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

[-] BO : #PSTEST-586 - Bad table name

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12709 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mDeflotte
2012-01-26 10:47:03 +00:00
parent 217ad6106c
commit cf85d8a712
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Product.php
+6 -6
View File
@@ -1002,7 +1002,7 @@ class ProductCore extends ObjectModel
* @see StockAvailable if you want to manage available quantities for sale on your shop(s) * @see StockAvailable if you want to manage available quantities for sale on your shop(s)
* @see ProductSupplier for manage supplier reference(s) * @see ProductSupplier for manage supplier reference(s)
* *
* @deprecated * @deprecated since 1.5.0
*/ */
public function addProductAttribute($price, $weight, $unit_impact, $ecotax, $quantity, $id_images, $reference, public function addProductAttribute($price, $weight, $unit_impact, $ecotax, $quantity, $id_images, $reference,
$supplier_reference = null, $ean13, $default, $location = null, $upc = null, $minimal_quantity = 1) $supplier_reference = null, $ean13, $default, $location = null, $upc = null, $minimal_quantity = 1)
@@ -2423,10 +2423,10 @@ class ProductCore extends ObjectModel
// Group reduction // Group reduction
if ($use_group_reduction) if ($use_group_reduction)
{ {
if ($reduction_from_category = (float)GroupReduction::getValueForProduct($id_product, $id_group)) if ($reduction_from_category = (float)GroupReduction::getValueForProduct($id_product, $id_group))
$price -= $price * $reduction_from_category; $price -= $price * $reduction_from_category;
else // apply group reduction if there is no group reduction for this category else // apply group reduction if there is no group reduction for this category
$price *= ((100 - Group::getReductionByIdGroup($id_group)) / 100); $price *= ((100 - Group::getReductionByIdGroup($id_group)) / 100);
} }
$price = Tools::ps_round($price, $decimals); $price = Tools::ps_round($price, $decimals);
@@ -4649,7 +4649,7 @@ class ProductCore extends ObjectModel
{ {
$query = new DbQuery; $query = new DbQuery;
$query->select('p.advanced_stock_management'); $query->select('p.advanced_stock_management');
$query->from('products', 'p'); $query->from('product', 'p');
$query->where('p.id_product = '.(int)$id_product); $query->where('p.id_product = '.(int)$id_product);
return (bool)Db::getInstance()->getValue($query); return (bool)Db::getInstance()->getValue($query);