lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uniformise code

Browse Source
This commit is contained in:
Laurent Destailleur 2010-05-08 18:37:34 +00:00
parent 33d88a661f
commit c363bba06e
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
htdocs/includes/modules/facture/modules_facture.php
View File

@ -135,7 +135,7 @@ class ModeleNumRefFactures
/** /**
* \brief Cree un facture sur disque en fonction du modele de FACTURE_ADDON_PDF * \brief Cree un facture sur disque en fonction du modele de FACTURE_ADDON_PDF
* \param db objet base de donnee * \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 message message
* \param modele force le modele a utiliser ('' to not force) * \param modele force le modele a utiliser ('' to not force)
* \param outputlangs objet lang a utiliser pour traduction * \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; $sav_charset_output=$outputlangs->charset_output;
if ($obj->write_file($id, $outputlangs) > 0) if ($obj->write_file($id, $outputlangs) > 0)
{ {
// Success in building document. We build meta file. if (! is_object($id)) // Old method
facture_meta_create($db, $id); {
// et on supprime l'image correspondant au preview // Success in building document. We build meta file.
facture_delete_preview($db, $id); 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; $outputlangs->charset_output=$sav_charset_output;
return 1; return 1;

5
htdocs/includes/modules/facture/pdf_crabe.modules.php
View File

@ -101,7 +101,7 @@ class pdf_crabe extends ModelePDFFactures
/** /**
* \brief Fonction generant la facture sur le disque * \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 * \param outputlangs Lang object for output language
* \return int 1=ok, 0=ko * \return int 1=ok, 0=ko
*/ */
@ -125,7 +125,7 @@ class pdf_crabe extends ModelePDFFactures
if (! is_object($fac)) if (! is_object($fac))
{ {
$id = $fac; $id = $fac;
$fac = new Facture($this->db,"",$id); $fac = new Facture($this->db);
$ret=$fac->fetch($id); $ret=$fac->fetch($id);
} }
@ -147,7 +147,6 @@ class pdf_crabe extends ModelePDFFactures
$dir = $conf->facture->dir_output . "/" . $facref; $dir = $conf->facture->dir_output . "/" . $facref;
$file = $dir . "/" . $facref . ".pdf"; $file = $dir . "/" . $facref . ".pdf";
} }
if (! file_exists($dir)) if (! file_exists($dir))
{ {
if (create_exdir($dir) < 0) if (create_exdir($dir) < 0)

10
htdocs/includes/modules/facture/pdf_oursin.modules.php
View File

@ -34,7 +34,7 @@ require_once(DOL_DOCUMENT_ROOT."/lib/company.lib.php");
/** /**
\class pdf_oursin \class pdf_oursin
\brief Classe permettant de g<EFBFBD>n<EFBFBD>rer les factures au mod<EFBFBD>le oursin \brief Classe permettant de generer les factures au modele oursin
*/ */
class pdf_oursin extends ModelePDFFactures 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); var $marges=array("g"=>10,"h"=>5,"d"=>10,"b"=>15);
/** /**
\brief Constructeur * \brief Constructeur
\param db handler acc<EFBFBD>s base de donn<EFBFBD>e * \param db Database handler
*/ */
function pdf_oursin($db) function pdf_oursin($db)
{ {
@ -101,7 +101,7 @@ class pdf_oursin extends ModelePDFFactures
/** /**
* \brief Fonction generant la facture sur le disque * \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 * \param outputlangs Lang object for output language
* \return int 1=ok, 0=ko * \return int 1=ok, 0=ko
*/ */
@ -125,7 +125,7 @@ class pdf_oursin extends ModelePDFFactures
if (! is_object($fac)) if (! is_object($fac))
{ {
$id = $fac; $id = $fac;
$fac = new Facture($this->db,"",$id); $fac = new Facture($this->db);
$ret=$fac->fetch($id); $ret=$fac->fetch($id);
} }
$fac->fetch_client(); $fac->fetch_client();