From dc1f48cc0b4c53f06489663ee2ff4aa5b90368df Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Mon, 18 Jun 2018 14:10:52 -0500 Subject: [PATCH] Ticket #223, Fix Ticket #224 --- CHANGELOG.md | 6 ++++++ VERSION | 2 +- source/app/controllers/cfdi_xml.py | 2 +- source/app/controllers/util.py | 5 +++-- source/app/settings.py | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e03c38..60adc6b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +v 1.9.0 [18-jun-2018] +--------------------- + - Se agrega la vista del detalle de facturas + - Fix: Al timbrar nĂ³mina + + v 1.8.1 [14-jun-2018] --------------------- - Fix: Se agrega una barra de desplazamiento al buscar productos o clientes diff --git a/VERSION b/VERSION index a8fdfda..f8e233b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.8.1 +1.9.0 diff --git a/source/app/controllers/cfdi_xml.py b/source/app/controllers/cfdi_xml.py index a192565..f01e117 100644 --- a/source/app/controllers/cfdi_xml.py +++ b/source/app/controllers/cfdi_xml.py @@ -124,7 +124,7 @@ class CFDI(object): if datos['donativo']: self._donativo = True - self._edu = datos['edu'] + self._edu = datos.get('edu', False) if datos['complementos']: if 'ine' in datos['complementos']: diff --git a/source/app/controllers/util.py b/source/app/controllers/util.py index 2573584..0385eae 100644 --- a/source/app/controllers/util.py +++ b/source/app/controllers/util.py @@ -48,7 +48,7 @@ try: from com.sun.star.awt import Size from com.sun.star.view.PaperFormat import LETTER APP_LIBO = True -except: +except ImportError: APP_LIBO = False import pyqrcode @@ -1469,12 +1469,13 @@ def import_employees(rfc): if not is_file(path): return () + msg = 'LibreOffice no se pudo iniciar' if APP_LIBO: app = LIBO() if app.is_running: return app.employees(path) - return () + return (), msg def import_nomina(rfc): diff --git a/source/app/settings.py b/source/app/settings.py index a26597b..b680e1b 100644 --- a/source/app/settings.py +++ b/source/app/settings.py @@ -31,7 +31,7 @@ except ImportError: DEBUG = DEBUG -VERSION = '1.8.1' +VERSION = '1.9.0' EMAIL_SUPPORT = ('soporte@empresalibre.net',) TITLE_APP = '{} v{}'.format(TITLE_APP, VERSION)