From 42aefd478efb92b37ae14943129ac197d4098df3 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Mon, 24 Sep 2007 18:08:48 +0000
Subject: [PATCH] git-svn-id:
 https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@66
 1c943782-d109-9647-9548-93b3ac332352

---
 .../Cliente/uEditorListaRecepciones.dfm       |   8 +
 Source/Modulos/Stock/Cliente/Stock.dpk        |   3 +-
 Source/Modulos/Stock/Cliente/Stock.dproj      |  81 ++++-----
 .../Stock/Cliente/uEditorControlStockEDI.dfm  | 167 ++++++++++++------
 .../Stock/Cliente/uEditorControlStockEDI.pas  |  24 ++-
 .../uViewControGridStockEDIInventario.dfm     |   2 +-
 .../uViewControGridStockEDIInventario.pas     |   2 +-
 .../uViewControGridStockPrendasCentros.dfm    |   4 +-
 .../uViewControGridStockPrendasCentros.pas    |   2 +-
 .../Cliente/uViewControGridStockVARELA.dfm    |  14 +-
 .../Cliente/uEditorControlResumenVentas.dfm   |  32 +---
 .../Cliente/uEditorControlResumenVentas.pas   |   1 -
 12 files changed, 205 insertions(+), 135 deletions(-)

diff --git a/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm b/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm
index 4ccb3b9..52ebe52 100644
--- a/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm
+++ b/Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm
@@ -82,6 +82,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
         Caption = 'Todos'
       end>
     OnTabSelected = JvTabBar1TabSelected
+    ExplicitTop = 70
   end
   inline frViewListaRecepciones1: TfrViewListaRecepciones [4]
     Left = 0
@@ -135,10 +136,17 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
       inherited frViewParametrosCentro1: TfrViewParametrosCentro
         Height = 41
         ExplicitHeight = 41
+        inherited dxLayoutControl1: TdxLayoutControl
+          inherited ccbCentro: TJvCheckedComboBox
+            Width = 392
+            ExplicitWidth = 392
+          end
+        end
       end
       inherited TBXLabel1: TTBXLabel
         Width = 816
         ExplicitWidth = 816
+        ExplicitHeight = 19
       end
       inherited pnlAgrupaciones: TTBXAlignmentPanel
         Width = 391
diff --git a/Source/Modulos/Stock/Cliente/Stock.dpk b/Source/Modulos/Stock/Cliente/Stock.dpk
index 7b30a92..1e68b17 100644
--- a/Source/Modulos/Stock/Cliente/Stock.dpk
+++ b/Source/Modulos/Stock/Cliente/Stock.dpk
@@ -65,7 +65,8 @@ requires
   JvSystemD10R,
   JvPageCompsD10R,
   JvStdCtrlsD10R,
-  Parametros;
+  Parametros,
+  JvCustomD10R;
 
 contains
   uPluginControllerStock in 'uPluginControllerStock.pas' {ModuleStock: TModuleController},
diff --git a/Source/Modulos/Stock/Cliente/Stock.dproj b/Source/Modulos/Stock/Cliente/Stock.dproj
index 836f003..07e8e43 100644
--- a/Source/Modulos/Stock/Cliente/Stock.dproj
+++ b/Source/Modulos/Stock/Cliente/Stock.dproj
@@ -50,46 +50,41 @@
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
     <DCCReference Include="..\Reglas\uBizStock.pas" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\BaseD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\ControlesBaseD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dclcxLibraryD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxComnD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGridLnkD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSLnksD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD10R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD10R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD10R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD10R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Parametros.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PluginSDK_D10R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tb2k_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclshlctrls.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
