diff --git a/README.md b/README.md index 7f90d73..0d9ad8c 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,6 @@ contratar: administracion ARROBA empresalibre.net G1: `A5DdXxCKPw3QKWVdDVs7CzkNugNUW1sHu5zDJFWxCU2h` BCH: `qztd3l00xle5tffdqvh2snvadkuau2ml0uqm4n875d` -BTC: `3FhiXcXmAesmQzrNEngjHFnvaJRhU1AGWV` ### Requerimientos: diff --git a/VERSION b/VERSION index a57c16f..fc43576 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -1.44.0 +1.44.1 diff --git a/source/app/settings.py b/source/app/settings.py index 16fef84..95c1e42 100644 --- a/source/app/settings.py +++ b/source/app/settings.py @@ -42,7 +42,7 @@ except ImportError: DEBUG = DEBUG -VERSION = '1.44.0' +VERSION = '1.44.1' EMAIL_SUPPORT = ('soporte@empresalibre.mx',) TITLE_APP = '{} v{}'.format(TITLE_APP, VERSION) diff --git a/source/static/js/controller/invoices.js b/source/static/js/controller/invoices.js index b58f710..6bb93ea 100644 --- a/source/static/js/controller/invoices.js +++ b/source/static/js/controller/invoices.js @@ -2482,7 +2482,7 @@ function get_leyendas_fiscales(){ }) } - +//~ Delete function _tab_carta_porte(){ var g1 = $$('grid_details') var g2 = $$('grid_carta_mercancias') @@ -2512,7 +2512,7 @@ function _tab_carta_porte(){ function tv_invoice_change(nv, ov){ if(nv=='Carta Porte'){ - _tab_carta_porte() + //~ _tab_carta_porte() } } diff --git a/source/static/js/ui/invoices.js b/source/static/js/ui/invoices.js index 856c8f8..35f646f 100644 --- a/source/static/js/ui/invoices.js +++ b/source/static/js/ui/invoices.js @@ -864,6 +864,43 @@ var opt_countries = [ ] +var opt_carta_estados = [ + {id: 'AGU', value: 'Aguascalientes'}, + {id: 'BCN', value: 'Baja California'}, + {id: 'BCS', value: 'Baja California Sur'}, + {id: 'CAM', value: 'Campeche'}, + {id: 'CHP', value: 'Chiapas'}, + {id: 'CHH', value: 'Chihuahua'}, + {id: 'COA', value: 'Coahuila'}, + {id: 'COL', value: 'Colima'}, + {id: 'DIF', value: 'Ciudad de México'}, + {id: 'DUR', value: 'Durango'}, + {id: 'GUA', value: 'Guanajuato'}, + {id: 'GRO', value: 'Guerrero'}, + {id: 'HID', value: 'Hidalgo'}, + {id: 'JAL', value: 'Jalisco'}, + {id: 'MEX', value: 'México'}, + {id: 'MIC', value: 'Michoacán'}, + {id: 'MOR', value: 'Morelos'}, + {id: 'NAC', value: 'Nacional'}, + {id: 'NAY', value: 'Nayarit'}, + {id: 'NLE', value: 'Nuevo León'}, + {id: 'OAX', value: 'Oaxaca'}, + {id: 'PUE', value: 'Puebla'}, + {id: 'QUE', value: 'Querétaro'}, + {id: 'ROO', value: 'Quintana Roo'}, + {id: 'SLP', value: 'San Luis Potosí'}, + {id: 'SIN', value: 'Sinaloa'}, + {id: 'SON', value: 'Sonora'}, + {id: 'TAB', value: 'Tabasco'}, + {id: 'TAM', value: 'Tamaulipas'}, + {id: 'TLA', value: 'Tlaxcala'}, + {id: 'VER', value: 'Veracruz'}, + {id: 'YUC', value: 'Yucatán'}, + {id: 'ZAC', value: 'Zacatecas'}, +] + + var grid_cols_carta_ubicaciones = [ {id: 'id', header: 'ID', hidden: true}, {id: 'delete', header: '', hidden: true, width: 30, css: 'delete'}, @@ -873,7 +910,7 @@ var grid_cols_carta_ubicaciones = [ {id: 'FechaHoraSalidaLlegada', header: 'Fecha/Hora', editor: 'date', suggest: date_suggest, format: webix.Date.dateToStr("%D, %d-%M-%Y %h:%i"), footer: 'Total distancia:', fillspace: 1}, {id: 'DistanciaRecorrida', header: 'Distancia (KM)', editor: 'text', format: webix.i18n.numberFormat, css: 'right', footer: {content: 'summColumn', css: 'right'}, fillspace: 1}, {id: 'Municipio', headerd: 'Municipio', editor: 'text', fillspace: 1}, - {id: 'Estado', headerd: 'Estado', editor: 'text', fillspace: 1}, + {id: 'Estado', headerd: 'Estado', editor: 'select', options: opt_carta_estados, fillspace: 1}, {id: 'Pais', headerd: 'Pais', editor: 'select', options: opt_countries, fillspace: 1}, {id: 'CodigoPostal', headerd: 'C.P.', editor: 'text', fillspace: 1}, ] @@ -885,7 +922,6 @@ var grid_cols_carta_ubicaciones = [ //~ Referencia - var grid_cols_carta_mercancias = [ {id: 'id', header: 'ID', hidden: true}, {id: 'BienesTransp', header: 'Clave SAT', fillspace: 1}, @@ -912,6 +948,8 @@ var grid_cols_carta_autotransporte = [ {id: 'ConfigVehicular', header: 'Clave Autotransporte', editor: 'select', options: opt_config_auto, fillspace: 1}, {id: 'PlacaVM', header: 'Placa', editor: 'text', fillspace: 1}, {id: 'AnioModeloVM', header: 'Modelo (Año)', editor: 'text', fillspace: 1}, + {id: 'SubTipoRem', header: 'ST Remolque', editor: 'text', fillspace: 1}, + {id: 'Placa', header: 'Placa', editor: 'text', fillspace: 1}, {id: 'AseguraRespCivil', header: 'Aseguradora', editor: 'text', fillspace: 1}, {id: 'PolizaRespCivil', header: 'Póliza', editor: 'text', fillspace: 1}, ] @@ -996,8 +1034,14 @@ var grid_carta_tipos_figuras = { var body_carta_mercancias = {rows:[ - {cols: [{view: 'richselect', id: 'lst_carta_UnidadPeso', labelPosition: 'top', - label: 'Unidad de Peso', maxWidth: 300, options: '/satunidadespeso?opt=active'}, {} + {cols: [ + {view: 'button', id: 'cmd_carta_add_product', label: 'Agregar Mercancía', icon: 'plus', + type: 'iconButton', autowidth: true, align: 'center'}, + {view: 'button', id: 'cmd_carta_copy_from_invoice', label: 'Copiar de CFDI', icon: 'copy', + type: 'iconButton', autowidth: true, align: 'center'}, + {}, + {view: 'richselect', id: 'lst_carta_UnidadPeso', label: 'Unidad de Peso: ', + labelWidth: 110, maxWidth: 300, options: '/satunidadespeso?opt=active'} ]}, {maxHeight: 10}, grid_carta_mercancias,