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 b992efa4
8 files
+ 51
- 30
Show latest version
l10n_mx_‎facturae‎
da‎ta‎
account_‎move.xml‎ +2 -2
account_p‎ayment.xml‎ +2 -2
ir_attachment_fa‎cturae_config.xml‎ +2 -2
rep‎ort‎
__ini‎t__.py‎ +1 -0
account‎_move.py‎ +22 -0
account_p‎ayment.py‎ +16 -18
temp‎lates‎
account_‎move.xml‎ +4 -4
account_p‎ayment.xml‎ +2 -2
l10n_mx_facturae/data/account_move.xml
+ 2
- 2

Files with large changes are collapsed by default.

l10n_mx_facturae/data/account_payment.xml
+ 2
- 2
Show all unchanged lines Show 20 lines
<field name="name">Account Payment CFDI XML</field>
<field name="model">account.payment</field>
<field name="report_type">qweb-xml</field>
<field name="report_name">l10n_mx_facturae.account_payment_template_cfdi_xml</field>
<field name="report_name">l10n_mx_facturae.account_payment</field>
<field name="xml_declaration">true</field>
<field name="xsd_schema"></field>
</record>
Show 20 lines Show all unchanged lines Show 20 lines
<field name="report_file">l10n_mx_facturae/report/account_payment.odt</field>
<field name="in_format">oo-odt</field>
<field name="out_format" ref="report_aeroo.report_mimetypes_pdf_odt"/>
<field name="parser_model">report.l10n_mx_facturae.account_payment_template_cfdi_xml</field>
<field name="parser_model">report.l10n_mx_facturae.account_payment</field>
<field name="styles_mode">default</field>
<field name="preload_mode">static</field>
<field name="deferred">off</field>
Show 20 lines Show all unchanged lines
l10n_mx_facturae/data/ir_attachment_facturae_config.xml
+ 2
- 2
Show all unchanged lines Show 20 lines
model="ir.attachment.facturae.mx.config">
<field name="model">account.move</field>
<field name="version">4.0</field>
<field name="template_xml_sign">l10n_mx_facturae.account_move_template_cfdi_xml</field>
<field name="template_xml_sign">l10n_mx_facturae.account_move</field>
<field name="template_xml_cancel">Aun.no.hay.uno</field>
<field name="template_pdf_sign">l10n_mx_facturae.account_move_template_cfdi_pdf</field>
<field name="template_pdf_cancel">l10n_mx_facturae.account_move_template_cfdi_pdf</field>
Show 20 lines Show all unchanged lines Show 20 lines
model="ir.attachment.facturae.mx.config">
<field name="model">account.payment</field>
<field name="version">4.0</field>
<field name="template_xml_sign">l10n_mx_facturae.account_payment_template_cfdi_xml</field>
<field name="template_xml_sign">l10n_mx_facturae.account_payment</field>
<field name="template_xml_cancel">Aun.no.hay.uno</field>
<field name="template_pdf_sign">l10n_mx_facturae.account_payment_template_cfdi_pdf</field>
<field name="template_pdf_cancel"><!--l10n_mx_facturae.account_payment_template_cfdi_pdf--></field>
Show 20 lines Show all unchanged lines
l10n_mx_facturae/report/__init__.py
+ 1
- 0
# -*- coding: utf-8 -*-
from . import account_move
from . import account_payment
l10n_mx_facturae/report/account_move.py
+ 22
- 0
# -*- coding: utf-8 -*-
from odoo import api, models
class Parser(models.AbstractModel):
_inherit = "report.l10n_mx_cfdi"
_description = "report.l10n_mx_facturae.account_move"
_name = "report.l10n_mx_facturae.account_move"
def _get_report_values(self, docids, data=None):
res = super()._get_report_values(docids, data=data)
docs = self.env["account.move"].browse(docids)
# return a custom rendering context
res.update(
{
"doc_ids": docids,
"doc_model": "account.move",
"docs": docs,
}
)
return res
l10n_mx_facturae/report/account_payment.py
+ 16
- 18
Show all unchanged lines Show 20 lines
class Parser(models.AbstractModel):
_inherit = ["report.report_xml.abstract", "report.l10n_mx_qr", "report.report_aeroo.abstract"]
_description = "report.l10n_mx_facturae.account_payment_template_cfdi_xml"
_name = "report.l10n_mx_facturae.account_payment_template_cfdi_xml"
_inherit = "report.l10n_mx_cfdi"
_description = "report.l10n_mx_facturae.account_payment"
_name = "report.l10n_mx_facturae.account_payment"
@api.model
def aeroo_report(self, docids, data):
self = self.with_context(
format_float = self._format_float,
format_impuesto = self._format_impuesto,
format_tasaocuota = self._format_tasaocuota,
format_impuesto=self._format_impuesto,
format_tasaocuota=self._format_tasaocuota,
)
return super(Parser, self).aeroo_report(docids, data)
def _get_report_values(self, docids, data=None):
res = super()._get_report_values(docids, data=data)
docs = self.env["account.payment"].browse(docids)
# return a custom rendering context
return {
"doc_ids": docids,
"doc_model": "account.payment",
"docs": docs,
"format_float": self._format_float,
"format_impuesto": self._format_impuesto,
"format_tasaocuota": self._format_tasaocuota,
}
def _format_float(self, amount, decimals):
"""Format any amount to a given number of decimals"""
return "{:.{}f}".format(amount, decimals)
res.update(
{
"doc_ids": docids,
"doc_model": "account.payment",
"docs": docs,
"format_impuesto": self._format_impuesto,
"format_tasaocuota": self._format_tasaocuota,
}
)
return res
def _format_impuesto(self, tax):
tax_types = {
Show 20 lines Show all unchanged lines
l10n_mx_facturae/templates/account_move.xml
+ 4
- 4
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<template id="account_move_template_cfdi_xml">
<template id="account_move">
<t t-set="move" t-value="docs[0]" />
<t t-set="taxes" t-value="move.impuestos" />
<t t-set="total_traslados" t-value="move.l10n_mx_facturae_compute_total_traslados(taxes)" />
Show 20 lines Show all unchanged lines Show 20 lines
<cfdi:Traslados t-if="line.impuestos['traslados']">
<t t-set="impuestos" t-value="line.impuestos"/>
<cfdi:Traslado t-foreach="impuestos['traslados']" t-as="tax"
t-attf-Base="{{ tax.base }}"
t-att-Base="format_float(tax.base, o.currency_id.decimal_places)"
t-attf-Impuesto="{{ tax.xml_name }}"
t-attf-TipoFactor="{{ tax.type }}"
t-attf-TasaOCuota="{{ tax.TasaOCuota }}"
Show 20 lines Show all unchanged lines Show 20 lines
</cfdi:Traslados>
<cfdi:Retenciones t-if="impuestos['retenciones']">
<cfdi:Retencion t-foreach="impuestos['retenciones']" t-as="tax"
t-attf-Base="{{ tax.base }}"
t-att-Base="format_float(tax.base, o.currency_id.decimal_places)"
t-attf-Impuesto="{{ tax.xml_name }}"
t-attf-TipoFactor="{{ tax.type }}"
t-attf-TasaOCuota="{{ tax.TasaOCuota }}"
Show 20 lines Show all unchanged lines Show 20 lines
</cfdi:Retenciones>
<cfdi:Traslados t-if="taxes['traslados']">
<cfdi:Traslado t-foreach="taxes['traslados']" t-as="tax"
t-attf-Base="{{ tax.base }}"
t-att-Base="format_float(tax.base, o.currency_id.decimal_places)"
t-attf-Impuesto="{{ tax.xml_name }}"
t-attf-TipoFactor="{{ tax.type }}"
t-attf-TasaOCuota="{{ tax.TasaOCuota }}"
Show 20 lines Show all unchanged lines
l10n_mx_facturae/templates/account_payment.xml
+ 2
- 2
<?xml version="1.0" encoding="UTF-8" ?>
<odoo>
<template id="account_payment_template_cfdi_xml">
<template id="account_payment">
<t t-set="payment" t-value="docs[0]" />
<t t-set="residenciaFiscal" t-value="payment.l10n_mx_facturae_payment_compute_residencia_fiscal()"/>
<t t-set="regimenTrib" t-value="payment.l10n_mx_facturae_payment_compute_regimen_tributario()"/>
Show 20 lines Show all unchanged lines Show 20 lines
<pago20:Totales
t-attf-MontoTotalPagos="{{ o.l10n_mx_facturae_payment_montototalpagos() }}"
t-att-TotalTrasladosBaseIVAExento="traslados.get('baseIVAExento', False)"
t-att-TotalTrasladosBaseIVA16="traslados.get('baseIVA16.0', False)"
t-att-TotalTrasladosBaseIVA16="format_float(traslados.get('baseIVA16.0', False), o.currency_id.decimal_places)"
t-att-TotalTrasladosImpuestoIVA16="traslados.get('importeIVA16.0', False)"
t-att-TotalTrasladosBaseIVA8="traslados.get('baseIVA8.0', False)"
t-att-TotalTrasladosImpuestoIVA8="traslados.get('importeIVA8.0', False)"
Show 20 lines Show all unchanged lines