Laurent Destailleur f0c75388cb Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/commande/class/api_commande.class.php htdocs/compta/facture/class/api_invoice.class.php htdocs/product/class/api_product.class.php htdocs/societe/class/api_contact.class.php htdocs/societe/class/api_thirdparty.class.php		2016-08-02 17:43:12 +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-02 17:43:12 +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	FIX #5457	2016-07-28 11:53:06 +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