From c8371a272f542ec1e082fa7344810971e60985fd Mon Sep 17 00:00:00 2001
From: Mauricio Baeza <git@elmau.net>
Date: Sun, 16 Sep 2018 01:17:18 -0500
Subject: [PATCH] Mejora - #262

---
 source/app/models/main.py     | 32 ++++++++++----------------------
 source/static/js/ui/bancos.js |  1 +
 2 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/source/app/models/main.py b/source/app/models/main.py
index 26ecf01..bcf1f21 100644
--- a/source/app/models/main.py
+++ b/source/app/models/main.py
@@ -1962,26 +1962,6 @@ class MovimientosBanco(BaseModel):
         msg = 'Movimiento cancelado correctamente'
         return {'ok': True, 'msg': msg, 'balance': balance}
 
-    # ~ @classmethod
-    # ~ def remove(cls, id):
-        # ~ try:
-            # ~ obj = MovimientosBanco.get(MovimientosBanco.id==id)
-        # ~ except MovimientosBanco.DoesNotExist:
-            # ~ return False
-
-        # ~ if obj.conciliado or obj.cancelado:
-            # ~ return False
-
-        # ~ with database_proxy.transaction():
-            # ~ obj.cancelado = True
-            # ~ obj.save()
-            # ~ FacturasPagos.cancelar(obj)
-
-            # ~ obj = cls._movimiento_anterior(cls, obj.cuenta, obj.fecha)
-            # ~ cls._actualizar_saldos(cls, obj)
-
-        # ~ return True
-
     @classmethod
     def con(cls, id):
         cant = (MovimientosBanco
@@ -2032,12 +2012,14 @@ class MovimientosBanco(BaseModel):
                 MovimientosBanco.descripcion,
                 MovimientosBanco.retiro,
                 MovimientosBanco.deposito,
-                MovimientosBanco.saldo)
+                MovimientosBanco.saldo,
+            )
             .join(SATFormaPago).switch(MovimientosBanco)
             .where(filtros)
             .dicts()
         )
-
+        for row in rows:
+            row['invoice'] = CfdiPagos.with_invoice(row['id'])
         return {'ok': True, 'rows': rows}
 
 
@@ -5382,6 +5364,12 @@ class CfdiPagos(BaseModel):
     class Meta:
         order_by = ('movimiento',)
 
+    @classmethod
+    def with_invoice(cls, id):
+        if CfdiPagos.select().where(CfdiPagos.movimiento==id).count():
+            return 'Si'
+        return ''
+
     @classmethod
     def post(cls, values):
         opt = values.pop('opt')
diff --git a/source/static/js/ui/bancos.js b/source/static/js/ui/bancos.js
index 79a0ca0..2f61cbb 100644
--- a/source/static/js/ui/bancos.js
+++ b/source/static/js/ui/bancos.js
@@ -62,6 +62,7 @@ var grid_cuentabanco_cols = [
         width: 125, format: webix.i18n.priceFormat, css: 'right'},
     {id: 'saldo', header: ['Saldo'],
         width: 125, format: webix.i18n.priceFormat, css: 'right'},
+    {id: 'invoice', header: ['FP'], width: 40, css: 'center'},
 ]