From e7b7ab93715b0d131a25f526b0f52ae3a5acc7f5 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Tue, 17 Apr 2012 15:29:07 +0000
Subject: [PATCH] // Fix ObjectModel::updateMultishopTable() for Combination

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14690 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/Product.php                           | 8 ++++----
 controllers/admin/AdminProductsController.php | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/Product.php b/classes/Product.php
index 87c8ea7e2..c70f2e82e 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -1099,7 +1099,7 @@ class ProductCore extends ObjectModel
 			$reference, $ean13, $default, $location, $upc, $minimal_quantity);
 
 		$this->addSupplierReference($supplier_reference, $id_product_attribute);
-		$result = ObjectModel::updateMultishopTable('product_attribute', array(
+		$result = ObjectModel::updateMultishopTable('Combination', array(
 			'wholesale_price' => (float)$wholesale_price,
 		), 'id_product_attribute = '.(int)$id_product_attribute);
 
@@ -1135,14 +1135,14 @@ class ProductCore extends ObjectModel
 	*/
 	public function deleteDefaultAttributes()
 	{
-		return ObjectModel::updateMultishopTable('product_attribute', array(
+		return ObjectModel::updateMultishopTable('Combination', array(
 			'default_on' => 0,
 		), 'id_product = '.(int)$this->id);
 	}
 
 	public function setDefaultAttribute($id_product_attribute)
 	{
-		$result = ObjectModel::updateMultishopTable('product_attribute', array(
+		$result = ObjectModel::updateMultishopTable('Combination', array(
 			'default_on' => 1
 		), '`id_product` = '.(int)$this->id.' AND `id_product_attribute` = '.(int)$id_product_attribute);
 
@@ -2762,7 +2762,7 @@ class ProductCore extends ObjectModel
 		if (!$mini)
 			return false;
 
-		if (!ObjectModel::updateMultishopTable('product_attribute', array('default_on' => 1), 'id_product_attribute = '.(int)$mini['id_attr']))
+		if (!ObjectModel::updateMultishopTable('Combination', array('default_on' => 1), 'id_product_attribute = '.(int)$mini['id_attr']))
 			return false;
 		return true;
 	}
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index a181abda7..a89aa9050 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2482,7 +2482,7 @@ class AdminProductsControllerCore extends AdminController
 									$where = '
 										id_product = '.(int)$product->id.'
 										AND id_product_attribute = '.(int)$attribute['id_product_attribute'];
-									ObjectModel::updateMultishopTable('product_attribute', $data, $where);
+									ObjectModel::updateMultishopTable('Combination', $data, $where);
 								}
 								else
 								{