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

Merge pull request #14160 from OPEN-DSI/new-societe-get-sales-representatives-order-by

Browse Source 
NEW add order by lastname and firstname by default
This commit is contained in:
Laurent Destailleur 2020-07-03 00:29:38 +02:00 committed by GitHub
commit cae55da399
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/societe/class/societe.class.php
View File

@ -2070,11 +2070,13 @@ class Societe extends CommonObject
/** /**
* Return array of sales representatives * Return array of sales representatives
* *
* @param User $user Object user * @param User $user Object user
* @param int $mode 0=Array with properties, 1=Array of id. * @param int $mode 0=Array with properties, 1=Array of id.
* @return array Array of sales representatives of third party * @param string $sortfield List of sort fields, separated by comma. Example: 't1.fielda,t2.fieldb'
* @param string $sortorder Sort order, separated by comma. Example: 'ASC,DESC';
* @return array Array of sales representatives of third party
*/ */
public function getSalesRepresentatives(User $user, $mode = 0) public function getSalesRepresentatives(User $user, $mode = 0, $sortfield = null, $sortorder = null)
{ {
global $conf; global $conf;
@ -2091,6 +2093,11 @@ class Societe extends CommonObject
} else $sql .= " WHERE entity in (0, ".$conf->entity.")"; } else $sql .= " WHERE entity in (0, ".$conf->entity.")";
$sql .= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id; $sql .= " AND u.rowid = sc.fk_user AND sc.fk_soc = ".$this->id;
if (empty($sortfield) && empty($sortorder)) {
$sortfield = 'u.lastname,u.firstname';
$sortorder = 'ASC,ASC';
}
$sql .= $this->db->order($sortfield, $sortorder);
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) if ($resql)