Marcos García de La Fuente
|
05728075d6
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/core/class/html.form.class.php
# htdocs/core/tpl/objectline_create.tpl.php
# htdocs/install/mysql/migration/3.9.0-4.0.0.sql
# htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2016-09-06 21:06:33 +02:00 |
|
Laurent Destailleur
|
898bbd6031
|
NEW Support extrafields for expense reports
|
2016-09-06 13:00:32 +02:00 |
|
Laurent Destailleur
|
b01d1979f8
|
Merge pull request #5680 from aspangaro/5.0-p7
NEW: Move Expense report menu from module to menu files (Again)
|
2016-09-02 18:39:49 +02:00 |
|
Laurent Destailleur
|
3edb04c5b8
|
Fix missing migration to create entity
|
2016-08-31 12:54:44 +02:00 |
|
aspangaro
|
b5f093436e
|
NEW: Move Expense report menu from module to menu files (Again)
|
2016-08-30 21:43:17 +02:00 |
|
Laurent Destailleur
|
867525cc91
|
Fix missing migration instructions
|
2016-08-29 17:50:31 +02:00 |
|
Laurent Destailleur
|
c49c23df3d
|
Fix debug project categories
|
2016-08-29 17:30:54 +02:00 |
|
Laurent Destailleur
|
b8201c9f86
|
Fix fk_soc can be null because we can set notification for users only.
|
2016-08-28 23:46:12 +02:00 |
|
BENKE Charlie
|
777b9fe4d8
|
Update 4.0.0-5.0.0.sql
|
2016-08-23 11:28:10 +02:00 |
|
BENKE Charlie
|
8707bb04fb
|
Update 4.0.0-5.0.0.sql
|
2016-08-17 16:38:02 +02:00 |
|
Laurent Destailleur
|
f1ee2bdddf
|
Remove deprecated field
|
2016-08-09 13:10:34 +02:00 |
|
BENKE Charlie
|
432fad6ed7
|
Update 4.0.0-5.0.0.sql
|
2016-08-07 14:22:05 +02:00 |
|
Marcos García de La Fuente
|
b1c552ee9d
|
Merge branch 'develop' into prod-attr
# Conflicts:
# htdocs/install/mysql/tables/llx_product_attribute.key.sql
# htdocs/install/mysql/tables/llx_product_attribute_combination2val.sql
|
2016-07-24 11:54:38 +02:00 |
|
Marcos García de La Fuente
|
c082505021
|
NEW Added product attributes feature
|
2016-07-24 11:27:52 +02:00 |
|
Laurent Destailleur
|
9c89bc4095
|
Remove deprecated tables and code
|
2016-07-23 10:57:27 +02:00 |
|
Laurent Destailleur
|
b90ed8d677
|
Merge pull request #5375 from frederic34/charges
NEW select bank and payment mode for social contrib
|
2016-07-20 19:00:10 +02:00 |
|
Laurent Destailleur
|
9ba1ca5acb
|
Merge branch 'abb-14' of https://github.com/bafbes/dolibarr into bafbes-abb-14
Conflicts:
htdocs/langs/en_US/companies.lang
|
2016-07-15 17:05:12 +02:00 |
|
Laurent Destailleur
|
00d80d827f
|
To match new standard, next version will be called 5.0, 6.0, ...
|
2016-07-15 11:17:33 +02:00 |
|
frederic34
|
2de3d4ec7b
|
Merge remote branch 'upstream/develop' into charges
Conflicts:
htdocs/install/mysql/migration/4.0.0-5.0.0.sql
|
2016-07-15 10:41:56 +02:00 |
|
Laurent Destailleur
|
74f28b3861
|
NEW Complete table llx_ecm_files with field generated_or_uploaded
|
2016-07-15 10:38:13 +02:00 |
|
Laurent Destailleur
|
eb47ec5823
|
Drop another deprecated table llx_ecm_documents (replace by
llx_ecm_files)
|
2016-07-15 10:27:20 +02:00 |
|
Laurent Destailleur
|
09306ba974
|
Drop not used table llx_document_generator (list of generators must be
managed by submodules like are the templates of document or engines to
select emailing targets (scan of a dedicated dir)
|
2016-07-15 10:23:36 +02:00 |
|
frederic34
|
7e3978c403
|
sql changes
|
2016-07-15 10:04:04 +02:00 |
|
Laurent Destailleur
|
ec6640af63
|
Add field virtualhost for website module
|
2016-07-14 15:54:46 +02:00 |
|