categulario
/
empresa-libre
forked from elmau/empresa-libre
1
0
Fork 0
Code Pull Requests Activity

Error #268

This commit is contained in:
Mauricio Baeza 2018-09-18 10:35:07 -05:00
parent a05b370c33
commit 525394dbed
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/app/models/main.py
View File

@ -3894,13 +3894,19 @@ class Facturas(BaseModel):
'factura': invoice.id, 'factura': invoice.id,
'impuesto': tax.id, 'impuesto': tax.id,
'base': tax.base, 'base': tax.base,
'importe': tax.suma_impuestos, 'importe': round(tax.suma_impuestos, DECIMALES),
} }
FacturasImpuestos.create(**invoice_tax) FacturasImpuestos.create(**invoice_tax)
if not total_trasladados is None:
total_trasladados = round(total_trasladados, DECIMALES)
if not total_retenciones is None:
total_retenciones = round(total_retenciones, DECIMALES)
total = subtotal - descuento_cfdi + \ total = subtotal - descuento_cfdi + \
(total_trasladados or 0) - (total_retenciones or 0) \ (total_trasladados or 0) - (total_retenciones or 0) \
+ locales_traslados - locales_retenciones + locales_traslados - locales_retenciones
total = round(total, DECIMALES)
total_mn = round(total * invoice.tipo_cambio, DECIMALES) total_mn = round(total * invoice.tipo_cambio, DECIMALES)
data = { data = {
'subtotal': subtotal, 'subtotal': subtotal,
@ -3910,6 +3916,7 @@ class Facturas(BaseModel):
'total_trasladados': total_trasladados, 'total_trasladados': total_trasladados,
'total_retenciones': total_retenciones, 'total_retenciones': total_retenciones,
} }
return data return data
def _guardar_relacionados(self, invoice, relacionados): def _guardar_relacionados(self, invoice, relacionados):
@ -5531,7 +5538,10 @@ class CfdiPagos(BaseModel):
r['MetodoDePagoDR'] = DEFAULT_CFDIPAY['WAYPAY'] r['MetodoDePagoDR'] = DEFAULT_CFDIPAY['WAYPAY']
r['ImpSaldoAnt'] = FORMAT.format(r['ImpSaldoAnt']) r['ImpSaldoAnt'] = FORMAT.format(r['ImpSaldoAnt'])
r['ImpPagado'] = FORMAT.format(r['ImpPagado']) r['ImpPagado'] = FORMAT.format(r['ImpPagado'])
r['ImpSaldoInsoluto'] = FORMAT.format(r['ImpSaldoInsoluto']) if round(r['ImpSaldoInsoluto'], 2) == 0.0:
r['ImpSaldoInsoluto'] = '0.00'
else:
r['ImpSaldoInsoluto'] = FORMAT.format(r['ImpSaldoInsoluto'])
return related return related