Marcos García de La Fuente b822a1e3ad Merge branch 'develop' into commercial-name ... Conflicts: htdocs/societe/class/societe.class.php		2015-03-15 18:20:17 +01:00
..
doc_generic_shipment_odt.modules.php	Uniformize code: property "nom" for thirdparty is aliased into "name"	2014-10-04 17:20:17 +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
pdf_merou.modules.php	NEW: [ task #851 ] Add a new field: Commercial name	2015-02-28 14:30:06 +01:00
pdf_rouget.modules.php	Merge branch 'develop' into commercial-name	2015-03-15 18:20:17 +01:00