+    <DCCReference Include="adortl.dcp" />
+    <DCCReference Include="BaseD10.dcp" />
+    <DCCReference Include="ControlesBaseD10.dcp" />
+    <DCCReference Include="cxDataD10.dcp" />
+    <DCCReference Include="cxEditorsD10.dcp" />
+    <DCCReference Include="cxExportD10.dcp" />
+    <DCCReference Include="cxExtEditorsD10.dcp" />
+    <DCCReference Include="cxGridD10.dcp" />
+    <DCCReference Include="cxLibraryD10.dcp" />
+    <DCCReference Include="cxPageControlD10.dcp" />
+    <DCCReference Include="dbrtl.dcp" />
+    <DCCReference Include="dclcxLibraryD10.dcp" />
+    <DCCReference Include="designide.dcp" />
+    <DCCReference Include="dsnap.dcp" />
+    <DCCReference Include="dxComnD10.dcp" />
+    <DCCReference Include="dxPSCoreD10.dcp" />
+    <DCCReference Include="dxPScxCommonD10.dcp" />
+    <DCCReference Include="dxPScxGridLnkD10.dcp" />
+    <DCCReference Include="dxPSLnksD10.dcp" />
+    <DCCReference Include="dxThemeD10.dcp" />
+    <DCCReference Include="GUISDK_D10.dcp" />
+    <DCCReference Include="Jcl.dcp" />
+    <DCCReference Include="JclVcl.dcp" />
+    <DCCReference Include="JvCoreD10R.dcp" />
+    <DCCReference Include="JvCustomD10R.dcp" />
+    <DCCReference Include="JvPageCompsD10R.dcp" />
+    <DCCReference Include="JvStdCtrlsD10R.dcp" />
+    <DCCReference Include="JvSystemD10R.dcp" />
+    <DCCReference Include="Parametros.dcp" />
+    <DCCReference Include="PluginSDK_D10R.dcp" />
+    <DCCReference Include="PngComponentsD10.dcp" />
+    <DCCReference Include="PNG_D10.dcp" />
+    <DCCReference Include="rtl.dcp" />
+    <DCCReference Include="tb2k_D10.dcp" />
+    <DCCReference Include="tbx_D10.dcp" />
     <DCCReference Include="uDataModuleStock.pas">
       <Form>dmStock</Form>
     </DCCReference>
@@ -114,6 +109,12 @@
     <DCCReference Include="uViewControGridStockVARELA.pas">
       <Form>frViewControlGridStockVARELA</Form>
     </DCCReference>
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vclactnband.dcp" />
+    <DCCReference Include="vcldb.dcp" />
+    <DCCReference Include="vcljpg.dcp" />
+    <DCCReference Include="vclshlctrls.dcp" />
+    <DCCReference Include="vclx.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm b/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm
index 89c408e..157d420 100644
--- a/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm
+++ b/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm
@@ -175,20 +175,34 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
   end
   object PageControl1: TPageControl [3]
     Left = 0
-    Top = 76
+    Top = 105
     Width = 864
-    Height = 478
+    Height = 449
+    Margins.Left = 0
+    Margins.Top = 0
+    Margins.Right = 0
+    Margins.Bottom = 0
     ActivePage = tabResumen
     Align = alClient
+    MultiLine = True
+    TabHeight = 10
     TabOrder = 3
+    TabPosition = tpLeft
     OnChange = PageControl1Change
+    ExplicitTop = 102
+    ExplicitHeight = 452
     object tabResumen: TTabSheet
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 0
       Caption = 'Resumido por prendas'
+      ExplicitHeight = 444
       inline frViewControlGridStockPrendasCentros1: TfrViewControlGridStockPrendasCentros
         Left = 0
         Top = 0
-        Width = 856
-        Height = 450
+        Width = 846
+        Height = 441
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -198,14 +212,13 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitWidth = 856
-        ExplicitHeight = 450
+        ExplicitWidth = 846
+        ExplicitHeight = 444
         inherited cxGrid: TcxGrid
-          Width = 856
-          Height = 390
-          ExplicitTop = 60
-          ExplicitWidth = 856
-          ExplicitHeight = 390
+          Width = 846
+          Height = 381
+          ExplicitWidth = 846
+          ExplicitHeight = 384
           inherited cxGridView: TcxGridDBTableView
             DataController.Summary.FooterSummaryItems = <
               item
@@ -251,9 +264,8 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
           end
         end
         inherited TBXDockablePanel1: TTBXDockablePanel
-          ExplicitWidth = 856
+          ExplicitWidth = 846
           inherited frViewParametrosColeccion1: TfrViewParametrosColeccion
-            ExplicitHeight = 41
             inherited dxLayoutControl1: TdxLayoutControl
               inherited ccbColeccion: TJvCheckedComboBox
                 Width = 512
