lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Forgot withregion condition if we want no state code

Browse Source
This commit is contained in:
Rui Strecht 2018-02-07 16:06:58 +00:00
parent 8c732a1443
commit 3a7cb43ad5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/lib/company.lib.php
View File

@ -517,10 +517,15 @@ function getState($id,$withcode='',$dbtouse=0,$withregion='',$outputlangs='',$en
return array('id'=>$obj->id,'code'=>$obj->code,'label'=>$label); return array('id'=>$obj->id,'code'=>$obj->code,'label'=>$label);
} }
} }
else {
if ($withregion == 1) {
return $label = $obj->region_name . ' - ' . $label;
}
else { else {
return $label; return $label;
} }
} }
}
else else
{ {
return $langs->transnoentitiesnoconv("NotDefined"); return $langs->transnoentitiesnoconv("NotDefined");