Subida con mejora en control de stock ya que podrá filtrar el calculo de estoc (entradas, salidas ...) a partir de una determinada fecha

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

Database/2.3 - vistas stock.sql

@@ -1,7 +1,5 @@
 DROP VIEW [RDX_V_CONTROL_INVENTARIO]
 GO
-DROP VIEW [RDX_V_INVENTARIO_STOCK]
-GO
 DROP VIEW [RDX_V_INVENTARIO_STOCK_DESGLOSADO]
 GO
 DROP VIEW [RDX_V_STOCK_CALCULADO_DESGLOSADO]
@@ -128,6 +126,7 @@ GO
 
 CREATE VIEW RDX_V_STOCK AS
 SELECT
+      FECHA = ISNULL(RDX_V_STOCK_INVENTARIO.FECHA, RDX_V_STOCK_VENTAS.FECHA),
       CENTRO = ISNULL(RDX_V_STOCK_INVENTARIO.CENTRO, RDX_V_STOCK_VENTAS.CENTRO),
       FILIAL = ISNULL(RDX_V_STOCK_INVENTARIO.FILIAL, RDX_V_STOCK_VENTAS.FILIAL),
       CODIGO = ISNULL(RDX_V_STOCK_INVENTARIO.CODIGO, RDX_V_STOCK_VENTAS.CODIGO),
@@ -362,6 +361,7 @@ FULL OUTER JOIN RDX_V_STOCK_VENTAS ON
 LEFT OUTER JOIN PRODUTOS ON
      (PRODUTOS.PRODUTO = ISNULL(RDX_V_STOCK_INVENTARIO.CODIGO, RDX_V_STOCK_VENTAS.CODIGO))
 GROUP BY
+      ISNULL(RDX_V_STOCK_INVENTARIO.FECHA, RDX_V_STOCK_VENTAS.FECHA),
       ISNULL(RDX_V_STOCK_INVENTARIO.CENTRO, RDX_V_STOCK_VENTAS.CENTRO),
       ISNULL(RDX_V_STOCK_INVENTARIO.FILIAL, RDX_V_STOCK_VENTAS.FILIAL),
       ISNULL(RDX_V_STOCK_INVENTARIO.CODIGO, RDX_V_STOCK_VENTAS.CODIGO),
@@ -376,6 +376,7 @@ GO
 
 CREATE VIEW RDX_V_STOCK_CALCULADO AS
 SELECT
+      FECHA,
       CENTRO,
       FILIAL,
       CODIGO,
@@ -416,7 +417,8 @@ GO
 /*Y NO LAS DE TIPO2(S,M,L,XL)*/
 
 CREATE VIEW RDX_V_STOCK_CALCULADO_DESGLOSADO AS
-SELECT CENTRO,
+SELECT FECHA, 
+		  CENTRO,
       FILIAL,
       CODIGO,
       PRODUCTO,
@@ -444,6 +446,7 @@ GO
 
 CREATE VIEW RDX_V_INVENTARIO_STOCK_DESGLOSADO AS
 SELECT
+	    ISNULL(RDX_V_STOCK_CALCULADO_DESGLOSADO.FECHA, RDX_V_ULTIMO_INVENTARIO.FECHA) as FECHA,
       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,
@@ -464,12 +467,14 @@ FULL OUTER JOIN RDX_V_STOCK_CALCULADO_DESGLOSADO ON
 AND (RDX_V_ULTIMO_INVENTARIO.CODIGO = RDX_V_STOCK_CALCULADO_DESGLOSADO.CODIGO)
 AND (RDX_V_ULTIMO_INVENTARIO.COLOR = RDX_V_STOCK_CALCULADO_DESGLOSADO.COLOR)
 AND (RDX_V_ULTIMO_INVENTARIO.TALLA = RDX_V_STOCK_CALCULADO_DESGLOSADO.TALLA)
+AND (RDX_V_ULTIMO_INVENTARIO.FECHA = RDX_V_STOCK_CALCULADO_DESGLOSADO.FECHA)
 GO
 
 /*--------------- SQL ---------------*/
 
-CREATE VIEW RDX_V_INVENTARIO_STOCK AS
+CREATE VIEW RDX_V_CONTROL_INVENTARIO AS
 select
+		  FECHA,
       CENTRO,
       FILIAL,
       CODIGO,
@@ -552,7 +557,8 @@ select
 
 from RDX_V_INVENTARIO_STOCK_DESGLOSADO
 
-group by CENTRO,
+group by FECHA,
+				 CENTRO,
          FILIAL,
          CODIGO,
          PRODUCTO,
@@ -564,47 +570,3 @@ GO
 
 /*--------------- SQL ---------------*/
 
-CREATE VIEW RDX_V_CONTROL_INVENTARIO AS
-SELECT
-      CENTRO,
-      FILIAL,
-      CODIGO,
-      PRODUCTO,
-      COLOR,
-      TIPO_PRODUCTO,
-      GRUPO_PRODUCTO,
-      COLECCION,
-
-      I38,
-      I40,
-      I42,
-      I44,
-      I46,
-      I48,
-      TI = ISNULL(I38, 0) + ISNULL(I40, 0) + ISNULL(I42, 0) + ISNULL(I44, 0) + ISNULL(I46, 0) + ISNULL(I48, 0),
-
-      K38,
-      K40,
-      K42,
-      K44,
-      K46,
-      K48,
-      TK = ISNULL(K38, 0) + ISNULL(K40, 0) + ISNULL(K42, 0) + ISNULL(K44, 0) + ISNULL(K46, 0) + ISNULL(K48, 0),
-
-      D38 = ISNULL(I38, 0) - ISNULL(K38, 0),
-      D40 = ISNULL(I40, 0) - ISNULL(K40, 0),
-      D42 = ISNULL(I42, 0) - ISNULL(K42, 0),
-      D44 = ISNULL(I44, 0) - ISNULL(K44, 0),
-      D46 = ISNULL(I46, 0) - ISNULL(K46, 0),
-      D48 = ISNULL(I48, 0) - ISNULL(K48, 0),
-      DT = ISNULL(I38, 0) - ISNULL(K38, 0) + ISNULL(I40, 0) - ISNULL(K40, 0) +
-           ISNULL(I42, 0) - ISNULL(K42, 0) + ISNULL(I44, 0) - ISNULL(K44, 0) +
-           ISNULL(I46, 0) - ISNULL(K46, 0) + ISNULL(I48, 0) - ISNULL(K48, 0)
-
-FROM RDX_V_INVENTARIO_STOCK
-where ((ISNULL(I38, 0) - ISNULL(K38, 0) + ISNULL(I40, 0) - ISNULL(K40, 0) +
-       ISNULL(I42, 0) - ISNULL(K42, 0) + ISNULL(I44, 0) - ISNULL(K44, 0) +
-       ISNULL(I46, 0) - ISNULL(K46, 0) + ISNULL(I48, 0) - ISNULL(K48, 0)) <> 0)
-
-GO
-/* EOF */