@@ -262,16 +274,15 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
             end
           end
           inherited pnlAgrupaciones: TTBXAlignmentPanel
-            Width = 535
-            ExplicitWidth = 535
-            ExplicitHeight = 41
+            Width = 525
+            ExplicitWidth = 525
             inherited TBXButton3: TTBXButton
               Action = actRefrescar
             end
           end
           inherited TBXLabel1: TTBXLabel
-            Width = 856
-            ExplicitWidth = 856
+            Width = 846
+            ExplicitWidth = 846
           end
         end
         inherited dsDataSource: TDADataSource
@@ -288,13 +299,18 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
       end
     end
     object tabDesglose: TTabSheet
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 0
       Caption = 'Detallado por centros'
       ImageIndex = 1
+      ExplicitHeight = 444
       inline frViewControlGridStockEDI1: TfrViewControlGridStockEDI
         Left = 0
         Top = 0
-        Width = 856
-        Height = 450
+        Width = 846
+        Height = 441
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -304,14 +320,13 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitWidth = 856
-        ExplicitHeight = 450
+        ExplicitWidth = 846
+        ExplicitHeight = 444
         inherited cxGrid: TcxGrid
-          Width = 856
-          Height = 390
-          ExplicitTop = 60
-          ExplicitWidth = 856
-          ExplicitHeight = 390
+          Width = 846
+          Height = 381
+          ExplicitWidth = 846
+          ExplicitHeight = 384
           inherited cxGridView: TcxGridDBTableView
             PopupMenu = GridPopupMenu
             DataController.Summary.DefaultGroupSummaryItems = <
@@ -550,9 +565,8 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
           end
         end
         inherited TBXDockablePanel1: TTBXDockablePanel
-          ExplicitWidth = 856
+          ExplicitWidth = 846
           inherited frViewParametrosColeccion1: TfrViewParametrosColeccion
-            ExplicitHeight = 41
             inherited dxLayoutControl1: TdxLayoutControl
               inherited ccbColeccion: TJvCheckedComboBox
                 Width = 512
@@ -561,7 +575,6 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
             end
           end
           inherited frViewParametrosCentro1: TfrViewParametrosCentro
-            ExplicitHeight = 41
             inherited dxLayoutControl1: TdxLayoutControl
               inherited ccbCentro: TJvCheckedComboBox
                 Width = 392
@@ -570,16 +583,15 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
             end
           end
           inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-            Width = 135
-            ExplicitWidth = 135
-            ExplicitHeight = 41
+            Width = 125
+            ExplicitWidth = 125
             inherited TBXButton1: TTBXButton
               Action = actRefrescar
             end
           end
           inherited TBXLabel2: TTBXLabel
-            Width = 856
-            ExplicitWidth = 856
+            Width = 846
+            ExplicitWidth = 846
           end
         end
         inherited dxComponentPrinter: TdxComponentPrinter
@@ -591,13 +603,18 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
       end
     end
     object tabInventario: TTabSheet
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 0
       Caption = 'Diferencias con '#250'ltimo inventario'
       ImageIndex = 2
+      ExplicitHeight = 444
       inline frViewControlGridStockEDIInventario1: TfrViewControlGridStockEDIInventario
         Left = 0
         Top = 0
-        Width = 856
-        Height = 450
+        Width = 846
+        Height = 441
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -607,14 +624,13 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
         ParentFont = False
         TabOrder = 0
         ReadOnly = False
-        ExplicitWidth = 856
-        ExplicitHeight = 450
+        ExplicitWidth = 846
+        ExplicitHeight = 444
         inherited cxGrid: TcxGrid
-          Width = 856
-          Height = 390
-          ExplicitTop = 60
-          ExplicitWidth = 856
-          ExplicitHeight = 390
+          Width = 846
+          Height = 381
+          ExplicitWidth = 846
+          ExplicitHeight = 384
           inherited cxGridView: TcxGridDBTableView
             DataController.Summary.DefaultGroupSummaryItems = <
               item
@@ -852,9 +868,8 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
           end
         end
         inherited TBXDockablePanel1: TTBXDockablePanel
