Laurent Destailleur
429ffd6c53
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-05-08 19:08:51 +02:00
Laurent Destailleur
bb4cda6719
Fix phpcs
2019-05-08 19:08:40 +02:00
Laurent Destailleur
b62b09df66
Merge pull request #11147 from frederic34/patch-2
...
fix reassort with not using product units
2019-05-08 18:33:10 +02:00
Laurent Destailleur
5317d0432d
Fix bad link
2019-05-08 18:32:26 +02:00
Laurent Destailleur
590b1d1e90
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/accountancy/bookkeeping/thirdparty_lettering_supplier.php
htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php
2019-05-08 18:24:50 +02:00
Laurent Destailleur
b5d8bc732d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-08 18:22:11 +02:00
Laurent Destailleur
af436b6559
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-05-08 18:21:17 +02:00
Laurent Destailleur
f2e24ed96e
Fix bad contact used
2019-05-08 18:20:28 +02:00
Laurent Destailleur
3a3b04f31b
Fix showdocument for external modules
2019-05-08 17:31:50 +02:00
Frédéric FRANCE
5fd3109e7f
fix reassort with no product units
2019-05-08 16:28:18 +02:00
Laurent Destailleur
d86f0b7407
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-05-08 13:27:36 +02:00
Laurent Destailleur
a67d6e7208
css
2019-05-08 13:27:26 +02:00
Laurent Destailleur
018cd3d034
Merge pull request #11143 from code-chicken/patch-5
...
FIX Show unit values if configured
2019-05-08 02:12:04 +02:00
Laurent Destailleur
af2c158821
Update reassort.php
2019-05-08 02:11:50 +02:00
Laurent Destailleur
953c9148ff
Update reassort.php
2019-05-08 02:11:12 +02:00
Laurent Destailleur
8812b95ce0
Merge pull request #11144 from aspangaro/develop
...
Fix Eldy menu
2019-05-08 02:09:35 +02:00
Laurent Destailleur
4ebc281960
Merge pull request #11140 from code-chicken/patch-3
...
FIX Fetch db value for cond_reglement_doc/cond_reglement_libelle_doc
2019-05-08 02:07:14 +02:00
Laurent Destailleur
eb9b9e44d8
Merge pull request #11137 from OPEN-DSI/fix-card-presend-shipment
...
Fix contact address substitution before sending by mail in shipment card
2019-05-08 02:06:36 +02:00
Laurent Destailleur
b58a73cfaf
Merge pull request #11139 from code-chicken/patch-1
...
FIX Add support for units
2019-05-08 02:02:22 +02:00
Laurent Destailleur
2ee72e2fdf
Update html.form.class.php
2019-05-08 02:02:07 +02:00
Laurent Destailleur
21c355dd9d
Merge pull request #11133 from aspangaro/9.0_lettering
...
FIX sortfield on lettering function
2019-05-08 01:59:27 +02:00
Laurent Destailleur
cea05b0d7d
Merge pull request #11131 from ptibogxiv/patch-173
...
FIX url lettre max & colissimo
2019-05-08 01:54:12 +02:00
Laurent Destailleur
1e036f3513
Correct support for type price on module builder
...
Fix link of ref in cash fence list
2019-05-08 01:09:38 +02:00
Laurent Destailleur
3606bab973
Merge pull request #11130 from ptibogxiv/patch-172
...
FIX : facnumber to ref report takepos
2019-05-08 00:35:03 +02:00
Laurent Destailleur
dc1ee29fef
Fix default permission of new users
2019-05-07 23:03:45 +02:00
Laurent Destailleur
12409e944c
Fix duplicate error message
2019-05-07 22:57:27 +02:00
Laurent Destailleur
e37519ed89
Fix label
2019-05-07 22:43:59 +02:00
Alexandre SPANGARO
a386f0e9ea
Fix Eldy menu
2019-05-07 09:18:27 +02:00
Rüdiger Hahn
475290a4b9
Show unit values if configured
...
Fix: Fetch unit values from db and display them if this has been configured
2019-05-07 09:02:48 +02:00
Rüdiger Hahn
acb2f59f56
Fetch db value for cond_reglement_doc/cond_reglement_libelle_doc
...
cond_reglement and cond_reglement_doc got the same value cond_reglement_libelle. It looks like that the db field libelle_facture was intended to be used for cond_reglement_libelle_doc.
2019-05-06 19:22:49 +02:00
Rüdiger Hahn
4008e26328
Add support for units
...
Fetch units from db when they've been enabled in configuration
2019-05-06 13:12:41 +02:00
Lionel VESSILLER
8bb4b3f339
Fix contact address substitution before sending by mail in shipment card
2019-05-06 11:12:56 +02:00
Alexandre SPANGARO
c86318ea66
fix
2019-05-05 21:49:04 +02:00
Alexandre SPANGARO
99b068b625
FIX sortfield on lettering function
2019-05-05 21:46:56 +02:00
ptibogxiv
f0fd0ece60
Update 9.0.0-10.0.0.sql
2019-05-05 15:06:10 +02:00
ptibogxiv
7033243572
FIX url lettre max & colissimo
2019-05-05 15:02:00 +02:00
ptibogxiv
c94e621059
FIX : facnumber to ref report takepos
2019-05-04 17:23:57 +02:00
Laurent Destailleur
15dc5f9d23
Fix css
2019-05-04 16:46:09 +02:00
Laurent Destailleur
e42caf1dd9
CSS
2019-05-04 14:54:25 +02:00
Laurent Destailleur
fc18e190d1
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-05-04 13:03:28 +02:00
Laurent Destailleur
e01476e10b
CSS
2019-05-04 13:03:18 +02:00
Laurent Destailleur
92534cc101
Merge pull request #11127 from Supermanu/del_proj_cat
...
FIX: Remove link between categories and project when deleting
2019-05-04 12:52:35 +02:00
Laurent Destailleur
204fc329a6
Merge pull request #11121 from frederic34/patch-2
...
Update thirdparty_lettering_customer.php
2019-05-04 12:46:35 +02:00
Laurent Destailleur
be68300e35
Merge pull request #11120 from openthink-laurent/fix-date-format-customer-orders-documents
...
Fix date format in customer orders documents
2019-05-04 12:46:09 +02:00
Laurent Destailleur
5caae1f50d
css
2019-05-04 12:42:16 +02:00
Laurent Destailleur
60bf3452c3
Hide export in EEC for non european countries
2019-05-04 12:26:54 +02:00
Supermanu
9aed9359ad
FIX: Remove link between categories and project when deleting
2019-05-04 12:22:45 +02:00
Laurent Destailleur
3ad478c25e
Merge pull request #11109 from aspangaro/develop
...
NEW Manage account sell_intra & sell_export in page accoutancy admin default product
2019-05-04 12:18:23 +02:00
Laurent Destailleur
702c683ce4
Merge pull request #11115 from ptibogxiv/patch-167
...
Fix footer in create ticket page
2019-05-04 12:16:06 +02:00
Laurent Destailleur
cf4086f970
Merge pull request #11122 from mrsof/patch-2
...
FIX : Fatal Errors and Warning
2019-05-04 12:15:49 +02:00
