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

2007-09-07 08:12:39 +00:00 · 2007-09-07 08:12:39 +00:00 · e451d22121
commit e451d22121
parent 0cfcc8f1f0
8 changed files with 123655 additions and 123239 deletions
--- a/Clientes/ContratoCliente.pas
+++ b/Clientes/ContratoCliente.pas
@ -1230,6 +1230,8 @@ begin
      Post;
      InsertarPropiedades(FieldByName('NUMCONCEPTO').AsInteger);
      gridDetalles.Refresh;
+// Como no coge el importe lo comentamos
+//      CalcularTotalDetalle;
    end;
    FCodigoArticulo := Value;
  finally
--- a/Clientes/PresupuestoCliente.pas
+++ b/Clientes/PresupuestoCliente.pas
@ -1360,6 +1360,8 @@ begin
      Post;
      InsertarPropiedades(FieldByName('NUMCONCEPTO').AsInteger);
      gridDetalles.Refresh;
+// Como no coge el importe lo comentamos       
+//      CalcularTotalDetalle;
    end;
    FCodigoArticulo := Value;
  finally
--- a/Factuges.drc
+++ b/Factuges.drc
--- a/Factuges.dsk
+++ b/Factuges.dsk
@ -11,64 +11,45 @@ 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
+Module0=E:\Codigo (Miguelo)\Clientes\ContratoCliente.pas
+Module1=E:\Codigo (Miguelo)\Clientes\PresupuestoCliente.pas
+Module2=E:\Codigo (Miguelo)\Factuges.dpr
+Count=3
 EditWindowCount=1

-[E:\Miguelo\Almacenes\ListadoArticulosAlmacen.pas]
+[E:\Codigo (Miguelo)\Clientes\ContratoCliente.pas]
 ModuleType=SourceModule
 FormState=1
 FormOnTop=0

-[E:\Miguelo\Clientes\ListadoClientes.pas]
+[E:\Codigo (Miguelo)\Clientes\PresupuestoCliente.pas]
 ModuleType=SourceModule
 FormState=1
 FormOnTop=0

-[E:\Miguelo\Almacenes\ArticulosAlmacen.pas]
+[E:\Codigo (Miguelo)\Factuges.dpr]
 ModuleType=SourceModule
-FormState=1
-FormOnTop=0
-
-[E:\Miguelo\Informes\PantallaInformesGeneral.pas]
-ModuleType=SourceModule
-FormState=1
+FormState=0
 FormOnTop=0

 [C:\Archivos de programa\Borland\Delphi7\Projects\ProjectGroup1.bpg]
 FormState=0
 FormOnTop=0

-[E:\Miguelo\Factuges.dpr]
+[E:\Codigo (Miguelo)\Factuges.todo]
 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]
+[E:\Codigo (Miguelo)\Libreria\Configuracion.pas]
 FormState=0
 FormOnTop=0

 [EditWindow0]
-ViewCount=4
+ViewCount=3
 CurrentView=1
 View0=0
 View1=1
 View2=2
-View3=3
 CodeExplorer=CodeExplorer@EditWindow0
 MessageView=MessageView@EditWindow0
 Create=1
@ -91,31 +72,24 @@ BottomPanelClients=MessageView@EditWindow0
 BottomPanelData=000004000000000000000000000000000000000000000000000100000000000000000B0000004D65737361676556696577FFFFFFFF

 [View0]
-Module=E:\Miguelo\Almacenes\ArticulosAlmacen.pas
-CursorX=5
-CursorY=341
-TopLine=334
+Module=E:\Codigo (Miguelo)\Factuges.dpr
+CursorX=1
+CursorY=1
+TopLine=1
 LeftCol=1

 [View1]
-Module=E:\Miguelo\Almacenes\ListadoArticulosAlmacen.pas
-CursorX=15
-CursorY=124
-TopLine=124
+Module=E:\Codigo (Miguelo)\Clientes\ContratoCliente.pas
+CursorX=3
+CursorY=1234
+TopLine=1219
 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
+Module=E:\Codigo (Miguelo)\Clientes\PresupuestoCliente.pas
+CursorX=41
+CursorY=1363
+TopLine=1347
 LeftCol=1

 [Watches]
