diff --git a/htdocs/core/modules/commande/modules_commande.php b/htdocs/core/modules/commande/modules_commande.php index 45623575ba4..aa6da728f56 100644 --- a/htdocs/core/modules/commande/modules_commande.php +++ b/htdocs/core/modules/commande/modules_commande.php @@ -146,26 +146,4 @@ abstract class ModeleNumRefCommandes if ($this->version) return $this->version; return $langs->trans("NotAvailable"); } -} - - -/** - * Create a document onto disk accordign to template module. - * - * @param DoliDB $db Database handler - * @param Commande $object Object order - * @param string $modele Force le modele a utiliser ('' to not force) - * @param Translate $outputlangs objet lang a utiliser pour traduction - * @param int $hidedetails Hide details of lines - * @param int $hidedesc Hide description - * @param int $hideref Hide ref - * @return int 0 if KO, 1 if OK - * @deprecated Use the new function generateDocument of Commande class - * @see Commande::generateDocument() - */ -function commande_pdf_create(DoliDB $db, Commande $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) -{ - dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING); - - return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); -} +} \ No newline at end of file diff --git a/htdocs/core/modules/contract/modules_contract.php b/htdocs/core/modules/contract/modules_contract.php index 1efeaef3466..47a882b7b56 100644 --- a/htdocs/core/modules/contract/modules_contract.php +++ b/htdocs/core/modules/contract/modules_contract.php @@ -143,24 +143,3 @@ class ModelNumRefContracts return $langs->trans("NotAvailable"); } } - -/** - * Create a contract document on disk using template defined into CONTRACT_ADDON_PDF - * - * @param DoliDB $db objet base de donnee - * @param Contrat $object Object contract - * @param string $modele force le modele a utiliser ('' par defaut) - * @param Translate $outputlangs objet lang a utiliser pour traduction - * @param int $hidedetails Hide details of lines - * @param int $hidedesc Hide description - * @param int $hideref Hide ref - * @return int 0 if KO, 1 if OK - * @deprecated Use the new function generateDocument of Contrat class - * @see Contrat::generateDocument() - */ -function contract_pdf_create(DoliDB $db, Contrat $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) -{ - dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING); - - return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); -} diff --git a/htdocs/core/modules/expedition/modules_expedition.php b/htdocs/core/modules/expedition/modules_expedition.php index 335491c0f9d..f46fa33c5f1 100644 --- a/htdocs/core/modules/expedition/modules_expedition.php +++ b/htdocs/core/modules/expedition/modules_expedition.php @@ -141,24 +141,3 @@ abstract class ModelNumRefExpedition return $langs->trans("NotAvailable"); } } - -/** - * Create a document onto disk according to template module. - * - * @param DoliDB $db Objet base de donnee - * @param Expedition $object Object expedition - * @param string $modele Force le modele a utiliser ('' to not force) - * @param Translate $outputlangs Objet lang a utiliser pour traduction - * @param int $hidedetails Hide details of lines - * @param int $hidedesc Hide description - * @param int $hideref Hide ref - * @return int 1 if OK -1 if KO - * @deprecated Use the new function generateDocument of Expedition class - * @see Expedition::generateDocument() - */ -function expedition_pdf_create(DoliDB $db, Expedition $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) -{ - dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING); - - return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); -} diff --git a/htdocs/core/modules/facture/modules_facture.php b/htdocs/core/modules/facture/modules_facture.php index 23d55d0aa96..b5d9a2397cc 100644 --- a/htdocs/core/modules/facture/modules_facture.php +++ b/htdocs/core/modules/facture/modules_facture.php @@ -142,26 +142,3 @@ abstract class ModeleNumRefFactures return $langs->trans("NotAvailable"); } } - - -/** - * Create a document onto disk according to template module. - * - * @param DoliDB $db Database handler - * @param Facture $object Object invoice - * @param string $modele Force template to use ('' to not force) - * @param Translate $outputlangs objet lang a utiliser pour traduction - * @param int $hidedetails Hide details of lines - * @param int $hidedesc Hide description - * @param int $hideref Hide ref - * @return int <0 if KO, >0 if OK - * @deprecated Use the new function generateDocument of Facture class - * @see Facture::generateDocument() - */ -function facture_pdf_create(DoliDB $db, Facture $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) -{ - dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING); - - return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); -} - diff --git a/htdocs/core/modules/livraison/modules_livraison.php b/htdocs/core/modules/livraison/modules_livraison.php index c3c762cbed1..a433f42930d 100644 --- a/htdocs/core/modules/livraison/modules_livraison.php +++ b/htdocs/core/modules/livraison/modules_livraison.php @@ -144,24 +144,3 @@ abstract class ModeleNumRefDeliveryOrder return $langs->trans("NotAvailable"); } } - - - -/** - * Create object on disk - * - * @param DoliDB $db objet base de donnee - * @param Livraison $object object delivery - * @param string $modele force le modele a utiliser ('' to not force) - * @param Translate $outputlangs objet lang a utiliser pour traduction - * @return int 0 if KO, 1 if OK - * @deprecated Use the new function generateDocument of Livraison class - * @see Livraison::generateDocument() - */ -function delivery_order_pdf_create(DoliDB $db, Livraison $object, $modele, $outputlangs='') -{ - dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING); - - return $object->generateDocument($modele, $outputlangs); -} - diff --git a/htdocs/core/modules/project/modules_project.php b/htdocs/core/modules/project/modules_project.php index acc1c2738f4..5f7ef3d5756 100644 --- a/htdocs/core/modules/project/modules_project.php +++ b/htdocs/core/modules/project/modules_project.php @@ -139,26 +139,3 @@ abstract class ModeleNumRefProjects return $langs->trans("NotAvailable"); } } - - -/** - * Create an intervention document on disk using template defined into PROJECT_ADDON_PDF - * - * @param DoliDB $db objet base de donnee - * @param Project $object Object fichinter - * @param string $modele force le modele a utiliser ('' par defaut) - * @param Translate $outputlangs objet lang a utiliser pour traduction - * @param int $hidedetails Hide details of lines - * @param int $hidedesc Hide description - * @param int $hideref Hide ref - * @return int 0 if KO, 1 if OK - * @deprecated Use the new function generateDocument of Project class - * @see Project::generateDocument() - */ -function project_pdf_create(DoliDB $db, Project $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) -{ - dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING); - - return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); -} - diff --git a/htdocs/core/modules/project/task/modules_task.php b/htdocs/core/modules/project/task/modules_task.php index bea4d342e29..7d14ae12a3e 100644 --- a/htdocs/core/modules/project/task/modules_task.php +++ b/htdocs/core/modules/project/task/modules_task.php @@ -139,27 +139,3 @@ abstract class ModeleNumRefTask return $langs->trans("NotAvailable"); } } - - -/** - * Create an intervention document on disk using template defined into PROJECT_TASK_ADDON_PDF - * - * @param DoliDB $db objet base de donnee - * @param Task $object Object fichinter - * @param string $modele force le modele a utiliser ('' par defaut) - * @param Translate $outputlangs objet lang a utiliser pour traduction - * @param int $hidedetails Hide details of lines - * @param int $hidedesc Hide description - * @param int $hideref Hide ref - * @param HookManager $hookmanager Hook manager instance - * @return int 0 if KO, 1 if OK - * @deprecated Use the new function generateDocument of Task class - * @see Task::generateDocument() - */ -function task_pdf_create(DoliDB $db, Task $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0, $hookmanager=false) -{ - dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING); - - return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref, $hookmanager); -} - diff --git a/htdocs/core/modules/propale/modules_propale.php b/htdocs/core/modules/propale/modules_propale.php index 6c0be15f0df..c2d52923e4f 100644 --- a/htdocs/core/modules/propale/modules_propale.php +++ b/htdocs/core/modules/propale/modules_propale.php @@ -143,26 +143,3 @@ abstract class ModeleNumRefPropales return $langs->trans("NotAvailable"); } } - - -/** - * Create a document onto disk according to template module. - * - * @param DoliDB $db Database handler - * @param Propal $object Object proposal - * @param string $modele Force model to use ('' to not force) - * @param Translate $outputlangs Object langs to use for output - * @param int $hidedetails Hide details of lines - * @param int $hidedesc Hide description - * @param int $hideref Hide ref - * @return int 0 if KO, 1 if OK - * @deprecated Use the new function generateDocument of Propal class - * @see Propal::generateDocument() - */ -function propale_pdf_create(DoliDB $db, Propal $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) -{ - dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING); - - return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); -} - diff --git a/htdocs/core/modules/societe/modules_societe.class.php b/htdocs/core/modules/societe/modules_societe.class.php index 63208b1369c..0ed5eace2e2 100644 --- a/htdocs/core/modules/societe/modules_societe.class.php +++ b/htdocs/core/modules/societe/modules_societe.class.php @@ -384,80 +384,3 @@ function thirdparty_doc_create(DoliDB $db, Societe $object, $message, $modele, $ return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); } - - -/** - * Create a document for third party - * - * @param DoliDB $db Database handler - * @param Societe $object Object of third party to use - * @param string $message Message - * @param string $modele Force model to use ('' to not force). model can be a model name or a template file. - * @param Translate $outputlangs Object lang to use for translation - * @return int <0 if KO, >0 if OK - */ -/*function thirdparty_doc_create($db, $object, $message, $modele, $outputlangs) -{ - global $conf,$langs,$user; - $langs->load("bills"); - $error=0; - - $dir = DOL_DOCUMENT_ROOT . "/core/modules/societe/doc"; - $srctemplatepath=''; - - // Positionne modele sur le nom du modele a utiliser - if (! dol_strlen($modele)) - { - if (! empty($conf->global->COMPANY_ADDON_PDF)) - { - $modele = $conf->global->COMPANY_ADDON_PDF; - } - else - { - print $langs->trans("Error")." ".$langs->trans("Error_COMPANY_ADDON_PDF_NotDefined"); - return 0; - } - } - - // If selected modele is a filename template (then $modele="modelname:filename") - $tmp=explode(':',$modele,2); - if (! empty($tmp[1])) - { - $modele=$tmp[0]; - $srctemplatepath=$tmp[1]; - } - - // Search template - $file = "doc_".$modele.".modules.php"; - if (file_exists($dir.'/'.$file)) - { - $classname = "doc_".$modele; - require_once $dir.'/'.$file; - - $obj = new $classname($db); - - // We save charset_output to restore it because write_file can change it if needed for - // output format that does not support UTF8. - $sav_charset_output=$outputlangs->charset_output; - if ($obj->write_file($object, $outputlangs, $srctemplatepath) > 0) - { - $outputlangs->charset_output=$sav_charset_output; - - return 1; - } - else - { - $outputlangs->charset_output=$sav_charset_output; - dol_print_error($db,"thirdparty_doc_create Error: ".$obj->error); - return -1; - } - - } - else - { - dol_print_error('',$langs->trans("Error")." ".$langs->trans("ErrorFileDoesNotExists",$dir.'/'.$file)); - return -1; - } -} -*/ - diff --git a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php index aebc7aa008a..7762d8ce6a5 100644 --- a/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php +++ b/htdocs/core/modules/supplier_invoice/modules_facturefournisseur.php @@ -135,22 +135,3 @@ abstract class ModeleNumRefSuppliersInvoices return $langs->trans("NotAvailable"); } } - -/** - * Create a document onto disk according to template model. - * - * @param DoliDB $db Database handler - * @param Object $object Object supplier invoice - * @param string $modele Force template to use ('' to not force) - * @param Translate $outputlangs Object lang a utiliser pour traduction - * @param int $hidedetails Hide details of lines - * @param int $hidedesc Hide description - * @param int $hideref Hide ref - * @return int 0 if KO, 1 if OK - * - */ -function supplier_invoice_pdf_create($db, $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) -{ - return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); -} - diff --git a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php index bd34ca86b20..4bd262d67fb 100644 --- a/htdocs/core/modules/supplier_order/modules_commandefournisseur.php +++ b/htdocs/core/modules/supplier_order/modules_commandefournisseur.php @@ -137,26 +137,3 @@ abstract class ModeleNumRefSuppliersOrders return $langs->trans("NotAvailable"); } } - - -/** - * Create a document onto disk according to template model. - * - * @param DoliDB $db Database handler - * @param CommandeFournisseur $object Object supplier order - * @param string $modele Force template to use ('' to not force) - * @param Translate $outputlangs Object lang to use for traduction - * @param int $hidedetails Hide details of lines - * @param int $hidedesc Hide description - * @param int $hideref Hide ref - * @return int 0 if KO, 1 if OK - * @deprecated Use the new function generateDocument of CommandeFournisseur class - * @see CommandeFournisseur::generateDocument() - */ -function supplier_order_pdf_create(DoliDB $db, CommandeFournisseur $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) -{ - dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING); - - return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); -} - diff --git a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php index 715dc294d91..b324a1b03a8 100644 --- a/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php +++ b/htdocs/core/modules/supplier_proposal/modules_supplier_proposal.php @@ -143,26 +143,3 @@ abstract class ModeleNumRefSupplierProposal return $langs->trans("NotAvailable"); } } - - -/** - * Create a document onto disk according to template module. - * - * @param DoliDB $db Database handler - * @param SupplierProposal $object Object supplier_proposal - * @param string $modele Force model to use ('' to not force) - * @param Translate $outputlangs Object langs to use for output - * @param int $hidedetails Hide details of lines - * @param int $hidedesc Hide description - * @param int $hideref Hide ref - * @return int 0 if KO, 1 if OK - * @deprecated Use the new function generateDocument of SupplierProposal class - * @see SupplierProposal::generateDocument() - */ -function supplier_proposal_pdf_create(DoliDB $db, SupplierProposal $object, $modele, $outputlangs, $hidedetails=0, $hidedesc=0, $hideref=0) -{ - dol_syslog(__METHOD__ . " is deprecated", LOG_WARNING); - - return $object->generateDocument($modele, $outputlangs, $hidedetails, $hidedesc, $hideref); -} -