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

Merge pull request #9455 from IAS-SYSTEMS-CSC/develop

Browse Source 
Fix : use correct resultset
This commit is contained in:
Laurent Destailleur 2018-09-12 18:59:45 +02:00 committed by GitHub
commit cb174c3d1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/modules/modAgenda.class.php
View File

@ -90,7 +90,7 @@ class modAgenda extends DolibarrModules
$resql = $this->db->query($sqlreadactions); $resql = $this->db->query($sqlreadactions);
if ($resql) if ($resql)
{ {
while ($obj = $this->db->fetch_object($sqlreadactions)) while ($obj = $this->db->fetch_object($resql))
{ {
//if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue; // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation). //if (preg_match('/_CREATE$/',$obj->code) && (! in_array($obj->code, array('COMPANY_CREATE','PRODUCT_CREATE','TASK_CREATE')))) continue; // We don't track such events (*_CREATE) by default, we prefer validation (except thirdparty/product/task creation because there is no validation).
if (preg_match('/^TASK_/',$obj->code)) continue; // We don't track such events by default. if (preg_match('/^TASK_/',$obj->code)) continue; // We don't track such events by default.