Source/Cliente/AdminPV.rc

@@ -17,7 +17,7 @@ BEGIN
               VALUE "InternalName", "Administración de puntos de venta\0"
               VALUE "ProductName", "Administración de puntos de venta\0"
               VALUE "ProductVersion", "1.0.0.0\0"
-              VALUE "CompileDate", "lunes, 08 de octubre de 2007 12:43\0"
+              VALUE "CompileDate", "jueves, 24 de enero de 2008 19:08\0"
          END
     END
     BLOCK "VarFileInfo"

Source/Modulos/Parametros/Cliente/Parametros.dpk

@@ -46,13 +46,16 @@ requires
   JvStdCtrlsD10R,
   JvSystemD10R,
   tbx_D10,
-  tb2k_D10;
+  tb2k_D10,
+  DataAbstract_Core_D10,
+  RemObjects_Core_D10;
 
 contains
   uDataModuleParametros in 'uDataModuleParametros.pas' {dmParametros: TDAClientDataModule},
   schParametrosClient_Intf in '..\Reglas\schParametrosClient_Intf.pas',
   uBizParametros in '..\Reglas\uBizParametros.pas',
   uViewParametrosCentro in 'uViewParametrosCentro.pas' {frViewParametrosCentro: TCustomView},
-  uViewParametrosColeccion in 'uViewParametrosColeccion.pas' {frViewParametrosColeccion: TCustomView};
+  uViewParametrosColeccion in 'uViewParametrosColeccion.pas' {frViewParametrosColeccion: TCustomView},
+  uViewParametrosFecha in 'uViewParametrosFecha.pas' {frViewParametrosFecha: TCustomView};
 
 end.

Source/Modulos/Parametros/Cliente/Parametros.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>{6be250c1-7a66-46ce-a9aa-2c4fe6aa768e}</ProjectGuid>
     <MainSource>Parametros.dpk</MainSource>
@@ -53,27 +54,25 @@
     </DelphiCompile>
     <DCCReference Include="..\Reglas\schParametrosClient_Intf.pas" />
     <DCCReference Include="..\Reglas\uBizParametros.pas" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
+    <DCCReference Include="adortl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\BaseD10.dcp" />
+    <DCCReference Include="BaseD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\ControlesBaseD10.dcp" />
+    <DCCReference Include="ControlesBaseD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD10.dcp" />
+    <DCCReference Include="cxLibraryD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="DataAbstract_Core_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
+    <DCCReference Include="dbrtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxComnD10.dcp" />
+    <DCCReference Include="dsnap.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD10.dcp" />
+    <DCCReference Include="dxComnD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD10.dcp" />
+    <DCCReference Include="dxLayoutControlD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
+    <DCCReference Include="dxThemeD10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
+    <DCCReference Include="Jcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD10R.dcp" />
+    <DCCReference Include="JclVcl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD10R.dcp" />
+    <DCCReference Include="JvCoreD10R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD10R.dcp" />
+    <DCCReference Include="JvStdCtrlsD10R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="JvSystemD10R.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tb2k_D10.dcp" />
+    <DCCReference Include="RemObjects_Core_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_D10.dcp" />
+    <DCCReference Include="rtl.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="tb2k_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="tbx_D10.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
-    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
     <DCCReference Include="uDataModuleParametros.pas">
       <Form>dmParametros</Form>
     </DCCReference>
@@ -83,6 +82,13 @@
     <DCCReference Include="uViewParametrosColeccion.pas">
       <Form>frViewParametrosColeccion</Form>
     </DCCReference>
+    <DCCReference Include="uViewParametrosFecha.pas">
+      <Form>frViewParametrosColeccion</Form>
+    </DCCReference>
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vcldb.dcp" />
+    <DCCReference Include="vcljpg.dcp" />
+    <DCCReference Include="vclx.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

Source/Modulos/Parametros/Cliente/uViewParametrosFecha.dfm

@@ -0,0 +1,32 @@
+inherited frViewParametrosFecha: TfrViewParametrosFecha
+  Width = 293
+  Height = 44
+  ExplicitWidth = 293
+  ExplicitHeight = 44
+  object dxLayoutControl1: TdxLayoutControl
+    Left = 0
+    Top = 0
+    Width = 293
+    Height = 44
+    Align = alClient
+    ParentBackground = True
+    TabOrder = 0
+    AutoContentSizes = [acsWidth, acsHeight]
+    object eFecha: TcxDateEdit
+      Left = 111
+      Top = 10
+      TabOrder = 0
+      Width = 121
+    end
+    object dxLayoutControl1Group_Root: TdxLayoutGroup
+      ShowCaption = False
+      Hidden = True
+      ShowBorder = False
+      object dxLayoutControl1Item1: TdxLayoutItem
+        Caption = 'A partir de la fecha:'
+        Control = eFecha
+        ControlOptions.ShowBorder = False
+      end
+    end
+  end
+end

Source/Modulos/Parametros/Cliente/uViewParametrosFecha.pas

