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

Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0

Browse Source 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
This commit is contained in:
Laurent Destailleur 2020-04-12 16:52:58 +02:00
commit eebf48b27c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/comm/action/class/actioncomm.class.php
View File

@ -190,7 +190,7 @@ class ActionComm extends CommonObject
* Object user of owner * Object user of owner
* @var User * @var User
* @deprecated * @deprecated
* @see userownerid * @see $userownerid
*/ */
public $usertodo; public $usertodo;
@ -198,7 +198,7 @@ class ActionComm extends CommonObject
* Object user that did action * Object user that did action
* @var User * @var User
* @deprecated * @deprecated
* @see userdoneid * @see $userdoneid
*/ */
public $userdone; public $userdone;
@ -209,7 +209,7 @@ class ActionComm extends CommonObject
* Company linked to action (optional) * Company linked to action (optional)
* @var Societe|null * @var Societe|null
* @deprecated * @deprecated
* @see socid * @see $socid
*/ */
public $societe; public $societe;
@ -217,7 +217,7 @@ class ActionComm extends CommonObject
* Contact linked to action (optional) * Contact linked to action (optional)
* @var Contact|null * @var Contact|null
* @deprecated * @deprecated
* @see contactid * @see $contactid
*/ */
public $contact; public $contact;
@ -797,7 +797,7 @@ class ActionComm extends CommonObject
dol_syslog(get_class($this)."::delete", LOG_DEBUG); dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$res=$this->db->query($sql); $res=$this->db->query($sql);
if ($res < 0) { if (!$res) {
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
$error++; $error++;
} }
@ -808,7 +808,7 @@ class ActionComm extends CommonObject
dol_syslog(get_class($this)."::delete", LOG_DEBUG); dol_syslog(get_class($this)."::delete", LOG_DEBUG);
$res=$this->db->query($sql); $res=$this->db->query($sql);
if ($res < 0) { if (!$res) {
$this->error=$this->db->lasterror(); $this->error=$this->db->lasterror();
$error++; $error++;
} }