git-svn-id: https://192.168.0.254/svn/Proyectos.Varela_PuntosVenta/trunk@64 1c943782-d109-9647-9548-93b3ac332352

Database/2.3 - vistas stock.sql

@@ -1,3 +1,13 @@
+DROP VIEW RDX_V_CONTROL_INVENTARIO;
+DROP VIEW RDX_V_INVENTARIO_STOCK;
+DROP VIEW RDX_V_STOCK_CALCULADO_DESGLOSADO;
+DROP VIEW RDX_V_STOCK_CALCULADO;
+DROP VIEW RDX_V_STOCK;
+DROP VIEW RDX_V_STOCK_VENTAS;
+DROP VIEW RDX_V_STOCK_INVENTARIO;
+DROP VIEW RDX_V_STOCK_VARELA;
+
+
 /*--------------- SQL ---------------*/
 
 CREATE VIEW RDX_V_STOCK_VARELA AS
@@ -357,6 +367,7 @@ GO
 CREATE VIEW RDX_V_STOCK_CALCULADO AS
 SELECT
       CENTRO,
+      FILIAL,
       CODIGO,
       PRODUCTO,
       TIPO_PRODUCTO,
@@ -394,6 +405,7 @@ GO
 
 CREATE VIEW RDX_V_STOCK_CALCULADO_DESGLOSADO AS
 SELECT CENTRO,
+      FILIAL,
       CODIGO,
       PRODUCTO,
       TIPO_PRODUCTO,
@@ -417,7 +429,8 @@ GO
 
 CREATE VIEW RDX_V_INVENTARIO_STOCK_DESGLOSADO AS
 SELECT
-      ISNULL(RDX_V_STOCK_CALCULADO_DESGLOSADO.CENTRO, RDX_V_ULTIMO_INVENTARIO.FILIAL) as CENTRO,
+      ISNULL(RDX_V_STOCK_CALCULADO_DESGLOSADO.CENTRO, RDX_V_ULTIMO_INVENTARIO.CENTRO) as CENTRO,
+      ISNULL(RDX_V_STOCK_CALCULADO_DESGLOSADO.FILIAL, RDX_V_ULTIMO_INVENTARIO.FILIAL) as FILIAL,
       ISNULL(RDX_V_STOCK_CALCULADO_DESGLOSADO.CODIGO, RDX_V_ULTIMO_INVENTARIO.CODIGO) as CODIGO,
       ISNULL(RDX_V_STOCK_CALCULADO_DESGLOSADO.PRODUCTO, RDX_V_ULTIMO_INVENTARIO.PRODUCTO) as PRODUCTO,
       ISNULL(RDX_V_STOCK_CALCULADO_DESGLOSADO.COLOR, RDX_V_ULTIMO_INVENTARIO.COLOR) as COLOR,
@@ -443,6 +456,7 @@ GO
 CREATE VIEW RDX_V_INVENTARIO_STOCK AS
 select
       CENTRO,
+      FILIAL,
       CODIGO,
       PRODUCTO,
       COLOR,
@@ -524,6 +538,7 @@ select
 from RDX_V_INVENTARIO_STOCK_DESGLOSADO
 
 group by CENTRO,
+         FILIAL,
          CODIGO,
          PRODUCTO,
          COLOR,
@@ -537,6 +552,7 @@ GO
 CREATE VIEW RDX_V_CONTROL_INVENTARIO AS
 SELECT
       CENTRO,
+      FILIAL,
       CODIGO,
       PRODUCTO,
       COLOR,

Database/3 - procedimientos.sql

@@ -91,7 +91,7 @@ BEGIN
 	       NUMINF, CLAVE1, CLAVE2, CLAVE3, PERVENINI, NUMTALON, EANLUG,
            FILIAL, EANVEN, CODVEN, VENDEDOR, EANART, CODCOM, PRODUTO,
            DESC_PRODUTO, COR_PRODUTO, GRADE, TIPO_PRODUTO, GRUPO_PRODUTO,
-           DESC_COLECAO, VALVEN, CANVEN, CANDEV, CANVENNET, CANESP )
+           DESC_COLECAO, VALVEN, CANVEN, CANDEV, CANVENNET, CANESP, IGNORAR )
 	SELECT
 	  RDX_CABVEN.NUMINF,
 	  RDX_ARTVEN.CLAVE1,
@@ -117,7 +117,9 @@ BEGIN
 	  RDX_ARTVEN.CANVEN,
 	  RDX_ARTVEN.CANDEV,
 	  RDX_ARTVEN.CANVENNET,
-	  RDX_ARTVEN.CANESP
+	  RDX_ARTVEN.CANESP,
+	  RDX_CABVEN.IGNORAR
+
 	FROM
 	  RDX_ARTVEN
 	  INNER JOIN RDX_LUGVEN ON (RDX_ARTVEN.CLAVE1 = RDX_LUGVEN.CLAVE1 AND RDX_ARTVEN.CLAVE2 = RDX_LUGVEN.CLAVE2)

Database/SCRIPT MEJORAS TABLAS.SQL

