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

Merge pull request #22171 from Hystepik/develop#4

Browse Source 
fix : scrutinaizer report
This commit is contained in:
Laurent Destailleur 2022-09-09 15:46:13 +02:00 committed by GitHub
commit 757f67c26e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/class/html.formticket.class.php
View File

@ -77,6 +77,7 @@ class FormTicket
public $withtitletopic; public $withtitletopic;
public $withtopicreadonly; public $withtopicreadonly;
public $withreadid;
public $withcompany; // affiche liste déroulante company public $withcompany; // affiche liste déroulante company
public $withfromsocid; public $withfromsocid;
public $withfromcontactid; public $withfromcontactid;

18
htdocs/projet/class/projectstats.class.php
View File

@ -32,6 +32,11 @@ class ProjectStats extends Stats
public $status; public $status;
public $opp_status; public $opp_status;
//SQL stat
public $field;
public $from;
public $where;
/** /**
* Constructor * Constructor
@ -46,6 +51,18 @@ class ProjectStats extends Stats
require_once 'project.class.php'; require_once 'project.class.php';
$this->project = new Project($this->db); $this->project = new Project($this->db);
$this->from = MAIN_DB_PREFIX.$this->project->table_element;
$this->field = 'opp_amount';
$this->where = " entity = ".$conf->entity;
if ($this->socid > 0) {
$this->where .= " AND fk_soc = ".((int) $this->socid);
}
if (is_array($this->userid) && count($this->userid) > 0) {
$this->where .= ' AND fk_user IN ('.$this->db->sanitize(join(',', $this->userid)).')';
} elseif ($this->userid > 0) {
$this->where .= " AND fk_user = ".((int) $this->userid);
}
} }
@ -538,7 +555,6 @@ class ProjectStats extends Stats
{ {
$sql = "SELECT date_format(datef,'%m') as dm, AVG(f.".$this->field.")"; $sql = "SELECT date_format(datef,'%m') as dm, AVG(f.".$this->field.")";
$sql .= " FROM ".$this->from; $sql .= " FROM ".$this->from;
$sql .= $this->join;
$sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'"; $sql .= " WHERE f.datef BETWEEN '".$this->db->idate(dol_get_first_day($year))."' AND '".$this->db->idate(dol_get_last_day($year))."'";
$sql .= " AND ".$this->where; $sql .= " AND ".$this->where;
$sql .= " GROUP BY dm"; $sql .= " GROUP BY dm";