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

Debug state

Browse Source
This commit is contained in:
aspangaro 2015-11-19 06:21:37 +01:00
parent 1e4d8ec104
commit 98d5f21787
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/user/card.php
View File

@ -903,8 +903,7 @@ if (($action == 'create') || ($action == 'adduserldap'))
if (empty($conf->global->USER_DISABLE_STATE)) if (empty($conf->global->USER_DISABLE_STATE))
{ {
print '<tr><td>'.fieldLabel('State','state_id').'</td><td class="maxwidthonsmartphone">'; print '<tr><td>'.fieldLabel('State','state_id').'</td><td class="maxwidthonsmartphone">';
if ($object->country_id) print $formcompany->select_state($object->state_id,$object->country_code); print $formcompany->select_state($object->state_id,$object->country_code, 'state_id');
else print $countrynotdefined;
print '</td></tr>'; print '</td></tr>';
} }
@ -1987,8 +1986,8 @@ else
// State // State
if (empty($conf->global->USER_DISABLE_STATE)) if (empty($conf->global->USER_DISABLE_STATE))
{ {
print '<tr><td>'.fieldLabel('State','state_id').'</td><td colspan="3">'; print '<tr><td>'.fieldLabel('State','state_id').'</td><td>';
print $formcompany->select_state($object->state_id,$object->country_code); print $formcompany->select_state($object->state_id,$object->country_code, 'state_id');
print '</td></tr>'; print '</td></tr>';
} }

4
htdocs/user/class/user.class.php
View File

@ -169,7 +169,7 @@ class User extends CommonObject
// Get user // Get user
$sql = "SELECT u.rowid, u.lastname, u.firstname, u.employee, u.gender, u.email, u.job, u.skype, u.signature, u.office_phone, u.office_fax, u.user_mobile,"; $sql = "SELECT u.rowid, u.lastname, u.firstname, u.employee, u.gender, u.email, u.job, u.skype, u.signature, u.office_phone, u.office_fax, u.user_mobile,";
$sql.= " u.address, u.zip, u.town, u.fk_state, u.fk_country as country_id,"; $sql.= " u.address, u.zip, u.town, u.fk_state as state_id, u.fk_country as country_id,";
$sql.= " u.admin, u.login, u.note,"; $sql.= " u.admin, u.login, u.note,";
$sql.= " u.pass, u.pass_crypted, u.pass_temp, u.api_key,"; $sql.= " u.pass, u.pass_crypted, u.pass_temp, u.api_key,";
$sql.= " u.fk_soc, u.fk_socpeople, u.fk_member, u.fk_user, u.ldap_sid,"; $sql.= " u.fk_soc, u.fk_socpeople, u.fk_member, u.fk_user, u.ldap_sid,";
@ -258,7 +258,7 @@ class User extends CommonObject
$this->country_code = $obj->country_id?$obj->country_code:''; $this->country_code = $obj->country_id?$obj->country_code:'';
$this->country = $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):''; $this->country = $obj->country_id?($langs->trans('Country'.$obj->country_code)!='Country'.$obj->country_code?$langs->transnoentities('Country'.$obj->country_code):$obj->country):'';
$this->state_id = $obj->fk_departement; $this->state_id = $obj->state_id;
$this->state_code = $obj->state_code; $this->state_code = $obj->state_code;
$this->state = ($obj->state!='-'?$obj->state:''); $this->state = ($obj->state!='-'?$obj->state:'');