categulario
/
empresa-libre
forked from elmau/empresa-libre
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'develop' 

Fix - Issue 41
This commit is contained in:
Mauricio Baeza 2017-12-06 09:50:28 -06:00
parent 88c42a2b1b 85de4e5d90
commit bd73871cb0
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/app/models/main.py
View File

@ -1710,8 +1710,9 @@ class Productos(BaseModel):
@classmethod @classmethod
def get_by(cls, values): def get_by(cls, values):
id = int(values.get('id', 0)) # ~ id = int(values.get('id', 0))
if id: clave = values.get('id', '')
if clave:
row = (Productos row = (Productos
.select( .select(
Productos.id, Productos.id,
@ -1722,8 +1723,9 @@ class Productos(BaseModel):
Productos.valor_unitario, Productos.valor_unitario,
Productos.descuento) Productos.descuento)
.join(SATUnidades).switch(Productos) .join(SATUnidades).switch(Productos)
.where(Productos.id==id).dicts()) .where(Productos.clave==clave).dicts())
if len(row): if len(row):
id = row[0]['id']
model_pt = Productos.impuestos.get_through_model() model_pt = Productos.impuestos.get_through_model()
taxes = tuple(model_pt taxes = tuple(model_pt
.select( .select(
@ -1731,6 +1733,8 @@ class Productos(BaseModel):
model_pt.satimpuestos_id.alias('tax')) model_pt.satimpuestos_id.alias('tax'))
.where(model_pt.productos_id==id).dicts()) .where(model_pt.productos_id==id).dicts())
return {'ok': True, 'row': row[0], 'taxes': taxes} return {'ok': True, 'row': row[0], 'taxes': taxes}
return {'ok': False} return {'ok': False}
name = values.get('name', '') name = values.get('name', '')
@ -1745,7 +1749,8 @@ class Productos(BaseModel):
Productos.valor_unitario) Productos.valor_unitario)
.join(SATUnidades) .join(SATUnidades)
.switch(Productos) .switch(Productos)
.where(Productos.descripcion.contains(name)) .where((Productos.descripcion.contains(name)) |
(Productos.clave.contains(name)))
.dicts() .dicts()
) )
return tuple(rows) return tuple(rows)

4
source/static/js/ui/invoices.js
View File

@ -435,9 +435,9 @@ var controls_generate = [
{view: "search", id: "search_product_id", {view: "search", id: "search_product_id",
name: "search_product_id", label: "por Clave", name: "search_product_id", label: "por Clave",
labelPosition:'top', maxWidth:200, labelPosition:'top', maxWidth:200,
placeholder:'Captura la clave'}, placeholder:'Presiona ENTER para buscar'},
{view: "search", id: "search_product_name", {view: "search", id: "search_product_name",
name: "search_product_name", label: "por Descripción", name: "search_product_name", label: "por Descripción o Clave",
labelPosition:'top', suggest: suggest_products, labelPosition:'top', suggest: suggest_products,
placeholder:'Captura al menos tres letras'}, placeholder:'Captura al menos tres letras'},
]}, ]},

2
source/static/js/ui/products.js
View File

@ -11,7 +11,7 @@ var toolbar_products = [
var grid_products_cols = [ var grid_products_cols = [
{ id: "id", header: "ID", width: 75}, { id: "id", header: "ID", width: 75, hidden: true},
{ id: "clave", header: ["Clave", {content: "textFilter"}], width: 100, { id: "clave", header: ["Clave", {content: "textFilter"}], width: 100,
sort: 'string', footer: {content: 'rowCount', css: 'right'}}, sort: 'string', footer: {content: 'rowCount', css: 'right'}},
{ id: "descripcion", header: ["Descripción", {content: "textFilter"}], { id: "descripcion", header: ["Descripción", {content: "textFilter"}],