-          ExplicitWidth = 856
+          ExplicitWidth = 846
           inherited frViewParametrosColeccion1: TfrViewParametrosColeccion
-            ExplicitHeight = 41
             inherited dxLayoutControl1: TdxLayoutControl
               inherited ccbColeccion: TJvCheckedComboBox
                 Width = 512
@@ -863,7 +878,6 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
             end
           end
           inherited frViewParametrosCentro1: TfrViewParametrosCentro
-            ExplicitHeight = 41
             inherited dxLayoutControl1: TdxLayoutControl
               inherited ccbCentro: TJvCheckedComboBox
                 Width = 392
@@ -872,16 +886,15 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
             end
           end
           inherited pnlAgrupaciones: TTBXAlignmentPanel
-            Width = 135
-            ExplicitWidth = 135
-            ExplicitHeight = 41
+            Width = 125
+            ExplicitWidth = 125
             inherited TBXButton3: TTBXButton
               Action = actRefrescar
             end
           end
           inherited TBXLabel1: TTBXLabel
-            Width = 856
-            ExplicitWidth = 856
+            Width = 846
+            ExplicitWidth = 846
           end
         end
         inherited dxComponentPrinter: TdxComponentPrinter
@@ -893,6 +906,30 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
       end
     end
   end
+  object JvTabBar1: TJvTabBar [4]
+    Left = 0
+    Top = 76
+    Width = 864
+    Height = 29
+    Cursor = crHandPoint
+    CloseButton = False
+    Painter = JvModernTabBarPainter1
+    Images = SmallImages
+    Tabs = <
+      item
+        Caption = 'Resumido por prendas'
+        Selected = True
+      end
+      item
+        Caption = 'Detallado por centros'
+        Tag = 1
+      end
+      item
+        Caption = 'Diferencias con '#250'ltimo inventario'
+        Tag = 2
+      end>
+    OnTabSelected = JvTabBar1TabSelected
+  end
   inherited EditorActionList: TActionList
     Top = 208
     inherited actNuevo: TAction
@@ -2286,11 +2323,11 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
       end>
     Bitmap = {}
   end
-  inherited dsDataTable: TDADataSource [8]
+  inherited dsDataTable: TDADataSource [9]
     Left = 8
     Top = 208
   end
-  inherited JvAppRegistryStorage: TJvAppRegistryStorage [9]
+  inherited JvAppRegistryStorage: TJvAppRegistryStorage [10]
   end
   inherited GridPopupMenu: TPopupMenu
     Left = 40
@@ -2303,4 +2340,26 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
     Left = 320
     Top = 232
   end
+  object JvModernTabBarPainter1: TJvModernTabBarPainter
+    BorderColor = clWindow
+    ControlDivideColor = cl3DDkShadow
+    DividerColor = clBtnShadow
+    Font.Charset = DEFAULT_CHARSET
+    Font.Color = clHighlight
+    Font.Height = -11
+    Font.Name = 'MS Sans Serif'
+    Font.Style = []
+    DisabledFont.Charset = DEFAULT_CHARSET
+    DisabledFont.Color = clGrayText
+    DisabledFont.Height = -11
+    DisabledFont.Name = 'MS Sans Serif'
+    DisabledFont.Style = []
+    SelectedFont.Charset = DEFAULT_CHARSET
+    SelectedFont.Color = clHighlight
+    SelectedFont.Height = -11
+    SelectedFont.Name = 'MS Sans Serif'
+    SelectedFont.Style = [fsBold]
+    Left = 320
+    Top = 128
+  end
 end
diff --git a/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.pas b/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.pas
index b7b2c18..6fdfe2d 100644
--- a/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.pas
+++ b/Source/Modulos/Stock/Cliente/uEditorControlStockEDI.pas
@@ -12,7 +12,7 @@ uses
   uEditorGridBase, uViewGridBase, uViewGrid, Menus, TB2ExtItems, TBXExtItems,
 
   uBizStock,uViewControGridStockEDI, uViewControGridStockPrendasCentros,
-  uViewControGridStockEDIInventario, uDAInterfaces;
+  uViewControGridStockEDIInventario, uDAInterfaces, JvTabBar;
 
 type
   IEditorControlStockEDI = interface(IEditorGridBase)