@ -208,11 +182,11 @@ Left=0
 Top=9
 Width=1152
 Height=112
-MaxLeft=-4
-MaxTop=-4
-MaxWidth=1160
+MaxLeft=-1
+MaxTop=-1
+MaxWidth=1688
 MaxHeight=112
-ClientWidth=1152
+ClientWidth=1680
 ClientHeight=78

 [ProjectManager]
@ -294,7 +268,7 @@ LRDockWidth=345
 Dockable=1
 SplitPos=170
 ArrangeBy=Name
-SelectedItem=BarraExtra
+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=

--- a/Factuges.~dsk
+++ b/Factuges.~dsk
@ -1,46 +1,41 @@
 [Closed Files]
-File_0=SourceModule,'D:\Proyectos\FactuGES (Miguelo)\Codigo\Factuges.dpr',0,1,1,1,1,0,0
-File_1=SourceModule,'D:\Proyectos\FactuGES (Miguelo)\Codigo\Clientes\PresupuestosClientes.pas',0,1,421,1,423,1,0
-File_2=SourceModule,'D:\Proyectos\FactuGES (Miguelo)\Codigo\VistaPrevia.pas',0,1,116,1,36,1,0
-File_3=SourceModule,'D:\Proyectos\FactuGES (Miguelo)\Codigo\Clientes\VistaPreviaPresupuestos.pas',0,1,7,44,12,1,0
-File_4=SourceModule,'D:\Proyectos\FactuGES (Miguelo)\Codigo\Clientes\ImprimirPresupuestosCliente.pas',0,1,56,15,56,1,0
-File_5=SourceModule,'D:\Proyectos\FactuGES (Miguelo)\Codigo\Informes\InformeContratoCliente.pas',0,1,22,29,2,0,0
-File_6=SourceModule,'D:\Proyectos\FactuGES (Miguelo)\Codigo\Informes\InformePresupuestoCliente.pas',0,1,82,1,84,1,0
-File_7=SourceModule,'c:\archivos de programa\borland\delphi7\source\vcl\DB.pas',0,1,9289,1,9313,0,0
-File_8=SourceModule,'c:\archivos de programa\borland\delphi7\source\vcl\IBCustomDataSet.pas',0,1,645,1,668,0,0
+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\Clientes\ListadoClientes.pas
-Module1=E:\Miguelo\Almacenes\ListadoArticulosAlmacen.pas
-Module2=E:\Miguelo\Frames\RdxDBFrame.pas
-Module3=c:\archivos de programa\borland\delphi7\source\rtl\common\classes.pas
-Module4=E:\Miguelo\Almacenes\ArticulosAlmacen.pas
-Count=5
+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\ListadoArticulosAlmacen.pas]
-ModuleType=SourceModule
-FormState=0
-FormOnTop=0
-
-[E:\Miguelo\Frames\RdxDBFrame.pas]
-ModuleType=SourceModule
-FormState=0
-FormOnTop=0
-
-[c:\archivos de programa\borland\delphi7\source\rtl\common\classes.pas]
-ModuleType=SourceModule
-FormState=0
-FormOnTop=0
-
 [E:\Miguelo\Almacenes\ArticulosAlmacen.pas]
 ModuleType=SourceModule
-FormState=0
+FormState=1
+FormOnTop=0
+
+[E:\Miguelo\Informes\PantallaInformesGeneral.pas]
+ModuleType=SourceModule
+FormState=1
 FormOnTop=0

 [C:\Archivos de programa\Borland\Delphi7\Projects\ProjectGroup1.bpg]
@ -63,14 +58,17 @@ FormOnTop=0
 FormState=0
 FormOnTop=0

+[E:\Miguelo\Informes\InformeBase.pas]
+FormState=0
+FormOnTop=0
+
 [EditWindow0]
-ViewCount=5
-CurrentView=4
+ViewCount=4
+CurrentView=1
 View0=0
 View1=1
 View2=2
 View3=3
-View4=4
 CodeExplorer=CodeExplorer@EditWindow0
 MessageView=MessageView@EditWindow0
 Create=1
