Laurent Destailleur a4665e17d4 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/customer/index.php htdocs/accountancy/expensereport/index.php htdocs/compta/facture/class/facture-rec.class.php htdocs/fichinter/class/fichinter.class.php htdocs/societe/class/societe.class.php htdocs/societe/list.php		2017-09-12 13:26:25 +02:00
..
admin	Change copyright comment	2017-08-25 16:25:40 +02:00
class	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-12 13:26:25 +02:00
stats	Escape all status	2017-09-08 13:23:12 +02:00
tpl	Suggested link for online payment use the generic link	2017-09-12 12:18:26 +02:00
card.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-09-12 13:26:25 +02:00
contact.php	Look and feel v6	2017-05-21 02:43:51 +02:00
document.php	Fix delete file not possible for external user even with permissions	2017-08-30 14:34:36 +02:00
fiche-rec.php	NEW template invoices support substition key	2017-09-11 02:11:31 +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	Fix missing $form	2017-08-22 10:02:45 +02:00
list.php	Fix filter on extrafield with type sellist	2017-09-07 15:34:25 +02:00
note.php	Page societe/soc.php and compta/facture.php was renamed into card.php	2017-03-20 21:29:22 +01:00
prelevement.php	Look and feel v6	2017-05-21 02:43:51 +02:00