From b8f5dbd4211e28ee4c6124e7c30ee611086d4eb6 Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Wed, 12 Sep 2018 17:42:52 -0500 Subject: [PATCH] Fix - #260 --- source/app/models/main.py | 19 ++++++++----------- source/static/js/controller/bancos.js | 18 ++++++++++++++++++ source/static/js/ui/bancos.js | 2 +- 3 files changed, 27 insertions(+), 12 deletions(-) diff --git a/source/app/models/main.py b/source/app/models/main.py index e132d83..826bb85 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -870,18 +870,15 @@ class Emisor(BaseModel): fields['correo'] = fields.pop('emisor_correo', '') fields['web'] = fields.pop('emisor_web', '') fields['es_escuela'] = bool(fields['es_escuela'].replace('0', '')) + fields['es_ong'] = bool(fields['es_ong'].replace('0', '')) - if fields['es_ong']: - fields['autorizacion'] = fields.pop('ong_autorizacion', '') - fields['fecha_autorizacion'] = fields.pop('ong_fecha', None) - fields['fecha_dof'] = fields.pop('ong_fecha_dof', None) - else: - fields.pop('ong_autorizacion') - fields.pop('ong_fecha') - fields.pop('ong_fecha_dof') - fields['autorizacion'] = '' - fields['fecha_autorizacion'] = None - fields['fecha_dof'] = None + ong_auth = fields.pop('ong_autorizacion', '') + ong_date = fields.pop('ong_fecha', None) + ong_date_dof = fields.pop('ong_fecha_dof', None) + fields['autorizacion'] = ong_auth + fields['fecha_autorizacion'] = ong_date + fields['fecha_dof'] = ong_date_dof + fields['correo_timbrado'] = fields.pop('correo_timbrado', '') fields['token_timbrado'] = fields.pop('token_timbrado', '') fields['token_soporte'] = fields.pop('token_soporte', '') diff --git a/source/static/js/controller/bancos.js b/source/static/js/controller/bancos.js index d38da73..0e827de 100644 --- a/source/static/js/controller/bancos.js +++ b/source/static/js/controller/bancos.js @@ -42,6 +42,8 @@ var bancos_controllers = { $$('cmd_pay_stamp').attachEvent('onItemClick', cmd_pay_stamp_click) $$('cmd_pay_cancel').attachEvent('onItemClick', cmd_pay_cancel_click) $$('grid_cfdi_pay').attachEvent('onItemClick', grid_cfdi_pay_click) + $$('grid_cfdi_por_pagar').attachEvent('onItemDblClick', grid_cfdi_por_pagar_double_click) + $$('grid_cfdi_este_deposito').attachEvent('onItemDblClick', grid_cfdi_este_deposito_double_click) set_year_month() show('cmd_complemento_pago', get_config('used_cfdi_pays')) @@ -992,3 +994,19 @@ function grid_cfdi_pay_click(id, e, node){ } } + + +function grid_cfdi_por_pagar_double_click(id, e, node){ + var grid = $$('grid_cfdi_este_deposito') + + this.move(id.row, -1, grid) + actualizar_deposito(grid) +} + + +function grid_cfdi_este_deposito_double_click(id, e, node){ + var grid = $$('grid_cfdi_este_deposito') + + this.move(id.row, -1, $$('grid_cfdi_por_pagar')) + actualizar_deposito(grid) +} diff --git a/source/static/js/ui/bancos.js b/source/static/js/ui/bancos.js index 3969bb1..12a9166 100644 --- a/source/static/js/ui/bancos.js +++ b/source/static/js/ui/bancos.js @@ -81,7 +81,7 @@ var grid_cfdi_por_pagar_cols = [ {id: 'index', header: '#', adjust: 'data', css: 'right'}, {id: 'id', header: 'ID', hidden: true}, {id: 'serie', header: 'Serie', adjust: 'data'}, - {id: 'folio', header: 'Folio', adjust: 'data', css: 'right'}, + {id: 'folio', header: ['Folio', {content: 'numberFilter'}], adjust: 'data', css: 'right'}, {id: 'uuid', header: 'UUID', width: 250, hidden: true}, {id: 'fecha', header: 'Fecha y Hora', width: 150, sort: 'date'}, {id: 'tipo_comprobante', header: 'Tipo', adjust: 'data'},