diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a6f873..260a00b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ -v 1.19.1 [29-sep-2018] +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] ---------------------- diff --git a/docs/empresalibre/docs/notas.md b/docs/empresalibre/docs/notas.md index 89d8b1c..d9fde64 100644 --- a/docs/empresalibre/docs/notas.md +++ b/docs/empresalibre/docs/notas.md @@ -6,8 +6,9 @@ siempre actualizado.** Solo se da soporte sobre la ultima versión de **Empresa Libre**. -### 1.19.1 [29-sep-2018] +### 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] 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/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/ui/bancos.js b/source/static/js/ui/bancos.js index 1116c27..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} ]