mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-05 09:08:09 +01:00
Merge branch '16.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0
This commit is contained in:
@@ -4027,7 +4027,7 @@ abstract class CommonObject
|
||||
$num = $this->db->num_rows($resql);
|
||||
$i = 0;
|
||||
while ($i < $num) {
|
||||
$obj = $this->db->fetch_object($resql);
|
||||
$obj = $this->db->fetch_object($resql);
|
||||
if ($justsource || $justtarget) {
|
||||
if ($justsource) {
|
||||
$this->linkedObjectsIds[$obj->targettype][$obj->rowid] = $obj->fk_target;
|
||||
@@ -4087,8 +4087,12 @@ abstract class CommonObject
|
||||
$classpath = 'adherents/class';
|
||||
$module = 'adherent';
|
||||
} elseif ($objecttype == 'contact') {
|
||||
$module = 'societe';
|
||||
}
|
||||
$module = 'societe';
|
||||
} elseif ($objecttype == 'action') {
|
||||
$module = 'agenda';
|
||||
$subelement = 'actionComm';
|
||||
}
|
||||
|
||||
// Set classfile
|
||||
$classfile = strtolower($subelement);
|
||||
$classname = ucfirst($subelement);
|
||||
|
||||
Reference in New Issue
Block a user