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

Fixunit price

Browse Source
This commit is contained in:
Laurent Destailleur 2021-12-30 20:00:04 +01:00
parent 3967ce9c20
commit a919ade1c6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/fourn/class/fournisseur.product.class.php
View File

@ -92,6 +92,7 @@ class ProductFournisseur extends Product
public $fk_availability;
public $fourn_unitprice;
public $fourn_unitprice_with_discount; // not saved into database
public $fourn_tva_tx;
public $fourn_tva_npr;
@ -819,6 +820,7 @@ class ProductFournisseur extends Product
$fourn_price = $record["price"];
// calculate unit price for quantity 1
$fourn_unitprice = $record["unitprice"];
$fourn_unitprice_with_discount = $record["unitprice"] * (1 - $record["remise_percent"] / 100);
if (!empty($conf->dynamicprices->enabled) && !empty($record["fk_supplier_price_expression"])) {
$prod_supplier = new ProductFournisseur($this->db);
@ -836,6 +838,7 @@ class ProductFournisseur extends Product
} else {
$fourn_unitprice = $fourn_price;
}
$fourn_unitprice_with_discount = $fourn_unitprice * (1 - $record["remise_percent"] / 100);
}
}
if ($fourn_unitprice < $min || $min == -1) {
@ -847,7 +850,8 @@ class ProductFournisseur extends Product
$this->fourn_qty = $record["quantity"];
$this->fourn_remise_percent = $record["remise_percent"];
$this->fourn_remise = $record["remise"];
$this->fourn_unitprice = !empty($conf->dynamicprices->enabled) ? $fourn_unitprice : $record["unitprice"];
$this->fourn_unitprice = $fourn_unitprice;
$this->fourn_unitprice_with_discount = $fourn_unitprice_with_discount;
$this->fourn_charges = $record["charges"]; // deprecated
$this->fourn_tva_tx = $record["tva_tx"];
$this->fourn_id = $record["fourn_id"];