From a1de6f9c99c95c7f6211b66a9f4543d18f00f526 Mon Sep 17 00:00:00 2001 From: roberto Date: Fri, 16 Jan 2009 20:07:01 +0000 Subject: [PATCH] Se arreglan detalles del funcionamiento de retencion y se repasan bien los informes git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@850 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Source/Base/Base.dproj | 102 +-- Source/Base/Base.res | Bin 384 -> 4748 bytes Source/GUIBase/uViewTotales.dfm | 32 +- Source/Informes/1/FacturaCliente.rdx | Bin 168448 -> 168448 bytes Source/Informes/1/InfFacturaCliente.fr3 | 4 +- Source/Informes/2/FacturaCliente.rdx | Bin 98816 -> 101376 bytes Source/Informes/2/InfFacturaCliente.fr3 | 30 +- .../Controller/uFacturasClienteController.pas | 5 + .../Reports/uRptWordFacturaCliente.pas | 3 +- .../Views/uViewFacturasCliente.dfm | 1 + Source/Servidor/FactuGES_Server.dproj | 638 +++++++++--------- 11 files changed, 416 insertions(+), 399 deletions(-) diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 97d49264..d03ddc0b 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -54,57 +54,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/GUIBase/uViewTotales.dfm b/Source/GUIBase/uViewTotales.dfm index 45ab651b..0ef60739 100644 --- a/Source/GUIBase/uViewTotales.dfm +++ b/Source/GUIBase/uViewTotales.dfm @@ -1,8 +1,8 @@ inherited frViewTotales: TfrViewTotales - Width = 966 + Width = 451 Height = 252 Align = alBottom - ExplicitWidth = 966 + ExplicitWidth = 451 ExplicitHeight = 252 object Bevel5: TBevel Left = 666 @@ -15,7 +15,7 @@ inherited frViewTotales: TfrViewTotales AlignWithMargins = True Left = 0 Top = 0 - Width = 966 + Width = 451 Height = 252 Margins.Left = 0 Margins.Top = 0 @@ -26,23 +26,22 @@ inherited frViewTotales: TfrViewTotales TabOrder = 0 TabStop = False AutoContentSizes = [acsWidth, acsHeight] - ExplicitHeight = 265 object Bevel3: TBevel - Left = 490 + Left = 305 Top = 28 Width = 3 Height = 100 Shape = bsRightLine end object Bevel4: TBevel - Left = 602 + Left = 417 Top = 70 Width = 342 Height = 9 Shape = bsBottomLine end object Bevel1: TBevel - Left = 602 + Left = 417 Top = 186 Width = 368 Height = 9 @@ -91,7 +90,7 @@ inherited frViewTotales: TfrViewTotales Width = 87 end object ImporteIVA: TcxDBCurrencyEdit - Left = 673 + Left = 488 Top = 105 AutoSize = False DataBinding.DataField = 'IMPORTE_IVA' @@ -126,7 +125,7 @@ inherited frViewTotales: TfrViewTotales Width = 20 end object ImporteTotal: TcxDBCurrencyEdit - Left = 603 + Left = 418 Top = 159 AutoSize = False DataBinding.DataField = 'IMPORTE_TOTAL' @@ -196,7 +195,7 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object edtIVA: TcxDBSpinEdit - Left = 602 + Left = 417 Top = 105 AutoSize = False DataBinding.DataField = 'IVA' @@ -237,7 +236,7 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object ImporteBase: TcxDBCurrencyEdit - Left = 602 + Left = 417 Top = 28 AutoSize = False DataBinding.DataField = 'BASE_IMPONIBLE' @@ -272,7 +271,7 @@ inherited frViewTotales: TfrViewTotales Width = 91 end object edtRE: TcxDBSpinEdit - Left = 602 + Left = 417 Top = 132 AutoSize = False DataBinding.DataField = 'RE' @@ -313,7 +312,7 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object ImporteRE: TcxDBCurrencyEdit - Left = 673 + Left = 488 Top = 132 AutoSize = False DataBinding.DataField = 'IMPORTE_RE' @@ -451,7 +450,7 @@ inherited frViewTotales: TfrViewTotales Width = 20 end object bTiposIVA: TButton - Left = 342 + Left = 157 Top = 109 Width = 132 Height = 21 @@ -489,7 +488,7 @@ inherited frViewTotales: TfrViewTotales Width = 221 end object edtRetencion: TcxDBSpinEdit - Left = 602 + Left = 417 Top = 206 AutoSize = False DataBinding.DataSource = DADataSource @@ -528,13 +527,14 @@ inherited frViewTotales: TfrViewTotales Width = 65 end object edtImporteRetencion: TcxDBCurrencyEdit - Left = 673 + Left = 488 Top = 206 AutoSize = False DataBinding.DataSource = DADataSource Enabled = False ParentFont = False Properties.Alignment.Horz = taRightJustify + Properties.DisplayFormat = '-,0.00 '#8364';,0.00 '#8364 Properties.ReadOnly = True Properties.UseLeftAlignmentOnEditing = False Properties.UseThousandSeparator = True diff --git a/Source/Informes/1/FacturaCliente.rdx b/Source/Informes/1/FacturaCliente.rdx index 2f6ace8129a2e9afc9e862dcf65e5e5e5ce118c1..fcc696368abff27de07d3638f5859b467dfd3d0f 100644 GIT binary patch delta 3147 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 - + @@ -53,7 +53,7 @@ - + diff --git a/Source/Informes/2/FacturaCliente.rdx b/Source/Informes/2/FacturaCliente.rdx index e32f3d0f51bddbc43889599eec449f27555cc959..d8b814997254144d1e271d0f34f41b3b0215f205 100644 GIT binary patch delta 7797 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 D1m=S^ diff --git a/Source/Informes/2/InfFacturaCliente.fr3 b/Source/Informes/2/InfFacturaCliente.fr3 index 1985cd06..01d399a2 100644 --- a/Source/Informes/2/InfFacturaCliente.fr3 +++ b/Source/Informes/2/InfFacturaCliente.fr3 @@ -1,5 +1,5 @@ - + @@ -32,16 +32,26 @@ - + - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas index 98191ad9..b1c60a85 100644 --- a/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas +++ b/Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas @@ -579,6 +579,11 @@ begin if (EsFechaVacia(AFactura.FECHA_FACTURA)) then raise Exception.Create('Debe indicar la fecha de esta factura'); + //En el caso de asignar una retención a la factura será obligatorio meter la fecha de retención. + if (AFactura.IMPORTE_RETENCION > 0) then + if (EsFechaVacia(AFactura.FECHA_RETENCION)) then + raise Exception.Create('Debe indicar la fecha de vencimiento de la retención, para poder asociarla al recibo que contendrá el importe de la retención.'); + if (AFactura.Detalles.DataTable.RecordCount = 0) then raise Exception.Create('La factura debe tener al menos un concepto en su contenido'); diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas index b0e89716..8196b741 100644 --- a/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas +++ b/Source/Modulos/Facturas de cliente/Reports/uRptWordFacturaCliente.pas @@ -264,9 +264,10 @@ begin FWordApp.Application.Selection.Cells.Delete(_ShiftCells); end else begin + ReplaceBookmark('TituloImporteTotal', 'Total certificacion'); ReplaceBookmark('Retencion', FieldByName('RETENCION').AsString); ReplaceBookmark('ImporteRetencion', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_RETENCION').AsFloat)); - ReplaceBookmark('ImporteTotalRet', FormatFloat(DISPLAY_EUROS2, (FieldByName('IMPORTE_TOTAL').AsFloat - FieldByName('IMPORTE_RETENCION').AsFloat))); + ReplaceBookmark('ImporteTotalRet', FormatFloat(DISPLAY_EUROS2, (FieldByName('IMPORTE_TOTAL').AsFloat - FieldByName('IMPORTE_RETENCION').AsFloat))); end; Texto := FieldByName('OBSERVACIONES').AsString; diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm index fa7e6621..efe93457 100644 --- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm +++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm @@ -130,6 +130,7 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente Caption = 'Importe retenido' DataBinding.FieldName = 'IMPORTE_RETENCION' PropertiesClassName = 'TcxCurrencyEditProperties' + Properties.Alignment.Horz = taRightJustify FooterAlignmentHorz = taRightJustify HeaderAlignmentHorz = taRightJustify end diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 7c81f6a5..49756c07 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -1,323 +1,323 @@ - + - - {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/standaloneTrueFalse1630FalseFalseFalseFalseFalse308212521.6.3.01.6.3.0jueves, 15 de enero de 2009 14:12FactuGES_Server.dpr - - - - - MainSource - - - - - -
srvEmpresas
- TDARemoteService - - -
srvProvinciasPoblaciones_Impl
- TDataModule - - - - -
srvUsuarios
- TDataAbstractService - - - - - - - - -
RptAlbaranesCliente
- TDataModule - - -
RptWordAlbaranCliente
- TDataModule - - -
srvAlbaranesCliente
- TDataAbstractService - - - - - -
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_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/standaloneTrueFalse1630FalseFalseFalseFalseFalse308212521.6.3.01.6.3.0jueves, 15 de enero de 2009 14:12FactuGES_Server.dpr + + + + + MainSource + + + + + +
srvEmpresas
+ TDARemoteService + + +
srvProvinciasPoblaciones_Impl
+ TDataModule + + + + +
srvUsuarios
+ TDataAbstractService + + + + + + + + +
RptAlbaranesCliente
+ TDataModule + + +
RptWordAlbaranCliente
+ TDataModule + + +
srvAlbaranesCliente
+ TDataAbstractService + + + + + +
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
+ + + + + + + + + + +