Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Modify Corporate Standard Char Of Account and 2017 Small And Medium-s… #32075

Closed
wants to merge 2 commits into from
Closed

Modify Corporate Standard Char Of Account and 2017 Small And Medium-s… #32075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d49813
[FIX] l10n_cn_small_business: Modify Small And Medium-sized Enterpris…
Colinliz Apr 8, 2019
e9be25a
[FIX] l10n_cn_standard: Modify Corporate Standard Char Of Account
Colinliz Apr 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions addons/l10n_cn_small_business/__manifest__.py
View file
Open in desktop
Expand Up @@ -5,14 +5,15 @@
# 维智众源 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 >
# Copyright (C) 2018-now 浪潮PS Cloud pscloud@inspur.com < PM and LTS >

{
'name': 'China - Small Business CoA',
'version': '1.8',
'version': '12.0.1.0',
'category': 'Localization',
'author': 'www.openerp-china.org',
'maintainer': 'jeff@osbzr.com',
'website': 'http://openerp-china.org',
'author': 'www.mypscloud.com',
'maintainer': 'pscloud@inspur.com',
'website': 'www.mypscloud.com/',
'description': """

科目类型\会计科目表模板\增值税\辅助核算类别\管理会计凭证簿\财务会计凭证簿
Expand All @@ -30,5 +31,4 @@
'data/account_tax_template_data.xml',
'data/account_chart_template_data.xml',
],
'auto_install': True
}
282 changes: 206 additions & 76 deletions addons/l10n_cn_small_business/data/account.account.template.csv
View file
Open in desktop

Large diffs are not rendered by default.

143 changes: 29 additions & 114 deletions addons/l10n_cn_small_business/data/account_tax_template_data.xml
View file
Open in desktop
@@ -1,154 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo noupdate="1">

<!-- sales tax included -->
<record id="l10n_cn_small_business_sales_included_17" model="account.tax.template">
<record id="vats_small_business_13" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china_small_business"/>
<field name="name">税收17％（含） - 中国小企业会计科目表</field>
<field name="description">税收17％</field>
<field name="amount">17</field>
<field name="name">13％销项税</field>
<field name="description">13％销项税 - 中国小企业会计科目表</field>
<field eval="13" name="amount"/>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="l10n_cn_2221"/>
<field name="account_id" ref="l10n_cn_2221"/>
<field name="type_tax_use">sale</field>
<field name="price_include" eval="1"/>
<field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_17"/>
</record>
<record id="l10n_cn_small_business_sales_included_11" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china_small_business"/>
<field name="name">税收11％（含） - 中国小企业会计科目表</field>
<field name="description">税收11％</field>
<field name="amount">11</field>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="l10n_cn_2221"/>
<field name="account_id" ref="l10n_cn_2221"/>
<field name="type_tax_use">sale</field>
<field name="price_include" eval="1"/>
<field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_11"/>
</record>
<record id="l10n_cn_small_business_sales_included_6" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china_small_business"/>
<field name="name">税收6％（含） - 中国小企业会计科目表</field>
<field name="description">税收6％</field>
<field name="amount">6</field>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="l10n_cn_2221"/>
<field name="account_id" ref="l10n_cn_2221"/>
<field name="type_tax_use">sale</field>
<field name="price_include" eval="1"/>
<field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_6"/>
</record>
<record id="l10n_cn_small_business_sales_included_3" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china_small_business"/>
<field name="name">税收3％（含） - 中国小企业会计科目表</field>
<field name="description">税收3％</field>
<field name="amount">3</field>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="l10n_cn_2221"/>
<field name="account_id" ref="l10n_cn_2221"/>
<field name="type_tax_use">sale</field>
<field name="price_include" eval="1"/>
<field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_3"/>
</record>

<!-- sales tax excluded -->
<record id="l10n_cn_small_business_sales_excluded_17" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china_small_business"/>
<field name="name">税收17％ - 中国小企业会计科目表</field>
<field name="description">税收17％</field>
<field name="amount">17</field>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="l10n_cn_2221"/>
<field name="account_id" ref="l10n_cn_2221"/>
<field name="type_tax_use">sale</field>
<field name="price_include" eval="0"/>
<field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_17"/>
</record>
<record id="l10n_cn_small_business_sales_excluded_11" model="account.tax.template">
<record id="vatp_small_business_13" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china_small_business"/>
<field name="name">税收11％ - 中国小企业会计科目表</field>
<field name="description">税收11％</field>
<field name="amount">11</field>
<field name="name">13%进项税</field>
<field name="description">13%进项税 - 中国小企业会计科目表</field>
<field eval="13" name="amount"/>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="l10n_cn_2221"/>
<field name="account_id" ref="l10n_cn_2221"/>
<field name="type_tax_use">sale</field>
<field name="price_include" eval="0"/>
<field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_11"/>
</record>
<record id="l10n_cn_small_business_sales_excluded_6" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china_small_business"/>
<field name="name">税收6％ - 中国小企业会计科目表</field>
<field name="description">税收6％</field>
<field name="amount">6</field>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="l10n_cn_2221"/>
<field name="account_id" ref="l10n_cn_2221"/>
<field name="type_tax_use">sale</field>
<field name="price_include" eval="0"/>
<field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_6"/>
<field name="type_tax_use">purchase</field>
</record>
<record id="l10n_cn_small_business_sales_excluded_3" model="account.tax.template">

<record id="vats_small_business_9" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china_small_business"/>
<field name="name">税收3％ - 中国小企业会计科目表</field>
<field name="description">税收3％</field>
<field name="amount">3</field>
<field name="name">9％销项税</field>
<field name="description">9％销项税 - 中国小企业会计科目表</field>
<field eval="9" name="amount"/>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="l10n_cn_2221"/>
<field name="account_id" ref="l10n_cn_2221"/>
<field name="type_tax_use">sale</field>
<field name="price_include" eval="0"/>
<field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_3"/>
</record>


<!-- purchase tax excluded -->
<record id="l10n_cn_small_business_purchase_excluded_17" model="account.tax.template">
<record id="vatp_small_business_9" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china_small_business"/>
<field name="name">税收17％ - 中国小企业会计科目表</field>
<field name="description">税收17％</field>
<field name="amount">17</field>
<field name="name">9%进项税</field>
<field name="description">9%进项税 - 中国小企业会计科目表</field>
<field eval="9" name="amount"/>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="l10n_cn_2221"/>
<field name="account_id" ref="l10n_cn_2221"/>
<field name="type_tax_use">purchase</field>
<field name="price_include" eval="0"/>
<field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_17"/>
</record>
<record id="l10n_cn_small_business_purchase_excluded_11" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china_small_business"/>
<field name="name">税收11％ - 中国小企业会计科目表</field>
<field name="description">税收11％</field>
<field name="amount">11</field>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="l10n_cn_2221"/>
<field name="account_id" ref="l10n_cn_2221"/>
<field name="type_tax_use">purchase</field>
<field name="price_include" eval="0"/>
<field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_11"/>
</record>
<record id="l10n_cn_small_business_purchase_excluded_6" model="account.tax.template">

<record id="vats_small_business_6" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china_small_business"/>
<field name="name">税收6％ - 中国小企业会计科目表</field>
<field name="description">税收6％</field>
<field name="amount">6</field>
<field name="name">6％销项税</field>
<field name="description">6％销项税 - 中国小企业会计科目表</field>
<field eval="6" name="amount"/>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="l10n_cn_2221"/>
<field name="account_id" ref="l10n_cn_2221"/>
<field name="type_tax_use">purchase</field>
<field name="price_include" eval="0"/>
<field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_6"/>
<field name="type_tax_use">sale</field>
</record>
<record id="l10n_cn_small_business_purchase_excluded_3" model="account.tax.template">

<record id="vatp_small_business_6" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china_small_business"/>
<field name="name">税收3％ - 中国小企业会计科目表</field>
<field name="description">税收3％</field>
<field name="amount">3</field>
<field name="name">6%进项税</field>
<field name="description">6%进项税 - 中国小企业会计科目表</field>
<field eval="6" name="amount"/>
<field name="amount_type">percent</field>
<field name="refund_account_id" ref="l10n_cn_2221"/>
<field name="account_id" ref="l10n_cn_2221"/>
<field name="type_tax_use">purchase</field>
<field name="price_include" eval="0"/>
<field name="tax_group_id" ref="l10n_cn.l10n_cn_tax_group_vat_3"/>
</record>
</odoo>
6 changes: 3 additions & 3 deletions addons/l10n_cn_small_business/data/l10n_cn_small_business_chart_data.xml
View file
Open in desktop
Expand Up @@ -13,16 +13,16 @@ http://kjs.mof.gov.cn/zhengwuxinxi/zhengcefabu/201111/t20111107_605525.html

-->
<data noupdate="1">

<record id="l10n_chart_china_small_business" model="account.chart.template">
<field name="name">小企业会计科目表（财会[2011]17号《小企业会计准则》）</field>
<field name="code_digits" eval="6"/>
<field name="code_digits" eval="4"/>
<field name="currency_id" ref="base.CNY"/>
<field name="cash_account_code_prefix">1001</field>
<field name="bank_account_code_prefix">1002</field>
<field name="transfer_account_code_prefix">1012</field>
<field name="spoken_languages" eval="'en_US'"/>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

By changing the CoA, you change to Chinese here, but as said before, you can add both.

</record>

</data>
</odoo>


8 changes: 4 additions & 4 deletions addons/l10n_cn_small_business/data/l10n_cn_small_business_chart_post_data.xml
View file
Open in desktop
Expand Up @@ -3,9 +3,9 @@
<record id="l10n_chart_china_small_business" model="account.chart.template">
<field name="property_account_receivable_id" ref="l10n_cn_1122"/>
<field name="property_account_payable_id" ref="l10n_cn_2202"/>
<field name="property_account_expense_categ_id" ref="l10n_cn_6401"/>
Colinliz marked this conversation as resolved.
Show resolved Hide resolved
<field name="property_account_income_categ_id" ref="l10n_cn_6001"/>
<field name="income_currency_exchange_account_id" ref="l10n_cn_6051"/>
<field name="expense_currency_exchange_account_id" ref="l10n_cn_6711"/>
<field name="property_account_expense_categ_id" ref="l10n_cn_1401"/>
<field name="property_account_income_categ_id" ref="l10n_cn_5001"/>
<field name="income_currency_exchange_account_id" ref="l10n_cn_5051"/>
<field name="expense_currency_exchange_account_id" ref="l10n_cn_5711"/>
</record>
</odoo>
7 changes: 5 additions & 2 deletions addons/l10n_cn_standard/__manifest__.py
View file
Open in desktop
Expand Up @@ -6,12 +6,15 @@
# Copyright (C) 2012-2012 南京盈通 ccdos@intoerp.com <small business chart>
# Copyright (C) 2008-now 开阖软件 jeff@osbzr.com < PM and LTS >
# Copyright (C) 2017-now jeffery9@gmail.com
# Copyright (C) 2018-now 浪潮PS Cloud pscloud@inspur.com < PM and LTS >


{
'name': 'China - Standard CoA',
'version': '2.0',
'version': '12.0.1.0',
'category': 'Localization',
'author': ['lvxin@gmail.co', 'oldrev@gmail.co', 'ccdos@intoerp.com', 'jeff@osbzr.com', 'jeffery9@gmail.com'],
'author': ['lvxin@gmail.co', 'oldrev@gmail.co', 'ccdos@intoerp.com', 'jeff@osbzr.com', 'jeffery9@gmail.com',
'pscloud@inspur.com'],

'website': 'http://shine-it.net',
'description': """
Expand Down