phf 127868899d Merge branch 'develop' into incoterm ...

Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql

2015-02-23 10:42:01 +01:00

..

doc_generic_invoice_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_crabe.modules.php

Merge branch 'develop' into incoterm

2015-02-23 10:42:01 +01:00