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

// Stock : updated stock{cover, mvt, instant_state}controllers

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10007 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2011-11-09 16:03:51 +00:00
parent 72077bb489
commit c92e78ad00
9 changed files with 177 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminStockInstantStateController.php
+3 -3
View File
@@ -100,7 +100,7 @@ class AdminStockInstantStateControllerCore extends AdminController
$this->lang = false;
$lang_id = (int)$this->context->language->id;
$id_product = (int)Tools::getValue('id');
$warehouse = (Tools::getValue('warehouse') ? (int)Tools::getValue('warehouse') : -1);
$warehouse = (Tools::getValue('id_warehouse') ? (int)Tools::getValue('id_warehouse') : -1);
$query = '
SELECT a.id_product_attribute as id, a.id_product, a.reference, a.ean13,
@@ -220,8 +220,8 @@ class AdminStockInstantStateControllerCore extends AdminController
if ($warehouse == 0)
{
$warehouse = -1; // all warehouses
if ((int)Tools::getValue('instant_state_warehouse'))
$warehouse = (int)Tools::getValue('instant_state_warehouse');
if ((int)Tools::getValue('id_warehouse'))
$warehouse = (int)Tools::getValue('id_warehouse');
}
return $warehouse;
}