diff --git a/source/app/models/main.py b/source/app/models/main.py index 568f81c..13906ff 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -9341,7 +9341,6 @@ class PartnerProducts(BaseModel): ) def _get_product(self, filters): - data = {'ok': True} partner = utils.loads(filters['partner']) id = int(partner['id']) @@ -9356,27 +9355,22 @@ class PartnerProducts(BaseModel): Productos.id.alias('id_product'), Productos.clave_sat.alias('key_sat1'), Productos.descripcion.alias('description1'), + Productos.valor_unitario.alias('unit_value1'), ) try: obj = (PartnerProducts - .select(select) + .select(*select) .join(Socios).switch(PartnerProducts) .join(Productos).switch(PartnerProducts) .where(where) .dicts()[0] ) - # ~ except PartnerProducts.DoesNotExist: - # ~ msg = 'No se encontrĂ³ un producto existente' - # ~ data = {'ok': False, 'msg': msg} - # ~ return data except IndexError: msg = 'No se encontrĂ³ un producto existente' data = {'ok': False, 'msg': msg} return data - print('ROW', obj) - - data['row'] = obj + data = {'ok': True, 'row': obj} return data @@ -9498,9 +9492,12 @@ class InventoryEntries(BaseModel): where = (SATImpuestos.activo==True & SATImpuestos.default==True) taxes = SATImpuestos.select().where(where) obj.impuestos = taxes + obj.save() - obj.existencia += cant - obj.save() + res = (Productos + .update(existencia=Productos.existencia + cant) + .where(Productos.id==obj.id).execute() + ) return obj @@ -9521,7 +9518,7 @@ class InventoryEntries(BaseModel): key = p['key'], product = product, ) - PartnerProducts.create(**values) + PartnerProducts.get_or_create(**values) return msg diff --git a/source/static/js/controller/products.js b/source/static/js/controller/products.js index 610304e..d6f4eef 100644 --- a/source/static/js/controller/products.js +++ b/source/static/js/controller/products.js @@ -653,6 +653,7 @@ function get_partner_product(grid, row){ row['id_product'] = values.row.id_product row['key_sat1'] = values.row.key_sat1 row['description1'] = values.row.description1 + row['unit_value1'] = values.row.unit_value1 grid.refresh(row.id) }else{ msg_error(values.msg)