From de9295b98a4dc243829763da67c67ec1c3ee24d6 Mon Sep 17 00:00:00 2001
From: vChabot <vincent.chabot@prestashop.com>
Date: Fri, 18 May 2012 14:45:41 +0000
Subject: [PATCH] // fix on product update and creation

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

diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index aa0eef8fa..66f167f9f 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -1425,7 +1425,6 @@ class AdminProductsControllerCore extends AdminController
 			$this->updateAccessories($this->object);
 			$this->updatePackItems($this->object);
 			$this->updateDownloadProduct($this->object);
-			$this->updateAssoShop($this->object->id);
 
 			if (empty($this->errors))
 			{
@@ -1527,6 +1526,8 @@ class AdminProductsControllerCore extends AdminController
 				{
 					if ($this->isTabSubmitted('Shipping'))
 						$this->addCarriers();
+					if ($this->isTabSubmitted('Associations'))
+						$this->updateAccessories($object);
 					if ($this->isTabSubmitted('Suppliers'))
 						$this->processSuppliers();
 					if ($this->isTabSubmitted('Warehouses'))
@@ -1545,11 +1546,6 @@ class AdminProductsControllerCore extends AdminController
 						$this->processCustomizationConfiguration();
 					if ($this->isTabSubmitted('Attachments'))
 						$this->processAttachments();
-					if ($this->isTabSubmitted('Associations'))
-					{
-						$this->updateAccessories($object);
-						$this->updateAssoShop($object->id);
-					}
 
 					$this->updatePackItems($object);
 					$this->updateDownloadProduct($object, 1);