diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php index 2dc70b74c7d..d3a3854309a 100644 --- a/htdocs/societe/card.php +++ b/htdocs/societe/card.php @@ -1143,7 +1143,15 @@ else // State if (empty($conf->global->SOCIETE_DISABLE_STATE)) { - print ''.fieldLabel('State','state_id').''; + if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2)) + { + print ''.fieldLabel('Region-State','state_id').''; + } + else + { + print ''.fieldLabel('State','state_id').''; + } + if ($object->country_id) print $formcompany->select_state($object->state_id,$object->country_code); else print $countrynotdefined; print ''; @@ -1700,7 +1708,15 @@ else // State if (empty($conf->global->SOCIETE_DISABLE_STATE)) { - print ''.fieldLabel('State','state_id').''; + if(!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && ($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 || $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 2)) + { + print ''.fieldLabel('Region-State','state_id').''; + } + else + { + print ''.fieldLabel('State','state_id').''; + } + print $formcompany->select_state($object->state_id,$object->country_code); print ''; }