diff --git a/languages/en_us/Users.php b/languages/en_us/Users.php
index c55af466b60e23fed7b626013fbf6033315489de..5e58d9b9ea2ff8404e798b335057b8b8a2877764 100644
--- a/languages/en_us/Users.php
+++ b/languages/en_us/Users.php
@@ -137,9 +137,9 @@ $languageStrings = array(
'Asia/Kuwait' => '(UTC+03:00) Kuwait, Riyadh',
'Asia/Baghdad' => '(UTC+03:00) Baghdad',
'Africa/Nairobi' => '(UTC+03:00) Nairobi',
+ 'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Tehran' => '(UTC+03:30) Tehran',
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi',
- 'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku',
'Asia/Yerevan' => '(UTC+04:00) Yerevan',
diff --git a/modules/Migration/schema/701_to_710.php b/modules/Migration/schema/701_to_710.php
index cb2cbaf98ffff85d4e61a9bb6515a84acaa5e82d..fb2d6ffffccb7128abf613a4ef459cca52734f92 100644
--- a/modules/Migration/schema/701_to_710.php
+++ b/modules/Migration/schema/701_to_710.php
@@ -106,6 +106,38 @@ if (defined('VTIGER_UPGRADE')) {
$em->registerHandler('vtiger.entity.aftersave', 'modules/Vtiger/handlers/FollowRecordHandler.php', 'FollowRecordHandler');
//END::Follow & unfollow features
+ //START::Reordering Timezones
+ $fieldName = 'time_zone';
+ $userModuleModel = Vtiger_Module_Model::getInstance('Users');
+ $fieldModel = Vtiger_Field_Model::getInstance($fieldName, $userModuleModel);
+ if ($fieldModel) {
+ $picklistValues = $fieldModel->getPicklistValues();
+
+ $utcTimezones = preg_grep('/\(UTC\)/', $picklistValues);
+ asort($utcTimezones);
+
+ $utcPlusTimezones = preg_grep('/\(UTC\+/', $picklistValues);
+ asort($utcPlusTimezones);
+
+ $utcMinusTimezones = preg_grep('/\(UTC\-/', $picklistValues);
+ arsort($utcMinusTimezones);
+
+ $timeZones = array_merge($utcMinusTimezones, $utcTimezones, $utcPlusTimezones);
+ $originalPicklistValues = array_flip(Vtiger_Util_Helper::getPickListValues($fieldName));
+
+ $orderedPicklists = array();
+ $i = 0;
+ foreach ($timeZones as $timeZone => $value) {
+ $orderedPicklists[$originalPicklistValues[$timeZone]] = $i++;
+ }
+ ksort($orderedPicklists);
+
+ $moduleModel = new Settings_Picklist_Module_Model();
+ $moduleModel->updateSequence($fieldName, $orderedPicklists);
+ echo '<br>Succecssfully reordered timezones<br>';
+ }
+ //END::Reordering Timezones
+
//Update existing package modules
Install_Utils_Model::installModules();
}
\ No newline at end of file
diff --git a/pkg/vtiger/translations/Arabic_ar_ae/modules/Users.php b/pkg/vtiger/translations/Arabic_ar_ae/modules/Users.php
index aee43fa5427dd9859ceeeeab88831ef6786edbc1..3c47d7341285353a63c18401090dcf1d9a26a14e 100644
--- a/pkg/vtiger/translations/Arabic_ar_ae/modules/Users.php
+++ b/pkg/vtiger/translations/Arabic_ar_ae/modules/Users.php
@@ -141,7 +141,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi',
'Asia/Tehran' => '(UTC+03:30) Tehran',
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi',
- 'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
+ 'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku',
'Asia/Yerevan' => '(UTC+04:00) Yerevan',
diff --git a/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Users.php b/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Users.php
index 571938b29f96ced1455913eccd09bcee6e19bd83..217343f5a15bce3dcce778bacbc759a275df4dc0 100644
--- a/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Users.php
+++ b/pkg/vtiger/translations/BrazilianLanguagePack_bz_bz/modules/Users.php
@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
- 'Europe/Moscow' => '(UTC+04:00) Moscou, Volgograd',
+ 'Europe/Moscow' => '(UTC+03:00) Moscou, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
diff --git a/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Users.php b/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Users.php
index 879a08dc1f022537ccfb0394ec68fa305158cf29..f1ff5e849e560f07e4a2ecd1516355de6161d1de 100644
--- a/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Users.php
+++ b/pkg/vtiger/translations/BritishLanguagePack_br_br/modules/Users.php
@@ -129,7 +129,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
- 'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
+ 'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
diff --git a/pkg/vtiger/translations/Deutsch/modules/Users.php b/pkg/vtiger/translations/Deutsch/modules/Users.php
index a6ca4b106fd14b27fd50adefd09325c19075a536..f919c9b1da71a0468bda360d530de776e13c69ed 100644
--- a/pkg/vtiger/translations/Deutsch/modules/Users.php
+++ b/pkg/vtiger/translations/Deutsch/modules/Users.php
@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Teheran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
- 'Europe/Moscow' => '(UTC+04:00) Moskau, Wolgograd',
+ 'Europe/Moscow' => '(UTC+03:00) Moskau, Wolgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muskat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
diff --git a/pkg/vtiger/translations/Dutch/modules/Users.php b/pkg/vtiger/translations/Dutch/modules/Users.php
index 40a7248663110057d212f7e90f35af16ffd4c219..b37b4683f477f57a0b0c9f138986e28401758ed4 100644
--- a/pkg/vtiger/translations/Dutch/modules/Users.php
+++ b/pkg/vtiger/translations/Dutch/modules/Users.php
@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
- 'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
+ 'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
diff --git a/pkg/vtiger/translations/French/modules/Users.php b/pkg/vtiger/translations/French/modules/Users.php
index c869e50878d7898ba4e6f64c86d23507be68c072..0cf4fa76eac760e8a647d7ca22447b07508480fa 100644
--- a/pkg/vtiger/translations/French/modules/Users.php
+++ b/pkg/vtiger/translations/French/modules/Users.php
@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
- 'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
+ 'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
diff --git a/pkg/vtiger/translations/Hungarian/modules/Users.php b/pkg/vtiger/translations/Hungarian/modules/Users.php
index 3b9901b2eee4b2821462a4c395066a3f04497524..bbc5da952fa81b4de8c7b30504b1d91210af2786 100644
--- a/pkg/vtiger/translations/Hungarian/modules/Users.php
+++ b/pkg/vtiger/translations/Hungarian/modules/Users.php
@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
- 'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
+ 'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
diff --git a/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Users.php b/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Users.php
index 92ab60600d716caf88545cb2e2e6b91447a9a7b9..e3e048ca7e334106aca735307ea65040223fe524 100644
--- a/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Users.php
+++ b/pkg/vtiger/translations/ItalianLanguagePack_it_it/modules/Users.php
@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
- 'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
+ 'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
diff --git a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Users.php b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Users.php
index d5eeb18847b597562875826838119a6d55b8cb33..09c9bfefa67516c54d2b190d2efc90919eb462f2 100644
--- a/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Users.php
+++ b/pkg/vtiger/translations/MexicanSpanishLanguagePack_es_mx/modules/Users.php
@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
- 'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
+ 'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
diff --git a/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Users.php b/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Users.php
index 960b4f4a9ee89d2a14408ee54b53e34e6b3cd74c..efc9eb52039311b4c546c26047ec381279ed3c7f 100644
--- a/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Users.php
+++ b/pkg/vtiger/translations/PolishLanguagePack_pl_pl/modules/Users.php
@@ -137,7 +137,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi',
'Asia/Tehran' => '(UTC+03:30) Tehran',
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi',
- 'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
+ 'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku',
'Asia/Yerevan' => '(UTC+04:00) Yerevan',
diff --git a/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Users.php b/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Users.php
index 33ea953959136e820e0f5d79dfede102b1de2536..19afc3689585439e570733583c9be1c4220818d2 100644
--- a/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Users.php
+++ b/pkg/vtiger/translations/RomanianLanguagePack_rm_rm/modules/Users.php
@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
- 'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
+ 'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
diff --git a/pkg/vtiger/translations/Russian/modules/Users.php b/pkg/vtiger/translations/Russian/modules/Users.php
index ad44620ce8951b195854900ab6e7650dda04ed19..2447bd3551b476b7e0fb5325ebd8232e132c1b40 100644
--- a/pkg/vtiger/translations/Russian/modules/Users.php
+++ b/pkg/vtiger/translations/Russian/modules/Users.php
@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
- 'Europe/Moscow' => '(UTC+04:00) МоÑква, Волгоград',
+ 'Europe/Moscow' => '(UTC+03:00) МоÑква, Волгоград',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,
diff --git a/pkg/vtiger/translations/Spanish/modules/Users.php b/pkg/vtiger/translations/Spanish/modules/Users.php
index e36c44cadcbd3eebebff12a9b1af7d2a56c5cfee..ed5ada7a988873bd74a100ada331a483f1493d5c 100644
--- a/pkg/vtiger/translations/Spanish/modules/Users.php
+++ b/pkg/vtiger/translations/Spanish/modules/Users.php
@@ -150,7 +150,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi',
'Asia/Tehran' => '(UTC+03:30) Tehran',
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi',
- 'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
+ 'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku',
'Asia/Yerevan' => '(UTC+04:00) Yerevan',
diff --git a/pkg/vtiger/translations/Sweden_sv_se/modules/Users.php b/pkg/vtiger/translations/Sweden_sv_se/modules/Users.php
index 4988b998a6d1c8a221ae40d1215ec8609a2d19f8..de9cbc676f2113c8d1d3d1186d5ce62d56812344 100755
--- a/pkg/vtiger/translations/Sweden_sv_se/modules/Users.php
+++ b/pkg/vtiger/translations/Sweden_sv_se/modules/Users.php
@@ -141,7 +141,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi',
'Asia/Tehran' => '(UTC+03:30) Tehran',
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi',
- 'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
+ 'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku',
'Asia/Yerevan' => '(UTC+04:00) Yerevan',
diff --git a/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Users.php b/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Users.php
index d893f13c5897ade7d84af9d6b6d45e192626442b..6895424aad797ee6ae88d10666329a61d17c8331 100644
--- a/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Users.php
+++ b/pkg/vtiger/translations/TurkishLanguagePack_tr_tr/modules/Users.php
@@ -130,7 +130,7 @@ $languageStrings = array(
'Africa/Nairobi' => '(UTC+03:00) Nairobi' ,
'Asia/Tehran' => '(UTC+03:30) Tehran' ,
'Asia/Tbilisi' => '(UTC+04:00) Tbilisi' ,
- 'Europe/Moscow' => '(UTC+04:00) Moscow, Volgograd',
+ 'Europe/Moscow' => '(UTC+03:00) Moscow, Volgograd',
'Asia/Muscat' => '(UTC+04:00) Abu Dhabi, Muscat',
'Asia/Baku' => '(UTC+04:00) Baku' ,
'Asia/Yerevan' => '(UTC+04:00) Yerevan' ,