From b421d469d29b9b84d2d48d373166d13313e6980b Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Mon, 24 Jun 2013 16:45:10 +0200
Subject: [PATCH] [-] Fix bug #PSCFV-8109 country creation/activation regarding
 payment modules restrictions

---
 classes/Country.php                            | 8 +++++++-
 controllers/admin/AdminCountriesController.php | 8 ++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/classes/Country.php b/classes/Country.php
index d9c96d5ff..993a70953 100644
--- a/classes/Country.php
+++ b/classes/Country.php
@@ -370,4 +370,10 @@ class CountryCore extends ObjectModel
 		else
 			return true; 
 	}
-}
+	
+	public function add($autodate = true, $null_values = false)
+	{
+		$return = parent::add($autodate, $null_values) && self::addModuleRestrictions(array(), array(array('id_country' => $this->id)), array());
+		return $return;	
+	}
+}
\ No newline at end of file
diff --git a/controllers/admin/AdminCountriesController.php b/controllers/admin/AdminCountriesController.php
index 2eb4e31a2..6d5638b31 100644
--- a/controllers/admin/AdminCountriesController.php
+++ b/controllers/admin/AdminCountriesController.php
@@ -433,10 +433,10 @@ class AdminCountriesControllerCore extends AdminController
 	
 	public function processStatus()
 	{
-		if (Validate::isLoadedObject($object = $this->loadObject()))
-			Country::addModuleRestrictions(array(), array(array('id_country' => $object->id)), array());
-		
-		parent::processStatus();
+		$return = parent::processStatus();
+		if (Validate::isLoadedObject($object = $this->loadObject()) &&  $object->active == 1)
+			$return &= Country::addModuleRestrictions(array(), array(array('id_country' => $object->id)), array());				
+		return $return;
 	}
 	
 	public function processBulkStatusSelection($way)