pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] account: fix previous commit

Browse Source 
Field enaming introduced at https://github.com/odoo/odoo/commit/bfe362c87a2c058c9257166dca096d80c79d3dc3 left some references to old field name. #oops #cestpasmoicestlui
This commit is contained in:
qdp-odoo
2018-03-29 21:54:13 +02:00
parent bfe362c87a
commit 0afab2853b
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/account/models/account_move.py
+1 -1
View File
@@ -1372,7 +1372,7 @@ class AccountPartialReconcile(models.Model):
'name': line.name,
'debit': rounded_amt if rounded_amt > 0 else 0.0,
'credit': abs(rounded_amt) if rounded_amt < 0 else 0.0,
'account_id': line.tax_line_id.cash_basis_account.id,
'account_id': line.tax_line_id.cash_basis_account_id.id,
'analytic_account_id': line.analytic_account_id.id,
'analytic_tag_ids': line.analytic_tag_ids.ids,
'tax_line_id': line.tax_line_id.id,
addons/account/models/chart_template.py
+7 -4
View File
@@ -333,11 +333,12 @@ class AccountChartTemplate(models.Model):
# writing account values after creation of accounts
company.transfer_account_id = account_template_ref[transfer_account_id.id]
for key, value in generated_tax_res['account_dict'].items():
if value['refund_account_id'] or value['account_id'] or value['cash_basis_account']:
if value['refund_account_id'] or value['account_id'] or value['cash_basis_account_id'] or value['cash_basis_base_account_id']:
AccountTaxObj.browse(key).write({
'refund_account_id': account_ref.get(value['refund_account_id'], False),
'account_id': account_ref.get(value['account_id'], False),
'cash_basis_account': account_ref.get(value['cash_basis_account'], False),
'cash_basis_account_id': account_ref.get(value['cash_basis_account_id'], False),
'cash_basis_base_account_id': account_ref.get(value['cash_basis_base_account_id'], False),
})
# Create Journals - Only done for root chart template
@@ -533,10 +534,11 @@ class AccountTaxTemplate(models.Model):
oldname='use_cash_basis',
help="Based on Invoice: the tax is due as soon as the invoice is validated.\n"
"Based on Payment: the tax is due as soon as the payment of the invoice is received.")
cash_basis_account = fields.Many2one(
cash_basis_account_id = fields.Many2one(
'account.account.template',
string='Tax Received Account',
domain=[('deprecated', '=', False)],
oldname='cash_basis_account',
help='Account used as counterpart for the journal entry, for taxes eligible based on payments.')
cash_basis_base_account_id = fields.Many2one(
'account.account.template',
@@ -607,7 +609,8 @@ class AccountTaxTemplate(models.Model):
todo_dict[new_tax] = {
'account_id': tax.account_id.id,
'refund_account_id': tax.refund_account_id.id,
'cash_basis_account': tax.cash_basis_account.id,
'cash_basis_account_id': tax.cash_basis_account_id.id,
'cash_basis_base_account_id': tax.cash_basis_base_account_id.id,
}
if any([tax.tax_exigibility == 'on_payment' for tax in self]):
addons/account/views/account_view.xml
+2 -2
View File
@@ -1127,7 +1127,7 @@
<field name="include_base_amount" attrs="{'invisible':[('amount_type','=', 'group')]}" />
<field name="hide_tax_exigibility" invisible="1"/>
<field name="tax_exigibility" widget="radio" attrs="{'invisible':['|', ('amount_type','=', 'group'), ('hide_tax_exigibility', '=', False)]}" groups="account.group_account_user"/>
<field name="cash_basis_account" attrs="{'invisible': [('tax_exigibility', '=', 'on_invoice')], 'required': [('tax_exigibility', '=', 'on_payment')]}" groups="account.group_account_user"/>
<field name="cash_basis_account_id" attrs="{'invisible': [('tax_exigibility', '=', 'on_invoice')], 'required': [('tax_exigibility', '=', 'on_payment')]}" groups="account.group_account_user"/>
<field name="cash_basis_base_account_id" attrs="{'invisible': [('tax_exigibility', '=', 'on_invoice')], 'required': [('tax_exigibility', '=', 'on_payment')]}" groups="account.group_account_user"/>
</group>
</group>
@@ -1957,7 +1957,7 @@
<field name="active" groups="base.group_no_one"/>
<field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
<field name="tax_exigibility" widget="radio" attrs="{'invisible':[('amount_type','=', 'group')]}"/>
<field name="cash_basis_account" attrs="{'invisible': [('tax_exigibility', '=', 'on_invoice')], 'required': [('tax_exigibility', '=', 'on_payment')]}"/>
<field name="cash_basis_account_id" attrs="{'invisible': [('tax_exigibility', '=', 'on_invoice')], 'required': [('tax_exigibility', '=', 'on_payment')]}"/>
</group>
</group>
</page>