From aee9a83dd201517abdc891103c34f0581c458493 Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Wed, 3 Oct 2018 20:51:26 -0500 Subject: [PATCH] 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){