@@ -42,12 +42,15 @@ type
     frViewControlGridStockPrendasCentros1: TfrViewControlGridStockPrendasCentros;
     tabInventario: TTabSheet;
     frViewControlGridStockEDIInventario1: TfrViewControlGridStockEDIInventario;
+    JvTabBar1: TJvTabBar;
+    JvModernTabBarPainter1: TJvModernTabBarPainter;
     procedure actAnchoAutoExecute(Sender: TObject);
     procedure FormShow(Sender: TObject); override;
     procedure actExpandirExecute(Sender: TObject);
     procedure actContraerExecute(Sender: TObject);
     procedure PageControl1Change(Sender: TObject);
     procedure actRefrescarExecute(Sender: TObject);
+    procedure JvTabBar1TabSelected(Sender: TObject; Item: TJvTabBarItem);
   protected
     FDesglose : IBizStockEDI;
     FInventario : IBizStockEDIInventario;
@@ -106,14 +109,23 @@ begin
 end;
 
 constructor TfEditorControlStockEDI.Create(AOwner: TComponent);
+var
+  i:Integer;
+
 begin
   inherited;
   FResumen := nil;
   FDesglose := nil;
-  FInventario := nil;  
-  
+  FInventario := nil;
+
   Self.Caption := 'Control de stock en centros';
   JvNavPanelHeader.Caption := Self.Caption;
+
+  //Para ocultar las pestaņas y dejar que se encargue del cambio el componente de jv
+  for i := 0 to PageControl1.PageCount - 1 do
+  begin
+    PageControl1.Pages[i].TabVisible := false;
+  end;
   PageControl1.ActivePageIndex := 0;
 
   if not Assigned(FResumen) then
@@ -164,6 +176,12 @@ begin
   Result := FResumen;
 end;
 
+procedure TfEditorControlStockEDI.JvTabBar1TabSelected(Sender: TObject; Item: TJvTabBarItem);
+begin
+  inherited;
+  PageControl1.ActivePageIndex := Item.Index;
+end;
+
 procedure TfEditorControlStockEDI.SetItemsDesglose(const Value: IBizStockEDI);
 begin
   FDesglose := Value;
diff --git a/Source/Modulos/Stock/Cliente/uViewControGridStockEDIInventario.dfm b/Source/Modulos/Stock/Cliente/uViewControGridStockEDIInventario.dfm
index be543e6..0b1a70a 100644
--- a/Source/Modulos/Stock/Cliente/uViewControGridStockEDIInventario.dfm
+++ b/Source/Modulos/Stock/Cliente/uViewControGridStockEDIInventario.dfm
@@ -571,7 +571,7 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
       ReportDocument.Caption = 'Venta mensual'
-      ReportDocument.CreationDate = 39346.818025173610000000
+      ReportDocument.CreationDate = 39349.452629837960000000
       ReportTitle.Text = 'Venta mensual'
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clBlack
diff --git a/Source/Modulos/Stock/Cliente/uViewControGridStockEDIInventario.pas b/Source/Modulos/Stock/Cliente/uViewControGridStockEDIInventario.pas
index e4340cb..7ed488e 100644
--- a/Source/Modulos/Stock/Cliente/uViewControGridStockEDIInventario.pas
+++ b/Source/Modulos/Stock/Cliente/uViewControGridStockEDIInventario.pas
@@ -252,7 +252,7 @@ begin
 
 
     Items.DataTable.Where.Clear;
-//    Items.DataTable.Where.AddText(AWhere, False);
+    Items.DataTable.Where.AddText(AWhere, False);
     Items.DataTable.Active := True;
 
   finally
diff --git a/Source/Modulos/Stock/Cliente/uViewControGridStockPrendasCentros.dfm b/Source/Modulos/Stock/Cliente/uViewControGridStockPrendasCentros.dfm
index 65dc2c8..196da7c 100644
--- a/Source/Modulos/Stock/Cliente/uViewControGridStockPrendasCentros.dfm
+++ b/Source/Modulos/Stock/Cliente/uViewControGridStockPrendasCentros.dfm
@@ -205,7 +205,7 @@ inherited frViewControlGridStockPrendasCentros: TfrViewControlGridStockPrendasCe
     DockedHeight = 32
     FloatingWidth = 128
     FloatingHeight = 60
