From b1c13e373afc0f653da81b054d86d7f18865f5bf Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Wed, 28 Nov 2012 15:31:55 +0100
Subject: [PATCH] Fix: A better fix to remove fk_pays.
---
htdocs/contact/fiche.php | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php
index 1021b306dbf..2e28c7e2a5c 100644
--- a/htdocs/contact/fiche.php
+++ b/htdocs/contact/fiche.php
@@ -361,7 +361,7 @@ else
$object->state_id = $_POST["state_id"];
// We set country_id, country_code and label for the selected country
- $object->country_id=$_POST["country_id"]?$_POST["country_id"]:$mysoc->country_id;
+ $object->country_id=$_POST["country_id"]?$_POST["country_id"]:(empty($objsoc->country_id)?$mysoc->country_id:$objsoc->country_id);
if ($object->country_id)
{
$tmparray=getCountry($object->country_id,'all');
@@ -460,7 +460,6 @@ else
print '</td></tr>';
// Country
- if (dol_strlen(trim($object->country_id)) == 0) $object->country_id = $objsoc->country_id; // Predefined with third party
print '<tr><td>'.$langs->trans("Country").'</td><td colspan="'.$colspan.'">';
print $form->select_country((isset($_POST["country_id"])?$_POST["country_id"]:$object->country_id),'country_id');
if ($user->admin) print info_admin($langs->trans("YouCanChangeValuesForThisListFromDictionnarySetup"),1);
--
GitLab