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

// Fixed bugs when editing Warehouses & Suppliers for a product

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11224 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone
2011-12-14 16:54:02 +00:00
parent 313b46212f
commit 1f74b8a56e
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+1
View File
@@ -259,6 +259,7 @@ class ProductCore extends ObjectModel
'cache_has_attachments' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDateFormat'),
'date_upd' => array('type' => self::TYPE_DATE, 'validate' => 'isDateFormat'),
'advanced_stock_management' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
// Lang fields
'meta_description' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isGenericName', 'size' => 255),
controllers/admin/AdminProductsController.php
+12 -11
View File
@@ -173,7 +173,7 @@ class AdminProductsControllerCore extends AdminController
);
/* Join categories table */
if ($id_category = (int)Tools::getValue('productFilter_cl!name'))
{
$this->_category = new Category($id_category);
@@ -183,7 +183,7 @@ class AdminProductsControllerCore extends AdminController
$this->_category = new Category($id_category);
else
$this->_category = new Category();
$this->_join = '
LEFT JOIN `'._DB_PREFIX_.'category_lang` cl ON (a.`id_category_default` = cl.`id_category` AND b.`id_lang` = cl.`id_lang`)
@@ -2345,14 +2345,14 @@ class AdminProductsControllerCore extends AdminController
$error = '';
$token = Tools::getValue('token') ? Tools::getValue('token') : $this->token;
$detail = array();
if (count($this->context->shop->getListOfID()) > 1)
$error = $this->l('Please select the shop you want to configure');
else
{
$zones = Zone::getZones();
$id_shop = $this->context->shop->getID();
// Set default zone value to the shop and sort it
foreach($zones as $zone)
{
@@ -2360,12 +2360,12 @@ class AdminProductsControllerCore extends AdminController
$detail['zones'][$zone['id_zone']]['account_number'] = '';
}
$zoneAccountNumberList = Accounting::getProductAccountNumberZoneShop($obj->id, $id_shop);
// Set Account number to the id_zone for an id_shop if exist
foreach($zoneAccountNumberList as $zone)
$detail['zones'][$zone['id_zone']]['account_number'] = $zone['account_number'];
}
$data->assign(array(
'productAccountNumberList' => $detail,
'shopName' => $this->context->shop->name,
@@ -2528,7 +2528,7 @@ class AdminProductsControllerCore extends AdminController
'languages' => $languages,
'default_language' => $default_language,
'ps_ssl_enabled' => Configuration::get('PS_SSL_ENABLED')
));
));
$this->tpl_form_vars['custom_form'] = $this->context->smarty->createTemplate($this->tpl_form, $data)->fetch();
}
@@ -2604,7 +2604,7 @@ class AdminProductsControllerCore extends AdminController
$rule = new SpecificPriceRule((int)$specific_price['id_specific_price_rule']);
$rule_name = ($rule->id ? $rule->name : '--');
$content .= '
<tr '.($i%2 ? 'class="alt_row"' : '').'>
<td class="cell border">'.$rule_name.'</td>
@@ -2955,7 +2955,7 @@ class AdminProductsControllerCore extends AdminController
$data->assign('imagesTypes', ImageType::getImagesTypes('products'));
$product->tags = Tag::getProductTags($product->id);
$data->assign('tabs_preloaded', $this->tabs_preloaded);
// TinyMCE
@@ -3118,7 +3118,7 @@ class AdminProductsControllerCore extends AdminController
}
else
$this->content .= '<b>'.$this->l('You must save this product before adding combinations').'.</b>';
// @todo
$data->assign('up_filename', strval(Tools::getValue('virtual_product_filename_attribute')));
$data->assign($this->tpl_form_vars);
@@ -3437,6 +3437,7 @@ class AdminProductsControllerCore extends AdminController
$attributes = $obj->getAttributesResume($this->context->language->id);
if (empty($attributes))
$attributes[] = array(
'id_product' => $obj->id,
'id_product_attribute' => 0,
'attribute_designation' => ''
);
@@ -3505,7 +3506,7 @@ class AdminProductsControllerCore extends AdminController
}
$data->assign('available_features', $features);
$data->assign('product', $obj);
$data->assign('link', $this->context->link);
$data->assign('languages', $this->_languages);