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

// AdminSupplierOrdersController : updated (fixed with modifications of HelperList & AdminController + update_receipt)

Browse Source
This commit is contained in:
bMancone
2011-11-07 13:05:07 +00:00
parent 8747306424
commit f79a6facbf
5 changed files with 245 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/stock/SupplierOrderDetail.php
+13 -5
View File
@@ -63,7 +63,12 @@ class SupplierOrderDetailCore extends ObjectModel
/**
* @var int Quantity ordered
*/
public $quantity = 0;
public $quantity_expected = 0;
/**
* @var int Quantity received
*/
public $quantity_received = 0;
/**
* @var float This defines the price of the product, considering the number of units to buy.
@@ -119,7 +124,8 @@ class SupplierOrderDetailCore extends ObjectModel
'id_currency',
'exchange_rate',
'unit_price_te',
'quantity',
'quantity_expected',
'quantity_received',
'price_te',
'discount_rate',
'discount_value_te',
@@ -138,7 +144,8 @@ class SupplierOrderDetailCore extends ObjectModel
'id_currency' => 'isUnsignedId',
'exchange_rate' => 'isFloat',
'unit_price_te' => 'isPrice',
'quantity' => 'isUnsignedInt',
'quantity_expected' => 'isUnsignedInt',
'quantity_received' => 'isUnsignedInt',
'price_te' => 'isPrice',
'discount_rate' => 'isFloat',
'discount_value_te' => 'isPrice',
@@ -173,7 +180,8 @@ class SupplierOrderDetailCore extends ObjectModel
$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->quantity;
$fields['quantity_expected'] = (int)$this->quantity_expected;
$fields['quantity_received'] = (int)$this->quantity_received;
$fields['price_te'] = (float)$this->price_te;
$fields['discount_rate'] = (float)$this->discount_rate;
$fields['discount_value_te'] = (float)$this->discount_value_te;
@@ -217,7 +225,7 @@ class SupplierOrderDetailCore extends ObjectModel
protected function calculatePrices()
{
// calcul entry price
$htis->price_te = (float)$this->unit_price_te * (int)$this->quantity;
$htis->price_te = (float)$this->unit_price_te * (int)$this->quantity_expected;
// calcul entry discount value
if ($this->discount_rate != null && is_numeric($this->discount_rate) && $this->discount_rate > 0)
classes/stock/SupplierOrderReceiptHistory.php
+6 -6
View File
@@ -43,7 +43,7 @@ class SupplierOrderReceiptHistoryCore extends ObjectModel
/**
* @var int State
*/
public $id_state;
public $id_supplier_order_state;
/**
* @var int Quantity delivered
@@ -57,15 +57,14 @@ class SupplierOrderReceiptHistoryCore extends ObjectModel
protected $fieldsRequired = array(
'id_supplier_order_detail',
'id_state',
'id_supplier_order_state',
'id_employee',
'quantity',
'date_add'
'quantity'
);
protected $fieldsValidate = array(
'id_supplier_order_detail' => 'isUnsignedId',
'id_state' => 'isUnsignedId',
'id_supplier_order_state' => 'isUnsignedId',
'id_employee' => 'isUnsignedId',
'quantity' => 'isUnsignedInt',
'date_add' => 'isDate'
@@ -86,9 +85,10 @@ class SupplierOrderReceiptHistoryCore extends ObjectModel
$this->validateFields();
$fields['id_supplier_order_detail'] = (int)$this->id_supplier_order_detail;
$fields['id_state'] = (int)$this->id_state;
$fields['id_supplier_order_state'] = (int)$this->id_supplier_order_state;
$fields['id_employee'] = (int)$this->id_employee;
$fields['quantity'] = (int)$this->quantity;
$fields['date_add'] = pSQL($this->date_add);
return $fields;