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

// #PSFV-94 : Add possibility to add product in a supplier order

Browse Source
This commit is contained in:
dSevere
2011-11-04 18:27:04 +00:00
parent a2607c922d
commit ea565d57fb
6 changed files with 177 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/stock/SupplierOrderDetail.php
+7 -7
View File
@@ -110,7 +110,7 @@ class SupplierOrderDetailCore extends ObjectModel
* @var float This is like $price_with_discount_te, considering the global order discount.
* (i.e. if SupplierOrder::discount_rate is set)
*/
public $price_with_order_discount_te;
public $price_with_order_discount_te = 0;
protected $fieldsRequired = array(
'id_supplier_order',
@@ -167,13 +167,13 @@ class SupplierOrderDetailCore extends ObjectModel
{
$this->validateFields();
$fields['id_supplier_order'] = (int)$this->id_supplier;
$fields['id_product'] = (int)$this->id_employee;
$fields['id_product_attribute'] = (int)$this->id_warehouse;
$fields['id_supplier_order'] = (int)$this->id_supplier_order;
$fields['id_product'] = (int)$this->id_product;
$fields['id_product_attribute'] = (int)$this->id_product_attribute;
$fields['id_currency'] = (int)$this->id_currency;
$fields['exchange_rate'] = (float)$this->exchange_rate;
$fields['unit_price_te'] = (float)$this->unit_price_te;
$fields['quantity'] = (int)$this->id_state;
$fields['quantity'] = (int)$this->quantity;
$fields['price_te'] = (float)$this->price_te;
$fields['discount_rate'] = (float)$this->discount_rate;
$fields['discount_value_te'] = (float)$this->discount_value_te;
@@ -221,10 +221,10 @@ class SupplierOrderDetailCore extends ObjectModel
// calcul entry discount value
if ($this->discount_rate != null && is_numeric($this->discount_rate) && $this->discount_rate > 0)
$htis->discount_value_te = (float)$htis->price_te * ((float)$this->discount_rate / 100);
$htis->discount_value_te = (float)$this->price_te * ((float)$this->discount_rate / 100);
// calcul entry price with discount
$this->price_with_discount_te = $htis->price_te - $htis->discount_value_te;
$this->price_with_discount_te = $this->price_te - $this->discount_value_te;
// calcul tax value
$this->tax_value = $this->price_with_discount_te * ((float)$this->tax_rate / 100);