From b3c8e0cb289a63e5b1d5600165fa2025dbca1d8a Mon Sep 17 00:00:00 2001 From: roberto Date: Wed, 9 Feb 2011 18:50:25 +0000 Subject: [PATCH] Se arreglan algunos detalles de nombres git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1033 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/Base/Base.res | Bin 4748 -> 384 bytes Source/Cliente/FactuGES.rc | 8 +- Source/Cliente/FactuGES.res | Bin 172156 -> 171984 bytes .../Controller/GestorInformes_controller.res | Bin 4748 -> 384 bytes .../Controller/uGestorInformesController.pas | 10 +- .../Views/GestorInformes_view.dpk | 2 +- .../Views/GestorInformes_view.dproj | 7 +- ...orInformeFacturasClienteReportGrafComp.dfm | 15 +- ...orInformeFacturasClienteReportGrafComp.pas | 38 +- ...InformeFacturasProveedorReportGrafComp.dfm | 16 +- ...InformeFacturasProveedorReportGrafComp.pas | 36 +- .../Views/uViewIntervaloComparativo.dfm | 2 +- .../Views/uViewIntervaloComparativo.pas | 16 +- Source/Servidor/FactuGES_Server.RES | Bin 23488 -> 23208 bytes Source/Servidor/FactuGES_Server.dproj | 661 +++++++++--------- Source/Servidor/FactuGES_Server.rc | 10 +- 16 files changed, 403 insertions(+), 418 deletions(-) diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644 GIT binary patch delta 11 ScmeBCZD5|Duvteife`=|>;pCc literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index e9a315ed..d5e44199 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,8,7,0 -PRODUCTVERSION 1,8,7,0 +FILEVERSION 1,8,8,0 +PRODUCTVERSION 1,8,8,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.8.7.0\0" + VALUE "FileVersion", "1.8.8.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "1.8.7.0\0" + VALUE "ProductVersion", "1.8.8.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index fc95218dfa27a4b9b950bfd2de6b42eac1d5cdb8..b652d3239b16058facf38896d2973724fbc9aa46 100644 GIT binary patch delta 284 zcmY+9u?m7v6o$Wh(^8WVS{#K48XA0oK$;vI+AC=2Eplk^0fIYeYeQpujg3A-b3+dh z)D=bPhr{9HKj(1%&)q3*PI3@eX=MA*b6gq;Ts#j1K0CAQ4H+Qu{mOfEq0>-mgFz5f z-q`}PC4H?+7}nkZdM%AvVG%`@Ihlh^99NVs!C}3w7mv^ilR>W142=e41!DdHmD>;tEIX)HG@NcfRLrFYZfmAo6~5nG^X zG>rCHg|(7-jB8-wc}B}@sFchjlWA3aztlEiy=08;pCc literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP diff --git a/Source/Modulos/Gestor de informes/Controller/uGestorInformesController.pas b/Source/Modulos/Gestor de informes/Controller/uGestorInformesController.pas index 12193769..badb5ac7 100644 --- a/Source/Modulos/Gestor de informes/Controller/uGestorInformesController.pas +++ b/Source/Modulos/Gestor de informes/Controller/uGestorInformesController.pas @@ -24,6 +24,7 @@ type procedure VerInformeListadoFacturasCli; procedure VerInformeListadoFacturasCliPendientes; procedure VerInformeFacturasCliGrafComp; + function DarListaAnosFacturasCli: TStringList; //MODULO RECIBOS DE CLIENTE procedure VerInformeListadoRecibosCliPendientes; @@ -67,6 +68,7 @@ type procedure Print(AFactura : IBizFacturaCliente; AllItems: Boolean = false); } property DataModule: IDataModuleGestorInformes read GetDataModule; + function DarListaIntervalos: TStringList; //MODULO PRESUPUESTOS DE CLIENTE procedure VerInformeListadoPresupuestos; @@ -76,6 +78,7 @@ type procedure VerInformeListadoFacturasCli; procedure VerInformeListadoFacturasCliPendientes; procedure VerInformeFacturasCliGrafComp; + function DarListaAnosFacturasCli: TStringList; //MODULO RECIBOS DE CLIENTE procedure VerInformeListadoRecibosCliPendientes; @@ -89,9 +92,7 @@ type procedure VerInformeListadoFacturasProv; procedure VerInformeListadoFacturasProvPendientes; procedure VerInformeFacturasProvGrafComp; - function DarListaAnosFacturasProv: TStringList; - function DarListaIntervalos: TStringList; //MODULO RECIBOS DE PROVEEDOR procedure VerInformeListadoRecibosProvPendientes; @@ -275,6 +276,11 @@ begin Result := Supports(EditorRegistry.CreateEditor(AName), IID, Intf); end; +function TGestorInformesController.DarListaAnosFacturasCli: TStringList; +begin + Result := FDataModule.DarListaAnosFacturasCli; +end; + function TGestorInformesController.DarListaAnosFacturasProv: TStringList; begin Result := FDataModule.DarListaAnosFacturasProv; diff --git a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dpk b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dpk index 067ea400..f6b535fc 100644 --- a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dpk +++ b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dpk @@ -89,7 +89,7 @@ contains uEditorInformeRecibosProveedorReport in 'uEditorInformeRecibosProveedorReport.pas' {fEditorInformeRecibosProveedorReport: TForm}, uEditorInformePresupuestosReport in 'uEditorInformePresupuestosReport.pas' {fEditorInformePresupuestosReport: TForm}, uViewPeriodoFechas in 'uViewPeriodoFechas.pas' {frViewPeriodoFechas: TFrame}, - uViewIntervaloComparativo in 'uViewIntervaloComparativo.pas' {TfrViewIntervaloComparativo: TFrame}, + uViewIntervaloComparativo in 'uViewIntervaloComparativo.pas' {frViewIntervaloComparativo: TFrame}, uEditorInformeFacturasClienteReportGrafComp in 'uEditorInformeFacturasClienteReportGrafComp.pas' {fEditorInformeFacturasClienteReportGrafComp: TForm}, uEditorInformeFacturasProveedorReportGrafComp in 'uEditorInformeFacturasProveedorReportGrafComp.pas' {fEditorInformeFacturasProveedorReportGrafComp: TForm}; diff --git a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj index 81d59c92..bb868ee7 100644 --- a/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj +++ b/Source/Modulos/Gestor de informes/Views/GestorInformes_view.dproj @@ -99,7 +99,10 @@
fEditorInformeFacturasProveedorReport
TForm - + +
fEditorInformeFacturasProveedorReportGrafComp
+ TForm +
fEditorInformeIVAClientesReport
TForm @@ -146,7 +149,7 @@ TFrame -
TfrViewIntervaloComparativo
+
frViewIntervaloComparativo
TFrame diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReportGrafComp.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReportGrafComp.dfm index d5adf1f4..5283df51 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReportGrafComp.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReportGrafComp.dfm @@ -71,7 +71,7 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl ExplicitHeight = 37 end end - inline TfrViewIntervaloComparativo1: TTfrViewIntervaloComparativo + inline frViewIntervaloComparativo1: TfrViewIntervaloComparativo Left = 0 Top = 0 Width = 188 @@ -85,10 +85,9 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl ParentFont = False TabOrder = 1 ReadOnly = False - ExplicitWidth = 188 + ExplicitTop = 195 inherited TBXAlignmentPanel2: TTBXAlignmentPanel Width = 182 - ExplicitWidth = 182 inherited Label3: TLabel Width = 172 end @@ -97,17 +96,14 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 166 Width = 166 end end inherited TBXLabel2: TTBXLabel Width = 188 - ExplicitWidth = 188 end inherited TBXAlignmentPanel3: TTBXAlignmentPanel Width = 182 - ExplicitWidth = 182 inherited lis: TLabel Width = 172 end @@ -116,13 +112,11 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 166 Width = 166 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 182 - ExplicitWidth = 182 inherited Label1: TLabel Width = 172 end @@ -131,7 +125,6 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 166 Width = 166 end end @@ -151,21 +144,17 @@ inherited fEditorInformeFacturasClienteReportGrafComp: TfEditorInformeFacturasCl TabOrder = 2 ReadOnly = False ExplicitTop = 182 - ExplicitWidth = 188 inherited TBXLabel2: TTBXLabel Width = 188 - ExplicitWidth = 188 end inherited bElegirCliente: TBitBtn Width = 119 - ExplicitWidth = 119 end inherited edtCliente: TcxTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 152 Width = 152 end end diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReportGrafComp.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReportGrafComp.pas index ad74dfa4..5cf547e3 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReportGrafComp.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasClienteReportGrafComp.pas @@ -20,7 +20,7 @@ uses type TfEditorInformeFacturasClienteReportGrafComp = class(TfEditorInformeBase, IEditorInformeFacturasClienteReportGrafComp) TBXItem58: TTBXItem; - TfrViewIntervaloComparativo1: TTfrViewIntervaloComparativo; + frViewIntervaloComparativo1: TfrViewIntervaloComparativo; frViewFiltroClientes1: TfrViewFiltroClientes; procedure actRefrescarExecute(Sender: TObject); procedure FormShow(Sender: TObject); @@ -84,17 +84,17 @@ end; function TfEditorInformeFacturasClienteReportGrafComp.GetIntervalo: Variant; begin - Result := TfrViewIntervaloComparativo1.cbIntervalo.EditValue; + Result := frViewIntervaloComparativo1.cbIntervalo.EditValue; end; function TfEditorInformeFacturasClienteReportGrafComp.GetAno1: Variant; begin - Result := TfrViewIntervaloComparativo1.cbAno1.EditValue; + Result := frViewIntervaloComparativo1.cbAno1.EditValue; end; function TfEditorInformeFacturasClienteReportGrafComp.GetAno2: Variant; begin - Result := TfrViewIntervaloComparativo1.cbAno2.EditValue; + Result := frViewIntervaloComparativo1.cbAno2.EditValue; end; function TfEditorInformeFacturasClienteReportGrafComp.GetListaIDClientes: TIntegerArray; @@ -145,34 +145,34 @@ begin inherited; AListaIntervalos := (Controller as IGestorInformesController).DarListaIntervalos; - AListaAnos := (Controller as IGestorInformesController).DarListaAnosFacturasProv; + AListaAnos := (Controller as IGestorInformesController).DarListaAnosFacturasCli; if Assigned(AListaIntervalos) then begin - TfrViewIntervaloComparativo1.cbIntervalo.Properties.Items.BeginUpdate; - TfrViewIntervaloComparativo1.cbIntervalo.Properties.Items.Clear; + frViewIntervaloComparativo1.cbIntervalo.Properties.Items.BeginUpdate; + frViewIntervaloComparativo1.cbIntervalo.Properties.Items.Clear; for i := 0 to AListaIntervalos.Count - 1 do - TfrViewIntervaloComparativo1.cbIntervalo.Properties.Items.Append(AListaIntervalos.Strings[i]); - TfrViewIntervaloComparativo1.cbIntervalo.Properties.Items.EndUpdate; + frViewIntervaloComparativo1.cbIntervalo.Properties.Items.Append(AListaIntervalos.Strings[i]); + frViewIntervaloComparativo1.cbIntervalo.Properties.Items.EndUpdate; end; if Assigned(AListaAnos) then begin - TfrViewIntervaloComparativo1.cbAno1.Properties.Items.BeginUpdate; - TfrViewIntervaloComparativo1.cbAno2.Properties.Items.BeginUpdate; - TfrViewIntervaloComparativo1.cbAno1.Properties.Items.Clear; - TfrViewIntervaloComparativo1.cbAno2.Properties.Items.Clear; + frViewIntervaloComparativo1.cbAno1.Properties.Items.BeginUpdate; + frViewIntervaloComparativo1.cbAno2.Properties.Items.BeginUpdate; + frViewIntervaloComparativo1.cbAno1.Properties.Items.Clear; + frViewIntervaloComparativo1.cbAno2.Properties.Items.Clear; for i := 0 to AListaAnos.Count - 1 do begin - TfrViewIntervaloComparativo1.cbAno1.Properties.Items.Append(AListaAnos.Strings[i]); - TfrViewIntervaloComparativo1.cbAno2.Properties.Items.Append(AListaAnos.Strings[i]); + frViewIntervaloComparativo1.cbAno1.Properties.Items.Append(AListaAnos.Strings[i]); + frViewIntervaloComparativo1.cbAno2.Properties.Items.Append(AListaAnos.Strings[i]); end; - TfrViewIntervaloComparativo1.cbAno1.Properties.Items.EndUpdate; - TfrViewIntervaloComparativo1.cbAno2.Properties.Items.EndUpdate; + frViewIntervaloComparativo1.cbAno1.Properties.Items.EndUpdate; + frViewIntervaloComparativo1.cbAno2.Properties.Items.EndUpdate; end; - TfrViewIntervaloComparativo1.cbIntervalo.ItemIndex := 0; - TfrViewIntervaloComparativo1.cbAno1.ItemIndex := 0; + frViewIntervaloComparativo1.cbIntervalo.ItemIndex := 0; + frViewIntervaloComparativo1.cbAno1.ItemIndex := 0; end; end. diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.dfm b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.dfm index 5f5739af..a2e675ff 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.dfm +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.dfm @@ -71,7 +71,7 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas ExplicitHeight = 37 end end - inline TfrViewIntervaloComparativo1: TTfrViewIntervaloComparativo + inline frViewIntervaloComparativo1: TfrViewIntervaloComparativo Left = 0 Top = 0 Width = 188 @@ -85,10 +85,9 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas ParentFont = False TabOrder = 1 ReadOnly = False - ExplicitWidth = 188 + ExplicitTop = 195 inherited TBXAlignmentPanel2: TTBXAlignmentPanel Width = 182 - ExplicitWidth = 182 inherited Label3: TLabel Width = 172 end @@ -97,17 +96,14 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 166 Width = 166 end end inherited TBXLabel2: TTBXLabel Width = 188 - ExplicitWidth = 188 end inherited TBXAlignmentPanel3: TTBXAlignmentPanel Width = 182 - ExplicitWidth = 182 inherited lis: TLabel Width = 172 end @@ -116,13 +112,11 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 166 Width = 166 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 182 - ExplicitWidth = 182 inherited Label1: TLabel Width = 172 end @@ -131,7 +125,6 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 166 Width = 166 end end @@ -149,24 +142,19 @@ inherited fEditorInformeFacturasProveedorReportGrafComp: TfEditorInformeFacturas Font.Style = [] ParentFont = False TabOrder = 2 - Visible = False ReadOnly = False ExplicitTop = 182 - ExplicitWidth = 188 inherited TBXLabel2: TTBXLabel Width = 188 - ExplicitWidth = 188 end inherited bElegirProveedor: TBitBtn Width = 119 - ExplicitWidth = 119 end inherited edtProveedor: TcxTextEdit Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitWidth = 152 Width = 152 end end diff --git a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.pas b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.pas index c12fa5b1..3fe6a93a 100644 --- a/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.pas +++ b/Source/Modulos/Gestor de informes/Views/uEditorInformeFacturasProveedorReportGrafComp.pas @@ -20,7 +20,7 @@ uses type TfEditorInformeFacturasProveedorReportGrafComp = class(TfEditorInformeBase, IEditorInformeFacturasProveedorReportGrafComp) TBXItem58: TTBXItem; - TfrViewIntervaloComparativo1: TTfrViewIntervaloComparativo; + frViewIntervaloComparativo1: TfrViewIntervaloComparativo; frViewFiltroProveedores1: TfrViewFiltroProveedores; procedure actRefrescarExecute(Sender: TObject); procedure FormShow(Sender: TObject); @@ -85,17 +85,17 @@ end; function TfEditorInformeFacturasProveedorReportGrafComp.GetIntervalo: Variant; begin - Result := TfrViewIntervaloComparativo1.cbIntervalo.EditValue; + Result := frViewIntervaloComparativo1.cbIntervalo.EditValue; end; function TfEditorInformeFacturasProveedorReportGrafComp.GetAno1: Variant; begin - Result := TfrViewIntervaloComparativo1.cbAno1.EditValue; + Result := frViewIntervaloComparativo1.cbAno1.EditValue; end; function TfEditorInformeFacturasProveedorReportGrafComp.GetAno2: Variant; begin - Result := TfrViewIntervaloComparativo1.cbAno2.EditValue; + Result := frViewIntervaloComparativo1.cbAno2.EditValue; end; function TfEditorInformeFacturasProveedorReportGrafComp.GetListaIDProveedores: TIntegerArray; @@ -150,30 +150,30 @@ begin if Assigned(AListaIntervalos) then begin - TfrViewIntervaloComparativo1.cbIntervalo.Properties.Items.BeginUpdate; - TfrViewIntervaloComparativo1.cbIntervalo.Properties.Items.Clear; + frViewIntervaloComparativo1.cbIntervalo.Properties.Items.BeginUpdate; + frViewIntervaloComparativo1.cbIntervalo.Properties.Items.Clear; for i := 0 to AListaIntervalos.Count - 1 do - TfrViewIntervaloComparativo1.cbIntervalo.Properties.Items.Append(AListaIntervalos.Strings[i]); - TfrViewIntervaloComparativo1.cbIntervalo.Properties.Items.EndUpdate; + frViewIntervaloComparativo1.cbIntervalo.Properties.Items.Append(AListaIntervalos.Strings[i]); + frViewIntervaloComparativo1.cbIntervalo.Properties.Items.EndUpdate; end; if Assigned(AListaAnos) then begin - TfrViewIntervaloComparativo1.cbAno1.Properties.Items.BeginUpdate; - TfrViewIntervaloComparativo1.cbAno2.Properties.Items.BeginUpdate; - TfrViewIntervaloComparativo1.cbAno1.Properties.Items.Clear; - TfrViewIntervaloComparativo1.cbAno2.Properties.Items.Clear; + frViewIntervaloComparativo1.cbAno1.Properties.Items.BeginUpdate; + frViewIntervaloComparativo1.cbAno2.Properties.Items.BeginUpdate; + frViewIntervaloComparativo1.cbAno1.Properties.Items.Clear; + frViewIntervaloComparativo1.cbAno2.Properties.Items.Clear; for i := 0 to AListaAnos.Count - 1 do begin - TfrViewIntervaloComparativo1.cbAno1.Properties.Items.Append(AListaAnos.Strings[i]); - TfrViewIntervaloComparativo1.cbAno2.Properties.Items.Append(AListaAnos.Strings[i]); + frViewIntervaloComparativo1.cbAno1.Properties.Items.Append(AListaAnos.Strings[i]); + frViewIntervaloComparativo1.cbAno2.Properties.Items.Append(AListaAnos.Strings[i]); end; - TfrViewIntervaloComparativo1.cbAno1.Properties.Items.EndUpdate; - TfrViewIntervaloComparativo1.cbAno2.Properties.Items.EndUpdate; + frViewIntervaloComparativo1.cbAno1.Properties.Items.EndUpdate; + frViewIntervaloComparativo1.cbAno2.Properties.Items.EndUpdate; end; - TfrViewIntervaloComparativo1.cbIntervalo.ItemIndex := 0; - TfrViewIntervaloComparativo1.cbAno1.ItemIndex := 0; + frViewIntervaloComparativo1.cbIntervalo.ItemIndex := 0; + frViewIntervaloComparativo1.cbAno1.ItemIndex := 0; end; end. diff --git a/Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.dfm b/Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.dfm index 21692061..27364feb 100644 --- a/Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.dfm +++ b/Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.dfm @@ -1,4 +1,4 @@ -inherited TfrViewIntervaloComparativo: TTfrViewIntervaloComparativo +inherited frViewIntervaloComparativo: TfrViewIntervaloComparativo Width = 451 Height = 182 Align = alTop diff --git a/Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.pas b/Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.pas index c61dc277..7d16d29e 100644 --- a/Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.pas +++ b/Source/Modulos/Gestor de informes/Views/uViewIntervaloComparativo.pas @@ -14,7 +14,7 @@ type ['{793084E2-873E-4C57-8BD6-9087816CCF3A}'] end; - TTfrViewIntervaloComparativo = class(TfrViewParametrosInforme, IViewPeriodoFechas) + TfrViewIntervaloComparativo = class(TfrViewParametrosInforme, IViewPeriodoFechas) TBXLabel2: TTBXLabel; TBXAlignmentPanel2: TTBXAlignmentPanel; Label3: TLabel; @@ -49,37 +49,37 @@ uses DateUtils; -function TTfrViewIntervaloComparativo.GetIntervalo: Variant; +function TfrViewIntervaloComparativo.GetIntervalo: Variant; begin Result := cbIntervalo.EditValue; end; -function TTfrViewIntervaloComparativo.GetAno1: Variant; +function TfrViewIntervaloComparativo.GetAno1: Variant; begin Result := cbAno1.EditValue; end; -function TTfrViewIntervaloComparativo.GetAno2: Variant; +function TfrViewIntervaloComparativo.GetAno2: Variant; begin Result := cbAno2.EditValue; end; -procedure TTfrViewIntervaloComparativo.SetIntervalo(const Value: Variant); +procedure TfrViewIntervaloComparativo.SetIntervalo(const Value: Variant); begin cbIntervalo.EditValue := Value; end; -procedure TTfrViewIntervaloComparativo.SetAno1(const Value: Variant); +procedure TfrViewIntervaloComparativo.SetAno1(const Value: Variant); begin cbAno1.EditValue := Value; end; -procedure TTfrViewIntervaloComparativo.SetAno2(const Value: Variant); +procedure TfrViewIntervaloComparativo.SetAno2(const Value: Variant); begin cbAno2.EditValue := Value; end; -constructor TTfrViewIntervaloComparativo.Create(AOwner: TComponent); +constructor TfrViewIntervaloComparativo.Create(AOwner: TComponent); begin inherited; // cbPeriodo.ItemIndex := 0; diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 56710ce37064e99a963ea85fff341638ff323e76..30dd39aafd91aa6de7c0a2a12cdf6762081ff795 100644 GIT binary patch delta 243 zcmX@GopHrh#tkJASq1`JJPdHa$iT)RAi%)D$RNRx!3v_`JQfB9CI$rsh};Se1_ovX z52%BM!N342$H&0Hir}d-0L^4zSi?B^UW6PIkop(lA;JPQ85M9bPL7IHVtU3fxh_&{ z@{>q|$#iVyMiDc*DM!M2xIFbjc2*ft>0Le$jRR1#4Gupp(G z6)j+)sw4_B8gSiewhA<>inBJT3H(^<*W0w1Cf@0qM%KfzRNy<-M5q^k{oLVP;1~&F zqzEy@GcK58+|Ov+C8mP`p4dI%8=;4cb&8ySLRJ~-&EI=9ie2_{A~WWYyt?LAsd&bD zzntp*DK~4)J|Z$rn9XzCH4!21$cvdXJkrTD4EC~9i43a6Q`_3c{3v7cir9p5W1f@O qEvj$-rXADHA2B_m^ywq)Kw=jM{Iv}}#(ESG}rAmwd diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 5618a109..4274a136 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,335 +1,334 @@ - + - - {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} - FactuGES_Server.dpr - Debug - AnyCPU - DCC32 - ..\..\Output\Debug\Servidor\FactuGES_Server.exe - vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 - - - 7.0 - False - False - 0 - 3 - ..\..\Output\Release\Servidor - RELEASE - - - 7.0 - 3 - ..\..\Output\Debug\Servidor - DEBUG; - True - True - True - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - - - Delphi.Personality - - -FalseTrueFalse/standaloneTrueFalse1880FalseFalseFalseFalseFalse308212521.8.8.01.8.8.0miércoles, 19 de enero de 2011 18:10 - - ExpressPrinting System by Developer Express Inc. - FactuGES_Server.dpr - - - - - MainSource - - - - - -
srvEmpresas
- TDARemoteService - - -
srvProvinciasPoblaciones_Impl
- TDataModule - - - - -
srvUsuarios
- TDataAbstractService - - - - - - - - -
RptAlbaranesCliente
- TDataModule - - -
RptWordAlbaranCliente
- TDataModule - - -
srvAlbaranesCliente
- TDataAbstractService - - - - - -
RptAlbaranesProveedor
- TDataModule - - -
RptWordAlbaranProveedor
- TDataModule - - -
srvAlbaranesProveedor
- TDataAbstractService - - - - -
srvAlmacenes
- TDARemoteService - - - - - -
srvArticulos
- TDARemoteService - - - - - - - - -
RptEtiquetasContacto
- TDataModule - - -
RptFichasEmpleado
- TDataModule - - -
srvContactos
- TDARemoteService - - - - -
srvFabricantes
- TDataAbstractService - - - - - -
RptFacturasCliente
- TDataModule - - -
RptWordFacturaCliente
- TDataModule - - -
srvFacturasCliente
- TDataAbstractService - - - - - -
RptFacturasProveedor
- TDataModule - - -
srvFacturasProveedor
- TDataAbstractService - - - - -
srvFamilias
- TDataAbstractService - - - - -
srvFormasPago
- TDataAbstractService - - -
srvGestorDocumentos
- TDataAbstractService - - -
srvGestorInformes
- TDataAbstractService - - - - -
srvHistoricoMovimientos
- TDataAbstractService - - - - -
srvInventario
- TDataAbstractService - - - - - -
srvObras
- TDataAbstractService - - - - - -
RptPedidosProveedor
- TDataModule - - -
RptWordPedidoProveedor
- TDataModule - - -
srvPedidosProveedor
- TDataAbstractService - - - - - -
RptPresupuestosCliente
- TDataModule - - -
RptWordCertificadoTrabajo
- TDataModule - - -
RptWordPresupuestoCliente
- TDataModule - - -
srvPresupuestosCliente
- TDataAbstractService - - - - -
RptRecibosCliente
- TDataModule - - -
srvRecibosCliente
- TDataAbstractService - - - - -
RptRecibosProveedor
- TDataModule - - -
srvRecibosProveedor
- TDataAbstractService - - - - -
srvReferencias
- TDataAbstractService - - - - - -
srvRemesasCliente
- TDataAbstractService - - - - - -
srvRemesasProveedor
- TDataAbstractService - - - - -
srvTiposIVA
- TDataAbstractService - - - - -
srvUnidadesMedida
- TDataAbstractService - - - - -
srvConfiguracion
- TDataAbstractService - - -
frConexionBD
- TFrame - - -
frConfGeneral
- TFrame - - -
fConfiguracion
- TForm - - -
FrameConfiguracion
- TFrame - - -
srvLogin
- TDARemoteService - - -
fAcercaDe
- - -
dmServer
- TDataModule - - -
fServerForm
- - - - - - - - - - - - + + {ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1} + FactuGES_Server.dpr + Debug + AnyCPU + DCC32 + ..\..\Output\Debug\Servidor\FactuGES_Server.exe + vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100 + + + 7.0 + False + False + 0 + 3 + ..\..\Output\Release\Servidor + RELEASE + + + 7.0 + 3 + ..\..\Output\Debug\Servidor + DEBUG; + True + True + True + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + + + Delphi.Personality + + + FalseTrueFalse/standaloneTrueFalse1880FalseFalseFalseFalseFalse308212521.8.8.01.8.8.0miércoles, 19 de enero de 2011 18:10 + ExpressPrinting System by Developer Express Inc. + FactuGES_Server.dpr + + + + + MainSource + + + + + +
srvEmpresas
+ TDARemoteService + + +
srvProvinciasPoblaciones_Impl
+ TDataModule + + + + +
srvUsuarios
+ TDataAbstractService + + + + + + + + +
RptAlbaranesCliente
+ TDataModule + + +
RptWordAlbaranCliente
+ TDataModule + + +
srvAlbaranesCliente
+ TDataAbstractService + + + + + +
RptAlbaranesProveedor
+ TDataModule + + +
RptWordAlbaranProveedor
+ TDataModule + + +
srvAlbaranesProveedor
+ TDataAbstractService + + + + +
srvAlmacenes
+ TDARemoteService + + + + + +
srvArticulos
+ TDARemoteService + + + + + + + + +
RptEtiquetasContacto
+ TDataModule + + +
RptFichasEmpleado
+ TDataModule + + +
srvContactos
+ TDARemoteService + + + + +
srvFabricantes
+ TDataAbstractService + + + + + +
RptFacturasCliente
+ TDataModule + + +
RptWordFacturaCliente
+ TDataModule + + +
srvFacturasCliente
+ TDataAbstractService + + + + + +
RptFacturasProveedor
+ TDataModule + + +
srvFacturasProveedor
+ TDataAbstractService + + + + +
srvFamilias
+ TDataAbstractService + + + + +
srvFormasPago
+ TDataAbstractService + + +
srvGestorDocumentos
+ TDataAbstractService + + +
srvGestorInformes
+ TDataAbstractService + + + + +
srvHistoricoMovimientos
+ TDataAbstractService + + + + +
srvInventario
+ TDataAbstractService + + + + + +
srvObras
+ TDataAbstractService + + + + + +
RptPedidosProveedor
+ TDataModule + + +
RptWordPedidoProveedor
+ TDataModule + + +
srvPedidosProveedor
+ TDataAbstractService + + + + + +
RptPresupuestosCliente
+ TDataModule + + +
RptWordCertificadoTrabajo
+ TDataModule + + +
RptWordPresupuestoCliente
+ TDataModule + + +
srvPresupuestosCliente
+ TDataAbstractService + + + + +
RptRecibosCliente
+ TDataModule + + +
srvRecibosCliente
+ TDataAbstractService + + + + +
RptRecibosProveedor
+ TDataModule + + +
srvRecibosProveedor
+ TDataAbstractService + + + + +
srvReferencias
+ TDataAbstractService + + + + + +
srvRemesasCliente
+ TDataAbstractService + + + + + +
srvRemesasProveedor
+ TDataAbstractService + + + + +
srvTiposIVA
+ TDataAbstractService + + + + +
srvUnidadesMedida
+ TDataAbstractService + + + + +
srvConfiguracion
+ TDataAbstractService + + +
frConexionBD
+ TFrame + + +
frConfGeneral
+ TFrame + + +
fConfiguracion
+ TForm + + +
FrameConfiguracion
+ TFrame + + +
srvLogin
+ TDARemoteService + + +
fAcercaDe
+ + +
dmServer
+ TDataModule + + +
fServerForm
+ + + + + + + + + + + +