-    SupportedDocks = [dkStandardDock, dkMultiDock]
+    SupportedDocks = []
     TabOrder = 1
     inline frViewParametrosColeccion1: TfrViewParametrosColeccion
       Left = 0
@@ -295,7 +295,7 @@ inherited frViewControlGridStockPrendasCentros: TfrViewControlGridStockPrendasCe
       PrinterPage.PageSize.Y = 297000
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
-      ReportDocument.CreationDate = 39346.696871921300000000
+      ReportDocument.CreationDate = 39349.452622245370000000
       ReportDocument.IsCaptionAssigned = True
       ReportTitle.AdjustOnReportScale = True
       ReportTitle.Text = 'Venta mensual'
diff --git a/Source/Modulos/Stock/Cliente/uViewControGridStockPrendasCentros.pas b/Source/Modulos/Stock/Cliente/uViewControGridStockPrendasCentros.pas
index c071644..a5b131f 100644
--- a/Source/Modulos/Stock/Cliente/uViewControGridStockPrendasCentros.pas
+++ b/Source/Modulos/Stock/Cliente/uViewControGridStockPrendasCentros.pas
@@ -186,7 +186,7 @@ begin
        AWhere := AWhere + AWhereColeccion;
 
     Items.DataTable.Where.Clear;
-//    Items.DataTable.Where.AddText(AWhere, False);
+    Items.DataTable.Where.AddText(AWhere, False);
     Items.DataTable.Active := True;
 
   finally
diff --git a/Source/Modulos/Stock/Cliente/uViewControGridStockVARELA.dfm b/Source/Modulos/Stock/Cliente/uViewControGridStockVARELA.dfm
index 8b96f28..514466b 100644
--- a/Source/Modulos/Stock/Cliente/uViewControGridStockVARELA.dfm
+++ b/Source/Modulos/Stock/Cliente/uViewControGridStockVARELA.dfm
@@ -7,9 +7,9 @@ inherited frViewControlGridStockVARELA: TfrViewControlGridStockVARELA
     Top = 60
     Width = 831
     Height = 290
-    ExplicitTop = 128
-    ExplicitWidth = 621
-    ExplicitHeight = 331
+    ExplicitTop = 60
+    ExplicitWidth = 831
+    ExplicitHeight = 290
     inherited cxGridView: TcxGridDBTableView
       FilterBox.Visible = fvNever
       DataController.Summary.DefaultGroupSummaryItems = <
@@ -232,13 +232,14 @@ inherited frViewControlGridStockVARELA: TfrViewControlGridStockVARELA
       ReadOnly = False
       ExplicitTop = 19
       ExplicitWidth = 321
-      ExplicitHeight = 109
+      ExplicitHeight = 41
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 321
         Height = 41
         Align = alClient
         AutoContentSizes = [acsWidth]
         ExplicitWidth = 321
+        ExplicitHeight = 41
         inherited ccbColeccion: TJvCheckedComboBox
           Width = 512
           ExplicitWidth = 512
@@ -252,8 +253,6 @@ inherited frViewControlGridStockVARELA: TfrViewControlGridStockVARELA
       Height = 41
       Align = alClient
       TabOrder = 1
-      ExplicitWidth = 300
-      ExplicitHeight = 109
       object TBXButton3: TTBXButton
         Tag = 3
         Left = 8
@@ -284,7 +283,6 @@ inherited frViewControlGridStockVARELA: TfrViewControlGridStockVARELA
       ParentColor = True
       ParentFont = False
       Underline = True
-      ExplicitWidth = 621
     end
   end
   inherited dxComponentPrinter: TdxComponentPrinter
@@ -310,7 +308,7 @@ inherited frViewControlGridStockVARELA: TfrViewControlGridStockVARELA
       PrinterPage.PageSize.Y = 297000
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
-      ReportDocument.CreationDate = 39343.812229085650000000
+      ReportDocument.CreationDate = 39349.529536493060000000
       ReportDocument.IsCaptionAssigned = True
       ReportTitle.AdjustOnReportScale = True
       ReportTitle.Text = 'Venta mensual'
