Laurent Destailleur 252d8da8fc Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ...

Conflicts:
	htdocs/categories/class/categorie.class.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/modules/DolibarrModules.class.php
	htdocs/filefunc.inc.php
	htdocs/societe/class/societe.class.php
	htdocs/supplier_proposal/class/supplier_proposal.class.php

2017-07-07 15:11:53 +02:00

..

doc

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop

2017-07-07 15:11:53 +02:00

index.html

…

mod_commande_marbre.php

…

mod_commande_saphir.php

Code was corrupted with very bad commits. I restore files manually.

2016-03-25 15:53:44 +01:00

modules_commande.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