Commit Graph

76723 Commits

Author SHA1 Message Date
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
4721dc3d34 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 11:57:39 +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
18348fea93 Fix sort on date on agenda list 2019-06-22 11:34:16 +02:00
Laurent Destailleur
9644b9c669
Merge pull request #10932 from tony13tv/patch-6
[CHANGE] Make State available in .odt templates...
2019-06-22 11:26:32 +02:00
Laurent Destailleur
e9a8eb19bb
Update company.php 2019-06-22 11:24:21 +02:00
Laurent Destailleur
3afa4175db
Update company.php 2019-06-22 11:22:04 +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
Laurent Destailleur
0bc0f8ae94 Fix translation of country 2019-06-21 15:40:35 +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
Laurent Destailleur
70c950bd7c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/core/modules/modAdherent.class.php
2019-06-21 11:26:25 +02:00
Laurent Destailleur
9093be2f0a FIX Add missing end date of subscription in export 2019-06-21 11:23:49 +02:00
Laurent Destailleur
6f35c53f3a Prepare v11 2019-06-21 09:44:05 +02:00
Laurent Destailleur
b0c76f48e1 error management 2019-06-21 09:38:26 +02:00
Laurent Destailleur
b111636ed0 Fix trans 2019-06-20 18:32:25 +02:00
Laurent Destailleur
8da5794777 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/accounting.lib.php
	htdocs/product/stock/class/entrepot.class.php
2019-06-20 18:24:43 +02:00
Laurent Destailleur
495604fa83 Fix phpunit 2019-06-20 18:16:49 +02:00
Laurent Destailleur
e28bf71964 Fix error management of warehouse->delete 2019-06-20 18:15:14 +02:00
Laurent Destailleur
d47cf87c00 Look and feel v10 2019-06-20 17:59:28 +02:00
Laurent Destailleur
6b5d477476 Fix search criteria lost after a delete 2019-06-20 17:14:04 +02:00
Laurent Destailleur
c521b9b8f8 Fix dispatch in ledger table of withdraw / direct debit payment 2019-06-20 16:58:51 +02:00
Laurent Destailleur
faadae8157 Code comment 2019-06-20 15:59:45 +02:00
Laurent Destailleur
ff0f6295d8 Fix phpcs 2019-06-20 13:59:53 +02:00
Laurent Destailleur
6975e18233 Fix phpcs 2019-06-20 13:59:04 +02:00
Laurent Destailleur
bb9b0d401e Fix phpcs 2019-06-20 13:56:20 +02:00
Laurent Destailleur
4f9aa4caac Fix phpcs 2019-06-20 13:53:31 +02:00
Laurent Destailleur
4ffa48d9bd Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 13:50:47 +02:00
Laurent Destailleur
29e3199639 Fix phpcs 2019-06-20 13:39:29 +02:00
Laurent Destailleur
afb6362317 Fix look and feel v10
Fix link to direct debit payment order
2019-06-20 13:37:06 +02:00
Laurent Destailleur
add36777ff Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-20 12:35:04 +02:00
Laurent Destailleur
bff6260983 Fix syntax error 2019-06-20 12:34:29 +02:00