// Welcome 2012²

This commit is contained in:
rMalie
2012-02-23 16:33:10 +00:00
parent 03d11f2d14
commit 14e6929565
1327 changed files with 2312 additions and 2353 deletions

View File

@@ -19,7 +19,7 @@
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @copyright 2007-2012 PrestaShop SA
* @version Release: $Revision$
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
@@ -38,6 +38,7 @@ class AdminStockInstantStateControllerCore extends AdminController
$this->table = 'stock';
$this->className = 'Stock';
$this->lang = false;
$this->display_multishop_toolbar = false;
$this->fieldsDisplay = array(
'reference' => array(
@@ -102,8 +103,6 @@ class AdminStockInstantStateControllerCore extends AdminController
array_unshift($this->stock_instant_state_warehouses, array('id_warehouse' => -1, 'name' => $this->l('All Warehouses')));
parent::__construct();
$this->multishop_context = null;
}
/**