Laurent Destailleur 3b035819a9 Merge remote-tracking branch 'origin/3.8' into 3.9 ... Conflicts: htdocs/core/modules/askpricesupplier/doc/doc_generic_askpricesupplier_odt.modules.php htdocs/product/document.php htdocs/societe/commerciaux.php		2016-03-10 15:03:53 +01:00
..
doc_generic_supplier_proposal_odt.modules.php	Merge remote-tracking branch 'origin/3.8' into 3.9	2016-03-10 15:03:53 +01:00
index.html
pdf_aurore.modules.php	DiscountOffered text was too long	2016-02-05 20:06:07 +01:00