[IMP] account_tax_balance: faster search of taxes with moves
parent
4a921f8f4d
commit
ae6e0d1a46
|
@ -5,10 +5,10 @@
|
||||||
{
|
{
|
||||||
"name": "Tax Balance",
|
"name": "Tax Balance",
|
||||||
"summary": "Compute tax balances based on date range",
|
"summary": "Compute tax balances based on date range",
|
||||||
"version": "10.0.1.0.1",
|
"version": "10.0.1.1.0",
|
||||||
"category": "Accounting & Finance",
|
"category": "Accounting & Finance",
|
||||||
"website": "https://www.agilebg.com/",
|
"website": "https://www.agilebg.com/",
|
||||||
"author": "Agile Business Group, Therp BV, Tecnativa, "
|
"author": "Agile Business Group, Therp BV, Tecnativa, ACSONE SA/NV, "
|
||||||
"Odoo Community Association (OCA)",
|
"Odoo Community Association (OCA)",
|
||||||
"license": "AGPL-3",
|
"license": "AGPL-3",
|
||||||
"application": False,
|
"application": False,
|
||||||
|
|
|
@ -3,8 +3,7 @@
|
||||||
# © 2016 Antonio Espinosa <antonio.espinosa@tecnativa.com>
|
# © 2016 Antonio Espinosa <antonio.espinosa@tecnativa.com>
|
||||||
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
|
||||||
|
|
||||||
from openerp import models, fields, api
|
from openerp import models, fields, api, _
|
||||||
from openerp.tools.safe_eval import safe_eval
|
|
||||||
|
|
||||||
|
|
||||||
class AccountTax(models.Model):
|
class AccountTax(models.Model):
|
||||||
|
@ -12,57 +11,27 @@ class AccountTax(models.Model):
|
||||||
|
|
||||||
balance = fields.Float(
|
balance = fields.Float(
|
||||||
string="Total Balance", compute="_compute_balance",
|
string="Total Balance", compute="_compute_balance",
|
||||||
search='_search_balance')
|
)
|
||||||
base_balance = fields.Float(
|
base_balance = fields.Float(
|
||||||
string="Total Base Balance", compute="_compute_balance",
|
string="Total Base Balance", compute="_compute_balance",
|
||||||
search='_search_base_balance')
|
)
|
||||||
balance_regular = fields.Float(
|
balance_regular = fields.Float(
|
||||||
string="Balance", compute="_compute_balance",
|
string="Balance", compute="_compute_balance",
|
||||||
search='_search_balance_regular')
|
)
|
||||||
base_balance_regular = fields.Float(
|
base_balance_regular = fields.Float(
|
||||||
string="Base Balance", compute="_compute_balance",
|
string="Base Balance", compute="_compute_balance",
|
||||||
search='_search_base_balance_regular')
|
)
|
||||||
balance_refund = fields.Float(
|
balance_refund = fields.Float(
|
||||||
string="Balance Refund", compute="_compute_balance",
|
string="Balance Refund", compute="_compute_balance",
|
||||||
search='_search_balance_refund')
|
)
|
||||||
base_balance_refund = fields.Float(
|
base_balance_refund = fields.Float(
|
||||||
string="Base Balance Refund", compute="_compute_balance",
|
string="Base Balance Refund", compute="_compute_balance",
|
||||||
search='_search_base_balance_refund')
|
)
|
||||||
|
has_moves = fields.Boolean(
|
||||||
def _search_balance_field(self, field, operator, value):
|
string="Has balance in period",
|
||||||
operators = {'>', '<', '>=', '<=', '!=', '=', '<>'}
|
compute="_compute_has_moves",
|
||||||
fields = {
|
search="_search_has_moves",
|
||||||
'balance', 'base_balance', 'balance_regular',
|
)
|
||||||
'base_balance_regular', 'balance_refund', 'base_balance_refund',
|
|
||||||
}
|
|
||||||
domain = []
|
|
||||||
if operator in operators and field in fields:
|
|
||||||
value = float(value) if value else 0
|
|
||||||
taxes = self.search([]).filtered(
|
|
||||||
lambda x: safe_eval(
|
|
||||||
'%.2f %s %.2f' % (x[field], operator, value)))
|
|
||||||
domain.append(('id', 'in', taxes.ids))
|
|
||||||
return domain
|
|
||||||
|
|
||||||
def _search_balance(self, operator, value):
|
|
||||||
return self._search_balance_field('balance', operator, value)
|
|
||||||
|
|
||||||
def _search_base_balance(self, operator, value):
|
|
||||||
return self._search_balance_field('base_balance', operator, value)
|
|
||||||
|
|
||||||
def _search_balance_regular(self, operator, value):
|
|
||||||
return self._search_balance_field('balance_regular', operator, value)
|
|
||||||
|
|
||||||
def _search_base_balance_regular(self, operator, value):
|
|
||||||
return self._search_balance_field(
|
|
||||||
'base_balance_regular', operator, value)
|
|
||||||
|
|
||||||
def _search_balance_refund(self, operator, value):
|
|
||||||
return self._search_balance_field('balance_refund', operator, value)
|
|
||||||
|
|
||||||
def _search_base_balance_refund(self, operator, value):
|
|
||||||
return self._search_balance_field(
|
|
||||||
'base_balance_refund', operator, value)
|
|
||||||
|
|
||||||
def get_context_values(self):
|
def get_context_values(self):
|
||||||
context = self.env.context
|
context = self.env.context
|
||||||
|
@ -73,6 +42,52 @@ class AccountTax(models.Model):
|
||||||
context.get('target_move', 'posted')
|
context.get('target_move', 'posted')
|
||||||
)
|
)
|
||||||
|
|
||||||
|
def _account_tax_ids_with_moves(self):
|
||||||
|
""" Return all account.tax ids for which there is at least
|
||||||
|
one account.move.line in the context period
|
||||||
|
for the user company.
|
||||||
|
|
||||||
|
Caveat: this ignores record rules and ACL but it is good
|
||||||
|
enough for filtering taxes with activity during the period.
|
||||||
|
"""
|
||||||
|
req = """
|
||||||
|
SELECT id
|
||||||
|
FROM account_tax at
|
||||||
|
WHERE
|
||||||
|
company_id = %s AND
|
||||||
|
EXISTS (
|
||||||
|
SELECT 1 FROM account_move_Line aml
|
||||||
|
WHERE
|
||||||
|
date >= %s AND
|
||||||
|
date <= %s AND
|
||||||
|
company_id = %s AND (
|
||||||
|
tax_line_id = at.id OR
|
||||||
|
EXISTS (
|
||||||
|
SELECT 1 FROM account_move_line_account_tax_rel
|
||||||
|
WHERE account_move_line_id = aml.id AND
|
||||||
|
account_tax_id = at.id
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
"""
|
||||||
|
from_date, to_date, company_id, target_move = self.get_context_values()
|
||||||
|
self.env.cr.execute(
|
||||||
|
req, (company_id, from_date, to_date, company_id))
|
||||||
|
return [r[0] for r in self.env.cr.fetchall()]
|
||||||
|
|
||||||
|
@api.multi
|
||||||
|
def _compute_has_moves(self):
|
||||||
|
ids_with_moves = set(self._account_tax_ids_with_moves())
|
||||||
|
for tax in self:
|
||||||
|
tax.has_moves = tax.id in ids_with_moves
|
||||||
|
|
||||||
|
@api.model
|
||||||
|
def _search_has_moves(self, operator, value):
|
||||||
|
if operator != '=' or not value:
|
||||||
|
raise ValueError(_("Unsupported search operator"))
|
||||||
|
ids_with_moves = self._account_tax_ids_with_moves()
|
||||||
|
return [('id', 'in', ids_with_moves)]
|
||||||
|
|
||||||
def _compute_balance(self):
|
def _compute_balance(self):
|
||||||
for tax in self:
|
for tax in self:
|
||||||
tax.balance_regular = tax.compute_balance(
|
tax.balance_regular = tax.compute_balance(
|
||||||
|
|
|
@ -60,10 +60,7 @@
|
||||||
<field name="res_model">account.tax</field>
|
<field name="res_model">account.tax</field>
|
||||||
<field name="view_type">form</field>
|
<field name="view_type">form</field>
|
||||||
<field name="view_mode">tree</field>
|
<field name="view_mode">tree</field>
|
||||||
<field name="domain">[
|
<field name="domain">[('has_moves', '=', True)]</field>
|
||||||
'|', '|', ('base_balance', '!=', 0), ('base_balance_regular', '!=', 0),
|
|
||||||
'|', '|', ('base_balance_refund', '!=', 0), ('balance', '!=', 0),
|
|
||||||
'|', ('balance_regular', '!=', 0), ('balance_refund', '!=', 0)]</field>
|
|
||||||
<field name="view_id" ref="view_tax_tree_balance"/>
|
<field name="view_id" ref="view_tax_tree_balance"/>
|
||||||
<field name="search_view_id" ref="view_tax_search_balance"/>
|
<field name="search_view_id" ref="view_tax_search_balance"/>
|
||||||
</record>
|
</record>
|
||||||
|
|
Loading…
Reference in New Issue