El nuevo logo solo es para las facturas

git-svn-id: https://192.168.0.254/svn/Proyectos.Miguelo_FactuGES/trunk@25 172823e9-465a-9d4b-80ba-0a9f016f4eb1

Clientes/ListadoClientes.dfm

@@ -1,7 +1,7 @@
 object frListadoClientes: TfrListadoClientes
   Left = 0
   Top = 0
-  Width = 443
+  Width = 1081
   Height = 270
   Align = alClient
   Color = 16383743
@@ -10,7 +10,7 @@ object frListadoClientes: TfrListadoClientes
   object pnlTitulo: TRdxPanelTituloOperacion
     Left = 0
     Top = 0
-    Width = 443
+    Width = 1081
     Height = 22
     Caption = ' '
     Color = 9685681
@@ -24,7 +24,7 @@ object frListadoClientes: TfrListadoClientes
   object pnlCuerpo: TPanel
     Left = 0
     Top = 22
-    Width = 443
+    Width = 1081
     Height = 107
     Align = alTop
     AutoSize = True
@@ -35,7 +35,7 @@ object frListadoClientes: TfrListadoClientes
     object pnlProveedor: TAdvPanel
       Left = 10
       Top = 10
-      Width = 423
+      Width = 1061
       Height = 87
       Align = alTop
       BevelOuter = bvNone
@@ -129,8 +129,8 @@ object frListadoClientes: TfrListadoClientes
         ParentFont = False
       end
       object Label2: TLabel
-        Left = 70
-        Top = 64
+        Left = 382
+        Top = 40
         Width = 76
         Height = 13
         Alignment = taRightJustify
@@ -157,6 +157,34 @@ object frListadoClientes: TfrListadoClientes
         ParentFont = False
         Visible = False
       end
+      object Label3: TLabel
+        Left = 19
+        Top = 66
+        Width = 127
+        Height = 13
+        Alignment = taRightJustify
+        Caption = 'Dados de alta entre el d'#237'a:'
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -11
+        Font.Name = 'Tahoma'
+        Font.Style = []
+        ParentFont = False
+      end
+      object eFechaFin: TLabel
+        Left = 420
+        Top = 66
+        Width = 38
+        Height = 13
+        Alignment = taRightJustify
+        Caption = 'y el d'#237'a:'
+        Font.Charset = DEFAULT_CHARSET
+        Font.Color = clWindowText
+        Font.Height = -11
+        Font.Name = 'Tahoma'
+        Font.Style = []
+        ParentFont = False
+      end
       object NombreCliIni: TcxButtonEdit
         Left = 152
         Top = 37
@@ -215,11 +243,11 @@ object frListadoClientes: TfrListadoClientes
         Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro
         TabOrder = 0
         Text = 'NombreCliIni'
-        Width = 350
+        Width = 225
       end
       object NombreCliFin: TcxButtonEdit
-        Left = 152
-        Top = 61
+        Left = 464
+        Top = 37
         ParentFont = False
         Properties.Buttons = <
           item
@@ -275,14 +303,34 @@ object frListadoClientes: TfrListadoClientes
         Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro
         TabOrder = 1
         Text = 'NombreCliFin'
-        Width = 350
+        Width = 225
+      end
+      object FechaIni: TcxDateEdit
+        Left = 152
+        Top = 62
+        ParentFont = False
+        Properties.ImmediatePost = True
+        Properties.OnValidate = FechaIniPropertiesValidate
+        Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro
+        TabOrder = 2
+        Width = 225
+      end
+      object FechaFin: TcxDateEdit
+        Left = 464
+        Top = 62
+        ParentFont = False
+        Properties.ImmediatePost = True
+        Properties.OnValidate = FechaFinPropertiesValidate
+        Style.StyleController = dmConfiguracion.cxEstiloEditoresFondoOscuro
+        TabOrder = 3
+        Width = 225
       end
     end
   end
   object pnlVistaPrevia: TPanel
     Left = 0
     Top = 129
-    Width = 443
+    Width = 1081
     Height = 141
     Align = alClient
     BevelOuter = bvNone

Clientes/ListadoClientes.pas

@@ -32,7 +32,7 @@ uses
   Dialogs, RdxFrame, RdxBotones, RdxPaneles, RdxBarras, cxControls,
   cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxButtonEdit, StdCtrls,
   AdvPanel, ExtCtrls, RdxTitulos, cxDropDownEdit, VistaPrevia,
-  InformeListadoClientes, TablaClientes, Entidades;
+  InformeListadoClientes, TablaClientes, Entidades, cxCalendar;
 
 type
   TfrListadoClientes = class(TRdxFrame)
@@ -45,6 +45,10 @@ type
     Label1: TLabel;
     NombreCliIni: TcxButtonEdit;
     NombreCliFin: TcxButtonEdit;
