Skip to content

Commit

Permalink
TVA NPR : add info_bits property in class FactureFournisseur
Browse files Browse the repository at this point in the history
  • Loading branch information
Sébastien de Chateauvieux committed Mar 25, 2013
1 parent be8a95a commit 6cfedff
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion htdocs/fourn/class/fournisseur.facture.class.php
Expand Up @@ -389,7 +389,7 @@ function fetch_lines()
{
$sql = 'SELECT f.rowid, f.description, f.pu_ht, f.pu_ttc, f.qty, f.remise_percent, f.tva_tx, f.tva';
$sql.= ', f.localtax1_tx, f.localtax2_tx, f.total_localtax1, f.total_localtax2 ';
$sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type';
$sql.= ', f.total_ht, f.tva as total_tva, f.total_ttc, f.fk_product, f.product_type, f.info_bits';
$sql.= ', p.rowid as product_id, p.ref as product_ref, p.label as label, p.description as product_desc';
$sql.= ' FROM '.MAIN_DB_PREFIX.'facture_fourn_det as f';
$sql.= ' LEFT JOIN '.MAIN_DB_PREFIX.'product as p ON f.fk_product = p.rowid';
Expand Down Expand Up @@ -430,6 +430,7 @@ function fetch_lines()
$this->lines[$i]->total_ttc = $obj->total_ttc;
$this->lines[$i]->fk_product = $obj->fk_product;
$this->lines[$i]->product_type = $obj->product_type;
$this->lines[$i]->info_bits = $obj->info_bits;

$i++;
}
Expand Down Expand Up @@ -1104,6 +1105,7 @@ function updateline($id, $label, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0,
$pu_ttc = $tabprice[5];
$total_localtax1 = $tabprice[9];
$total_localtax2 = $tabprice[10];
$info_bits = empty($info_bits) ? 0 : $info_bits;

if ($idproduct)
{
Expand Down Expand Up @@ -1133,6 +1135,7 @@ function updateline($id, $label, $pu, $vatrate, $txlocaltax1=0, $txlocaltax2=0,
if ($idproduct) $sql.= ", fk_product = ".$idproduct;
else $sql.= ", fk_product = null";
$sql.= ", product_type = ".$product_type;
$sql.= ", infos_bits = ".$infos_bits;
$sql.= " WHERE rowid = ".$id;

dol_syslog(get_class($this)."::updateline sql=".$sql);
Expand Down

0 comments on commit 6cfedff

Please sign in to comment.