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

Fix: renommage du champ "coef" en "marge_tx" (marge sur prix d'achat)

Browse Source 
ajout du champ "marque_tx" (marge sur prix de vente)
This commit is contained in:
Regis Houssin 2007-07-25 14:46:21 +00:00
parent 7723240d10
commit ff861a24ea
4 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1104,7 +1104,7 @@ class Commande extends CommonObject
function fetch_lines($only_product=0)
{
$sql = 'SELECT l.rowid, l.fk_product, l.fk_commande, l.description, l.price, l.qty, l.tva_tx,';
$sql.= ' l.fk_remise_except, l.remise_percent, l.subprice, l.coef, l.rang, l.info_bits,';
$sql.= ' l.fk_remise_except, l.remise_percent, l.subprice, l.marge_tx, l.marque_tx, l.rang, l.info_bits,';
$sql.= ' l.total_ht, l.total_ttc, l.total_tva,';
$sql.= ' p.ref as product_ref, p.description as product_desc, p.fk_product_type, p.label';
$sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as l';
@ -1138,7 +1138,8 @@ class Commande extends CommonObject
$ligne->remise_percent = $objp->remise_percent;
$ligne->price = $objp->price;
$ligne->fk_product = $objp->fk_product;
$ligne->coef = $objp->coef;
$ligne->marge_tx = $objp->marge_tx;
$ligne->marque_tx = $objp->marque_tx;
$ligne->rang = $objp->rang;
$ligne->info_bits = $objp->info_bits;
@ -2327,7 +2328,8 @@ class CommandeLigne
var $subprice;
var $remise_percent;
var $rang = 0;
var $coef;
var $marge_tx;
var $marque_tx;
var $info_bits = 0; // Bit 0: 0 si TVA normal - 1 si TVA NPR
// Bit 1: 0 ligne normale - 1 si ligne de remise fixe
var $total_ht; // Total HT de la ligne toute quantité et incluant la remise ligne
@ -2361,7 +2363,7 @@ class CommandeLigne
{
$sql = 'SELECT cd.rowid, cd.fk_commande, cd.fk_product, cd.description, cd.price, cd.qty, cd.tva_tx,';
$sql.= ' cd.remise, cd.remise_percent, cd.fk_remise_except, cd.subprice,';
$sql.= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_ttc, cd.coef, cd.rang,';
$sql.= ' cd.info_bits, cd.total_ht, cd.total_tva, cd.total_ttc, cd.marge_tx, cd.marque_tx, cd.rang,';
$sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc';
$sql.= ' FROM '.MAIN_DB_PREFIX.'commandedet as cd';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON cd.fk_product = p.rowid';
@ -2385,7 +2387,8 @@ class CommandeLigne
$this->total_ht = $objp->total_ht;
$this->total_tva = $objp->total_tva;
$this->total_ttc = $objp->total_ttc;
$this->coef = $objp->coef;
$this->marge_tx = $objp->marge_tx;
$this->marque_tx = $objp->marque_tx;
$this->rang = $objp->rang;
$this->ref = $objp->product_ref;
@ -2465,7 +2468,7 @@ class CommandeLigne
$sql = 'INSERT INTO '.MAIN_DB_PREFIX.'commandedet';
$sql.= ' (fk_commande, description, price, qty, tva_tx,';
$sql.= ' fk_product, remise_percent, subprice, remise, fk_remise_except, ';
$sql.= ' rang, coef,';
$sql.= ' rang, marge_tx, marque_tx,';
$sql.= ' info_bits, total_ht, total_tva, total_ttc)';
$sql.= " VALUES (".$this->fk_commande.",";
$sql.= " '".addslashes($this->desc)."',";
@ -2480,7 +2483,9 @@ class CommandeLigne
if ($this->fk_remise_except) $sql.= $this->fk_remise_except.",";
else $sql.= 'null,';
$sql.= ' '.$rangtouse.',';
if (isset($this->coef)) $sql.= ' '.$this->coef.',';
if (isset($this->marge_tx)) $sql.= ' '.$this->marge_tx.',';
else $sql.= ' null,';
if (isset($this->marque_tx)) $sql.= ' '.$this->marque_tx.',';
else $sql.= ' null,';
$sql.= " '".$this->info_bits."',";
$sql.= " '".price2num($this->total_ht)."',";

4
htdocs/includes/triggers/interface_ecotax.class.php-NORUN
View File

@ -242,7 +242,7 @@ class InterfaceEcotax
$sql = "INSERT INTO ".MAIN_DB_PREFIX."commandedet";
$sql.= " (fk_commande, description, qty, tva_tx,";
$sql.= " fk_product, remise_percent, subprice, price, remise, fk_remise_except,";
$sql.= " coef,rang,info_bits, total_ht, total_tva, total_ttc,special_code)";
$sql.= " marge_tx, marque_tx, rang, info_bits, total_ht, total_tva, total_ttc, special_code)";
$sql.= " VALUES (".$object->fk_commande.",";
$sql.= " '".addslashes($desc)."',";
$sql.= " '1',";
@ -251,7 +251,7 @@ class InterfaceEcotax
$sql.= " '0',";
$sql.= " '".price2num($total_ht)."',";
$sql.= " '".price2num($total_ht)."',";
$sql.= " 0,0,0,";
$sql.= " 0,0,0,0,";
$sql.= ' '.$rang.',0,';
$sql.= " '".price2num($total_ht)."',";
$sql.= " '".price2num($total_tva)."',";

4
htdocs/includes/triggers/interface_fraisport.class.php-NORUN
View File

@ -235,7 +235,7 @@ class InterfaceFraisport
$sql = "INSERT INTO ".MAIN_DB_PREFIX."commandedet";
$sql.= " (fk_commande, description, qty, tva_tx,";
$sql.= " fk_product, remise_percent, subprice, price, remise, fk_remise_except,";
$sql.= " coef,rang,info_bits, total_ht, total_tva, total_ttc,special_code)";
$sql.= " marge_tx, marque_tx, rang, info_bits, total_ht, total_tva, total_ttc, special_code)";
$sql.= " VALUES (".$object->fk_commande.",";
$sql.= " '".addslashes($desc)."',";
$sql.= " '1',";
@ -244,7 +244,7 @@ class InterfaceFraisport
$sql.= " '0',";
$sql.= " '".price2num($total_ht)."',";
$sql.= " '".price2num($total_ht)."',";
$sql.= " 0,0,0,";
$sql.= " 0,0,0,0,";
$sql.= ' '.$rang.',0,';
$sql.= " '".price2num($total_ht)."',";
$sql.= " '".price2num($total_tva)."',";

22
htdocs/propal.class.php
View File

@ -855,7 +855,7 @@ class Propal extends CommonObject
* Lignes propales liées à un produit ou non
*/
$sql = "SELECT d.description, d.price, d.tva_tx, d.qty, d.fk_remise_except, d.remise_percent, d.subprice, d.fk_product,";
$sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_ttc, d.coef, d.rang,";
$sql.= " d.info_bits, d.total_ht, d.total_tva, d.total_ttc, d.marge_tx, d.marque_tx, d.rang,";
$sql.= " p.ref, p.label, p.description as product_desc";
$sql.= " FROM ".MAIN_DB_PREFIX."propaldet as d";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON d.fk_product = p.rowid";
@ -886,7 +886,8 @@ class Propal extends CommonObject
$ligne->total_ht = $objp->total_ht;
$ligne->total_tva = $objp->total_tva;
$ligne->total_ttc = $objp->total_ttc;
$ligne->coef = $objp->coef;
$ligne->marge_tx = $objp->marge_tx;
$ligne->marque_tx = $objp->marque_tx;
$ligne->rang = $objp->rang;
$ligne->fk_product = $objp->fk_product;
@ -2182,7 +2183,8 @@ class PropaleLigne
var $fk_remise_except;
var $rang = 0;
var $coef;
var $marge_tx;
var $marque_tx;
var $info_bits = 0; // Bit 0: 0 si TVA normal - 1 si TVA NPR
// Bit 1: 0 ligne normale - 1 si ligne de remise fixe
var $total_ht; // Total HT de la ligne toute quantité et incluant la remise ligne
@ -2216,7 +2218,7 @@ class PropaleLigne
{
$sql = 'SELECT pd.rowid, pd.fk_propal, pd.fk_product, pd.description, pd.price, pd.qty, pd.tva_tx,';
$sql.= ' pd.remise, pd.remise_percent, pd.fk_remise_except, pd.subprice,';
$sql.= ' pd.info_bits, pd.total_ht, pd.total_tva, pd.total_ttc, pd.coef, pd.rang,';
$sql.= ' pd.info_bits, pd.total_ht, pd.total_tva, pd.total_ttc, pd.marge_tx, pd.marque_tx, pd.rang,';
$sql.= ' p.ref as product_ref, p.label as product_libelle, p.description as product_desc';
$sql.= ' FROM '.MAIN_DB_PREFIX.'propaldet as pd';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON pd.fk_product = p.rowid';
@ -2240,7 +2242,8 @@ class PropaleLigne
$this->total_ht = $objp->total_ht;
$this->total_tva = $objp->total_tva;
$this->total_ttc = $objp->total_ttc;
$this->coef = $objp->coef;
$this->marge_tx = $objp->marge_tx;
$this->marque_tx = $objp->marque_tx;
$this->rang = $objp->rang;
$this->ref = $objp->product_ref;
@ -2292,7 +2295,7 @@ class PropaleLigne
$sql.= ' (fk_propal, description, fk_product, fk_remise_except, qty, tva_tx,';
$sql.= ' subprice, remise_percent, price, remise, ';
$sql.= ' info_bits, ';
$sql.= ' total_ht, total_tva, total_ttc, coef, rang)';
$sql.= ' total_ht, total_tva, total_ttc, marge_tx, marque_tx, rang)';
$sql.= " VALUES (".$this->fk_propal.",";
$sql.= " '".addslashes($this->desc)."',";
if ($this->fk_product) { $sql.= "'".$this->fk_product."',"; }
@ -2309,7 +2312,9 @@ class PropaleLigne
$sql.= " ".price2num($this->total_ht).",";
$sql.= " ".price2num($this->total_tva).",";
$sql.= " ".price2num($this->total_ttc).",";
if (isset($this->coef)) $sql.= ' '.$this->coef.',';
if (isset($this->marge_tx)) $sql.= ' '.$this->marge_tx.',';
else $sql.= ' null,';
if (isset($this->marque_tx)) $sql.= ' '.$this->marque_tx.',';
else $sql.= ' null,';
$sql.= ' '.$rangtouse;
$sql.= ')';
@ -2357,7 +2362,8 @@ class PropaleLigne
$sql.= ",total_tva=".price2num($this->total_tva)."";
$sql.= ",total_ttc=".price2num($this->total_ttc)."";
$sql.= ",rang='".$this->rang."'";
$sql.= ",coef='".$this->coef."'";
$sql.= ",marge_tx='".$this->marge_tx."'";
$sql.= ",marque_tx='".$this->marque_tx."'";
$sql.= " WHERE rowid = ".$this->rowid;
dolibarr_syslog("PropaleLigne::update sql=$sql");