Laurent Destailleur 51d11ff190 Merge remote-tracking branch 'origin/3.4' into develop ...

Conflicts:
	htdocs/compta/facture/stats/index.php
	htdocs/core/class/html.form.class.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/core/modules/propale/doc/pdf_azur.modules.php
	htdocs/includes/tcpdf/tcpdf.php
	htdocs/langs/el_GR/other.lang
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/en_US/main.lang
	htdocs/langs/es_ES/products.lang
	htdocs/main.inc.php
	test/phpunit/NumberingModulesTest.php

2013-06-09 16:49:47 +02:00

..

doc

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

2013-06-09 16:49:47 +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