@@ -0,0 +1,63 @@
+unit uViewParametrosFecha;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, dxLayoutControl, StdCtrls, Mask, JvExMask, JvToolEdit,
+  JvCombobox, cxControls, uViewParametrosControlGrid, TBXDkPanels,
+  uBizParametros, cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit,
+  cxCalendar;
+
+type
+  IViewParametrosFecha = interface(IViewParametrosControlGrid)
+  ['{450D10BE-740E-466D-BA12-3E0A9206B697}']
+    function GetFecha: Variant;
+    property Fecha : Variant read GetFecha;
+  end;
+
+  TfrViewParametrosFecha = class(TfrViewParametrosControlGrid, IViewParametrosFecha)
+    dxLayoutControl1Group_Root: TdxLayoutGroup;
+    dxLayoutControl1: TdxLayoutControl;
+    eFecha: TcxDateEdit;
+    dxLayoutControl1Item1: TdxLayoutItem;
+  private
+    function GetFecha: Variant;
+  public
+    procedure Execute; override;
+    procedure Refresh; override;
+    property Fecha : Variant read GetFecha;
+    procedure LimpiarFecha;
+  end;
+
+implementation
+
+uses
+  uDataModuleParametros, uDADataTable;
+
+{$R *.dfm}
+
+{ TfrViewParametrosCentro }
+
+procedure TfrViewParametrosFecha.Execute;
+begin
+  // inherited; <- no descomentar
+end;
+
+function TfrViewParametrosFecha.GetFecha: Variant;
+begin
+  Result := eFecha.EditValue;
+end;
+
+procedure TfrViewParametrosFecha.LimpiarFecha;
+begin
+  eFecha.Clear;
+end;
+
+procedure TfrViewParametrosFecha.Refresh;
+begin
+  // inherited; <- no descomentar
+  LimpiarFecha;
+end;
+
+end.

Source/Modulos/Stock/Cliente/uEditorControlStockEDI.dfm

@@ -5,7 +5,7 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
   ClientHeight = 573
   ClientWidth = 864
   ExplicitWidth = 872
-  ExplicitHeight = 607
+  ExplicitHeight = 600
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -261,9 +261,17 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
         end
         inherited TBXDockablePanel1: TTBXDockablePanel
           ExplicitWidth = 846
+          inherited frViewParametrosColeccion1: TfrViewParametrosColeccion
+            inherited dxLayoutControl1: TdxLayoutControl
+              inherited ccbColeccion: TJvCheckedComboBox
+                Width = 512
+                ExplicitWidth = 512
+              end
+            end
+          end
           inherited pnlAgrupaciones: TTBXAlignmentPanel
-            Width = 525
+            Width = 346
-            ExplicitWidth = 525
+            ExplicitWidth = 346
             inherited TBXButton3: TTBXButton
               Action = actRefrescar
             end
@@ -272,6 +280,14 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
             Width = 846
             ExplicitWidth = 846
           end
+          inherited frViewParametrosFecha1: TfrViewParametrosFecha
+            inherited dxLayoutControl1: TdxLayoutControl
+              inherited eFecha: TcxDateEdit
+                ExplicitWidth = 231
+                Width = 231
+              end
+            end
+          end
         end
         inherited dsDataSource: TDADataSource
           Left = 16
@@ -553,8 +569,24 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
         end
         inherited TBXDockablePanel1: TTBXDockablePanel
           ExplicitWidth = 846
+          inherited frViewParametrosColeccion1: TfrViewParametrosColeccion
+            inherited dxLayoutControl1: TdxLayoutControl
+              inherited ccbColeccion: TJvCheckedComboBox
+                Width = 512
+                ExplicitWidth = 512
+              end
+            end
+          end
+          inherited frViewParametrosCentro1: TfrViewParametrosCentro
+            inherited dxLayoutControl1: TdxLayoutControl
+              inherited ccbCentro: TJvCheckedComboBox
+                Width = 392
+                ExplicitWidth = 392
+              end
+            end
+          end
           inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-            Width = 125
+            Width = 16
             ExplicitWidth = 125
             inherited TBXButton1: TTBXButton
               Action = actRefrescar
@@ -564,6 +596,14 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
             Width = 846
             ExplicitWidth = 846
           end
+          inherited frViewParametrosFecha1: TfrViewParametrosFecha
+            inherited dxLayoutControl1: TdxLayoutControl
+              inherited eFecha: TcxDateEdit
+                ExplicitWidth = 231
+                Width = 231
+              end
+            end
+          end
         end
         inherited dxComponentPrinter: TdxComponentPrinter
           inherited dxComponentPrinterLink1: TdxGridReportLink
@@ -839,8 +879,24 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
         end
         inherited TBXDockablePanel1: TTBXDockablePanel
           ExplicitWidth = 846
+          inherited frViewParametrosColeccion1: TfrViewParametrosColeccion
+            inherited dxLayoutControl1: TdxLayoutControl
+              inherited ccbColeccion: TJvCheckedComboBox
+                Width = 512
+                ExplicitWidth = 512
+              end
+            end
+          end
+          inherited frViewParametrosCentro1: TfrViewParametrosCentro
+            inherited dxLayoutControl1: TdxLayoutControl
+              inherited ccbCentro: TJvCheckedComboBox
+                Width = 392
+                ExplicitWidth = 392
+              end
+            end
+          end
           inherited pnlAgrupaciones: TTBXAlignmentPanel
-            Width = 125
+            Width = 16
             ExplicitWidth = 125
             inherited TBXButton3: TTBXButton
               Action = actRefrescar
@@ -850,6 +906,14 @@ inherited fEditorControlStockEDI: TfEditorControlStockEDI
             Width = 846
             ExplicitWidth = 846
           end
+          inherited frViewParametrosFecha1: TfrViewParametrosFecha
+            inherited dxLayoutControl1: TdxLayoutControl
+              inherited eFecha: TcxDateEdit
+                ExplicitWidth = 122
+                Width = 122
+              end
+            end
+          end
         end
         inherited dxComponentPrinter: TdxComponentPrinter
           inherited dxComponentPrinterLink1: TdxGridReportLink

Source/Modulos/Stock/Cliente/uViewControGridStockEDI.dfm

@@ -1,14 +1,14 @@
 inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI
-  Width = 553
+  Width = 972
   Height = 477
-  ExplicitWidth = 553
+  ExplicitWidth = 972
   ExplicitHeight = 477
   inherited cxGrid: TcxGrid
     Top = 60
-    Width = 553
+    Width = 972
     Height = 417
     ExplicitTop = 60
-    ExplicitWidth = 553
+    ExplicitWidth = 972
     ExplicitHeight = 417
     inherited cxGridView: TcxGridDBTableView
       FilterBox.Visible = fvNever
