From 0a006f4508c1fa5363d3bd15732cea0f0eb9685f Mon Sep 17 00:00:00 2001
From: Mauricio Baeza <public@elmau.net>
Date: Wed, 29 Jan 2020 16:03:02 -0600
Subject: [PATCH] Fix new validate nomina SAT

---
 CHANGELOG.md                   |  5 +++++
 README.md                      |  5 ++---
 VERSION                        |  2 +-
 source/app/controllers/util.py |  1 +
 source/app/models/main.py      | 11 ++++++-----
 source/app/settings.py         |  2 +-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e36507b..333a2a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,9 @@
 
+v 1.34.0 [29-ene-2020]
+----------------------
+    - Error: Al timbrar nómina
+
+
 v 1.33.2 [27-ene-2020]
 ----------------------
     - Se actualizan métodos de pago en catálogos del SAT
diff --git a/README.md b/README.md
index 44f0eed..826f193 100644
--- a/README.md
+++ b/README.md
@@ -27,9 +27,8 @@ contratar: administracion ARROBA empresalibre.net
 Debería de funcionar con cualquier combinación servidor-wsgi que soporte
 aplicaciones Python.
 
-El sistema tiene soporte para tres bases de datos: SQLite, MySQL y PostgreSQL
-(recomendado), debes de instalar el servidor de la base de datos y sus drivers
-respectivos, excepto SQLite que es nativo en Python.
+El sistema tiene soporte solo para PostgreSQL, debes de instalar el servidor de
+la base de datos y su driver respectivo.
 
 
 
diff --git a/VERSION b/VERSION
index 80c8c0b..2b17ffd 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.33.2
+1.34.0
diff --git a/source/app/controllers/util.py b/source/app/controllers/util.py
index 50653ea..0080670 100644
--- a/source/app/controllers/util.py
+++ b/source/app/controllers/util.py
@@ -1487,6 +1487,7 @@ class LIBO(object):
             return {}, msg
 
         data = tuple([r[2:] for r in rows[:count+2]])
+
         return data, ''
 
     def _get_separacion(self, doc, count):
diff --git a/source/app/models/main.py b/source/app/models/main.py
index 7a2098d..2ab50a5 100644
--- a/source/app/models/main.py
+++ b/source/app/models/main.py
@@ -7952,8 +7952,8 @@ class CfdiNomina(BaseModel):
             if isinstance(value, float):
                 importe = round(value, DECIMALES)
 
-            if not importe:
-                continue
+            # ~ if not importe:
+                # ~ continue
 
             td = SATTipoOtroPago.get_by_key(key)
             if td is None:
@@ -8314,8 +8314,8 @@ class CfdiNomina(BaseModel):
             nomina['TotalPercepciones'] = FORMAT.format(totals.total_percepciones)
         if totals.total_deducciones:
             nomina['TotalDeducciones'] = FORMAT.format(totals.total_deducciones)
-        if totals.total_otros_pagos:
-            nomina['TotalOtrosPagos'] = FORMAT.format(totals.total_otros_pagos)
+        # ~ if totals.total_otros_pagos:
+        nomina['TotalOtrosPagos'] = FORMAT.format(totals.total_otros_pagos)
 
         nomina_emisor = {}
         if emisor.curp:
@@ -8443,7 +8443,8 @@ class CfdiNomina(BaseModel):
                 'Concepto': concepto[:100],
                 'Importe': FORMAT.format(row.importe),
             }
-            if row.tipo_otro_pago.key == '002' and row.subsidio_causado:
+            # ~ if row.tipo_otro_pago.key == '002' and row.subsidio_causado:
+            if row.tipo_otro_pago.key == '002':
                 p['subsidio'] = {
                     'SubsidioCausado': FORMAT.format(row.subsidio_causado)
                 }
diff --git a/source/app/settings.py b/source/app/settings.py
index de11348..f95c8e9 100644
--- a/source/app/settings.py
+++ b/source/app/settings.py
@@ -47,7 +47,7 @@ except ImportError:
 
 
 DEBUG = DEBUG
-VERSION = '1.33.2'
+VERSION = '1.34.0'
 EMAIL_SUPPORT = ('soporte@empresalibre.mx',)
 TITLE_APP = '{} v{}'.format(TITLE_APP, VERSION)