diff --git a/htdocs/contact/card.php b/htdocs/contact/card.php index bc0031b5992..87189528d5a 100644 --- a/htdocs/contact/card.php +++ b/htdocs/contact/card.php @@ -607,7 +607,15 @@ else // State if (empty($conf->global->SOCIETE_DISABLE_STATE)) { - print ''; + if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE) && ($conf->global->MAIN_SHOW_REGION_IN_STATE == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE == 2)) + { + print ''; + } + else + { + print ''; + } + if ($object->country_id) { print $formcompany->select_state(GETPOST("state_id",'alpha')?GETPOST("state_id",'alpha'):$object->state_id,$object->country_code,'state_id'); @@ -852,7 +860,15 @@ else // State if (empty($conf->global->SOCIETE_DISABLE_STATE)) { - print ''; + if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE) && ($conf->global->MAIN_SHOW_REGION_IN_STATE == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE == 2)) + { + print ''; + } + else + { + print ''; + } + print $formcompany->select_state($object->state_id,isset($_POST["country_id"])?GETPOST("country_id"):$object->country_id,'state_id'); print ''; } diff --git a/htdocs/langs/en_US/companies.lang b/htdocs/langs/en_US/companies.lang index 7cff22df092..c5bc84acaf8 100644 --- a/htdocs/langs/en_US/companies.lang +++ b/htdocs/langs/en_US/companies.lang @@ -56,6 +56,7 @@ Address=Address State=State/Province StateShort=State Region=Region +Region-State=Region - State Country=Country CountryCode=Country code CountryId=Country id diff --git a/htdocs/langs/pt_PT/companies.lang b/htdocs/langs/pt_PT/companies.lang index 4875dc8e3de..8f797802925 100644 --- a/htdocs/langs/pt_PT/companies.lang +++ b/htdocs/langs/pt_PT/companies.lang @@ -56,6 +56,7 @@ Address=Direcção State=Distrito StateShort=Estado Region=Região +Region-State=Distrito - Concelho Country=País CountryCode=Código país CountryId=ID país