audrius/app-odoo
1
0
Fork 0
mirror of https://github.com/guohuadeng/app-odoo.git synced 2025-02-23 04:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix account

Browse Source
This commit is contained in:
ivan deng
2020-10-30 17:47:37 +08:00
parent d70e2e6a24
commit 73ecbadb36
5 changed files with 18 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app_odoo_customize/models/res_config_settings.py
View File

@@ -127,9 +127,9 @@ class ResConfigSettings(models.TransientModel):
sql = "delete from %s" % t_name sql = "delete from %s" % t_name
try: try:
self._cr.execute(sql) self._cr.execute(sql)
self._cr.commit()
except Exception as e: except Exception as e:
_logger.error('remove data error: %s,%s', line, e) _logger.error('remove data error: %s,%s', line, e)
self._cr.commit()
# 更新序号 # 更新序号
for line in s: for line in s:
domain = [('code', '=ilike', line + '%')] domain = [('code', '=ilike', line + '%')]
@@ -354,7 +354,14 @@ class ResConfigSettings(models.TransientModel):
self._cr.execute(sql2) self._cr.execute(sql2)
self._cr.commit() self._cr.commit()
except Exception as e: except Exception as e:
pass # raise Warning(e) pass
try:
# 增加对 pos的处理
sql = ("update pos_config set journal_id=NULL;")
self._cr.execute(sql)
self._cr.commit()
except Exception as e:
pass
try: try:
rec = self.env['res.partner'].search([]) rec = self.env['res.partner'].search([])
for r in rec: for r in rec:
@@ -376,7 +383,7 @@ class ResConfigSettings(models.TransientModel):
'property_stock_valuation_account_id': None, 'property_stock_valuation_account_id': None,
}) })
except Exception as e: except Exception as e:
pass # raise Warning(e) pass
try: try:
rec = self.env['stock.location'].search([]) rec = self.env['stock.location'].search([])
for r in rec: for r in rec:
@@ -385,7 +392,7 @@ class ResConfigSettings(models.TransientModel):
'valuation_out_account_id': None, 'valuation_out_account_id': None,
}) })
except Exception as e: except Exception as e:
pass # raise Warning(e) pass
seqs = [] seqs = []
return self.remove_app_data(to_removes, seqs) return self.remove_app_data(to_removes, seqs)

4
l10n_cn_standard_latest/data/account_chart_template_data.xml
View File

@@ -11,8 +11,8 @@
<field name="default_pos_receivable_account_id" ref="account_1124"/> <field name="default_pos_receivable_account_id" ref="account_1124"/>
</record> </record>
<function model="account.chart.template" name="try_loading_for_current_company"> <function model="account.chart.template" name="try_loading">
<value eval="[ref('l10n_cn_standard_latest.l10n_chart_china_standard_business_latest')]"/> <value eval="[ref('l10n_chart_china_standard_business_latest')]"/>
</function> </function>
</data> </data>
</odoo> </odoo>

99
l10n_cn_standard_latest/data/account_tax_template_data.xml
View File

@@ -199,39 +199,7 @@
]"/> ]"/>
</record> </record>
<record id="l10n_cn_standard_sale_included_3" model="account.tax.template"> <!-- sale tax excluded -->
<field name="chart_template_id" ref="l10n_chart_china_standard_business_latest"/>
<field name="name">3%销项税(含)</field>
<field name="description">增值税销项税3%，单价含税</field>
<field name="amount">3</field>
<field name="amount_type">percent</field>
<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"/>
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('account_2221_1_5'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('account_2221_1_5'),
}),
]"/>
</record>
<!-- sale tax excluded -->
<record id="l10n_cn_standard_sale_excluded_13" model="account.tax.template"> <record id="l10n_cn_standard_sale_excluded_13" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china_standard_business_latest"/> <field name="chart_template_id" ref="l10n_chart_china_standard_business_latest"/>
<field name="name">13%销项税</field> <field name="name">13%销项税</field>
@@ -364,39 +332,6 @@
]"/> ]"/>
</record> </record>
<record id="l10n_cn_standard_sale_excluded_3" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china_standard_business_latest"/>
<field name="name">3%销项税</field>
<field name="description">增值税销项税3%，单价不含税</field>
<field name="amount">3</field>
<field name="amount_type">percent</field>
<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"/>
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('account_2221_1_5'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('account_2221_1_5'),
}),
]"/>
</record>
<!-- purchase tax excluded --> <!-- purchase tax excluded -->
<record id="l10n_cn_standard_purchase_excluded_13" model="account.tax.template"> <record id="l10n_cn_standard_purchase_excluded_13" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china_standard_business_latest"/> <field name="chart_template_id" ref="l10n_chart_china_standard_business_latest"/>
@@ -530,36 +465,4 @@
]"/> ]"/>
</record> </record>
<record id="l10n_cn_standard_purchase_excluded_3" model="account.tax.template">
<field name="chart_template_id" ref="l10n_chart_china_standard_business_latest"/>
<field name="name">3%进项税</field>
<field name="description">增值税进项税3%，单价不含税</field>
<field name="amount">3</field>
<field name="amount_type">percent</field>
<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"/>
<field name="invoice_repartition_line_ids" eval="[(5, 0, 0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('account_2221_1_1'),
}),
]"/>
<field name="refund_repartition_line_ids" eval="[(5, 0, 0),
(0,0, {
'factor_percent': 100,
'repartition_type': 'base',
}),
(0,0, {
'factor_percent': 100,
'repartition_type': 'tax',
'account_id': ref('account_2221_1_1'),
}),
]"/>
</record>
</odoo> </odoo>

2
l10n_cn_standard_latest/data/chart_data.xml
View File

@@ -4,7 +4,7 @@
<data noupdate="1"> <data noupdate="1">
<!-- Chart template --> <!-- Chart template -->
<record id="l10n_chart_china_standard_business_latest" model="account.chart.template"> <record id="l10n_chart_china_standard_business_latest" model="account.chart.template">
<field name="name">2020中国企业会计科目表</field> <field name="name">2021中国企业会计科目表-odoo14</field>
<field name="code_digits" eval="4" /> <field name="code_digits" eval="4" />
<field name="currency_id" ref="base.CNY" /> <field name="currency_id" ref="base.CNY" />
<field name="cash_account_code_prefix">1001</field> <field name="cash_account_code_prefix">1001</field>

6
l10n_cn_standard_latest/hooks.py
View File

@@ -29,11 +29,11 @@ def post_init_hook(cr, registry):
数据初始化，只在安装后执行，更新时不执行 数据初始化，只在安装后执行，更新时不执行
此处不执行，只是记录，该数据已处理完成 此处不执行，只是记录，该数据已处理完成
""" """
cr.execute("UPDATE account_account_template set group_id = " # cr.execute("UPDATE account_account_template set group_id = "
"(select id from account_group where account_group.code_prefix=trim(substring(account_account_template.code from 1 for 1)) limit 1);") # "(select id from account_group where account_group.code_prefix_start=trim(substring(account_account_template.code from 1 for 1)) limit 1);")
cr.execute("UPDATE account_account set group_id = " cr.execute("UPDATE account_account set group_id = "
"(select id from account_group where account_group.code_prefix=trim(substring(account_account.code from 1 for 1)) limit 1);") "(select id from account_group where account_group.code_prefix_start=trim(substring(account_account.code from 1 for 1)) limit 1);")
cr.commit() cr.commit()
pass pass