@@ -12,10 +12,19 @@ IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = OBJECT_ID(N'[FK__RDX_ARTVEN__
   DROP CONSTRAINT [FK__RDX_ARTVEN__56BFC79A]
 GO
 
+
+ALTER TABLE [RDX_CABINV]
+DROP COLUMN [CARGADO]
+GO
+
 ALTER TABLE [RDX_CABINV]
 ADD [CARGADO]char(1) NULL
 GO
 
+ALTER TABLE [RDX_CABVEN]
+DROP COLUMN [CARGADO]
+GO
+
 ALTER TABLE [RDX_CABVEN]
 ADD [CARGADO]char(1) NULL
 GO

Source/Base/BaseD10.dproj

@@ -1,4 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{51b1cbd5-e922-4e6d-b778-6de1bca9118c}</ProjectGuid>
     <MainSource>BaseD10.dpk</MainSource>
@@ -39,12 +40,6 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">True</Package_Options></Package_Options><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
-      
-      
-      
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>

Source/Cliente/AdminPV.dpr

@@ -1,15 +1,14 @@
 program AdminPV;
 
 uses
+  ExceptionLog,
   Forms,
   uLoginForm,
   uPantallaPrincipal in 'uPantallaPrincipal.pas' {fPantallaPrincipal},
   uMenuUtils in 'uMenuUtils.pas',
   uSplash in 'uSplash.pas' {SplashScreen},
   uAcercaDe in 'uAcercaDe.pas' {fAcercaDe},
-  uIntegerList in '..\Base\uIntegerList.pas',
+  uIntegerList in '..\Base\uIntegerList.pas';
-  schVentasTerminadasClient_Intf in '..\Modulos\VentasTerminadas\Reglas\schVentasTerminadasClient_Intf.pas',
-  schVentasTerminadasServer_Intf in '..\Modulos\VentasTerminadas\Reglas\schVentasTerminadasServer_Intf.pas';
 
 {$R *.res}
 

Source/Cliente/AdminPV.dproj

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{c1d52109-a098-45a1-97ed-37902144cf8a}</ProjectGuid>
@@ -26,7 +27,7 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <Version>7.0</Version>
-		<DCC_Define>DEBUG</DCC_Define>
+    <DCC_Define>DEBUG;EUREKALOG;EUREKALOG_VER6</DCC_Define>
     <DCC_ExeOutput>..\..\Output\Debug\Cliente</DCC_ExeOutput>
     <DCC_DcuOutput>.\</DCC_DcuOutput>
     <DCC_ObjOutput>.\</DCC_ObjOutput>
@@ -35,12 +36,31 @@
     <DCC_ResourcePath>..\Lib</DCC_ResourcePath>
     <DCC_ObjPath>..\Lib</DCC_ObjPath>
     <DCC_IncludePath>..\Lib</DCC_IncludePath>
+    <DCC_MapFile>3</DCC_MapFile>
   </PropertyGroup>
   <ProjectExtensions>
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">Administración de puntos de venta</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
@@ -55,8 +75,6 @@
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
     <DCCReference Include="..\Base\uIntegerList.pas" />
-		<DCCReference Include="..\Modulos\VentasTerminadas\Reglas\schVentasTerminadasClient_Intf.pas"/>
-		<DCCReference Include="..\Modulos\VentasTerminadas\Reglas\schVentasTerminadasServer_Intf.pas"/>
     <DCCReference Include="uAcercaDe.pas">
       <Form>fAcercaDe</Form>
     </DCCReference>
@@ -72,7 +90,7 @@
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006
-Activate=0
+Activate=1
 Activate Handle=1
 Save Log File=1
 Foreground Tab=0
@@ -550,5 +568,5 @@ Count mtException_AntiFreeze=1
 mtException_AntiFreeze0="The application seems to be frozen."
 Count mtInvalidEmailMsg=1
 mtInvalidEmailMsg0="Invalid email."
-TextsCollection=English
+TextsCollection=
 EurekaLog Last Line -->

Source/Cliente/AdminPV.drc

@@ -1,5 +1,5 @@
-/* VER180
+/* VER185
-  Generated by the Borland Delphi Pascal Compiler
+  Generated by the CodeGear Delphi Pascal Compiler
   because -GD or --drc was supplied to the compiler.
 
   This file contains compiler-generated resources that
@@ -12,3 +12,12 @@ STRINGTABLE
 BEGIN
 END
 
+/* C:\Archivos de programa\EurekaLog 6\Delphi11\DIALOG.RES */
+/* c:\archivos de programa\codegear\rad studio\5.0\lib\WindowsXP.res */
+/* c:\varela_d2007\lib\jvcl\JvXPCore.res */
+/* c:\varela_d2007\lib\jvcl\JvXPBar.res */
+/* C:\Varela_D2007\Source\Cliente\uSplash.dfm */
+/* C:\Varela_D2007\Source\Cliente\uAcercaDe.dfm */
+/* C:\Varela_D2007\Source\Cliente\uPantallaPrincipal.dfm */
+/* C:\Varela_D2007\Source\Cliente\AdminPV.res */
+/* C:\Varela_D2007\Source\Cliente\AdminPV.drf */

Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.dfm

@@ -61,7 +61,7 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
   end
   object JvTabBar1: TJvTabBar [3]
     Left = 0
-    Top = 204
+    Top = 76
     Width = 901
     Height = 29
     Cursor = crHandPoint
@@ -85,9 +85,9 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
   end
   inline frViewListaDevoluciones1: TfrViewListaDevoluciones [4]
     Left = 0
-    Top = 233
+    Top = 105
     Width = 901
-    Height = 385
+    Height = 513
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -97,14 +97,15 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
     ParentFont = False
     TabOrder = 4
     ReadOnly = False
-    ExplicitTop = 233
+    ExplicitTop = 105
     ExplicitWidth = 901
-    ExplicitHeight = 385
+    ExplicitHeight = 513
     inherited cxGrid: TcxGrid
       Width = 901
-      Height = 385
+      Height = 453
+      ExplicitTop = 60
       ExplicitWidth = 901
-      ExplicitHeight = 385
+      ExplicitHeight = 453
       inherited cxGridView: TcxGridDBTableView
         PopupMenu = GridPopupMenu
         DataController.Summary.DefaultGroupSummaryItems = <
@@ -124,84 +125,37 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
         end
       end
     end
-    inherited dxComponentPrinter: TdxComponentPrinter
+    inherited TBXDockablePanel1: TTBXDockablePanel
-      inherited dxComponentPrinterLink1: TdxGridReportLink
+      ExplicitWidth = 901
-        BuiltInReportLink = True
+      inherited frViewParametrosCentro1: TfrViewParametrosCentro
-      end
+        ExplicitHeight = 41
-    end
-  end
-  object TBXDockablePanel1: TTBXDockablePanel [5]
-    Left = 0
-    Top = 76
-    MaxClientHeight = 61
-    Align = alTop
-    Caption = 'TBXDockablePanel1'
-    FloatingWidth = 128
-    FloatingHeight = 128
-    SupportedDocks = [dkStandardDock, dkMultiDock]
-    TabOrder = 5
-    inline frViewParametrosCentro1: TfrViewParametrosCentro
-      Left = 0
-      Top = 19
-      Width = 425
-      Height = 109
-      Align = alLeft
-      TabOrder = 0
-      ReadOnly = False
-      ExplicitTop = 19
-      ExplicitWidth = 425
-      ExplicitHeight = 109
         inherited dxLayoutControl1: TdxLayoutControl
-        Width = 425
-        ExplicitWidth = 425
           inherited ccbCentro: TJvCheckedComboBox
             Width = 392
             ExplicitWidth = 392
           end
         end
       end
-    object TBXLabel1: TTBXLabel
+      inherited TBXLabel1: TTBXLabel
-      Left = 0
-      Top = 0
         Width = 901
-      Height = 19
+        ExplicitWidth = 901
-      Margins.Left = 5
+        ExplicitHeight = 19
-      Margins.Top = 5
-      Align = alTop
-      Caption = 'Par'#225'metros de consulta'
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -11
-      Font.Name = 'MS Sans Serif'
-      Font.Style = [fsBold]
-      ParentColor = True
-      ParentFont = False
-      Underline = True
       end
-    object pnlAgrupaciones: TTBXAlignmentPanel
+      inherited pnlAgrupaciones: TTBXAlignmentPanel
-      Left = 425
-      Top = 19
         Width = 476
-      Height = 109
+        ExplicitHeight = 41
-      Align = alClient
+        inherited TBXButton3: TTBXButton
-      AutoSize = True
-      TabOrder = 2
-      object TBXButton3: TTBXButton
-        Tag = 3
-        Left = 8
-        Top = 10
-        Width = 90
-        Height = 21
           Action = actRefrescar
-        AutoSize = False
-        Caption = 'Consultar'
-        ImageIndex = 0
-        TabOrder = 0
-        Wrapping = twEndEllipsis
         end
       end
     end
-  inherited EditorActionList: TActionList [6]
+    inherited dxComponentPrinter: TdxComponentPrinter
+      inherited dxComponentPrinterLink1: TdxGridReportLink
+        BuiltInReportLink = True
+      end
+    end
+  end
+  inherited EditorActionList: TActionList [5]
     inherited actNuevo: TAction
       Enabled = False
       Visible = False
@@ -258,7 +212,7 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
       OnUpdate = actAprobadoUpdate
     end
   end
-  inherited SmallImages: TPngImageList [7]
+  inherited SmallImages: TPngImageList [6]
     PngImages = <
       item
         PngImage.Data = {
@@ -838,7 +792,7 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
       end>
     Bitmap = {}
   end
-  inherited LargeImages: TPngImageList [8]
+  inherited LargeImages: TPngImageList [7]
     PngImages = <
       item
         PngImage.Data = {
@@ -1659,11 +1613,11 @@ inherited fEditorListaDevoluciones: TfEditorListaDevoluciones
       end>
     Bitmap = {}
   end
-  inherited JvFormStorage: TJvFormStorage [9]
+  inherited JvFormStorage: TJvFormStorage [8]
   end
-  inherited JvAppRegistryStorage: TJvAppRegistryStorage [10]
+  inherited JvAppRegistryStorage: TJvAppRegistryStorage [9]
   end
-  inherited dsDataTable: TDADataSource [11]
+  inherited dsDataTable: TDADataSource [10]
     Top = 136
   end
   inherited GridPopupMenu: TPopupMenu

Source/Modulos/Devoluciones/Cliente/uEditorListaDevoluciones.pas

@@ -43,11 +43,6 @@ type
     TBXItem37: TTBXItem;
     actAprobado: TAction;
     frViewListaDevoluciones1: TfrViewListaDevoluciones;
-    TBXDockablePanel1: TTBXDockablePanel;
-    frViewParametrosCentro1: TfrViewParametrosCentro;
-    TBXLabel1: TTBXLabel;
-    pnlAgrupaciones: TTBXAlignmentPanel;
-    TBXButton3: TTBXButton;
     procedure FormShow(Sender: TObject);
     procedure JvTabBar1TabSelected(Sender: TObject; Item: TJvTabBarItem);
     procedure actModificarExecute(Sender: TObject);
@@ -100,7 +95,7 @@ begin
   if Assigned(FItems) then
   begin
     dsDataTable.DataTable := FItems.DataTable;
-    frViewListaDevoluciones1.dsDataSource.DataTable := FItems.DataTable;
+    frViewListaDevoluciones1.Items := FItems;
   end;
 end;
 
@@ -113,45 +108,15 @@ begin
   if not Assigned(ViewGrid) then
     raise Exception.Create('No hay una vista asignada');
 
-  frViewParametrosCentro1.Refresh;
-
   with (ViewGrid as IViewListaDevoluciones) do
     VerPendientes;
 end;
 
-procedure TfEditorListaDevoluciones.JvTabBar1TabSelected(
+procedure TfEditorListaDevoluciones.JvTabBar1TabSelected(Sender: TObject; Item: TJvTabBarItem);
-  Sender: TObject; Item: TJvTabBarItem);
 begin
-  inherited;
+  if Items.DataTable.Active then
-  ShowHourglassCursor;
-
      Items.DataTable.Active := False;
-
+  frViewListaDevoluciones1.frViewParametrosCentro1.LimpiarSeleccion;
-  Application.ProcessMessages;
-  ViewGrid._FocusedView.BeginUpdate;
-  Application.ProcessMessages;
-  try
-    case Item.Index of
-      0     : begin
-                Items := dmDevoluciones.GetItems(tidPendiente);
-                (ViewGrid as IViewListaDevoluciones).VerPendientes;
-              end;
-
-      1     : begin
-                Items := dmDevoluciones.GetItems(tidAprobado);
-                (ViewGrid as IViewListaDevoluciones).VerAprobados;
-              end;
-
-      2     : begin
-                Items := dmDevoluciones.GetItems;
-                (ViewGrid as IViewListaDevoluciones).VerTodos;
-              end;
-    end;
-  finally
-    dsDataTable.DataTable := Items.DataTable;
-    ViewGrid._FocusedView.EndUpdate;
-    HideHourglassCursor;
-  end;
 end;
 
 procedure TfEditorListaDevoluciones.actModificarExecute(
@@ -216,58 +181,41 @@ begin
      not (ViewGrid._FocusedView.Controller.FocusedRow.Expandable))
 end;
 
-procedure TfEditorListaDevoluciones.actRefrescarExecute(
+procedure TfEditorListaDevoluciones.actRefrescarExecute(Sender: TObject);
-  Sender: TObject);
-var
-  ACentrosList : TStringList;
-  AWhere : String;
-  i : integer;
 begin
-  // BEGIN Adaptación a DA5
-  {case (ViewGrid as IViewListaDevoluciones).VistaActiva of
-    tdvaPendiente,
-    tdvaAprobado     : AWhere := ' and'
-    else
-      AWhere := '';
-  end;}
-  AWhere := '';
-  // END Adaptación a DA5
-
-  AWhere := AWhere + ' CENTRO in (';
-
-  Items.DataTable.Active := False;
-  ACentrosList := frViewParametrosCentro1.CentrosSeleccionados;
-
   ShowHourglassCursor;
+  Items.DataTable.Active := False;
+  Application.ProcessMessages;
+  ViewGrid._FocusedView.BeginUpdate;
+  Application.ProcessMessages;
   try
-    if ACentrosList.Count = 0 then
+    case JvTabBar1.SelectedTab.Index  of
-      ShowMessage('Debe seleccionar al menos un centro en los parámetros de la consulta.')
+      0     : begin
-    else begin
+                Items := dmDevoluciones.GetItems(tidPendiente);
-      with Items.DataTable.Where do
+                (ViewGrid as IViewListaDevoluciones).VerPendientes;
-      begin
-        Clear;
-        for i := 0 to ACentrosList.Count - 1 do
-        begin
-          if i > 0 then
-            AWhere := AWhere + ', ';
-          AWhere := AWhere + '''' + ACentrosList[i] + '''';
-        end;
-        AWhere := AWhere + ')';
-
-        AddText(AWhere);
-      end;
-      Items.DataTable.Active := True;
-    end;
-  finally
-    HideHourglassCursor;
-    FreeAndNIL(ACentrosList);
               end;
 
+      1     : begin
+                Items := dmDevoluciones.GetItems(tidAprobado);
+                (ViewGrid as IViewListaDevoluciones).VerAprobados;
+              end;
+
+      2     : begin
+                Items := dmDevoluciones.GetItems;
+                (ViewGrid as IViewListaDevoluciones).VerTodos;
+              end;
+    end;
+
+    frViewListaDevoluciones1.Refresh;
     inherited;
 
+  finally
+    ViewGrid._FocusedView.EndUpdate;
+    HideHourglassCursor;
     ViewGrid.ExpandirTodo;
     ViewGrid.GotoFirst;
   end;
+end;
 
 procedure TfEditorListaDevoluciones.actPendienteExecute(
   Sender: TObject);

Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.dfm

@@ -1,9 +1,14 @@
 inherited frViewListaDevoluciones: TfrViewListaDevoluciones
   Width = 466
   Height = 477
+  ExplicitWidth = 466
+  ExplicitHeight = 477
   inherited cxGrid: TcxGrid
+    Top = 60
     Width = 466
-    Height = 477
+    Height = 417
+    ExplicitWidth = 466
+    ExplicitHeight = 477
     inherited cxGridView: TcxGridDBTableView
       OnMouseDown = cxGridViewMouseDown
       FilterBox.Visible = fvNever
@@ -291,6 +296,82 @@ inherited frViewListaDevoluciones: TfrViewListaDevoluciones
       end
     end
   end
+  object TBXDockablePanel1: TTBXDockablePanel [1]
+    Left = 0
+    Top = 0
+    MaxClientHeight = 61
+    Align = alTop
+    Caption = 'TBXDockablePanel1'
+    DockedWidth = 32
+    DockedHeight = 32
+    FloatingWidth = 128
+    FloatingHeight = 60
+    SupportedDocks = [dkStandardDock, dkMultiDock]
+    TabOrder = 1
+    inline frViewParametrosCentro1: TfrViewParametrosCentro
+      Left = 0
+      Top = 19
+      Width = 425
+      Height = 41
+      Align = alLeft
+      TabOrder = 0
+      ReadOnly = False
+      ExplicitTop = 19
+      ExplicitWidth = 425
+      ExplicitHeight = 109
+      inherited dxLayoutControl1: TdxLayoutControl
+        Width = 425
+        ExplicitWidth = 425
+        inherited ccbCentro: TJvCheckedComboBox
+          Width = 392
+          ExplicitWidth = 392
+        end
+      end
+    end
+    object TBXLabel1: TTBXLabel
+      Left = 0
+      Top = 0
+      Width = 466
+      Height = 19
+      Margins.Left = 5
+      Margins.Top = 5
+      Align = alTop
+      Caption = 'Par'#225'metros de consulta'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'MS Sans Serif'
+      Font.Style = [fsBold]
+      ParentColor = True
+      ParentFont = False
+      Underline = True
+      ExplicitWidth = 128
+      ExplicitHeight = 32
+    end
+    object pnlAgrupaciones: TTBXAlignmentPanel
+      Left = 425
+      Top = 19
+      Width = 41
+      Height = 41
+      Align = alClient
+      AutoSize = True
+      TabOrder = 2
+      ExplicitWidth = 476
+      ExplicitHeight = 109
+      object TBXButton3: TTBXButton
+        Tag = 3
+        Left = 8
+        Top = 10
+        Width = 90
+        Height = 21
+        AutoSize = False
+        Caption = 'Consultar'
+        ImageIndex = 0
+        TabOrder = 0
+        Wrapping = twEndEllipsis
+      end
+    end
+  end
   inherited dsDataSource: TDADataSource
     Top = 120
   end

Source/Modulos/Devoluciones/Cliente/uViewListaDevoluciones.pas

@@ -20,7 +20,8 @@ uses
   dxPSFillPatterns, dxPSEdgePatterns, cxCalendar, cxTextEdit,
   cxCurrencyEdit, dxPSCore, uDADataTable, StdCtrls, cxGridBandedTableView,
   cxGridDBBandedTableView, cxImageComboBox, ImgList, PngImageList,
-  dxPScxCommon, dxPScxGridLnk, cxMemo;
+  dxPScxCommon, dxPScxGridLnk, cxMemo, TBXDkPanels, uCustomView, uViewBase,
+  uViewParametrosControlGrid, uViewParametrosCentro, TB2Dock, uDAInterfaces;
 
 type
   TvDevolucionesVistaActiva = (tdvaPendiente, tdvaAprobado, tdvaTodos);
@@ -33,6 +34,10 @@ type
 
     function GetVistaActiva : TvDevolucionesVistaActiva;
     property VistaActiva : TvDevolucionesVistaActiva read GetVistaActiva;
+
+    function GetItems: IBizDevoluciones;
+    procedure SetItems(const Value: IBizDevoluciones);
+    property Items: IBizDevoluciones read GetItems write SetItems;
   end;
 
   TfrViewListaDevoluciones = class(TfrViewGrid, IViewListaDevoluciones)
@@ -82,6 +87,11 @@ type
     cxStyleGroupInforme: TcxStyle;
     cxStyleHeaderInforme: TcxStyle;
     cxStyleSelectionInforme: TcxStyle;
+    TBXDockablePanel1: TTBXDockablePanel;
+    frViewParametrosCentro1: TfrViewParametrosCentro;
+    TBXLabel1: TTBXLabel;
+    pnlAgrupaciones: TTBXAlignmentPanel;
+    TBXButton3: TTBXButton;
     procedure cxGridViewMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
     procedure cxGridBandedViewRR38GetDisplayText(
@@ -151,11 +161,18 @@ type
       ARecord: TcxCustomGridRecord; AColumn: TcxGridColumn;
       AnItem: TAbstractdxReportCellData);
   protected
+    FItems: IBizDevoluciones;
     FTipo : String;
     FNivelFiltrado : TcxFilterCriteriaItemList;
     procedure FilterChanged(Sender: TObject); override;
     function GetVistaActiva : TvDevolucionesVistaActiva;
+    function GetItems: IBizDevoluciones;
+    procedure SetItems(const Value: IBizDevoluciones);
+
   public
+    property Items: IBizDevoluciones read GetItems write SetItems;
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
     procedure Preview; override;
     procedure Print; override;
     procedure PrintSetup; override;
@@ -163,6 +180,7 @@ type
     procedure VerAprobados;
     procedure VerTodos;
     property VistaActiva : TvDevolucionesVistaActiva read GetVistaActiva;
+    procedure Refresh;
   end;
 
 
@@ -448,6 +466,13 @@ begin
     FOnDblClick(Sender);
 end;
 
+constructor TfrViewListaDevoluciones.Create(AOwner: TComponent);
+begin
+  inherited;
+  FItems := Nil;
+  frViewParametrosCentro1.Refresh;
+end;
+
 procedure TfrViewListaDevoluciones.cxGridBandedViewCODIGOGetDataText(
   Sender: TcxCustomGridTableItem; ARecordIndex: Integer;
   var AText: String);
@@ -479,6 +504,12 @@ begin
     AStyle := cxStyle1;
 end;
 
+destructor TfrViewListaDevoluciones.Destroy;
+begin
+  FItems := Nil;
+  inherited;
+end;
+
 procedure TfrViewListaDevoluciones.Preview;
 begin
   inherited;
@@ -497,6 +528,64 @@ begin
   dxComponentPrinterLink1.PageSetup
 end;
 
+procedure TfrViewListaDevoluciones.Refresh;
+var
+  ACentrosList : TStringList;
+  AWhereCentro : String;
+  AWhere : String;
+  i : integer;
+begin
+  ACentrosList := Nil;
+
+  if Assigned(FItems) then
+     Items.DataTable.Active := False;
+  ACentrosList := frViewParametrosCentro1.CentrosSeleccionados;
+
+  ShowHourglassCursor;
+  try
+    if Assigned(ACentrosList) then
+    begin
+       AWhereCentro := '';
+       if ACentrosList.Count = 0 then
+       begin
+          ShowMessage('Debe seleccionar al menos un centro en los parámetros de la consulta.');
+          Exit;
+       end
+       else begin
+          AWhereCentro := AWhereCentro + ' FILIAL in (';
+          for i := 0 to ACentrosList.Count - 1 do
+          begin
+            if i > 0 then
+              AWhereCentro := AWhereCentro + ', ';
+            AWhereCentro := AWhereCentro + '''' + ACentrosList[i] + '''';
+          end;
+          AWhereCentro := AWhereCentro + ')';
+        end;
+    end;
+
+    AWhere := '';
+    if AWhereCentro <> '' then
+    begin
+       AWhere := AWhere + AWhereCentro;
+    end;
+
+    Items.DataTable.Where.Clear;
+    Items.DataTable.Where.AddText(AWhere, False);
+    Items.DataTable.Active := True;
+
+  finally
+    HideHourglassCursor;
+    FreeAndNIL(ACentrosList);
+  end;
+end;
+
+procedure TfrViewListaDevoluciones.SetItems(const Value: IBizDevoluciones);
+begin
+  FItems := Value;
+  if Assigned(FItems) then
+     dsDataSource.DataTable := FItems.DataTable;
+end;
+
 procedure TfrViewListaDevoluciones.cxGridViewCODIGOGetDataText(
   Sender: TcxCustomGridTableItem; ARecordIndex: Integer;
   var AText: String);
@@ -595,6 +684,11 @@ begin
   cxGridView.DataController.Filter.EndUpdate;
 end;
 
+function TfrViewListaDevoluciones.GetItems: IBizDevoluciones;
+begin
+  Result := FItems;
+end;
+
 function TfrViewListaDevoluciones.GetVistaActiva: TvDevolucionesVistaActiva;
 begin
   if FTipo = 'N' then

Source/Modulos/Parametros/Cliente/uViewParametrosCentro.pas

@@ -14,6 +14,8 @@ type
 
     function GetCentrosSeleccionados: TStringList;
     property CentrosSeleccionados : TStringList read GetCentrosSeleccionados;
+    function GetCodigoCentrosSeleccionados: TStringList;
+    property CodigoCentrosSeleccionados : TStringList read GetCodigoCentrosSeleccionados;
   end;
 
   TfrViewParametrosCentro = class(TfrViewParametrosControlGrid, IViewParametrosCentro)
@@ -25,10 +27,13 @@ type
     FCentros : IBizCentros;
     procedure RellenarListaCentros;
     function GetCentrosSeleccionados: TStringList;
+    function GetCodigoCentrosSeleccionados: TStringList;
   public
     procedure Execute; override;
     procedure Refresh; override;
     property CentrosSeleccionados : TStringList read GetCentrosSeleccionados;
+    property CodigoCentrosSeleccionados : TStringList read GetCodigoCentrosSeleccionados;
+    procedure LimpiarSeleccion;
   end;
 
 implementation
@@ -55,12 +60,34 @@ begin
   for i := 0 to ccbCentro.Items.Count - 1 do
   begin
     if ccbCentro.Checked[i] then
-//      Result.Add(FCentros.CODBARRA);
       Result.Add(FCentros.FILIAL);
     FCentros.DataTable.Next;
   end;
 end;
 
+function TfrViewParametrosCentro.GetCodigoCentrosSeleccionados: TStringList;
+var
+  i : integer;
+begin
+  Result := TStringList.Create;
+
+  FCentros.DataTable.First;
+  for i := 0 to ccbCentro.Items.Count - 1 do
+  begin
+    if ccbCentro.Checked[i] then
+      Result.Add(FCentros.CODBARRA);
+    FCentros.DataTable.Next;
+  end;
+end;
+
+procedure TfrViewParametrosCentro.LimpiarSeleccion;
+var
+  i : integer;
+begin
+  for i := 0 to ccbCentro.Items.Count - 1 do
+      ccbCentro.Checked[i] := False;
+end;
+
 procedure TfrViewParametrosCentro.Refresh;
 begin
   // inherited; <- no descomentar

Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.dfm

@@ -61,7 +61,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
   end
   object JvTabBar1: TJvTabBar [3]
     Left = 0
-    Top = 137
+    Top = 76
     Width = 816
     Height = 29
     Cursor = crHandPoint
@@ -82,13 +82,12 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
         Caption = 'Todos'
       end>
     OnTabSelected = JvTabBar1TabSelected
-    ExplicitTop = 204
   end
   inline frViewListaRecepciones1: TfrViewListaRecepciones [4]
     Left = 0
-    Top = 166
+    Top = 105
     Width = 816
-    Height = 479
+    Height = 540
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -98,14 +97,16 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
     ParentFont = False
     TabOrder = 4
     ReadOnly = False
-    ExplicitTop = 233
+    ExplicitTop = 105
     ExplicitWidth = 816
-    ExplicitHeight = 412
+    ExplicitHeight = 540
     inherited cxGrid: TcxGrid
+      Top = 60
       Width = 816
-      Height = 479
+      Height = 480
+      ExplicitTop = 60
       ExplicitWidth = 816
-      ExplicitHeight = 412
+      ExplicitHeight = 480
       inherited cxGridView: TcxGridDBTableView
         PopupMenu = GridPopupMenu
         DataController.Summary.DefaultGroupSummaryItems = <
@@ -125,86 +126,36 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
         end
       end
     end
+    inherited TBXDockablePanel1: TTBXDockablePanel
+      DockedWidth = 32
+      DockedHeight = 32
+      FloatingHeight = 60
+      ExplicitWidth = 816
+      ExplicitHeight = 60
+      inherited frViewParametrosCentro1: TfrViewParametrosCentro
+        Height = 41
+        ExplicitHeight = 41
+      end
+      inherited TBXLabel1: TTBXLabel
+        Width = 816
+        ExplicitWidth = 816
+      end
+      inherited pnlAgrupaciones: TTBXAlignmentPanel
+        Width = 391
+        Height = 41
+        ExplicitHeight = 41
+        inherited TBXButton3: TTBXButton
+          Action = actRefrescar
+        end
+      end
+    end
     inherited dxComponentPrinter: TdxComponentPrinter
       inherited dxComponentPrinterLink1: TdxGridReportLink
         BuiltInReportLink = True
       end
     end
   end
-  object TBXDockablePanel1: TTBXDockablePanel [5]
+  inherited EditorActionList: TActionList [5]
-    Left = 0
-    Top = 76
-    MaxClientHeight = 61
-    Align = alTop
-    Caption = 'TBXDockablePanel1'
-    FloatingWidth = 128
-    FloatingHeight = 128
-    SupportedDocks = [dkStandardDock, dkMultiDock]
-    TabOrder = 5
-    inline frViewParametrosCentro1: TfrViewParametrosCentro
-      Left = 0
-      Top = 19
-      Width = 425
-      Height = 109
-      Align = alLeft
-      TabOrder = 0
-      ReadOnly = False
-      ExplicitTop = 19
-      ExplicitWidth = 425
-      ExplicitHeight = 109
-      inherited dxLayoutControl1: TdxLayoutControl
-        Width = 425
-        ExplicitWidth = 425
-        inherited ccbCentro: TJvCheckedComboBox
-          Width = 363
-          ExplicitWidth = 363
-        end
-      end
-    end
-    object TBXLabel1: TTBXLabel
-      Left = 0
-      Top = 0
-      Width = 816
-      Height = 19
-      Margins.Left = 5
-      Margins.Top = 5
-      Align = alTop
-      Caption = 'Par'#225'metros de consulta'
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -11
-      Font.Name = 'MS Sans Serif'
-      Font.Style = [fsBold]
-      ParentColor = True
-      ParentFont = False
-      Underline = True
-    end
-    object pnlAgrupaciones: TTBXAlignmentPanel
-      Left = 425
-      Top = 19
-      Width = 391
-      Height = 109
-      Align = alClient
-      AutoSize = True
-      TabOrder = 2
-      ExplicitLeft = 421
-      ExplicitTop = 25
-      object TBXButton3: TTBXButton
-        Tag = 3
-        Left = 8
-        Top = 10
-        Width = 90
-        Height = 21
-        Action = actRefrescar
-        AutoSize = False
-        Caption = 'Consultar'
-        ImageIndex = 0
-        TabOrder = 0
-        Wrapping = twEndEllipsis
-      end
-    end
-  end
-  inherited EditorActionList: TActionList [6]
     inherited actNuevo: TAction
       Enabled = False
       Visible = False
@@ -261,7 +212,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
       OnUpdate = actAprobadoUpdate
     end
   end
-  inherited SmallImages: TPngImageList [7]
+  inherited SmallImages: TPngImageList [6]
     PngImages = <
       item
         PngImage.Data = {
@@ -842,7 +793,7 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
     Left = 331
     Bitmap = {}
   end
-  inherited LargeImages: TPngImageList [8]
+  inherited LargeImages: TPngImageList [7]
     PngImages = <
       item
         PngImage.Data = {
@@ -1665,15 +1616,15 @@ inherited fEditorListaRecepciones: TfEditorListaRecepciones
     Top = 88
     Bitmap = {}
   end
-  inherited JvFormStorage: TJvFormStorage [9]
+  inherited JvFormStorage: TJvFormStorage [8]
     Left = 416
     Top = 224
   end
-  inherited JvAppRegistryStorage: TJvAppRegistryStorage [10]
+  inherited JvAppRegistryStorage: TJvAppRegistryStorage [9]
     Left = 368
     Top = 168
   end
-  inherited dsDataTable: TDADataSource [11]
+  inherited dsDataTable: TDADataSource [10]
     Top = 136
   end
   inherited GridPopupMenu: TPopupMenu

Source/Modulos/Recepciones/Cliente/uEditorListaRecepciones.pas

@@ -28,8 +28,7 @@ type
     ['{5CF9C341-A9BB-4A42-A132-0145827FBD9C}']
     function GetItems: IBizRecepciones;
     procedure SetItems(const Value: IBizRecepciones);
-    property Items: IBizRecepciones read GetItems
+    property Items: IBizRecepciones read GetItems write SetItems;
-            write SetItems;
   end;
 
   TfEditorListaRecepciones = class(TfEditorGridBase, IEditorListaRecepciones)
@@ -45,11 +44,6 @@ type
     TBXItem37: TTBXItem;
     actAprobado: TAction;
     frViewListaRecepciones1: TfrViewListaRecepciones;
-    TBXDockablePanel1: TTBXDockablePanel;
-    frViewParametrosCentro1: TfrViewParametrosCentro;
-    TBXLabel1: TTBXLabel;
-    pnlAgrupaciones: TTBXAlignmentPanel;
-    TBXButton3: TTBXButton;
     procedure FormShow(Sender: TObject);
     procedure JvTabBar1TabSelected(Sender: TObject; Item: TJvTabBarItem);
     procedure actModificarExecute(Sender: TObject);
@@ -103,7 +97,7 @@ begin
   if Assigned(FItems) then
   begin
     dsDataTable.DataTable := FItems.DataTable;
-    frViewListaRecepciones1.dsDataSource.DataTable := FItems.DataTable;
+    frViewListaRecepciones1.Items := FItems;
   end;
 end;
 
@@ -118,44 +112,15 @@ begin
 
   //FItems.DataTable.Active := True;
 
-  frViewParametrosCentro1.Refresh;
   with (ViewGrid as IViewListaRecepciones) do
     VerPendientes;
 end;
 
-procedure TfEditorListaRecepciones.JvTabBar1TabSelected(
+procedure TfEditorListaRecepciones.JvTabBar1TabSelected(Sender: TObject; Item: TJvTabBarItem);
-  Sender: TObject; Item: TJvTabBarItem);
 begin
-  inherited;
+  if Items.DataTable.Active then
-  ShowHourglassCursor;
-
      Items.DataTable.Active := False;
-
+  frViewListaRecepciones1.frViewParametrosCentro1.LimpiarSeleccion;
-  Application.ProcessMessages;
-  ViewGrid._FocusedView.BeginUpdate;
-  Application.ProcessMessages;
-  try
-    case Item.Index of
-      0     : begin
-                Items := dmRecepciones.GetItems(tirPendiente);
-                (ViewGrid as IViewListaRecepciones).VerPendientes;
-              end;
-
-      1     : begin
-                Items := dmRecepciones.GetItems(tirAprobado);
-                (ViewGrid as IViewListaRecepciones).VerAprobados;
-              end;
-
-      2     : begin
-                Items := dmRecepciones.GetItems;
-                (ViewGrid as IViewListaRecepciones).VerTodos;
-              end;
-    end;
-  finally
-    dsDataTable.DataTable := Items.DataTable;
-    ViewGrid._FocusedView.EndUpdate;
-    HideHourglassCursor;
-  end;
 end;
 
 procedure TfEditorListaRecepciones.actModificarExecute(
@@ -220,56 +185,40 @@ begin
      not (ViewGrid._FocusedView.Controller.FocusedRow.Expandable))
 end;
 
-procedure TfEditorListaRecepciones.actRefrescarExecute(
+procedure TfEditorListaRecepciones.actRefrescarExecute(Sender: TObject);
-  Sender: TObject);
-var
-  ACentrosList : TStringList;
-  AWhere : String;
-  i : integer;
 begin
-  AWhere := '';
-
-  {case (ViewGrid as IViewListaRecepciones).VistaActiva of
-    trvaPendiente,
-    trvaAprobado     : AWhere := ' and'
-    else
-      AWhere := '';
-  end;}
-
-  AWhere := AWhere + ' CENTRO in (';
-
-  Items.DataTable.Active := False;
-  ACentrosList := frViewParametrosCentro1.CentrosSeleccionados;
-
   ShowHourglassCursor;
+  Items.DataTable.Active := False;
+  Application.ProcessMessages;
+  ViewGrid._FocusedView.BeginUpdate;
+  Application.ProcessMessages;
   try
-    if ACentrosList.Count = 0 then
+    case JvTabBar1.SelectedTab.Index of
-      ShowMessage('Debe seleccionar al menos un centro en los parámetros de la consulta.')
+      0     : begin
-    else begin
+                Items := dmRecepciones.GetItems(tirPendiente);
-      with Items.DataTable.Where do
+                (ViewGrid as IViewListaRecepciones).VerPendientes;
-      begin
-        Clear;
-        for i := 0 to ACentrosList.Count - 1 do
-        begin
-          if i > 0 then
-            AWhere := AWhere + ', ';
-          AWhere := AWhere + '''' + ACentrosList[i] + '''';
-        end;
-        AWhere := AWhere + ')';
-        AddText(AWhere, False);
-      end;
-      Items.DataTable.Active := True;
-    end;
-  finally
-    HideHourglassCursor;
-    FreeAndNIL(ACentrosList);
               end;
 
+      1     : begin
+                Items := dmRecepciones.GetItems(tirAprobado);
+                (ViewGrid as IViewListaRecepciones).VerAprobados;
+              end;
+
+      2     : begin
+                Items := dmRecepciones.GetItems;
+                (ViewGrid as IViewListaRecepciones).VerTodos;
+              end;
+    end;
+
+    frViewListaRecepciones1.Refresh;
     inherited;
-  
+  finally
+    ViewGrid._FocusedView.EndUpdate;
+    HideHourglassCursor;
     ViewGrid.ExpandirTodo;
     ViewGrid.GotoFirst;
   end;
+end;
 
 procedure TfEditorListaRecepciones.actPendienteExecute(
   Sender: TObject);
@@ -339,8 +288,8 @@ begin
     finally
       FItems.DataTable.FreeBookMark(BM);
       //FItems.DataTable.EnableControls; <- No descomentar
-      ViewGrid._FocusedView.EndUpdate;
       ViewGrid._FocusedView.Controller.ClearSelection;
+      ViewGrid._FocusedView.EndUpdate;
       PostMessage(Handle, CM_SETFOCUSEDRECORD, Integer(ViewGrid._FocusedView),
         MakeLParam(ViewGrid._FocusedView.Controller.FocusedRowIndex,
         ViewGrid._FocusedView.Controller.TopRowIndex));

Source/Modulos/Recepciones/Cliente/uEditorListaRecepcionesAlbaran.dfm

@@ -1,21 +1,27 @@
 inherited fEditorListaRecepcionesAlbaran: TfEditorListaRecepcionesAlbaran
   Left = 286
   Top = 168
-  Width = 850
-  Height = 671
   Caption = 'Control de '#225'lbaranes'
+  ClientHeight = 637
+  ClientWidth = 842
+  ExplicitWidth = 850
+  ExplicitHeight = 671
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
     Width = 842
     Caption = 'Control de albaranes'
+    ExplicitWidth = 842
     inherited Image1: TImage
       Left = 815
+      ExplicitLeft = 815
     end
   end
   inherited TBXDock: TTBXDock
     Width = 842
+    ExplicitWidth = 842
     inherited tbxMain: TTBXToolbar
+      ExplicitWidth = 344
       object TBXSeparatorItem16: TTBXSeparatorItem [7]
       end
       object tbxiExpandir: TTBXItem [15]
@@ -29,14 +35,20 @@ inherited fEditorListaRecepcionesAlbaran: TfEditorListaRecepcionesAlbaran
         DisplayMode = nbdmImageAndText
       end
     end
+    inherited tbxMenu: TTBXToolbar
+      ExplicitWidth = 842
+    end
     inherited tbxFiltro: TTBXToolbar
       Left = 344
       DockPos = 344
+      ExplicitLeft = 344
     end
   end
   inherited StatusBar: TStatusBar
     Top = 618
     Width = 842
+    ExplicitTop = 618
+    ExplicitWidth = 842
   end
   object JvTabBar1: TJvTabBar [3]
     Left = 0
@@ -76,9 +88,15 @@ inherited fEditorListaRecepcionesAlbaran: TfEditorListaRecepcionesAlbaran
     ParentFont = False
     TabOrder = 4
     ReadOnly = False
+    ExplicitTop = 105
+    ExplicitWidth = 842
+    ExplicitHeight = 513
     inherited cxGrid: TcxGrid
       Width = 842
-      Height = 513
+      Height = 453
+      ExplicitTop = 60
+      ExplicitWidth = 842
+      ExplicitHeight = 453
       inherited cxGridView: TcxGridDBTableView
         inherited cxGridViewESTADOPRODUCTO: TcxGridDBColumn
           Caption = 'Situaci'#243'n'
@@ -94,6 +112,31 @@ inherited fEditorListaRecepcionesAlbaran: TfEditorListaRecepcionesAlbaran
         end
       end
     end
+    inherited TBXDockablePanel1: TTBXDockablePanel
+      ExplicitWidth = 842
+      inherited frViewParametrosCentro1: TfrViewParametrosCentro
+        ExplicitHeight = 41
+        inherited dxLayoutControl1: TdxLayoutControl
+          inherited ccbCentro: TJvCheckedComboBox
+            Width = 392
+            ExplicitWidth = 392
+          end
+        end
+      end
+      inherited TBXLabel1: TTBXLabel
+        Width = 842
+        ExplicitWidth = 842
+        ExplicitHeight = 19
+      end
+      inherited pnlAgrupaciones: TTBXAlignmentPanel
+        Width = 417
+        ExplicitWidth = 417
+        ExplicitHeight = 41
+        inherited TBXButton3: TTBXButton
+          Action = actRefrescar
+        end
+      end
+    end
     inherited dxComponentPrinter: TdxComponentPrinter
       inherited dxComponentPrinterLink1: TdxGridReportLink
         BuiltInReportLink = True

Source/Modulos/Recepciones/Cliente/uEditorListaRecepcionesAlbaran.pas

@@ -17,7 +17,7 @@ uses
   JvAppRegistryStorage, JvComponentBase, JvFormPlacement, ImgList, PngImageList,
   StdActns, ActnList, ComCtrls, TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock,
   TB2Toolbar, ExtCtrls, JvExControls, JvComponent, JvNavigationPane, StdCtrls,
-  uViewListaRecepcionesAlbaran;
+  uViewListaRecepcionesAlbaran, uDAInterfaces;
 
 
 type
@@ -77,10 +77,8 @@ begin
     ShowHourglassCursor;
     try
       dsDataTable.DataTable := FItems.DataTable;
-      frViewListaRecepcionesAlbaran1.dsDataSource.DataTable := FItems.DataTable;
+      frViewListaRecepcionesAlbaran1.Items := FItems;
 
-      if not FItems.DataTable.Active then
-         FItems.DataTable.Active := True;
     finally
       HideHourglassCursor;
     end;
@@ -104,41 +102,12 @@ begin
   end;
 end;
 
-procedure TfEditorListaRecepcionesAlbaran.JvTabBar1TabSelected(
+procedure TfEditorListaRecepcionesAlbaran.JvTabBar1TabSelected(Sender: TObject; Item: TJvTabBarItem);
-  Sender: TObject; Item: TJvTabBarItem);
 begin
   inherited;
-  ShowHourglassCursor;
+  if Items.DataTable.Active then
      Items.DataTable.Active := False;
-  Application.ProcessMessages;
+  frViewListaRecepcionesAlbaran1.frViewParametrosCentro1.LimpiarSeleccion;
-  ViewGrid._FocusedView.BeginUpdate;
-  Application.ProcessMessages;
-  try
-    case Item.Index of
-      0     : begin
-                Items := dmRecepciones.GetItemsAlbaran(tiraPendiente);
-              end;
-
-      1     : begin
-                Items := dmRecepciones.GetItemsAlbaran(tiraRecibido);
-              end;
-
-      2     : begin
-                Items := dmRecepciones.GetItemsAlbaran;
-              end;
-    end;
-  finally
-    dsDataTable.DataTable := Items.DataTable;
-    with (ViewGrid as IViewListaRecepcionesAlbaran) do
-    begin
-      ExpandirTodo;
-      AjustarAncho;
-      ContraerTodo;
-      _FocusedView.EndUpdate;
-      GotoFirst;
-    end;
-    HideHourglassCursor;
-  end;
 end;
 
 procedure TfEditorListaRecepcionesAlbaran.actExpandirExecute(
@@ -173,12 +142,41 @@ begin
     (Sender as TAction).Enabled := False;
 end;
 
-procedure TfEditorListaRecepcionesAlbaran.actRefrescarExecute(
+procedure TfEditorListaRecepcionesAlbaran.actRefrescarExecute(Sender: TObject);
-  Sender: TObject);
 begin
+  ShowHourglassCursor;
+  Items.DataTable.Active := False;
+  Application.ProcessMessages;
+  ViewGrid._FocusedView.BeginUpdate;
+  Application.ProcessMessages;
+  try
+    case JvTabBar1.SelectedTab.Index of
+      0     : begin
+                Items := dmRecepciones.GetItemsAlbaran(tiraPendiente);
+              end;
+
+      1     : begin
+                Items := dmRecepciones.GetItemsAlbaran(tiraRecibido);
+              end;
+
+      2     : begin
+                Items := dmRecepciones.GetItemsAlbaran;
+              end;
+    end;
+
+    frViewListaRecepcionesAlbaran1.Refresh;
     inherited;
-  ViewGrid.ContraerTodo;
+  finally
-  ViewGrid.GotoFirst;
+    with (ViewGrid as IViewListaRecepcionesAlbaran) do
+    begin
+      ExpandirTodo;
+      AjustarAncho;
+      ContraerTodo;
+      _FocusedView.EndUpdate;
+      GotoFirst;
+    end;
+    HideHourglassCursor;
+  end;
 end;
 
 end.

Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.dfm

@@ -4,8 +4,9 @@ inherited frViewListaRecepciones: TfrViewListaRecepciones
   ExplicitWidth = 695
   ExplicitHeight = 477
   inherited cxGrid: TcxGrid
+    Top = 61
     Width = 695
-    Height = 477
+    Height = 416
     ExplicitWidth = 695
     ExplicitHeight = 477
     inherited cxGridView: TcxGridDBTableView
@@ -328,6 +329,83 @@ inherited frViewListaRecepciones: TfrViewListaRecepciones
       end
     end
   end
+  object TBXDockablePanel1: TTBXDockablePanel [1]
+    Left = 0
+    Top = 0
+    MaxClientHeight = 61
+    Align = alTop
+    Caption = 'TBXDockablePanel1'
+    FloatingWidth = 128
+    FloatingHeight = 128
+    SupportedDocks = [dkStandardDock, dkMultiDock]
+    TabOrder = 1
+    ExplicitTop = 76
+    ExplicitWidth = 128
+    ExplicitHeight = 128
+    inline frViewParametrosCentro1: TfrViewParametrosCentro
+      Left = 0
+      Top = 19
+      Width = 425
+      Height = 42
+      Align = alLeft
+      TabOrder = 0
+      ReadOnly = False
+      ExplicitTop = 19
+      ExplicitWidth = 425
+      ExplicitHeight = 109
+      inherited dxLayoutControl1: TdxLayoutControl
+        Width = 425
+        ExplicitWidth = 425
+        inherited ccbCentro: TJvCheckedComboBox
+          Width = 392
+          ExplicitWidth = 392
+        end
+      end
+    end
+    object TBXLabel1: TTBXLabel
+      Left = 0
+      Top = 0
+      Width = 695
+      Height = 19
+      Margins.Left = 5
+      Margins.Top = 5
+      Align = alTop
+      Caption = 'Par'#225'metros de consulta'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'MS Sans Serif'
+      Font.Style = [fsBold]
+      ParentColor = True
+      ParentFont = False
+      Underline = True
+      ExplicitWidth = 128
+      ExplicitHeight = 32
+    end
+    object pnlAgrupaciones: TTBXAlignmentPanel
+      Left = 425
+      Top = 19
+      Width = 270
+      Height = 42
+      Align = alClient
+      AutoSize = True
+      TabOrder = 2
+      ExplicitWidth = 391
+      ExplicitHeight = 109
+      object TBXButton3: TTBXButton
+        Tag = 3
+        Left = 8
+        Top = 10
+        Width = 90
+        Height = 21
+        AutoSize = False
+        Caption = 'Consultar'
+        ImageIndex = 0
+        TabOrder = 0
+        Wrapping = twEndEllipsis
+      end
+    end
+  end
   inherited dsDataSource: TDADataSource
     Top = 120
   end

Source/Modulos/Recepciones/Cliente/uViewListaRecepciones.pas

@@ -20,7 +20,8 @@ uses
   dxPSFillPatterns, dxPSEdgePatterns, cxCalendar, cxTextEdit,
   cxCurrencyEdit, dxPSCore, uDADataTable, StdCtrls, cxGridBandedTableView,
   cxGridDBBandedTableView, cxImageComboBox, ImgList, PngImageList,
-  dxPScxCommon, dxPScxGridLnk, cxMemo, uDAInterfaces;
+  dxPScxCommon, dxPScxGridLnk, cxMemo, uDAInterfaces, TBXDkPanels, uCustomView,
+  uViewBase, uViewParametrosControlGrid, uViewParametrosCentro, TB2Dock;
 
 type
   TvRecepcionVistaActiva = (trvaPendiente, trvaAprobado, trvaTodos);
@@ -33,6 +34,10 @@ type
 
     function GetVistaActiva : TvRecepcionVistaActiva;
     property VistaActiva : TvRecepcionVistaActiva read GetVistaActiva;
+
+    function GetItems: IBizRecepciones;
+    procedure SetItems(const Value: IBizRecepciones);
+    property Items: IBizRecepciones read GetItems write SetItems;
   end;
 
   TfrViewListaRecepciones = class(TfrViewGrid, IViewListaRecepciones)
@@ -83,6 +88,11 @@ type
     cxStyleHeaderInforme: TcxStyle;
     cxStyleSelectionInforme: TcxStyle;
     cxGridViewColumnOBSERVACIONES: TcxGridDBColumn;
+    TBXDockablePanel1: TTBXDockablePanel;
+    frViewParametrosCentro1: TfrViewParametrosCentro;
+    TBXLabel1: TTBXLabel;
+    pnlAgrupaciones: TTBXAlignmentPanel;
+    TBXButton3: TTBXButton;
     procedure cxGridViewMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
     procedure cxGridBandedViewRR38GetDisplayText(
@@ -150,18 +160,27 @@ type
       ARecord: TcxCustomGridRecord; AColumn: TcxGridColumn;
       AnItem: TAbstractdxReportCellData);
   protected
+    FItems : IBizRecepciones;
     FTipo : String;
     FNivelFiltrado : TcxFilterCriteriaItemList;
     procedure FilterChanged(Sender: TObject); override;
     function GetVistaActiva : TvRecepcionVistaActiva;
+    function GetItems: IBizRecepciones;
+    procedure SetItems(const Value: IBizRecepciones);
+
   public
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
+
+    property Items: IBizRecepciones read GetItems write SetItems;
+    property VistaActiva : TvRecepcionVistaActiva read GetVistaActiva;
+    procedure Refresh;
     procedure Preview; override;
     procedure Print; override;
     procedure PrintSetup; override;
     procedure VerPendientes;
     procedure VerAprobados;
     procedure VerTodos;
-    property VistaActiva : TvRecepcionVistaActiva read GetVistaActiva;
   end;
 
 
@@ -211,6 +230,12 @@ begin
   end;
 end;
 
+destructor TfrViewListaRecepciones.Destroy;
+begin
+  FItems := Nil;
+  inherited;
+end;
+
 procedure TfrViewListaRecepciones.VerAprobados;
 begin
   FTipo := 'S';
@@ -233,6 +258,13 @@ begin
   cxGridBandedViewAPROBADO.Visible := True;
 end;
 
+constructor TfrViewListaRecepciones.Create(AOwner: TComponent);
+begin
+  inherited;
+  FItems := Nil;
+  frViewParametrosCentro1.Refresh;
+end;
+
 procedure TfrViewListaRecepciones.cxGridBandedViewALBARANGetDisplayText(
   Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
   var AText: String);
@@ -497,6 +529,64 @@ begin
   dxComponentPrinterLink1.PageSetup;
 end;
 
+procedure TfrViewListaRecepciones.Refresh;
+var
+  ACentrosList : TStringList;
+  AWhereCentro : String;
+  AWhere : String;
+  i : integer;
+begin
+  ACentrosList := Nil;
+
+  if Assigned(FItems) then
+     Items.DataTable.Active := False;
+  ACentrosList := frViewParametrosCentro1.CentrosSeleccionados;
+
+  ShowHourglassCursor;
+  try
+    if Assigned(ACentrosList) then
+    begin
+       AWhereCentro := '';
+       if ACentrosList.Count = 0 then
+       begin
+          ShowMessage('Debe seleccionar al menos un centro en los parámetros de la consulta.');
+          Exit;
+       end
+       else begin
+          AWhereCentro := AWhereCentro + ' FILIAL in (';
+          for i := 0 to ACentrosList.Count - 1 do
+          begin
+            if i > 0 then
+              AWhereCentro := AWhereCentro + ', ';
+            AWhereCentro := AWhereCentro + '''' + ACentrosList[i] + '''';
+          end;
+          AWhereCentro := AWhereCentro + ')';
+        end;
+    end;
+
+    AWhere := '';
+    if AWhereCentro <> '' then
+    begin
+       AWhere := AWhere + AWhereCentro;
+    end;
+
+    Items.DataTable.Where.Clear;
+    Items.DataTable.Where.AddText(AWhere, False);
+    Items.DataTable.Active := True;
+
+  finally
+    HideHourglassCursor;
+    FreeAndNIL(ACentrosList);
+  end;
+end;
+
+procedure TfrViewListaRecepciones.SetItems(const Value: IBizRecepciones);
+begin
+  FItems := Value;
+  if Assigned(FItems) then
+     dsDataSource.DataTable := FItems.DataTable;
+end;
+
 procedure TfrViewListaRecepciones.cxGridBandedViewCODIGOGetDisplayText(
   Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
   var AText: String);
@@ -582,6 +672,11 @@ begin
   cxGridView.DataController.Filter.EndUpdate;
 end;
 
+function TfrViewListaRecepciones.GetItems: IBizRecepciones;
+begin
+  Result := FItems;
+end;
+
 function TfrViewListaRecepciones.GetVistaActiva: TvRecepcionVistaActiva;
 begin
   if FTipo = 'N' then

Source/Modulos/Recepciones/Cliente/uViewListaRecepcionesAlbaran.dfm

@@ -1,9 +1,14 @@
 inherited frViewListaRecepcionesAlbaran: TfrViewListaRecepcionesAlbaran
   Width = 695
   Height = 477
+  ExplicitWidth = 695
+  ExplicitHeight = 477
   inherited cxGrid: TcxGrid
+    Top = 60
     Width = 695
-    Height = 477
+    Height = 417
+    ExplicitWidth = 695
+    ExplicitHeight = 477
     inherited cxGridView: TcxGridDBTableView
       FilterBox.Visible = fvNever
       DataController.KeyFieldNames = 'Albaran;Codigo;Color'
@@ -77,6 +82,81 @@ inherited frViewListaRecepcionesAlbaran: TfrViewListaRecepcionesAlbaran
       end
     end
   end
+  object TBXDockablePanel1: TTBXDockablePanel [1]
+    Left = 0
+    Top = 0
+    MaxClientHeight = 61
+    Align = alTop
+    Caption = 'TBXDockablePanel1'
+    DockedWidth = 32
+    DockedHeight = 32
+    FloatingWidth = 128
+    FloatingHeight = 60
+    SupportedDocks = [dkStandardDock, dkMultiDock]
+    TabOrder = 1
+    inline frViewParametrosCentro1: TfrViewParametrosCentro
+      Left = 0
+      Top = 19
+      Width = 425
+      Height = 41
+      Align = alLeft
+      TabOrder = 0
+      ReadOnly = False
+      ExplicitTop = 19
+      ExplicitWidth = 425
+      ExplicitHeight = 109
+      inherited dxLayoutControl1: TdxLayoutControl
+        Width = 425
+        ExplicitWidth = 425
+        inherited ccbCentro: TJvCheckedComboBox
+          Width = 392
+          ExplicitWidth = 392
+        end
+      end
+    end
+    object TBXLabel1: TTBXLabel
+      Left = 0
+      Top = 0
+      Width = 695
+      Height = 19
+      Margins.Left = 5
+      Margins.Top = 5
+      Align = alTop
+      Caption = 'Par'#225'metros de consulta'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'MS Sans Serif'
+      Font.Style = [fsBold]
+      ParentColor = True
+      ParentFont = False
+      Underline = True
+      ExplicitWidth = 128
+      ExplicitHeight = 32
+    end
+    object pnlAgrupaciones: TTBXAlignmentPanel
+      Left = 425
+      Top = 19
+      Width = 270
+      Height = 41
+      Align = alClient
+      AutoSize = True
+      TabOrder = 2
+      ExplicitHeight = 109
+      object TBXButton3: TTBXButton
+        Tag = 3
+        Left = 8
+        Top = 10
+        Width = 90
+        Height = 21
+        AutoSize = False
+        Caption = 'Consultar'
+        ImageIndex = 0
+        TabOrder = 0
+        Wrapping = twEndEllipsis
+      end
+    end
+  end
   inherited dsDataSource: TDADataSource
     Top = 120
   end

Source/Modulos/Recepciones/Cliente/uViewListaRecepcionesAlbaran.pas

@@ -20,11 +20,15 @@ uses
   dxPSFillPatterns, dxPSEdgePatterns, cxCalendar, cxTextEdit,
   cxCurrencyEdit, dxPSCore, uDADataTable, StdCtrls, cxGridBandedTableView,
   cxGridDBBandedTableView, cxImageComboBox, ImgList, PngImageList,
-  dxPScxCommon, dxPScxGridLnk, cxMemo;
+  dxPScxCommon, dxPScxGridLnk, cxMemo, uDAInterfaces, TBXDkPanels, uCustomView,
+  uViewBase, uViewParametrosControlGrid, uViewParametrosCentro, TB2Dock;
 
 type
   IViewListaRecepcionesAlbaran = interface(IViewGrid)
   ['{F0B4B97B-158B-4FD8-B3F1-8ECAC7AE40D5}']
+    function GetItems: IBizRecepcionesAlbaran;
+    procedure SetItems(const Value: IBizRecepcionesAlbaran);
+    property Items: IBizRecepcionesAlbaran read GetItems write SetItems;
   end;
 
   TfrViewListaRecepcionesAlbaran = class(TfrViewGrid, IViewListaRecepcionesAlbaran)
@@ -56,12 +60,27 @@ type
     cxGridViewE44: TcxGridDBColumn;
     cxGridViewE46: TcxGridDBColumn;
     cxGridViewE48: TcxGridDBColumn;
+    TBXDockablePanel1: TTBXDockablePanel;
+    frViewParametrosCentro1: TfrViewParametrosCentro;
+    TBXLabel1: TTBXLabel;
+    pnlAgrupaciones: TTBXAlignmentPanel;
+    TBXButton3: TTBXButton;
     procedure cxGridViewALBARANGetDataText(Sender: TcxCustomGridTableItem;
       ARecordIndex: Integer; var AText: String);
+  protected
+    FItems: IBizRecepcionesAlbaran;
+    function GetItems: IBizRecepcionesAlbaran;
+    procedure SetItems(const Value: IBizRecepcionesAlbaran);
+
   public
+    property Items: IBizRecepcionesAlbaran read GetItems write SetItems;
+    
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
     procedure Preview; override;
     procedure Print; override;
     procedure PrintSetup; override;
+    procedure Refresh;
   end;
 
 
@@ -72,6 +91,11 @@ uses
   uViewGridBase, cxGridRows;
 
 {$R *.dfm}
+function TfrViewListaRecepcionesAlbaran.GetItems: IBizRecepcionesAlbaran;
+begin
+  Result := FItems;
+end;
+
 procedure TfrViewListaRecepcionesAlbaran.Preview;
 begin
   inherited;
@@ -90,6 +114,75 @@ begin
   dxComponentPrinterLink1.PageSetup;
 end;
 
+procedure TfrViewListaRecepcionesAlbaran.Refresh;
+var
+  ACentrosList : TStringList;
+  AWhereCentro : String;
+  AWhere : String;
+  i : integer;
+begin
+  ACentrosList := Nil;
+
+  if Assigned(FItems) then
+     Items.DataTable.Active := False;
+  ACentrosList := frViewParametrosCentro1.CentrosSeleccionados;
+
+  ShowHourglassCursor;
+  try
+    if Assigned(ACentrosList) then
+    begin
+       AWhereCentro := '';
+       if ACentrosList.Count = 0 then
+       begin
+          ShowMessage('Debe seleccionar al menos un centro en los parámetros de la consulta.');
+          Exit;
+       end
+       else begin
+          AWhereCentro := AWhereCentro + ' FILIAL in (';
+          for i := 0 to ACentrosList.Count - 1 do
+          begin
+            if i > 0 then
+              AWhereCentro := AWhereCentro + ', ';
+            AWhereCentro := AWhereCentro + '''' + ACentrosList[i] + '''';
+          end;
+          AWhereCentro := AWhereCentro + ')';
+        end;
+    end;
+
+    AWhere := '';
+    if AWhereCentro <> '' then
+    begin
+       AWhere := AWhere + AWhereCentro;
+    end;
+
+//No hacemos clear porque en este caso la aprobación o no del albaran no viene dado por la where desde el editor    
+//    Items.DataTable.Where.Clear;
+    if not Items.DataTable.Where.Empty then
+       AWhere  := 'AND ' + AWhere;
+
+    Items.DataTable.Where.AddText(AWhere, False);
+    Items.DataTable.Active := True;
+
+  finally
+    HideHourglassCursor;
+    FreeAndNIL(ACentrosList);
+  end;
+end;
+
+procedure TfrViewListaRecepcionesAlbaran.SetItems(const Value: IBizRecepcionesAlbaran);
+begin
+  FItems := Value;
+  if Assigned(FItems) then
+     dsDataSource.DataTable := FItems.DataTable;
+end;
+
+constructor TfrViewListaRecepcionesAlbaran.Create(AOwner: TComponent);
+begin
+  inherited;
+  FItems := Nil;
+  frViewParametrosCentro1.Refresh;
+end;
+
 procedure TfrViewListaRecepcionesAlbaran.cxGridViewALBARANGetDataText(
   Sender: TcxCustomGridTableItem; ARecordIndex: Integer;
   var AText: String);
@@ -108,4 +201,10 @@ begin
   end;
 end;
 
+destructor TfrViewListaRecepcionesAlbaran.Destroy;
+begin
+  FItems := Nil;
+  inherited;
+end;
+
 end.

Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.dpk

@@ -61,7 +61,8 @@ requires
   cxExtEditorsD10,
   dxPSCoreD10,
   dxComnD10,
-  JvCustomD10R;
+  JvCustomD10R,
+  Parametros;
 
 contains
   uPluginControllerReferenciaGenerica in 'uPluginControllerReferenciaGenerica.pas' {ModuleReferenciaGenerica: TModuleController},

Source/Modulos/ReferenciaGenerica/Cliente/ReferenciaGenerica.dproj

@@ -1,4 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{d34ce1e7-d660-436d-a982-7683ff67eecd}</ProjectGuid>
     <MainSource>ReferenciaGenerica.dpk</MainSource>
@@ -52,45 +53,46 @@
     <DelphiCompile Include="ReferenciaGenerica.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\..\..\Lib\adortl.dcp" />
+    <DCCReference Include="..\..\..\Lib\BaseD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\ControlesBaseD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\cxDataD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\cxEditorsD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\cxExportD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\cxExtEditorsD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\cxGridD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\cxLibraryD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\cxPageControlD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\cxTreeListD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\dbrtl.dcp" />
+    <DCCReference Include="..\..\..\Lib\dsnap.dcp" />
+    <DCCReference Include="..\..\..\Lib\dxComnD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\dxPSCoreD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\dxThemeD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\GUISDK_D10.dcp" />
+    <DCCReference Include="..\..\..\Lib\Jcl.dcp" />
+    <DCCReference Include="..\..\..\Lib\JclVcl.dcp" />
+    <DCCReference Include="..\..\..\Lib\JvCoreD10R.dcp" />
+    <DCCReference Include="..\..\..\Lib\JvCustomD10R.dcp" />
+    <DCCReference Include="..\..\..\Lib\JvGlobusD10R.dcp" />
+    <DCCReference Include="..\..\..\Lib\JvPageCompsD10R.dcp" />
+    <DCCReference Include="..\..\..\Lib\JvStdCtrlsD10R.dcp" />
+    <DCCReference Include="..\..\..\Lib\JvSystemD10R.dcp" />
+    <DCCReference Include="..\..\..\Lib\Parametros.dcp" />
+    <DCCReference Include="..\..\..\Lib\PluginSDK_D10R.dcp" />
+    <DCCReference Include="..\..\..\Lib\PngComponentsD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\PNG_D10.dcp" />
+    <DCCReference Include="..\..\..\Lib\rtl.dcp" />
+    <DCCReference Include="..\..\..\Lib\tb2k_D10.dcp" />
+    <DCCReference Include="..\..\..\Lib\tbx_D10.dcp" />
+    <DCCReference Include="..\..\..\Lib\vcl.dcp" />
+    <DCCReference Include="..\..\..\Lib\vclactnband.dcp" />
+    <DCCReference Include="..\..\..\Lib\vcldb.dcp" />
+    <DCCReference Include="..\..\..\Lib\vcljpg.dcp" />
+    <DCCReference Include="..\..\..\Lib\vclx.dcp" />
     <DCCReference Include="..\Reglas\schReferenciaGenericaClient_Intf.pas" />
     <DCCReference Include="..\Reglas\schReferenciaGenericaServer_Intf.pas" />
     <DCCReference Include="..\Reglas\uBizReferenciaGenerica.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\cxTreeListD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.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\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\JvCustomD10R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD10R.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\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\vclx.dcp" />
     <DCCReference Include="uDataModuleReferenciaGenerica.pas">
       <Form>dmReferenciaGenerica</Form>
     </DCCReference>

Source/Modulos/ReferenciaGenerica/Cliente/uDataModuleReferenciaGenerica.dfm

@@ -22,9 +22,11 @@ object dmReferenciaGenerica: TdmReferenciaGenerica
         Name = 'Result'
         DataType = rtString
         Flag = fResult
+        Value = Null
       end>
     GetSchemaCall.Default = False
     GetSchemaCall.IncomingSchemaParameter = 'Result'
+    GetSchemaCall.OutgoingFilterParameter = 'aFilter'
     GetDataCall.RemoteService = RORemoteService
     GetDataCall.MethodName = 'GetDatasetData'
     GetDataCall.Params = <

Source/Modulos/ReferenciaGenerica/Cliente/uEditorListaReferenciaGenerica.dfm

@@ -81,9 +81,9 @@ inherited fEditorListaReferenciaGenerica: TfEditorListaReferenciaGenerica
     ExplicitHeight = 513
     inherited cxGrid: TcxGrid
       Width = 901
-      Height = 513
+      Height = 453
       ExplicitWidth = 901
-      ExplicitHeight = 513
+      ExplicitHeight = 453
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.DefaultGroupSummaryItems = <
           item
@@ -94,6 +94,28 @@ inherited fEditorListaReferenciaGenerica: TfEditorListaReferenciaGenerica
           end>
       end
     end
+    inherited TBXDockablePanel1: TTBXDockablePanel
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitWidth = 901
+      inherited frViewParametrosCentro1: TfrViewParametrosCentro
+        inherited dxLayoutControl1: TdxLayoutControl
+          inherited ccbCentro: TJvCheckedComboBox
+            Width = 525
+            ExplicitWidth = 525
+          end
+        end
+      end
+      inherited TBXLabel1: TTBXLabel
+        Width = 901
+      end
+      inherited pnlAgrupaciones: TTBXAlignmentPanel
+        Width = 476
+        inherited TBXButton3: TTBXButton
+          Action = actRefrescar
+        end
+      end
+    end
   end
   object JvTabBar1: TJvTabBar [4]
     Left = 0

Source/Modulos/ReferenciaGenerica/Cliente/uEditorListaReferenciaGenerica.pas

@@ -46,7 +46,6 @@ type
     actEspera: TAction;
     actResuelto: TAction;
     procedure FormShow(Sender: TObject);
-    procedure JvTabBar1TabSelected(Sender: TObject; Item: TJvTabBarItem);
     procedure actModificarExecute(Sender: TObject);
     procedure actExpandirExecute(Sender: TObject);
     procedure actContraerExecute(Sender: TObject);
@@ -66,6 +65,7 @@ type
     procedure actResueltoUpdate(Sender: TObject);
     procedure actResueltoExecute(Sender: TObject);
     procedure actEliminarExecute(Sender: TObject);
+    procedure JvTabBar1TabSelected(Sender: TObject; Item: TJvTabBarItem);
   protected
     FItems : IBizReferenciaGenerica;
     function GetItems: IBizReferenciaGenerica;
@@ -98,14 +98,20 @@ begin
   Result := FItems;
 end;
 
-procedure TfEditorListaReferenciaGenerica.SetItems(
+procedure TfEditorListaReferenciaGenerica.JvTabBar1TabSelected(Sender: TObject; Item: TJvTabBarItem);
-  const Value: IBizReferenciaGenerica);
+begin
+  if Items.DataTable.Active then
+     Items.DataTable.Active := False;
+  frViewListaReferenciaGenerica1.frViewParametrosCentro1.LimpiarSeleccion;
+end;
+
+procedure TfEditorListaReferenciaGenerica.SetItems(const Value: IBizReferenciaGenerica);
 begin
   FItems := Value;
   if Assigned(FItems) then
   begin
     dsDataTable.DataTable := FItems.DataTable;
-    frViewListaReferenciaGenerica1.dsDataSource.DataTable := FItems.DataTable;
+    frViewListaReferenciaGenerica1.Items := FItems;
   end;
 end;
 
@@ -118,8 +124,6 @@ begin
   if not Assigned(ViewGrid) then
     raise Exception.Create('No hay una vista asignada');
 
-  FItems.DataTable.Active := True;
-  Items.VerPendientes;
   with (ViewGrid as IViewListaReferenciaGenerica) do
   begin
     VerPendientes;
@@ -128,30 +132,6 @@ begin
   end;
 end;
 
-procedure TfEditorListaReferenciaGenerica.JvTabBar1TabSelected(
-  Sender: TObject; Item: TJvTabBarItem);
-begin
-  inherited;
-  case Item.Index of
-    0     : begin
-              Items.VerPendientes;
-              (ViewGrid as IViewListaReferenciaGenerica).VerPendientes;
-            end;
-
-    1     : begin
-              Items.VerEnEspera;
-              (ViewGrid as IViewListaReferenciaGenerica).VerEnEspera;
-            end;
-
-    2     : begin
-              Items.VerResueltos;
-              (ViewGrid as IViewListaReferenciaGenerica).VerResueltos
-            end;
-  end;
-  ViewGrid.ExpandirTodo;
-  ViewGrid.GotoFirst;
-end;
-
 procedure TfEditorListaReferenciaGenerica.actModificarExecute(
   Sender: TObject);
 var
@@ -329,12 +309,42 @@ begin
     (ViewGrid._FocusedView.Controller.SelectedRecordCount > 0)
 end;
 
-procedure TfEditorListaReferenciaGenerica.actRefrescarExecute(
+procedure TfEditorListaReferenciaGenerica.actRefrescarExecute(Sender: TObject);
-  Sender: TObject);
 begin
+  ShowHourglassCursor;
+  Items.DataTable.Active := False;
+  Application.ProcessMessages;
+  ViewGrid._FocusedView.BeginUpdate;
+  Application.ProcessMessages;
+  try
+    case JvTabBar1.SelectedTab.Index of
+      0     : begin
+                Items.VerPendientes;
+                (ViewGrid as IViewListaReferenciaGenerica).VerPendientes;
+              end;
+
+      1     : begin
+                Items.VerEnEspera;
+                (ViewGrid as IViewListaReferenciaGenerica).VerEnEspera;
+              end;
+
+      2     : begin
+                Items.VerResueltos;
+                (ViewGrid as IViewListaReferenciaGenerica).VerResueltos
+              end;
+    end;
+
+    frViewListaReferenciaGenerica1.Refresh;
     inherited;
-  ViewGrid.ExpandirTodo;
+
+  finally
+    dsDataTable.DataTable := Items.DataTable;
+    ViewGrid._FocusedView.EndUpdate;
+    Items.DataTable.Active := True;
+    ViewGrid.ContraerTodo;
     ViewGrid.GotoFirst;
+    HideHourglassCursor;
+  end;
 end;
 
 procedure TfEditorListaReferenciaGenerica.actPendienteExecute(

Source/Modulos/ReferenciaGenerica/Cliente/uViewListaReferenciaGenerica.dfm

@@ -2,7 +2,9 @@ inherited frViewListaReferenciaGenerica: TfrViewListaReferenciaGenerica
   Width = 504
   ExplicitWidth = 504
   inherited cxGrid: TcxGrid
+    Top = 60
     Width = 504
+    Height = 208
     ExplicitWidth = 504
     inherited cxGridView: TcxGridDBTableView
       OnMouseDown = cxGridViewMouseDown
@@ -118,6 +120,84 @@ inherited frViewListaReferenciaGenerica: TfrViewListaReferenciaGenerica
       end
     end
   end
+  object TBXDockablePanel1: TTBXDockablePanel [1]
+    Left = 0
+    Top = 0
+    MaxClientHeight = 61
+    Align = alTop
+    Caption = 'TBXDockablePanel1'
+    DockedWidth = 32
+    DockedHeight = 32
+    FloatingWidth = 128
+    FloatingHeight = 60
+    SupportedDocks = [dkStandardDock, dkMultiDock]
+    TabOrder = 1
+    ExplicitLeft = 8
+    ExplicitTop = 8
+    ExplicitWidth = 128
+    inline frViewParametrosCentro1: TfrViewParametrosCentro
+      Left = 0
+      Top = 19
+      Width = 425
+      Height = 41
+      Align = alLeft
+      TabOrder = 0
+      ReadOnly = False
+      ExplicitTop = 19
+      ExplicitWidth = 425
+      ExplicitHeight = 41
+      inherited dxLayoutControl1: TdxLayoutControl
+        Width = 425
+        ExplicitWidth = 425
+        inherited ccbCentro: TJvCheckedComboBox
+          Width = 392
+          ExplicitWidth = 392
+        end
+      end
+    end
+    object TBXLabel1: TTBXLabel
+      Left = 0
+      Top = 0
+      Width = 504
+      Height = 19
+      Margins.Left = 5
+      Margins.Top = 5
+      Align = alTop
+      Caption = 'Par'#225'metros de consulta'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'MS Sans Serif'
+      Font.Style = [fsBold]
+      ParentColor = True
+      ParentFont = False
+      Underline = True
+      ExplicitWidth = 128
+      ExplicitHeight = 32
+    end
+    object pnlAgrupaciones: TTBXAlignmentPanel
+      Left = 425
+      Top = 19
+      Width = 79
+      Height = 41
+      Align = alClient
+      AutoSize = True
+      TabOrder = 2
+      ExplicitWidth = 251
+      object TBXButton3: TTBXButton
+        Tag = 3
+        Left = 8
+        Top = 10
+        Width = 90
+        Height = 21
+        AutoSize = False
+        Caption = 'Consultar'
+        ImageIndex = 0
+        TabOrder = 0
+        Wrapping = twEndEllipsis
+      end
+    end
+  end
   inherited cxStyleRepository1: TcxStyleRepository
     object cxStyleResuelto: TcxStyle
       AssignedValues = [svTextColor]

Source/Modulos/ReferenciaGenerica/Cliente/uViewListaReferenciaGenerica.pas

@@ -18,7 +18,9 @@ uses
   cxControls, cxGridCustomView, cxGrid, uBizReferenciaGenerica, dxPSGlbl,
   dxPSUtl, dxPSEngn, dxPrnPg, dxBkgnd, dxWrap, dxPrnDev, dxPSCompsProvider,
   dxPSFillPatterns, dxPSEdgePatterns, cxCalendar, cxTextEdit,
-  cxCurrencyEdit, dxPSCore, uDADataTable, StdCtrls, uDAInterfaces;
+  cxCurrencyEdit, dxPSCore, uDADataTable, StdCtrls, uDAInterfaces, TBXDkPanels,
+  uCustomView, uViewBase, uViewParametrosControlGrid, uViewParametrosCentro,
+  TB2Dock;
 
 type
   IViewListaReferenciaGenerica = interface(IViewGrid)
@@ -26,6 +28,10 @@ type
     procedure VerPendientes;
     procedure VerEnEspera;
     procedure VerResueltos;
+
+    function GetItems: IBizReferenciaGenerica;
+    procedure SetItems(const Value: IBizReferenciaGenerica);
+    property Items: IBizReferenciaGenerica read GetItems write SetItems;
   end;
 
   TfrViewListaReferenciaGenerica = class(TfrViewGrid, IViewListaReferenciaGenerica)
@@ -48,6 +54,11 @@ type
     cxStyleEnEspera1semana: TcxStyle;
     cxStyleResueltoRectificado: TcxStyle;
     cxGridViewColumn1: TcxGridDBColumn;
+    TBXDockablePanel1: TTBXDockablePanel;
+    frViewParametrosCentro1: TfrViewParametrosCentro;
+    TBXLabel1: TTBXLabel;
+    pnlAgrupaciones: TTBXAlignmentPanel;
+    TBXButton3: TTBXButton;
     procedure cxGridViewCellDblClick(Sender: TcxCustomGridTableView;
       ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton;
       AShift: TShiftState; var AHandled: Boolean);
@@ -58,10 +69,20 @@ type
       Shift: TShiftState; X, Y: Integer);
   private
     FEstado : TRefGenEstado;
+  protected
+    FItems: IBizReferenciaGenerica;
+    function GetItems: IBizReferenciaGenerica;
+    procedure SetItems(const Value: IBizReferenciaGenerica);
+
   public
+    property Items: IBizReferenciaGenerica read GetItems write SetItems;
+
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
     procedure VerPendientes;
     procedure VerEnEspera;
     procedure VerResueltos;
+    procedure Refresh;    
   end;
 
 
@@ -71,6 +92,13 @@ uses uDataModuleReferenciaGenerica, DateUtils, cxGridDBDataDefinitions;
 
 {$R *.dfm}
 
+constructor TfrViewListaReferenciaGenerica.Create(AOwner: TComponent);
+begin
+  inherited;
+  FItems := Nil;
+  frViewParametrosCentro1.Refresh;
+end;
+
 procedure TfrViewListaReferenciaGenerica.cxGridViewCellDblClick(
   Sender: TcxCustomGridTableView;
   ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton;
@@ -142,6 +170,75 @@ begin
   end;
 end;
 
+destructor TfrViewListaReferenciaGenerica.Destroy;
+begin
+  FItems := Nil;
+  inherited;
+end;
+
+function TfrViewListaReferenciaGenerica.GetItems: IBizReferenciaGenerica;
+begin
+  Result := FItems;
+end;
+
+procedure TfrViewListaReferenciaGenerica.Refresh;
+var
+  ACentrosList : TStringList;
+  AWhereCentro : String;
+  AWhere : String;
+  i : integer;
+begin
+  ACentrosList := Nil;
+
+  if Assigned(FItems) then
+     Items.DataTable.Active := False;
+  ACentrosList := frViewParametrosCentro1.CentrosSeleccionados;
+
+  ShowHourglassCursor;
+  try
+    if Assigned(ACentrosList) then
+    begin
+       AWhereCentro := '';
+       if ACentrosList.Count = 0 then
+       begin
+          ShowMessage('Debe seleccionar al menos un centro en los parámetros de la consulta.');
+          Exit;
+       end
+       else begin
+          AWhereCentro := AWhereCentro + ' FILIAL in (';
+          for i := 0 to ACentrosList.Count - 1 do
+          begin
+            if i > 0 then
+              AWhereCentro := AWhereCentro + ', ';
+            AWhereCentro := AWhereCentro + '''' + ACentrosList[i] + '''';
+          end;
+          AWhereCentro := AWhereCentro + ')';
+        end;
+    end;
+
+    AWhere := '';
+    if AWhereCentro <> '' then
+    begin
+       AWhere := AWhere + AWhereCentro;
+    end;
+
+//    Items.DataTable.Where.Clear;
+//    Items.DataTable.Where.AddText(AWhere, False);
+    Items.DataTable.Active := True;
+
+  finally
+    HideHourglassCursor;
+    FreeAndNIL(ACentrosList);
+  end;
+end;
+
+procedure TfrViewListaReferenciaGenerica.SetItems(const Value: IBizReferenciaGenerica);
+begin
+  FItems := Value;
+  if Assigned(FItems) then
+     dsDataSource.DataTable := FItems.DataTable;
+end;
+
 procedure TfrViewListaReferenciaGenerica.cxGridViewMouseDown(
   Sender: TObject; Button: TMouseButton; Shift: TShiftState; X,
   Y: Integer);

Source/Modulos/ReferenciaGenerica/Servidor/srvReferenciaGenerica_Impl.dfm

@@ -20,31 +20,26 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
         Params = <
           item
             Name = 'NUMINF'
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'CLAVE1'
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'CLAVE2'
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'CLAVE3'
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'NUMCON'
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end>
@@ -85,65 +80,23 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
             Name = 'NUMINF'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CLAVE1'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CLAVE2'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CLAVE3'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMCON'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end>
-        BusinessRulesClient.ScriptLanguage = rslPascalScript
-        BusinessRulesServer.ScriptLanguage = rslPascalScript
       end
       item
         Params = <>
@@ -209,124 +162,55 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
             Name = 'CODCENTRO'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CENTRO'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CODVENDEDOR'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'VENDEDOR'
             DataType = datString
             Size = 255
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECHA'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMTALON'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CANTIDAD'
             DataType = datString
             Size = 8000
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'VALTOT'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end>
-        BusinessRulesClient.ScriptLanguage = rslPascalScript
-        BusinessRulesServer.ScriptLanguage = rslPascalScript
       end
       item
         Params = <
           item
             Name = 'CODIGO'
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'TALLA'
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'COLOR'
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end>
@@ -370,69 +254,27 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
             Name = 'CODIGO_BARRA'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'COR_PRODUTO'
             DataType = datString
             Size = 10
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'DESC_PRODUTO'
             DataType = datString
             Size = 40
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PRODUTO'
             DataType = datString
             Size = 12
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'GRADE'
             DataType = datString
             Size = 8
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end>
-        BusinessRulesClient.ScriptLanguage = rslPascalScript
-        BusinessRulesServer.ScriptLanguage = rslPascalScript
       end
       item
         Params = <>
@@ -451,7 +293,7 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
               '    END,'#10'    NUMTALON, CODIGO_BARRA, CODIGO, PRODUCTO, COLOR, TA' +
               'LLA, VTAPROCESO,'#10'    VTAFINAL, VTATERM, VALTOT, ESTADO, FECHACAM' +
               'BIO'#10'  FROM'#10'    RDX_V_REFERENCIA_GENERICA'#10'ORDER BY CENTRO, VENDED' +
-              'OR, FECHA'
+              'OR, FECHA'#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -549,280 +391,106 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
             Name = 'NUMINF'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CLAVE1'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CLAVE2'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CLAVE3'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMCON'
             DataType = datInteger
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECHA'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CODCENTRO'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CENTRO'
             DataType = datString
             Size = 45
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CODVENDEDOR'
             DataType = datString
             Size = 17
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'VENDEDOR'
             DataType = datString
             Size = 86
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'NUMTALON'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CODIGO_BARRA'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'CODIGO'
             DataType = datString
             Size = 12
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PRODUCTO'
             DataType = datString
             Size = 40
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'COLOR'
             DataType = datString
             Size = 10
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'TALLA'
             DataType = datString
             Size = 8
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'VTAPROCESO'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'VTAFINAL'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'VTATERM'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'VALTOT'
             DataType = datFloat
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'ESTADO'
             DataType = datString
             Size = 1
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'FECHACAMBIO'
             DataType = datDateTime
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end>
-        BusinessRulesClient.ScriptLanguage = rslPascalScript
-        BusinessRulesServer.ScriptLanguage = rslPascalScript
       end>
     JoinDataTables = <>
     UnionDataTables = <>
@@ -833,14 +501,12 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
             Name = 'ESTADO'
             DataType = datString
             Size = 1
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'FECHACAMBIO'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -848,35 +514,30 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
             Name = 'CODIGO_BARRA'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'VTAPROCESO'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'VTAFINAL'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'VTATERM'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'VALTOT'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -884,35 +545,30 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
             Name = 'OLD_NUMINF'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'OLD_CLAVE1'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'OLD_CLAVE2'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'OLD_CLAVE3'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'OLD_NUMCON'
             DataType = datInteger
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end>
@@ -938,7 +594,6 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
             Name = 'ESTADO'
             DataType = datString
             Size = 1
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end>
@@ -962,28 +617,24 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
             Name = 'NUMINF'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'CLAVE1'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'CLAVE2'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'CLAVE3'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -991,14 +642,12 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
             Name = 'ESTADO'
             DataType = datString
             Size = 1
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'FECHACAMBIO'
             DataType = datDateTime
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
@@ -1006,35 +655,30 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
             Name = 'CODIGO_BARRA'
             DataType = datString
             Size = 25
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'VTATERM'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'VTAPROCESO'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'VTAFINAL'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'VALTOT'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end>
@@ -1075,35 +719,30 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
             Name = 'OLD_NUMINF'
             DataType = datString
             Size = 35
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'OLD_CLAVE1'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'OLD_CLAVE2'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'OLD_CLAVE3'
             DataType = datFloat
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end
           item
             Name = 'OLD_NUMCON'
             DataType = datInteger
-            BlobType = dabtUnknown
             Value = ''
             ParamType = daptInput
           end>
@@ -1228,7 +867,6 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
     MasterMappingMode = mmDataRequest
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteFetchEnabled = False
-    ReadOnly = False
     DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
     MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     IndexDefs = <>
@@ -1294,8 +932,6 @@ object srvReferenciaGenerica: TsrvReferenciaGenerica
     Top = 144
   end
   object DABINAdapter: TDABINAdapter
-    BufferSize = 262144
-    IsCompatibleV4 = True
     Left = 336
     Top = 32
   end

Source/Modulos/Stock/Cliente/uEditorControlStockVARELA.dfm

@@ -11,7 +11,7 @@ inherited fEditorControlStockVARELA: TfEditorControlStockVARELA
   inherited JvNavPanelHeader: TJvNavPanelHeader
     Width = 720
     Caption = 'Control de stock de almac'#233'n'
-    ExplicitWidth = 1071
+    ExplicitWidth = 720
     inherited Image1: TImage
       Left = 693
       Picture.Data = {
@@ -127,22 +127,35 @@ inherited fEditorControlStockVARELA: TfEditorControlStockVARELA
   end
   inherited TBXDock: TTBXDock
     Width = 720
+    ExplicitWidth = 720
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 256
+      ExplicitWidth = 331
+      object TBXSeparatorItem16: TTBXSeparatorItem [13]
+      end
+      object TBXItem35: TTBXItem [14]
+        Action = actExpandir
+      end
+      object TBXItem36: TTBXItem [15]
+        Action = actContraer
+      end
+      object TBXItem37: TTBXItem [16]
+        Action = actAnchoAuto
+      end
     end
     inherited tbxMenu: TTBXToolbar
       ExplicitWidth = 720
     end
     inherited tbxFiltro: TTBXToolbar
-      Left = 392
+      Left = 337
-      ExplicitLeft = 392
+      DockPos = 337
+      ExplicitLeft = 337
     end
   end
   inherited StatusBar: TStatusBar
     Top = 554
     Width = 720
     ExplicitTop = 554
-    ExplicitWidth = 1071
+    ExplicitWidth = 720
   end
   inline frViewControlGridStockVARELA1: TfrViewControlGridStockVARELA [3]
     Left = 0
@@ -158,14 +171,14 @@ inherited fEditorControlStockVARELA: TfEditorControlStockVARELA
     ParentFont = False
     TabOrder = 3
     ReadOnly = False
-    ExplicitLeft = -111
+    ExplicitTop = 76
-    ExplicitTop = 223
+    ExplicitWidth = 720
+    ExplicitHeight = 478
     inherited cxGrid: TcxGrid
       Width = 720
       Height = 418
-      ExplicitTop = 60
+      ExplicitWidth = 720
-      ExplicitWidth = 831
+      ExplicitHeight = 418
-      ExplicitHeight = 290
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.DefaultGroupSummaryItems = <
           item
@@ -260,27 +273,25 @@ inherited fEditorControlStockVARELA: TfEditorControlStockVARELA
       end
     end
     inherited TBXDockablePanel1: TTBXDockablePanel
+      ExplicitWidth = 720
       inherited frViewParametrosColeccion1: TfrViewParametrosColeccion
-        ExplicitHeight = 41
         inherited dxLayoutControl1: TdxLayoutControl
-          ExplicitHeight = 41
           inherited ccbColeccion: TJvCheckedComboBox
-            Width = 512
+            Width = 513
-            ExplicitWidth = 512
+            ExplicitWidth = 513
           end
         end
       end
       inherited pnlAgrupaciones: TTBXAlignmentPanel
         Width = 399
-        ExplicitWidth = 510
+        ExplicitWidth = 399
-        ExplicitHeight = 41
         inherited TBXButton3: TTBXButton
           Action = actRefrescar
         end
       end
       inherited TBXLabel1: TTBXLabel
         Width = 720
-        ExplicitWidth = 831
+        ExplicitWidth = 720
       end
     end
     inherited dxComponentPrinter: TdxComponentPrinter

Source/Modulos/Stock/Cliente/uEditorControlStockVARELA.pas

@@ -28,6 +28,10 @@ type
     actContraer: TAction;
     actAnchoAuto: TAction;
     frViewControlGridStockVARELA1: TfrViewControlGridStockVARELA;
+    TBXSeparatorItem16: TTBXSeparatorItem;
+    TBXItem35: TTBXItem;
+    TBXItem36: TTBXItem;
+    TBXItem37: TTBXItem;
     procedure actAnchoAutoExecute(Sender: TObject);
     procedure FormShow(Sender: TObject);
     procedure actPrevisualizarExecute(Sender: TObject);

Source/Modulos/Stock/Cliente/uViewControGridStockEDI.dfm

@@ -7,9 +7,9 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI
     Top = 60
     Width = 553
     Height = 417
-    ExplicitTop = 128
+    ExplicitTop = 60
     ExplicitWidth = 553
-    ExplicitHeight = 349
+    ExplicitHeight = 417
     inherited cxGridView: TcxGridDBTableView
       FilterBox.Visible = fvNever
       DataController.Summary.DefaultGroupSummaryItems = <
@@ -259,7 +259,7 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI
       end
       object cxGridViewCENTRO: TcxGridDBColumn
         Caption = 'Centro'
-        DataBinding.FieldName = 'CENTRO'
+        DataBinding.FieldName = 'FILIAL'
         Visible = False
         GroupIndex = 1
       end
@@ -474,14 +474,10 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI
       ReadOnly = False
       ExplicitTop = 19
       ExplicitWidth = 321
-      ExplicitHeight = 109
+      ExplicitHeight = 41
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 321
         ExplicitWidth = 321
-        inherited ccbColeccion: TJvCheckedComboBox
-          Width = 512
-          ExplicitWidth = 512
-        end
       end
     end
     inline frViewParametrosCentro1: TfrViewParametrosCentro
@@ -496,14 +492,10 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI
       ExplicitLeft = 321
       ExplicitTop = 19
       ExplicitWidth = 400
-      ExplicitHeight = 109
+      ExplicitHeight = 41
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 400
         ExplicitWidth = 400
-        inherited ccbCentro: TJvCheckedComboBox
-          Width = 392
-          ExplicitWidth = 392
-        end
       end
     end
     object TBXAlignmentPanel1: TTBXAlignmentPanel
@@ -514,7 +506,6 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI
       Align = alClient
       AutoSize = True
       TabOrder = 2
-      ExplicitHeight = 109
       object TBXButton1: TTBXButton
         Tag = 3
         Left = 8
@@ -572,7 +563,7 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
       ReportDocument.Caption = 'Venta mensual'
-      ReportDocument.CreationDate = 39343.811115983790000000
+      ReportDocument.CreationDate = 39346.803634976850000000
       ReportTitle.Text = 'Venta mensual'
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clBlack

Source/Modulos/Stock/Cliente/uViewControGridStockEDI.pas

@@ -109,14 +109,14 @@ uses uViewGridBase;
 procedure TfrViewControlGridStockEDI.Preview;
 begin
   inherited;
-//  dxComponentPrinterLink1.ReportTitle.Text := 'Control de stock de colección ' + frViewFiltrosStock1.cbColeccion.Text + ' en centro(s) ' + frViewFiltrosStock1.ccbCentro.Text;
+  dxComponentPrinterLink1.ReportTitle.Text := 'Control de stock de colección ' + frViewParametrosColeccion1.ccbColeccion.Text + ' en centro(s) ' + frViewParametrosCentro1.ccbCentro.Text;
   dxComponentPrinterLink1.Preview;
 end;
 
 procedure TfrViewControlGridStockEDI.Print;
 begin
   inherited;
-//  dxComponentPrinterLink1.ReportTitle.Text := 'Control de stock de colección ' + frViewFiltrosStock1.cbColeccion.Text + ' en centro(s) ' + frViewFiltrosStock1.ccbCentro.Text;
+  dxComponentPrinterLink1.ReportTitle.Text := 'Control de stock de colección ' + frViewParametrosColeccion1.ccbColeccion.Text + ' en centro(s) ' + frViewParametrosCentro1.ccbCentro.Text;
   dxComponentPrinterLink1.Print(True, Nil);
 end;
 
@@ -195,7 +195,7 @@ begin
   if Assigned(FItems) then
      Items.DataTable.Active := False;
   AColeccionesList := frViewParametrosColeccion1.ColeccionesSeleccionadas;
-  ACentrosList := frViewParametrosCentro1.CentrosSeleccionados;
+  ACentrosList := frViewParametrosCentro1.CodigoCentrosSeleccionados;
 
   ShowHourglassCursor;
   try

Source/Modulos/Stock/Cliente/uViewControGridStockEDIInventario.dfm

@@ -7,9 +7,9 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa
     Top = 60
     Width = 553
     Height = 417
-    ExplicitTop = 128
+    ExplicitTop = 60
     ExplicitWidth = 553
-    ExplicitHeight = 349
+    ExplicitHeight = 417
     inherited cxGridView: TcxGridDBTableView
       FilterBox.Visible = fvNever
       DataController.Summary.DefaultGroupSummaryItems = <
@@ -259,7 +259,7 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa
       end
       object cxGridViewCENTRO: TcxGridDBColumn
         Caption = 'Centro'
-        DataBinding.FieldName = 'CENTRO'
+        DataBinding.FieldName = 'FILIAL'
         Visible = False
         GroupIndex = 1
       end
@@ -474,7 +474,7 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa
       ReadOnly = False
       ExplicitTop = 19
       ExplicitWidth = 321
-      ExplicitHeight = 109
+      ExplicitHeight = 41
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 321
         ExplicitWidth = 321
@@ -496,7 +496,7 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa
       ExplicitLeft = 321
       ExplicitTop = 19
       ExplicitWidth = 400
-      ExplicitHeight = 109
+      ExplicitHeight = 41
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 400
         ExplicitWidth = 400
@@ -514,7 +514,6 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa
       Align = alClient
       AutoSize = True
       TabOrder = 2
-      ExplicitHeight = 109
       object TBXButton3: TTBXButton
         Tag = 3
         Left = 8
@@ -572,7 +571,7 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
       ReportDocument.Caption = 'Venta mensual'
-      ReportDocument.CreationDate = 39343.811842083330000000
+      ReportDocument.CreationDate = 39346.818025173610000000
       ReportTitle.Text = 'Venta mensual'
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clBlack

Source/Modulos/Stock/Cliente/uViewControGridStockEDIInventario.pas

@@ -109,14 +109,14 @@ uses
 procedure TfrViewControlGridStockEDIInventario.Preview;
 begin
   inherited;
-//  dxComponentPrinterLink1.ReportTitle.Text := 'Diferencias con último inventario de colección ' + frViewFiltrosStock1.cbColeccion.Text + ' en centro(s) ' + frViewFiltrosStock1.ccbCentro.Text;
+  dxComponentPrinterLink1.ReportTitle.Text := 'Diferencias con último inventario de colección ' + frViewParametrosColeccion1.ccbColeccion.Text + ' en centro(s) ' + frViewParametrosCentro1.ccbCentro.Text;
   dxComponentPrinterLink1.Preview;
 end;
 
 procedure TfrViewControlGridStockEDIInventario.Print;
 begin
   inherited;
-//  dxComponentPrinterLink1.ReportTitle.Text := 'Diferencias con último inventario de colección ' + frViewFiltrosStock1.cbColeccion.Text + ' en centro(s) ' + frViewFiltrosStock1.ccbCentro.Text;
+  dxComponentPrinterLink1.ReportTitle.Text := 'Diferencias con último inventario de colección ' + frViewParametrosColeccion1.ccbColeccion.Text + ' en centro(s) ' + frViewParametrosCentro1.ccbCentro.Text;
   dxComponentPrinterLink1.Print(True, Nil);
 end;
 
@@ -195,7 +195,7 @@ begin
   if Assigned(FItems) then
      Items.DataTable.Active := False;
   AColeccionesList := frViewParametrosColeccion1.ColeccionesSeleccionadas;
-  ACentrosList := frViewParametrosCentro1.CentrosSeleccionados;
+  ACentrosList := frViewParametrosCentro1.CodigoCentrosSeleccionados;
 
   ShowHourglassCursor;
   try
@@ -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

Source/Modulos/Stock/Cliente/uViewControGridStockPrendasCentros.dfm

@@ -7,9 +7,9 @@ inherited frViewControlGridStockPrendasCentros: TfrViewControlGridStockPrendasCe
     Top = 60
     Width = 621
     Height = 399
-    ExplicitTop = 128
+    ExplicitTop = 60
     ExplicitWidth = 621
-    ExplicitHeight = 331
+    ExplicitHeight = 399
     inherited cxGridView: TcxGridDBTableView
       FilterBox.Visible = fvNever
       DataController.Summary.DefaultGroupSummaryItems = <
@@ -218,7 +218,7 @@ inherited frViewControlGridStockPrendasCentros: TfrViewControlGridStockPrendasCe
       ReadOnly = False
       ExplicitTop = 19
       ExplicitWidth = 321
-      ExplicitHeight = 109
+      ExplicitHeight = 41
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 321
         ExplicitWidth = 321
@@ -236,7 +236,6 @@ inherited frViewControlGridStockPrendasCentros: TfrViewControlGridStockPrendasCe
       Align = alClient
       AutoSize = True
       TabOrder = 1
-      ExplicitHeight = 109
       object TBXButton3: TTBXButton
         Tag = 3
         Left = 8
@@ -296,7 +295,7 @@ inherited frViewControlGridStockPrendasCentros: TfrViewControlGridStockPrendasCe
       PrinterPage.PageSize.Y = 297000
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
-      ReportDocument.CreationDate = 39343.812036666670000000
+      ReportDocument.CreationDate = 39346.696871921300000000
       ReportDocument.IsCaptionAssigned = True
       ReportTitle.AdjustOnReportScale = True
       ReportTitle.Text = 'Venta mensual'

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

Source/Modulos/Traspasos/Cliente/Traspasos.dpk

@@ -70,7 +70,8 @@ requires
   vclshlctrls,
   dxPScxGridLnkD10,
   dclcxLibraryD10,
-  dxLayoutControlD10;
+  dxLayoutControlD10,
+  Parametros;
 
 contains
   uDataModuleTraspasos in 'uDataModuleTraspasos.pas' {dmTraspasos: TDAClientDataModule},

Source/Modulos/Traspasos/Cliente/Traspasos.dproj

@@ -1,4 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{8271ac21-0741-43b7-8373-432a0bf0ec7a}</ProjectGuid>
     <MainSource>Traspasos.dpk</MainSource>
@@ -52,52 +53,53 @@
     <DelphiCompile Include="Traspasos.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="..\..\..\Lib\adortl.dcp" />
+    <DCCReference Include="..\..\..\Lib\BaseD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\bdertl.dcp" />
+    <DCCReference Include="..\..\..\Lib\ControlesBaseD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\cxDataD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\cxEditorsD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\cxExportD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\cxExtEditorsD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\cxGridD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\cxLibraryD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\cxPageControlD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\cxTreeListD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\dbrtl.dcp" />
+    <DCCReference Include="..\..\..\Lib\dclcxLibraryD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\designide.dcp" />
+    <DCCReference Include="..\..\..\Lib\dsnap.dcp" />
+    <DCCReference Include="..\..\..\Lib\dxComnD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\dxLayoutControlD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\dxPSCoreD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\dxPScxCommonD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\dxPScxGridLnkD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\dxPSLnksD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\dxThemeD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\GUISDK_D10.dcp" />
+    <DCCReference Include="..\..\..\Lib\Jcl.dcp" />
+    <DCCReference Include="..\..\..\Lib\JclVcl.dcp" />
+    <DCCReference Include="..\..\..\Lib\JvCoreD10R.dcp" />
+    <DCCReference Include="..\..\..\Lib\JvCustomD10R.dcp" />
+    <DCCReference Include="..\..\..\Lib\JvGlobusD10R.dcp" />
+    <DCCReference Include="..\..\..\Lib\JvPageCompsD10R.dcp" />
+    <DCCReference Include="..\..\..\Lib\JvStdCtrlsD10R.dcp" />
+    <DCCReference Include="..\..\..\Lib\JvSystemD10R.dcp" />
+    <DCCReference Include="..\..\..\Lib\Parametros.dcp" />
+    <DCCReference Include="..\..\..\Lib\PluginSDK_D10R.dcp" />
+    <DCCReference Include="..\..\..\Lib\PngComponentsD10.dcp" />
+    <DCCReference Include="..\..\..\Lib\PNG_D10.dcp" />
+    <DCCReference Include="..\..\..\Lib\rtl.dcp" />
+    <DCCReference Include="..\..\..\Lib\tb2k_D10.dcp" />
+    <DCCReference Include="..\..\..\Lib\tbx_D10.dcp" />
+    <DCCReference Include="..\..\..\Lib\vcl.dcp" />
+    <DCCReference Include="..\..\..\Lib\vclactnband.dcp" />
+    <DCCReference Include="..\..\..\Lib\vcldb.dcp" />
+    <DCCReference Include="..\..\..\Lib\vcljpg.dcp" />
+    <DCCReference Include="..\..\..\Lib\vclshlctrls.dcp" />
+    <DCCReference Include="..\..\..\Lib\VclSmp.dcp" />
+    <DCCReference Include="..\..\..\Lib\vclx.dcp" />
     <DCCReference Include="..\Reglas\uBizTraspasos.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\bdertl.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\cxTreeListD10.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\dxLayoutControlD10.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\JvCustomD10R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD10R.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\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\VclSmp.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
     <DCCReference Include="uDataModuleTraspasos.pas">
       <Form>dmTraspasos</Form>
     </DCCReference>

Source/Modulos/Traspasos/Cliente/uDataModuleTraspasos.pas

@@ -56,11 +56,9 @@ begin
   end;
 end;
 
-function TdmTraspasos.GetItems(
+function TdmTraspasos.GetItems(const AEstado: TInvTraspasoEstado): IBizTraspasos;
-  const AEstado: TInvTraspasoEstado): IBizTraspasos;
 var
   dtLista: TDACDSDataTable;
-  AStr : String;
 begin
   ShowHourglassCursor;
   try

Source/Modulos/Traspasos/Cliente/uEditorListaTraspasos.dfm

@@ -1,21 +1,27 @@
 inherited fEditorListaTraspasos: TfEditorListaTraspasos
   Left = 271
   Top = 250
-  Width = 909
-  Height = 659
   Caption = 'Control de traspasos'
+  ClientHeight = 625
+  ClientWidth = 901
+  ExplicitWidth = 909
+  ExplicitHeight = 659
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
     Width = 901
     Caption = 'Control de traspasos'
+    ExplicitWidth = 901
     inherited Image1: TImage
       Left = 874
+      ExplicitLeft = 874
     end
   end
   inherited TBXDock: TTBXDock
     Width = 901
+    ExplicitWidth = 901
     inherited tbxMain: TTBXToolbar
+      ExplicitWidth = 571
       object TBXSubmenuItem2: TTBXSubmenuItem [5]
         Caption = 'Cambiar el estado'
         DropdownCombo = True
@@ -39,13 +45,19 @@ inherited fEditorListaTraspasos: TfEditorListaTraspasos
         DisplayMode = nbdmImageAndText
       end
     end
+    inherited tbxMenu: TTBXToolbar
+      ExplicitWidth = 901
+    end
     inherited tbxFiltro: TTBXToolbar
       Left = 571
+      ExplicitLeft = 571
     end
   end
   inherited StatusBar: TStatusBar
     Top = 606
     Width = 901
+    ExplicitTop = 606
+    ExplicitWidth = 901
   end
   object JvTabBar1: TJvTabBar [3]
     Left = 0
@@ -85,15 +97,43 @@ inherited fEditorListaTraspasos: TfEditorListaTraspasos
     ParentFont = False
     TabOrder = 0
     ReadOnly = False
+    ExplicitTop = 105
+    ExplicitWidth = 901
+    ExplicitHeight = 501
     inherited cxGrid: TcxGrid
       Width = 901
-      Height = 501
+      Height = 441
+      ExplicitWidth = 901
+      ExplicitHeight = 441
       inherited cxGridView: TcxGridDBTableView
         inherited cxGridViewAPROBADO: TcxGridDBColumn
           IsCaptionAssigned = True
         end
       end
     end
+    inherited TBXDockablePanel1: TTBXDockablePanel
+      ExplicitWidth = 901
+      inherited frViewParametrosCentro1: TfrViewParametrosCentro
+        inherited dxLayoutControl1: TdxLayoutControl
+          inherited ccbCentro: TJvCheckedComboBox
+            Width = 392
+            ExplicitWidth = 392
+          end
+        end
+      end
+      inherited TBXLabel1: TTBXLabel
+        Width = 901
+        ExplicitWidth = 901
+        ExplicitHeight = 19
+      end
+      inherited pnlAgrupaciones: TTBXAlignmentPanel
+        Width = 476
+        ExplicitWidth = 476
+        inherited TBXButton3: TTBXButton
+          Action = actRefrescar
+        end
+      end
+    end
     inherited dxComponentPrinter: TdxComponentPrinter
       inherited dxComponentPrinterLink1: TdxGridReportLink
         BuiltInReportLink = True

Source/Modulos/Traspasos/Cliente/uEditorListaTraspasos.pas

@@ -18,16 +18,17 @@ uses
   JvFormPlacement, ImgList, PngImageList, StdActns, ActnList, ComCtrls,
   TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, ExtCtrls,
   JvExControls, JvComponent, JvNavigationPane, StdCtrls,
-  uViewListaTraspasos, uBizTraspasos;
+  uViewListaTraspasos, uBizTraspasos, uDAInterfaces;
   
+const
+  CM_SETFOCUSEDRECORD = WM_USER + 1002;
 
 type
   IEditorListaTraspasos = interface(IEditorGridBase)
     ['{729D3CD7-88E7-4D97-A9A0-8E0E1CF74716}']
     function GetItems: IBizTraspasos;
     procedure SetItems(const Value: IBizTraspasos);
-    property Items: IBizTraspasos read GetItems
+    property Items: IBizTraspasos read GetItems write SetItems;
-            write SetItems;
   end;
 
   TfEditorListaTraspasos = class(TfEditorGridBase, IEditorListaTraspasos)
@@ -95,7 +96,7 @@ begin
   if Assigned(FItems) then
   begin
     dsDataTable.DataTable := FItems.DataTable;
-    frViewListaTraspasos1.dsDataSource.DataTable := FItems.DataTable;
+    frViewListaTraspasos1.Items := FItems;
   end;
 end;
 
@@ -108,8 +109,6 @@ begin
   if not Assigned(ViewGrid) then
     raise Exception.Create('No hay una vista asignada');
 
-  FItems.DataTable.Active := True;
-
   with (ViewGrid as IViewListaTraspasos) do
   begin
     VerPendientes;
@@ -118,40 +117,11 @@ begin
   end;
 end;
 
-procedure TfEditorListaTraspasos.JvTabBar1TabSelected(
+procedure TfEditorListaTraspasos.JvTabBar1TabSelected(Sender: TObject; Item: TJvTabBarItem);
-  Sender: TObject; Item: TJvTabBarItem);
 begin
-  inherited;
+  if Items.DataTable.Active then
-  ShowHourglassCursor;
      Items.DataTable.Active := False;
-  Application.ProcessMessages;
+  frViewListaTraspasos1.frViewParametrosCentro1.LimpiarSeleccion;
-  ViewGrid._FocusedView.BeginUpdate;
-  Application.ProcessMessages;
-  try
-    case Item.Index of
-      0     : begin
-                Items := dmTraspasos.GetItems(titPendiente);
-                (ViewGrid as IViewListaTraspasos).VerPendientes;
-              end;
-
-      1     : begin
-                Items := dmTraspasos.GetItems(titAprobado);
-                (ViewGrid as IViewListaTraspasos).VerAprobados;
-              end;
-
-      2     : begin
-                Items := dmTraspasos.GetItems;
-                (ViewGrid as IViewListaTraspasos).VerTodos;
-              end;
-    end;
-  finally
-    dsDataTable.DataTable := Items.DataTable;
-    ViewGrid._FocusedView.EndUpdate;
-    Items.DataTable.Active := True;
-    ViewGrid.ContraerTodo;
-    ViewGrid.GotoFirst;
-    HideHourglassCursor;
-  end;
 end;
 
 procedure TfEditorListaTraspasos.actModificarExecute(
@@ -216,11 +186,42 @@ begin
      not (ViewGrid._FocusedView.Controller.FocusedRow.Expandable))
 end;
 
-procedure TfEditorListaTraspasos.actRefrescarExecute(
+procedure TfEditorListaTraspasos.actRefrescarExecute(Sender: TObject);
-  Sender: TObject);
 begin
+  ShowHourglassCursor;
+  Items.DataTable.Active := False;
+  Application.ProcessMessages;
+  ViewGrid._FocusedView.BeginUpdate;
+  Application.ProcessMessages;
+  try
+    case JvTabBar1.SelectedTab.Index of
+      0     : begin
+                Items := dmTraspasos.GetItems(titPendiente);
+                (ViewGrid as IViewListaTraspasos).VerPendientes;
+              end;
+
+      1     : begin
+                Items := dmTraspasos.GetItems(titAprobado);
+                (ViewGrid as IViewListaTraspasos).VerAprobados;
+              end;
+
+      2     : begin
+                Items := dmTraspasos.GetItems;
+                (ViewGrid as IViewListaTraspasos).VerTodos;
+              end;
+    end;
+
+    frViewListaTraspasos1.Refresh;
     inherited;
+
+  finally
+    dsDataTable.DataTable := Items.DataTable;
+    ViewGrid._FocusedView.EndUpdate;
+    Items.DataTable.Active := True;
+    ViewGrid.ContraerTodo;
     ViewGrid.GotoFirst;
+    HideHourglassCursor;
+  end;
 end;
 
 procedure TfEditorListaTraspasos.actPendienteExecute(
@@ -269,7 +270,8 @@ begin
   begin
     ShowHourglassCursor;
     bm := FItems.DataTable.GetBookMark;
-    FItems.DataTable.DisableControls;
+//    FItems.DataTable.DisableControls;
+    ViewGrid._FocusedView.BeginUpdate;
     try
       for i := 0 to ViewGrid._FocusedView.Controller.SelectedRecordCount-1 do
       begin
@@ -286,8 +288,12 @@ begin
       FItems.DataTable.GotoBookMark(bm);
     finally
       FItems.DataTable.FreeBookMark(BM);
-      FItems.DataTable.EnableControls;
+//      FItems.DataTable.EnableControls;
       ViewGrid._FocusedView.Controller.ClearSelection;
+      ViewGrid._FocusedView.EndUpdate;
+      PostMessage(Handle, CM_SETFOCUSEDRECORD, Integer(ViewGrid._FocusedView),
+        MakeLParam(ViewGrid._FocusedView.Controller.FocusedRowIndex,
+        ViewGrid._FocusedView.Controller.TopRowIndex));
       HideHourglassCursor;
     end;
   end;

Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.dfm

@@ -1,9 +1,14 @@
 inherited frViewListaTraspasos: TfrViewListaTraspasos
   Width = 676
   Height = 486
+  ExplicitWidth = 676
+  ExplicitHeight = 486
   inherited cxGrid: TcxGrid
+    Top = 60
     Width = 676
-    Height = 486
+    Height = 426
+    ExplicitWidth = 676
+    ExplicitHeight = 486
     inherited cxGridView: TcxGridDBTableView
       OnMouseDown = cxGridViewMouseDown
       FilterBox.Visible = fvNever
@@ -199,7 +204,86 @@ inherited frViewListaTraspasos: TfrViewListaTraspasos
       end
     end
   end
+  object TBXDockablePanel1: TTBXDockablePanel [1]
+    Left = 0
+    Top = 0
+    MaxClientHeight = 61
+    Align = alTop
+    Caption = 'TBXDockablePanel1'
+    DockedWidth = 32
+    DockedHeight = 32
+    FloatingWidth = 128
+    FloatingHeight = 60
+    SupportedDocks = [dkStandardDock, dkMultiDock]
+    TabOrder = 1
+    ExplicitLeft = 8
+    ExplicitTop = 8
+    ExplicitWidth = 128
+    inline frViewParametrosCentro1: TfrViewParametrosCentro
+      Left = 0
+      Top = 19
+      Width = 425
+      Height = 41
+      Align = alLeft
+      TabOrder = 0
+      ReadOnly = False
+      ExplicitTop = 19
+      ExplicitWidth = 425
+      ExplicitHeight = 41
+      inherited dxLayoutControl1: TdxLayoutControl
+        Width = 425
+        ExplicitWidth = 425
+        inherited ccbCentro: TJvCheckedComboBox
+          Width = 392
+          ExplicitWidth = 392
+        end
+      end
+    end
+    object TBXLabel1: TTBXLabel
+      Left = 0
+      Top = 0
+      Width = 676
+      Height = 19
+      Margins.Left = 5
+      Margins.Top = 5
+      Align = alTop
+      Caption = 'Par'#225'metros de consulta'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'MS Sans Serif'
+      Font.Style = [fsBold]
+      ParentColor = True
+      ParentFont = False
+      Underline = True
+      ExplicitWidth = 128
+      ExplicitHeight = 32
+    end
+    object pnlAgrupaciones: TTBXAlignmentPanel
+      Left = 425
+      Top = 19
+      Width = 251
+      Height = 41
+      Align = alClient
+      AutoSize = True
+      TabOrder = 2
+      ExplicitWidth = 41
+      object TBXButton3: TTBXButton
+        Tag = 3
+        Left = 8
+        Top = 10
+        Width = 90
+        Height = 21
+        AutoSize = False
+        Caption = 'Consultar'
+        ImageIndex = 0
+        TabOrder = 0
+        Wrapping = twEndEllipsis
+      end
+    end
+  end
   inherited dsDataSource: TDADataSource
+    DataSet = tbl_TraspasosPendientes.Dataset
     DataTable = dmTraspasos.tbl_TraspasosPendientes
     Top = 120
   end

Source/Modulos/Traspasos/Cliente/uViewListaTraspasos.pas

@@ -20,7 +20,8 @@ uses
   dxPSFillPatterns, dxPSEdgePatterns, cxCalendar, cxTextEdit,
   cxCurrencyEdit, dxPSCore, uDADataTable, StdCtrls, cxGridBandedTableView,
   cxGridDBBandedTableView, cxImageComboBox, ImgList, PngImageList,
-  dxPScxCommon, dxPScxGridLnk, cxMemo;
+  dxPScxCommon, dxPScxGridLnk, cxMemo, TBXDkPanels, uCustomView, uViewBase,
+   uViewParametrosCentro, TB2Dock, uDAInterfaces, uViewParametrosControlGrid;
 
 type
   IViewListaTraspasos = interface(IViewGrid)
@@ -28,6 +29,10 @@ type
     procedure VerPendientes;
     procedure VerAprobados;
     procedure VerTodos;
+
+    function GetItems: IBizTraspasos;
+    procedure SetItems(const Value: IBizTraspasos);
+    property Items: IBizTraspasos read GetItems write SetItems;
   end;
 
   TfrViewListaTraspasos = class(TfrViewGrid, IViewListaTraspasos)
@@ -73,6 +78,11 @@ type
     cxStyleCentro2: TcxStyle;
     cxGridViewObservaciones: TcxGridDBColumn;
     cxStyleObservacionesInforme: TcxStyle;
+    TBXDockablePanel1: TTBXDockablePanel;
+    frViewParametrosCentro1: TfrViewParametrosCentro;
+    TBXLabel1: TTBXLabel;
+    pnlAgrupaciones: TTBXAlignmentPanel;
+    TBXButton3: TTBXButton;
     procedure cxGridViewMouseDown(Sender: TObject; Button: TMouseButton;
       Shift: TShiftState; X, Y: Integer);
     procedure cxGridBandedViewRR38GetDisplayText(
@@ -130,16 +140,24 @@ type
       ARecord: TcxCustomGridRecord; AColumn: TcxGridColumn;
       AnItem: TAbstractdxReportCellData);
   protected
+    FItems: IBizTraspasos;
     FTipo : String;
     FNivelFiltrado : TcxFilterCriteriaItemList;
     procedure FilterChanged(Sender: TObject); override;
+    function GetItems: IBizTraspasos;
+    procedure SetItems(const Value: IBizTraspasos);
+
   public
+    property Items: IBizTraspasos read GetItems write SetItems;
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
     procedure Preview; override;
     procedure Print; override;
     procedure PrintSetup; override;
     procedure VerPendientes;
     procedure VerAprobados;
     procedure VerTodos;
+    procedure Refresh;
   end;
 
 
@@ -259,6 +277,79 @@ begin
   dxComponentPrinterLink1.PageSetup;
 end;
 
+procedure TfrViewListaTraspasos.Refresh;
+var
+  ACentrosList : TStringList;
+  AWhereCentro : String;
+  AWhereCentro2 : String;  
+  AWhere : String;
+  i : integer;
+begin
+  ACentrosList := Nil;
+
+  if Assigned(FItems) then
+     Items.DataTable.Active := False;
+  ACentrosList := frViewParametrosCentro1.CentrosSeleccionados;
+
+  ShowHourglassCursor;
+  try
+    if Assigned(ACentrosList) then
+    begin
+       AWhereCentro := '';
+       AWhereCentro2 := '';       
+       if ACentrosList.Count = 0 then
+       begin
+          ShowMessage('Debe seleccionar al menos un centro en los parámetros de la consulta.');
+          Exit;
+       end
+       else begin
+          AWhereCentro := AWhereCentro + ' FILIAL in (';
+          AWhereCentro2 := AWhereCentro2 + ' FILIAL2 in (';          
+          for i := 0 to ACentrosList.Count - 1 do
+          begin
+            if i > 0 then
+            begin
+              AWhereCentro := AWhereCentro + ', ';
+              AWhereCentro2 := AWhereCentro2 + ', ';
+            end;
+            AWhereCentro := AWhereCentro + '''' + ACentrosList[i] + '''';
+            AWhereCentro2 := AWhereCentro2 + '''' + ACentrosList[i] + '''';
+          end;
+          AWhereCentro := AWhereCentro + ')';
+          AWhereCentro2 := AWhereCentro2 + ')';
+        end;
+    end;
+
+    AWhere := '';
+    if AWhereCentro <> '' then
+    begin
+       AWhere := AWhere + AWhereCentro + ' OR ' + AWhereCentro2;
+    end;
+
+    Items.DataTable.Where.Clear;
+    Items.DataTable.Where.AddText(AWhere, False);
+    Items.DataTable.Active := True;
+
+  finally
+    HideHourglassCursor;
+    FreeAndNIL(ACentrosList);
+  end;
+end;
+
+constructor TfrViewListaTraspasos.Create(AOwner: TComponent);
+begin
+  inherited;
+  FItems := Nil;
+  frViewParametrosCentro1.Refresh;
+end;
+
+procedure TfrViewListaTraspasos.SetItems(const Value: IBizTraspasos);
+begin
+  FItems := Value;
+  if Assigned(FItems) then
+     dsDataSource.DataTable := FItems.DataTable;
+end;
+
 procedure TfrViewListaTraspasos.cxGridBandedViewCODIGOGetDisplayText(
   Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
   var AText: String);
@@ -453,6 +544,12 @@ begin
   end;
 end;
 
+destructor TfrViewListaTraspasos.Destroy;
+begin
+  FItems := Nil;
+  inherited;
+end;
+
 procedure TfrViewListaTraspasos.cxGridViewCODIGOGetDataText(
   Sender: TcxCustomGridTableItem; ARecordIndex: Integer;
   var AText: String);
@@ -551,4 +648,9 @@ begin
   cxGridView.DataController.Filter.EndUpdate;
 end;
 
+function TfrViewListaTraspasos.GetItems: IBizTraspasos;
+begin
+  Result := FItems;
+end;
+
 end.

Source/Modulos/VentasTerminadas/Cliente/uDataModuleVentasTerminadas.dfm

@@ -523,31 +523,36 @@ object dmVentasTerminadas: TdmVentasTerminadas
       end
       item
         Name = 'VALTERMDEV'
-        DataType = datDecimal
+        DataType = datCurrency
+        DecimalPrecision = 2
         DisplayLabel = 'Val.Term/Dev'
         Alignment = taRightJustify
       end
       item
         Name = 'VALFINALRESC'
-        DataType = datDecimal
+        DataType = datCurrency
+        DecimalPrecision = 2
         DisplayLabel = 'Val.Final/Resc'
         Alignment = taRightJustify
       end
       item
         Name = 'VALVEN'
-        DataType = datDecimal
+        DataType = datCurrency
+        DecimalPrecision = 2
         DisplayLabel = 'Imp. ventas'
         Alignment = taRightJustify
       end
       item
         Name = 'VALDEV'
-        DataType = datDecimal
+        DataType = datCurrency
+        DecimalPrecision = 2
         DisplayLabel = 'Imp. devoluciones'
         Alignment = taRightJustify
       end
       item
         Name = 'VALTOT'
-        DataType = datDecimal
+        DataType = datCurrency
+        DecimalPrecision = 2
         DisplayLabel = 'Imp. Total'
         Alignment = taRightJustify
       end>

Source/Modulos/VentasTerminadas/Reglas/schVentasTerminadasClient_Intf.pas

@@ -9,8 +9,8 @@ const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_VentasTerminadasCrossTab = '{2E68D174-CE7E-4597-A951-7670FA84D874}';
+  RID_VentasTerminadasCrossTab = '{E35531EF-55AE-4A00-823F-5B7AD2AC3170}';
-  RID_VentasTerminadas = '{F20667F0-C1D2-4500-8E10-1B8577467C80}';
+  RID_VentasTerminadas = '{D098E936-4B28-485D-8B90-913C71342300}';
 
   { Data table names }
   nme_VentasTerminadasCrossTab = 'VentasTerminadasCrossTab';
@@ -97,7 +97,7 @@ const
 type
   { IVentasTerminadasCrossTab }
   IVentasTerminadasCrossTab = interface(IDAStronglyTypedDataTable)
-  ['{F1FA92FE-5A97-4645-A93A-CAFA9775A238}']
+  ['{7F43FB66-B68A-4E2E-BF67-E314FDE24117}']
     { Property getters and setters }
 
 
@@ -120,7 +120,7 @@ type
 
   { IVentasTerminadas }
   IVentasTerminadas = interface(IDAStronglyTypedDataTable)
-  ['{78DAAFC9-9EAE-4237-B301-3103B6C18EF2}']
+  ['{6861A381-9EBD-4816-8EAC-5B2EDB0ED191}']
     { Property getters and setters }
     function GetNUMINFValue: String;
     procedure SetNUMINFValue(const aValue: String);
@@ -242,24 +242,24 @@ type
     procedure SetTOTALValue(const aValue: TBcd);
     function GetTOTALIsNull: Boolean;
     procedure SetTOTALIsNull(const aValue: Boolean);
-    function GetVALTERMDEVValue: TBcd;
+    function GetVALTERMDEVValue: Currency;
-    procedure SetVALTERMDEVValue(const aValue: TBcd);
+    procedure SetVALTERMDEVValue(const aValue: Currency);
     function GetVALTERMDEVIsNull: Boolean;
     procedure SetVALTERMDEVIsNull(const aValue: Boolean);
-    function GetVALFINALRESCValue: TBcd;
+    function GetVALFINALRESCValue: Currency;
-    procedure SetVALFINALRESCValue(const aValue: TBcd);
+    procedure SetVALFINALRESCValue(const aValue: Currency);
     function GetVALFINALRESCIsNull: Boolean;
     procedure SetVALFINALRESCIsNull(const aValue: Boolean);
-    function GetVALVENValue: TBcd;
+    function GetVALVENValue: Currency;
-    procedure SetVALVENValue(const aValue: TBcd);
+    procedure SetVALVENValue(const aValue: Currency);
     function GetVALVENIsNull: Boolean;
     procedure SetVALVENIsNull(const aValue: Boolean);
-    function GetVALDEVValue: TBcd;
+    function GetVALDEVValue: Currency;
-    procedure SetVALDEVValue(const aValue: TBcd);
+    procedure SetVALDEVValue(const aValue: Currency);
     function GetVALDEVIsNull: Boolean;
     procedure SetVALDEVIsNull(const aValue: Boolean);
-    function GetVALTOTValue: TBcd;
+    function GetVALTOTValue: Currency;
-    procedure SetVALTOTValue(const aValue: TBcd);
+    procedure SetVALTOTValue(const aValue: Currency);
     function GetVALTOTIsNull: Boolean;
     procedure SetVALTOTIsNull(const aValue: Boolean);
 
@@ -325,15 +325,15 @@ type
     property DEVOLUCIONESIsNull: Boolean read GetDEVOLUCIONESIsNull write SetDEVOLUCIONESIsNull;
     property TOTAL: TBcd read GetTOTALValue write SetTOTALValue;
     property TOTALIsNull: Boolean read GetTOTALIsNull write SetTOTALIsNull;
-    property VALTERMDEV: TBcd read GetVALTERMDEVValue write SetVALTERMDEVValue;
+    property VALTERMDEV: Currency read GetVALTERMDEVValue write SetVALTERMDEVValue;
     property VALTERMDEVIsNull: Boolean read GetVALTERMDEVIsNull write SetVALTERMDEVIsNull;
-    property VALFINALRESC: TBcd read GetVALFINALRESCValue write SetVALFINALRESCValue;
+    property VALFINALRESC: Currency read GetVALFINALRESCValue write SetVALFINALRESCValue;
     property VALFINALRESCIsNull: Boolean read GetVALFINALRESCIsNull write SetVALFINALRESCIsNull;
-    property VALVEN: TBcd read GetVALVENValue write SetVALVENValue;
+    property VALVEN: Currency read GetVALVENValue write SetVALVENValue;
     property VALVENIsNull: Boolean read GetVALVENIsNull write SetVALVENIsNull;
-    property VALDEV: TBcd read GetVALDEVValue write SetVALDEVValue;
+    property VALDEV: Currency read GetVALDEVValue write SetVALDEVValue;
     property VALDEVIsNull: Boolean read GetVALDEVIsNull write SetVALDEVIsNull;
-    property VALTOT: TBcd read GetVALTOTValue write SetVALTOTValue;
+    property VALTOT: Currency read GetVALTOTValue write SetVALTOTValue;
     property VALTOTIsNull: Boolean read GetVALTOTIsNull write SetVALTOTIsNull;
   end;
 
@@ -462,24 +462,24 @@ type
     procedure SetTOTALValue(const aValue: TBcd); virtual;
     function GetTOTALIsNull: Boolean; virtual;
     procedure SetTOTALIsNull(const aValue: Boolean); virtual;
-    function GetVALTERMDEVValue: TBcd; virtual;
+    function GetVALTERMDEVValue: Currency; virtual;
-    procedure SetVALTERMDEVValue(const aValue: TBcd); virtual;
+    procedure SetVALTERMDEVValue(const aValue: Currency); virtual;
     function GetVALTERMDEVIsNull: Boolean; virtual;
     procedure SetVALTERMDEVIsNull(const aValue: Boolean); virtual;
-    function GetVALFINALRESCValue: TBcd; virtual;
+    function GetVALFINALRESCValue: Currency; virtual;
-    procedure SetVALFINALRESCValue(const aValue: TBcd); virtual;
+    procedure SetVALFINALRESCValue(const aValue: Currency); virtual;
     function GetVALFINALRESCIsNull: Boolean; virtual;
     procedure SetVALFINALRESCIsNull(const aValue: Boolean); virtual;
-    function GetVALVENValue: TBcd; virtual;
+    function GetVALVENValue: Currency; virtual;
-    procedure SetVALVENValue(const aValue: TBcd); virtual;
+    procedure SetVALVENValue(const aValue: Currency); virtual;
     function GetVALVENIsNull: Boolean; virtual;
     procedure SetVALVENIsNull(const aValue: Boolean); virtual;
-    function GetVALDEVValue: TBcd; virtual;
+    function GetVALDEVValue: Currency; virtual;
-    procedure SetVALDEVValue(const aValue: TBcd); virtual;
+    procedure SetVALDEVValue(const aValue: Currency); virtual;
     function GetVALDEVIsNull: Boolean; virtual;
     procedure SetVALDEVIsNull(const aValue: Boolean); virtual;
-    function GetVALTOTValue: TBcd; virtual;
+    function GetVALTOTValue: Currency; virtual;
-    procedure SetVALTOTValue(const aValue: TBcd); virtual;
+    procedure SetVALTOTValue(const aValue: Currency); virtual;
     function GetVALTOTIsNull: Boolean; virtual;
     procedure SetVALTOTIsNull(const aValue: Boolean); virtual;
 
@@ -544,15 +544,15 @@ type
     property DEVOLUCIONESIsNull: Boolean read GetDEVOLUCIONESIsNull write SetDEVOLUCIONESIsNull;
     property TOTAL: TBcd read GetTOTALValue write SetTOTALValue;
     property TOTALIsNull: Boolean read GetTOTALIsNull write SetTOTALIsNull;
-    property VALTERMDEV: TBcd read GetVALTERMDEVValue write SetVALTERMDEVValue;
+    property VALTERMDEV: Currency read GetVALTERMDEVValue write SetVALTERMDEVValue;
     property VALTERMDEVIsNull: Boolean read GetVALTERMDEVIsNull write SetVALTERMDEVIsNull;
-    property VALFINALRESC: TBcd read GetVALFINALRESCValue write SetVALFINALRESCValue;
+    property VALFINALRESC: Currency read GetVALFINALRESCValue write SetVALFINALRESCValue;
     property VALFINALRESCIsNull: Boolean read GetVALFINALRESCIsNull write SetVALFINALRESCIsNull;
-    property VALVEN: TBcd read GetVALVENValue write SetVALVENValue;
+    property VALVEN: Currency read GetVALVENValue write SetVALVENValue;
     property VALVENIsNull: Boolean read GetVALVENIsNull write SetVALVENIsNull;
-    property VALDEV: TBcd read GetVALDEVValue write SetVALDEVValue;
+    property VALDEV: Currency read GetVALDEVValue write SetVALDEVValue;
     property VALDEVIsNull: Boolean read GetVALDEVIsNull write SetVALDEVIsNull;
-    property VALTOT: TBcd read GetVALTOTValue write SetVALTOTValue;
+    property VALTOT: Currency read GetVALTOTValue write SetVALTOTValue;
     property VALTOTIsNull: Boolean read GetVALTOTIsNull write SetVALTOTIsNull;
 
   public
@@ -1218,14 +1218,14 @@ begin
     DataTable.Fields[idx_VentasTerminadasTOTAL].AsVariant := Null;
 end;
 
-function TVentasTerminadasDataTableRules.GetVALTERMDEVValue: TBcd;
+function TVentasTerminadasDataTableRules.GetVALTERMDEVValue: Currency;
 begin
-  result := DataTable.Fields[idx_VentasTerminadasVALTERMDEV].AsDecimal;
+  result := DataTable.Fields[idx_VentasTerminadasVALTERMDEV].AsCurrency;
 end;
 
-procedure TVentasTerminadasDataTableRules.SetVALTERMDEVValue(const aValue: TBcd);
+procedure TVentasTerminadasDataTableRules.SetVALTERMDEVValue(const aValue: Currency);
 begin
-  DataTable.Fields[idx_VentasTerminadasVALTERMDEV].AsDecimal := aValue;
+  DataTable.Fields[idx_VentasTerminadasVALTERMDEV].AsCurrency := aValue;
 end;
 
 function TVentasTerminadasDataTableRules.GetVALTERMDEVIsNull: boolean;
@@ -1239,14 +1239,14 @@ begin
     DataTable.Fields[idx_VentasTerminadasVALTERMDEV].AsVariant := Null;
 end;
 
-function TVentasTerminadasDataTableRules.GetVALFINALRESCValue: TBcd;
+function TVentasTerminadasDataTableRules.GetVALFINALRESCValue: Currency;
 begin
-  result := DataTable.Fields[idx_VentasTerminadasVALFINALRESC].AsDecimal;
+  result := DataTable.Fields[idx_VentasTerminadasVALFINALRESC].AsCurrency;
 end;
 
-procedure TVentasTerminadasDataTableRules.SetVALFINALRESCValue(const aValue: TBcd);
+procedure TVentasTerminadasDataTableRules.SetVALFINALRESCValue(const aValue: Currency);
 begin
-  DataTable.Fields[idx_VentasTerminadasVALFINALRESC].AsDecimal := aValue;
+  DataTable.Fields[idx_VentasTerminadasVALFINALRESC].AsCurrency := aValue;
 end;
 
 function TVentasTerminadasDataTableRules.GetVALFINALRESCIsNull: boolean;
@@ -1260,14 +1260,14 @@ begin
     DataTable.Fields[idx_VentasTerminadasVALFINALRESC].AsVariant := Null;
 end;
 
-function TVentasTerminadasDataTableRules.GetVALVENValue: TBcd;
+function TVentasTerminadasDataTableRules.GetVALVENValue: Currency;
 begin
-  result := DataTable.Fields[idx_VentasTerminadasVALVEN].AsDecimal;
+  result := DataTable.Fields[idx_VentasTerminadasVALVEN].AsCurrency;
 end;
 
-procedure TVentasTerminadasDataTableRules.SetVALVENValue(const aValue: TBcd);
+procedure TVentasTerminadasDataTableRules.SetVALVENValue(const aValue: Currency);
 begin
-  DataTable.Fields[idx_VentasTerminadasVALVEN].AsDecimal := aValue;
+  DataTable.Fields[idx_VentasTerminadasVALVEN].AsCurrency := aValue;
 end;
 
 function TVentasTerminadasDataTableRules.GetVALVENIsNull: boolean;
@@ -1281,14 +1281,14 @@ begin
     DataTable.Fields[idx_VentasTerminadasVALVEN].AsVariant := Null;
 end;
 
-function TVentasTerminadasDataTableRules.GetVALDEVValue: TBcd;
+function TVentasTerminadasDataTableRules.GetVALDEVValue: Currency;
 begin
-  result := DataTable.Fields[idx_VentasTerminadasVALDEV].AsDecimal;
+  result := DataTable.Fields[idx_VentasTerminadasVALDEV].AsCurrency;
 end;
 
-procedure TVentasTerminadasDataTableRules.SetVALDEVValue(const aValue: TBcd);
+procedure TVentasTerminadasDataTableRules.SetVALDEVValue(const aValue: Currency);
 begin
-  DataTable.Fields[idx_VentasTerminadasVALDEV].AsDecimal := aValue;
+  DataTable.Fields[idx_VentasTerminadasVALDEV].AsCurrency := aValue;
 end;
 
 function TVentasTerminadasDataTableRules.GetVALDEVIsNull: boolean;
@@ -1302,14 +1302,14 @@ begin
     DataTable.Fields[idx_VentasTerminadasVALDEV].AsVariant := Null;
 end;
 
-function TVentasTerminadasDataTableRules.GetVALTOTValue: TBcd;
+function TVentasTerminadasDataTableRules.GetVALTOTValue: Currency;
 begin
-  result := DataTable.Fields[idx_VentasTerminadasVALTOT].AsDecimal;
+  result := DataTable.Fields[idx_VentasTerminadasVALTOT].AsCurrency;
 end;
 
-procedure TVentasTerminadasDataTableRules.SetVALTOTValue(const aValue: TBcd);
+procedure TVentasTerminadasDataTableRules.SetVALTOTValue(const aValue: Currency);
 begin
-  DataTable.Fields[idx_VentasTerminadasVALTOT].AsDecimal := aValue;
+  DataTable.Fields[idx_VentasTerminadasVALTOT].AsCurrency := aValue;
 end;
 
 function TVentasTerminadasDataTableRules.GetVALTOTIsNull: boolean;

Source/Modulos/VentasTerminadas/Reglas/schVentasTerminadasServer_Intf.pas

@@ -9,13 +9,13 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_VentasTerminadasCrossTabDelta = '{450CE6EB-71EE-4A59-9D2A-558F4D5346A3}';
+  RID_VentasTerminadasCrossTabDelta = '{D13D1DE1-ED2A-4146-8D79-6B99529AC6CB}';
-  RID_VentasTerminadasDelta = '{05A89678-2248-4B09-9BEC-354E07FD2CE5}';
+  RID_VentasTerminadasDelta = '{D00EC469-4C92-48AF-BDC3-D946B20C1A47}';
 
 type
   { IVentasTerminadasCrossTabDelta }
   IVentasTerminadasCrossTabDelta = interface(IVentasTerminadasCrossTab)
-  ['{450CE6EB-71EE-4A59-9D2A-558F4D5346A3}']
+  ['{D13D1DE1-ED2A-4146-8D79-6B99529AC6CB}']
     { Property getters and setters }
 
     { Properties }
@@ -37,7 +37,7 @@ type
 
   { IVentasTerminadasDelta }
   IVentasTerminadasDelta = interface(IVentasTerminadas)
-  ['{05A89678-2248-4B09-9BEC-354E07FD2CE5}']
+  ['{D00EC469-4C92-48AF-BDC3-D946B20C1A47}']
     { Property getters and setters }
     function GetOldNUMINFValue : String;
     function GetOldCLAVE1Value : TBcd;
@@ -69,11 +69,11 @@ type
     function GetOldVENTASValue : TBcd;
     function GetOldDEVOLUCIONESValue : TBcd;
     function GetOldTOTALValue : TBcd;
-    function GetOldVALTERMDEVValue : TBcd;
+    function GetOldVALTERMDEVValue : Currency;
-    function GetOldVALFINALRESCValue : TBcd;
+    function GetOldVALFINALRESCValue : Currency;
-    function GetOldVALVENValue : TBcd;
+    function GetOldVALVENValue : Currency;
-    function GetOldVALDEVValue : TBcd;
+    function GetOldVALDEVValue : Currency;
-    function GetOldVALTOTValue : TBcd;
+    function GetOldVALTOTValue : Currency;
 
     { Properties }
     property OldNUMINF : String read GetOldNUMINFValue;
@@ -106,11 +106,11 @@ type
     property OldVENTAS : TBcd read GetOldVENTASValue;
     property OldDEVOLUCIONES : TBcd read GetOldDEVOLUCIONESValue;
     property OldTOTAL : TBcd read GetOldTOTALValue;
-    property OldVALTERMDEV : TBcd read GetOldVALTERMDEVValue;
+    property OldVALTERMDEV : Currency read GetOldVALTERMDEVValue;
-    property OldVALFINALRESC : TBcd read GetOldVALFINALRESCValue;
+    property OldVALFINALRESC : Currency read GetOldVALFINALRESCValue;
-    property OldVALVEN : TBcd read GetOldVALVENValue;
+    property OldVALVEN : Currency read GetOldVALVENValue;
-    property OldVALDEV : TBcd read GetOldVALDEVValue;
+    property OldVALDEV : Currency read GetOldVALDEVValue;
-    property OldVALTOT : TBcd read GetOldVALTOTValue;
+    property OldVALTOT : Currency read GetOldVALTOTValue;
   end;
 
   { TVentasTerminadasBusinessProcessorRules }
@@ -298,35 +298,35 @@ type
     function GetOldTOTALIsNull: Boolean; virtual;
     procedure SetTOTALValue(const aValue: TBcd); virtual;
     procedure SetTOTALIsNull(const aValue: Boolean); virtual;
-    function GetVALTERMDEVValue: TBcd; virtual;
+    function GetVALTERMDEVValue: Currency; virtual;
     function GetVALTERMDEVIsNull: Boolean; virtual;
-    function GetOldVALTERMDEVValue: TBcd; virtual;
+    function GetOldVALTERMDEVValue: Currency; virtual;
     function GetOldVALTERMDEVIsNull: Boolean; virtual;
-    procedure SetVALTERMDEVValue(const aValue: TBcd); virtual;
+    procedure SetVALTERMDEVValue(const aValue: Currency); virtual;
     procedure SetVALTERMDEVIsNull(const aValue: Boolean); virtual;
-    function GetVALFINALRESCValue: TBcd; virtual;
+    function GetVALFINALRESCValue: Currency; virtual;
     function GetVALFINALRESCIsNull: Boolean; virtual;
-    function GetOldVALFINALRESCValue: TBcd; virtual;
+    function GetOldVALFINALRESCValue: Currency; virtual;
     function GetOldVALFINALRESCIsNull: Boolean; virtual;
-    procedure SetVALFINALRESCValue(const aValue: TBcd); virtual;
+    procedure SetVALFINALRESCValue(const aValue: Currency); virtual;
     procedure SetVALFINALRESCIsNull(const aValue: Boolean); virtual;
-    function GetVALVENValue: TBcd; virtual;
+    function GetVALVENValue: Currency; virtual;
     function GetVALVENIsNull: Boolean; virtual;
-    function GetOldVALVENValue: TBcd; virtual;
+    function GetOldVALVENValue: Currency; virtual;
     function GetOldVALVENIsNull: Boolean; virtual;
-    procedure SetVALVENValue(const aValue: TBcd); virtual;
+    procedure SetVALVENValue(const aValue: Currency); virtual;
     procedure SetVALVENIsNull(const aValue: Boolean); virtual;
-    function GetVALDEVValue: TBcd; virtual;
+    function GetVALDEVValue: Currency; virtual;
     function GetVALDEVIsNull: Boolean; virtual;
-    function GetOldVALDEVValue: TBcd; virtual;
+    function GetOldVALDEVValue: Currency; virtual;
     function GetOldVALDEVIsNull: Boolean; virtual;
-    procedure SetVALDEVValue(const aValue: TBcd); virtual;
+    procedure SetVALDEVValue(const aValue: Currency); virtual;
     procedure SetVALDEVIsNull(const aValue: Boolean); virtual;
-    function GetVALTOTValue: TBcd; virtual;
+    function GetVALTOTValue: Currency; virtual;
     function GetVALTOTIsNull: Boolean; virtual;
-    function GetOldVALTOTValue: TBcd; virtual;
+    function GetOldVALTOTValue: Currency; virtual;
     function GetOldVALTOTIsNull: Boolean; virtual;
-    procedure SetVALTOTValue(const aValue: TBcd); virtual;
+    procedure SetVALTOTValue(const aValue: Currency); virtual;
     procedure SetVALTOTIsNull(const aValue: Boolean); virtual;
 
     { Properties }
@@ -450,25 +450,25 @@ type
     property TOTALIsNull : Boolean read GetTOTALIsNull write SetTOTALIsNull;
     property OldTOTAL : TBcd read GetOldTOTALValue;
     property OldTOTALIsNull : Boolean read GetOldTOTALIsNull;
-    property VALTERMDEV : TBcd read GetVALTERMDEVValue write SetVALTERMDEVValue;
+    property VALTERMDEV : Currency read GetVALTERMDEVValue write SetVALTERMDEVValue;
     property VALTERMDEVIsNull : Boolean read GetVALTERMDEVIsNull write SetVALTERMDEVIsNull;
-    property OldVALTERMDEV : TBcd read GetOldVALTERMDEVValue;
+    property OldVALTERMDEV : Currency read GetOldVALTERMDEVValue;
     property OldVALTERMDEVIsNull : Boolean read GetOldVALTERMDEVIsNull;
-    property VALFINALRESC : TBcd read GetVALFINALRESCValue write SetVALFINALRESCValue;
+    property VALFINALRESC : Currency read GetVALFINALRESCValue write SetVALFINALRESCValue;
     property VALFINALRESCIsNull : Boolean read GetVALFINALRESCIsNull write SetVALFINALRESCIsNull;
-    property OldVALFINALRESC : TBcd read GetOldVALFINALRESCValue;
+    property OldVALFINALRESC : Currency read GetOldVALFINALRESCValue;
     property OldVALFINALRESCIsNull : Boolean read GetOldVALFINALRESCIsNull;
-    property VALVEN : TBcd read GetVALVENValue write SetVALVENValue;
+    property VALVEN : Currency read GetVALVENValue write SetVALVENValue;
     property VALVENIsNull : Boolean read GetVALVENIsNull write SetVALVENIsNull;
-    property OldVALVEN : TBcd read GetOldVALVENValue;
+    property OldVALVEN : Currency read GetOldVALVENValue;
     property OldVALVENIsNull : Boolean read GetOldVALVENIsNull;
-    property VALDEV : TBcd read GetVALDEVValue write SetVALDEVValue;
+    property VALDEV : Currency read GetVALDEVValue write SetVALDEVValue;
     property VALDEVIsNull : Boolean read GetVALDEVIsNull write SetVALDEVIsNull;
-    property OldVALDEV : TBcd read GetOldVALDEVValue;
+    property OldVALDEV : Currency read GetOldVALDEVValue;
     property OldVALDEVIsNull : Boolean read GetOldVALDEVIsNull;
-    property VALTOT : TBcd read GetVALTOTValue write SetVALTOTValue;
+    property VALTOT : Currency read GetVALTOTValue write SetVALTOTValue;
     property VALTOTIsNull : Boolean read GetVALTOTIsNull write SetVALTOTIsNull;
-    property OldVALTOT : TBcd read GetOldVALTOTValue;
+    property OldVALTOT : Currency read GetOldVALTOTValue;
     property OldVALTOTIsNull : Boolean read GetOldVALTOTIsNull;
 
   public
@@ -1435,9 +1435,9 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasTOTAL] := Null;
 end;
 
-function TVentasTerminadasBusinessProcessorRules.GetVALTERMDEVValue: TBcd;
+function TVentasTerminadasBusinessProcessorRules.GetVALTERMDEVValue: Currency;
 begin
-  result := GetVarDecimal(BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALTERMDEV]);
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALTERMDEV];
 end;
 
 function TVentasTerminadasBusinessProcessorRules.GetVALTERMDEVIsNull: Boolean;
@@ -1445,9 +1445,9 @@ begin
   result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALTERMDEV]);
 end;
 
-function TVentasTerminadasBusinessProcessorRules.GetOldVALTERMDEVValue: TBcd;
+function TVentasTerminadasBusinessProcessorRules.GetOldVALTERMDEVValue: Currency;
 begin
-  result := GetVarDecimal(BusinessProcessor.CurrentChange.OldValueByName[fld_VentasTerminadasVALTERMDEV]);
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_VentasTerminadasVALTERMDEV];
 end;
 
 function TVentasTerminadasBusinessProcessorRules.GetOldVALTERMDEVIsNull: Boolean;
@@ -1455,9 +1455,9 @@ begin
   result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_VentasTerminadasVALTERMDEV]);
 end;
 
-procedure TVentasTerminadasBusinessProcessorRules.SetVALTERMDEVValue(const aValue: TBcd);
+procedure TVentasTerminadasBusinessProcessorRules.SetVALTERMDEVValue(const aValue: Currency);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALTERMDEV] := BCDToVariant(aValue);
+  BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALTERMDEV] := aValue;
 end;
 
 procedure TVentasTerminadasBusinessProcessorRules.SetVALTERMDEVIsNull(const aValue: Boolean);
