From feb7682e6703f39fe3883fbbfdb520dae536203b Mon Sep 17 00:00:00 2001
From: bMancone <brice.mancone@prestashop.com>
Date: Tue, 27 Mar 2012 12:25:43 +0000
Subject: [PATCH] // Fixed supplier addresses

---
 classes/Address.php                            | 3 +++
 controllers/admin/AdminSuppliersController.php | 9 ++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/classes/Address.php b/classes/Address.php
index 68b6d5e1b..ad5cc7def 100644
--- a/classes/Address.php
+++ b/classes/Address.php
@@ -355,6 +355,9 @@ class AddressCore extends ObjectModel
 		$query->from('address');
 		$query->where('id_supplier = '.(int)$id_supplier);
 		$query->where('deleted = 0');
+		$query->where('id_customer = 0');
+		$query->where('id_manufacturer = 0');
+		$query->where('id_warehouse = 0');
 		return Db::getInstance(_PS_USE_SQL_SLAVE_)->getValue($query);
 	}
 }
diff --git a/controllers/admin/AdminSuppliersController.php b/controllers/admin/AdminSuppliersController.php
index b7d239259..e93fe47ca 100644
--- a/controllers/admin/AdminSuppliersController.php
+++ b/controllers/admin/AdminSuppliersController.php
@@ -399,7 +399,8 @@ class AdminSuppliersControllerCore extends AdminController
 				$this->errors[] = $this->l('It is not possible to delete a supplier if there are any pending supply order.');
 			else
 			{
-				$address = new Address($obj->id_address);
+				$id_address = Address::getAddressIdBySupplierId($obj->id);
+				$address = new Address($id_address);
 				if (Validate::isLoadedObject($address))
 				{
 					$address->deleted = 1;
@@ -417,7 +418,8 @@ class AdminSuppliersControllerCore extends AdminController
 	 */
 	protected function afterAdd($object)
 	{
-		$address = new Address($object->id_address);
+		$id_address = (int)$_POST['id_address'];
+		$address = new Address($id_address);
 		if (Validate::isLoadedObject($address))
 		{
 			$address->id_supplier = $object->id;
@@ -432,7 +434,8 @@ class AdminSuppliersControllerCore extends AdminController
 	 */
 	protected function afterUpdate($object)
 	{
-		$address = new Address($object->id_address);
+		$id_address = (int)$_POST['id_address'];
+		$address = new Address($id_address);
 		if (Validate::isLoadedObject($address))
 		{
 			if ($address->id_supplier != $object->id)