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

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

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

mod_commande_marbre.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

mod_commande_saphir.php

Prepare move to other licence. For the moment all answers for licence

2013-01-16 15:36:08 +01:00

modules_commande.php

Fix: $hookmanager is a global object

2013-01-26 10:35:30 +01:00