Show warehouse in sucursal

source/app/models/main.py

@@ -582,8 +582,12 @@ class Configuracion(BaseModel):
         return data
 
     def _get_admin_sucursales(cls, args):
-        rows = Folios.get_for_sucursales()
-        return rows
+        values = {
+            'folios': Folios.get_for_sucursales(),
+            'warehouse': Almacenes.get_for_sucursales(),
+            'multi_stock': Configuracion.get_bool('chk_multi_stock')
+        }
+        return values
 
     @classmethod
     def get_(cls, keys):
@@ -1223,7 +1227,7 @@ class Folios(BaseModel):
                 Folios.serie.alias('id'),
                 Folios.serie.alias('value'),
             )
-            .where(Folios.usarcon == '')
+            # ~ .where(Folios.usarcon == '')
             .dicts()
         )
         return tuple(rows)
@@ -3387,6 +3391,17 @@ class Almacenes(BaseModel):
     class Meta:
         order_by = ('name',)
 
+    @classmethod
+    def get_for_sucursales(cls):
+        rows = (Almacenes
+            .select(
+                Almacenes.id,
+                Almacenes.name.alias('value'),
+            )
+            .dicts()
+        )
+        return tuple(rows)
+
     @classmethod
     def _get_all(cls, values):
         rows = (Almacenes

source/static/js/controller/admin.js

@@ -484,7 +484,12 @@ function set_config_admin_sucursales(){
         },
         success: function(text, data, xhr) {
             var values = data.json()
-            lst_parse2('lst_sucursal_add_invoice', values)
+            lst_parse2('lst_sucursal_add_invoice', values.folios)
+            lst_parse2('lst_sucursal_warehouse', values.warehouse)
+            if(values.multi_stock){
+                $$('lst_sucursal_warehouse').show()
+                $$('grid_sucursales').showColumn('warehouse')
+            }
         }
     })
 
@@ -565,7 +570,6 @@ function multi_admin_change(prevID, nextID){
     }
 
     if(nextID == 'app_options'){
-        //~ set_visible_warehouse(false)
         get_config_values('templates')
         return
     }

source/static/js/ui/admin.js

@@ -878,6 +878,8 @@ var controls_add_sucursal = [{cols: [
         label: 'Serie Facturas: ', labelPosition: 'top', required: true, options: []},
     {view: 'text', id: 'txt_sucursal_add_ticket', name: 'sucursal_add_ticket',
         required: true, label: 'Serie Tickets: ', labelPosition: 'top'},
+    {view: 'richselect', id: 'lst_sucursal_warehouse', label: 'Almacen: ',
+        labelPosition: 'top', required: false, options: [], hidden: true},
     {view: 'button', id: 'cmd_add_sucursal', label: 'Agregar',
         autowidth: true, type: 'iconButton', icon: 'plus'},
     {maxWidth: 20},
@@ -889,7 +891,9 @@ var grid_sucursales_cols = [
     {id: 'delete', header: '', width: 30, css: 'delete'},
     {id: 'name', header: 'Nombre', fillspace: 1},
     {id: 'serie_invoice', header: 'Serie Facturas', fillspace: 1},
-    {id: 'serie_tickets', header: 'Serie Tickets', fillspace: 1},]
+    {id: 'serie_tickets', header: 'Serie Tickets', fillspace: 1},
+    {id: 'warehouse', header: 'Almacen', fillspace: 1, hidden: true},
+]
 
 
 var grid_sucursales = {
@@ -897,7 +901,7 @@ var grid_sucursales = {
     id: 'grid_sucursales',
     select: 'row',
     adjust: true,
-    headermenu: true,
+    headermenu: false,
     footer: true,
     columns: grid_sucursales_cols,
     on:{