Laurent Destailleur 1fbf233f95 Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 ... Conflicts: htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/contact/list.php htdocs/contrat/list.php htdocs/expedition/list.php htdocs/expensereport/list.php htdocs/fichinter/list.php htdocs/fourn/commande/list.php htdocs/product/reassort.php htdocs/product/reassortlot.php htdocs/product/stock/list.php htdocs/societe/list.php htdocs/supplier_proposal/list.php htdocs/theme/eldy/style.css.php		2016-09-12 01:50:38 +02:00
..
class	Fix insert expeditiondet_batch with extrafield	2016-09-07 14:07:29 +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
card.php	Popup on links not visible.	2016-07-11 12:59:07 +02:00
contact.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
index.php	Fix search on shipment	2016-01-08 23:59:02 +01:00
list.php	Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0	2016-09-12 01:50:38 +02:00
note.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
shipment.php	NEW Removed deprecated CommonObject::client property. Please use CommonObject::thirdparty instead	2016-04-17 15:24:22 +02:00