From c28e365ada53627f6d09c84516f1cafc90265e75 Mon Sep 17 00:00:00 2001 From: pvy Date: Wed, 7 Oct 2015 16:02:03 +0200 Subject: [PATCH] [REF] l10n_cn: split to have 2 coa --- addons/l10n_cn/__openerp__.py | 6 +--- addons/l10n_cn_small_business/__init__.py | 4 +++ addons/l10n_cn_small_business/__openerp__.py | 32 +++++++++++++++++++ .../account_chart_template.xml | 16 +++++----- .../account_chart_template.yml | 0 addons/l10n_cn_standard/__init__.py | 4 +++ addons/l10n_cn_standard/__openerp__.py | 32 +++++++++++++++++++ 7 files changed, 81 insertions(+), 13 deletions(-) create mode 100644 addons/l10n_cn_small_business/__init__.py create mode 100644 addons/l10n_cn_small_business/__openerp__.py rename addons/{l10n_cn => l10n_cn_small_business}/account_chart_template.xml (98%) rename addons/{l10n_cn => l10n_cn_small_business}/account_chart_template.yml (100%) create mode 100644 addons/l10n_cn_standard/__init__.py create mode 100644 addons/l10n_cn_standard/__openerp__.py 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(). 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 +# 维智众源 oldrev@gmail.com +# Copyright (C) 2012-2012 南京盈通 ccdos@intoerp.com +# 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 similarity index 98% rename from addons/l10n_cn/account_chart_template.xml rename to 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 2401 递延收益 - + @@ -396,14 +396,14 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html 4001 生产成本 - + 4101 制造费用 - + @@ -411,7 +411,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html 4301 研发支出 - + @@ -419,7 +419,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html 4401 工程施工 - + @@ -427,7 +427,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html 4403 机械作业 - + @@ -559,7 +559,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html - 17％的增值税销项税 + 17％的增值税销项税 - 中国小企业会计科目表 17％的增值税销项税 percent @@ -571,7 +571,7 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html - 增值税17%进项税 + 增值税17%进项税 - 中国小企业会计科目表 增值税17%进项税 percent diff --git a/addons/l10n_cn/account_chart_template.yml b/addons/l10n_cn_small_business/account_chart_template.yml similarity index 100% rename from addons/l10n_cn/account_chart_template.yml rename to 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(). 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 +# 维智众源 oldrev@gmail.com +# Copyright (C) 2012-2012 南京盈通 ccdos@intoerp.com +# 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, +}