Regis Houssin 2f537a1ade Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_dict Conflicts: htdocs/compta/charges/index.php htdocs/compta/paiement/list.php htdocs/install/mysql/migration/6.0.0-7.0.0.sql		2017-08-22 18:49:40 +02:00
..
bank	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-08-22 18:49:40 +02:00
charges	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-08-22 18:49:40 +02:00
deplacement	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
facture	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-08-22 18:49:40 +02:00
journal	Update code using new css class	2017-05-10 16:41:19 +02:00
localtax	FIX pgsql compatibility. Add PHPUnit to avoid using dates without quotes	2017-07-26 21:22:53 +02:00
paiement	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-08-22 18:49:40 +02:00
payment_sc	Fix var not sanitized	2017-05-16 13:27:32 +02:00
prelevement	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
resultat	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-08-22 18:49:40 +02:00
salaries	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-08-22 18:49:40 +02:00
sociales	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-08-22 18:49:40 +02:00
stats	Look and feel v6	2017-07-01 14:23:24 +02:00
tva	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-08-22 18:49:40 +02:00
ajaxpayment.php
clients.php	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
index.php	Update index.php	2017-07-18 14:35:11 +02:00
paiement_charge.php	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
paiement.php	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into	2017-08-22 18:49:40 +02:00
recap-compta.php	Fix syntax error	2017-06-08 14:55:12 +02:00