Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-05 09:08:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX : removes traces of <<<HEAD conflicts following the postponement of branch 13 modifications (#32014)

Browse Source 
Co-authored-by: John Fleuret <john.fleuret@atgp.net>
This commit is contained in:
alkaan
2024-11-20 20:57:22 +01:00
committed by GitHub
parent 753e5e535d
commit 115323dec8
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
htdocs/core/class/commonobject.class.php
View File

@@ -2156,12 +2156,7 @@ abstract class CommonObject
if (!empty($user->admin) && empty($user->entity) && $conf->entity == 1) {
$sql .= " AND te.entity IS NOT NULL"; // Show all users
} else {
<<<<<<< HEAD
$sql .= " AND ug.fk_user = te.rowid";
$sql .= " AND ug.entity IN (".getEntity('usergroup').")";
=======
$sql .= " AND ug.entity IN (".getEntity($this->element).")";
>>>>>>> branch '13.0' of git@github.com:Dolibarr/dolibarr.git
}
} else {
$sql .= ' AND te.entity IN ('.getEntity($this->element).')';