diff --git a/source/app/models/main.py b/source/app/models/main.py index 77163bf..8a9f14d 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -5109,7 +5109,9 @@ class Facturas(BaseModel): 'id': obj.cliente.id, 'nombre': obj.cliente.nombre, 'rfc': obj.cliente.rfc, + 'codigo_postal': obj.cliente.codigo_postal, 'notas': obj.notas, + 'regimenes': SociosRegimenes.get_by_key(obj.cliente.id) } invoice = { 'tipo_comprobante': obj.tipo_comprobante, @@ -6996,6 +6998,8 @@ class PreFacturasDetalle(BaseModel): 'rfc': q.cliente.rfc, 'forma_pago': q.forma_pago, 'uso_cfdi': q.uso_cfdi, + 'codigo_postal': q.cliente.codigo_postal, + 'regimenes': SociosRegimenes.get_by_key(q.cliente.id), 'notas': q.notas, } diff --git a/source/static/js/controller/invoices.js b/source/static/js/controller/invoices.js index 22949b6..93bd0ba 100644 --- a/source/static/js/controller/invoices.js +++ b/source/static/js/controller/invoices.js @@ -291,6 +291,11 @@ function cmd_new_invoice_click(){ grid_totals.add({id: 1, concepto: 'SubTotal', importe: 0}) $$('cmd_cfdi_relacionados').disable() $$('multi_invoices').setValue('invoices_new') + + var lst = $$('lst_invoice_client_regimen') + lst.setValue('') + lst.getList().clearAll() + form.focus('search_client_name') } @@ -363,19 +368,25 @@ function validate_invoice(values){ msg_error(msg) return false } - } var tipo_comprobante = $$('lst_tipo_comprobante').getValue() if(tipo_comprobante != 'T'){ if(values.id_partner == 0){ - webix.UIManager.setFocus('search_client_name') + focus('search_client_name') msg = 'Selecciona un cliente' msg_error(msg) return false } } + var regimen_fiscal = $$('lst_invoice_client_regimen').getValue() + if(!regimen_fiscal){ + msg = 'El Regimen Fiscal del Cliente es obligatorio.' + msg_error(msg) + return false + } + if(!grid.count()){ webix.UIManager.setFocus('search_product_id') msg = 'Agrega al menos un producto o servicio' @@ -923,7 +934,11 @@ function set_client(row){ var lst = $$('lst_invoice_client_regimen') lst.getList().clearAll() - lst.getList().parse(row.regimenes) + if(row.regimenes==undefined){ + msg_ok('traer regimenes') + }else{ + lst.getList().parse(row.regimenes) + } lst.setValue(lst.getPopup().getList().getFirstId()) form.focus('search_product_id') diff --git a/source/static/js/ui/invoices.js b/source/static/js/ui/invoices.js index 9369461..5f99dec 100644 --- a/source/static/js/ui/invoices.js +++ b/source/static/js/ui/invoices.js @@ -1393,7 +1393,6 @@ var win_carta_import_json = { head: 'Importar Carta Porte JSON', body: body_upload_carta_json, }) - //~ $$('cmd_upload_invoice').attachEvent('onItemClick', cmd_upload_invoice_click) $$('up_invoice_json').attachEvent('onAfterFileAdd', up_invoice_json_on_after_file_add) } }