Laurent Destailleur ea2fd67e0d Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/card.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/tpl/admin_extrafields_view.tpl.php htdocs/langs/de_DE/admin.lang		2018-04-12 13:31:14 +02:00
..
pdf	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-12 13:31:14 +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
mod_commande_fournisseur_muguet.php	Fix regression db => this->db	2017-09-15 19:37:23 +02:00
mod_commande_fournisseur_orchidee.php	Code was corrupted with very bad commits. I restore files manually.	2016-03-25 15:53:44 +01:00
modules_commandefournisseur.php	NEW Removed commande_pdf_create, contract_pdf_create,expedition_pdf_create, facture_pdf_create, delivery_order_pdf_create, task_pdf_create, project_pdf_create, propale_pdf_create, supplier_invoice_pdf_create, supplier_order_pdf_create, supplier_proposal_pdf_create deprecated functions	2017-01-16 21:59:02 +01:00