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

Fix: Parametre facultatif

Browse Source
This commit is contained in:
Laurent Destailleur 2006-09-13 22:04:43 +00:00
parent f9d90c3908
commit 0b71693c07
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
htdocs/fourn/fournisseur.facture.class.php
View File

@ -206,7 +206,7 @@ class FactureFournisseur extends Facture
/* /*
* Lignes * Lignes
*/ */
$sql = 'SELECT rowid,description, pu_ht, qty, tva_taux, tva, total_ht, total_ttc'; $sql = 'SELECT rowid, description, pu_ht, qty, tva_taux, tva, total_ht, total_ttc';
$sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det'; $sql .= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det';
$sql .= ' WHERE fk_facture_fourn='.$this->id; $sql .= ' WHERE fk_facture_fourn='.$this->id;
$resql_rows = $this->db->query($sql); $resql_rows = $this->db->query($sql);
@ -218,15 +218,16 @@ class FactureFournisseur extends Facture
{ {
while ($i < $num_rows) while ($i < $num_rows)
{ {
$obj = $this->db->fetch_object(); $obj = $this->db->fetch_object($resql_rows);
$this->lignes[$i][0] = stripslashes($obj->description); $this->lignes[$i][0] = $obj->description;
$this->lignes[$i][1] = $obj->pu_ht; $this->lignes[$i][1] = $obj->pu_ht;
$this->lignes[$i][2] = $obj->tva_tx; $this->lignes[$i][2] = $obj->tva_taux;
$this->lignes[$i][3] = $obj->qty; $this->lignes[$i][3] = $obj->qty;
$this->lignes[$i][4] = $obj->total_ht; $this->lignes[$i][4] = $obj->total_ht;
$this->lignes[$i][5] = $obj->tva; $this->lignes[$i][5] = $obj->tva;
$this->lignes[$i][6] = $obj->total_ttc; $this->lignes[$i][6] = $obj->total_ttc;
$this->lignes[$i][7] = $obj->rowid; $this->lignes[$i][7] = $obj->rowid;
$this->lignes[$i][8] = $obj->total_ht;
$i++; $i++;
} }
} }
@ -371,14 +372,15 @@ class FactureFournisseur extends Facture
/** /**
* \brief Mets à jour une ligne de facture * \brief Mets à jour une ligne de facture
* \param id id de la ligne de facture * \param id Id de la ligne de facture
* \param label description de la ligne * \param label Description de la ligne
* \param puht prix unitaire * \param puht Prix unitaire
* \param tauxtva taux tva * \param tauxtva Taux tva
* \param qty quantité * \param qty Quantité
* \return int <0 si ko, >0 si ok * \param idproduct Id produit
* \return int <0 si ko, >0 si ok
*/ */
function updateline($id, $label, $puht, $tauxtva, $qty=1, $idproduct) function updateline($id, $label, $puht, $tauxtva, $qty=1, $idproduct=0)
{ {
$puht = price2num($puht); $puht = price2num($puht);
$qty = price2num($qty); $qty = price2num($qty);