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
..
class	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-08-02 17:43:12 +02:00
stats	Revert "Corrected non-static usages of Form::selectarray function"	2016-03-25 15:34:37 +01:00
tpl	Don't delete link between order and shipment	2016-06-04 11:52:36 +02:00
apercu.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
card.php	Merge remote-tracking branch 'origin/4.0' into develop	2016-08-01 15:15:32 +02:00
contact.php	NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead	2016-04-17 15:24:22 +02:00
customer.php	Fix: missing getEntity function	2015-04-19 03:05:37 +02:00
document.php	FIX The include file for action on files should not be a template file	2016-04-02 14:16:16 +02:00
index.php	Better practice in boolean comparison	2016-05-17 23:19:57 +02:00
info.php	[Qual] Close database handler should be after Footer	2015-12-11 14:19:38 +01:00
list.php	Update skeleton with mass action code	2016-07-30 20:05:54 +02:00
note.php	Fix minor	2016-06-20 10:22:08 +02:00
orderstoinvoice.php	Fix link	2016-08-01 16:04:49 +02:00