dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// SupplierOrderDetail : prices updated

Browse Source
This commit is contained in:
bMancone
2011-11-09 17:09:17 +00:00
parent 39fe15df4c
commit c67af2b3e2
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/stock/SupplierOrderDetail.php
+10 -9
View File
@@ -224,22 +224,22 @@ class SupplierOrderDetailCore extends ObjectModel
protected function calculatePrices() protected function calculatePrices()
{ {
// calcul entry price // calcul entry price
$this->price_te = (float)$this->unit_price_te * (int)$this->quantity_expected; $this->price_te = Tools::ps_round((float)$this->unit_price_te * (int)$this->quantity_expected, 6);
// calcul entry discount value // calcul entry discount value
if ($this->discount_rate != null && is_float($this->discount_rate) && $this->discount_rate > 0) if ($this->discount_rate != null && is_float($this->discount_rate) && $this->discount_rate > 0)
$this->discount_value_te = (float)$this->price_te * ($this->discount_rate / 100); $this->discount_value_te = Tools::ps_round((float)$this->price_te * ($this->discount_rate / 100), 6);
// calcul entry price with discount // calcul entry price with discount
$this->price_with_discount_te = $this->price_te - $this->discount_value_te; $this->price_with_discount_te = Tools::ps_round($this->price_te - $this->discount_value_te, 6);
// calcul tax value // calcul tax value
$this->tax_value = $this->price_with_discount_te * ((float)$this->tax_rate / 100); $this->tax_value = Tools::ps_round($this->price_with_discount_te * ((float)$this->tax_rate / 100), 6);
$this->price_ti = $this->price_with_discount_te + $this->tax_value; $this->price_ti = Tools::ps_round($this->price_with_discount_te + $this->tax_value, 6);
// define default values for order discount fields // define default values for order discount fields
$this->tax_value_with_order_discount = $this->tax_value; $this->tax_value_with_order_discount = Tools::ps_round($this->tax_value, 6);
$this->price_with_order_discount_te = $this->price_with_discount_te; $this->price_with_order_discount_te = Tools::ps_round($this->price_with_discount_te, 6);
} }
/** /**
@@ -252,10 +252,11 @@ class SupplierOrderDetailCore extends ObjectModel
if ($discount_rate != null && is_numeric($discount_rate) && (float)$discount_rate > 0) if ($discount_rate != null && is_numeric($discount_rate) && (float)$discount_rate > 0)
{ {
// calculate new price, with global order discount, tax ecluded // calculate new price, with global order discount, tax ecluded
$this->price_with_order_discount_te = $this->price_with_discount_te - ($this->price_with_discount_te * ((float)$discount_rate / 100)); $this->price_with_order_discount_te = Tools::ps_round($this->price_with_discount_te - ($this->price_with_discount_te * ((float)$discount_rate / 100)),
6);
// calculate new tax value, with global order discount // calculate new tax value, with global order discount
$this->tax_value_with_order_discount = $this->price_with_order_discount_te * ((float)$this->tax_rate / 100); $this->tax_value_with_order_discount = Tools::ps_round($this->price_with_order_discount_te * ((float)$this->tax_rate / 100), 6);
parent::update(); parent::update();
} }