Skip to content

Commit

Permalink
Fix: Correct sign on line
Browse files Browse the repository at this point in the history
  • Loading branch information
@eldy
eldy committed Nov 18, 2011
1 parent 75fe0c6 commit f60b664
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion htdocs/compta/facture.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1010,7 +1010,7 @@
}
else
{
// Insert line
// Insert line
$result = $object->addline(
$id,
$desc,
Expand Down
32 changes: 16 additions & 16 deletions htdocs/compta/facture/class/facture.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1854,13 +1854,13 @@ function addline($facid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocalta

// TODO A virer
// Anciens indicateurs: $price, $remise (a ne plus utiliser)
$price = $pu;
$remise = 0;
if ($remise_percent > 0)
{
$remise = round(($pu * $remise_percent / 100),2);
$price = ($pu - $remise);
}
//$price = $pu;
//$remise = 0;
//if ($remise_percent > 0)
//{
// $remise = round(($pu * $remise_percent / 100),2);
// $price = ($pu - $remise);
//}

$product_type=$type;
if ($fk_product)
Expand All @@ -1874,33 +1874,33 @@ function addline($facid, $desc, $pu_ht, $qty, $txtva, $txlocaltax1=0, $txlocalta
$this->line=new FactureLigne($this->db);
$this->line->fk_facture=$facid;
$this->line->desc=$desc;
$this->line->qty=$qty;
$this->line->qty= ($this->type==2?abs($qty):$qty); // For credit note, quantity is always positive and unit price negative
$this->line->tva_tx=$txtva;
$this->line->localtax1_tx=$txlocaltax1;
$this->line->localtax2_tx=$txlocaltax2;
$this->line->fk_product=$fk_product;
$this->line->product_type=$product_type;
$this->line->remise_percent=$remise_percent;
$this->line->subprice= ($this->type==2?-1:1)*abs($pu_ht);
$this->line->subprice= ($this->type==2?-abs($pu_ht):$pu_ht); // For credit note, unit price always negative, always positive otherwise
$this->line->date_start=$date_start;
$this->line->date_end=$date_end;
$this->line->ventil=$ventil;
$this->line->rang=$rangtouse;
$this->line->info_bits=$info_bits;
$this->line->fk_remise_except=$fk_remise_except;
$this->line->total_ht= ($this->type==2?-1:1)*abs($total_ht);
$this->line->total_tva= ($this->type==2?-1:1)*abs($total_tva);
$this->line->total_localtax1=($this->type==2?-1:1)*abs($total_localtax1);
$this->line->total_localtax2=($this->type==2?-1:1)*abs($total_localtax2);
$this->line->total_ttc= ($this->type==2?-1:1)*abs($total_ttc);
$this->line->total_ht= (($this->type==2||$qty<0)?-1:1)*abs($total_ht); // For credit note and if qty is negative, total is negative
$this->line->total_tva= (($this->type==2||$qty<0)?-1:1)*abs($total_tva);
$this->line->total_localtax1=(($this->type==2||$qty<0)?-1:1)*abs($total_localtax1);
$this->line->total_localtax2=(($this->type==2||$qty<0)?-1:1)*abs($total_localtax2);
$this->line->total_ttc= (($this->type==2||$qty<0)?-1:1)*abs($total_ttc);
$this->line->special_code=$special_code;
$this->line->fk_parent_line=$fk_parent_line;
$this->line->origin=$origin;
$this->line->origin_id=$origin_id;

// TODO Ne plus utiliser
$this->line->price=($this->type==2?-1:1)*abs($price);
$this->line->remise=($this->type==2?-1:1)*abs($remise);
//$this->line->price=($this->type==2?-1:1)*abs($price);
//$this->line->remise=($this->type==2?-1:1)*abs($remise);

$result=$this->line->insert();
if ($result > 0)
Expand Down

0 comments on commit f60b664

Please sign in to comment.