From aee9a83dd201517abdc891103c34f0581c458493 Mon Sep 17 00:00:00 2001
From: Mauricio Baeza <git@elmau.net>
Date: Wed, 3 Oct 2018 20:51:26 -0500
Subject: [PATCH 1/3] Importar CFDI sin marcar como pagada

---
 source/app/models/main.py            | 3 ++-
 source/static/js/controller/admin.js | 4 ++--
 source/static/js/ui/admin.js         | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/source/app/models/main.py b/source/app/models/main.py
index 46c8096..d09c023 100644
--- a/source/app/models/main.py
+++ b/source/app/models/main.py
@@ -4479,6 +4479,7 @@ class Facturas(BaseModel):
             'moneda': invoice['Moneda'],
             'tipo_cambio': tipo_cambio,
             'total': total,
+            'saldo': total,
             'total_mn': round(float(total * tipo_cambio), DECIMALES),
             'tipo_comprobante': invoice['TipoDeComprobante'],
             'metodo_pago': invoice['MetodoPago'],
@@ -4490,7 +4491,7 @@ class Facturas(BaseModel):
             'uuid': invoice['uuid'],
             'estatus': 'Importada',
             'regimen_fiscal': invoice['RegimenFiscal'],
-            'pagada': True,
+            'pagada': False,
             'tipo_relacion': invoice.get('TipoRelacion', '')
         }
         # ~ donativo = BooleanField(default=False)
diff --git a/source/static/js/controller/admin.js b/source/static/js/controller/admin.js
index 8e45c41..d81ce7b 100644
--- a/source/static/js/controller/admin.js
+++ b/source/static/js/controller/admin.js
@@ -1711,7 +1711,7 @@ function cmd_subir_cfdixml_click(){
     var values = form.getValues()
 
     if($$('lst_cfdixml').count() < 1){
-        msg = 'Selecciona un archivo XML'
+        msg = 'Selecciona al menos un archivo XML'
         msg_error(msg)
         return
     }
@@ -1724,7 +1724,7 @@ function cmd_subir_cfdixml_click(){
 
     var cfdixml = $$('up_cfdixml').files.getItem($$('up_cfdixml').files.getFirstId())
 
-    var ext = []
+    //~ var ext = []
     if(cfdixml.type.toLowerCase() != 'xml'){
         msg = 'Archivo inválido, se requiere un archivo XML'
         msg_error(msg)
diff --git a/source/static/js/ui/admin.js b/source/static/js/ui/admin.js
index 586deff..fe8e60f 100644
--- a/source/static/js/ui/admin.js
+++ b/source/static/js/ui/admin.js
@@ -130,7 +130,7 @@ var admin_ui_niveles_educativos = {
 
 
 var menu_data = [
-    {id: 'app_home', icon: 'dashboard', value: 'Inicio'},
+    {id: 'app_admin_home', icon: 'dashboard', value: 'Inicio'},
     {id: 'app_emisor', icon: 'user-circle', value: 'Emisor'},
     {id: 'app_folios', icon: 'sort-numeric-asc', value: 'Folios'},
     {id: 'app_correo', icon: 'envelope-o', value: 'Correo'},
@@ -146,8 +146,8 @@ var sidebar_admin = {
     id: 'sidebar_admin',
     data: menu_data,
     ready: function(){
-        this.select('app_home');
-        this.open(this.getParentId('app_home'));
+        this.select('app_admin_home');
+        this.open(this.getParentId('app_admin_home'));
     },
     on:{
         onAfterSelect: function(id){

From db435a9b3dd3468ee1ec3408620a0ec20e09a5af Mon Sep 17 00:00:00 2001
From: Mauricio Baeza <git@elmau.net>
Date: Wed, 3 Oct 2018 23:15:32 -0500
Subject: [PATCH 2/3] Filtrar por pagar facturas v3.2

---
 source/app/models/main.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/source/app/models/main.py b/source/app/models/main.py
index d09c023..6380094 100644
--- a/source/app/models/main.py
+++ b/source/app/models/main.py
@@ -3659,12 +3659,16 @@ class Facturas(BaseModel):
         filtros = (
             (Facturas.cancelada==False) &
             (Facturas.uuid.is_null(False)) &
-            (Facturas.tipo_comprobante=='I') &
+            (Facturas.tipo_comprobante.in_(('I', 'ingreso'))) &
             (Facturas.saldo>0)
         )
         if ids:
             filtros &= (Facturas.id.not_in(ids))
 
+        currency = case(Facturas.moneda, (
+            ('peso', 'MXN'),
+        ), Facturas.moneda)
+
         rows = tuple(Facturas
             .select(
                 Facturas.id,
@@ -3676,7 +3680,7 @@ class Facturas(BaseModel):
                 Facturas.estatus,
                 Socios.nombre.alias('cliente'),
                 Facturas.total,
-                Facturas.moneda.alias('currency'),
+                currency.alias('currency'),
                 Facturas.total_mn,
                 Facturas.saldo,
             )
@@ -5357,7 +5361,7 @@ class FacturasPagos(BaseModel):
             else:
                 nuevo['saldo_anterior'] = float(mov_ant.saldo)
 
-            if(fac.moneda=='MXN'):
+            if(fac.moneda in ('MXN', 'peso')):
                 nuevo['saldo'] = nuevo['saldo_anterior'] - importe
             else:
                 nuevo['importe'] = this_pay

From a6edbaa56f11342d166ae24e8a409aff9044e396 Mon Sep 17 00:00:00 2001
From: Mauricio Baeza <git@elmau.net>
Date: Wed, 3 Oct 2018 23:40:18 -0500
Subject: [PATCH 3/3] Relacionar facturas v3.2

---
 CHANGELOG.md                    | 1 +
 docs/empresalibre/docs/notas.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 260a00b..c899338 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ v 1.19.1 [03-oct-2018]
 ----------------------
     - Error #291
     - Error al generar PDF de factura de pago con relacionados sin serie
+    - Error al relacionar facturas versión 3.2
 
 v 1.19.0 [28-sep-2018]
 ----------------------
diff --git a/docs/empresalibre/docs/notas.md b/docs/empresalibre/docs/notas.md
index d9fde64..34830e4 100644
--- a/docs/empresalibre/docs/notas.md
+++ b/docs/empresalibre/docs/notas.md
@@ -9,6 +9,7 @@ Libre**.
 ### 1.19.1 [03-oct-2018]
 - Error [#291](https://gitlab.com/mauriciobaeza/empresa-libre/issues/291)
 - Error al generar PDF de factura de pago con relacionados sin serie
+- Error al relacionar facturas versión 3.2
 
 
 ### 1.19.0 [28-sep-2018]