diff --git a/source/app/models/main.py b/source/app/models/main.py index 839f44f..f0c8bc5 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -8167,7 +8167,9 @@ class Tickets(BaseModel): return inicio def _without_tax(self, importe, obj): + # ~ todo # ~ Por ahora se asume que solo tiene IVA trasladado 0.16 + for tax in obj.impuestos: tasa = 1.0 + float(tax.tasa) base = round(importe / tasa, DECIMALES) @@ -8231,9 +8233,6 @@ class Tickets(BaseModel): for tax in totals_tax.values(): - if tax.tipo == 'E': - continue - ticket_tax = { 'ticket': ticket.id, 'impuesto': tax.id, @@ -8499,6 +8498,7 @@ class Tickets(BaseModel): 'key': r.impuesto.key, 'base': r.base, 'importe': tax_importe} + print(values) tax_sum[tax_id] = values for i, tax in tax_sum.items(): @@ -8539,16 +8539,18 @@ class Tickets(BaseModel): periodicidad = values['periodicidad'] id_client = int(values['client']) tickets = util.loads(values['tickets']) - invoice_by_ticket = Configuracion.get_bool('chk_config_invoice_by_ticket') + # ~ invoice_by_ticket = Configuracion.get_bool('chk_config_invoice_by_ticket') + invoice_by_ticket = True if is_invoice_day: filters = ( Socios.rfc == RFCS['PUBLIC'] and - Socios.slug == 'publico_en_general') + Socios.slug == 'publico_en_general' + ) try: client = Socios.get(filters) except Socios.DoesNotExist: - msg = 'No existe el cliente Público en General. Agregalo primero.' + msg = 'No existe el cliente PUBLICO EN GENERAL. Agregalo primero.' data = {'ok': False, 'msg': msg} return data else: diff --git a/source/static/img/favicon.png b/source/static/img/favicon.png index eccb275..88c98f1 100644 Binary files a/source/static/img/favicon.png and b/source/static/img/favicon.png differ diff --git a/source/static/img/tcm970625mb1.png b/source/static/img/tcm970625mb1.png deleted file mode 100644 index 37dbe13..0000000 Binary files a/source/static/img/tcm970625mb1.png and /dev/null differ diff --git a/source/static/js/ui/tickets.js b/source/static/js/ui/tickets.js index fdc812c..e7e19f8 100644 --- a/source/static/js/ui/tickets.js +++ b/source/static/js/ui/tickets.js @@ -235,7 +235,7 @@ var cells_new_ticket = [ var toolbar_ticket_invoice = {view: 'toolbar', elements: [{}, {view: 'checkbox', id: 'chk_is_invoice_day', labelWidth: 0, width: 150, - labelRight: 'Es factura del día'}, + labelRight: 'Es Factura Global'}, {view: 'richselect', id: 'lst_global_periodicidad_2', labelWidth: 90, width: 225, label: 'Periodicidad:', options: opt_global_periodicidad, value: '01', disabled: true}, {view: 'richselect', id: 'lst_global_months_2', labelWidth: 50, width: 250,