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

Fix: uniformise and clean code

Browse Source
This commit is contained in:
Regis Houssin 2010-03-11 10:40:58 +00:00
parent 92cfaa42d3
commit 2dc31fa613
9 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/commande/commande.class.php
View File

@ -2248,7 +2248,6 @@ class Commande extends CommonObject
$line->total_ht=100; $line->total_ht=100;
$line->total_ttc=119.6; $line->total_ttc=119.6;
$line->total_tva=19.6; $line->total_tva=19.6;
$line->produit_id=$prodids[$prodid];
$line->fk_product=$prodids[$prodid]; $line->fk_product=$prodids[$prodid];
$this->lignes[$xnbp]=$line; // TODO: deprecated $this->lignes[$xnbp]=$line; // TODO: deprecated
@ -2388,7 +2387,6 @@ class OrderLine
$this->remise = $objp->remise; $this->remise = $objp->remise;
$this->remise_percent = $objp->remise_percent; $this->remise_percent = $objp->remise_percent;
$this->fk_remise_except = $objp->fk_remise_except; $this->fk_remise_except = $objp->fk_remise_except;
$this->produit_id = $objp->fk_product;
$this->fk_product = $objp->fk_product; $this->fk_product = $objp->fk_product;
$this->product_type = $objp->product_type; $this->product_type = $objp->product_type;
$this->info_bits = $objp->info_bits; $this->info_bits = $objp->info_bits;

1
htdocs/compta/facture/facture-rec.class.php
View File

@ -329,7 +329,6 @@ class FactureRec extends Facture
$faclig->tva_tx = $objp->tva_tx; $faclig->tva_tx = $objp->tva_tx;
$faclig->remise_percent = $objp->remise_percent; $faclig->remise_percent = $objp->remise_percent;
$faclig->fk_remise_except = $objp->fk_remise_except; $faclig->fk_remise_except = $objp->fk_remise_except;
$faclig->produit_id = $objp->fk_product;
$faclig->fk_product = $objp->fk_product; $faclig->fk_product = $objp->fk_product;
$faclig->date_start = $objp->date_start; $faclig->date_start = $objp->date_start;
$faclig->date_end = $objp->date_end; $faclig->date_end = $objp->date_end;

12
htdocs/facture.class.php
View File

@ -305,10 +305,10 @@ class Facture extends CommonObject
{ {
foreach ($_facrec->lignes as $i => $val) foreach ($_facrec->lignes as $i => $val)
{ {
if ($_facrec->lignes[$i]->produit_id) if ($_facrec->lignes[$i]->fk_product)
{ {
$prod = new Product($this->db, $_facrec->lignes[$i]->produit_id); $prod = new Product($this->db, $_facrec->lignes[$i]->fk_product);
$res=$prod->fetch($_facrec->lignes[$i]->produit_id); $res=$prod->fetch($_facrec->lignes[$i]->fk_product);
} }
$tva_tx = get_default_tva($mysoc,$soc,($prod->tva_tx?$prod->tva_tx:0)); $tva_tx = get_default_tva($mysoc,$soc,($prod->tva_tx?$prod->tva_tx:0));
@ -318,7 +318,7 @@ class Facture extends CommonObject
$_facrec->lignes[$i]->subprice, $_facrec->lignes[$i]->subprice,
$_facrec->lignes[$i]->qty, $_facrec->lignes[$i]->qty,
$tva_tx, $tva_tx,
$_facrec->lignes[$i]->produit_id, $_facrec->lignes[$i]->fk_product,
$_facrec->lignes[$i]->remise_percent, $_facrec->lignes[$i]->remise_percent,
'','',0,0,'','HT',0, '','',0,0,'','HT',0,
$_facrec->lignes[$i]->product_type $_facrec->lignes[$i]->product_type
@ -697,7 +697,6 @@ class Facture extends CommonObject
$faclig->tva_tx = $objp->tva_tx; $faclig->tva_tx = $objp->tva_tx;
$faclig->remise_percent = $objp->remise_percent; $faclig->remise_percent = $objp->remise_percent;
$faclig->fk_remise_except = $objp->fk_remise_except; $faclig->fk_remise_except = $objp->fk_remise_except;
$faclig->produit_id = $objp->fk_product;
$faclig->fk_product = $objp->fk_product; $faclig->fk_product = $objp->fk_product;
$faclig->date_start = $this->db->jdate($objp->date_start); $faclig->date_start = $this->db->jdate($objp->date_start);
$faclig->date_end = $this->db->jdate($objp->date_end); $faclig->date_end = $this->db->jdate($objp->date_end);
@ -2789,7 +2788,7 @@ class Facture extends CommonObject
$ligne->total_ttc=107.64; // 90 * 1.196 $ligne->total_ttc=107.64; // 90 * 1.196
$ligne->total_tva=17.64; $ligne->total_tva=17.64;
$prodid = rand(1, $num_prods); $prodid = rand(1, $num_prods);
$ligne->produit_id=$prodids[$prodid]; $ligne->fk_product=$prodids[$prodid];
$this->lignes[$xnbp]=$ligne; $this->lignes[$xnbp]=$ligne;
$xnbp++; $xnbp++;
} }
@ -2933,7 +2932,6 @@ class FactureLigne
$this->tva_tx = $objp->tva_tx; $this->tva_tx = $objp->tva_tx;
$this->remise_percent = $objp->remise_percent; $this->remise_percent = $objp->remise_percent;
$this->fk_remise_except = $objp->fk_remise_except; $this->fk_remise_except = $objp->fk_remise_except;
$this->produit_id = $objp->fk_product; // Ne plus utiliser
$this->fk_product = $objp->fk_product; $this->fk_product = $objp->fk_product;
$this->product_type = $objp->product_type; $this->product_type = $objp->product_type;
$this->date_start = $this->db->jdate($objp->date_start); $this->date_start = $this->db->jdate($objp->date_start);

2
htdocs/fichinter/fichinter.class.php
View File

@ -756,7 +756,7 @@ class Fichinter extends CommonObject
$ligne->price=100; $ligne->price=100;
$ligne->tva_tx=19.6; $ligne->tva_tx=19.6;
$prodid = rand(1, $num_prods); $prodid = rand(1, $num_prods);
$ligne->produit_id=$prodids[$prodid]; $ligne->fk_product=$prodids[$prodid];
$this->lignes[$xnbp]=$ligne; $this->lignes[$xnbp]=$ligne;
$xnbp++; $xnbp++;
} }

