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

Update user.class.php

Browse Source
This commit is contained in:
Frédéric FRANCE 2020-11-10 21:43:45 +01:00 committed by GitHub
parent 00e3627dd2
commit fd078ef713
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,6 +74,10 @@ class User extends CommonObject
public $ldap_sid; public $ldap_sid;
public $search_sid; public $search_sid;
public $employee; public $employee;
/**
* @var string gender
*/
public $gender; public $gender;
public $birth; public $birth;
@ -307,6 +311,9 @@ class User extends CommonObject
public $default_c_exp_tax_cat; public $default_c_exp_tax_cat;
public $default_range; public $default_range;
/**
*@var int id of warehouse
*/
public $fk_warehouse; public $fk_warehouse;
public $fields = array( public $fields = array(
@ -2916,23 +2923,17 @@ class User extends CommonObject
$sql .= " FROM ".MAIN_DB_PREFIX."user"; $sql .= " FROM ".MAIN_DB_PREFIX."user";
if ($option == 'superadmin') { if ($option == 'superadmin') {
$sql .= " WHERE entity = 0"; $sql .= " WHERE entity = 0";
if ($admin >= 0) {
$sql .= " AND admin = ".$admin;
}
} else { } else {
$sql .= " WHERE entity IN (".getEntity('user', 0).")"; $sql .= " WHERE entity IN (".getEntity('user', 0).")";
if ($limitTo == 'active') { }
$sql .= " AND statut = 1"; if ($admin >= 0) {
} $sql .= " AND admin = ".(int) $admin;
if ($admin >= 0) {
$sql .= " AND admin = ".$admin;
}
} }
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {
$obj = $this->db->fetch_object($resql); $obj = $this->db->fetch_object($resql);
$nb = $obj->nb; $nb = (int) $obj->nb;
$this->db->free($resql); $this->db->free($resql);
return $nb; return $nb;