diff --git a/CHANGELOG.md b/CHANGELOG.md index b342f51..260a00b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +v 1.19.1 [03-oct-2018] +---------------------- + - Error #291 + - Error al generar PDF de factura de pago con relacionados sin serie + v 1.19.0 [28-sep-2018] ---------------------- - Mejora #280 diff --git a/VERSION b/VERSION index 815d5ca..66e2ae6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.19.0 +1.19.1 diff --git a/docs/empresalibre/docs/notas.md b/docs/empresalibre/docs/notas.md index a3e675a..d9fde64 100644 --- a/docs/empresalibre/docs/notas.md +++ b/docs/empresalibre/docs/notas.md @@ -6,6 +6,11 @@ siempre actualizado.** Solo se da soporte sobre la ultima versión de **Empresa 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 + + ### 1.19.0 [28-sep-2018] - Mejora [#280](https://gitlab.com/mauriciobaeza/empresa-libre/issues/280) - Mejora [#288](https://gitlab.com/mauriciobaeza/empresa-libre/issues/288) diff --git a/source/app/controllers/util.py b/source/app/controllers/util.py index 22191f6..6efd2b6 100644 --- a/source/app/controllers/util.py +++ b/source/app/controllers/util.py @@ -1175,7 +1175,7 @@ class LIBO(object): count = len(related) for i, doc in enumerate(related): uuid = doc['IdDocumento'].upper() - serie = doc['Serie'] + serie = doc.get('Serie', '') folio = doc['Folio'] metodo_pago = doc['MetodoDePagoDR'] moneda = doc['MonedaDR'] diff --git a/source/app/settings.py b/source/app/settings.py index a3d13b3..8602a52 100644 --- a/source/app/settings.py +++ b/source/app/settings.py @@ -47,7 +47,7 @@ except ImportError: DEBUG = DEBUG -VERSION = '1.19.0' +VERSION = '1.19.1' EMAIL_SUPPORT = ('soporte@empresalibre.net',) TITLE_APP = '{} v{}'.format(TITLE_APP, VERSION) diff --git a/source/static/js/controller/admin.js b/source/static/js/controller/admin.js index 04e4bed..8e45c41 100644 --- a/source/static/js/controller/admin.js +++ b/source/static/js/controller/admin.js @@ -1262,8 +1262,6 @@ function cmd_emisor_agregar_cuenta_click(){ } var values = form.getValues() - - var saldo_inicial = parseFloat(values.emisor_cuenta_saldo_inicial.replace('$', '').replace(',', '')) var cuenta = { de_emisor: true, activa: true, @@ -1274,7 +1272,7 @@ function cmd_emisor_agregar_cuenta_click(){ cuenta: values.emisor_cuenta.trim(), clabe: values.emisor_clabe.trim(), moneda: values.emisor_cuenta_moneda, - saldo_inicial: saldo_inicial + saldo_inicial: values.emisor_cuenta_saldo_inicial.to_float() } if(!cuenta.nombre){ @@ -1319,7 +1317,6 @@ function cmd_emisor_agregar_cuenta_click(){ return } - //~ if(!isFinite(cuenta.saldo_inicial)){ if(cuenta.saldo_inicial <= 0){ msg = 'El saldo inicial no puede ser negativo o cero' msg_error(msg) diff --git a/source/static/js/controller/bancos.js b/source/static/js/controller/bancos.js index 1506565..07414d4 100644 --- a/source/static/js/controller/bancos.js +++ b/source/static/js/controller/bancos.js @@ -257,12 +257,15 @@ function cmd_agregar_deposito_click(){ msg_importe = '' get_bancos_forma_pago(false) get_facturas_por_pagar() + var g = $$('grid_cfdi_este_deposito') g.config.columns[g.getColumnIndex('importe')].header = 'Este Pago ' + current_currency g.refreshColumns() show('deposit_type_change', current_currency!=CURRENCY_MN) + var title = 'Agregar depósito de banco a la cuenta ' + $$('lst_cuentas_banco').getText() + ' en ' + $$('txt_cuenta_moneda').getValue() $$('title_bank_deposit').setValue(title) + $$('multi_bancos').setValue('banco_deposito') } @@ -388,14 +391,14 @@ function cmd_guardar_retiro_click(){ function txt_retiro_importe_change(new_value, old_value){ - if(!isFinite(new_value) || !new_value){ + if(!isFinite(new_value)){ this.config.value = old_value this.refresh() } } function txt_deposito_importe_change(new_value, old_value){ - if(!isFinite(new_value) || !new_value){ + if(!isFinite(new_value)){ this.config.value = old_value this.refresh() } diff --git a/source/static/js/controller/util.js b/source/static/js/controller/util.js index 2d31f05..ea175fc 100644 --- a/source/static/js/controller/util.js +++ b/source/static/js/controller/util.js @@ -154,7 +154,7 @@ String.prototype.to_float4 = function(){ function get_float(value){ - var f = parseFloat(value.replace('$', '').replace(',', '').trim()).round(DECIMALES) + var f = parseFloat(value.replace('$', '').replace(/,/g, '').trim()).round(DECIMALES) if(!f){ f = 0.00 } @@ -163,7 +163,7 @@ function get_float(value){ function get_float4(value){ - var f = parseFloat(value.replace('$', '').replace(',', '').trim()).round(DECIMALES_TAX) + var f = parseFloat(value.replace('$', '').replace(/,/g, '').trim()).round(DECIMALES_TAX) if(!f){ f = 0.00 } @@ -197,8 +197,13 @@ function format_currency(value){ } +function format_currency2(value){ + return '$ ' + format_decimal_2(value) +} + + function format_currency4(value){ - return '$ ' + format_decimal_4(value) + return '$ ' + format_decimal_2(value) } @@ -252,6 +257,31 @@ webix.protoUI({ }, webix.ui.text) +webix.protoUI({ + $cssName: "text", + name: "currency2", + $init:function(){ + this.attachEvent("onItemClick", function(){ + this.$setValue(this.config.raw, true) + this.getInputNode().select() + }) + this.attachEvent("onBlur", function(){ + this.$setValue(this.config.value) + }) + }, + $render:function(){ + this.$setValue(this.config.value) + }, + $setValue:function(value, raw){ + this.config.raw = value + if(!raw){ + value = format_currency2(value) + } + this.getInputNode().value = value + } +}, webix.ui.text) + + webix.ui.datafilter.countRows = webix.extend({ refresh:function(master, node, value){ node.firstChild.innerHTML = master.count(); diff --git a/source/static/js/ui/bancos.js b/source/static/js/ui/bancos.js index a88099b..9900f4d 100644 --- a/source/static/js/ui/bancos.js +++ b/source/static/js/ui/bancos.js @@ -19,7 +19,7 @@ var toolbar_banco = [ {view: 'richselect', id: 'lst_cuentas_banco', label: 'Cuenta', labelWidth: 100, options: []}, {view: 'text', id: 'txt_cuenta_moneda', label: 'Moneda', readonly: true}, - {view: 'currency', id: 'txt_cuenta_saldo', label: 'Saldo', readonly: true, + {view: 'currency2', id: 'txt_cuenta_saldo', label: 'Saldo', readonly: true, inputAlign: 'right', value: 0} ] @@ -391,7 +391,7 @@ var controls_banco_retiro = [ {view: 'richselect', id: 'lst_retiro_forma_pago', name: 'retiro_forma_pago', label: 'Forma de Pago', required: true, options: [], labelWidth: 125, labelAlign: 'right'}, - {view: 'currency', type: 'text', id: 'txt_retiro_importe', + {view: 'currency2', type: 'text', id: 'txt_retiro_importe', name: 'retiro_importe', label: 'Importe', labelAlign: 'right', required: true, invalidMessage: 'Captura un valor númerico', inputAlign: 'right', value: ''} @@ -422,7 +422,7 @@ var controls_banco_deposito = [ {view: 'richselect', id: 'lst_deposito_forma_pago', name: 'deposito_forma_pago', label: 'Forma de Pago', required: true, options: [], labelWidth: 125, labelAlign: 'right'}, - {view: 'currency', type: 'text', id: 'txt_deposito_importe', + {view: 'currency2', type: 'text', id: 'txt_deposito_importe', name: 'deposito_importe', label: 'Importe', labelAlign: 'right', required: true, invalidMessage: 'Captura un valor númerico', inputAlign: 'right', value: ''},