Fix: Il fallait générer 2 fois le document quand on changeait de modèle

This commit is contained in:
Laurent Destailleur 2006-07-13 14:31:41 +00:00
parent 0cb701b682
commit ceb10ce850
3 changed files with 72 additions and 69 deletions

View File

@ -933,10 +933,11 @@ class Commande extends CommonObject
} }
} }
/*
* /**
* * \brief Positionne modele derniere generation
* * \param user Objet use qui modifie
* \param modelpdf Nom du modele
*/ */
function set_pdf_model($user, $modelpdf) function set_pdf_model($user, $modelpdf)
{ {
@ -948,6 +949,7 @@ class Commande extends CommonObject
if ($this->db->query($sql) ) if ($this->db->query($sql) )
{ {
$this->modelpdf=$modelpdf;
return 1; return 1;
} }
else else

View File

@ -1030,22 +1030,22 @@ class Facture extends CommonObject
} }
} }
/*
*
*
*
*/
/**
* \brief Positionne modele derniere generation
* \param user Objet use qui modifie
* \param modelpdf Nom du modele
*/
function set_pdf_model($user, $modelpdf) function set_pdf_model($user, $modelpdf)
{ {
if ($user->rights->facture->creer) if ($user->rights->facture->creer)
{ {
$sql = "UPDATE ".MAIN_DB_PREFIX."facture SET model_pdf = '$modelpdf'"; $sql = "UPDATE ".MAIN_DB_PREFIX."facture SET model_pdf = '$modelpdf'";
$sql .= " WHERE rowid = $this->id AND fk_statut < 2 ;"; $sql .= " WHERE rowid = $this->id AND fk_statut < 2 ;";
if ($this->db->query($sql) ) if ($this->db->query($sql) )
{ {
$this->modelpdf=$modelpdf;
return 1; return 1;
} }
else else

View File

@ -780,9 +780,9 @@ class CommandeFournisseur extends Commande
} }
/** /**
* * \brief Positionne modele derniere generation
* * \param user Objet use qui modifie
* * \param modelpdf Nom du modele
*/ */
function set_pdf_model($user, $modelpdf) function set_pdf_model($user, $modelpdf)
{ {
@ -794,6 +794,7 @@ class CommandeFournisseur extends Commande
if ($this->db->query($sql) ) if ($this->db->query($sql) )
{ {
$this->modelpdf=$modelpdf;
return 1; return 1;
} }
else else