Laurent Destailleur 9ff1809f85 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contrat/list.php htdocs/expedition/class/expedition.class.php htdocs/fourn/card.php htdocs/product/stock/class/productlot.class.php htdocs/theme/eldy/style.css.php		2016-09-12 02:05:38 +02:00
..
class	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop	2016-09-12 02:05:38 +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	Move button to link to, in same part of code than code to output links.	2016-08-05 15:30:28 +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