@@ -1466,9 +1466,9 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALTERMDEV] := Null;
 end;
 
-function TVentasTerminadasBusinessProcessorRules.GetVALFINALRESCValue: TBcd;
+function TVentasTerminadasBusinessProcessorRules.GetVALFINALRESCValue: Currency;
 begin
-  result := GetVarDecimal(BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALFINALRESC]);
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALFINALRESC];
 end;
 
 function TVentasTerminadasBusinessProcessorRules.GetVALFINALRESCIsNull: Boolean;
@@ -1476,9 +1476,9 @@ begin
   result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALFINALRESC]);
 end;
 
-function TVentasTerminadasBusinessProcessorRules.GetOldVALFINALRESCValue: TBcd;
+function TVentasTerminadasBusinessProcessorRules.GetOldVALFINALRESCValue: Currency;
 begin
-  result := GetVarDecimal(BusinessProcessor.CurrentChange.OldValueByName[fld_VentasTerminadasVALFINALRESC]);
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_VentasTerminadasVALFINALRESC];
 end;
 
 function TVentasTerminadasBusinessProcessorRules.GetOldVALFINALRESCIsNull: Boolean;
@@ -1486,9 +1486,9 @@ begin
   result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_VentasTerminadasVALFINALRESC]);
 end;
 
