From 5e6d86cb6b2c1f6de4f154f2f195e18ca7fadceb Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Wed, 12 Sep 2018 13:35:03 -0500 Subject: [PATCH 1/5] Fix - #257 --- source/static/js/controller/bancos.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/static/js/controller/bancos.js b/source/static/js/controller/bancos.js index 8fe2df4..d38da73 100644 --- a/source/static/js/controller/bancos.js +++ b/source/static/js/controller/bancos.js @@ -369,7 +369,8 @@ function actualizar_deposito(grid){ } suma += obj.importe.to_float() }) - $$('txt_deposito_importe').setValue(suma) + + $$('txt_deposito_importe').setValue(suma.round(2)) $$('deposito_descripcion').setValue(descripcion.slice(0, -1)) grid.refresh() } @@ -500,6 +501,7 @@ function validate_deposito(values){ } suma += tmp }) + if(suma > importe){ msg = 'La suma del pago de facturas, no puede ser mayor al deposito' msg_error(msg) From 63b9d6729b850cd01395ebd59d9849ee541b5566 Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Wed, 12 Sep 2018 15:41:34 -0500 Subject: [PATCH 2/5] Fix - #259 --- source/app/models/main.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/source/app/models/main.py b/source/app/models/main.py index 9bac9e3..e132d83 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -167,12 +167,14 @@ def import_invoice(): descuento = round(row[3], 2) cant = round(row[4], 2) + pedimento = row[5].strip() pf = vu - descuento p = { 'id_product': obj.id, 'delete': '-', 'clave': obj.clave, 'descripcion': obj.descripcion, + 'pedimento': pedimento, 'unidad': obj.unidad.id, 'cantidad': cant, 'valor_unitario': vu, From b8f5dbd4211e28ee4c6124e7c30ee611086d4eb6 Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Wed, 12 Sep 2018 17:42:52 -0500 Subject: [PATCH 3/5] 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'}, From 30fab23c0da74c3a14f10da0d441fbc7b3f999e5 Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Wed, 12 Sep 2018 17:59:17 -0500 Subject: [PATCH 4/5] Fix - #257 --- source/static/js/controller/bancos.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/static/js/controller/bancos.js b/source/static/js/controller/bancos.js index 0e827de..28cd425 100644 --- a/source/static/js/controller/bancos.js +++ b/source/static/js/controller/bancos.js @@ -372,7 +372,7 @@ function actualizar_deposito(grid){ suma += obj.importe.to_float() }) - $$('txt_deposito_importe').setValue(suma.round(2)) + $$('txt_deposito_importe').setValue(suma.round(DECIMALES)) $$('deposito_descripcion').setValue(descripcion.slice(0, -1)) grid.refresh() } @@ -503,6 +503,7 @@ function validate_deposito(values){ } suma += tmp }) + suma = suma.round(DECIMALES) if(suma > importe){ msg = 'La suma del pago de facturas, no puede ser mayor al deposito' From 0379fd6a6ae6657b6c63b9f658c0e686b105d04f Mon Sep 17 00:00:00 2001 From: Mauricio Baeza Date: Wed, 12 Sep 2018 22:19:51 -0500 Subject: [PATCH 5/5] Fix - #259 --- CHANGELOG.md | 8 ++++++++ VERSION | 2 +- source/app/models/main.py | 5 +++++ source/app/settings.py | 2 +- source/static/js/ui/bancos.js | 1 + 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25b30fa..dfc68b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +v 1.15.0 [12-sep-2018] +---------------------- + - Se pueden mover las facturas con doble clic en los movimientos de banco. + - Fix - Al sumar las facturas en los depósitos + - Fix - Al importar los pedimentos en facturas por lotes + - Fix - Al guardar los datos del emisor + + v 1.14.0 [10-sep-2018] ---------------------- - Personalizar plantilla para factura de pago diff --git a/VERSION b/VERSION index 850e742..141f2e8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.14.0 +1.15.0 diff --git a/source/app/models/main.py b/source/app/models/main.py index 826bb85..61f5105 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -5047,6 +5047,7 @@ class FacturasDetalle(BaseModel): row['clave'] = p.clave row['clave_sat'] = p.clave_sat row['descripcion'] = p.descripcion + row['pedimento'] = p.pedimento row['unidad'] = p.producto.unidad.id row['cantidad'] = p.cantidad row['valor_unitario'] = p.valor_unitario @@ -5135,6 +5136,7 @@ class PreFacturasDetalle(BaseModel): row = {'id_product': p.producto.id} row['clave'] = p.producto.clave row['descripcion'] = p.descripcion + row['pedimento'] = p.pedimento row['unidad'] = p.producto.unidad.id row['cantidad'] = p.cantidad row['valor_unitario'] = p.valor_unitario @@ -5175,6 +5177,9 @@ class PreFacturasDetalle(BaseModel): if p.cuenta_predial: info = '\nCuenta Predial Número: {}'.format(p.cuenta_predial) producto['descripcion'] += info + if p.pedimento: + info = '\nNúmero Pedimento: {}'.format(p.pedimento) + producto['descripcion'] += info producto['unidad'] = '{}\n({})'.format( p.producto.unidad.name, p.producto.unidad.key) diff --git a/source/app/settings.py b/source/app/settings.py index e212adc..a0fd425 100644 --- a/source/app/settings.py +++ b/source/app/settings.py @@ -47,7 +47,7 @@ except ImportError: DEBUG = DEBUG -VERSION = '1.14.0' +VERSION = '1.15.0' EMAIL_SUPPORT = ('soporte@empresalibre.net',) TITLE_APP = '{} v{}'.format(TITLE_APP, VERSION) diff --git a/source/static/js/ui/bancos.js b/source/static/js/ui/bancos.js index 12a9166..79a0ca0 100644 --- a/source/static/js/ui/bancos.js +++ b/source/static/js/ui/bancos.js @@ -183,6 +183,7 @@ var grid_cfdi_este_deposito = { view: 'datatable', id: 'grid_cfdi_este_deposito', select: 'row', + multiselect: true, autoConfig: false, adjust: true, height: 200,