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

// Multiple bugs fix on stock interfaces during tests

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11053 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dSevere
2011-12-08 15:22:31 +00:00
parent 56c6105c56
commit 12ea52f4f7
6 changed files with 265 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminSupplyOrdersController.php
+5 -1
View File
@@ -909,6 +909,8 @@ class AdminSupplyOrdersControllerCore extends AdminController
*/
public function postProcess()
{
$this->is_editing_order = false;
// Checks access
if (Tools::isSubmit('submitAddsupply_order') && !($this->tabAccess['add'] === '1'))
$this->_errors[] = Tools::displayError($this->l('You do not have the required permission to add a supply order.'));
@@ -918,6 +920,7 @@ class AdminSupplyOrdersControllerCore extends AdminController
if (Tools::isSubmit('submitAddsupply_order') || Tools::isSubmit('submitAddsupply_orderAndStay'))
{
$this->action = 'save';
$this->is_editing_order = true;
// get supplier ID
$id_supplier = (int)Tools::getValue('id_supplier', 0);
@@ -1052,7 +1055,8 @@ class AdminSupplyOrdersControllerCore extends AdminController
if (Tools::isSubmit('create_supply_order') && Tools::isSubmit('id_supply_order'))
$this->postProcessCopyFromTemplate();
parent::postProcess();
if ( (!count($this->_errors) && $this->is_editing_order) || !$this->is_editing_order)
parent::postProcess();
// if the threshold is defined and we are saving the order
if (Tools::isSubmit('submitAddsupply_order') && $quantity_threshold != null)