-procedure TVentasTerminadasBusinessProcessorRules.SetVALFINALRESCValue(const aValue: TBcd);
+procedure TVentasTerminadasBusinessProcessorRules.SetVALFINALRESCValue(const aValue: Currency);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALFINALRESC] := BCDToVariant(aValue);
+  BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALFINALRESC] := aValue;
 end;
 
 procedure TVentasTerminadasBusinessProcessorRules.SetVALFINALRESCIsNull(const aValue: Boolean);
@@ -1497,9 +1497,9 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALFINALRESC] := Null;
 end;
 
-function TVentasTerminadasBusinessProcessorRules.GetVALVENValue: TBcd;
+function TVentasTerminadasBusinessProcessorRules.GetVALVENValue: Currency;
 begin
-  result := GetVarDecimal(BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALVEN]);
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALVEN];
 end;
 
 function TVentasTerminadasBusinessProcessorRules.GetVALVENIsNull: Boolean;
@@ -1507,9 +1507,9 @@ begin
   result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALVEN]);
 end;
 
-function TVentasTerminadasBusinessProcessorRules.GetOldVALVENValue: TBcd;
+function TVentasTerminadasBusinessProcessorRules.GetOldVALVENValue: Currency;
 begin
-  result := GetVarDecimal(BusinessProcessor.CurrentChange.OldValueByName[fld_VentasTerminadasVALVEN]);
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_VentasTerminadasVALVEN];
 end;
 
 function TVentasTerminadasBusinessProcessorRules.GetOldVALVENIsNull: Boolean;
