From a7a4fb22f991712b84ccee106160bf51df221f88 Mon Sep 17 00:00:00 2001 From: roberto Date: Wed, 11 Jun 2008 11:51:50 +0000 Subject: [PATCH] Arreglo para que los informes de facturas cuando sea un abono ponga abono y cuando sea factura ponga factura git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@451 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/Base/Base.dproj | 102 ++-- Source/Base/Base.res | Bin 384 -> 4748 bytes Source/Informes/FacturaCliente.rdx | Bin 132608 -> 141312 bytes Source/Informes/InfFacturaCliente.fr3 | 5 +- .../Plugin/uPluginAlbaranesCliente.dfm | 2 + .../Reports/uRptWordFacturaCliente.pas | 5 +- .../Views/uEditorFacturaCliente.dfm | 88 +-- .../Views/uEditorFacturaCliente.pas | 2 +- Source/Servidor/FactuGES_Server.dproj | 552 +++++++++--------- 9 files changed, 387 insertions(+), 369 deletions(-) diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 34b6aca9..91f13e4e 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -53,57 +53,57 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch 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 delta 11 ScmeBCZD5|Duvteife`=|>;pCc diff --git a/Source/Informes/FacturaCliente.rdx b/Source/Informes/FacturaCliente.rdx index 1fdaac0fd30ed78d021892d5751373a4ec59d196..e5d602fde09e0e2d7df7437d9c629ffebb02d5ea 100644 GIT binary patch delta 12282 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 - + @@ -7,7 +7,7 @@ - + @@ -23,6 +23,7 @@ + diff --git a/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm index 8a8f8ccd..b98d2488 100644 --- a/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm +++ b/Source/Modulos/Albaranes de cliente/Plugin/uPluginAlbaranesCliente.dfm @@ -175,7 +175,9 @@ object PluginAlbaranesCliente: TPluginAlbaranesCliente object actAlbaranesDevCliente: TAction Category = 'Ventas' Caption = 'Ordenes de devoluci'#243'n' + Enabled = False ImageIndex = 1 + Visible = False OnExecute = actAlbaranesDevClienteExecute end end diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas index 9b8f6d98..0d45ff87 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas @@ -204,7 +204,10 @@ begin //Activamos cabecera FWordApp.Application.ActiveWindow.ActivePane.View.SeekView := wdSeekCurrentPageHeader; - ReplaceBookmark('CodigoFacturaCab', FieldByName('REFERENCIA').AsString); + if (FieldByName('TIPO').AsString = 'F') then + ReplaceBookmark('CodigoFacturaCab', 'FACTURA ' + FieldByName('REFERENCIA').AsString) + else + ReplaceBookmark('CodigoFacturaCab', 'ABONO ' + FieldByName('REFERENCIA').AsString); ReplaceBookmark('FechaFacturaCab', FieldByName('FECHA_FACTURA').AsString); ReplaceBookmark('VencimientoCab', ''{FieldByName('FECHAVENCIMIENTO').AsString}); ReplaceBookmark('FormaPagoCab', FieldByName('FORMA_PAGO').AsString); diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm index 31cff11a..c17751f0 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm @@ -203,82 +203,90 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente Height = 51 ExplicitWidth = 815 ExplicitHeight = 51 - inherited FontName: TJvFontComboBox [3] - Left = 279 + inherited ToolButton3: TToolButton + Wrap = False + end + inherited ToolButton4: TToolButton + Left = 278 Top = 0 - ExplicitLeft = 279 + ExplicitLeft = 278 ExplicitTop = 0 end - inherited ToolButton14: TToolButton [4] - Left = 424 + inherited ToolButton14: TToolButton + Left = 334 Top = 0 - ExplicitLeft = 424 + Wrap = False + ExplicitLeft = 334 ExplicitTop = 0 end - inherited FontSize: TEdit [5] - Left = 489 + inherited FontName: TJvFontComboBox + Left = 399 + Top = 0 + ExplicitLeft = 399 + ExplicitTop = 0 + end + inherited FontSize: TEdit + Left = 544 Top = 0 Width = 104 - ExplicitLeft = 489 + ExplicitLeft = 544 ExplicitTop = 0 ExplicitWidth = 104 end - inherited UpDown1: TUpDown [6] - Left = 593 + inherited UpDown1: TUpDown + Left = 648 Top = 0 - ExplicitLeft = 593 + ExplicitLeft = 648 ExplicitTop = 0 end - inherited ToolButton13: TToolButton [7] + inherited ToolButton13: TToolButton + Left = 0 Top = 0 + Wrap = True + ExplicitLeft = 0 ExplicitTop = 0 + ExplicitHeight = 27 end - inherited ToolButton11: TToolButton [8] + inherited ToolButton6: TToolButton Left = 0 Top = 27 - Wrap = False ExplicitLeft = 0 ExplicitTop = 27 end - inherited ToolButton3: TToolButton [9] - Left = 141 + inherited ToolButton7: TToolButton + Left = 66 Top = 27 - Wrap = False - end - inherited ToolButton12: TToolButton [10] - Left = 196 - Top = 27 - ExplicitLeft = 196 + ExplicitLeft = 66 ExplicitTop = 27 end - inherited ToolButton9: TToolButton [11] - Left = 204 + inherited ToolButton8: TToolButton + Left = 133 Top = 27 - ExplicitLeft = 204 + ExplicitLeft = 133 ExplicitTop = 27 end - inherited ToolButton10: TToolButton [12] - Left = 349 + inherited ToolButton12: TToolButton + Left = 216 Top = 27 - ExplicitLeft = 349 + ExplicitLeft = 216 ExplicitTop = 27 end - inherited ToolButton6: TToolButton [13] - Left = 474 + inherited ToolButton9: TToolButton + Left = 224 Top = 27 - ExplicitLeft = 474 + ExplicitLeft = 224 ExplicitTop = 27 end - inherited ToolButton7: TToolButton [14] - Left = 540 + inherited ToolButton10: TToolButton + Left = 369 Top = 27 - ExplicitLeft = 540 + ExplicitLeft = 369 ExplicitTop = 27 end - inherited ToolButton8: TToolButton [15] - Left = 607 + inherited ToolButton11: TToolButton + Left = 494 Top = 27 - ExplicitLeft = 607 + ExplicitLeft = 494 ExplicitTop = 27 end end @@ -344,7 +352,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente ExplicitWidth = 829 inherited Bevel1: TBevel Top = 111 + Width = 73 ExplicitTop = 111 + ExplicitWidth = 73 end inherited Bevel3: TBevel Left = 375 @@ -357,8 +367,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente inherited Bevel4: TBevel Left = 487 Top = 111 + Width = 192 ExplicitLeft = 487 ExplicitTop = 111 + ExplicitWidth = 192 end inherited ImporteDto: TcxDBCurrencyEdit Top = 131 diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas index b755a898..6a89e3eb 100644 --- a/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas @@ -276,7 +276,7 @@ begin begin ShowInfoMessage('El abono se ha dado de alta con el código ' + FFactura.REFERENCIA); //Preguntamos is desea hacer una orden de devolución asociada - if (Application.MessageBox('¿Desea crear una orden de devolución para el abono?', 'Atención', MB_YESNO) = IDYES) then +// if (Application.MessageBox('¿Desea crear una orden de devolución para el abono?', 'Atención', MB_YESNO) = IDYES) then // GenerarAlbaranCli(FFactura); end; end; diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index b67b4065..c04561bf 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,280 +1,280 @@ - + - - {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_D11;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 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 - - - Delphi.Personality - - - FalseTrueFalse/standaloneTrueFalse1070FalseFalseFalseFalseFalse308212521.0.7.01.0.7.0jueves, 05 de junio de 2008 20:23FactuGES_Server.dpr - - - - - MainSource - - - - -
srvEmpresas
- TDARemoteService - - - - - - - - - - - - -
RptAlbaranesCliente
- TDataModule - - -
RptWordAlbaranCliente
- TDataModule - - -
srvAlbaranesCliente
- TDataAbstractService - - - - - -
srvAlbaranesProveedor
- TDataAbstractService - - - - -
srvAlmacenes
- TDARemoteService - - - - - - - - - - - -
RptEtiquetasContacto
- TDataModule - - -
RptFichasEmpleado
- TDataModule - - -
srvContactos
- TDARemoteService - - - - -
srvFabricantes
- TDataAbstractService - - - - - -
RptFacturasCliente
- TDataModule - - -
RptWordFacturaCliente
- TDataModule - - -
srvFacturasCliente
- TDataAbstractService - - - - - -
srvFacturasProveedor
- TDataAbstractService - - - - - - - - - - - -
srvHistoricoMovimientos
- TDataAbstractService - - - - -
srvInventario
- TDataAbstractService - - - - - - - - - -
RptPedidosProveedor
- TDataModule - - -
RptWordPedidoProveedor
- TDataModule - - -
srvPedidosProveedor
- TDataAbstractService - - - - - -
RptPresupuestosCliente
- - -
RptWordPresupuestoCliente
- TDataModule - - -
srvPresupuestosCliente
- TDataAbstractService - - - - -
RptRecibosCliente
- TDataModule - - -
srvRecibosCliente
- TDataAbstractService - - - - -
srvRecibosProveedor
- TDataAbstractService - - - - -
srvReferencias
- TDataAbstractService - - - - - -
srvRemesasCliente
- TDataAbstractService - - - - - -
srvRemesasProveedor
- 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_D11;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 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10 + + + Delphi.Personality + + +FalseTrueFalse/standaloneTrueFalse1070FalseFalseFalseFalseFalse308212521.0.7.01.0.7.0jueves, 05 de junio de 2008 20:23FactuGES_Server.dpr + + + + + MainSource + + + + +
srvEmpresas
+ TDARemoteService + + + + + + + + + + + + +
RptAlbaranesCliente
+ TDataModule + + +
RptWordAlbaranCliente
+ TDataModule + + +
srvAlbaranesCliente
+ TDataAbstractService + + + + + +
srvAlbaranesProveedor
+ TDataAbstractService + + + + +
srvAlmacenes
+ TDARemoteService + + + + + + + + + + + +
RptEtiquetasContacto
+ TDataModule + + +
RptFichasEmpleado
+ TDataModule + + +
srvContactos
+ TDARemoteService + + + + +
srvFabricantes
+ TDataAbstractService + + + + + +
RptFacturasCliente
+ TDataModule + + +
RptWordFacturaCliente
+ TDataModule + + +
srvFacturasCliente
+ TDataAbstractService + + + + + +
srvFacturasProveedor
+ TDataAbstractService + + + + + + + + + + + +
srvHistoricoMovimientos
+ TDataAbstractService + + + + +
srvInventario
+ TDataAbstractService + + + + + + + + + +
RptPedidosProveedor
+ TDataModule + + +
RptWordPedidoProveedor
+ TDataModule + + +
srvPedidosProveedor
+ TDataAbstractService + + + + + +
RptPresupuestosCliente
+ + +
RptWordPresupuestoCliente
+ TDataModule + + +
srvPresupuestosCliente
+ TDataAbstractService + + + + +
RptRecibosCliente
+ TDataModule + + +
srvRecibosCliente
+ TDataAbstractService + + + + +
srvRecibosProveedor
+ TDataAbstractService + + + + +
srvReferencias
+ TDataAbstractService + + + + + +
srvRemesasCliente
+ TDataAbstractService + + + + + +
srvRemesasProveedor
+ TDataAbstractService + + + + + + + +
srvUnidadesMedida
+ TDataAbstractService + + + + +
srvConfiguracion
+ TDataAbstractService + + +
frConexionBD
+ TFrame + + +
frConfGeneral
+ TFrame + + +
fConfiguracion
+ TForm + + +
FrameConfiguracion
+ TFrame + + +
srvLogin
+ TDARemoteService + + +
fAcercaDe
+ + +
dmServer
+ TDataModule + + +
fServerForm
+ + + + + + + + + + +