From 485dc4154ed849a38cd6af2e2c7951c75499bf39 Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Fri, 8 Mar 2019 19:40:53 -0600 Subject: [PATCH] Fix #343 --- CHANGELOG.md | 4 ++++ VERSION | 2 +- source/app/models/main.py | 7 ++++++- source/app/settings.py | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3fec62..fe4c14b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +v 1.28.3 [09-mar-2019] +---------------------- + - Error: Al mostrar detalle en facturas importadas #343 + v 1.28.2 [04-mar-2019] ---------------------- - Error: Al enviar facturas de pago diff --git a/VERSION b/VERSION index bf4df28..ac786b6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.28.2 +1.28.3 diff --git a/source/app/models/main.py b/source/app/models/main.py index c9cd429..e052e66 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -5184,7 +5184,12 @@ class Facturas(BaseModel): for concepto in data['conceptos']: valor_unitario = float(concepto['ValorUnitario']) descuento = float(concepto.get('Descuento', '0.0')) + clave = concepto.get('NoIdentificacion', '') + producto = None + if Productos.select().where(Productos.clave==clave).exists(): + producto = Productos.get(Productos.clave==clave) c = { + 'producto': producto, 'cantidad': float(concepto['Cantidad']), 'valor_unitario': valor_unitario, 'descuento': descuento, @@ -5192,7 +5197,7 @@ class Facturas(BaseModel): 'importe': float(concepto['Importe']), 'descripcion': concepto['Descripcion'], 'unidad': concepto.get('Unidad', ''), - 'clave': concepto.get('NoIdentificacion', ''), + 'clave': clave, 'clave_sat': concepto['ClaveProdServ'], } conceptos.append(c) diff --git a/source/app/settings.py b/source/app/settings.py index 20f549b..54636fb 100644 --- a/source/app/settings.py +++ b/source/app/settings.py @@ -47,7 +47,7 @@ except ImportError: DEBUG = DEBUG -VERSION = '1.28.2' +VERSION = '1.28.3' EMAIL_SUPPORT = ('soporte@empresalibre.mx',) TITLE_APP = '{} v{}'.format(TITLE_APP, VERSION)