diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 7d22cd3f..cccb4ff9 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -53,7 +53,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1760FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.7.6.0FactuGESFactuGES1.7.6.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1770FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.7.7.0FactuGESFactuGES1.7.7.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index a2976e4c..d5ee4ea8 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 1,7,6,0 -PRODUCTVERSION 1,7,6,0 +FILEVERSION 1,7,7,0 +PRODUCTVERSION 1,7,7,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "1.7.6.0\0" + VALUE "FileVersion", "1.7.7.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "1.7.6.0\0" + VALUE "ProductVersion", "1.7.7.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 2300e1b5..80e1df23 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index 45b77560..c3550861 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -59,30 +59,30 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/GUIBase/uEditorGridBase.pas b/Source/GUIBase/uEditorGridBase.pas index f8a8216d..6fc6a894 100644 --- a/Source/GUIBase/uEditorGridBase.pas +++ b/Source/GUIBase/uEditorGridBase.pas @@ -111,12 +111,16 @@ type procedure ConfPaginaInterno; override; procedure ImprimirInterno; override; procedure RefrescarInterno; override; + + function GetModified: Boolean; override; + public property ListaAnos: TStringList read GetListaAnos write SetListaAnos; property ViewGrid: IViewGridBase read GetViewGrid write SetViewGrid; property DynWhereDataTable: WideString read GetDynWhereDataTable write SetDynWhereDataTable; property MultiSelect : Boolean read GetMultiSelect write SetMultiSelect; + constructor Create(AOwner : TComponent); override; destructor Destroy; override; function ShowModal : Integer; override; @@ -152,6 +156,12 @@ begin Result := FListaAnos; end; +function TfEditorGridBase.GetModified: Boolean; +begin + //inherited: + Result := False; +end; + function TfEditorGridBase.GetMultiSelect: Boolean; begin Result := False; diff --git a/Source/GUIBase/uViewFiltroBase.dfm b/Source/GUIBase/uViewFiltroBase.dfm index 9a52ddf0..afdf9307 100644 --- a/Source/GUIBase/uViewFiltroBase.dfm +++ b/Source/GUIBase/uViewFiltroBase.dfm @@ -1,10 +1,9 @@ -object frViewFiltroBase: TfrViewFiltroBase - Left = 0 - Top = 0 +inherited frViewFiltroBase: TfrViewFiltroBase Width = 549 Height = 105 - TabOrder = 0 Visible = False + ExplicitWidth = 549 + ExplicitHeight = 105 object TBXDockablePanel1: TTBXDockablePanel Left = 0 Top = 0 diff --git a/Source/GUIBase/uViewFiltroBase.pas b/Source/GUIBase/uViewFiltroBase.pas index 0b843e30..3c3902ce 100644 --- a/Source/GUIBase/uViewFiltroBase.pas +++ b/Source/GUIBase/uViewFiltroBase.pas @@ -7,10 +7,10 @@ uses Dialogs, StdCtrls, Buttons, cxRadioGroup, TBXDkPanels, TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar, ActnList, ImgList, PngImageList, cxGraphics, dxLayoutLookAndFeels, dxLayoutControl, cxDropDownEdit, cxMaskEdit, - cxCalendar, cxContainer, cxEdit, cxTextEdit, cxControls; + cxCalendar, cxContainer, cxEdit, cxTextEdit, cxControls, uViewBase; type - IViewFiltroBase = interface + IViewFiltroBase = interface(IViewBase) ['{0D0EA630-BF93-4BA1-93C2-FD5A5B0CBEED}'] function GetFiltrosChange: TNotifyEvent; procedure SetFiltrosChange(const Value: TNotifyEvent); @@ -25,7 +25,7 @@ type property Texto: String read GetTexto write SetTexto; end; - TfrViewFiltroBase = class(TFrame, IViewFiltroBase) + TfrViewFiltroBase = class(TfrViewBase, IViewFiltroBase) dxLayoutControl1Group_Root: TdxLayoutGroup; dxLayoutControl1: TdxLayoutControl; dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList; @@ -63,6 +63,7 @@ type function ValidarCampos: Boolean; virtual; public + function GetModified: Boolean; property OnFiltrosChange: TNotifyEvent read GetFiltrosChange write SetFiltrosChange; property VerFiltros: Boolean read GetVerFiltros write SetVerFiltros; property Texto: String read GetTexto write SetTexto; @@ -80,6 +81,11 @@ begin Result := FOnFiltrosChange; end; +function TfrViewFiltroBase.GetModified: Boolean; +begin + Result := False; +end; + procedure TfrViewFiltroBase.SetFiltrosChange(const Value: TNotifyEvent); begin FOnFiltrosChange := Value; diff --git a/Source/GUIBase/uViewGrid.dfm b/Source/GUIBase/uViewGrid.dfm index ed57777c..33edc7ed 100644 --- a/Source/GUIBase/uViewGrid.dfm +++ b/Source/GUIBase/uViewGrid.dfm @@ -73,8 +73,15 @@ inherited frViewGrid: TfrViewGrid Width = 607 Height = 102 Align = alTop + Font.Charset = DEFAULT_CHARSET + Font.Color = clWindowText + Font.Height = -11 + Font.Name = 'Tahoma' + Font.Style = [] + ParentFont = False TabOrder = 1 Visible = False + ReadOnly = False ExplicitWidth = 607 ExplicitHeight = 102 inherited TBXDockablePanel1: TTBXDockablePanel @@ -100,22 +107,24 @@ inherited frViewGrid: TfrViewGrid Width = 272 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 376 + Left = 270 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 376 + ExplicitLeft = 270 ExplicitWidth = 221 Width = 221 end inherited eLista: TcxComboBox - Left = 634 + Left = 457 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 634 + ExplicitLeft = 457 + ExplicitWidth = 215 + Width = 215 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel @@ -140,6 +149,7 @@ inherited frViewGrid: TfrViewGrid SupportedDocks = [dkStandardDock, dkMultiDock] TabOrder = 2 Visible = False + ExplicitWidth = 128 object TBXAlignmentPanel1: TTBXAlignmentPanel Left = 0 Top = 0 @@ -189,7 +199,7 @@ inherited frViewGrid: TfrViewGrid PrinterPage.ScaleMode = smFit PrinterPage._dxMeasurementUnits_ = 0 PrinterPage._dxLastMU_ = 2 - ReportDocument.CreationDate = 39791.760840023150000000 + ReportDocument.CreationDate = 40003.669735601850000000 StyleManager = dmBase.dxPrintStyleManager1 OptionsCards.Shadow.Depth = 0 OptionsExpanding.ExpandGroupRows = True diff --git a/Source/GUIBase/uViewGrid.pas b/Source/GUIBase/uViewGrid.pas index 2d6df2f1..025c3375 100644 --- a/Source/GUIBase/uViewGrid.pas +++ b/Source/GUIBase/uViewGrid.pas @@ -22,7 +22,7 @@ uses cxIntlPrintSys3, dxPSPrvwAdv, uViewGridBase, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, ComCtrls, cxPC, ImgList, PngImageList, TB2Item, TBX, TB2Dock, TB2Toolbar, TBXDkPanels, dxPgsDlg, uDAInterfaces, - dxPScxGrid6Lnk; + dxPScxGrid6Lnk, uCustomView; type IViewGrid = interface(IViewGridBase) diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorElegirArticulosFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorElegirArticulosFacturaCliente.dfm index 56ceb54f..9e9e2def 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorElegirArticulosFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorElegirArticulosFacturaCliente.dfm @@ -1,5 +1,6 @@ inherited fEditorElegirArticulosFacturaCliente: TfEditorElegirArticulosFacturaCliente Caption = 'fEditorElegirArticulosFacturaCliente' + ExplicitWidth = 320 ExplicitHeight = 478 PixelsPerInch = 96 TextHeight = 13 diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorElegirArticulosFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorElegirArticulosFacturaCliente.pas index 8c06ecea..f99c8014 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorElegirArticulosFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorElegirArticulosFacturaCliente.pas @@ -10,7 +10,7 @@ uses JvExComCtrls, JvStatusBar, TBX, TB2ExtItems, TBXExtItems, TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane, uIEditorElegirArticulosFacturasCliente, uDAInterfaces, - uViewGridBase, uViewGrid, uViewArticulos; + uViewGridBase, uViewGrid, uViewArticulos, StdCtrls; type TfEditorElegirArticulosFacturaCliente = class(TfEditorElegirArticulos, IEditorElegirArticulosFacturasCliente) diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas index 69f9f036..7fc4f334 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas @@ -13,7 +13,8 @@ uses cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid, cxImage, Grids, DBGrids, uBizFacturasCliente, cxGridCustomPopupMenu, cxGridPopupMenu, cxCalendar, cxCurrencyEdit, uViewFiltroBase, TB2Item, TBX, - TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces; + TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, uCustomView, + uViewBase; type IViewFacturasCliente = interface(IViewGrid) diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm index eb9ddb2d..6aa96bbf 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.dfm @@ -41,7 +41,7 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente Width = 645 ExplicitWidth = 645 inherited tbxMain: TTBXToolbar - ExplicitWidth = 645 + ExplicitWidth = 577 end inherited tbxFiltro: TTBXToolbar ExplicitWidth = 427 @@ -156,24 +156,24 @@ inherited fEditorRecibosCliente: TfEditorRecibosCliente Width = 194 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 298 + Left = 237 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 298 + ExplicitLeft = 237 ExplicitWidth = 337 Width = 337 end inherited eLista: TcxComboBox - Left = 672 + Left = 533 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 672 - ExplicitWidth = 215 - Width = 215 + ExplicitLeft = 533 + ExplicitWidth = 140 + Width = 140 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas index 6d292474..4ad92210 100644 --- a/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uEditorRecibosCliente.pas @@ -68,7 +68,7 @@ type procedure ImprimirInterno; override; procedure PrevisualizarInterno; override; procedure RefrescarInterno; override; - + public procedure PonerTitulos(const ATitulo: string = ''); override; property RecibosCliente: IBizRecibosCliente read GetRecibosCliente write SetRecibosCliente; diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm index 4596a8ac..96c920b2 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm +++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm @@ -184,24 +184,22 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente Width = 195 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 299 + Left = 208 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 299 + ExplicitLeft = 208 ExplicitWidth = 222 Width = 222 end inherited eLista: TcxComboBox - Left = 558 + Left = 389 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 558 - ExplicitWidth = 215 - Width = 215 + ExplicitLeft = 389 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas index cfdb2b3d..8cbf8f5d 100644 --- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas +++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas @@ -13,7 +13,8 @@ uses cxGridLevel, cxClasses, cxControls, cxGridCustomView, cxGrid, cxImage, Grids, DBGrids, uBizRecibosCliente, cxGridCustomPopupMenu, cxGridPopupMenu, cxCalendar, cxCurrencyEdit, uViewFiltroBase, TB2Item, TBX, - TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces; + TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, uCustomView, + uViewBase; type IViewRecibosCliente = interface(IViewGrid) diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index ba5deda5..80945cba 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 9ee76245..259be46d 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -35,7 +35,7 @@ Delphi.Personality - FalseTrueFalse/standaloneTrueFalse1760FalseFalseFalseFalseFalse308212521.7.6.01.7.6.0martes, 05 de mayo de 2009 16:47 + FalseTrueFalse/standaloneTrueFalse1770FalseFalseFalseFalseFalse308212521.7.7.01.7.7.0miércoles, 08 de julio de 2009 11:18 ExpressPrinting System by Developer Express Inc. FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 4049114a..1557d3aa 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 1,7,6,0 -PRODUCTVERSION 1,7,6,0 +FILEVERSION 1,7,7,0 +PRODUCTVERSION 1,7,7,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -12,9 +12,9 @@ BEGIN BEGIN BLOCK "0C0A04E4" BEGIN - VALUE "FileVersion", "1.7.6.0\0" - VALUE "ProductVersion", "1.7.6.0\0" - VALUE "CompileDate", "jueves, 09 de julio de 2009 13:09\0" + VALUE "FileVersion", "1.7.7.0\0" + VALUE "ProductVersion", "1.7.7.0\0" + VALUE "CompileDate", "jueves, 09 de julio de 2009 16:19\0" END END BLOCK "VarFileInfo"