Laurent Destailleur a93ba86ce0 Merge remote-tracking branch 'origin/3.7' into develop ... Conflicts: htdocs/commande/card.php htdocs/compta/facture.php htdocs/compta/facture/class/facture.class.php htdocs/core/class/commonobject.class.php htdocs/core/modules/expedition/modules_expedition.php htdocs/core/modules/modContrat.class.php htdocs/expedition/class/expedition.class.php		2015-05-07 13:35:09 +02:00
..
html.formproduct.class.php	Fix: missing getEntity function	2015-04-19 03:05:37 +02: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
product.class.php	Merge remote-tracking branch 'origin/3.7' into develop	2015-05-07 13:35:09 +02:00
productbatch.class.php	Scrutinizer Auto-Fixes	2015-04-06 10:25:30 +00:00
productcustomerprice.class.php	Fix trigger to insert lines where called when inserting line but also	2015-02-26 13:03:17 +01:00
propalmergepdfproduct.class.php	Fix phpcs	2015-04-19 01:52:15 +02:00
service.class.php	Removed closing php tag	2014-05-03 18:18:44 +02:00