1328

pending completion

Build # 1328

Build Type

Pull #325

travis-ci

Committed by

web-flow

Commit Message

[IMP] refactor for performance imp and v13 comp.

Several changes to improove the computation of the budget to date.
This changes make breat this past improvements:
* https://github.com/ingadhoc/odoo-public-administration/commit/cb617ea99
* https://github.com/ingadhoc/odoo-public-administration/commit/8e0d85073

Pull Request Pull Request #325: [IMP] refactor for performance imp and v13 comp.

Run Details

183 of 183 new or added lines in 7 files covered. (100.0%)

1550 of 2746 relevant lines covered (56.45%)

0.56 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

32.43

/public_budget/models/account_invoice_line.py

from odoo import models, fields, api, _
from odoo.exceptions import ValidationError
from odoo.tools import float_is_zero
import logging
_logger = logging.getLogger(__name__)


class AccountInvoiceLine(models.Model):

    _inherit = 'account.invoice.line'

    to_pay_amount = fields.Monetary(
        compute='_compute_amounts',
        # store=True,
    )
    paid_amount = fields.Monetary(
        compute='_compute_amounts',
        # store=True,
    )
    definitive_line_id = fields.Many2one(
        'public_budget.definitive_line',
        readonly=True,
        auto_join=True,
    )

    @api.depends(
        # 'price_subtotal',
        # 'invoice_id.amount_total',
        'invoice_id.residual',
        'invoice_id.to_pay_amount',
    )
    def _compute_amounts(self):
        """Update the following fields:
        -to_pay_amount: is the amount of this invoice that is in draft vouchers
        so we consider that is has been sent to be paid. Dividimos
        proporcionalmente por linea, porque sabemos el total a nivel factura
        -paid_amount: vemos el porcentaje que se pago de la factura y,
        al total de cada linea lo multiplicamos por ese porcentaje"""
        _logger.info('Getting amounts for invoice lines %s' % self.ids)
        to_date = self._context.get('analysis_to_date', False)

        lines = self.filtered(lambda x: x.invoice_id.state not in ['draft', 'cancel'])

        invoice_vals = {}
        for invoice in lines.mapped('invoice_id'):
            invoice_total = invoice.amount_total
            # if to_date, then we dont get residual from invoice,
            # we get from helper function
            if to_date:
                invoice_paid_perc = invoice._get_paid_amount_to_date() / invoice_total
                invoice_to_pay_perc = invoice._get_to_pay_amount_to_date() / invoice_total
            else:
                # odoo compute residual always positive, no matter invoice is negative
                residual = invoice.residual
                if invoice_total < 0:
                    residual = -residual
                invoice_paid_perc = (invoice_total - residual) / invoice_total
                invoice_to_pay_perc = invoice.to_pay_amount / invoice_total
            invoice_vals[invoice] = {
                'amount_total': invoice_total,
                'invoice_paid_perc': invoice_paid_perc,
                'invoice_to_pay_perc': invoice_to_pay_perc,
            }
        for rec in lines:
            invoice_total = invoice_vals[rec.invoice_id]['amount_total']
            if float_is_zero(invoice_total, precision_rounding=rec.currency_id.rounding):
                continue
            rec.to_pay_amount = rec.price_subtotal * invoice_vals[rec.invoice_id]['invoice_to_pay_perc']
            rec.paid_amount = rec.price_subtotal * invoice_vals[rec.invoice_id]['invoice_paid_perc']

    @api.constrains(
        'definitive_line_id',
    )
    def check_budget_state_open_pre_closed(self):
        for rec in self:
            budget = rec.definitive_line_id.budget_id
            if budget and budget.state not in ['open', 'pre_closed']:
                raise ValidationError(_(
                    'Solo puede cambiar o registrar comprobantes si '
                    'el presupuesto está abierto o en pre-cierre'))

1	from odoo import models, fields, api, _	1✔
2	from odoo.exceptions import ValidationError	1✔
3	from odoo.tools import float_is_zero	1✔
4	import logging	1✔
5	_logger = logging.getLogger(__name__)	1✔
6
7
8	class AccountInvoiceLine(models.Model):	1✔
9
10	_inherit = 'account.invoice.line'	1✔
11
12	to_pay_amount = fields.Monetary(	1✔
13	compute='_compute_amounts',
14	# store=True,
15	)
16	paid_amount = fields.Monetary(	1✔
17	compute='_compute_amounts',
18	# store=True,
19	)
20	definitive_line_id = fields.Many2one(	1✔
21	'public_budget.definitive_line',
22	readonly=True,
23	auto_join=True,
24	)
25
26	@api.depends(	1✔
27	# 'price_subtotal',
28	# 'invoice_id.amount_total',
29	'invoice_id.residual',
30	'invoice_id.to_pay_amount',
31	)
32	def _compute_amounts(self):
33	"""Update the following fields:
34	-to_pay_amount: is the amount of this invoice that is in draft vouchers
35	so we consider that is has been sent to be paid. Dividimos
36	proporcionalmente por linea, porque sabemos el total a nivel factura
37	-paid_amount: vemos el porcentaje que se pago de la factura y,
38	al total de cada linea lo multiplicamos por ese porcentaje"""
39	_logger.info('Getting amounts for invoice lines %s' % self.ids)	×
40	to_date = self._context.get('analysis_to_date', False)	×
41
42	lines = self.filtered(lambda x: x.invoice_id.state not in ['draft', 'cancel'])	×
43
44	invoice_vals = {}	×
45	for invoice in lines.mapped('invoice_id'):	×
46	invoice_total = invoice.amount_total	×
47	# if to_date, then we dont get residual from invoice,
48	# we get from helper function
49	if to_date:	×
50	invoice_paid_perc = invoice._get_paid_amount_to_date() / invoice_total	×
51	invoice_to_pay_perc = invoice._get_to_pay_amount_to_date() / invoice_total	×
52	else:
53	# odoo compute residual always positive, no matter invoice is negative
54	residual = invoice.residual	×
55	if invoice_total < 0:	×
56	residual = -residual	×
57	invoice_paid_perc = (invoice_total - residual) / invoice_total	×
58	invoice_to_pay_perc = invoice.to_pay_amount / invoice_total	×
59	invoice_vals[invoice] = {	×
60	'amount_total': invoice_total,
61	'invoice_paid_perc': invoice_paid_perc,
62	'invoice_to_pay_perc': invoice_to_pay_perc,
63	}
64	for rec in lines:	×
65	invoice_total = invoice_vals[rec.invoice_id]['amount_total']	×
66	if float_is_zero(invoice_total, precision_rounding=rec.currency_id.rounding):	×
67	continue	×
68	rec.to_pay_amount = rec.price_subtotal * invoice_vals[rec.invoice_id]['invoice_to_pay_perc']	×
69	rec.paid_amount = rec.price_subtotal * invoice_vals[rec.invoice_id]['invoice_paid_perc']	×
70
71	@api.constrains(	1✔
72	'definitive_line_id',
73	)
74	def check_budget_state_open_pre_closed(self):
75	for rec in self:	×
76	budget = rec.definitive_line_id.budget_id	×
77	if budget and budget.state not in ['open', 'pre_closed']:	×
78	raise ValidationError(_(	×
79	'Solo puede cambiar o registrar comprobantes si '
80	'el presupuesto está abierto o en pre-cierre'))

ingadhoc / odoo-public-administration / 1328

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous