diff --git a/source/app/models/db.py b/source/app/models/db.py index b8703a4..94b929e 100644 --- a/source/app/models/db.py +++ b/source/app/models/db.py @@ -487,6 +487,9 @@ class StorageEngine(object): def inventory_entries_post(self, filters, user): return main.InventoryEntries.post(filters, user) + def wharehouse_get(self, filters): + return main.Almacenes.get_data(filters) + def wharehouse_post(self, values, user): return main.Almacenes.post(values, user) diff --git a/source/app/models/main.py b/source/app/models/main.py index 75cb6d3..1d52e4c 100644 --- a/source/app/models/main.py +++ b/source/app/models/main.py @@ -3386,7 +3386,7 @@ class Almacenes(BaseModel): order_by = ('name',) @classmethod - def _get_all(cls): + def _get_all(cls, values): rows = (Almacenes .select( Almacenes.id, @@ -3396,6 +3396,11 @@ class Almacenes(BaseModel): ) return tuple(rows) + @classmethod + def get_data(cls, values): + opt = values['opt'] + return getattr(cls, f'_get_{opt}')(values) + @classmethod def _create(cls, args, user): try: diff --git a/source/static/js/controller/admin.js b/source/static/js/controller/admin.js index b8e3775..48e2019 100644 --- a/source/static/js/controller/admin.js +++ b/source/static/js/controller/admin.js @@ -526,15 +526,6 @@ function get_config_values(opt){ if(chk_obj.indexOf(key) > 0){ admin_config_other_options(key) } - //~ if(key=='chk_config_leyendas_fiscales'){ - //~ admin_config_other_options(key) - //~ }else if(key=='chk_llevar_inventario'){ - //~ admin_config_other_options(key) - //~ }else if(key=='chk_multi_stock'){ - //~ if($$(key).getValue()){ - //~ $$('chk_multi_stock').enable() - //~ } - //~ } } }) } @@ -2536,6 +2527,7 @@ function set_visible_wharehouse(value){ //~ $$('template_add_wharehouse').show() $$('txt_add_wharehouse').show() $$('cmd_add_wharehouse').show() + $$('grid_warehouse').load('/wharehouse?opt=all') $$('grid_warehouse').show() }else{ //~ $$('template_add_wharehouse').hide()