diff --git a/source/app/models/main.py b/source/app/models/main.py index 1c9561f..1850b1d 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -4471,7 +4471,7 @@ class PreFacturas(BaseModel): id_product = product.pop('id_product') p = Productos.get(Productos.id==id_product) - product['unidad'] = p.unidad.key + product['unidad'] = SATUnidades.get(SATUnidades.id==product['unidad']).key product['clave'] = p.clave product['clave_sat'] = p.clave_sat product['cuenta_predial'] = p.cuenta_predial @@ -4721,7 +4721,7 @@ class PreFacturasDetalle(BaseModel): row = {'id_product': p.producto.id} row['clave'] = p.producto.clave row['descripcion'] = p.descripcion - row['unidad'] = p.producto.unidad.name + row['unidad'] = p.producto.unidad.id row['cantidad'] = p.cantidad row['valor_unitario'] = p.valor_unitario row['descuento'] = p.descuento diff --git a/source/static/js/controller/invoices.js b/source/static/js/controller/invoices.js index 1f216dc..df0e660 100644 --- a/source/static/js/controller/invoices.js +++ b/source/static/js/controller/invoices.js @@ -1376,7 +1376,6 @@ function cmd_prefactura_click(){ delete rows[i]['id'] delete rows[i]['delete'] delete rows[i]['clave'] - delete rows[i]['unidad'] delete rows[i]['importe'] rows[i]['valor_unitario'] = parseFloat(rows[i]['valor_unitario']) rows[i]['descuento'] = parseFloat(rows[i]['descuento'])