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

Uniformisation et simplification du code de gestion des lignes facture, propal, commande pour faciliter dev des avoirs

Browse Source
This commit is contained in:
Laurent Destailleur 2006-09-09 13:32:54 +00:00
parent 972b810379
commit 525a93b2a4
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -527,9 +527,8 @@ class Commande extends CommonObject
$total_tva = $tabprice[1]; $total_tva = $tabprice[1];
$total_ttc = $tabprice[2]; $total_ttc = $tabprice[2];
// Anciens indicateurs: $price, $subprice, $remise (a ne plus utiliser) // Anciens indicateurs: $price, $remise (a ne plus utiliser)
$price = $pu; $price = $pu;
$subprice = $pu;
if ($remise_percent > 0) if ($remise_percent > 0)
{ {
$remise = round(($pu * $remise_percent / 100), 2); $remise = round(($pu * $remise_percent / 100), 2);
@ -542,19 +541,21 @@ class Commande extends CommonObject
$ligne->fk_commande=$commandeid; $ligne->fk_commande=$commandeid;
$ligne->libelle=$libelle; $ligne->libelle=$libelle;
$ligne->desc=$desc; $ligne->desc=$desc;
$ligne->price=$price;
$ligne->qty=$qty; $ligne->qty=$qty;
$ligne->tva_tx=$txtva; $ligne->tva_tx=$txtva;
$ligne->fk_product=$fk_product; $ligne->fk_product=$fk_product;
$ligne->remise_percent=$remise_percent; $ligne->remise_percent=$remise_percent;
$ligne->subprice=$subprice; $ligne->subprice=$pu;
$ligne->remise=$remise;
$ligne->rang=-1; $ligne->rang=-1;
$ligne->info_bits=$info_bits; $ligne->info_bits=$info_bits;
$ligne->total_ht=$total_ht; $ligne->total_ht=$total_ht;
$ligne->total_tva=$total_tva; $ligne->total_tva=$total_tva;
$ligne->total_ttc=$total_ttc; $ligne->total_ttc=$total_ttc;
// Ne plus utiliser
$ligne->price=$price;
$ligne->remise=$remise;
$result=$ligne->insert(); $result=$ligne->insert();
if ($result > 0) if ($result > 0)
{ {

11
htdocs/propal.class.php
View File

@ -272,9 +272,8 @@ class Propal extends CommonObject
$total_tva = $tabprice[1]; $total_tva = $tabprice[1];
$total_ttc = $tabprice[2]; $total_ttc = $tabprice[2];
// Anciens indicateurs: $price, $subprice, $remise (a ne plus utiliser) // Anciens indicateurs: $price, $remise (a ne plus utiliser)
$price = $pu; $price = $pu;
$subprice = $pu;
if ($remise_percent > 0) if ($remise_percent > 0)
{ {
$remise = round(($pu * $remise_percent / 100), 2); $remise = round(($pu * $remise_percent / 100), 2);
@ -286,19 +285,21 @@ class Propal extends CommonObject
$ligne->fk_propal=$propalid; $ligne->fk_propal=$propalid;
$ligne->desc=$desc; $ligne->desc=$desc;
$ligne->price=$price;
$ligne->qty=$qty; $ligne->qty=$qty;
$ligne->tva_tx=$txtva; $ligne->tva_tx=$txtva;
$ligne->fk_product=$fk_product; $ligne->fk_product=$fk_product;
$ligne->remise_percent=$remise_percent; $ligne->remise_percent=$remise_percent;
$ligne->subprice=$subprice; $ligne->subprice=$pu;
$ligne->remise=$remise;
$ligne->rang=-1; $ligne->rang=-1;
$ligne->info_bits=$info_bits; $ligne->info_bits=$info_bits;
$ligne->total_ht=$total_ht; $ligne->total_ht=$total_ht;
$ligne->total_tva=$total_tva; $ligne->total_tva=$total_tva;
$ligne->total_ttc=$total_ttc; $ligne->total_ttc=$total_ttc;
// Ne plus utiliser
$ligne->price=$price;
$ligne->remise=$remise;
$result=$ligne->insert(); $result=$ligne->insert();
if ($result > 0) if ($result > 0)
{ {