@ -94,37 +92,30 @@ BottomPanelData=0000040000000000000000000000000000000000000000000001000000000000

 [View0]
 Module=E:\Miguelo\Almacenes\ArticulosAlmacen.pas
-CursorX=1
-CursorY=329
-TopLine=326
+CursorX=5
+CursorY=341
+TopLine=334
 LeftCol=1

 [View1]
-Module=c:\archivos de programa\borland\delphi7\source\rtl\common\classes.pas
-CursorX=1
-CursorY=2180
-TopLine=2169
+Module=E:\Miguelo\Almacenes\ListadoArticulosAlmacen.pas
+CursorX=15
+CursorY=124
+TopLine=124
 LeftCol=1

 [View2]
-Module=E:\Miguelo\Almacenes\ListadoArticulosAlmacen.pas
-CursorX=1
-CursorY=234
-TopLine=229
+Module=E:\Miguelo\Clientes\ListadoClientes.pas
+CursorX=15
+CursorY=66
+TopLine=66
 LeftCol=1

 [View3]
-Module=E:\Miguelo\Frames\RdxDBFrame.pas
+Module=E:\Miguelo\Informes\PantallaInformesGeneral.pas
 CursorX=1
-CursorY=169
-TopLine=158
-LeftCol=1
-
-[View4]
-Module=E:\Miguelo\Clientes\ListadoClientes.pas
-CursorX=33
-CursorY=34
-TopLine=43
+CursorY=94
+TopLine=87
 LeftCol=1

 [Watches]
@ -203,8 +194,8 @@ Breakpoint43='T:\Codigo (Miguelo)\Frames\RdxFrameArticulos.pas',114,'',0,1,'',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\ArticulosAlmacen.pas',329,'',0,1,'',1,0,0,'',1,'','',''
-Breakpoint48='E:\Miguelo\Almacenes\ListadoArticulosAlmacen.pas',234,'',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
@ -217,8 +208,8 @@ Left=0
 Top=9
 Width=1152
 Height=112
-MaxLeft=-1
-MaxTop=-1
+MaxLeft=-4
+MaxTop=-4
 MaxWidth=1160
 MaxHeight=112
 ClientWidth=1152
@ -292,11 +283,11 @@ Visible=1
 State=0
 Left=20
 Top=124
-Width=299
+Width=294
 Height=719
 MaxLeft=-1
 MaxTop=-1
-ClientWidth=291
+ClientWidth=286
 ClientHeight=693
 TBDockHeight=431
 LRDockWidth=345
@ -304,7 +295,7 @@ Dockable=1
 SplitPos=170
 ArrangeBy=Name
 SelectedItem=BarraExtra
-ExpandedItems=Action,Actions,Anchors,ArrangeSettings,BusinessRulesClient,BusinessRulesServer,Caption,Channel.Encryption,Colors,DataBinding,DataController,DataRequestCall,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
+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]
@ -367,10 +358,10 @@ Column3Width=250

 [ObjectTree]
 Create=1
-Visible=0
+Visible=1
 State=0
-Left=49
-Top=185
+Left=646
+Top=122
 Width=490
 Height=543
 MaxLeft=-1
--- a/Temp/Factuges.exe
+++ b/Temp/Factuges.exe
--- a/Temp/Factuges.map
+++ b/Temp/Factuges.map
--- a/Temp/update/versionlocal.ini
+++ b/Temp/update/versionlocal.ini
@ -1,17 +1,18 @@
 [Version]
 Count=1
-CurrentProductionProgramVersion=3.0.3.0
+CurrentProductionProgramVersion=3.0.5.0
 CurrentBetaProgramVersion=
 CurrentAlphaProgramVersion=

 [Program Version 0]
 DownloadPasswordRequired=FALSE
+LocalInstallerParams=
 ProgramLocationPath=files
 ProgramLocationFileName=instalar.exe
-ProgramVersion=3.0.3.0
+ProgramVersion=3.0.5.0
 ProgramReleaseType=prtProduction
 ProgramSize=1000000
-ProgramReleaseDate=07/06/2007
+ProgramReleaseDate=29/06/2007

 [Program Version 0\VersionDescription]
 Count=0