diff --git a/Source/Modulos/VentasTerminadas/Cliente/uEditorControlResumenVentas.dfm b/Source/Modulos/VentasTerminadas/Cliente/uEditorControlResumenVentas.dfm
index 2812d8b..8d696e6 100644
--- a/Source/Modulos/VentasTerminadas/Cliente/uEditorControlResumenVentas.dfm
+++ b/Source/Modulos/VentasTerminadas/Cliente/uEditorControlResumenVentas.dfm
@@ -253,7 +253,7 @@ inherited fEditorControlResumenVentas: TfEditorControlResumenVentas
     Left = 0
     Top = 76
     Width = 679
-    Height = 284
+    Height = 478
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -265,12 +265,12 @@ inherited fEditorControlResumenVentas: TfEditorControlResumenVentas
     ReadOnly = False
     ExplicitTop = 76
     ExplicitWidth = 679
-    ExplicitHeight = 478
+    ExplicitHeight = 284
     inherited cxGrid: TcxGrid
       Width = 679
-      Height = 284
+      Height = 478
       ExplicitWidth = 679
-      ExplicitHeight = 478
+      ExplicitHeight = 284
     end
     inherited dxComponentPrinter: TdxComponentPrinter
       inherited dxComponentPrinterLink1: TdxGridReportLink
@@ -279,21 +279,7 @@ inherited fEditorControlResumenVentas: TfEditorControlResumenVentas
       end
     end
   end
-  object DBGrid1: TDBGrid [4]
-    Left = 0
-    Top = 360
-    Width = 679
-    Height = 194
-    Align = alBottom
-    DataSource = dsDataTable
-    TabOrder = 4
-    TitleFont.Charset = DEFAULT_CHARSET
-    TitleFont.Color = clWindowText
-    TitleFont.Height = -11
-    TitleFont.Name = 'Tahoma'
-    TitleFont.Style = []
-  end
-  inherited EditorActionList: TActionList [5]
+  inherited EditorActionList: TActionList [4]
     inherited actNuevo: TAction
       Visible = False
     end
@@ -326,7 +312,7 @@ inherited fEditorControlResumenVentas: TfEditorControlResumenVentas
       OnExecute = actAnchoAutoExecute
     end
   end
-  inherited SmallImages: TPngImageList [6]
+  inherited SmallImages: TPngImageList [5]
     PngImages = <
       item
         PngImage.Data = {
@@ -859,7 +845,7 @@ inherited fEditorControlResumenVentas: TfEditorControlResumenVentas
       end>
     Bitmap = {}
   end
-  inherited LargeImages: TPngImageList [7]
+  inherited LargeImages: TPngImageList [6]
     PngImages = <
       item
         PngImage.Data = {
@@ -1689,9 +1675,9 @@ inherited fEditorControlResumenVentas: TfEditorControlResumenVentas
       end>
     Bitmap = {}
   end
-  inherited JvFormStorage: TJvFormStorage [8]
+  inherited JvFormStorage: TJvFormStorage [7]
   end
-  inherited JvAppRegistryStorage: TJvAppRegistryStorage [10]
+  inherited JvAppRegistryStorage: TJvAppRegistryStorage [9]
   end
   object dsVentasTerminadas: TDADataSource
     Left = 320
diff --git a/Source/Modulos/VentasTerminadas/Cliente/uEditorControlResumenVentas.pas b/Source/Modulos/VentasTerminadas/Cliente/uEditorControlResumenVentas.pas
index 0abc4e6..56a7d43 100644
--- a/Source/Modulos/VentasTerminadas/Cliente/uEditorControlResumenVentas.pas
+++ b/Source/Modulos/VentasTerminadas/Cliente/uEditorControlResumenVentas.pas
@@ -43,7 +43,6 @@ type
     edtColeccion: TTBXEditItem;
     TBXLabelItem4: TTBXLabelItem;
     TBXSeparatorItem19: TTBXSeparatorItem;
-    DBGrid1: TDBGrid;
     procedure actAnchoAutoExecute(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure actRefrescarExecute(Sender: TObject);