Laurent Destailleur 05f3a47018 Merge remote-tracking branch 'origin/3.5' into 3.6 ... Conflicts: build/debian/control htdocs/compta/bank/account.php htdocs/fourn/paiement/fiche.php htdocs/product/class/product.class.php htdocs/product/fiche.php		2014-09-15 22:52:59 +02:00
..
html.formproduct.class.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
product.class.php	Merge remote-tracking branch 'origin/3.5' into 3.6	2014-09-15 22:52:59 +02:00
productbatch.class.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
productcustomerprice.class.php	Removed closing php tag	2014-05-03 18:18:44 +02:00
service.class.php	Removed closing php tag	2014-05-03 18:18:44 +02:00