From b387c3fdf84b00e220906cdb2dba65f40746dac5 Mon Sep 17 00:00:00 2001
From: Rui Strecht <rui.strecht@aliartalentos.com>
Date: Wed, 31 Jan 2018 11:45:30 +0000
Subject: [PATCH] Forgot to update other files to same PR changes

---
 htdocs/admin/company.php                 | 2 +-
 htdocs/core/class/commonobject.class.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/admin/company.php b/htdocs/admin/company.php
index 825f4a89be9..4456cd918be 100644
--- a/htdocs/admin/company.php
+++ b/htdocs/admin/company.php
@@ -742,7 +742,7 @@ else
 
 	print '<tr class="oddeven"><td>'.$langs->trans("State").'</td><td>';
 	if ($mysoc->state_id) {
-		print getState($mysoc->state_id,$conf->global->MAIN_SHOW_STATE_CODE,0,$conf->global->MAIN_SHOW_REGION_IN_STATE);
+		print getState($mysoc->state_id,$conf->global->MAIN_SHOW_STATE_CODE,0,$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
 	}
 	else print '&nbsp;';
 	print '</td></tr>';
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 0ee5a371c73..43c216de26c 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -507,7 +507,7 @@ abstract class CommonObject
 		$out='<!-- BEGIN part to show address block -->';
 
 		$outdone=0;
-		$coords = $this->getFullAddress(1,', ',$conf->global->MAIN_SHOW_REGION_IN_STATE);
+		$coords = $this->getFullAddress(1,', ',$conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT);
 		if ($coords)
 		{
 			if (! empty($conf->use_javascript_ajax))
@@ -525,7 +525,7 @@ abstract class CommonObject
 		if (! in_array($this->country_code,$countriesusingstate) && empty($conf->global->MAIN_FORCE_STATE_INTO_ADDRESS)   // If MAIN_FORCE_STATE_INTO_ADDRESS is on, state is already returned previously with getFullAddress
 				&& empty($conf->global->SOCIETE_DISABLE_STATE) && $this->state)
 		{
-            if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE) && $conf->global->MAIN_SHOW_REGION_IN_STATE == 1 && $this->region) {
+            if (!empty($conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT) && $conf->global->MAIN_SHOW_REGION_IN_STATE_SELECT == 1 && $this->region) {
                 $out.=($outdone?' - ':'').$this->region.' - '.$this->state;
             }
             else {