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

Merge pull request #18744 from Hystepik/develop#5

Browse Source 
Fix error on html.for.class on ismultientitymanaged test
This commit is contained in:
Laurent Destailleur 2021-09-17 11:24:32 +02:00 committed by GitHub
commit 2132bd1b9f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/class/html.form.class.php
View File

@ -7009,7 +7009,7 @@ class Form
$tmparray = explode('@', $objecttmp->ismultientitymanaged); $tmparray = explode('@', $objecttmp->ismultientitymanaged);
$sql .= " INNER JOIN ".MAIN_DB_PREFIX.$tmparray[1]." as parenttable ON parenttable.rowid = t.".$tmparray[0]; $sql .= " INNER JOIN ".MAIN_DB_PREFIX.$tmparray[1]." as parenttable ON parenttable.rowid = t.".$tmparray[0];
} }
if ($objecttmp->ismultientitymanaged == 'fk_soc@societe') { if ($objecttmp->ismultientitymanaged === 'fk_soc@societe') {
if (!$user->rights->societe->client->voir && !$user->socid) { if (!$user->rights->societe->client->voir && !$user->socid) {
$sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc"; $sql .= ", ".MAIN_DB_PREFIX."societe_commerciaux as sc";
} }
@ -7037,7 +7037,7 @@ class Form
$sql .= " AND t.fk_soc = ".((int) $user->socid); $sql .= " AND t.fk_soc = ".((int) $user->socid);
} }
} }
if ($objecttmp->ismultientitymanaged == 'fk_soc@societe') { if ($objecttmp->ismultientitymanaged === 'fk_soc@societe') {
if (!$user->rights->societe->client->voir && !$user->socid) { if (!$user->rights->societe->client->voir && !$user->socid) {
$sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id); $sql .= " AND t.rowid = sc.fk_soc AND sc.fk_user = ".((int) $user->id);
} }