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

[-] BO : fixed bug #PSCFV-3457 - part2

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16675 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
vAugagneur
2012-08-03 07:56:18 +00:00
parent 747cfd729b
commit 2c960d9bee
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminProductsController.php
+5 -6
View File
@@ -205,8 +205,7 @@ class AdminProductsControllerCore extends AdminController
AND tr.`id_country` = '.(int)$this->context->country->id.' AND tr.`id_state` = 0)
LEFT JOIN `'._DB_PREFIX_.'tax` t ON (t.`id_tax` = tr.`id_tax`)
LEFT JOIN `'._DB_PREFIX_.'stock_available` sav ON (sav.`id_product` = a.`id_product` AND sav.`id_product_attribute` = 0
AND sav.`id_shop` = '.(int)$this->context->shop->id.')';
AND sav.`id_shop` in ('.implode(', ', array_map('intval', Shop::getContextListShopID())).'))';
// if no category selected, display all products
if (Validate::isLoadedObject($this->_category) && empty($this->_filter))
$this->_filter = 'AND cp.`id_category` = '.(int)$this->_category->id;
@@ -2460,9 +2459,9 @@ class AdminProductsControllerCore extends AdminController
$this->errors[] = Tools::displayError($this->l('The selected currency is not valid.'));
// Save product-supplier data
$existing_id = (int)ProductSupplier::getIdByProductAndSupplier($product->id, $attribute['id_product_attribute'], $supplier->id_supplier);
if ($existing_id <= 0)
$product_supplier_id = (int)ProductSupplier::getIdByProductAndSupplier($product->id, $attribute['id_product_attribute'], $supplier->id_supplier);
if (!$product_supplier_id)
{
$product->addSupplierReference($supplier->id_supplier, (int)$attribute['id_product_attribute'], $reference, (float)Tools::convertPrice($price, $id_currency), (int)$id_currency);
if ($product->id_supplier == $supplier->id_supplier)
@@ -2488,7 +2487,7 @@ class AdminProductsControllerCore extends AdminController
}
else
{
$product_supplier = new ProductSupplier($existing_id);
$product_supplier = new ProductSupplier($product_supplier_id);
$product_supplier->id_currency = (int)$id_currency;
$product_supplier->product_supplier_price_te = (float)Tools::convertPrice($price, $id_currency); //converted in the default currency
$product_supplier->product_supplier_reference = pSQL($reference);