diff --git a/source/app/models/main.py b/source/app/models/main.py index 6b6e160..4c3c0f2 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -785,8 +785,11 @@ class SATImpuestos(BaseModel): @classmethod def remove(cls, id): with database_proxy.transaction(): - q = SATImpuestos.delete().where(SATImpuestos.id==id) - return bool(q.execute()) + try: + q = SATImpuestos.delete().where(SATImpuestos.id==id) + return bool(q.execute()) + except IntegrityError: + return False @classmethod def get_(self): diff --git a/source/static/js/controller/admin.js b/source/static/js/controller/admin.js index 0b1852b..17377c0 100644 --- a/source/static/js/controller/admin.js +++ b/source/static/js/controller/admin.js @@ -1099,10 +1099,13 @@ function borrar_impuesto(row){ var grid = $$('grid_admin_taxes') webix.ajax().del('/values/satimpuesto', {id: row}, function(text, xml, xhr){ - var msg = 'Impuesto eliminado correctamente' + msg = 'Impuesto eliminado correctamente' if(xhr.status == 200){ grid.remove(row) msg_sucess(msg) + }else{ + msg = 'Impuesto en uso, no se pudo eliminar.' + msg_sucess(msg) } }) }