Marcos García de La Fuente ce7ed70d74 Merge branch 'develop' into commercial-name ... Conflicts: htdocs/comm/prospect/list.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php		2015-05-10 12:23:07 +02:00
..
doc_generic_order_odt.modules.php	Fix: Bad parameter of get_substitutionarray_other	2014-10-15 18:16:41 +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_einstein.modules.php	Merge branch 'develop' into commercial-name	2015-05-10 12:23:07 +02:00
pdf_proforma.modules.php	NEW: [ task #851 ] Add a new field: Commercial name	2015-02-28 14:30:06 +01:00