Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
Conflicts: htdocs/comm/action/class/actioncomm.class.php
This commit is contained in:
commit
ef802d9c39
@ -144,7 +144,7 @@ class ActionComm extends CommonObject
|
||||
if ($this->elementtype=='facture') $this->elementtype='invoice';
|
||||
if ($this->elementtype=='commande') $this->elementtype='order';
|
||||
if ($this->elementtype=='contrat') $this->elementtype='contract';
|
||||
|
||||
|
||||
$userownerid=$this->userownerid;
|
||||
$userdoneid=$this->userdoneid;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user