@@ -1517,9 +1517,9 @@ begin
   result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_VentasTerminadasVALVEN]);
 end;
 
-procedure TVentasTerminadasBusinessProcessorRules.SetVALVENValue(const aValue: TBcd);
+procedure TVentasTerminadasBusinessProcessorRules.SetVALVENValue(const aValue: Currency);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALVEN] := BCDToVariant(aValue);
+  BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALVEN] := aValue;
 end;
 
 procedure TVentasTerminadasBusinessProcessorRules.SetVALVENIsNull(const aValue: Boolean);
@@ -1528,9 +1528,9 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALVEN] := Null;
 end;
 
-function TVentasTerminadasBusinessProcessorRules.GetVALDEVValue: TBcd;
+function TVentasTerminadasBusinessProcessorRules.GetVALDEVValue: Currency;
 begin
-  result := GetVarDecimal(BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALDEV]);
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALDEV];
 end;
 
 function TVentasTerminadasBusinessProcessorRules.GetVALDEVIsNull: Boolean;
@@ -1538,9 +1538,9 @@ begin
   result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALDEV]);
 end;
 
-function TVentasTerminadasBusinessProcessorRules.GetOldVALDEVValue: TBcd;
+function TVentasTerminadasBusinessProcessorRules.GetOldVALDEVValue: Currency;
 begin
