Merge branch '16.0' of git@github.com:/Dolibarr/dolibarr.git into 17.0

This commit is contained in:
Laurent Destailleur (aka Eldy)
2024-12-19 17:50:34 +01:00

View File

@@ -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);