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

[IMP] l10n_latam_invoice_document: remove fields

Browse Source 
Fields removed:
 * l10n_latam_amount_untaxed
 * l10n_latam_tax_ids
 * l10n_latam_price_unit
 * l10n_latam_price_subtotal
 * l10n_latam_price_net

Methods removed:
 * compute_l10n_latam_prices_and_taxes
 * compute_l10n_latam_amount_and_taxes
 * _compute_invoice_taxes_by_group

We move the removed methods to l10n_ar and l10n_cl and now it returns
a dictionary with the removed fields as the keys.

X-original-commit: 667ffb286d27f1e7a834b15d8f61536e530acd6f
Part-of: odoo/odoo#78296
Co-authored-by: Juan Jose Scarafia <jjs@adhoc.com.ar>
This commit is contained in:
Bruno Zanotti (ADHOC)
2021-10-14 16:16:04 +00:00
committed by Bruno Zanotti
co-authored by Juan Jose Scarafia
parent 7fd7ac1f31
commit ee7e20f49d
3 changed files with 1 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/l10n_latam_invoice_document/models/account_move.py
-50
View File
@@ -2,9 +2,6 @@
from odoo import models, fields, api, _
from odoo.exceptions import UserError, ValidationError
import json
import re
from odoo.tools.misc import formatLang
from odoo.tools.sql import column_exists, create_column
@@ -44,8 +41,6 @@ class AccountMove(models.Model):
create_column(self.env.cr, "account_move", "l10n_latam_document_type_id", "int4")
return super()._auto_init()
l10n_latam_amount_untaxed = fields.Monetary(compute='_compute_l10n_latam_amount_and_taxes')
l10n_latam_tax_ids = fields.One2many(compute="_compute_l10n_latam_amount_and_taxes", comodel_name='account.move.line')
l10n_latam_available_document_type_ids = fields.Many2many('l10n_latam.document.type', compute='_compute_l10n_latam_available_document_types')
l10n_latam_document_type_id = fields.Many2one(
'l10n_latam.document.type', string='Document Type', readonly=False, auto_join=True, index=True,
@@ -130,31 +125,6 @@ class AccountMove(models.Model):
return super(AccountMove, self)._get_starting_sequence()
def _compute_l10n_latam_amount_and_taxes(self):
recs_invoice = self.filtered(lambda x: x.is_invoice())
for invoice in recs_invoice:
tax_lines = invoice.line_ids.filtered('tax_line_id')
currencies = invoice.line_ids.filtered(lambda x: x.currency_id == invoice.currency_id).mapped('currency_id')
included_taxes = invoice.l10n_latam_document_type_id and \
invoice.l10n_latam_document_type_id._filter_taxes_included(tax_lines.mapped('tax_line_id'))
if not included_taxes:
l10n_latam_amount_untaxed = invoice.amount_untaxed
not_included_invoice_taxes = tax_lines
else:
included_invoice_taxes = tax_lines.filtered(lambda x: x.tax_line_id in included_taxes)
not_included_invoice_taxes = tax_lines - included_invoice_taxes
if invoice.is_inbound():
sign = -1
else:
sign = 1
amount = 'amount_currency' if len(currencies) == 1 else 'balance'
l10n_latam_amount_untaxed = invoice.amount_untaxed + sign * sum(included_invoice_taxes.mapped(amount))
invoice.l10n_latam_amount_untaxed = l10n_latam_amount_untaxed
invoice.l10n_latam_tax_ids = not_included_invoice_taxes
remaining = self - recs_invoice
remaining.l10n_latam_amount_untaxed = False
remaining.l10n_latam_tax_ids = [(5, 0)]
def _post(self, soft=True):
for rec in self.filtered(lambda x: x.l10n_latam_use_documents and (not x.name or x.name == '/')):
if rec.move_type in ('in_receipt', 'out_receipt'):
@@ -226,20 +196,6 @@ class AccountMove(models.Model):
document_types = document_types.filtered(lambda x: x.internal_type == 'debit_note')
rec.l10n_latam_document_type_id = document_types and document_types[0].id
def _prepare_tax_lines_data_for_totals_from_invoice(self, tax_line_id_filter=None, tax_ids_filter=None):
# Overridden from account in order to exclude some taxes from the totals' computation.
# TODO CLEANME: we'd better get rid of those l10n_latam_tax_ids fields.
report_or_portal_view = 'commit_assetsbundle' in self.env.context \
or not self.env.context.get('params', {}).get('view_type') == 'form'
if report_or_portal_view and self.l10n_latam_document_type_id:
# Under such circumstances, we want to hide some taxes, and only
# display the ones in l10n_latam_tax_ids fields
tax_line_id_filter = lambda aml, tax: tax in aml.move_id.l10n_latam_tax_ids.tax_line_id
tax_ids_filter = lambda aml, tax: tax in aml.l10n_latam_tax_ids
return super()._prepare_tax_lines_data_for_totals_from_invoice(tax_line_id_filter, tax_ids_filter)
@api.constrains('name', 'partner_id', 'company_id', 'posted_before')
def _check_unique_vendor_number(self):
""" The constraint _check_unique_sequence_number is valid for customer bills but not valid for us on vendor
@@ -259,9 +215,3 @@ class AccountMove(models.Model):
]
if rec.search(domain):
raise ValidationError(_('Vendor bill number must be unique per vendor and company.'))
def _get_tax_totals_for_latam_invoice_report(self):
self.ensure_one()
tax_totals = json.loads(self.tax_totals_json)
tax_totals['amount_untaxed'] = self.l10n_latam_amount_untaxed
return tax_totals
addons/l10n_latam_invoice_document/models/account_move_line.py
+1 -37
View File
@@ -1,6 +1,6 @@
# Part of Odoo. See LICENSE file for full copyright and licensing details.
from odoo import models, api, fields
from odoo import models, fields
from odoo.tools.sql import column_exists, create_column
@@ -17,39 +17,3 @@ class AccountMoveLine(models.Model):
l10n_latam_document_type_id = fields.Many2one(
related='move_id.l10n_latam_document_type_id', auto_join=True, store=True, index=True)
l10n_latam_price_unit = fields.Float(compute='compute_l10n_latam_prices_and_taxes', digits='Product Price')
l10n_latam_price_subtotal = fields.Monetary(compute='compute_l10n_latam_prices_and_taxes')
l10n_latam_price_net = fields.Float(compute='compute_l10n_latam_prices_and_taxes', digits='Product Price')
l10n_latam_tax_ids = fields.One2many(compute="compute_l10n_latam_prices_and_taxes", comodel_name='account.tax')
@api.depends('price_unit', 'price_subtotal', 'move_id.l10n_latam_document_type_id')
def compute_l10n_latam_prices_and_taxes(self):
for line in self:
invoice = line.move_id
included_taxes = \
invoice.l10n_latam_document_type_id and invoice.l10n_latam_document_type_id._filter_taxes_included(
line.tax_ids)
# For the unit price, we need the number rounded based on the product price precision.
# The method compute_all uses the accuracy of the currency so, we multiply and divide for 10^(decimal accuracy of product price) to get the price correctly rounded.
price_digits = 10**self.env['decimal.precision'].precision_get('Product Price')
if not included_taxes:
price_unit = line.tax_ids.with_context(round=False, force_sign=invoice._get_tax_force_sign()).compute_all(
line.price_unit * price_digits, invoice.currency_id, 1.0, line.product_id, invoice.partner_id)
l10n_latam_price_unit = price_unit['total_excluded'] / price_digits
l10n_latam_price_subtotal = line.price_subtotal
not_included_taxes = line.tax_ids
l10n_latam_price_net = l10n_latam_price_unit * (1 - (line.discount or 0.0) / 100.0)
else:
not_included_taxes = line.tax_ids - included_taxes
l10n_latam_price_unit = included_taxes.with_context(force_sign=invoice._get_tax_force_sign()).compute_all(
line.price_unit * price_digits, invoice.currency_id, 1.0, line.product_id, invoice.partner_id)['total_included'] / price_digits
l10n_latam_price_net = l10n_latam_price_unit * (1 - (line.discount or 0.0) / 100.0)
price = line.price_unit * (1 - (line.discount or 0.0) / 100.0)
l10n_latam_price_subtotal = included_taxes.with_context(force_sign=invoice._get_tax_force_sign()).compute_all(
price, invoice.currency_id, line.quantity, line.product_id,
invoice.partner_id)['total_included']
line.l10n_latam_price_subtotal = l10n_latam_price_subtotal
line.l10n_latam_price_unit = l10n_latam_price_unit
line.l10n_latam_price_net = l10n_latam_price_net
line.l10n_latam_tax_ids = not_included_taxes
addons/l10n_latam_invoice_document/models/l10n_latam_document_type.py
-7
View File
@@ -51,10 +51,3 @@ class L10nLatamDocumentType(models.Model):
else:
domain = ['|', ('name', 'ilike', name), ('code', 'ilike', name)]
return self._search(expression.AND([domain, args]), limit=limit, access_rights_uid=name_get_uid)
def _filter_taxes_included(self, taxes):
""" This method is to be inherited by different localizations and must return filter the given taxes recordset
returning the taxes to be included on reports of this document type. All taxes are going to be discriminated
except the one returned by this method. """
self.ensure_one()
return self.env['account.tax']