4
htdocs/fourn/fournisseur.commande.class.php
View File

@ -1445,7 +1445,7 @@ class CommandeFournisseur extends Commande
$ligne->tva_tx=19.6; $ligne->tva_tx=19.6;
$ligne->ref_fourn='SUPPLIER_REF_'.$xnbp; $ligne->ref_fourn='SUPPLIER_REF_'.$xnbp;
$prodid = rand(1, $num_prods); $prodid = rand(1, $num_prods);
$ligne->produit_id=$prodids[$prodid]; $ligne->fk_product=$prodids[$prodid];
$this->lignes[$xnbp]=$ligne; $this->lignes[$xnbp]=$ligne;
$xnbp++; $xnbp++;
} }
@ -1517,7 +1517,7 @@ class CommandeFournisseurLigne extends OrderLine
$this->tva_tx = $objp->tva_tx; $this->tva_tx = $objp->tva_tx;
$this->remise = $objp->remise; $this->remise = $objp->remise;
$this->remise_percent = $objp->remise_percent; $this->remise_percent = $objp->remise_percent;
$this->produit_id = $objp->fk_product; $this->fk_product = $objp->fk_product;
$this->info_bits = $objp->info_bits; $this->info_bits = $objp->info_bits;
$this->total_ht = $objp->total_ht; $this->total_ht = $objp->total_ht;
$this->total_tva = $objp->total_tva; $this->total_tva = $objp->total_tva;

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

@ -1024,7 +1024,7 @@ class FactureFournisseur extends Facture
$ligne->price=100; $ligne->price=100;
$ligne->tva_tx=19.6; $ligne->tva_tx=19.6;
$prodid = rand(1, $num_prods); $prodid = rand(1, $num_prods);
$ligne->produit_id=$prodids[$prodid]; $ligne->fk_product=$prodids[$prodid];
$ligne->product_type=0; $ligne->product_type=0;
$this->lignes[$xnbp]=$ligne; $this->lignes[$xnbp]=$ligne;

2
htdocs/lib/pdf.lib.php
View File

@ -239,7 +239,7 @@ function pdf_getlinedesc($line,$outputlangs,$hideref=0,$hidedesc=0,$issupplierli
{ {
global $db, $conf, $langs; global $db, $conf, $langs;
$idprod=$line->fk_product; if (empty($idprod)) $idprod=$line->produit_id; $idprod=$line->fk_product;
$label=$line->label; if (empty($label)) $label=$line->libelle; $label=$line->label; if (empty($label)) $label=$line->libelle;
$desc=$line->desc; if (empty($desc)) $desc=$line->description; $desc=$line->desc; if (empty($desc)) $desc=$line->description;
$ref_supplier=$line->ref_supplier; if (empty($ref_supplier)) $ref_supplier=$line->ref_fourn; // TODO Not yeld saved for supplier invoices, only supplier orders $ref_supplier=$line->ref_supplier; if (empty($ref_supplier)) $ref_supplier=$line->ref_fourn; // TODO Not yeld saved for supplier invoices, only supplier orders

8
htdocs/projet/project.class.php
View File

@ -663,11 +663,11 @@ class Project extends CommonObject
$xnbp = 0; $xnbp = 0;
while ($xnbp < $nbp) while ($xnbp < $nbp)
{ {
$ligne=new Task($this->db); $line=new Task($this->db);
$ligne->desc=$langs->trans("Description")." ".$xnbp; $line->desc=$langs->trans("Description")." ".$xnbp;
$ligne->qty=1; $line->qty=1;
$prodid = rand(1, $num_prods); $prodid = rand(1, $num_prods);
$ligne->produit_id=$prodids[$prodid]; $line->fk_product=$prodids[$prodid];
$xnbp++; $xnbp++;
} }
} }

4
htdocs/propal.class.php
View File

@ -1958,7 +1958,7 @@ class Propal extends CommonObject
$ligne->total_ttc=119.6; $ligne->total_ttc=119.6;
$ligne->total_tva=19.6; $ligne->total_tva=19.6;
$prodid = rand(1, $num_prods); $prodid = rand(1, $num_prods);
$ligne->produit_id=$prodids[$prodid]; $ligne->fk_product=$prodids[$prodid];
$this->lignes[$xnbp]=$ligne; $this->lignes[$xnbp]=$ligne;
$xnbp++; $xnbp++;
} }
@ -2197,7 +2197,7 @@ class PropaleLigne
$this->remise = $objp->remise; $this->remise = $objp->remise;
$this->remise_percent = $objp->remise_percent; $this->remise_percent = $objp->remise_percent;
$this->fk_remise_except = $objp->fk_remise_except; $this->fk_remise_except = $objp->fk_remise_except;
$this->produit_id = $objp->fk_product; $this->fk_product = $objp->fk_product;
$this->info_bits = $objp->info_bits; $this->info_bits = $objp->info_bits;
$this->total_ht = $objp->total_ht; $this->total_ht = $objp->total_ht;