@@ -478,18 +478,17 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI
     inline frViewParametrosColeccion1: TfrViewParametrosColeccion
       Left = 0
       Top = 19
-      Width = 321
+      Width = 250
       Height = 41
       Align = alLeft
-      AutoSize = True
       TabOrder = 0
       ReadOnly = False
       ExplicitTop = 19
-      ExplicitWidth = 321
+      ExplicitWidth = 250
       ExplicitHeight = 41
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 321
+        Width = 250
-        ExplicitWidth = 321
+        ExplicitWidth = 250
         inherited ccbColeccion: TJvCheckedComboBox
           Width = 512
           ExplicitWidth = 512
@@ -497,21 +496,20 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI
       end
     end
     inline frViewParametrosCentro1: TfrViewParametrosCentro
-      Left = 321
+      Left = 250
       Top = 19
-      Width = 400
+      Width = 300
       Height = 41
       Align = alLeft
-      AutoSize = True
       TabOrder = 1
       ReadOnly = False
-      ExplicitLeft = 321
+      ExplicitLeft = 250
       ExplicitTop = 19
-      ExplicitWidth = 400
+      ExplicitWidth = 300
       ExplicitHeight = 41
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 400
+        Width = 300
-        ExplicitWidth = 400
+        ExplicitWidth = 300
         inherited ccbCentro: TJvCheckedComboBox
           Width = 392
           ExplicitWidth = 392
@@ -519,13 +517,15 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI
       end
     end
     object TBXAlignmentPanel1: TTBXAlignmentPanel
-      Left = 721
+      Left = 770
       Top = 19
-      Width = 350
+      Width = 202
       Height = 41
       Align = alClient
       AutoSize = True
       TabOrder = 2
+      ExplicitLeft = 730
+      ExplicitWidth = 200
       object TBXButton1: TTBXButton
         Tag = 3
         Left = 8
@@ -542,7 +542,7 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI
     object TBXLabel2: TTBXLabel
       Left = 0
       Top = 0
-      Width = 553
+      Width = 972
       Height = 19
       Margins.Left = 5
       Margins.Top = 5
@@ -557,6 +557,31 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI
       ParentFont = False
       Underline = True
     end
+    inline frViewParametrosFecha1: TfrViewParametrosFecha
+      Left = 550
+      Top = 19
+      Width = 220
+      Height = 41
+      Align = alLeft
+      TabOrder = 4
+      ReadOnly = False
+      ExplicitLeft = 550
+      ExplicitTop = 19
+      ExplicitWidth = 220
+      ExplicitHeight = 41
+      inherited dxLayoutControl1: TdxLayoutControl
+        Width = 220
+        Height = 41
+        ExplicitLeft = 6
+        ExplicitTop = -6
+        ExplicitWidth = 180
+        ExplicitHeight = 41
+        inherited eFecha: TcxDateEdit
+          ExplicitWidth = 231
+          Width = 231
+        end
+      end
+    end
   end
   inherited dsDataSource: TDADataSource
     Left = 72
@@ -583,7 +608,7 @@ inherited frViewControlGridStockEDI: TfrViewControlGridStockEDI
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
       ReportDocument.Caption = 'Venta mensual'
-      ReportDocument.CreationDate = 39361.439008969910000000
+      ReportDocument.CreationDate = 39478.750675266200000000
       ReportTitle.Text = 'Venta mensual'
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clBlack

Source/Modulos/Stock/Cliente/uViewControGridStockEDI.pas

@@ -14,7 +14,7 @@ uses
   cxDropDownEdit, StdCtrls, cxSpinEdit, uViewGrid, cxMemo,
   cxEditRepositoryItems, uDataModuleStock, uDAInterfaces, TBXDkPanels,
   uViewParametrosCentro, uCustomView, uViewBase, uViewParametrosControlGrid,
-  uViewParametrosColeccion, TB2Dock, uBizStock;
+  uViewParametrosColeccion, TB2Dock, uBizStock, uViewParametrosFecha;
 
 type
   IViewControlGridStockEDI = interface(IViewGrid)
@@ -73,6 +73,7 @@ type
     TBXAlignmentPanel1: TTBXAlignmentPanel;
     TBXButton1: TTBXButton;
     TBXLabel2: TTBXLabel;
+    frViewParametrosFecha1: TfrViewParametrosFecha;
     procedure cxGridViewKTCustomDrawCell(Sender: TcxCustomGridTableView;
       ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
       var ADone: Boolean);
@@ -182,10 +183,12 @@ end;
 
 procedure TfrViewControlGridStockEDI.Refresh;
 var
+  AFecha : Variant;
   AColeccionesList : TStringList;
   ACentrosList : TStringList;
   AWhereColeccion : String;
   AWhereCentro : String;
+  AWhereFecha : String;
   AWhere : String;
   i : integer;
 begin
@@ -196,7 +199,8 @@ begin
      Items.DataTable.Active := False;
   AColeccionesList := frViewParametrosColeccion1.ColeccionesSeleccionadas;
   ACentrosList := frViewParametrosCentro1.CodigoCentrosSeleccionados;
-
+  AFecha := frViewParametrosFecha1.Fecha;
+  
   ShowHourglassCursor;
   try
     if Assigned(AColeccionesList) then
@@ -239,6 +243,10 @@ begin
         end;
     end;
 
