diff --git a/source/app/controllers/configpac.py b/source/app/controllers/configpac.py index 513832f..1f559f5 100644 --- a/source/app/controllers/configpac.py +++ b/source/app/controllers/configpac.py @@ -1,7 +1,7 @@ #!/usr/bin/env python -from conf import DEBUG, ID_INTEGRADOR, FINKOK +from .conf import DEBUG, ID_INTEGRADOR, FINKOK DEBUG = DEBUG TIMEOUT = 10 diff --git a/source/app/models/main.py b/source/app/models/main.py index 946d09f..a62f82b 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -4,7 +4,7 @@ import sqlite3 import click from peewee import * from playhouse.fields import PasswordField, ManyToManyField -from playhouse.shortcuts import case +from playhouse.shortcuts import case, SQL if __name__ == '__main__': @@ -1270,16 +1270,18 @@ class Facturas(BaseModel): def _get_folio(self, serie): inicio_serie = Folios.select( Folios.inicio).where(Folios.serie==serie).scalar() + inicio = (Facturas - .select(fn.Max(Facturas.folio)) + .select(fn.Max(Facturas.folio).alias('mf')) .where(Facturas.serie==serie) - .group_by(Facturas.folio) - .order_by(Facturas.folio) + .order_by(SQL('mf')) .scalar()) + if inicio is None: inicio = inicio_serie else: inicio += 1 + return inicio def _calculate_totals(self, invoice, products): @@ -1292,7 +1294,7 @@ class Facturas(BaseModel): for product in products: id_product = product.pop('id') p = Productos.get(Productos.id==id_product) - product['descripcion'] = p.descripcion + #~ product['descripcion'] = p.descripcion product['unidad'] = p.unidad.key product['clave'] = p.clave product['clave_sat'] = p.clave_sat @@ -1437,7 +1439,7 @@ class Facturas(BaseModel): 'Cantidad': FORMAT.format(row.cantidad), 'ClaveUnidad': row.producto.unidad.key, 'Unidad': row.producto.unidad.name, - 'Descripcion': row.producto.descripcion, + 'Descripcion': row.descripcion, 'ValorUnitario': FORMAT.format(row.valor_unitario), 'Importe': FORMAT.format(row.importe), } diff --git a/source/static/js/controller/invoices.js b/source/static/js/controller/invoices.js index b858d12..20c3d3f 100644 --- a/source/static/js/controller/invoices.js +++ b/source/static/js/controller/invoices.js @@ -296,7 +296,6 @@ function cmd_timbrar_click(id, e, node){ for (i = 0; i < rows.length; i++) { delete rows[i]['delete'] delete rows[i]['clave'] - delete rows[i]['descripcion'] delete rows[i]['unidad'] delete rows[i]['importe'] rows[i]['valor_unitario'] = parseFloat(rows[i]['valor_unitario'])