Laurent Destailleur
cade08342c
Merge pull request #11390 from grandoc/develop
...
translation
2019-06-24 15:30:30 +02:00
Laurent Destailleur
7e10208619
Merge pull request #11380 from atm-florian/9.0
...
fix depending extrafeilds list
2019-06-24 15:23:48 +02:00
John Botella
ec7446762c
Fix travis
2019-06-24 14:36:06 +02:00
Laurent Destailleur
1daac232b0
Code comment
2019-06-24 14:31:58 +02:00
Laurent Destailleur
01b8522216
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-24 13:56:39 +02:00
Laurent Destailleur
76d49229cd
Fix log
2019-06-24 13:42:46 +02:00
Laurent Destailleur
1c86294f83
Enhance pdf_getFormat
2019-06-24 13:39:32 +02:00
Laurent Destailleur
1699413a4c
Add log
2019-06-24 12:59:16 +02:00
John Botella
9c414a7a57
Change function to camel case
2019-06-24 12:22:33 +02:00
John Botella
a83e7f3665
Add retained warranty to PDF
2019-06-24 12:00:55 +02:00
John Botella
7b6925b8f7
Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop
2019-06-24 10:29:43 +02:00
Laurent Destailleur
43fc0466e5
Fix position of modules
2019-06-23 20:05:15 +02:00
Laurent Destailleur
9c54de57ce
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-23 18:12:56 +02:00
Laurent Destailleur
1c48b8be32
Fix code comment
2019-06-23 17:23:41 +02:00
Laurent Destailleur
efa09301b1
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 20:19:14 +02:00
Laurent Destailleur
8a9c858609
Code comment
2019-06-22 20:18:55 +02:00
Laurent Destailleur
b202c7eaa0
Fix confusion between ->childs and ->childsoncascade
2019-06-22 20:17:40 +02:00
Laurent Destailleur
2854e0dae6
Code comment
2019-06-22 19:15:15 +02:00
Laurent Destailleur
5c3d3cec9e
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 18:44:12 +02:00
Laurent Destailleur
662afe8a36
Fix missing global
2019-06-22 18:24:29 +02:00
Laurent Destailleur
5675e7c50e
Clean code of deprecated method
2019-06-22 18:19:40 +02:00
Laurent Destailleur
eb20df8e64
Fix debug save of state into setup
2019-06-22 14:47:46 +02:00
Philippe GRAND
e877f108ac
translation
2019-06-22 12:18:56 +02:00
Laurent Destailleur
6cab4f03ba
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 12:10:50 +02:00
Philippe GRAND
9d698c257c
translation
2019-06-22 12:10:32 +02:00
Philippe GRAND
8de36dc7c1
translation
2019-06-22 12:10:09 +02:00
Philippe GRAND
2d3b0b8f9e
translation
2019-06-22 12:09:50 +02:00
Philippe GRAND
26af2d8fe3
translation
2019-06-22 12:09:28 +02:00
Philippe GRAND
5379d4085f
translation
2019-06-22 12:08:57 +02:00
Philippe GRAND
a8d50228db
translation
2019-06-22 12:08:36 +02:00
Philippe GRAND
4d4b5abb7e
translation
2019-06-22 12:08:08 +02:00
Philippe GRAND
d75f4eb1c8
translation
2019-06-22 12:07:46 +02:00
Philippe GRAND
3cc97ec351
translation
2019-06-22 12:07:02 +02:00
Philippe GRAND
592591ff69
translation
2019-06-22 12:06:37 +02:00
Philippe GRAND
053b129f52
translation
2019-06-22 12:06:01 +02:00
Philippe GRAND
a9222c602f
translation
2019-06-22 12:04:26 +02:00
Laurent Destailleur
a4cd7772ef
Fix title
2019-06-22 12:02:41 +02:00
Laurent Destailleur
403d41ec30
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-22 11:55:33 +02:00
Laurent Destailleur
a7d7d44f87
FIX Management of vat info in stripe
2019-06-21 19:59:16 +02:00
Laurent Destailleur
681dbc3eac
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-06-21 19:58:43 +02:00
Laurent Destailleur
b6266953e9
FIX Management of vat info in stripe
2019-06-21 19:58:28 +02:00
John Botella
ec7ebe9f39
redo backported fix and update adherent substitution methode
2019-06-21 15:32:38 +02:00
John Botella
200b66d11f
Remove a backported fix because failling at init test
2019-06-21 14:52:12 +02:00
Laurent Destailleur
c63b465d48
Fix doxygen
2019-06-21 14:34:04 +02:00
Laurent Destailleur
4499447a89
Fix sort order of import profiles
...
Fix picto in import profile for accounting
2019-06-21 14:27:38 +02:00
Laurent Destailleur
bbbd066ac9
Merge pull request #11119 from openthink-laurent/add-customer-code-customer-orders-documents
...
Add customer code in customer orders documents
2019-06-21 13:33:57 +02:00
Laurent Destailleur
7ffcd3603b
Add option DOC_SHOW_CUSTOMER_CODE
...
Because we have a lot of information and the REF is better to retrieve/search an order and know the customer code, i added a hidden option to show this field.
2019-06-21 13:33:24 +02:00
Laurent Destailleur
f9095408b6
Fix sort order of export profiles
...
Add missing pos information into export of invoice
Add missing label of project in export of invoice
2019-06-21 13:25:40 +02:00
Laurent Destailleur
ad4bd05efb
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
...
Conflicts:
htdocs/core/modules/modAdherent.class.php
2019-06-21 11:29:06 +02:00
Laurent Destailleur
c725db166d
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
2019-06-21 11:26:44 +02:00