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

// Fixed #PSTEST-454 #PSTEST-455 #PSTEST-458

Browse Source
This commit is contained in:
bMancone
2012-01-17 15:28:30 +00:00
parent ab67298235
commit da27efe002
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminSupplyOrdersController.php
+5 -3
View File
@@ -352,7 +352,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
// if the current state doesn't allow order edit, skip the edit action
if ($this->_list[$i]['editable'] == 0)
$this->addRowActionSkipList('edit', $this->_list[$i]['id_supply_order']);
if ($this->_list[$i]['enclosed'] == 1)
if ($this->_list[$i]['enclosed'] == 1 && $this->_list[$i]['receipt_state'] == 0)
$this->addRowActionSkipList('changestate', $this->_list[$i]['id_supply_order']);
if (1 != $this->_list[$i]['pending_receipt'])
$this->addRowActionSkipList('updatereceipt', $this->_list[$i]['id_supply_order']);
@@ -500,9 +500,9 @@ class AdminSupplyOrdersControllerCore extends AdminController
),
array(
'type' => 'select',
'label' => $this->l('New status of the order:'),
'label' => $this->l('Status of the order:'),
'name' => 'id_supply_order_state',
'required' => true,
'required' => false,
'options' => array(
'query' => $states,
'id' => 'id_supply_order_state',
@@ -517,6 +517,8 @@ class AdminSupplyOrdersControllerCore extends AdminController
)
);
$this->displayInformation($this->l('Be careful when changing status. Some of them cannot be changed afterwards. (Canceled, for instance).'));
// sets up the helper
$helper = new HelperForm();
$helper->submit_action = 'submitChangestate';