+    AWhereFecha := '';
+    if not VarIsNull(AFecha) then
+       AWhereFecha := '(FECHA >= ''' + VarToStr(AFecha) + ''')';
+
     AWhere := '';
     if AWhereColeccion <> '' then
        AWhere := AWhere + AWhereColeccion;
@@ -250,6 +258,13 @@ begin
        AWhere := AWhere + AWhereCentro;
     end;
 
+    if AWhereFecha <> '' then
+    begin
+       if AWhere <> '' then
+          AWhere := AWhere + ' AND ';
+       AWhere := AWhere + AWhereFecha;
+    end;
+
     Items.DataTable.Where.Clear;
     Items.DataTable.Where.AddText(AWhere, False);
     Items.DataTable.Active := True;

Source/Modulos/Stock/Cliente/uViewControGridStockEDIInventario.dfm

@@ -1,15 +1,15 @@
 inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventario
-  Width = 553
+  Width = 1067
-  Height = 477
+  Height = 537
-  ExplicitWidth = 553
+  ExplicitWidth = 1067
-  ExplicitHeight = 477
+  ExplicitHeight = 537
   inherited cxGrid: TcxGrid
     Top = 60
-    Width = 553
+    Width = 1067
-    Height = 417
+    Height = 477
     ExplicitTop = 60
-    ExplicitWidth = 553
+    ExplicitWidth = 1067
-    ExplicitHeight = 417
+    ExplicitHeight = 477
     inherited cxGridView: TcxGridDBTableView
       FilterBox.Visible = fvNever
       DataController.Summary.DefaultGroupSummaryItems = <
@@ -478,18 +478,17 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa
     inline frViewParametrosColeccion1: TfrViewParametrosColeccion
       Left = 0
       Top = 19
-      Width = 321
+      Width = 250
       Height = 41
       Align = alLeft
-      AutoSize = True
       TabOrder = 0
       ReadOnly = False
       ExplicitTop = 19
-      ExplicitWidth = 321
+      ExplicitWidth = 250
       ExplicitHeight = 41
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 321
+        Width = 250
-        ExplicitWidth = 321
+        ExplicitWidth = 300
         inherited ccbColeccion: TJvCheckedComboBox
           Width = 512
           ExplicitWidth = 512
@@ -497,21 +496,20 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa
       end
     end
     inline frViewParametrosCentro1: TfrViewParametrosCentro
-      Left = 321
+      Left = 250
       Top = 19
-      Width = 400
+      Width = 300
       Height = 41
       Align = alLeft
-      AutoSize = True
       TabOrder = 1
       ReadOnly = False
-      ExplicitLeft = 321
+      ExplicitLeft = 250
       ExplicitTop = 19
-      ExplicitWidth = 400
+      ExplicitWidth = 300
       ExplicitHeight = 41
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 400
+        Width = 300
-        ExplicitWidth = 400
+        ExplicitWidth = 350
         inherited ccbCentro: TJvCheckedComboBox
           Width = 392
           ExplicitWidth = 392
@@ -519,13 +517,15 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa
       end
     end
     object pnlAgrupaciones: TTBXAlignmentPanel
-      Left = 721
+      Left = 770
       Top = 19
-      Width = 350
+      Width = 297
       Height = 41
       Align = alClient
       AutoSize = True
       TabOrder = 2
+      ExplicitLeft = 830
+      ExplicitWidth = 237
       object TBXButton3: TTBXButton
         Tag = 3
         Left = 8
@@ -542,7 +542,7 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa
     object TBXLabel1: TTBXLabel
       Left = 0
       Top = 0
-      Width = 553
+      Width = 1067
       Height = 19
       Margins.Left = 5
       Margins.Top = 5
@@ -557,6 +557,29 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa
       ParentFont = False
       Underline = True
     end
+    inline frViewParametrosFecha1: TfrViewParametrosFecha
+      Left = 550
+      Top = 19
+      Width = 220
+      Height = 41
+      Align = alLeft
+      TabOrder = 4
+      ReadOnly = False
+      ExplicitLeft = 550
+      ExplicitTop = 19
+      ExplicitWidth = 220
+      ExplicitHeight = 41
+      inherited dxLayoutControl1: TdxLayoutControl
+        Width = 220
+        Height = 41
+        ExplicitWidth = 180
+        ExplicitHeight = 41
+        inherited eFecha: TcxDateEdit
+          ExplicitWidth = 122
+          Width = 122
+        end
+      end
+    end
   end
   inherited dsDataSource: TDADataSource
     Left = 72
@@ -583,7 +606,7 @@ inherited frViewControlGridStockEDIInventario: TfrViewControlGridStockEDIInventa
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
       ReportDocument.Caption = 'Venta mensual'
-      ReportDocument.CreationDate = 39361.438243449080000000
+      ReportDocument.CreationDate = 39478.742396006940000000
       ReportTitle.Text = 'Venta mensual'
       Font.Charset = DEFAULT_CHARSET
       Font.Color = clBlack

Source/Modulos/Stock/Cliente/uViewControGridStockEDIInventario.pas

@@ -14,7 +14,7 @@ uses
   cxDropDownEdit, StdCtrls, cxSpinEdit, uViewGrid, cxMemo,
   cxEditRepositoryItems, uDataModuleStock, uDAInterfaces, TBXDkPanels,
   uViewParametrosCentro, uCustomView, uViewBase, uViewParametrosControlGrid,
-  uViewParametrosColeccion, TB2Dock, uBizStock;
+  uViewParametrosColeccion, TB2Dock, uBizStock, uViewParametrosFecha;
 
 type
   IViewControlGridStockEDIInventario = interface(IViewGrid)
@@ -73,6 +73,7 @@ type
     pnlAgrupaciones: TTBXAlignmentPanel;
     TBXButton3: TTBXButton;
     TBXLabel1: TTBXLabel;
+    frViewParametrosFecha1: TfrViewParametrosFecha;
     procedure cxGridViewDTCustomDrawCell(Sender: TcxCustomGridTableView;
       ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
       var ADone: Boolean);
@@ -184,8 +185,10 @@ procedure TfrViewControlGridStockEDIInventario.Refresh;
 var
   AColeccionesList : TStringList;
   ACentrosList : TStringList;
+  AFecha : Variant;
   AWhereColeccion : String;
   AWhereCentro : String;
+  AWhereFecha : String;
   AWhere : String;
   i : integer;
 begin
@@ -196,6 +199,7 @@ begin
      Items.DataTable.Active := False;
   AColeccionesList := frViewParametrosColeccion1.ColeccionesSeleccionadas;
   ACentrosList := frViewParametrosCentro1.CodigoCentrosSeleccionados;
+  AFecha := frViewParametrosFecha1.Fecha;
 
   ShowHourglassCursor;
   try
@@ -239,6 +243,10 @@ begin
         end;
     end;
 
+    AWhereFecha := '';
+    if not VarIsNull(AFecha) then
+       AWhereFecha := '(FECHA >= ''' + VarToStr(AFecha) + ''')';
+
     AWhere := '';
     if AWhereColeccion <> '' then
        AWhere := AWhere + AWhereColeccion;
@@ -250,6 +258,12 @@ begin
        AWhere := AWhere + AWhereCentro;
     end;
 
+    if AWhereFecha <> '' then
+    begin
+       if AWhere <> '' then
+          AWhere := AWhere + ' AND ';
+       AWhere := AWhere + AWhereFecha;
+    end;
 
     Items.DataTable.Where.Clear;
     Items.DataTable.Where.AddText(AWhere, False);

Source/Modulos/Stock/Cliente/uViewControGridStockPrendasCentros.dfm

@@ -214,18 +214,17 @@ inherited frViewControlGridStockPrendasCentros: TfrViewControlGridStockPrendasCe
     inline frViewParametrosColeccion1: TfrViewParametrosColeccion
       Left = 0
       Top = 19
-      Width = 321
+      Width = 250
       Height = 41
       Align = alLeft
-      AutoSize = True
       TabOrder = 0
       ReadOnly = False
       ExplicitTop = 19
-      ExplicitWidth = 321
+      ExplicitWidth = 250
       ExplicitHeight = 41
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 321
+        Width = 250
-        ExplicitWidth = 321
+        ExplicitWidth = 300
         inherited ccbColeccion: TJvCheckedComboBox
           Width = 512
           ExplicitWidth = 512
@@ -233,13 +232,15 @@ inherited frViewControlGridStockPrendasCentros: TfrViewControlGridStockPrendasCe
       end
     end
     object pnlAgrupaciones: TTBXAlignmentPanel
-      Left = 321
+      Left = 470
       Top = 19
-      Width = 300
+      Width = 151
       Height = 41
       Align = alClient
       AutoSize = True
       TabOrder = 1
+      ExplicitLeft = 500
+      ExplicitWidth = 121
       object TBXButton3: TTBXButton
         Tag = 3
         Left = 8
@@ -271,6 +272,29 @@ inherited frViewControlGridStockPrendasCentros: TfrViewControlGridStockPrendasCe
       ParentFont = False
       Underline = True
     end
+    inline frViewParametrosFecha1: TfrViewParametrosFecha
+      Left = 250
+      Top = 19
+      Width = 220
+      Height = 41
+      Align = alLeft
+      TabOrder = 3
+      ReadOnly = False
+      ExplicitLeft = 250
+      ExplicitTop = 19
+      ExplicitWidth = 220
+      ExplicitHeight = 41
+      inherited dxLayoutControl1: TdxLayoutControl
+        Width = 220
+        Height = 41
+        ExplicitWidth = 200
+        ExplicitHeight = 41
+        inherited eFecha: TcxDateEdit
+          ExplicitWidth = 231
+          Width = 231
+        end
+      end
+    end
   end
   inherited dsDataSource: TDADataSource
     Left = 24
@@ -299,7 +323,7 @@ inherited frViewControlGridStockPrendasCentros: TfrViewControlGridStockPrendasCe
       PrinterPage.PageSize.Y = 297000
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
-      ReportDocument.CreationDate = 39361.401792893520000000
+      ReportDocument.CreationDate = 39478.749355277770000000
       ReportDocument.IsCaptionAssigned = True
       ReportTitle.AdjustOnReportScale = True
       ReportTitle.Text = 'Venta mensual'

Source/Modulos/Stock/Cliente/uViewControGridStockPrendasCentros.pas

@@ -14,7 +14,8 @@ uses
   cxDropDownEdit, StdCtrls, cxSpinEdit, uViewGrid, cxMemo,
   cxEditRepositoryItems, uDataModuleStock, uCustomView, uViewBase,
   uViewParametrosControlGrid, Grids, DBGrids, uDAInterfaces, TBXDkPanels,
-  uViewParametrosCentro, uViewParametrosColeccion, TB2Dock, uBizStock;
+  uViewParametrosCentro, uViewParametrosColeccion, TB2Dock, uBizStock,
+  uViewParametrosFecha;
 
 type
   IViewControlGridStockPrendasCentros = interface(IViewGrid)
@@ -53,6 +54,7 @@ type
     pnlAgrupaciones: TTBXAlignmentPanel;
     TBXButton3: TTBXButton;
     TBXLabel1: TTBXLabel;
+    frViewParametrosFecha1: TfrViewParametrosFecha;
     procedure cxGridViewKTCustomDrawCell(Sender: TcxCustomGridTableView;
       ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
       var ADone: Boolean);
@@ -146,10 +148,12 @@ end;
 
 procedure TfrViewControlGridStockPrendasCentros.Refresh;
 var
+  AFecha : Variant;
   AColeccionesList : TStringList;
   ACentrosList : TStringList;
   AWhereColeccion : String;
   AWhereCentro : String;
+  AWhereFecha : String;
   AWhere : String;
   i : integer;
 begin
@@ -158,6 +162,7 @@ begin
   if Assigned(FItems) then
      Items.DataTable.Active := False;
   AColeccionesList := frViewParametrosColeccion1.ColeccionesSeleccionadas;
+  AFecha := frViewParametrosFecha1.Fecha;
 
   ShowHourglassCursor;
   try
@@ -181,10 +186,21 @@ begin
         end;
     end;
 
+    AWhereFecha := '';
+    if not VarIsNull(AFecha) then
+       AWhereFecha := '(FECHA >= ''' + VarToStr(AFecha) + ''')';
+
     AWhere := '';
     if AWhereColeccion <> '' then
        AWhere := AWhere + AWhereColeccion;
 
+    if AWhereFecha <> '' then
+    begin
+       if AWhere <> '' then
+          AWhere := AWhere + ' AND ';
+       AWhere := AWhere + AWhereFecha;
+    end;
+
     Items.DataTable.Where.Clear;
     Items.DataTable.Where.AddText(AWhere, False);
     Items.DataTable.Active := True;

Source/Modulos/Stock/Cliente/uViewControGridStockVARELA.dfm

@@ -312,7 +312,7 @@ inherited frViewControlGridStockVARELA: TfrViewControlGridStockVARELA
       PrinterPage.PageSize.Y = 297000
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
-      ReportDocument.CreationDate = 39361.401457418980000000
+      ReportDocument.CreationDate = 39478.735610347220000000
       ReportDocument.IsCaptionAssigned = True
       ReportTitle.AdjustOnReportScale = True
       ReportTitle.Text = 'Venta mensual'

Source/Modulos/Stock/Cliente/uViewControGridStockVARELA.pas

@@ -175,7 +175,7 @@ procedure TfrViewControlGridStockVARELA.cxGridViewK38GetDataText(
   var AText: String);
 begin
   inherited;
-  ShowMessage(AText);
+//  ShowMessage(AText);
   if AText = '0' then
     AText := '';
 end;

Source/Modulos/Stock/Servidor/srvStock_Impl.dfm

@@ -175,10 +175,22 @@ object srvStock: TsrvStock
           item
             Connection = 'GFT_VARELA'
             SQL = 
-              'SELECT CENTRO, FILIAL, CODIGO, PRODUCTO, TIPO_PRODUCTO, GRUPO_PR' +
+              'SELECT'#10#10'    CENTRO, FILIAL, CODIGO, PRODUCTO, TIPO_PRODUCTO, GRU' +
-              'ODUCTO, COLECCION, COLOR,'#10'      E38, E40, E42, E44, E46, E48, TE' +
+              'PO_PRODUCTO, COLECCION, COLOR,'#10#10'    SUM(E38) as E38,'#10'    SUM(E40' +
-              ','#10'      S38, S40, S42, S44, S46, S48, TS,'#10'      K38, K40, K42, K' +
+              ') as E40,'#10'    SUM(E42) as E42,'#10'    SUM(E44) as E44,'#10'    SUM(E46)' +
-              '44, K46, K48, KT'#10'      '#10'FROM RDX_V_STOCK_CALCULADO'#10
+              ' as E46,'#10'    SUM(E48) as E48,'#10'    (SUM(E38) + SUM(E40) + SUM(E42' +
+              ') + SUM(E44) + SUM(E46) + SUM(E48)) as TE,'#10'    SUM(S38) as S38,'#10 +
+              '    SUM(S40) as S40,'#10'    SUM(S42) as S42,'#10'    SUM(S44) as S44,'#10' ' +
+              '   SUM(S46) as S46,'#10'    SUM(S48) as S48,'#10'    (SUM(S38) + SUM(S40' +
+              ') + SUM(S42) + SUM(S44) + SUM(S46) + SUM(S48)) as TS,'#10#10'    (SUM(' +
+              'E38) - SUM(S38)) as K38,'#10'    (SUM(E40) - SUM(S40)) as K40,'#10'    (' +
+              'SUM(E42) - SUM(S42)) as K42,'#10'    (SUM(E44) - SUM(S44)) as K44,'#10' ' +
+              '   (SUM(E46) - SUM(S46)) as K46,'#10'    (SUM(E48) - SUM(S48)) as K4' +
+              '8,'#10#10'    ((SUM(E38) - SUM(S38)) + (SUM(E40) - SUM(S40)) + (SUM(E4' +
+              '2) - SUM(S42)) + (SUM(E44) - SUM(S44)) + (SUM(E46) - SUM(S46)) +' +
+              ' (SUM(E48) - SUM(S48))) as KT'#10#10'  FROM'#10'    RDX_V_STOCK_CALCULADO'#10 +
+              #10#10'GROUP BY CENTRO, FILIAL, CODIGO, PRODUCTO, TIPO_PRODUCTO, GRUP' +
+              'O_PRODUCTO, COLECCION, COLOR'#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -717,6 +729,278 @@ object srvStock: TsrvStock
                 TableField = 'DT'
               end>
           end>
+        Name = 'StockEDIInventario2'
+        Fields = <
+          item
+            Name = 'CENTRO'
+            DataType = datString
+            Size = 17
+          end
+          item
+            Name = 'FILIAL'
+            DataType = datString
+            Size = 25
+          end
+          item
+            Name = 'CODIGO'
+            DataType = datString
+            Size = 12
+          end
+          item
+            Name = 'PRODUCTO'
+            DataType = datString
+            Size = 40
+          end
+          item
+            Name = 'COLOR'
+            DataType = datString
+            Size = 10
+          end
+          item
+            Name = 'TIPO_PRODUCTO'
+            DataType = datString
+            Size = 25
+          end
+          item
+            Name = 'GRUPO_PRODUCTO'
+            DataType = datString
+            Size = 25
+          end
+          item
+            Name = 'COLECCION'
+            DataType = datString
+            Size = 6
+          end
+          item
+            Name = 'I38'
+            DataType = datFloat
+          end
+          item
+            Name = 'I40'
+            DataType = datFloat
+          end
+          item
+            Name = 'I42'
+            DataType = datFloat
+          end
+          item
+            Name = 'I44'
+            DataType = datFloat
+          end
+          item
+            Name = 'I46'
+            DataType = datFloat
+          end
+          item
+            Name = 'I48'
+            DataType = datFloat
+          end
+          item
+            Name = 'TI'
+            DataType = datFloat
+          end
+          item
+            Name = 'K38'
+            DataType = datFloat
+          end
+          item
+            Name = 'K40'
+            DataType = datFloat
+          end
+          item
+            Name = 'K42'
+            DataType = datFloat
+          end
+          item
+            Name = 'K44'
+            DataType = datFloat
+          end
+          item
+            Name = 'K46'
+            DataType = datFloat
+          end
+          item
+            Name = 'K48'
+            DataType = datFloat
+          end
+          item
+            Name = 'TK'
+            DataType = datFloat
+          end
+          item
+            Name = 'D38'
+            DataType = datFloat
+          end
+          item
+            Name = 'D40'
+            DataType = datFloat
+          end
+          item
+            Name = 'D42'
+            DataType = datFloat
+          end
+          item
+            Name = 'D44'
+            DataType = datFloat
+          end
+          item
+            Name = 'D46'
+            DataType = datFloat
+          end
+          item
+            Name = 'D48'
+            DataType = datFloat
+          end
+          item
+            Name = 'DT'
+            DataType = datFloat
+          end>
+      end
+      item
+        Params = <>
+        Statements = <
+          item
+            Connection = 'GFT_VARELA'
+            TargetTable = 'RDX_V_CONTROL_INVENTARIO'
+            SQL = 
+              'SELECT'#10'    CENTRO, FILIAL, CODIGO, PRODUCTO, COLOR, TIPO_PRODUCT' +
+              'O, GRUPO_PRODUCTO, COLECCION,'#10#10'    SUM(I38) as I38,'#10'    SUM(I40)' +
+              ' as I40,'#10'    SUM(I42) as I42,'#10'    SUM(I44) as I44,'#10'    SUM(I46) ' +
+              'as I46,'#10'    SUM(I48) as I48,'#10'    (SUM(I38) + SUM(I40) + SUM(I42)' +
+              ' + SUM(I44) + SUM(I46) + SUM(I48)) as TI,'#10'    SUM(K38) as K38,'#10' ' +
+              '   SUM(K40) as K40,'#10'    SUM(K42) as K42,'#10'    SUM(K44) as K44,'#10'  ' +
+              '  SUM(K46) as K46,'#10'    SUM(K48) as K48,'#10'    (SUM(K38) + SUM(K40)' +
+              ' + SUM(K42) + SUM(K44) + SUM(K46) + SUM(K48)) as TK,'#10#10'    (SUM(I' +
+              '38) - SUM(K38)) as D38,'#10'    (SUM(I40) - SUM(K40)) as D40,'#10'    (S' +
+              'UM(I42) - SUM(K42)) as D42,'#10'    (SUM(I44) - SUM(K44)) as D44,'#10'  ' +
+              '  (SUM(I46) - SUM(K46)) as D46,'#10'    (SUM(I48) - SUM(K48)) as D48' +
+              ','#10#10'    ((SUM(I38) - SUM(K38)) + (SUM(I40) - SUM(K40)) + (SUM(I42' +
+              ') - SUM(K42)) + (SUM(I44) - SUM(K44)) + (SUM(I46) - SUM(K46)) + ' +
+              '(SUM(I48) - SUM(K48))) as DT'#10#10'  FROM'#10'    RDX_V_CONTROL_INVENTARI' +
+              'O'#10#10'GROUP BY CENTRO, FILIAL, CODIGO, PRODUCTO, COLOR, TIPO_PRODUC' +
+              'TO, GRUPO_PRODUCTO, COLECCION'#10#10'having ((SUM(I38) - SUM(K38)) + (' +
+              'SUM(I40) - SUM(K40)) +'#10'       (SUM(I42) - SUM(K42)) + (SUM(I44) ' +
+              '- SUM(K44)) +'#10'       (SUM(I46) - SUM(K46)) + (SUM(I48) - SUM(K48' +
+              ')) <> 0)'#10
+            StatementType = stSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'CENTRO'
+                TableField = 'CENTRO'
+              end
+              item
+                DatasetField = 'FILIAL'
+                TableField = 'FILIAL'
+              end
+              item
+                DatasetField = 'CODIGO'
+                TableField = 'CODIGO'
+              end
+              item
+                DatasetField = 'PRODUCTO'
+                TableField = 'PRODUCTO'
+              end
+              item
+                DatasetField = 'COLOR'
+                TableField = 'COLOR'
+              end
+              item
+                DatasetField = 'TIPO_PRODUCTO'
+                TableField = 'TIPO_PRODUCTO'
+              end
+              item
+                DatasetField = 'GRUPO_PRODUCTO'
+                TableField = 'GRUPO_PRODUCTO'
+              end
+              item
+                DatasetField = 'COLECCION'
+                TableField = 'COLECCION'
+              end
+              item
+                DatasetField = 'I38'
+                TableField = 'I38'
+              end
+              item
+                DatasetField = 'I40'
+                TableField = 'I40'
+              end
+              item
+                DatasetField = 'I42'
+                TableField = 'I42'
+              end
+              item
+                DatasetField = 'I44'
+                TableField = 'I44'
+              end
+              item
+                DatasetField = 'I46'
+                TableField = 'I46'
+              end
+              item
+                DatasetField = 'I48'
+                TableField = 'I48'
+              end
+              item
+                DatasetField = 'TI'
+                TableField = 'TI'
+              end
+              item
+                DatasetField = 'K38'
+                TableField = 'K38'
+              end
+              item
+                DatasetField = 'K40'
+                TableField = 'K40'
+              end
+              item
+                DatasetField = 'K42'
+                TableField = 'K42'
+              end
+              item
+                DatasetField = 'K44'
+                TableField = 'K44'
+              end
+              item
+                DatasetField = 'K46'
+                TableField = 'K46'
+              end
+              item
+                DatasetField = 'K48'
+                TableField = 'K48'
+              end
+              item
+                DatasetField = 'TK'
+                TableField = 'TK'
+              end
+              item
+                DatasetField = 'D38'
+                TableField = 'D38'
+              end
+              item
+                DatasetField = 'D40'
+                TableField = 'D40'
+              end
+              item
+                DatasetField = 'D42'
+                TableField = 'D42'
+              end
+              item
+                DatasetField = 'D44'
+                TableField = 'D44'
+              end
+              item
+                DatasetField = 'D46'
+                TableField = 'D46'
+              end
+              item
+                DatasetField = 'D48'
+                TableField = 'D48'
+              end
+              item
+                DatasetField = 'DT'
+                TableField = 'DT'
+              end>
+          end>
         Name = 'StockEDIInventario'
         Fields = <
           item

Source/Servidor/AdminPV_Server.dproj

@@ -45,6 +45,13 @@
     <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><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">1</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.1.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">AdminPV_Server</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 05 de octubre de 2007 17:13</VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">AdminPV_Server.dpr</Source></Source><Excluded_Packages>
+      
+      
+      
+      
+      
+      
+      
       <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>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>

Source/Servidor/AdminPV_Server.rc

@@ -16,7 +16,7 @@ BEGIN
               VALUE "FileVersion", "2.1.0.0\0"
               VALUE "ProductName", "AdminPV_Server\0"
               VALUE "ProductVersion", "2.1.0.0\0"
-              VALUE "CompileDate", "lunes, 08 de octubre de 2007 12:43\0"
+              VALUE "CompileDate", "jueves, 24 de enero de 2008 19:05\0"
          END
     END
     BLOCK "VarFileInfo"