From 8e7aa23d1babc512b9119f38603e9739fa7e780a Mon Sep 17 00:00:00 2001 From: El Mau Date: Wed, 29 Mar 2023 17:36:17 -0600 Subject: [PATCH 1/2] Validate exists partner in edit --- source/app/models/main.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/source/app/models/main.py b/source/app/models/main.py index f6a5d15..492befc 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -2966,6 +2966,16 @@ class Socios(BaseModel): fields.pop('accounts', '') regimenes = fields.pop('regimenes', ()) + w = ( + (Socios.rfc==fields['rfc']) & + (Socios.slug==fields['slug']) & + (Socios.id!=id) + ) + if Socios.select().where(w).exists(): + msg = 'Ya existe otro emisor con este RFC y Razón Social' + data = {'ok': False, 'row': {}, 'new': True, 'msg': msg} + return data + try: q = Socios.update(**fields).where(Socios.id==id) q.execute() From 5bbad9ef58458ed882e036174729db08482e11b8 Mon Sep 17 00:00:00 2001 From: El Mau Date: Sat, 1 Apr 2023 15:09:27 -0600 Subject: [PATCH 2/2] Fix: al obtener la clave del sat al facturar en lote --- CHANGELOG.md | 5 +++++ VERSION | 2 +- source/app/models/main.py | 2 ++ source/app/settings.py | 2 +- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b00e7b5..68a6175 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +v 2.0.2 [01-Abr-2023] +--------------------- + - Fix: Obtener la clave del sat al facturar por lote. + + v 2.0.1 [29-Mar-2023] --------------------- - Fix ticket #97 diff --git a/VERSION b/VERSION index 38f77a6..e9307ca 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.1 +2.0.2 diff --git a/source/app/models/main.py b/source/app/models/main.py index 492befc..5c9cdfe 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -227,6 +227,7 @@ def import_invoice(): return {'ok': False, 'msg': msg} obj = Productos.get(Productos.clave==row[0]) + if isinstance(row[2], str): msg = 'El Precio Unitario debe ser un número, debe ser 0.00, si no quieres cambiarlo' return {'ok': False, 'msg': msg} @@ -248,6 +249,7 @@ def import_invoice(): 'id_product': obj.id, 'delete': '-', 'clave': obj.clave, + 'clave_sat': obj.clave_sat, 'descripcion': description or obj.descripcion, 'pedimento': pedimento, 'unidad': obj.unidad.id, diff --git a/source/app/settings.py b/source/app/settings.py index de51fb8..235c971 100644 --- a/source/app/settings.py +++ b/source/app/settings.py @@ -42,7 +42,7 @@ except ImportError: DEBUG = DEBUG -VERSION = '2.0.1' +VERSION = '2.0.2' EMAIL_SUPPORT = ('soporte@empresalibre.mx',) TITLE_APP = '{} v{}'.format(TITLE_APP, VERSION)