From c3f0915b2b49d100257a1ac0f20d56beb3307d0d Mon Sep 17 00:00:00 2001
From: jeffery CHEN fan <jeffery9@gmail.com>
Date: Sun, 26 Aug 2018 09:58:47 +0800
Subject: [PATCH] [FIX] l10n_cn: move china city data into separate module

Changes made at #23879 changed the dependency of l10n_cn to include a large
list of cities.
Move to a different module to make the l10n_cn more lightweight.

Closes #26592
---
 addons/l10n_cn/__manifest__.py                |  11 +++++----
 addons/l10n_cn_city/__init__.py               |   2 ++
 addons/l10n_cn_city/__manifest__.py           |  21 ++++++++++++++++++
 .../data/res_city_data.xml                    |   0
 .../l10n_cn_city/static/description/icon.png  | Bin 0 -> 967 bytes
 5 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 addons/l10n_cn_city/__init__.py
 create mode 100644 addons/l10n_cn_city/__manifest__.py
 rename addons/{l10n_cn => l10n_cn_city}/data/res_city_data.xml (100%)
 create mode 100644 addons/l10n_cn_city/static/description/icon.png

diff --git a/addons/l10n_cn/__manifest__.py b/addons/l10n_cn/__manifest__.py
index f918b90461e..f3283a73803 100644
--- a/addons/l10n_cn/__manifest__.py
+++ b/addons/l10n_cn/__manifest__.py
@@ -15,18 +15,17 @@
     'maintainer': 'jeff@osbzr.com',
     'website': 'http://openerp-china.org',
     'description': """
-Include those data/包含以下数据
-===============================
+Includes the following data for the Chinese localization
+========================================================
 
-    Account Type/科目类型
+Account Type/科目类型
 
-    State Data/省份数据
+State Data/省份数据
 
     """,
-    'depends': ['base', 'account', 'l10n_multilang','base_address_city'],
+    'depends': ['base', 'account', 'l10n_multilang'],
     'data': [
         'data/res_country_state_data.xml',
-        'data/res_city_data.xml',
         'data/account_account_type_data.xml',
         'data/account_tax_group_data.xml',
     ],
diff --git a/addons/l10n_cn_city/__init__.py b/addons/l10n_cn_city/__init__.py
new file mode 100644
index 00000000000..67dee8c60db
--- /dev/null
+++ b/addons/l10n_cn_city/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
diff --git a/addons/l10n_cn_city/__manifest__.py b/addons/l10n_cn_city/__manifest__.py
new file mode 100644
index 00000000000..48721610d88
--- /dev/null
+++ b/addons/l10n_cn_city/__manifest__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+# Copyright (C) 2018-now  jeffery9@gmail.com
+
+{
+    'name': 'China - City Data',
+    'version': '1.8',
+    'category': 'Localization',
+    'author': 'Jeffery Chen Fan<jeffery9@gmail.com>',
+    'description': """
+Includes the following data for the Chinese localization
+========================================================
+
+City Data/城市数据
+
+    """,
+    'depends': ['l10n_cn','base_address_city'],
+    'data': [
+        'data/res_city_data.xml',
+    ],
+}
diff --git a/addons/l10n_cn/data/res_city_data.xml b/addons/l10n_cn_city/data/res_city_data.xml
similarity index 100%
rename from addons/l10n_cn/data/res_city_data.xml
rename to addons/l10n_cn_city/data/res_city_data.xml
diff --git a/addons/l10n_cn_city/static/description/icon.png b/addons/l10n_cn_city/static/description/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce5e1e12f7c135cb667d820dc1bb7f27d11f6a1e
GIT binary patch
literal 967
zcmV;&133JNP)<h;3K|Lk000e1NJLTq002+`002-30{{R3xz7Th00004XF*Lt006O%
z3;baP00001b5ch_0Itp)=>Px$m{3eqMF0Q*|K0%JClKB$5Z);e-YF2?C=lK$5Z);e
z-YF2^G7taX0N*SS-YXFQ-2mc14&gWt-!Kp0G!N!i4B$2o{@eiIGY{V_5c|ji>~#t9
zmImTI4*%c)-!BjCdkO7&3GI0a-YgL9d<pT82kUSO@Qnxm;Q-=14)v=A^rHpoXbShV
z1n-Cl_O1ltJ`U`63EwUd@|gzcT?^qh59U=2{nr8OZVKW*4&_k|;5QHKcnRiH4d`PF
z?tlpV%mV-10PTGU`^f_4Rt)r@2If-?<xvdvtOWeg0rQ#$@QDcg&jH;g5cR1A>S_w`
zj|byN4)?MI{n!EHL=NLZ4&p%$^PL9YFA)9H0p(8&`N0F_Pz~#I3g=x5{@MWGF%Rr^
z3FJ!+_NxW_&jRE~4eM<R<3tVLF%SLK0rQ&%>~sm?Iu7e_3Fur4@|FkfehBJp3g=l2
z`o#kGvjpQs4*u8y=2Q&hLk|7c0sYYd^{NE<zXS4^2IWr;`MU$;ObzE;3+{gi^PUF$
z(gEpY3*kEs-6s&`O%3sr23FZAQUCw|3UpFVQvm<}|Nj5~3eiTtV06p?00Fm2L_t(o
z!|j+?Ps1=2MiZM{ph@?jlTpfOp`|T*@4ffld+)vX-=<Weq=LRUmXMIoQzT1A-@W#=
zrEnaB!C?GGDrLAN%5XwrKp-HY5Chgp6ov3||7?>$sStk)Rqs#vZ;~=0n5xyWZ^vV4
zflmdBgs7>bGG@@0Jd|ODJ;b$*EhrZ8)l?2bmKuOq2&R0#A$}EUXY%^fh=c&p-CCF1
zV?iL#G*K|nOOOy$HSY9`%;tKrt1~kry{h7CZ$@&)2d5>1gjvS6S&do4^Ss8)w`Xg=
zR>y`$`+PbeC>gXl7h=T6i~OWVc37}c2bidbNWXs=H7-uY&9IvI*nr{E`B}0X35tjb
z(Vf+)IT4-Sxwv(GkT{{ud>--~iPi;qL=-j(WIY6n*IHzNRr}Jstc8vhzkkyKM4Pg_
zdw@YeDqEp!lh=yYOScIpMVA-#fHbU^Ra~+W+ChY~3_mXZNb>?)h5%M@!OCz2i*Kap
zj8l37%J;4dT{Islmp%8Y%mUPeaF%^*KTe~V&`^9DMl?$XQ0u8a^olPBCS*b;WI`rn
pLMHrsVG3oqWXiDrObo{V-~$)>f9|Cr`VasB002ovPDHLkV1hR!x0C<?

literal 0
HcmV?d00001