Laurent Destailleur 7b7b5090c7 Merge branch 'incoterm' of https://github.com/atm-ph/dolibarr into ...

atm-ph-incoterm

Conflicts:
	htdocs/comm/propal.php
	htdocs/fourn/commande/card.php
	htdocs/fourn/facture/card.php
	htdocs/install/mysql/migration/3.7.0-3.8.0.sql

2015-03-04 23:03:29 +01: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 'incoterm' of https://github.com/atm-ph/dolibarr into

2015-03-04 23:03:29 +01:00

pdf_proforma.modules.php

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

2014-11-28 02:20:01 +01:00