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

Merge pull request #736 from codeurWeb/patch-2

Browse Source 
[-] BO : fix ovverride of constructor when PS_ADVANCED_STOCK_MANAGEMENT is off
This commit is contained in:
Gregory Roussac committed 2013-09-24 01:40:16 -07:00
2 parents 6796b64e18 6850db0612
commit 92b987c0f8
1 file changed
+12 -12
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminImportController.php
+12 -12
View File
@@ -363,10 +363,13 @@ class AdminImportControllerCore extends AdminController
'shop' => Shop::getGroupFromShop(Configuration::get('PS_SHOP_DEFAULT')), 'shop' => Shop::getGroupFromShop(Configuration::get('PS_SHOP_DEFAULT')),
); );
break; break;
// @since 1.5.0 }
case $this->entities[$this->l('Supply Orders')]:
if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT')) // @since 1.5.0
{ if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
switch ((int)Tools::getValue('entity'))
{
case $this->entities[$this->l('Supply Orders')]:
// required fields // required fields
$this->required_fields = array( $this->required_fields = array(
'id_supplier', 'id_supplier',
@@ -394,12 +397,8 @@ class AdminImportControllerCore extends AdminController
'discount_rate' => '0', 'discount_rate' => '0',
'is_template' => '0', 'is_template' => '0',
); );
} break;
break; case $this->entities[$this->l('Supply Order Details')]:
// @since 1.5.0
case $this->entities[$this->l('Supply Order Details')]:
if (Configuration::get('PS_ADVANCED_STOCK_MANAGEMENT'))
{
// required fields // required fields
$this->required_fields = array( $this->required_fields = array(
'supply_order_reference', 'supply_order_reference',
@@ -423,8 +422,9 @@ class AdminImportControllerCore extends AdminController
'discount_rate' => '0', 'discount_rate' => '0',
'tax_rate' => '0', 'tax_rate' => '0',
); );
} break;
}
}
$this->separator = strval(trim(Tools::getValue('separator', ';'))); $this->separator = strval(trim(Tools::getValue('separator', ';')));