Laurent Destailleur b675b9b610 Merge remote-tracking branch 'origin/3.5' into develop ...

Conflicts:
	htdocs/comm/action/fiche.php
	htdocs/core/class/conf.class.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/company.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/fourn/facture/fiche.php
	htdocs/langs/en_US/admin.lang
	htdocs/margin/agentMargins.php
	htdocs/margin/customerMargins.php
	htdocs/margin/productMargins.php
	htdocs/projet/tasks/task.php

2014-03-31 00:44:45 +02:00

..

doc_generic_order_odt.modules.php

Merge remote-tracking branch 'origin/3.5' into develop

2014-03-31 00:44:45 +02:00

pdf_einstein.modules.php

Merge remote-tracking branch 'origin/3.5' into develop

2014-03-31 00:44:45 +02:00

pdf_proforma.modules.php

Merge remote-tracking branch 'origin/3.5' into develop

2014-03-19 22:29:18 +01:00