Laurent Destailleur fac28f9589 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/sociales/charges.php htdocs/core/boxes/modules_boxes.php htdocs/core/class/commonobject.class.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/commande/card.php htdocs/fourn/facture/card.php		2016-08-28 02:40:20 +02:00
..
tpl	NEW Merge all boxes "related objects" into one. This save a lot of room	2016-03-30 19:18:31 +02:00
card.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-28 02:40:20 +02:00
contact.php	Uniformize presentation supplier invoice	2016-08-01 07:21:24 +02:00
document.php	Uniformize presentation supplier invoice	2016-08-01 07:21:24 +02:00
impayees.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01: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	Uniformize presentation supplier invoice	2016-08-01 07:21:24 +02:00
list.php	NEW Reduce nb of picto on ref into list, merging preview and download	2016-08-05 12:20:11 +02:00
note.php	Uniformize presentation supplier invoice	2016-08-01 07:21:24 +02:00
paiement.php	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-02 17:43:12 +02:00