From a948f15453dcfc658ef79008c7f0fbfb1617b038 Mon Sep 17 00:00:00 2001
From: Mauricio Baeza <git@elmau.net>
Date: Tue, 31 Oct 2017 10:34:34 -0600
Subject: [PATCH] =?UTF-8?q?Fix=20-=20Descripci=C3=B3n=20de=20producto=20y?=
 =?UTF-8?q?=20folio=20siguiente=20en=20facturas?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/app/models/main.py               | 14 ++++++++------
 source/static/js/controller/invoices.js |  1 -
 2 files changed, 8 insertions(+), 7 deletions(-)

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'])