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_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

Merge remote-tracking branch 'origin/3.6' into 3.7

2015-02-10 21:33:43 +01:00

pdf_rouget.modules.php

[CORE] gestion de l'affichage de l'incoterm sur les différents PDF de base (#incoterm).

2015-02-23 10:36:44 +01:00