Skip to content

GitLab

Merged
Opened by Noe Fernando Izquierdo Hernandez@noe.izquierdoOwner

feat(account.payment): se corrigen errores para la validación de pagos

Viewing commit 91537a6a
3 files
+ 33
- 69
Show latest version
l10n_mx_‎facturae‎
mod‎els‎
account‎_move.py‎ +0 -24
account_p‎ayment.py‎ +29 -41
temp‎lates‎
account_p‎ayment.xml‎ +4 -4
l10n_mx_facturae/models/account_move.py
+ 0
- 24
Show all unchanged lines Show 20 lines
"N° Pediment",
)
l10n_mx_tax_base_dr = fields.Monetary(
compute="_compute_l10n_mx_tax_base_dr"
)
l10n_mx_tax_importe_dr = fields.Monetary(
compute="_compute_l10n_mx_tax_importe_dr"
)
l10n_mx_tax_currency_dr = fields.Monetary(
compute="_compue_l10n_mx_tax_currency_dr"
)
@api.constrains("cfdi_cuentapredial")
def _constraint_cfdi_cuentapredial(self):
for record in self:
Show 20 lines Show all unchanged lines Show 20 lines
def l10n_mx_facturae_importe(self):
return "{0:.2f}".format(self.importe)
def _compute_l10n_mx_tax_base_dr(self):
for record in self:
return
def _compute_l10n_mx_tax_importe_dr(self):
for record in self:
return
def _compue_l10n_mx_tax_currency_dr(self):
for record in self:
return
l10n_mx_facturae/models/account_payment.py
+ 29
- 41
Show all unchanged lines Show 20 lines
tax_group = tax_rep_lines.mapped("tag_ids")
key = tax_group.name + str(line["tax_id"].amount)
if company_currency != voucher_currency:
company_currency = company_currency.with_context(
special_currency_rate=self.currency_rate(),
special_currency=voucher_currency.id,
)
tax_totals["importe" + key] = company_currency.compute(
line["importe"], voucher_currency,
)
tax_totals["base" + key] = company_currency.compute(
line["tax_base"], voucher_currency,
)
else:
tax_totals["importe" + key] = line["importe"]
tax_totals["base" + key] = line["tax_base"]
tax_totals["importe" + key] = line["importe"]
tax_totals["base" + key] = line["tax_base"]
return tax_totals
Show 20 lines Show all unchanged lines Show 20 lines
importe=0.0,
)
if tax_move.currency_id != voucher_currency:
invoice_currency = (
tax_move.currency_id
if tax_move.currency_id else company_currency
)
invoice_currency = invoice_currency.with_context(date=self.date)
if invoice_currency != company_currency:
invoice_currency = invoice_currency.with_context(
special_currency_rate=self.tipocambiodr(invoice),
special_currency=invoice_currency.id,
)
else:
invoice_currency = invoice_currency.with_context(
special_currency_rate=(1 / self.tipocambiodr(invoice)),
special_currency=voucher_currency.id,
)
tax_base = invoice_currency.compute(
tax_move.tax_base_amount, voucher_currency, round=False,
)
# Force rounding 6 decimals to use as many decimal as possible and
# avoid rounding errors when validating XML
tax_base = float_round(
tax_base, precision_digits=2, rounding_method="DOWN",
)
else:
tax_base = tax_move.tax_base_amount
tax_base = self._l10n_mx_tax_base_dr(invoice, tax_move)
importe = self._l10n_mx_tax_importe_dr(invoice, tax_move)
tax_totals[tax_move.tax_line_id.id]["tax_base"] += tax_base
tax_totals[tax_move.tax_line_id.id]["importe"] += abs(tax_move.balance)
tax_totals[tax_move.tax_line_id.id]["importe"] += importe
return [line for line in tax_totals.values()]
Show 20 lines Show all unchanged lines Show 20 lines
domain.append(("tax_line_id.amount_type", "=", "percent"))
return domain
def _l10n_mx_tax_base_dr(self, invoice, tax_move):
amount = tax_move.tax_base_amount
if invoice.currency_id != self.company_id.currency_id:
account = (
tax_move.company_id.account_cash_basis_base_account_id or
tax_move.account_id
)
base_line = tax_move.move_id.line_ids.filtered(
lambda l:
l.id != tax_move.id and l.account_id == account and l.tax_ids
)
amount = -1 * base_line.amount_currency
return amount
def _l10n_mx_tax_importe_dr(self, invoice, tax_move):
amount = tax_move.balance
if invoice.currency_id != self.company_id.currency_id:
amount = tax_move.amount_currency
return -1 * amount
l10n_mx_facturae/templates/account_payment.xml
+ 4
- 4
Show all unchanged lines Show 20 lines
t-att-TotalTrasladosImpuestoIVA16="format_float(traslados.get('importeIVA16.0'), o.currency_id.decimal_places) if traslados.get('importeIVA16.0', False) else False"
t-att-TotalTrasladosBaseIVA8="format_float(traslados.get('baseIVA8.0'), o.currency_id.decimal_places) if traslados.get('baseIVA8.0', False) else False"
t-att-TotalTrasladosImpuestoIVA8="format_float(traslados.get('importeIVA8.0'), o.currency_id.decimal_places) if traslados.get('importeIVA8.0', False) else False"
t-att-TotalTrasladosBaseIVA0="traslados.get('baseIVA0.0', False)"
t-att-TotalTrasladosImpuestoIVA0="traslados.get('importeIVA0.0', False)"
t-att-TotalTrasladosBaseIVA0="format_float(traslados.get('baseIVA0.0'), o.currency_id.decimal_places) if traslados.get('baseIVA0.0', False) else False"
t-att-TotalTrasladosImpuestoIVA0="format_float(traslados.get('importeIVA0.0'), o.currency_id.decimal_places) if traslados.get('importeIVA0.0', False) else False"
t-att-TotalRetencionesIVA="retenciones.get('importeIVA', False)"
t-att-TotalRetencionesISR="retenciones.get('importeISR', False)"
t-att-TotalRetencionesIEPS="retenciones.get('importeIEPS', False)" />
Show 20 lines Show all unchanged lines Show 20 lines
</pago20:RetencionesDR>
<pago20:TrasladosDR>
<pago20:TrasladoDR t-foreach="o.impuestos_dr(invoice)" t-as="tax_move"
t-att-BaseDR="format_float(tax_move.tax_base_amount, invoice.currency_id.decimal_places)"
t-att-BaseDR="format_float(o._l10n_mx_tax_base_dr(invoice, tax_move), invoice.currency_id.decimal_places)"
t-att-ImpuestoDR="format_impuesto(tax_move.tax_line_id)"
t-att-ImporteDR="format_float(abs(tax_move.balance), invoice.currency_id.decimal_places)"
t-att-ImporteDR="format_float(abs(o._l10n_mx_tax_importe_dr(invoice, tax_move)), invoice.currency_id.decimal_places)"
t-att-TasaOCuotaDR="format_tasaocuota(tax_move.tax_line_id)"
t-att-TipoFactorDR="tax_move.tax_line_id.l10n_mx_tax_type" />
</pago20:TrasladosDR>
Show 20 lines Show all unchanged lines