From 3126d1f9d9dcf32fd2d775698f5c0c0ce9dfdffc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 3 Jul 2011 18:32:08 +0000 Subject: [PATCH] Can return country id from country code --- htdocs/lib/company.lib.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/htdocs/lib/company.lib.php b/htdocs/lib/company.lib.php index 2f7ef32b660..fd74cf79c4b 100644 --- a/htdocs/lib/company.lib.php +++ b/htdocs/lib/company.lib.php @@ -24,7 +24,7 @@ * \file htdocs/lib/company.lib.php * \brief Ensemble de fonctions de base pour le module societe * \ingroup societe - * \version $Id: company.lib.php,v 1.119 2011/06/26 18:53:16 eldy Exp $ + * \version $Id: company.lib.php,v 1.120 2011/07/03 18:32:08 eldy Exp $ */ /** @@ -210,7 +210,7 @@ function societe_admin_prepare_head($object) /** * Return country label, code or id from an id or a code * @param id Id or code of country - * @param withcode 0=Return label, 1=Return code + label, 2=Return code from id + * @param withcode 0=Return label, 1=Return code + label, 2=Return code from id, 3=Return id from code * @param dbtouse Database handler (using in global way may fail because of conflicts with some autoload features) * @param outputlangs Lang object for output translation * @param entconv 0=Return value without entities and not converted to output charset @@ -243,6 +243,7 @@ function getCountry($id,$withcode=0,$dbtouse=0,$outputlangs='',$entconv=1) } if ($withcode == 1) return $label?"$obj->code - $label":"$obj->code"; else if ($withcode == 2) return $obj->code; + else if ($withcode == 3) return $obj->rowid; else return $label; } else