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

// Fix stock on shop import

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13734 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard committed 2012-02-29 10:45:22 +00:00
1 parent 24c4392215
commit 2da79de4b7
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

classes/shop/Shop.php
+1
View File
@@ -94,6 +94,7 @@ class ShopCore extends ObjectModel
'store' => array('type' => 'shop'), 'store' => array('type' => 'shop'),
'webservice_account' => array('type' => 'shop'), 'webservice_account' => array('type' => 'shop'),
'warehouse' => array('type' => 'shop'), 'warehouse' => array('type' => 'shop'),
'stock_available' => array('type' => 'fk_shop'),
); );
protected $webserviceParameters = array( protected $webserviceParameters = array(
controllers/admin/AdminShopController.php
+1 -2
View File
@@ -319,7 +319,7 @@ class AdminShopControllerCore extends AdminController
if (Tools::isSubmit('id_shop')) if (Tools::isSubmit('id_shop'))
{ {
$shop = new Shop(Tools::getValue('id_shop')); $shop = new Shop((int)Tools::getValue('id_shop'));
$parent = $shop->id_category; $parent = $shop->id_category;
} }
else else
@@ -405,7 +405,6 @@ class AdminShopControllerCore extends AdminController
'stock_available' => $this->l('Available quantities for sale'), 'stock_available' => $this->l('Available quantities for sale'),
'store' => $this->l('Stores'), 'store' => $this->l('Stores'),
'warehouse' => $this->l('Warehouse'), 'warehouse' => $this->l('Warehouse'),
'stock_available' => $this->l('Stock Available'),
); );
if (!$this->object->id) if (!$this->object->id)