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

Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/expedition/doc/pdf_expedition_merou.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php

2013-09-22 20:01:33 +02:00

..

pdf

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

2013-09-22 20:01:33 +02:00

mod_commande_fournisseur_muguet.php

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

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

mod_commande_fournisseur_orchidee.php

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

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

modules_commandefournisseur.php

Fix order_supplier and invoice_supplier PDF model name

2013-04-06 13:00:41 +02:00