-  result := GetVarDecimal(BusinessProcessor.CurrentChange.OldValueByName[fld_VentasTerminadasVALDEV]);
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_VentasTerminadasVALDEV];
 end;
 
 function TVentasTerminadasBusinessProcessorRules.GetOldVALDEVIsNull: Boolean;
@@ -1548,9 +1548,9 @@ begin
   result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_VentasTerminadasVALDEV]);
 end;
 
-procedure TVentasTerminadasBusinessProcessorRules.SetVALDEVValue(const aValue: TBcd);
+procedure TVentasTerminadasBusinessProcessorRules.SetVALDEVValue(const aValue: Currency);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALDEV] := BCDToVariant(aValue);
+  BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALDEV] := aValue;
 end;
 
 procedure TVentasTerminadasBusinessProcessorRules.SetVALDEVIsNull(const aValue: Boolean);
@@ -1559,9 +1559,9 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALDEV] := Null;
 end;
 
-function TVentasTerminadasBusinessProcessorRules.GetVALTOTValue: TBcd;
+function TVentasTerminadasBusinessProcessorRules.GetVALTOTValue: Currency;
 begin
-  result := GetVarDecimal(BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALTOT]);
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALTOT];
 end;
 
 function TVentasTerminadasBusinessProcessorRules.GetVALTOTIsNull: Boolean;
