diff --git a/include/QueryGenerator/QueryGenerator.php b/include/QueryGenerator/QueryGenerator.php
index 649312e74e04fbbced76bd544c26342447fd0885..6abdb7beb55866b73b2bc612f43b105a9f69d1fc 100644
--- a/include/QueryGenerator/QueryGenerator.php
+++ b/include/QueryGenerator/QueryGenerator.php
@@ -763,7 +763,13 @@ class QueryGenerator {
$columnList[] = "$referenceTable.$column";
}
if(php7_count($columnList) > 1) {
- $columnSql = getSqlForNameInDisplayFormat(array('first_name'=>$columnList[0],'last_name'=>$columnList[1]),'Users');
+ if ($module == "Users") {
+ // Special case
+ $columnSql = getSqlForNameInDisplayFormat(array('first_name'=>$columnList[0],'last_name'=>$columnList[1]),'Users');
+ } else {
+ // Leads or contacts
+ $columnSql = getSqlForNameInDisplayFormat(array('firstname'=>$columnList[0],'lastname'=>$columnList[1]), $module);
+ }
} else {
$columnSql = implode('', $columnList);
}
diff --git a/include/utils/utils.php b/include/utils/utils.php
index ca897998b55be668bc52dd8554c2dbcf7ac4ce4e..f6385811d4c10bf5e3ef026579797ad69764e888 100755
--- a/include/utils/utils.php
+++ b/include/utils/utils.php
@@ -148,13 +148,13 @@ function get_user_array($add_blank=true, $status="Active", $assigned_user="",$pr
vtiger_users.first_name as first_name ,vtiger_users.last_name as last_name, vtiger_users.userlabel AS userlabel
from vtiger_user2role inner join vtiger_users on vtiger_users.id=vtiger_user2role.userid inner join vtiger_role on vtiger_role.roleid=vtiger_user2role.roleid where vtiger_role.parentrole like ? and status='Active' union
select shareduserid as id,vtiger_users.user_name as user_name ,
- vtiger_users.first_name as first_name ,vtiger_users.last_name as last_name,vtiger_users.userlabel AS userlabel from vtiger_tmp_write_user_sharing_per inner join vtiger_users on vtiger_users.id=vtiger_tmp_write_user_sharing_per.shareduserid where status='Active' and vtiger_tmp_write_user_sharing_per.userid=? and vtiger_tmp_write_user_sharing_per.tabid=? and (user_name != 'admin' OR is_owner=1)";
+ vtiger_users.first_name as first_name ,vtiger_users.last_name as last_name,vtiger_users.userlabel AS userlabel from vtiger_tmp_write_user_sharing_per inner join vtiger_users on vtiger_users.id=vtiger_tmp_write_user_sharing_per.shareduserid where status='Active' and vtiger_tmp_write_user_sharing_per.userid=? and vtiger_tmp_write_user_sharing_per.tabid=?";
$params = array($current_user->id, $current_user_parent_role_seq."::%", $current_user->id, getTabid($module));
}
else
{
$log->debug("Sharing is Public. All vtiger_users should be listed");
- $query = "SELECT id, user_name,first_name,last_name,userlabel from vtiger_users WHERE status=? and (user_name != 'admin' OR is_owner=1)";
+ $query = "SELECT id, user_name,first_name,last_name,userlabel from vtiger_users WHERE status=?";
$params = array($status);
}
}
diff --git a/modules/Calendar/models/Module.php b/modules/Calendar/models/Module.php
index 11fd4eb3c8dd2fc413e2cde5dafe403fd59deb1e..65a1d40e0c06be882c0ebb17630c5754c8c6d5af 100644
--- a/modules/Calendar/models/Module.php
+++ b/modules/Calendar/models/Module.php
@@ -306,7 +306,7 @@ class Calendar_Module_Model extends Vtiger_Module_Model {
$currentUser = Users_Record_Model::getCurrentUserModel();
if($currentUser->isAdminUser()) {
$query = "SELECT userlabel, id AS userid
- FROM vtiger_users WHERE status='Active' AND (user_name != 'admin' OR is_owner = 1) AND id <> ?";
+ FROM vtiger_users WHERE status='Active' AND id <> ?";
$result = $db->pquery($query, array($id));
} else {
$query = "SELECT vtiger_users.userlabel, vtiger_users.id AS userid
diff --git a/modules/Users/models/ListView.php b/modules/Users/models/ListView.php
index 20d72c0f674be222c033341b89794374f77e1432..963de8b27749b6617c6a1d0a6d14649653b22833 100644
--- a/modules/Users/models/ListView.php
+++ b/modules/Users/models/ListView.php
@@ -74,7 +74,6 @@ class Users_ListView_Model extends Vtiger_ListView_Model {
$listQueryComponents = explode(" WHERE vtiger_users.status='Active' AND", $listQuery);
$listQuery = implode(' WHERE ', $listQueryComponents);
}
- $listQuery .= " AND (vtiger_users.user_name != 'admin' OR vtiger_users.is_owner = 1)";
// Impose non-admin restrictions.
$user = vglobal('current_user');
diff --git a/packages/vtiger/mandatory/Import.zip b/packages/vtiger/mandatory/Import.zip
index 8b879521d565b697cd6196ad5ac80a398b8b1797..9e030759cbffba5ef8559f821b417ca88e13f4d3 100644
Binary files a/packages/vtiger/mandatory/Import.zip and b/packages/vtiger/mandatory/Import.zip differ
diff --git a/packages/vtiger/mandatory/MailManager.zip b/packages/vtiger/mandatory/MailManager.zip
index 1a91b4ecaa8d32372d31173080a906d87750ead0..ba0486a024a74892b0ddac260bbb24ca73263ae3 100644
Binary files a/packages/vtiger/mandatory/MailManager.zip and b/packages/vtiger/mandatory/MailManager.zip differ
diff --git a/packages/vtiger/mandatory/Mobile.zip b/packages/vtiger/mandatory/Mobile.zip
index 314d6615e333475f3df901946e9ab7cbc65e03b2..0e42a60e96fbf02725e840eb33a8b1f0509afffa 100644
Binary files a/packages/vtiger/mandatory/Mobile.zip and b/packages/vtiger/mandatory/Mobile.zip differ
diff --git a/packages/vtiger/mandatory/ModTracker.zip b/packages/vtiger/mandatory/ModTracker.zip
index f4ab5d282b2dcdef07f59f7e48bcc0d7ae116b2a..cb7db894bbd2fb6ab7f03c228ee30be046123d50 100644
Binary files a/packages/vtiger/mandatory/ModTracker.zip and b/packages/vtiger/mandatory/ModTracker.zip differ
diff --git a/packages/vtiger/mandatory/PBXManager.zip b/packages/vtiger/mandatory/PBXManager.zip
index 603660f72f8d605a82390cd91e0872d4de00340c..19cab71e4eafd7fc30ec7e298583b89d2cd55b13 100644
Binary files a/packages/vtiger/mandatory/PBXManager.zip and b/packages/vtiger/mandatory/PBXManager.zip differ
diff --git a/packages/vtiger/mandatory/ServiceContracts.zip b/packages/vtiger/mandatory/ServiceContracts.zip
index bb9081390d3787eba29b37b2f247e7e7143e33fd..4d34de34f78c3438518d94abb9f423e46da2ade1 100644
Binary files a/packages/vtiger/mandatory/ServiceContracts.zip and b/packages/vtiger/mandatory/ServiceContracts.zip differ
diff --git a/packages/vtiger/mandatory/Services.zip b/packages/vtiger/mandatory/Services.zip
index 74f2fa669a88929bb070f990d2c02b30ea4fbee8..260f827df3c2fd5f9e3bfda000996382fe11fa88 100644
Binary files a/packages/vtiger/mandatory/Services.zip and b/packages/vtiger/mandatory/Services.zip differ
diff --git a/packages/vtiger/mandatory/WSAPP.zip b/packages/vtiger/mandatory/WSAPP.zip
index e80ccf4192f425e8dcb93c459e6c70d5494fa39c..4c9d79559ba194579d7fee63291581d1a0341077 100644
Binary files a/packages/vtiger/mandatory/WSAPP.zip and b/packages/vtiger/mandatory/WSAPP.zip differ
diff --git a/packages/vtiger/marketplace/ExtensionStore.zip b/packages/vtiger/marketplace/ExtensionStore.zip
index 421f1f37e5857e0970abded28b78f5c5aead54ff..4f132d5fd748c3fc374dcee91e6ec6789d48e767 100644
Binary files a/packages/vtiger/marketplace/ExtensionStore.zip and b/packages/vtiger/marketplace/ExtensionStore.zip differ
diff --git a/packages/vtiger/optional/Arabic_ar_ae.zip b/packages/vtiger/optional/Arabic_ar_ae.zip
index f66e6328829d396f62fd840f827c5ef319d1f59a..9d99a06e674c076464cdc678a348a11cc216c310 100644
Binary files a/packages/vtiger/optional/Arabic_ar_ae.zip and b/packages/vtiger/optional/Arabic_ar_ae.zip differ
diff --git a/packages/vtiger/optional/Assets.zip b/packages/vtiger/optional/Assets.zip
index e58e3b846f2782d971a2a4bca93f96e761b13690..c7d24301373f345ebb1562d1457e389eb5b34d12 100644
Binary files a/packages/vtiger/optional/Assets.zip and b/packages/vtiger/optional/Assets.zip differ
diff --git a/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip b/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip
index 0c607aeec1e40debe87f8c51ade67ec5aa5041e1..89d3e451353a9a615c5aefd6e5ec0e97972932d0 100644
Binary files a/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip and b/packages/vtiger/optional/BrazilianLanguagePack_bz_bz.zip differ
diff --git a/packages/vtiger/optional/BritishLanguagePack_br_br.zip b/packages/vtiger/optional/BritishLanguagePack_br_br.zip
index 28f6e07acbc2298bce12106e66242c1c1688d11f..147103a1cc1c12f737b1fe4e4c831c837d42e348 100644
Binary files a/packages/vtiger/optional/BritishLanguagePack_br_br.zip and b/packages/vtiger/optional/BritishLanguagePack_br_br.zip differ
diff --git a/packages/vtiger/optional/CustomerPortal.zip b/packages/vtiger/optional/CustomerPortal.zip
index f8f25e769373f85cef3e90adbab159cadbd1c8ac..3f071db4394c543550c0bbeffc499df4ea4f378f 100644
Binary files a/packages/vtiger/optional/CustomerPortal.zip and b/packages/vtiger/optional/CustomerPortal.zip differ
diff --git a/packages/vtiger/optional/Deutsch.zip b/packages/vtiger/optional/Deutsch.zip
index 0d7a6f0c0ce0e886e3ff095012f7714d3307f8ef..f09928442f30ecad8f7f9ec43c3bc3692f26f5ee 100644
Binary files a/packages/vtiger/optional/Deutsch.zip and b/packages/vtiger/optional/Deutsch.zip differ
diff --git a/packages/vtiger/optional/Dutch.zip b/packages/vtiger/optional/Dutch.zip
index 23679a435825cda05d6d36df1cb49ccdd0752b53..2cac9bb30070d721468a28180a813e4ea856cf43 100644
Binary files a/packages/vtiger/optional/Dutch.zip and b/packages/vtiger/optional/Dutch.zip differ
diff --git a/packages/vtiger/optional/EmailTemplates.zip b/packages/vtiger/optional/EmailTemplates.zip
index 8c96595e409849548a5858853dc8460fbadb1ea3..af8991810b3ab0092cb8005b76ccdc2d567cb58c 100644
Binary files a/packages/vtiger/optional/EmailTemplates.zip and b/packages/vtiger/optional/EmailTemplates.zip differ
diff --git a/packages/vtiger/optional/French.zip b/packages/vtiger/optional/French.zip
index a30379660cf4815ee102e23f2432ddc96236229c..bd153e23dc74cae6a8c252a9ecf5d4955343eafa 100644
Binary files a/packages/vtiger/optional/French.zip and b/packages/vtiger/optional/French.zip differ
diff --git a/packages/vtiger/optional/Google.zip b/packages/vtiger/optional/Google.zip
index 7d7f342af67ae7b525a0b2fe309c7a486390add5..5e0a23428557a2326f1b24053592a5f16aeb264e 100644
Binary files a/packages/vtiger/optional/Google.zip and b/packages/vtiger/optional/Google.zip differ
diff --git a/packages/vtiger/optional/Hungarian.zip b/packages/vtiger/optional/Hungarian.zip
index 283897d0e4fbadc08d2775baf634d02129cad25a..b065d52ed6242d1fa0e7db4a068f7025c4b3f40f 100644
Binary files a/packages/vtiger/optional/Hungarian.zip and b/packages/vtiger/optional/Hungarian.zip differ
diff --git a/packages/vtiger/optional/ItalianLanguagePack_it_it.zip b/packages/vtiger/optional/ItalianLanguagePack_it_it.zip
index 543a8b516fa43ef9c33087eadb46ffe4a966a889..83073beab04a9f9161d039d2c494ef58fd9584f5 100644
Binary files a/packages/vtiger/optional/ItalianLanguagePack_it_it.zip and b/packages/vtiger/optional/ItalianLanguagePack_it_it.zip differ
diff --git a/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip b/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip
index 816d870cede50c73b7c885223239a552a1ed39c7..7a9f0d028aaf0538e42b52298ec352a3c5b55d30 100644
Binary files a/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip and b/packages/vtiger/optional/MexicanSpanishLanguagePack_es_mx.zip differ
diff --git a/packages/vtiger/optional/ModComments.zip b/packages/vtiger/optional/ModComments.zip
index d4dd7cbab25aef623993324db9131ca904261f51..adb1cc05e93e6449f3532de18a285b5175ab00bc 100644
Binary files a/packages/vtiger/optional/ModComments.zip and b/packages/vtiger/optional/ModComments.zip differ
diff --git a/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip b/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip
index 41acff3ae33b8af7a77524d17cdd99e356e870a8..54513f2a4c826a93bed88e4ef8694db8612c68fa 100644
Binary files a/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip and b/packages/vtiger/optional/PolishLanguagePack_pl_pl.zip differ
diff --git a/packages/vtiger/optional/Projects.zip b/packages/vtiger/optional/Projects.zip
index 4baac1894023af01af4ba23c4f3046a05f73fd11..43a776ac53d56e75c4b9a10502526ad2e10a3a38 100644
Binary files a/packages/vtiger/optional/Projects.zip and b/packages/vtiger/optional/Projects.zip differ
diff --git a/packages/vtiger/optional/RecycleBin.zip b/packages/vtiger/optional/RecycleBin.zip
index 9a700f08b2327e87430659b72426ca48db2bcdb7..502c09b2dd6160f1d61caa59db7351dedad07c57 100644
Binary files a/packages/vtiger/optional/RecycleBin.zip and b/packages/vtiger/optional/RecycleBin.zip differ
diff --git a/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip b/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip
index 043f62ffdd1d6b3f3cc5183f2841a89fe83d8a95..2494066b43d663efb14dd7037c59b9c4def83da7 100644
Binary files a/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip and b/packages/vtiger/optional/RomanianLanguagePack_rm_rm.zip differ
diff --git a/packages/vtiger/optional/Russian.zip b/packages/vtiger/optional/Russian.zip
index 03222f1405420b5b6a7c39388534ffe19ed087fc..5e8deafb601668a1f93ac0030a10243bba4aad14 100644
Binary files a/packages/vtiger/optional/Russian.zip and b/packages/vtiger/optional/Russian.zip differ
diff --git a/packages/vtiger/optional/SMSNotifier.zip b/packages/vtiger/optional/SMSNotifier.zip
index 7c0fab9939e36be5780f9813f46522aae183670b..7a46d3ca7cf0054144f70faf29d6ce84cd7f9118 100644
Binary files a/packages/vtiger/optional/SMSNotifier.zip and b/packages/vtiger/optional/SMSNotifier.zip differ
diff --git a/packages/vtiger/optional/Spanish.zip b/packages/vtiger/optional/Spanish.zip
index 92e8c42fcb770f26ae9007399803bffdfa660da7..44156fe4cda93932d3e71be079253ce266fa8d8a 100644
Binary files a/packages/vtiger/optional/Spanish.zip and b/packages/vtiger/optional/Spanish.zip differ
diff --git a/packages/vtiger/optional/Sweden_sv_se.zip b/packages/vtiger/optional/Sweden_sv_se.zip
index 2a703890a409453b3072e43e5caaeba4ac8eb909..8edd2adc92e0fd880bdb7e51e6a6b1e8c1e42587 100644
Binary files a/packages/vtiger/optional/Sweden_sv_se.zip and b/packages/vtiger/optional/Sweden_sv_se.zip differ
diff --git a/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip b/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip
index 791d336c34c5e334ccdebc41615cb713efc9eb79..dcd1bb5239e59222f426ec535838bab992b22756 100644
Binary files a/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip and b/packages/vtiger/optional/TurkishLanguagePack_tr_tr.zip differ
diff --git a/packages/vtiger/optional/Webforms.zip b/packages/vtiger/optional/Webforms.zip
index 4e94d0dbee48f9ac426c9fd1f40d5b0e72d4d86a..5f1a5ce437462d0417c14902bf389fab3ae235b9 100644
Binary files a/packages/vtiger/optional/Webforms.zip and b/packages/vtiger/optional/Webforms.zip differ
diff --git a/vtigerversion.php b/vtigerversion.php
index 576391f7f6a5ef3b7139d0ee09be567ccf4edbd6..7988f163579cc6c13c6206a098e3847559b5bd3b 100644
--- a/vtigerversion.php
+++ b/vtigerversion.php
@@ -8,7 +8,7 @@
* All Rights Reserved.
************************************************************************************/
-$patch_version = '-20240505'; // -ve timestamp before release, +ve timestamp after release.
+$patch_version = '20240515'; // -ve timestamp before release, +ve timestamp after release.
$modified_database = '';
$vtiger_current_version = '8.2.0';
$_SESSION['vtiger_version'] = $vtiger_current_version;