From e07ff43a35530712f7fc80353c768ef9cb549ea4 Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Thu, 19 Apr 2012 15:41:52 +0000
Subject: [PATCH] // Fix errors on product combinations edition page

---
 classes/Product.php                           | 4 ++--
 controllers/admin/AdminProductsController.php | 2 +-
 js/admin-products.js                          | 4 ++++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/classes/Product.php b/classes/Product.php
index 68c0387ed..92ce273d1 100644
--- a/classes/Product.php
+++ b/classes/Product.php
@@ -1180,12 +1180,12 @@ class ProductCore extends ObjectModel
 	 * Sets Supplier Reference
 	 *
 	 * @param int $id_supplier
-	 * @param string $supplier_reference
 	 * @param int $id_product_attribute
+	 * @param string $supplier_reference
 	 * @param float $price
 	 * @param int $id_currency
 	 */
-	public function addSupplierReference($id_supplier, $supplier_reference, $id_product_attribute = null, $price, $id_currency = null)
+	public function addSupplierReference($id_supplier, $id_product_attribute, $supplier_reference = null, $price = null, $id_currency = null)
 	{
 		//Try to set the default supplier reference
 		if ($id_supplier > 0 && $supplier_reference != null)
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 95ecea2bf..b3fb6ac0c 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2482,7 +2482,7 @@ class AdminProductsControllerCore extends AdminController
 
 						if ($existing_id <= 0)
 						{
-							$product->addSupplierReference($supplier->id_supplier, $reference, (int)$attribute['id_product_attribute'], (float)Tools::convertPrice($price, $id_currency), (int)$id_currency);
+							$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)
 							{
 								if ((int)$attribute['id_product_attribute'] > 0)
diff --git a/js/admin-products.js b/js/admin-products.js
index de04a9b2a..53f76c1c8 100644
--- a/js/admin-products.js
+++ b/js/admin-products.js
@@ -610,6 +610,8 @@ product_tabs['Associations'] = new function(){
 
 	this.getAccessoriesIds = function()
 	{
+		if ($('#inputAccessories').val() === undefined)
+			return '';
 		var ids = id_product + ',';
 		ids += $('#inputAccessories').val().replace(/\\-/g,',').replace(/\\,$/,'');
 		ids = ids.replace(/\,$/,'');
@@ -1076,6 +1078,8 @@ product_tabs['Pack'] = new function(){
 
 		function getSelectedIds()
 		{
+			if ($('#inputPackItems').val() === undefined)
+				return '';
 			var ids = '';
 			if (typeof(id_product) != 'undefined')
 				ids += id_product + ',';