Laurent Destailleur 2e1a63a1f3 Merge remote-tracking branch 'origin/3.9' into develop ... Conflicts: htdocs/langs/de_DE/companies.lang htdocs/langs/fr_FR/compta.lang htdocs/societe/class/societe.class.php htdocs/societe/commerciaux.php htdocs/societe/consumption.php		2016-03-10 15:09:30 +01:00
..
doc_generic_shipment_odt.modules.php	Merge remote-tracking branch 'origin/3.9' into develop	2016-03-10 15:09:30 +01: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
pdf_merou.modules.php	NEW Add $object in parameter of pdf_build_address so we could include	2016-02-25 18:30:31 +01:00
pdf_rouget.modules.php	Fix unit not visible if not defined	2016-03-09 23:20:44 +01:00