Laurent Destailleur 852bf8dab7 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/card.php htdocs/societe/class/societe.class.php		2018-03-15 01:57:35 +01:00
..
bank	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-12 19:09:57 +01:00
charges	Fix: regression, restore primary key	2018-03-08 07:41:54 +01:00
deplacement	Fix scrutinizer bugs	2017-12-15 22:14:28 +01:00
facture	NEW Can set the start/end date of service line in invoice templates	2018-03-12 12:27:40 +01:00
journal	Clean code	2017-09-05 10:16:08 +02:00
localtax	Fix scrutinizer errors	2018-03-04 11:22:43 +01:00
paiement	Fix: debug	2018-03-08 11:53:46 +01:00
payment_sc	Fix creation of tax payment	2017-10-07 21:27:18 +02:00
prelevement	Update bonprelevement.class.php	2018-03-10 22:09:32 +01:00
resultat	Fix: regression, restore primary key	2018-03-08 07:41:54 +01:00
salaries	Fix: debug	2018-03-08 11:53:46 +01:00
sociales	Fix: regression, restore primary key	2018-03-08 07:41:54 +01:00
stats	Fix SQLi reported by op7ica	2018-03-15 01:55:16 +01:00
tva	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-03-12 19:09:57 +01:00
ajaxpayment.php	Replaced usage of dol_json_encode and dol_json_decode with json_encode and json_decode. If json module is not installed, it will refer to dol_json_encode/decode	2014-07-30 15:47:19 +02:00
clients.php	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
index.php	fix better thirdparty link	2018-03-09 22:36:00 +01:00
paiement_charge.php	Look and feel v6	2017-10-16 20:53:23 +02:00
paiement.php	Fix: regression, restore primary key	2018-03-08 07:41:54 +01:00
recap-compta.php	FIX #8192	2018-02-15 14:47:08 +01:00