Laurent Destailleur 7f85d73001 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/card.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/contrat/card.php htdocs/expensereport/card.php htdocs/fichinter/list.php htdocs/fourn/commande/card.php htdocs/fourn/commande/list.php htdocs/fourn/facture/card.php htdocs/fourn/paiement/card.php htdocs/livraison/card.php htdocs/modulebuilder/template/myobject_list.php htdocs/societe/rib.php htdocs/supplier_proposal/list.php htdocs/user/card.php		2017-10-18 19:51:29 +02:00
..
admin	Uniformize name of standard PDF template	2017-05-04 20:16:55 +02:00
class	Fix bug reported by scrutinizer	2017-10-07 20:21:47 +02:00
stats	Escape all status	2017-09-08 13:23:12 +02:00
tpl	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
card.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-18 19:51:29 +02:00
contact.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 14:50:52 +02:00
document.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 14:50:52 +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
index.php	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
info.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 14:50:52 +02:00
list.php	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-10-18 19:51:29 +02:00
note.php	NEW Search filters in lists are restored when using "back to list"	2017-10-03 14:50:52 +02:00