@@ -1569,9 +1569,9 @@ begin
   result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALTOT]);
 end;
 
-function TVentasTerminadasBusinessProcessorRules.GetOldVALTOTValue: TBcd;
+function TVentasTerminadasBusinessProcessorRules.GetOldVALTOTValue: Currency;
 begin
-  result := GetVarDecimal(BusinessProcessor.CurrentChange.OldValueByName[fld_VentasTerminadasVALTOT]);
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_VentasTerminadasVALTOT];
 end;
 
 function TVentasTerminadasBusinessProcessorRules.GetOldVALTOTIsNull: Boolean;
@@ -1579,9 +1579,9 @@ begin
   result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_VentasTerminadasVALTOT]);
 end;
 
-procedure TVentasTerminadasBusinessProcessorRules.SetVALTOTValue(const aValue: TBcd);
+procedure TVentasTerminadasBusinessProcessorRules.SetVALTOTValue(const aValue: Currency);
 begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALTOT] := BCDToVariant(aValue);
+  BusinessProcessor.CurrentChange.NewValueByName[fld_VentasTerminadasVALTOT] := aValue;
 end;
 
 procedure TVentasTerminadasBusinessProcessorRules.SetVALTOTIsNull(const aValue: Boolean);

Source/Modulos/VentasTerminadas/Servidor/srvVentasTerminadas_Impl.dfm

