diff --git a/htdocs/includes/modules/facture/modules_facture.php b/htdocs/includes/modules/facture/modules_facture.php index c9f900ade1d..e6849f179b8 100644 --- a/htdocs/includes/modules/facture/modules_facture.php +++ b/htdocs/includes/modules/facture/modules_facture.php @@ -135,7 +135,7 @@ class ModeleNumRefFactures /** * \brief Cree un facture sur disque en fonction du modele de FACTURE_ADDON_PDF * \param db objet base de donnee - * \param id id de la facture a creer + * \param id Object invoice (or id of invoice) * \param message message * \param modele force le modele a utiliser ('' to not force) * \param outputlangs objet lang a utiliser pour traduction @@ -178,10 +178,20 @@ function facture_pdf_create($db, $id, $message, $modele, $outputlangs) $sav_charset_output=$outputlangs->charset_output; if ($obj->write_file($id, $outputlangs) > 0) { - // Success in building document. We build meta file. - facture_meta_create($db, $id); - // et on supprime l'image correspondant au preview - facture_delete_preview($db, $id); + if (! is_object($id)) // Old method + { + // Success in building document. We build meta file. + facture_meta_create($db, $id); + // et on supprime l'image correspondant au preview + facture_delete_preview($db, $id); + } + else + { + // Success in building document. We build meta file. + facture_meta_create($db, $id->id); + // et on supprime l'image correspondant au preview + facture_delete_preview($db, $id->id); + } $outputlangs->charset_output=$sav_charset_output; return 1; diff --git a/htdocs/includes/modules/facture/pdf_crabe.modules.php b/htdocs/includes/modules/facture/pdf_crabe.modules.php index 86e64e3efd0..79f3a628750 100644 --- a/htdocs/includes/modules/facture/pdf_crabe.modules.php +++ b/htdocs/includes/modules/facture/pdf_crabe.modules.php @@ -101,7 +101,7 @@ class pdf_crabe extends ModelePDFFactures /** * \brief Fonction generant la facture sur le disque - * \param fac Objet facture a generer (ou id si ancienne methode) + * \param fac Objet invoice to build (or id if old method) * \param outputlangs Lang object for output language * \return int 1=ok, 0=ko */ @@ -125,7 +125,7 @@ class pdf_crabe extends ModelePDFFactures if (! is_object($fac)) { $id = $fac; - $fac = new Facture($this->db,"",$id); + $fac = new Facture($this->db); $ret=$fac->fetch($id); } @@ -147,7 +147,6 @@ class pdf_crabe extends ModelePDFFactures $dir = $conf->facture->dir_output . "/" . $facref; $file = $dir . "/" . $facref . ".pdf"; } - if (! file_exists($dir)) { if (create_exdir($dir) < 0) diff --git a/htdocs/includes/modules/facture/pdf_oursin.modules.php b/htdocs/includes/modules/facture/pdf_oursin.modules.php index 26b3e103e53..586d41aed36 100644 --- a/htdocs/includes/modules/facture/pdf_oursin.modules.php +++ b/htdocs/includes/modules/facture/pdf_oursin.modules.php @@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php"); /** \class pdf_oursin - \brief Classe permettant de g�n�rer les factures au mod�le oursin + \brief Classe permettant de generer les factures au modele oursin */ class pdf_oursin extends ModelePDFFactures @@ -43,8 +43,8 @@ class pdf_oursin extends ModelePDFFactures var $marges=array("g"=>10,"h"=>5,"d"=>10,"b"=>15); /** - \brief Constructeur - \param db handler acc�s base de donn�e + * \brief Constructeur + * \param db Database handler */ function pdf_oursin($db) { @@ -101,7 +101,7 @@ class pdf_oursin extends ModelePDFFactures /** * \brief Fonction generant la facture sur le disque - * \param fac Objet facture a generer (ou id si ancienne methode) + * \param fac Objet invoice to build (or id if old method) * \param outputlangs Lang object for output language * \return int 1=ok, 0=ko */ @@ -125,7 +125,7 @@ class pdf_oursin extends ModelePDFFactures if (! is_object($fac)) { $id = $fac; - $fac = new Facture($this->db,"",$id); + $fac = new Facture($this->db); $ret=$fac->fetch($id); } $fac->fetch_client();