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

Doc: Mise a jour doc doxygen

Browse Source
This commit is contained in:
Laurent Destailleur 2006-01-08 18:16:30 +00:00
parent 4b3dbfab67
commit e836f51c9c
2 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/facture.class.php
View File

@ -2055,8 +2055,19 @@ class Facture
class FactureLigne class FactureLigne
{ {
var $subprice; // Prix unitaire HT // From llx_facturedet
var $price; // Prix HT apres remise % var $desc = $objp->description;
var $qty = $objp->qty;
var $price = $objp->price; // Prix HT apres remise %
var $price_ttc = $objp->price_ttc;
var $subprice = $objp->subprice; // Prix unitaire HT
var $tva_taux = $objp->tva_taux;
var $remise = $objp->remise;
var $remise_percent = $objp->remise_percent;
var $produit_id = $objp->fk_product;
var $date_start = $objp->date_start;
var $date_end = $objp->date_end;
/** /**
* \brief Constructeur d'objets ligne de facture * \brief Constructeur d'objets ligne de facture

39
htdocs/propal.class.php
View File

@ -524,10 +524,11 @@ class Propal
/* /*
* Lignes propales liées à un produit * Lignes propales liées à un produit
*/ */
$sql = "SELECT d.description, p.rowid, p.label, p.description as product_desc, p.ref, d.price, d.tva_tx, d.qty, d.remise_percent, d.subprice"; $sql = "SELECT d.description, d.price, d.tva_tx, d.qty, d.remise_percent, d.subprice,";
$sql .= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."product as p"; $sql.= " p.rowid, p.label, p.description as product_desc, p.ref";
$sql .= " WHERE d.fk_propal = ".$this->id ." AND d.fk_product = p.rowid"; $sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d, ".MAIN_DB_PREFIX."product as p";
$sql .= " ORDER by d.rowid ASC"; $sql.= " WHERE d.fk_propal = ".$this->id ." AND d.fk_product = p.rowid";
$sql.= " ORDER by d.rowid ASC";
$result = $this->db->query($sql); $result = $this->db->query($sql);
if ($result) if ($result)
@ -540,16 +541,18 @@ class Propal
$objp = $this->db->fetch_object($result); $objp = $this->db->fetch_object($result);
$ligne = new PropaleLigne(); $ligne = new PropaleLigne();
$ligne->desc = $objp->description; // Description ligne $ligne->desc = $objp->description; // Description ligne
$ligne->libelle = $objp->label; // Label produit
$ligne->product_desc = $objp->product_desc; // Description produit
$ligne->qty = $objp->qty; $ligne->qty = $objp->qty;
$ligne->ref = $objp->ref;
$ligne->tva_tx = $objp->tva_tx; $ligne->tva_tx = $objp->tva_tx;
$ligne->subprice = $objp->subprice; $ligne->subprice = $objp->subprice;
$ligne->remise_percent = $objp->remise_percent; $ligne->remise_percent = $objp->remise_percent;
$ligne->price = $objp->price; $ligne->price = $objp->price;
$ligne->product_id = $objp->rowid; $ligne->product_id = $objp->rowid;
$ligne->libelle = $objp->label; // Label produit
$ligne->product_desc = $objp->product_desc; // Description produit
$ligne->ref = $objp->ref;
$this->lignes[$i] = $ligne; $this->lignes[$i] = $ligne;
//dolibarr_syslog("1 ".$ligne->desc); //dolibarr_syslog("1 ".$ligne->desc);
@ -580,16 +583,20 @@ class Propal
while ($j < $num) while ($j < $num)
{ {
$objp = $this->db->fetch_object($result); $objp = $this->db->fetch_object($result);
$ligne = new PropaleLigne(); $ligne = new PropaleLigne();
$ligne->libelle = $objp->description;
$ligne->desc = $objp->description; $ligne->desc = $objp->description;
$ligne->qty = $objp->qty; $ligne->qty = $objp->qty;
$ligne->ref = $objp->ref;
$ligne->tva_tx = $objp->tva_tx; $ligne->tva_tx = $objp->tva_tx;
$ligne->subprice = $objp->subprice; $ligne->subprice = $objp->subprice;
$ligne->remise_percent = $objp->remise_percent; $ligne->remise_percent = $objp->remise_percent;
$ligne->price = $objp->price; $ligne->price = $objp->price;
$ligne->product_id = 0; $ligne->product_id = 0;
$ligne->libelle = $objp->description;
$ligne->product_desc = '';
$ligne->ref = '';
$this->lignes[$i] = $ligne; $this->lignes[$i] = $ligne;
$i++; $i++;
@ -1243,6 +1250,20 @@ class Propal
class PropaleLigne class PropaleLigne
{ {
// From llx_propaldet
var $qty;
var $tva_tx;
var $subprice;
var $remise_percent;
var $price;
var $product_id;
var $desc; // Description ligne
// From llx_product
var $libelle; // Label produit
var $product_desc; // Description produit
var $ref;
function PropaleLigne() function PropaleLigne()
{ {
} }