From: Rohan Katkar <rohan.katkar@webaccess.co.in>
Date: Tue, 8 Jul 2014 06:13:01 +0000 (+0530)
Subject: CRM-14948
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=95865041a5032ab12925580e6bd9e00cdec7b5c9;p=civicrm-core.git

CRM-14948
---

diff --git a/CRM/Upgrade/Incremental/sql/4.5.beta2.mysql.tpl b/CRM/Upgrade/Incremental/sql/4.5.beta2.mysql.tpl
index 1111f89963..bb114bbb33 100644
--- a/CRM/Upgrade/Incremental/sql/4.5.beta2.mysql.tpl
+++ b/CRM/Upgrade/Incremental/sql/4.5.beta2.mysql.tpl
@@ -1 +1,11 @@
 {* file to handle db changes in 4.5.beta2 during upgrade *}
+
+--CRM-14948 To delete list of outdated Russian provinance
+DELETE FROM `civicrm_state_province` WHERE `name` IN ('Komi-Permyatskiy avtonomnyy okrug','Taymyrskiy (Dolgano-Nenetskiy)','Evenkiyskiy avtonomnyy okrug','Koryakskiy avtonomnyy okrug','Ust\'-Ordynskiy Buryatskiy','Aginskiy Buryatskiy avtonomnyy');
+
+--CRM-14948 To update new list of new Russian provinance
+UPDATE `civicrm_state_province` SET `name`='Permskiy kray',`abbreviation`='PEK',`country_id`= 1177 WHERE `id` = 4270;
+
+UPDATE `civicrm_state_province` SET `name`='Kamchatskiy kray',`country_id`= 1177 WHERE `id` = 4252;
+
+UPDATE `civicrm_state_province` SET `name`='Zabaykal skiy kray',`abbreviation`='ZSK',`country_id`= 1177 WHERE `id` = 4247;
\ No newline at end of file
diff --git a/xml/templates/civicrm_state_province.tpl b/xml/templates/civicrm_state_province.tpl
index c98e1789dd..5c9853cc25 100644
--- a/xml/templates/civicrm_state_province.tpl
+++ b/xml/templates/civicrm_state_province.tpl
@@ -2703,12 +2703,12 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (4244, 1177, "BEL", "Belgorodskaya oblast\'"),
 (4245, 1177, "BRY", "Bryanskaya oblast\'"),
 (4246, 1177, "CHE", "Chelyabinskaya oblast\'"),
-(4247, 1177, "CHI", "Chitinskaya oblast\'"),
+(4247, 1177, "ZSK", "Zabaykal'skiy kray\'"),
 (4248, 1177, "IRK", "Irkutskaya oblast\'"),
 (4249, 1177, "IVA", "Ivanovskaya oblast\'"),
 (4250, 1177, "KGD", "Kaliningradskaya oblast\'"),
 (4251, 1177, "KLU", "Kaluzhskaya oblast\'"),
-(4252, 1177, "KAM", "Kamchatskaya oblast\'"),
+(4252, 1177, "KAM", "Kamchatskiy kray\'"),
 (4253, 1177, "KEM", "Kemerovskaya oblast\'"),
 (4254, 1177, "KIR", "Kirovskaya oblast\'"),
 (4255, 1177, "KOS", "Kostromskaya oblast\'"),
@@ -2726,7 +2726,7 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (4267, 1177, "ORE", "Orenburgskaya oblast\'"),
 (4268, 1177, "ORL", "Orlovskaya oblast\'"),
 (4269, 1177, "PNZ", "Penzenskaya oblast\'"),
-(4270, 1177, "PER", "Permskaya oblast\'"),
+(4270, 1177, "PEK", "Permskiy kray\'"),
 (4271, 1177, "PSK", "Pskovskaya oblast\'"),
 (4272, 1177, "ROS", "Rostovskaya oblast\'"),
 (4273, 1177, "RYA", "Ryazanskaya oblast\'"),
@@ -2749,15 +2749,9 @@ INSERT INTO civicrm_state_province (id, country_id, abbreviation, name) VALUES
 (4290, 1177, "MOW", "Moskva"),
 (4291, 1177, "SPE", "Sankt-Peterburg"),
 (4292, 1177, "YEV", "Yevreyskaya avtonomnaya oblast\'"),
-(4293, 1177, "AGB", "Aginskiy Buryatskiy avtonomnyy"),
 (4294, 1177, "CHU", "Chukotskiy avtonomnyy okrug"),
-(4295, 1177, "EVE", "Evenkiyskiy avtonomnyy okrug"),
 (4296, 1177, "KHM", "Khanty-Mansiyskiy avtonomnyy okrug"),
-(4297, 1177, "KOP", "Komi-Permyatskiy avtonomnyy okrug"),
-(4298, 1177, "KOR", "Koryakskiy avtonomnyy okrug"),
 (4299, 1177, "NEN", "Nenetskiy avtonomnyy okrug"),
-(4300, 1177, "TAY", "Taymyrskiy (Dolgano-Nenetskiy)"),
-(4301, 1177, "UOB", "Ust\'-Ordynskiy Buryatskiy"),
 (4302, 1177, "YAN", "Yamalo-Nenetskiy avtonomnyy okrug"),
 (4303, 1178, "C", "Butare"),
 (4304, 1178, "I", "Byumba"),