@@ -400,31 +400,39 @@ object srvVentasTerminadas: TsrvVentasTerminadas
           end
           item
             Name = 'VALTERMDEV'
-            DataType = datDecimal
+            DataType = datCurrency
+            DecimalPrecision = 2
             DisplayLabel = 'Val.Term/Dev'
             Alignment = taRightJustify
           end
           item
             Name = 'VALFINALRESC'
-            DataType = datDecimal
+            DataType = datCurrency
+            DecimalPrecision = 2
+            LogChanges = False
             DisplayLabel = 'Val.Final/Resc'
+            ReadOnly = True
             Alignment = taRightJustify
+            ServerCalculated = True
           end
           item
             Name = 'VALVEN'
-            DataType = datDecimal
+            DataType = datCurrency
+            DecimalPrecision = 2
             DisplayLabel = 'Imp. ventas'
             Alignment = taRightJustify
           end
           item
             Name = 'VALDEV'
-            DataType = datDecimal
+            DataType = datCurrency
+            DecimalPrecision = 2
             DisplayLabel = 'Imp. devoluciones'
             Alignment = taRightJustify
           end
           item
             Name = 'VALTOT'
-            DataType = datDecimal
+            DataType = datCurrency
+            DecimalPrecision = 2
             DisplayLabel = 'Imp. Total'
             Alignment = taRightJustify
           end>

Source/Servidor/AdminPV_Server.dpr

@@ -3,6 +3,8 @@ program AdminPV_Server;
 {#ROGEN:VARELA.rodl} // RemObjects: Careful, do not remove!
 
 uses
+  uROComInit,
+  ExceptionLog,
   Forms,
   fServerForm in 'fServerForm.pas' {ServerForm},
   VARELA_Intf in 'VARELA_Intf.pas',
@@ -32,11 +34,7 @@ uses
   schVentasEnProcesoServer_Intf in '..\Modulos\VentasProceso\Reglas\schVentasEnProcesoServer_Intf.pas',
   uSchemaUtilsServer in 'uSchemaUtilsServer.pas',
   srvVentasTerminadas_Impl in '..\Modulos\VentasTerminadas\Servidor\srvVentasTerminadas_Impl.pas' {srvVentasTerminadas: TDARemoteService},
-  schVentasTerminadasClient_Intf in '..\Modulos\VentasTerminadas\Reglas\schVentasTerminadasClient_Intf.pas',
-  schVentasTerminadasServer_Intf in '..\Modulos\VentasTerminadas\Reglas\schVentasTerminadasServer_Intf.pas',
   srvReferenciaGenerica_Impl in '..\Modulos\ReferenciaGenerica\Servidor\srvReferenciaGenerica_Impl.pas' {srvReferenciaGenerica: TDARemoteService},
-  schReferenciaGenericaClient_Intf in '..\Modulos\ReferenciaGenerica\Reglas\schReferenciaGenericaClient_Intf.pas',
-  schReferenciaGenericaServer_Intf in '..\Modulos\ReferenciaGenerica\Reglas\schReferenciaGenericaServer_Intf.pas',
   uBizReferenciaGenericaServer in '..\Modulos\ReferenciaGenerica\Reglas\uBizReferenciaGenericaServer.pas',
   uDataModuleEDI_Inventary in 'Services\EDI_Inventary\uDataModuleEDI_Inventary.pas' {dmEDIInventary: TDataModule},
   schEDIInventaryClient_Intf in 'Services\EDI_Inventary\schEDIInventaryClient_Intf.pas',
@@ -47,8 +45,6 @@ uses
   srvDevoluciones_Impl in '..\Modulos\Devoluciones\Servidor\srvDevoluciones_Impl.pas' {srvDevoluciones: TDARemoteService},
   srvTraspasos_Impl in '..\Modulos\Traspasos\Servidor\srvTraspasos_Impl.pas' {srvTraspasos: TDARemoteService},
   srvStock_Impl in '..\Modulos\Stock\Servidor\srvStock_Impl.pas' {srvStock: TDARemoteService},
-  schStockClient_Intf in '..\Modulos\Stock\Reglas\schStockClient_Intf.pas',
-  schStockServer_Intf in '..\Modulos\Stock\Reglas\schStockServer_Intf.pas',
   uAcercaDe in 'uAcercaDe.pas' {fAcercaDe},
   srvParametros_Impl in '..\Modulos\Parametros\Servidor\srvParametros_Impl.pas' {srvParametros: TDARemoteService},
   schParametrosClient_Intf in '..\Modulos\Parametros\Reglas\schParametrosClient_Intf.pas',
@@ -60,7 +56,13 @@ uses
   schControlesServer_Intf in '..\ControlesBase\Reglas\schControlesServer_Intf.pas',
   RegExpr in 'RegExpr.pas',
   uDBSelectionList in '..\Base\uDBSelectionList.pas',
-  uIntegerList in '..\Base\uIntegerList.pas';
+  schReferenciaGenericaClient_Intf in '..\Modulos\ReferenciaGenerica\Reglas\schReferenciaGenericaClient_Intf.pas',
+  schReferenciaGenericaServer_Intf in '..\Modulos\ReferenciaGenerica\Reglas\schReferenciaGenericaServer_Intf.pas',
+  schVentasTerminadasClient_Intf in '..\Modulos\VentasTerminadas\Reglas\schVentasTerminadasClient_Intf.pas',
+  schVentasTerminadasServer_Intf in '..\Modulos\VentasTerminadas\Reglas\schVentasTerminadasServer_Intf.pas',
+  uIntegerList in '..\Base\uIntegerList.pas',
+  schStockClient_Intf in '..\Modulos\Stock\Reglas\schStockClient_Intf.pas',
+  schStockServer_Intf in '..\Modulos\Stock\Reglas\schStockServer_Intf.pas';
 
 {$R *.res}
 {$R RODLFile.res}

Source/Servidor/AdminPV_Server.dproj

@@ -38,7 +38,7 @@
     <DCC_ResourcePath>..\Lib;..\Base</DCC_ResourcePath>
     <DCC_ObjPath>..\Lib;..\Base</DCC_ObjPath>
     <DCC_IncludePath>..\Lib;..\Base</DCC_IncludePath>
-    <DCC_Define>DEBUG</DCC_Define>
+    <DCC_Define>DEBUG;EUREKALOG;EUREKALOG_VER6</DCC_Define>
   </PropertyGroup>
   <ProjectExtensions>
     <Borland.Personality>Delphi.Personality</Borland.Personality>
@@ -51,6 +51,20 @@
       
       
       
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
       
       <Excluded_Packages Name="C:\Varela_D2007\Lib\DevExpressVCL\dxPSCoreD10.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
@@ -172,12 +186,12 @@
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006
-Activate=0
+Activate=1
 Activate Handle=1
 Save Log File=1
 Foreground Tab=0
 Freeze Activate=0
-Freeze Timeout=0
+Freeze Timeout=1
 SMTP From=eurekalog@email.com
 SMTP Host=
 SMTP Port=25
@@ -324,7 +338,7 @@ boSaveCompressedCopyInCaseOfError=0
 boHandleSafeCallExceptions=1
 boCallRTLExceptionEvent=0
 boCatchHandledExceptions=0
-loCatchLeaks=0
+loCatchLeaks=1
 loGroupsSonLeaks=1
 loHideBorlandLeaks=1
 loFreeAllLeaks=1
@@ -650,5 +664,5 @@ Count mtException_AntiFreeze=1
 mtException_AntiFreeze0="The application seems to be frozen."
 Count mtInvalidEmailMsg=1
 mtInvalidEmailMsg0="Invalid email."
-TextsCollection=English
+TextsCollection=
 EurekaLog Last Line -->

Source/Servidor/Services/Login/srvLogin_Impl.dfm

@@ -19,14 +19,12 @@ object srvLogin: TsrvLogin
           item
             Name = 'USERID'
             DataType = datString
-            BlobType = dabtUnknown
             Value = 'zeus'
             ParamType = daptInput
           end
           item
             Name = 'PASSWORD'
             DataType = datString
-            BlobType = dabtUnknown
             Value = 'zvg'
             ParamType = daptInput
           end>
@@ -56,30 +54,13 @@ object srvLogin: TsrvLogin
             Name = 'ID'
             DataType = datString
             Size = 12
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
             InPrimaryKey = True
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end
           item
             Name = 'PASS'
             DataType = datString
             Size = 12
-            BlobType = dabtUnknown
-            DisplayWidth = 0
-            Alignment = taLeftJustify
-            InPrimaryKey = False
-            Calculated = False
-            ServerCalculated = False
-            Lookup = False
-            LookupCache = False
           end>
-        BusinessRulesClient.ScriptLanguage = rslPascalScript
-        BusinessRulesServer.ScriptLanguage = rslPascalScript
       end>
     JoinDataTables = <>
     UnionDataTables = <>
@@ -91,8 +72,6 @@ object srvLogin: TsrvLogin
     Top = 24
   end
   object DABINAdapter: TDABINAdapter
-    BufferSize = 262144
-    IsCompatibleV4 = True
     Left = 56
     Top = 96
   end

Source/Servidor/fServerForm.dfm

@@ -1056,6 +1056,12 @@ object ServerForm: TServerForm
     Left = 40
     Top = 16
   end
+  object TrayIcon1: TTrayIcon
+    PopupMenu = PopupMenu1
+    Visible = True
+    Left = 144
+    Top = 16
+  end
   object JvTrayIcon: TJvTrayIcon
     IconIndex = 0
     DropDownMenu = PopupMenu1

Source/Servidor/fServerForm.pas

@@ -23,7 +23,6 @@ type
     Refrescarconexin1: TMenuItem;
     N2: TMenuItem;
     XPManifest1: TXPManifest;
-    JvTrayIcon: TJvTrayIcon;
     Panel1: TPanel;
     Image1: TImage;
     JvGradient1: TJvGradient;
@@ -31,6 +30,8 @@ type
     actAcerca: TAction;
     Acercade1: TMenuItem;
     N1: TMenuItem;
+    TrayIcon1: TTrayIcon;
+    JvTrayIcon: TJvTrayIcon;
     procedure actCerrarExecute(Sender: TObject);
     procedure actRestartExecute(Sender: TObject);
     procedure actOpcionesExecute(Sender: TObject);
@@ -79,10 +80,16 @@ end;
 
 procedure TServerForm.FormCreate(Sender: TObject);
 begin
-  JvTrayIcon.HideApplication;
+{  JvTrayIcon.HideApplication;
   JvTrayIcon.Hint := 'Administración de puntos de venta (Servidor)' +
     #10#13 + dmServer.ConnectionName;
   JvTrayIcon.Active := True;
+}
+
+{  JvTrayIcon.Hint := 'Administración de puntos de venta (Servidor)' +
+    #10#13 + dmServer.ConnectionName;
+  JvTrayIcon.Active := True;
+}
 end;
 
 procedure TServerForm.FormClose(Sender: TObject; var Action: TCloseAction);

Source/Servidor/uDataModuleServer.dfm

@@ -37,9 +37,16 @@ object dmServer: TdmServer
       item
         Name = 'GFT_VARELA'
         ConnectionString = 
-          'ADO?AuxDriver=SQLOLEDB.1;Server=david;Database=GFT_VARELA;UserID' +
+          'SDAC?Server=roberto;Database=GFT_VARELA_NUEVA_QUE_FALLA;UserID=s' +
-          '=sa;Password=123456;Integrated Security=SSPI;'
+          'a;Password=123456;Schemas=1;'
+        ConnectionType = 'MSSQL'
         Default = True
+      end
+      item
+        Name = 'GFT_VARELA_ADO'
+        ConnectionString = 
+          'ADO?AuxDriver=SQLOLEDB.1;Server=ROBERTO;Database=GFT_VARELA_NUEV' +
+          'A_QUE_FALLA;UserID=sa;Password=123456;'
       end>
     DriverManager = DriverManager
     PoolingEnabled = True
@@ -93,4 +100,8 @@ object dmServer: TdmServer
     Left = 224
     Top = 144
   end
+  object DASDACDriver: TDASDACDriver
+    Left = 304
+    Top = 80
+  end
 end

Source/Servidor/uDataModuleServer.pas

@@ -8,7 +8,8 @@ uses
   uROSessions, uDADataTable, uDABINAdapter, IBSQLMonitor, JvComponent,
   JvAppStorage, JvAppRegistryStorage, uDAInterfaces, 
   JvComponentBase, uDAADODriver, uROEventRepository, uDAServerLog,
-  JvLogFile, SyncObjs;
+  JvLogFile, SyncObjs, uDASQLiteDriver, uDABDEDriver, uDADBXDriver,
+  uDASDACDriver;
 
 const
   SERVER_PORT = '8099';
@@ -25,6 +26,7 @@ type
     ConnectionManager: TDAConnectionManager;
     DAServerLog1: TDAServerLog;
     JvLogFile1: TJvLogFile;
+    DASDACDriver: TDASDACDriver;
     DataDictionary: TDADataDictionary;
     procedure DataModuleCreate(Sender: TObject);
     procedure DataModuleDestroy(Sender: TObject);
@@ -292,7 +294,7 @@ begin
 
   ConnectionName := ConnectionManager.GetDefaultConnectionName;
   ConnectionManager.Connections.GetDefaultConnection.ConnectionString := GetConnectionString;
-  CoInitialize(nil);
+
   HTTPServer.Active := TRUE;
 end;