Laurent Destailleur 30b4d88428 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/compta/facture/list.php htdocs/product/reassort.php htdocs/societe/list.php		2018-08-12 19:23:45 +02:00
..
admin	Fix back link of look and feel v7	2018-02-26 09:20:05 +01:00
class	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-08-12 19:23:45 +02:00
stats	FIX : test for filter fk_status	2017-11-29 11:06:33 +01:00
tpl	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-21 14:35:33 +01:00
card.php	Fix text in payment area of crabe pdf	2018-07-02 11:33:33 +02:00
contact.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-28 09:56:40 +01:00
document.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-28 09:56:40 +01:00
fiche-rec.php	Fix lang loading	2018-06-26 00:48:43 +02:00
index.html	Removed index.php and replaced them with blank index.html as it is more appropriate	2014-07-12 23:18:57 +02:00
info.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-28 09:56:40 +01:00
invoicetemplate_list.php	FIX Max nb of generation of recurring invoice should not show warning	2018-04-16 15:05:35 +02:00
list.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0	2018-08-12 19:23:45 +02:00
note.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-12-28 09:56:40 +01:00
prelevement.php	Fix suggested amount for direct debit order	2018-01-18 18:22:10 +01:00