+    Label3: TLabel;
+    FechaIni: TcxDateEdit;
+    eFechaFin: TLabel;
+    FechaFin: TcxDateEdit;
     procedure CodigoCliIniPropertiesButtonClick(Sender: TObject;
       AButtonIndex: Integer);
     procedure CodigoCliFinPropertiesButtonClick(Sender: TObject;
@@ -55,6 +59,12 @@ type
     procedure NombreCliFinPropertiesValidate(Sender: TObject;
       var DisplayValue: Variant; var ErrorText: TCaption;
       var Error: Boolean);
+    procedure FechaIniPropertiesValidate(Sender: TObject;
+      var DisplayValue: Variant; var ErrorText: TCaption;
+      var Error: Boolean);
+    procedure FechaFinPropertiesValidate(Sender: TObject;
+      var DisplayValue: Variant; var ErrorText: TCaption;
+      var Error: Boolean);
   private
     FVistaPrevia : TfrVistaPrevia;
     FInforme : TdmInformeListadoClientes;
@@ -82,8 +92,8 @@ implementation
 { TfrListadoClientes }
 
 uses
-  Literales, Mensajes, StrFunc, DateUtils, InformeBase,
-  Clientes, RdxFrameClientes, configuracion;
+  Literales, Mensajes, StrFunc, DateUtils, InformeBase, cxDateUtils,
+  Clientes, RdxFrameClientes, configuracion, TablaTrimestres;
 
 constructor TfrListadoClientes.Create(AOwner: TComponent);
 var
@@ -111,6 +121,12 @@ begin
   FVistaPrevia.Parent := pnlVistaPrevia;
   FInforme := TdmInformeListadoClientes.Create(Self);
   FInforme.Preview := FVistaPrevia.Preview;
+
+  FechaIni.Date := dmTablaTrimestres.darFechaIniTrimestre(dmTablaTrimestres.darTrimestreActual);
+  FechaFin.Date := dmTablaTrimestres.darFechaFinTrimestre(dmTablaTrimestres.darTrimestreActual);
+  FInforme.FechaAltaIni := FechaIni.Date;
+  FInforme.FechaAltaFin := FechaFin.Date;
+
   RecogerParametrosInforme;
 end;
 
@@ -217,4 +233,46 @@ begin
   ConfigurarFrame(Self, Self.Entidad);
 end;
 
+procedure TfrListadoClientes.FechaIniPropertiesValidate(Sender: TObject;
+  var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
+var
+  ADate : TDateTime;
+begin
+  try
+    if DisplayValue > FechaFin.Date then
+    begin
+      ErrorText := msgFechasMal;
+      Error := True;
+      Exit;
+    end;
+    TextToDateEx(DisplayValue, ADate);
+    FInforme.FechaAltaIni := ADate;
+    FInforme.Previsualizar;
+  except
+    Error := True;
+    ErrorText := msgFechaNoValida;
+  end;
+end;
+
+procedure TfrListadoClientes.FechaFinPropertiesValidate(Sender: TObject;
+  var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
+var
+  ADate : TDateTime;
+begin
+  try
+    if DisplayValue < FechaIni.Date then
+    begin
+      ErrorText := msgFechasMal;
+      Error := True;
+      Exit;
+    end;
+    TextToDateEx(DisplayValue, ADate);
+    FInforme.FechaAltaFin := ADate;
+    FInforme.Previsualizar
+  except
+    Error := True;
+    ErrorText := msgFechaNoValida;
+  end;
+end;
+
 end.

Factuges.dof

@@ -114,7 +114,7 @@ IncludeVerInfo=1
 AutoIncBuild=0
 MajorVer=3
 MinorVer=0
-Release=6
+Release=8
 Build=0
 Debug=0
 PreRelease=0
@@ -126,28 +126,28 @@ CodePage=1252
 [Version Info Keys]
 CompanyName=
 FileDescription=
-FileVersion=3.0.6.0
+FileVersion=3.0.8.0
 InternalName=
 LegalCopyright=
 LegalTrademarks=
 OriginalFilename=
 ProductName=
-ProductVersion=2.6.0.0
+ProductVersion=3.0.8.0
 Comments=
 [Excluded Packages]
-C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxTreeListVCLD7.bpl=ExpressQuantumTreeList 4 (VCL Edition) by Developer Express Inc.
-C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxThemeD7.bpl=Express XP Theme Manager by Developer Express Inc.
 C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxLibraryVCLD7.bpl=Express Cross Platform Library (VCL Edition) by Developer Express Inc.
-C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxExportVCLD7.bpl=Express Cross Platform Export Library (VCL Edition) by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxThemeD7.bpl=Express XP Theme Manager by Developer Express Inc.
 C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxEditorsVCLD7.bpl=ExpressEditors Library 5 (VCL Edition) by Developer Express Inc.
 C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxDataD7.bpl=ExpressDataController by Developer Express Inc.
 C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxExtEditorsVCLD7.bpl=ExpressExtendedEditors Library 5 (VCL Edition) by Developer Express Inc.
 C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxGridVCLD7.bpl=ExpressQuantumGrid 5 (VCL Edition) by Developer Express Inc.
 C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxPageControlVCLD7.bpl=Express Cross Platform PageControl (VCL Edition) by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxExportVCLD7.bpl=Express Cross Platform Export Library (VCL Edition) by Developer Express Inc.
 C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxSchedulerVCLD7.bpl=ExpressScheduler 2 (VCL Edition) by Developer Express Inc.
-C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxsbD7.bpl=ExpressSideBar by Developer Express Inc.
-C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxComnD7.bpl=ExpressCommonLibrary by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxTreeListVCLD7.bpl=ExpressQuantumTreeList 4 (VCL Edition) by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxVerticalGridVCLD7.bpl=ExpressVerticalGrid (VCL Edition) by Developer Express Inc.
 C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxBarD7.bpl=ExpressBars by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxComnD7.bpl=ExpressCommonLibrary by Developer Express Inc.
 C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxBarDBNavD7.bpl=ExpressBars DBNavigator by Developer Express Inc.
 C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxBarExtDBItemsD7.bpl=ExpressBars extended DB items by Developer Express Inc.
 C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxBarExtItemsD7.bpl=ExpressBars extended items by Developer Express Inc.
@@ -156,15 +156,51 @@ C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxLayoutControlD7.bpl=Expre
 C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxNavBarD7.bpl=ExpressNavBar by Developer Express Inc.
 C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxGDIPlusD7.bpl=ExpressGDI+ Library by Developer Express Inc.
 C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxPSCoreD7.bpl=ExpressPrinting System by Developer Express Inc.
-C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\cxVerticalGridVCLD7.bpl=ExpressVerticalGrid (VCL Edition) by Developer Express Inc.
-C:\Archivos de programa\EurekaLog 5\Delphi7\ExceptionExpert7.bpl=EurekaLog 5.1.9
-C:\Archivos de programa\Clever Components\Database Comparer\Delphi 7\Lib\ComparerD7.bpl=Database Comparer VCL
-C:\Archivos de programa\Clever Components\Database Comparer\Delphi 7\Lib\ComparerBdeD7.bpl=Database Comparer VCL BDE
-C:\Archivos de programa\Clever Components\Database Comparer\Delphi 7\Lib\ComparerDBXD7.bpl=Database Comparer VCL DBX
-C:\Archivos de programa\Clever Components\Database Comparer\Delphi 7\Lib\ComparerIbxD7.bpl=Database Comparer VCL IBX
-C:\Archivos de programa\Clever Components\Database Comparer\Delphi 7\Lib\ComparerAdoD7.bpl=Database Comparer VCL ADO
-C:\WINDOWS\system32\dclShX_Namespace_V3D7.bpl=(untitled)
-C:\WINDOWS\system32\vclShX_Namespace_v3D7.bpl=(untitled)
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\dxsbD7.bpl=ExpressSideBar by Developer Express Inc.
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\VirtualTreesD7.bpl=Virtual Treeview runtime package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\EPCOTAUtils70.bpl=EPC Open Tools API utilities
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvCoreD7R.bpl=JVCL Core Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\Jcl70.bpl=JEDI Code Library RTL package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JclVcl70.bpl=JEDI Code Library VCL package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvSystemD7R.bpl=JVCL System Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvStdCtrlsD7R.bpl=JVCL Standard Controls Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvAppFrmD7R.bpl=JVCL Application and Form Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvBandsD7R.bpl=JVCL Band Objects Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvDBD7R.bpl=JVCL Database Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvDlgsD7R.bpl=JVCL Dialog Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvCustomD7R.bpl=JVCL Custom Controls Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvBDED7R.bpl=JVCL BDE Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvCmpD7R.bpl=JVCL Non-Visual Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvCryptD7R.bpl=JVCL Encryption and Compression Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvDockingD7R.bpl=JVCL Docking Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvDotNetCtrlsD7R.bpl=JVCL DotNet Controls Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvEDID7R.bpl=JVCL EDI Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvGlobusD7R.bpl=JVCL Globus Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvHMID7R.bpl=JVCL HMI Controls Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvInterpreterD7R.bpl=JVCL Interpreter Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvJansD7R.bpl=JVCL Jans Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvManagedThreadsD7R.bpl=JVCL Managed Threads Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvMMD7R.bpl=JVCL Multimedia and Image Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvNetD7R.bpl=JVCL Network Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvPageCompsD7R.bpl=JVCL Page Style Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvPluginD7R.bpl=JVCL Plugin Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvPrintPreviewD7R.bpl=JVCL Print Preview Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvRuntimeDesignD7R.bpl=JVCL Runtime Design Components Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\JvTimeFrameworkD7R.bpl=JVCL Time Framework Runtime Package
+C:\Archivos de programa\Borland\Delphi7\Projects\Bpl\PluginSDK_D7R.bpl=(untitled)
+C:\Componentes\FastReport 3\LibD7\frxADO7.bpl=(untitled)
+C:\Componentes\FastReport 3\LibD7\fsADO7.bpl=(untitled)
+C:\Componentes\FastReport 3\LibD7\fsDB7.bpl=(untitled)
+C:\Componentes\FastReport 3\LibD7\fs7.bpl=(untitled)
+C:\Componentes\FastReport 3\LibD7\frxDB7.bpl=(untitled)
+C:\Componentes\FastReport 3\LibD7\frx7.bpl=(untitled)
+C:\Componentes\FastReport 3\LibD7\frxBDE7.bpl=(untitled)
+C:\Componentes\FastReport 3\LibD7\fsBDE7.bpl=(untitled)
+C:\Componentes\FastReport 3\LibD7\frxDBX7.bpl=(untitled)
+C:\Componentes\FastReport 3\LibD7\frxe7.bpl=(untitled)
+C:\Componentes\FastReport 3\LibD7\frxIBX7.bpl=(untitled)
+C:\Componentes\FastReport 3\LibD7\fsIBX7.bpl=(untitled)
+C:\Componentes\FastReport 3\LibD7\frxTee7.bpl=(untitled)
 [HistoryLists\hlDebugSourcePath]
 Count=1
 Item0=D:\Proyectos\Componentes\Indy9\

Factuges.dpr

@@ -28,7 +28,7 @@ program FactuGES;
 {%ToDo 'Factuges.todo'}
 
 uses
-  ExceptionLog,
+//  ExceptionLog,
   Forms,
   Windows,
   Mensajes,

Factuges.dsk

@@ -1,21 +1,27 @@
 [Closed Files]
-File_0=SourceModule,'E:\Miguelo\Informes\InformeEstadoAlmacen.pas',0,1,15,17,24,1,0
-File_1=SourceModule,'E:\Miguelo\Informes\InformeListadoClientes.pas',0,1,51,20,46,1,0
-File_2=SourceModule,'E:\Miguelo\BaseDatos\TablaArticulosAlmacen.pas',0,1,246,1,253,1,0
-File_3=SourceModule,'E:\Miguelo\BaseDatos\TablaArticulos.pas',0,1,243,18,256,0,0
-File_4=SourceModule,'c:\archivos de programa\borland\delphi7\source\vcl\Forms.pas',0,1,2060,1,2076,0,0
-File_5=SourceModule,'c:\archivos de programa\borland\delphi7\source\vcl\Controls.pas',0,1,5419,1,5430,0,0
-File_6=SourceModule,'c:\archivos de programa\borland\delphi7\source\rtl\Sys\system.pas',0,1,8374,1,8385,0,0
-File_7=SourceModule,'c:\archivos de programa\borland\delphi7\source\rtl\common\classes.pas',0,1,2169,1,2180,0,0
-File_8=SourceModule,'E:\Miguelo\Frames\RdxDBFrame.pas',0,1,158,1,169,0,0
-File_9=SourceModule,'c:\archivos de programa\borland\delphi7\source\rtl\Sys\variants.pas',0,1,596,1,609,0,0
+File_0=SourceModule,'C:\Codigo Miguelo\BaseDatos\TablaEmpresas.pas',0,1,160,39,194,1,0
+File_1=SourceModule,'C:\Codigo Miguelo\Informes\InformeContratoCliente.pas',0,1,1,1,1,1,0
+File_2=SourceModule,'C:\Codigo Miguelo\Clientes\ListadoClientes.pas',0,1,68,69,95,1,0
+File_3=SourceModule,'C:\Codigo Miguelo\Informes\InformeListadoFacturacionProcedencia.pas',0,1,87,97,105,1,0
+File_4=SourceModule,'C:\Codigo Miguelo\Clientes\ListadoFacturacionProcedencia.pas',0,1,46,63,76,1,0
+File_5=SourceModule,'C:\Codigo Miguelo\Informes\InformeListadoClientes.pas',0,1,74,58,79,1,0
+File_6=SourceModule,'E:\Miguelo\Informes\InformeEstadoAlmacen.pas',0,1,15,17,24,1,0
+File_7=SourceModule,'E:\Miguelo\Informes\InformeListadoClientes.pas',0,1,51,20,46,1,0
+File_8=SourceModule,'E:\Miguelo\BaseDatos\TablaArticulosAlmacen.pas',0,1,246,1,253,1,0
+File_9=SourceModule,'E:\Miguelo\BaseDatos\TablaArticulos.pas',0,1,243,18,256,0,0
 
 [Modules]
-Module0=T:\Miguelo\Factuges.dpr
-Count=1
+Module0=C:\Codigo\Informes\InformeFacturaCliente.pas
+Module1=C:\Codigo\Factuges.dpr
+Count=2
 EditWindowCount=1
 
-[T:\Miguelo\Factuges.dpr]
+[C:\Codigo\Informes\InformeFacturaCliente.pas]
+ModuleType=SourceModule
+FormState=1
+FormOnTop=1
+
+[C:\Codigo\Factuges.dpr]
 ModuleType=SourceModule
 FormState=0
 FormOnTop=0
@@ -24,27 +30,32 @@ FormOnTop=0
 FormState=0
 FormOnTop=0
 
-[T:\Miguelo\Factuges.todo]
+[C:\Codigo\Factuges.todo]
+FormState=0
+FormOnTop=0
+
+[C:\Codigo\Informes\InformeBase.pas]
 FormState=0
 FormOnTop=0
 
 [EditWindow0]
-ViewCount=1
-CurrentView=0
+ViewCount=2
+CurrentView=1
 View0=0
+View1=1
 CodeExplorer=CodeExplorer@EditWindow0
 MessageView=MessageView@EditWindow0
 Create=1
 Visible=1
 State=0
 Left=329
-Top=139
-Width=781
-Height=545
+Top=140
+Width=1308
+Height=827
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=773
-ClientHeight=511
+ClientWidth=1300
+ClientHeight=793
 LeftPanelSize=140
 LeftPanelClients=CodeExplorer@EditWindow0
 LeftPanelData=000004000000000000000000000000000000000000000000000100000000000000000C000000436F64654578706C6F726572FFFFFFFF
@@ -54,7 +65,14 @@ BottomPanelClients=MessageView@EditWindow0
 BottomPanelData=000004000000000000000000000000000000000000000000000100000000000000000B0000004D65737361676556696577FFFFFFFF
 
 [View0]
-Module=T:\Miguelo\Factuges.dpr
+Module=C:\Codigo\Factuges.dpr
+CursorX=1
+CursorY=1
+TopLine=1
+LeftCol=1
+
+[View1]
+Module=C:\Codigo\Informes\InformeFacturaCliente.pas
 CursorX=1
 CursorY=1
 TopLine=1
@@ -147,14 +165,14 @@ Create=1
 Visible=1
 State=2
 Left=0
-Top=9
-Width=1680
+Top=10
+Width=1920
 Height=112
 MaxLeft=-1
 MaxTop=-1
-MaxWidth=1688
+MaxWidth=1928
 MaxHeight=112
-ClientWidth=1680
+ClientWidth=1920
 ClientHeight=78
 
 [ProjectManager]
@@ -194,7 +212,7 @@ Create=1
 Visible=0
 State=0
 Left=355
-Top=311
+Top=312
 Width=531
 Height=352
 MaxLeft=-1
@@ -208,7 +226,7 @@ FlagPane=64
 
 [AlignmentPalette]
 Create=1
-Visible=0
+Visible=1
 State=0
 Left=227
 Top=640
@@ -236,7 +254,7 @@ LRDockWidth=345
 Dockable=1
 SplitPos=170
 ArrangeBy=Name
-SelectedItem=
+SelectedItem=Name
 ExpandedItems=Action,Actions,Anchors,ArrangeSettings,BusinessRulesClient,BusinessRulesServer,Caption,Channel.Encryption,Colors,DataBinding,DataController,DataRequestCall,Dataset,Dataset.DataSet,DispatchOptions,DragDropSettings,Encryption,Fonts,ObjectTypes,Options,OptionsCustomize,OptionsView,ProcessorOptions,Properties,Properties.ListOptions,Properties.ListSource,ProxySettings,RemoteService.Message,RemoteUpdatesOptions,Root,RootLevelStyles,SchemaCall,Style,Style.LookAndFeel,StyleDisabled,StyleFocused,StyleHot,StyleManager.Colors,Styles,Styles.StyleSheet,Styles.StyleSheet.Styles,Styles.StyleSheet.Styles.Preview,Styles.StyleSheet.Styles.Preview.Font,Summary,Value,VisibleButtons
 HiddenCategories=
 
@@ -300,7 +318,7 @@ Column3Width=250
 
 [ObjectTree]
 Create=1
-Visible=1
+Visible=0
 State=0
 Left=646
 Top=122
@@ -375,7 +393,7 @@ Create=1
 Visible=0
 State=0
 Left=711
-Top=239
+Top=240
 Width=394
 Height=333
 MaxLeft=-1
@@ -429,11 +447,11 @@ State=0
 Left=0
 Top=12
 Width=140
-Height=411
+Height=693
 MaxLeft=-1
 MaxTop=-1
 ClientWidth=140
-ClientHeight=411
+ClientHeight=693
 TBDockHeight=305
 LRDockWidth=140
 Dockable=1
@@ -444,11 +462,11 @@ Visible=1
 State=0
 Left=12
 Top=0
-Width=761
+Width=1288
 Height=85
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=761
+ClientWidth=1288
 ClientHeight=85
 TBDockHeight=85
 LRDockWidth=443

Factuges.~dsk

@@ -1,517 +0,0 @@
-[Closed Files]
-File_0=SourceModule,'E:\Miguelo\Informes\InformeEstadoAlmacen.pas',0,1,15,17,24,1,0
-File_1=SourceModule,'E:\Miguelo\Informes\InformeListadoClientes.pas',0,1,51,20,46,1,0
-File_2=SourceModule,'E:\Miguelo\BaseDatos\TablaArticulosAlmacen.pas',0,1,246,1,253,1,0
-File_3=SourceModule,'E:\Miguelo\BaseDatos\TablaArticulos.pas',0,1,243,18,256,0,0
-File_4=SourceModule,'c:\archivos de programa\borland\delphi7\source\vcl\Forms.pas',0,1,2060,1,2076,0,0
-File_5=SourceModule,'c:\archivos de programa\borland\delphi7\source\vcl\Controls.pas',0,1,5419,1,5430,0,0
-File_6=SourceModule,'c:\archivos de programa\borland\delphi7\source\rtl\Sys\system.pas',0,1,8374,1,8385,0,0
-File_7=SourceModule,'c:\archivos de programa\borland\delphi7\source\rtl\common\classes.pas',0,1,2169,1,2180,0,0
-File_8=SourceModule,'E:\Miguelo\Frames\RdxDBFrame.pas',0,1,158,1,169,0,0
-File_9=SourceModule,'c:\archivos de programa\borland\delphi7\source\rtl\Sys\variants.pas',0,1,596,1,609,0,0
-
-[Modules]
-Module0=E:\Miguelo\Almacenes\ListadoArticulosAlmacen.pas
-Module1=E:\Miguelo\Clientes\ListadoClientes.pas
-Module2=E:\Miguelo\Almacenes\ArticulosAlmacen.pas
-Module3=E:\Miguelo\Informes\PantallaInformesGeneral.pas
-Count=4
-EditWindowCount=1
-
-[E:\Miguelo\Almacenes\ListadoArticulosAlmacen.pas]
-ModuleType=SourceModule
-FormState=1
-FormOnTop=0
-
-[E:\Miguelo\Clientes\ListadoClientes.pas]
-ModuleType=SourceModule
-FormState=1
-FormOnTop=0
-
-[E:\Miguelo\Almacenes\ArticulosAlmacen.pas]
-ModuleType=SourceModule
-FormState=1
-FormOnTop=0
-
-[E:\Miguelo\Informes\PantallaInformesGeneral.pas]
-ModuleType=SourceModule
-FormState=1
-FormOnTop=0
-
-[C:\Archivos de programa\Borland\Delphi7\Projects\ProjectGroup1.bpg]
-FormState=0
-FormOnTop=0
-
-[E:\Miguelo\Factuges.dpr]
-FormState=0
-FormOnTop=0
-
-[E:\Miguelo\Factuges.todo]
-FormState=0
-FormOnTop=0
-
-[E:\Miguelo\Libreria\Configuracion.pas]
-FormState=0
-FormOnTop=0
-
-[E:\Miguelo\Frames\RdxFrame.pas]
-FormState=0
-FormOnTop=0
-
-[E:\Miguelo\Informes\InformeBase.pas]
-FormState=0
-FormOnTop=0
-
-[EditWindow0]
-ViewCount=4
-CurrentView=1
-View0=0
-View1=1
-View2=2
-View3=3
-CodeExplorer=CodeExplorer@EditWindow0
-MessageView=MessageView@EditWindow0
-Create=1
-Visible=1
-State=0
-Left=329
-Top=139
-Width=781
-Height=545
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=773
-ClientHeight=511
-LeftPanelSize=140
-LeftPanelClients=CodeExplorer@EditWindow0
-LeftPanelData=000004000000000000000000000000000000000000000000000100000000000000000C000000436F64654578706C6F726572FFFFFFFF
-RightPanelSize=0
-BottomPanelSize=85
-BottomPanelClients=MessageView@EditWindow0
-BottomPanelData=000004000000000000000000000000000000000000000000000100000000000000000B0000004D65737361676556696577FFFFFFFF
-
-[View0]
-Module=E:\Miguelo\Almacenes\ArticulosAlmacen.pas
-CursorX=5
-CursorY=341
-TopLine=334
-LeftCol=1
-
-[View1]
-Module=E:\Miguelo\Almacenes\ListadoArticulosAlmacen.pas
-CursorX=15
-CursorY=124
-TopLine=124
-LeftCol=1
-
-[View2]
-Module=E:\Miguelo\Clientes\ListadoClientes.pas
-CursorX=15
-CursorY=66
-TopLine=66
-LeftCol=1
-
-[View3]
-Module=E:\Miguelo\Informes\PantallaInformesGeneral.pas
-CursorX=1
-CursorY=94
-TopLine=87
-LeftCol=1
-
-[Watches]
-Count=6
-Watch0='Self',256,0,18,1,0,'Watches'
-Watch1='TablaAlmacenes.FieldByName(''NOMBRECLIENTE'').Required',256,0,18,1,0,'Watches'
-Watch2='VistaDetalles.GetColumnByFieldName(''DESCRIPCION'')',256,0,18,1,0,'Watches'
-Watch3='obj',16,0,18,1,0,'Watches'
-Watch4='temp',4,0,18,1,0,'Watches'
-Watch5='contenidomodal.class',256,0,18,1,0,'Watches'
-
-[WatchWindow]
-WatchColumnWidth=100
-WatchShowColumnHeaders=1
-Create=1
-Visible=0
-State=0
-Left=858
-Top=625
-Width=302
-Height=237
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=294
-ClientHeight=211
-TBDockHeight=128
-LRDockWidth=294
-Dockable=1
-
-[Breakpoints]
-Count=49
-Breakpoint0='C:\Archivos de programa\jvcl\run\JvProgramVersionCheck.pas',1194,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint1='C:\Archivos de programa\jvcl\run\JvProgramVersionCheck.pas',1202,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint2='C:\Archivos de programa\jvcl\run\JvProgramVersionCheck.pas',818,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint3='C:\Archivos de programa\jvcl\run\JvProgramVersionCheck.pas',1534,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint4='D:\Proyectos\Componentes\Indy9\IdHTTP.pas',1081,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint5='D:\Proyectos\Componentes\Indy9\IdHTTP.pas',1115,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint6='D:\Proyectos\FactuGES (Miguelo)\Codigo\Almacenes\MovimientoAlmacenes.pas',1429,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint7='D:\Proyectos\Librerias\RdxGestorContadores.pas',547,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint8='D:\Proyectos\FactuGES (Miguelo)\Codigo\Almacenes\MovimientoAlmacenes.pas',863,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint9='D:\Proyectos\FactuGES (Miguelo)\Codigo\Almacenes\ArticuloObraHistorica.pas',281,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint10='D:\Proyectos\FactuGES (Miguelo)\Codigo\Almacenes\ArticuloObraHistorica.pas',321,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint11='T:\Codigo (Miguelo)\Datos\ArticulosModelo.pas',145,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint12='T:\Codigo (Miguelo)\Datos\ArticulosModelo.pas',153,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint13='T:\Codigo (Miguelo)\Datos\ArticulosModelo.pas',178,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint14='T:\Codigo (Miguelo)\Datos\ArticulosModelo.pas',183,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint15='T:\Codigo (Miguelo)\Datos\ArticulosModelo.pas',188,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint16='T:\Codigo (Miguelo)\Datos\ArticulosModelo.pas',194,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint17='T:\Codigo (Miguelo)\Datos\ArticulosModelo.pas',200,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint18='T:\Codigo (Miguelo)\Datos\ArticulosModelo.pas',206,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint19='T:\Codigo (Miguelo)\Datos\ArticulosModelo.pas',212,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint20='T:\Codigo (Miguelo)\Datos\ArticulosModelo.pas',218,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint21='T:\Codigo (Miguelo)\Datos\ArticulosModelo.pas',224,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint22='T:\Codigo (Miguelo)\Datos\ArticulosModelo.pas',232,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint23='T:\Codigo (Miguelo)\Datos\ArticulosModelo.pas',128,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint24='T:\Codigo (Miguelo)\Datos\ArticulosModelo.pas',120,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint25='T:\Codigo (Miguelo)\Datos\ArticulosModelo.pas',105,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint26='T:\Codigo (Miguelo)\Datos\Articulos.pas',158,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint27='T:\Codigo (Miguelo)\Datos\Articulos.pas',130,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint28='T:\Codigo (Miguelo)\Datos\Articulos.pas',110,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint29='T:\Codigo (Miguelo)\Datos\Articulos.pas',101,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint30='T:\Codigo (Miguelo)\Datos\Articulos.pas',95,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint31='T:\Codigo (Miguelo)\Datos\Articulos.pas',89,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint32='T:\Codigo (Miguelo)\Datos\Articulos.pas',83,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint33='T:\Codigo (Miguelo)\Datos\Articulos.pas',77,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint34='T:\Codigo (Miguelo)\Frames\RdxFrameArticulos.pas',173,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint35='T:\Codigo (Miguelo)\Frames\RdxFrameArticulos.pas',165,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint36='T:\Codigo (Miguelo)\Frames\RdxFrameArticulos.pas',160,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint37='T:\Codigo (Miguelo)\Frames\RdxFrameArticulos.pas',182,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint38='T:\Codigo (Miguelo)\Frames\RdxFrameArticulos.pas',189,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint39='T:\Codigo (Miguelo)\Frames\RdxFrameArticulos.pas',198,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint40='T:\Codigo (Miguelo)\Frames\RdxFrameArticulos.pas',207,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint41='T:\Codigo (Miguelo)\Frames\RdxFrameArticulos.pas',141,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint42='T:\Codigo (Miguelo)\Frames\RdxFrameArticulos.pas',133,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint43='T:\Codigo (Miguelo)\Frames\RdxFrameArticulos.pas',114,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint44='T:\Codigo (Miguelo)\Frames\RdxFrameArticulos.pas',88,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint45='T:\Codigo (Miguelo)\Frames\RdxFrameArticulos.pas',81,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint46='T:\Codigo (Miguelo)\Proveedores\PedidoProveedor.pas',936,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint47='E:\Miguelo\Almacenes\ListadoArticulosAlmacen.pas',437,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint48='E:\Miguelo\BaseDatos\TablaArticulosAlmacen.pas',253,'',0,1,'',1,0,0,'',1,'','',''
-
-[AddressBreakpoints]
-Count=0
-
-[Main Window]
-Create=1
-Visible=1
-State=2
-Left=0
-Top=9
-Width=1152
-Height=112
-MaxLeft=-4
-MaxTop=-4
-MaxWidth=1160
-MaxHeight=112
-ClientWidth=1152
-ClientHeight=78
-
-[ProjectManager]
-Create=1
-Visible=1
-State=0
-Left=1
-Top=148
-Width=369
-Height=563
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=361
-ClientHeight=537
-TBDockHeight=305
-LRDockWidth=345
-Dockable=1
-
-[Components]
-Left=421
-Top=252
-Width=181
-Height=264
-Create=1
-Visible=0
-State=0
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=173
-ClientHeight=238
-TBDockHeight=235
-LRDockWidth=183
-Dockable=1
-
-[CPUWindow]
-Create=1
-Visible=0
-State=0
-Left=355
-Top=311
-Width=531
-Height=352
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=523
-ClientHeight=318
-DumpPane=79
-DisassemblyPane=187
-RegisterPane=231
-FlagPane=64
-
-[AlignmentPalette]
-Create=1
-Visible=0
-State=0
-Left=227
-Top=640
-Width=156
-Height=84
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=150
-ClientHeight=60
-
-[PropertyInspector]
-Create=1
-Visible=1
-State=0
-Left=20
-Top=124
-Width=294
-Height=719
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=286
-ClientHeight=693
-TBDockHeight=431
-LRDockWidth=345
-Dockable=1
-SplitPos=170
-ArrangeBy=Name
-SelectedItem=BarraExtra
-ExpandedItems=Action,Actions,Anchors,ArrangeSettings,BusinessRulesClient,BusinessRulesServer,Caption,Channel.Encryption,Colors,DataBinding,DataController,DataRequestCall,Dataset,Dataset.DataSet,DispatchOptions,DragDropSettings,Encryption,Fonts,ObjectTypes,Options,OptionsCustomize,OptionsView,ProcessorOptions,Properties,Properties.ListOptions,Properties.ListSource,ProxySettings,RemoteService.Message,RemoteUpdatesOptions,Root,RootLevelStyles,SchemaCall,Style,Style.LookAndFeel,StyleDisabled,StyleFocused,StyleHot,StyleManager.Colors,Styles,Styles.StyleSheet,Styles.StyleSheet.Styles,Styles.StyleSheet.Styles.Preview,Styles.StyleSheet.Styles.Preview.Font,Summary,Value,VisibleButtons
-HiddenCategories=
-
-[BreakpointWindow]
-Create=1
-Visible=0
-State=0
-Left=32
-Top=202
-Width=735
-Height=197
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=727
-ClientHeight=171
-TBDockHeight=197
-LRDockWidth=737
-Dockable=1
-Column0Width=100
-Column1Width=75
-Column2Width=200
-Column3Width=200
-Column4Width=75
-Column5Width=75
-
-[CallStackWindow]
-Create=1
-Visible=0
-State=0
-Left=858
-Top=137
-Width=302
-Height=438
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=294
-ClientHeight=412
-TBDockHeight=161
-LRDockWidth=294
-Dockable=1
-
-[ThreadStatusWindow]
-Create=1
-Visible=0
-State=0
-Left=194
-Top=108
-Width=622
-Height=152
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=614
-ClientHeight=126
-TBDockHeight=152
-LRDockWidth=624
-Dockable=1
-Column0Width=145
-Column1Width=100
-Column2Width=115
-Column3Width=250
-
-[ObjectTree]
-Create=1
-Visible=1
-State=0
-Left=646
-Top=122
-Width=490
-Height=543
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=482
-ClientHeight=517
-TBDockHeight=288
-LRDockWidth=167
-Dockable=1
-
-[DebugLogView]
-Create=1
-Visible=0
-State=0
-Left=304
-Top=239
-Width=415
-Height=291
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=407
-ClientHeight=265
-TBDockHeight=291
-LRDockWidth=417
-Dockable=1
-
-[LocalVarsWindow]
-Create=1
-Visible=0
-State=0
-Left=290
-Top=580
-Width=419
-Height=192
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=411
-ClientHeight=166
-TBDockHeight=192
-LRDockWidth=421
-Dockable=1
-
-[ToDo List]
-Create=1
-Visible=0
-State=0
-Left=174
-Top=63
-Width=519
-Height=455
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=511
-ClientHeight=429
-TBDockHeight=250
-LRDockWidth=470
-Dockable=1
-Column0Width=377
-Column1Width=30
-Column2Width=55
-Column3Width=70
-Column4Width=103
-SortOrder=6
-ShowHints=1
-ShowChecked=1
-
-[FPUWindow]
-Create=1
-Visible=0
-State=0
-Left=711
-Top=239
-Width=394
-Height=333
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=386
-ClientHeight=299
-RegisterPane=121
-FlagPane=126
-
-[ModuleWindow]
-Create=1
-Visible=0
-State=0
-Left=198
-Top=131
-Width=636
-Height=355
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=628
-ClientHeight=329
-TBDockHeight=355
-LRDockWidth=638
-Dockable=1
-Column0Width=125
-Column1Width=100
-Column2Width=155
-EntryPointPane=225
-CompUnitPane=104
-
-[MessageHintFrm]
-Create=1
-Visible=0
-State=0
-Left=323
-Top=383
-Width=383
-Height=195
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=375
-ClientHeight=169
-TBDockHeight=195
-LRDockWidth=383
-Dockable=1
-
-[CodeExplorer@EditWindow0]
-Create=1
-Visible=1
-State=0
-Left=0
-Top=12
-Width=140
-Height=411
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=140
-ClientHeight=411
-TBDockHeight=305
-LRDockWidth=140
-Dockable=1
-
-[MessageView@EditWindow0]
-Create=1
-Visible=1
-State=0
-Left=12
-Top=0
-Width=761
-Height=85
-MaxLeft=-1
-MaxTop=-1
-ClientWidth=761
-ClientHeight=85
-TBDockHeight=85
-LRDockWidth=443
-Dockable=1
-
-[DockHosts]
-DockHostCount=0
-

Informes/InformeBase.dfm

@@ -1,7 +1,7 @@
 object dmInformeBase: TdmInformeBase
   OldCreateOrder = False
   Left = 141
-  Top = 554
+  Top = 555
   Height = 246
   Width = 321
   object FReport: TfrReport

Informes/InformeFacturaCliente.dfm

@@ -1,5 +1,7 @@
 inherited dmInformeFacturaCliente: TdmInformeFacturaCliente
   OldCreateOrder = True
+  Left = 434
+  Top = 492
   Width = 344
   inherited FReport: TfrReport
     Dataset = TablaCab

Informes/InformeHistorialFacturacionClientes.pas

@@ -88,14 +88,14 @@ begin
     SQL.Add('COALESCE(C.CODIGOPOSTAL, FC.CODIGOPOSTAL) as CODIGOPOSTAL, ');
     SQL.Add('COALESCE(C.POBLACION, FC.POBLACION) as POBLACION ,');
     SQL.Add('COALESCE(C.PROVINCIA, FC.PROVINCIA) as PROVINCIA ,');    
-    SQL.Add('FC.IVA, FC.BASEIMPONIBLE, FC.IMPORTEIVA, FC.IMPORTETOTAL');
+    SQL.Add('FC.IVA, (FC.BASEIMPONIBLE - FC.IMPORTEDESCUENTO) AS BASEIMPONIBLE, FC.IMPORTEIVA, FC.IMPORTETOTAL');
     SQL.Add('from FACTURASCLIENTE FC left join sucursalescliente C');
     SQL.Add('on (FC.CODIGOCLIENTE = C.CODIGOCLIENTE) and (C.TIPO = ''P'')');
     SQL.Add('where FC.CODIGOEMPRESA = :CODIGOEMPRESA');
     SQL.Add('and upper(FC.NOMBRE) between upper(:NOMBREINI) and upper(:NOMBREFIN) ');
     SQL.Add('and FC.FECHAFACTURA between :FECHAFACINI and :FECHAFACFIN ');
     if not VarIsNull(FImporteMinimo) then
-       SQL.Add('and FC.BASEIMPONIBLE >= :BASEIMPONIBLE ');
+       SQL.Add('and (FC.BASEIMPONIBLE - FC.IMPORTEDESCUENTO) >= :BASEIMPONIBLE ');
     SQL.Add('order by FC.NOMBRE, FC.FECHAFACTURA');
     ParamByName('CODIGOEMPRESA').AsInteger := EmpresaActiva.Codigo;
     ParamByName('NOMBREINI').AsString := FNombreIni;

Informes/InformeHistorialFacturacionProveedores.pas

@@ -87,14 +87,14 @@ begin
     SQL.Add('COALESCE(P.CODIGOPOSTAL, FP.CODIGOPOSTAL) as CODIGOPOSTAL, ');
     SQL.Add('COALESCE(P.POBLACION, FP.POBLACION) as POBLACION ,');
     SQL.Add('COALESCE(P.PROVINCIA, FP.PROVINCIA) as PROVINCIA ,');
-    SQL.Add('FP.IVA, FP.BASEIMPONIBLE, FP.IMPORTEIVA, FP.IMPORTETOTAL');
+    SQL.Add('FP.IVA, (FP.BASEIMPONIBLE - FP.IMPORTEDESCUENTO) AS BASEIMPONIBLE, FP.IMPORTEIVA, FP.IMPORTETOTAL');
     SQL.Add('from FACTURASPROVEEDOR FP left join PROVEEDORES P');
     SQL.Add('on FP.CODIGOPROVEEDOR = P.CODIGO');
     SQL.Add('where FP.CODIGOEMPRESA = :CODIGOEMPRESA');
     SQL.Add('and upper(FP.NOMBRE) between upper(:NOMBREINI) and upper(:NOMBREFIN) ');
     SQL.Add('and FP.FECHAFACTURA between :FECHAFACINI and :FECHAFACFIN ');
     if not VarIsNull(FImporteMinimo) then
-       SQL.Add('and FP.BASEIMPONIBLE >= :BASEIMPONIBLE ');
+       SQL.Add('and (FP.BASEIMPONIBLE - FP.IMPORTEDESCUENTO) >= :BASEIMPONIBLE ');
     SQL.Add('order by FP.NOMBRE, FP.FECHAFACTURA');
     ParamByName('CODIGOEMPRESA').AsInteger := EmpresaActiva.Codigo;
     ParamByName('NOMBREINI').AsString := FNombreIni;

Informes/InformeListadoClientes.dfm

@@ -1,7 +1,7 @@
 inherited dmInformeListadoClientes: TdmInformeListadoClientes
   OldCreateOrder = True
   Left = 548
-  Top = 252
+  Top = 253
   inherited FReport: TfrReport
     Dataset = dsTablaClientes
     ReportForm = {19000000}

Informes/InformeListadoClientes.pas

@@ -39,6 +39,8 @@ type
   private
     FNombreIni: String;
     FNombreFin: String;
+    FFechaAltaIni: TDateTime;
+    FFechaAltaFin: TDateTime;
   protected
     procedure RellenarCabecera(Band: TfrBand); override;
     procedure PrepararConsultas; override;
@@ -47,6 +49,8 @@ type
   published
     property NombreIni : String read FNombreIni write FNombreIni;
     property NombreFin : String read FNombreFin write FNombreFin;
+    property FechaAltaIni : TDateTime read FFechaAltaIni write FFechaAltaIni;
+    property FechaAltaFin : TDateTime read FFechaAltaFin write FFechaAltaFin;
   end;
 
 var
@@ -72,15 +76,18 @@ begin
     Database := FBaseDatos;
     Transaction := FTransaccion;
     SQL.Clear;
-    SQL.Add('select CLIENTES.CODIGO, CLIENTES.NIFCIF, CLIENTES.NOMBRE, CALLE ');
+    SQL.Add('select CLIENTES.CODIGO, CLIENTES.FECHAALTA, CLIENTES.NIFCIF, CLIENTES.NOMBRE, CALLE ');
     SQL.Add('||'', ''||NUMERO AS DIRECCION, TELEFONO1, TELEFONO2, FAX, CORREO ');
     SQL.Add('from CLIENTES left join SUCURSALESCLIENTE on ');
     SQL.Add('(SUCURSALESCLIENTE.CODIGOCLIENTE = CLIENTES.CODIGO and ');
     SQL.Add('SUCURSALESCLIENTE.TIPO = ''P'')' );
-    SQL.Add('where upper(CLIENTES.NOMBRE) between upper(:NOMBREINI) and upper(:NOMBREFIN) ');
+    SQL.Add('where (upper(CLIENTES.NOMBRE) between upper(:NOMBREINI) and upper(:NOMBREFIN)) ');
+    SQL.Add('and (CLIENTES.FECHAALTA between :FECHAINI and :FECHAFIN)');
     SQL.Add('order by CLIENTES.NOMBRE');
     ParamByName('NOMBREINI').AsString := FNombreIni;
     ParamByName('NOMBREFIN').AsString := FNombreFin;
+    ParamByName('FECHAINI').AsDate := FFechaAltaIni;
+    ParamByName('FECHAFIN').AsDate := FFechaAltaFin;
     Prepare;
   end;
 end;
@@ -102,6 +109,7 @@ begin
           begin
             Memo.Clear;
             Memo.Add('Rango de clientes: ' + FNombreIni + ' - ' + FNombreFin);
+            Memo.Add('Rango de fechas: ' + DateToStr(FFechaAltaIni) + ' - ' + DateToStr(FFechaAltaFin));            
           end;
         end;
       end;

Informes/InformeResumenFacturacionClientes.pas

@@ -84,13 +84,13 @@ begin
     Database := FBaseDatos;
     Transaction := FTransaccion;
     SQL.Clear;
-    SQL.Add('select NOMBRE, BASEIMPONIBLE, IMPORTEIVA, IMPORTETOTAL ');
+    SQL.Add('select NOMBRE, (BASEIMPONIBLE - IMPORTEDESCUENTO) AS BASEIMPONIBLE, IMPORTEIVA, IMPORTETOTAL ');
     SQL.Add('from FACTURASCLIENTE ');
     SQL.Add('where CODIGOEMPRESA = :CODIGOEMPRESA');
     SQL.Add('and upper(NOMBRE) between upper(:NOMBREINI) and upper(:NOMBREFIN) ');
     SQL.Add('and FECHAFACTURA between :FECHAFACINI and :FECHAFACFIN ');
     if not VarIsNull(FImporteMinimo) then
-       SQL.Add('and BASEIMPONIBLE >= :BASEIMPONIBLE ');
+       SQL.Add('and (BASEIMPONIBLE - IMPORTEDESCUENTO) >= :BASEIMPONIBLE ');
     SQL.Add('order by NOMBRE');
     ParamByName('CODIGOEMPRESA').AsInteger := EmpresaActiva.Codigo;
     ParamByName('NOMBREINI').AsString := FNombreIni;

Informes/InformeResumenFacturacionProveedores.pas

@@ -82,13 +82,13 @@ begin
     Database := FBaseDatos;
     Transaction := FTransaccion;
     SQL.Clear;
-    SQL.Add('select NOMBRE, BASEIMPONIBLE, IMPORTEIVA, IMPORTETOTAL ');
+    SQL.Add('select NOMBRE, (BASEIMPONIBLE - IMPORTEDESCUENTO) AS BASEIMPONIBLE, IMPORTEIVA, IMPORTETOTAL ');
     SQL.Add('from FACTURASPROVEEDOR ');
     SQL.Add('where CODIGOEMPRESA = :CODIGOEMPRESA');
     SQL.Add('and upper(NOMBRE) between upper(:NOMBREINI) and upper(:NOMBREFIN) ');
     SQL.Add('and FECHAFACTURA between :FECHAFACINI and :FECHAFACFIN ');
     if not VarIsNull(FImporteMinimo) then
-       SQL.Add('and BASEIMPONIBLE >= :BASEIMPONIBLE ');
+       SQL.Add('and (BASEIMPONIBLE - IMPORTEDESCUENTO) >= :BASEIMPONIBLE ');
     SQL.Add('order by NOMBRE');
     ParamByName('CODIGOEMPRESA').AsInteger := EmpresaActiva.Codigo;
     ParamByName('NOMBREINI').AsString := FNombreIni;

Temp/FACTUGES.INI

@@ -1,7 +1,8 @@
 [BD]
+MIGUELO ROBERTO=localhost:c:\Codigo\bd\miguelo.gdb
 MIGUELO RIVAS=david:D:\Proyectos\FactuGES (Miguelo)\Codigo\bd\miguelo.gdb
 ACANA DAVID=david:D:\Proyectos\FactuGES 2000 v2 (Acana)\Codigo\bd\acana.gdb
-MIGUELO ROBERTO=roberto:T:\Miguelo\bd\miguelo.gdb
+
 
 
 

Temp/update/versionlocal.ini

@@ -1,19 +1,6 @@
 [Version]
-Count=1
-CurrentProductionProgramVersion=3.0.5.0
+Count=0
+CurrentProductionProgramVersion=
 CurrentBetaProgramVersion=
 CurrentAlphaProgramVersion=
 
-[Program Version 0]
-DownloadPasswordRequired=FALSE
-LocalInstallerParams=
-ProgramLocationPath=files
-ProgramLocationFileName=instalar.exe
-ProgramVersion=3.0.5.0
-ProgramReleaseType=prtProduction
-ProgramSize=1000000
-ProgramReleaseDate=29/06/2007
-
-[Program Version 0\VersionDescription]
-Count=0
-