[REF] l10n_cn: split to have 2 coa

7 files changed, 81 insertions, 13 deletions

diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py
index 315f9f3bbf7..2572af5181a 100644
--- a/addons/l10n_cn/__openerp__.py
+++ b/addons/l10n_cn/__openerp__.py
@@ -23,14 +23,10 @@
 
     """,
     'depends': ['base', 'account'],
-    'demo': [],
     'data': [
-        'account_chart_type.xml',
-        'account_chart_template.xml',
-        'account_chart_template.yml',
         'base_data.xml',
+        'account_chart_type.xml',
     ],
     'license': 'GPL-3',
-    'auto_install': False,
     'installable': True,
 }
diff --git a/addons/l10n_cn_small_business/__init__.py b/addons/l10n_cn_small_business/__init__.py
new file mode 100644
index 00000000000..7e7e19a411a
--- /dev/null
+++ b/addons/l10n_cn_small_business/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+# Copyright (C) 2007-2014 Jeff Wang(<http://jeff@osbzr.com>).
diff --git a/addons/l10n_cn_small_business/__openerp__.py b/addons/l10n_cn_small_business/__openerp__.py
new file mode 100644
index 00000000000..a9792fb87bf
--- /dev/null
+++ b/addons/l10n_cn_small_business/__openerp__.py
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+# Copyright (C) 2008-2008 凯源吕鑫 lvxin@gmail.com   <basic chart data>
+#                         维智众源 oldrev@gmail.com  <states data>
+# Copyright (C) 2012-2012 南京盈通 ccdos@intoerp.com <small business chart>
+# Copyright (C) 2008-now  开阖软件 jeff@osbzr.com    < PM and LTS >
+
+{
+    'name': '中国小企业会计科目表',
+    'version': '1.8',
+    'category': 'Localization/Account Charts',
+    'author': 'www.openerp-china.org',
+    'maintainer': 'jeff@osbzr.com',
+    'website': 'http://openerp-china.org',
+    'description': """
+
+    科目类型\会计科目表模板\增值税\辅助核算类别\管理会计凭证簿\财务会计凭证簿
+
+    添加中文省份数据
+
+    增加小企业会计科目表
+
+    """,
+    'depends': ['l10n_cn'],
+    'data': [
+        'account_chart_template.xml',
+        'account_chart_template.yml',
+    ],
+    'license': 'GPL-3',
+    'installable': True,
+}
diff --git a/addons/l10n_cn/account_chart_template.xml b/addons/l10n_cn_small_business/account_chart_template.xml
index ecf9ff510fd..77f64cdd63d 100644
--- a/addons/l10n_cn/account_chart_template.xml
+++ b/addons/l10n_cn_small_business/account_chart_template.xml
@@ -334,7 +334,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
             <field name="code">2401</field>
             <field eval="False" name="reconcile"/>
             <field name="name">递延收益</field>
-            <field name="user_type_id" ref="user_type_all"/>
+            <field name="user_type_id" ref="l10n_cn.user_type_all"/>
             <field name="chart_template_id" ref="l10n_chart_china_small_business"/>
         </record>
         <record id="small_business_chart2501" model="account.account.template">
@@ -396,14 +396,14 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
             <field name="code">4001</field>
             <field eval="False" name="reconcile"/>
             <field name="name">生产成本</field>
-            <field name="user_type_id" ref="user_type_all"/>
+            <field name="user_type_id" ref="l10n_cn.user_type_all"/>
             <field name="chart_template_id" ref="l10n_chart_china_small_business"/>
         </record>
         <record id="small_business_chart4101" model="account.account.template">
             <field name="code">4101</field>
             <field eval="False" name="reconcile"/>
             <field name="name">制造费用</field>
-            <field name="user_type_id" ref="user_type_all"/>
+            <field name="user_type_id" ref="l10n_cn.user_type_all"/>
             <field name="chart_template_id" ref="l10n_chart_china_small_business"/>
         </record>
 
@@ -411,7 +411,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
             <field name="code">4301</field>
             <field eval="False" name="reconcile"/>
             <field name="name">研发支出</field>
-            <field name="user_type_id" ref="user_type_all"/>
+            <field name="user_type_id" ref="l10n_cn.user_type_all"/>
             <field name="chart_template_id" ref="l10n_chart_china_small_business"/>
         </record>
 
@@ -419,7 +419,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
             <field name="code">4401</field>
             <field eval="False" name="reconcile"/>
             <field name="name">工程施工</field>
-            <field name="user_type_id" ref="user_type_all"/>
+            <field name="user_type_id" ref="l10n_cn.user_type_all"/>
             <field name="chart_template_id" ref="l10n_chart_china_small_business"/>
         </record>
 
@@ -427,7 +427,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
             <field name="code">4403</field>
             <field eval="False" name="reconcile"/>
             <field name="name">机械作业</field>
-            <field name="user_type_id" ref="user_type_all"/>
+            <field name="user_type_id" ref="l10n_cn.user_type_all"/>
             <field name="chart_template_id" ref="l10n_chart_china_small_business"/>
         </record>
 
@@ -559,7 +559,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
         <!-- 增值税 -->
         <record id="vats_small_business" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_chart_china_small_business"/>
-            <field name="name">17％的增值税销项税</field>
+            <field name="name">17％的增值税销项税 - 中国小企业会计科目表</field>
             <field name="description">17％的增值税销项税</field>
             <field eval="17" name="amount"/>
             <field name="amount_type">percent</field>
@@ -571,7 +571,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html
 
         <record id="vatp_small_business" model="account.tax.template">
             <field name="chart_template_id" ref="l10n_chart_china_small_business"/>
-            <field name="name">增值税17%进项税</field>
+            <field name="name">增值税17%进项税 - 中国小企业会计科目表</field>
             <field name="description">增值税17%进项税</field>
             <field eval="17" name="amount"/>
             <field name="amount_type">percent</field>
diff --git a/addons/l10n_cn/account_chart_template.yml b/addons/l10n_cn_small_business/account_chart_template.yml
index f1d6e114f9d..f1d6e114f9d 100644
--- a/addons/l10n_cn/account_chart_template.yml
+++ b/addons/l10n_cn_small_business/account_chart_template.yml
diff --git a/addons/l10n_cn_standard/__init__.py b/addons/l10n_cn_standard/__init__.py
new file mode 100644
index 00000000000..7e7e19a411a
--- /dev/null
+++ b/addons/l10n_cn_standard/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+# Copyright (C) 2007-2014 Jeff Wang(<http://jeff@osbzr.com>).
diff --git a/addons/l10n_cn_standard/__openerp__.py b/addons/l10n_cn_standard/__openerp__.py
new file mode 100644
index 00000000000..4575293f53c
--- /dev/null
+++ b/addons/l10n_cn_standard/__openerp__.py
@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+# Copyright (C) 2008-2008 凯源吕鑫 lvxin@gmail.com   <basic chart data>
+#                         维智众源 oldrev@gmail.com  <states data>
+# Copyright (C) 2012-2012 南京盈通 ccdos@intoerp.com <small business chart>
+# Copyright (C) 2008-now  开阖软件 jeff@osbzr.com    < PM and LTS >
+
+{
+    'name': '中国会计科目表',
+    'version': '1.8',
+    'category': 'Localization/Account Charts',
+    'author': 'www.openerp-china.org',
+    'maintainer': 'jeff@osbzr.com',
+    'website': 'http://openerp-china.org',
+    'description': """
+
+    科目类型\会计科目表模板\增值税\辅助核算类别\管理会计凭证簿\财务会计凭证簿
+
+    添加中文省份数据
+
+    增加小企业会计科目表
+
+    """,
+    'depends': ['l10n_cn'],
+    'demo': [],
+    'data': [
+    ],
+    'license': 'GPL-3',
+    'auto_install': False,
+    'installable': True,
+}