更新会计相关

l10n_cn_standard_latest/__manifest__.py

@@ -9,7 +9,7 @@
 
 {
     'name': '2025最新中国会计科目表.企业标准会计.Latest Chinese Accounting for odoo18',
-    'version': '24.11.04',
+    'version': '24.11.13',
     'author': 'odooai.cn',
     'category': 'Accounting/Localizations/Account Charts',
     'website': 'https://www.odooai.cn',
@@ -23,24 +23,26 @@
     """,
     'description': """
     最新中国化财务，主要针对标准会计科目表作了优化。
-    1. 2025最新会计科目表，处理营改增后会计科目调整。odoo 18专用。
-    2. 超级管理员自动开启全部会计功能，可管理会计科目表等。
-    3. 增强对生产企业会计科目的支持，增加数据资产入表支持。
-    4. 将菜单中设置为"财务"。
-    5. 补充分类及标签信息。
-    6. 更多的税项处理，处理营改增，更新至最新税率。
-    7. 会计科目表增加上下级支持，增加树状结构，支持多级科目，配合 "app_web_superbar" 使用可轻易实现树状导航。
-    8. 使用金蝶的会计科目命名法对多级科目进行初始化。可自行调整为用友科目命名法
-    9. 增加中文数字和阿拉伯数字的转换(可安装cn2an库，pip3 install cn2an)
-    10. 注意，建议在没有业务数据，没有会计科目的初始环境。可以使用 "app_odoo_customize" 模块清除财务数据，重置会计科目。
+    1. 2025最新会计科目表，处理营改增后会计科目调整。更新至最新税率。odoo 18专用。
+    2. 将菜单中设置为"财务"。
+    3. 补充分类及标签信息。
+    4. 更新税信息。
+    5. 增加树状结构，支持二级科目，可设置上级科目，配合 "app_web_superbar" 使用可轻易实现树状导航。
+    6. 使用金蝶的会计科目命名法对多级科目进行初始化。可自行调整为用友科目命名法
+    7. 增加中文数字和阿拉伯数字的转换(需安装cn2an库，pip3 install cn2an)
+    8. 注意，必须在没有业务数据，没有会计科目的初始环境。可以使用 "app_odoo_customize" 模块清除财务数据，重置会计科目。
 
-    中国财务，中国会计
+    如果是多语种环境需要自行更改翻译，主要体现在1%,3%,6%,13%增值税处理。
+    中国财务，中国会计，中国城市
     欧度智能，odooai.cn
     The Latest Chinese Account
     Including the following data in the Accounting Standards for Business Enterprises
     包含企业会计准则以下数据
+
     * Chart of Accounts
-    * 中国会计科目表模板
+    * 科目表模板
+    * Account templates
+    * 科目模板
     * Tax templates
     * 税金模板
     """,
@@ -50,7 +52,6 @@
     ],
     'images': ['static/description/banner.png'],
     'data': [
-        'security/res_groups.xml',
         'views/account_account_views.xml',
         'views/account_views.xml',
         'data/account_account_tag_data.xml',

l10n_cn_standard_latest/data/template/account.account-cn_standard.csv

@@ -38,11 +38,7 @@
 "account_1403","1403","原材料","","False","asset_current",""
 "account_1404","1404","材料成本差异","","False","asset_current",""
 "account_1405","1405","库存商品","","False","asset_current",""
-"account_1405_01","1405.01","库存商品-产成品","account_1405","False","asset_current",""
-"account_1405_02","1405.02","库存商品-自制产成品","account_1405","False","asset_current",""
-"account_1405_03","1405.03","库存商品-外购商品","account_1405","False","asset_current",""
-"account_1405_04","1405.04","库存商品-委外加工商品","account_1405","False","asset_current",""
-"account_1405_05","1405.05","库存商品-数据资源","account_1405","False","asset_current",""
+"account_1405_01","1405.01","其中:数据资源","account_1405","False","asset_current",""
 "account_1406","1406","发出商品","","False","asset_current",""
 "account_1407","1407","商品进销差价","","False","asset_current",""
 "account_1408","1408","委托加工物资","","False","asset_current",""
@@ -76,14 +72,7 @@
 "account_1631","1631","油气资产","","False","asset_current","l10n_cn_standard_latest.tag28"
 "account_1632","1632","累计折耗","","False","asset_current","l10n_cn_standard_latest.tag28"
 "account_1701","1701","无形资产","","False","asset_current",""
-"account_1701_01","1701.01","无形资产-土地使用权","account_1701","False","asset_current",""
-"account_1701_02","1701.02","无形资产-软件","account_1701","False","asset_current",""
-"account_1701_03","1701.03","无形资产-专利权","account_1701","False","asset_current",""
-"account_1701_04","1701.04","无形资产-非专利技术","account_1701","False","asset_current",""
-"account_1701_05","1701.05","无形资产-商标权","account_1701","False","asset_current",""
-"account_1701_06","1701.06","无形资产-著作权","account_1701","False","asset_current",""
-"account_1701_07","1701.07","无形资产-数据资源","account_1701","False","asset_current",""
-"account_1701_09","1701.09","无形资产-其它","account_1701","False","asset_current",""
+"account_1701_01","1701.01","其中：数据资源","account_1701","False","asset_current",""
 "account_1702","1702","累计摊销","","False","asset_current",""
 "account_1703","1703","无形资产减值准备","","False","asset_current",""
 "account_1711","1711","商誉","","False","asset_current",""
@@ -167,9 +156,7 @@
 "account_5101","5101","制造费用","","False","asset_current",""
 "account_5201","5201","劳务成本","","False","asset_current",""
 "account_5301","5301","研发支出","","False","asset_current",""
-"account_5301_01","5301.01","研发支出-费用化支出","account_5301","False","asset_current",""
-"account_5301_02","5301.02","研发支出-资本化支出","account_5301","False","asset_current",""
-"account_5301_03","5301.03","研发支出-数据资源","account_5301","False","asset_current",""
+"account_5301_01","5301.01","其中：数据资源","account_5301","False","asset_current",""
 "account_5401","5401","工程施工","","False","asset_current","l10n_cn_standard_latest.tag30"
 "account_5402","5402","工程结算","","False","asset_current","l10n_cn_standard_latest.tag30"
 "account_5403","5403","机械作业","","False","asset_current","l10n_cn_standard_latest.tag30"

l10n_cn_standard_latest/hooks.py

@@ -27,24 +27,13 @@ def pre_init_hook(env):
 def post_init_hook(env):
     """
     数据初始化，只在安装后执行，更新时不执行
-    注意 account.account 中 code 处理已不同，主要用 json 存在 code_store 中，故要不可使用 sql，
-    同时 group_id 已为 compute 字段，无需设置
-    
+    此处不执行，只是记录，该数据已处理完成
     """
     # cr.execute("UPDATE account_account_template set group_id = "
     #            "(select id from account_group where account_group.code_prefix_start=trim(substring(account_account_template.code from 1 for 1)) limit 1);")
 
-    # for g in [
-    #     env.ref('l10n_cn_standard_latest.account_group_1'),
-    #     env.ref('l10n_cn_standard_latest.account_group_2'),
-    #     env.ref('l10n_cn_standard_latest.account_group_3'),
-    #     env.ref('l10n_cn_standard_latest.account_group_4'),
-    #     env.ref('l10n_cn_standard_latest.account_group_5'),
-    #     env.ref('l10n_cn_standard_latest.account_group_6'),
-    # ]:
-    #     res = env['account.account'].search([('code', 'like', g.code_prefix_start + '%')])
-    #     if res:
-    #         res.write({'group_id': g.id})
-    #     env.cr.commit()
+    env.cr.execute("UPDATE account_account set group_id = "
+               "(select id from account_group where account_group.code_prefix_start=trim(substring(account_account.code from 1 for 1)) limit 1);")
+    env.cr.commit()
     pass
 

l10n_cn_standard_latest/models/account_account.py

@@ -27,7 +27,7 @@ class AccountAccount(models.Model):
 
     parent_id = fields.Many2one('account.account', 'Parent Chart', index=True, ondelete='cascade')
     child_ids = fields.One2many('account.account', 'parent_id', 'Child Chart')
-    parent_path = fields.Char(index=True)
+    parent_path = fields.Char(index=True, unaccent=False)
     # todo: view 类型只用于上级，不可在凭证中选择使用。  odoo 中使用 _compute_account_type 处理是找不到自动设置为 其上级科目
     # 故暂时不增加此类型
     # account_type = fields.fields.Selection(selection_add=[

l10n_cn_standard_latest/models/template_cn_standard.py

@@ -36,7 +36,7 @@ class AccountChartTemplate(models.AbstractModel):
             self.env.company.id: {
                 'account_fiscal_country_id': 'base.cn',
                 'cash_account_code_prefix': '1001',
-                'bank_account_code_prefix': '1002.01',
+                'bank_account_code_prefix': '1002',
                 'transfer_account_code_prefix': '1003',
                 'account_default_pos_receivable_account_id': 'account_1124',
                 'account_sale_tax_id': 'l10n_cn_standard_sale_included_13',

l10n_cn_standard_latest/report/report_voucher.xml

@@ -2,9 +2,13 @@
 <odoo>
     <data>
         <template id="external_layout_boxed" inherit_id="web.external_layout_boxed" primary="True">
-            <xpath expr="//img[hasclass('o_company_logo_big')]/.." position="replace">
-                <div class="col-3">
-                    <img t-if="company.logo" class="o_company_logo_big" t-att-src="image_data_uri(company.logo)" style="max-height: 45px;" alt="Logo"/>
+            <xpath expr="//div[hasclass('o_boxed_header')]" position="replace">
+                <div class="o_boxed_header">
+                <div class="row mb8">
+                    <div class="col-3 mb4">
+                        <img t-if="company.logo" t-att-src="image_data_uri(company.logo)" style="max-height: 45px;" alt="Logo"/>
+                    </div>
+                </div>
                 </div>
             </xpath>
         </template>
@@ -12,6 +16,7 @@
         <template id="report_voucher_document">
             <t t-set="o" t-value="o.with_context(lang=lang)" />
             <t t-set="company" t-value="o.company_id"/>
+
             <t t-call="l10n_cn_standard_latest.external_layout_boxed">
                 <div class="page">
 

l10n_cn_standard_latest/static/description/index.html

@@ -17,7 +17,7 @@
     <div class="oe_row oe_spaced">
         <div class="row">
             <div class="oe_row">
-                <h3>Lastest update: v18.24.11.04</h3>
+                <h3>Lastest update: v18.24.11.13</h3>
                 <div class="row">
                     <img class="oe_demo oe_screenshot img img-fluid" src="banner.png">
                 </div>

l10n_cn_standard_latest/views/account_account_views.xml

@@ -7,7 +7,7 @@
           <field name="model">account.account</field>
           <field name="inherit_id" ref="account.view_account_list"/>
           <field name="arch" type="xml">
-              <xpath expr="//list" position="attributes">
+              <xpath expr="//tree" position="attributes">
                   <attribute name="default_order">code</attribute>
               </xpath>
               <xpath expr="//field[@name='account_type']" position="after">