diff --git a/addons/point_of_sale/models/account_tax.py b/addons/point_of_sale/models/account_tax.py index 37cf71324e10f..99235a1cbd56c 100644 --- a/addons/point_of_sale/models/account_tax.py +++ b/addons/point_of_sale/models/account_tax.py @@ -2,6 +2,7 @@ from odoo import _, api, models from odoo.exceptions import UserError +from odoo.tools import split_every class AccountTax(models.Model): @@ -9,21 +10,22 @@ class AccountTax(models.Model): @api.multi def write(self, vals): - forbidden_fields = set([ + forbidden_fields = { 'amount_type', 'amount', 'type_tax_use', 'tax_group_id', 'price_include', 'include_base_amount' - ]) + } if forbidden_fields & set(vals.keys()): - tax_ids = self.env['pos.order.line'].sudo().search([ + lines = self.env['pos.order.line'].sudo().search([ ('order_id.session_id.state', '!=', 'closed') - ]).read(['tax_ids']) - # Flatten the list of taxes, see https://stackoverflow.com/questions/952914 - tax_ids = set([i for sl in [t['tax_ids'] for t in tax_ids] for i in sl]) - if tax_ids & set(self.ids): - raise UserError(_( - 'It is forbidden to modify a tax used in a POS order not posted. ' + - 'You must close the POS sessions before modifying the tax.' - )) + ]) + self_ids = set(self.ids) + for lines_chunk in map(self.env['pos.order.line'].browse, split_every(100000, lines.ids)): + if any(tid in self_ids for ts in lines_chunk.read(['tax_ids']) for tid in ts['tax_ids']): + raise UserError(_( + 'It is forbidden to modify a tax used in a POS order not posted. ' + + 'You must close the POS sessions before modifying the tax.' + )) + lines_chunk.invalidate_cache(['tax_ids'], lines_chunk.ids) return super(AccountTax, self).write(vals) def get_real_tax_amount(self):