From 2a782ff59ababc4b77edbbb94a42cb537b32963f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 15 Sep 2005 23:34:11 +0000 Subject: [PATCH] =?UTF-8?q?Le=20pays=20par=20defaut=20d'une=20nouvelle=20s?= =?UTF-8?q?oci=E9t=E9=20est=20positionn=E9=20sur=20celui=20de=20la=20soci?= =?UTF-8?q?=E9t=E9=20Dolibarr.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/soc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/soc.php b/htdocs/soc.php index dd4edc88507..fd7cbc1c779 100644 --- a/htdocs/soc.php +++ b/htdocs/soc.php @@ -182,7 +182,7 @@ if ($_GET["action"] == 'create' || $_POST["action"] == 'create') } // On positionne pays_id, pays_code et libelle du pays choisi - $soc->pays_id=$_POST["pays_id"]?$_POST["pays_id"]:(defined(MAIN_INFO_SOCIETE_PAYS)?MAIN_INFO_SOCIETE_PAYS:''); + $soc->pays_id=$_POST["pays_id"]?$_POST["pays_id"]:$conf->global->MAIN_INFO_SOCIETE_PAYS; if ($soc->pays_id) { $sql = "SELECT code, libelle from ".MAIN_DB_PREFIX."c_pays where rowid = ".$soc->pays_id; @@ -404,7 +404,7 @@ elseif ($_GET["action"] == 'edit' || $_POST["action"] == 'edit') $soc->adresse=$_POST["adresse"]; $soc->zip=$_POST["zip"]; $soc->ville=$_POST["ville"]; - $soc->pays_id=$_POST["pays_id"]?$_POST["pays_id"]:(defined(MAIN_INFO_SOCIETE_PAYS)?MAIN_INFO_SOCIETE_PAYS:''); + $soc->pays_id=$_POST["pays_id"]?$_POST["pays_id"]:$conf->global->MAIN_INFO_SOCIETE_PAYS; $soc->departement_id=$_POST["departement_id"]; $soc->tel=$_POST["tel"]; $soc->fax=$_POST["fax"];