Poner en el informe de facturas de cliente los datos bancarios del cliente.

git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES/trunk@43 c93665c3-c93d-084d-9b98-7d5f4a9c3376
2007-06-15 09:32:21 +00:00 · 2007-06-15 09:32:21 +00:00 · 62ba18599d
commit 62ba18599d
parent 4ee8a0f9f7
7 changed files with 106 additions and 16 deletions
--- a/Output/Debug/Servidor/FactuGES_Server.exe
+++ b/Output/Debug/Servidor/FactuGES_Server.exe
--- a/Output/Debug/Servidor/Informes/InfFacturaCliente.fr3
+++ b/Output/Debug/Servidor/Informes/InfFacturaCliente.fr3
--- a/Source/Base/Base.res
+++ b/Source/Base/Base.res
--- a/cliente/Reports/uRptFacturasCliente_Server.dfm
+++ b/cliente/Reports/uRptFacturasCliente_Server.dfm
@ -93,7 +93,7 @@ object RptFacturasCliente: TRptFacturasCliente
            Name = 'ID'
            DataType = datInteger
            BlobType = dabtUnknown
-            Value = '12'
+            Value = '1'
            ParamType = daptInput
          end>
        Statements = <
@ -111,16 +111,20 @@ object RptFacturasCliente: TRptFacturasCliente
              'S_CLIENTE.ID_CLIENTE,'#10'    V_FACTURAS_CLIENTE.NIF_CIF, V_FACTURAS' +
              '_CLIENTE.NOMBRE, V_FACTURAS_CLIENTE.CALLE,'#10'    V_FACTURAS_CLIENT' +
              'E.PROVINCIA, V_FACTURAS_CLIENTE.CODIGO_POSTAL, V_FACTURAS_CLIENT' +
-              'E.POBLACION,'#10#10'    ID_EMPRESA, EMPRESAS.NIF_CIF as NIF_CIF_EMPRES' +
-              'A, EMPRESAS.RAZON_SOCIAL,'#10'    EMPRESAS.CALLE as CALLE_EMPRESA, E' +
-              'MPRESAS.POBLACION as POBLACION_EMPRESA,'#10'    EMPRESAS.PROVINCIA a' +
-              's PROVINCIA_EMPRESA, EMPRESAS.CODIGO_POSTAL as CODIGO_POSTAL_EMP' +
-              'RESA,'#10'    EMPRESAS.TELEFONO_1, EMPRESAS.FAX, EMPRESAS.MOVIL_1, E' +
-              'MPRESAS.EMAIL_1,'#10'    EMPRESAS.PAGINA_WEB, EMPRESAS.REGISTRO_MERC' +
-              'ANTIL, EMPRESAS.LOGOTIPO'#10#10'FROM V_FACTURAS_CLIENTE'#10'LEFT JOIN EMPR' +
-              'ESAS ON EMPRESAS.ID = ID_EMPRESA'#10'LEFT JOIN FORMAS_PAGO ON (FORMA' +
-              'S_PAGO.ID = V_FACTURAS_CLIENTE.ID_FORMA_PAGO)'#10'WHERE V_FACTURAS_C' +
-              'LIENTE.ID = :ID'
+              'E.POBLACION,'#10'    CONTACTOS_DATOS_BANCO.TITULAR,'#10'    CONTACTOS_DA' +
+              'TOS_BANCO.ENTIDAD,'#10'    CONTACTOS_DATOS_BANCO.SUCURSAL,'#10'    CONTA' +
+              'CTOS_DATOS_BANCO.DC,'#10'    CONTACTOS_DATOS_BANCO.CUENTA,'#10'    ID_EM' +
+              'PRESA, EMPRESAS.NIF_CIF as NIF_CIF_EMPRESA, EMPRESAS.RAZON_SOCIA' +
+              'L,'#10'    EMPRESAS.CALLE as CALLE_EMPRESA, EMPRESAS.POBLACION as PO' +
+              'BLACION_EMPRESA,'#10'    EMPRESAS.PROVINCIA as PROVINCIA_EMPRESA, EM' +
+              'PRESAS.CODIGO_POSTAL as CODIGO_POSTAL_EMPRESA,'#10'    EMPRESAS.TELE' +
+              'FONO_1, EMPRESAS.FAX, EMPRESAS.MOVIL_1, EMPRESAS.EMAIL_1,'#10'    EM' +
+              'PRESAS.PAGINA_WEB, EMPRESAS.REGISTRO_MERCANTIL, EMPRESAS.LOGOTIP' +
+              'O'#10'FROM V_FACTURAS_CLIENTE'#10'LEFT JOIN EMPRESAS ON EMPRESAS.ID = ID' +
+              '_EMPRESA'#10'LEFT JOIN FORMAS_PAGO ON (FORMAS_PAGO.ID = V_FACTURAS_C' +
+              'LIENTE.ID_FORMA_PAGO)'#10'LEFT JOIN CONTACTOS_DATOS_BANCO ON (CONTAC' +
+              'TOS_DATOS_BANCO.ID_CONTACTO = V_FACTURAS_CLIENTE.ID_CLIENTE)'#10'WHE' +
+              'RE V_FACTURAS_CLIENTE.ID = :ID'
            StatementType = stSQL
            ColumnMappings = <
              item
@ -258,6 +262,26 @@ object RptFacturasCliente: TRptFacturasCliente
              item
                DatasetField = 'IMPORTE_RE'
                TableField = 'IMPORTE_RE'
+              end
+              item
+                DatasetField = 'TITULAR'
+                TableField = 'TITULAR'
+              end
+              item
+                DatasetField = 'ENTIDAD'
+                TableField = 'ENTIDAD'
+              end
+              item
+                DatasetField = 'SUCURSAL'
+                TableField = 'SUCURSAL'
+              end
+              item
+                DatasetField = 'DC'
+                TableField = 'DC'
+              end
+              item
+                DatasetField = 'CUENTA'
+                TableField = 'CUENTA'
              end>
          end>
        Name = 'InformeFacturasCliente'
@ -387,9 +411,12 @@ object RptFacturasCliente: TRptFacturasCliente
          end
          item
            Name = 'FORMA_PAGO'
-            DataType = datMemo
+            DataType = datString
+            Size = 255
            BlobType = dabtUnknown
-            DictionaryEntry = 'FacturasCliente_FORMA_PAGO'
+            DisplayWidth = 0
+            DisplayLabel = 'Forma de pago'
+            Alignment = taLeftJustify
            InPrimaryKey = False
            Calculated = False
            Lookup = False
@ -470,6 +497,66 @@ object RptFacturasCliente: TRptFacturasCliente
            Lookup = False
            LookupCache = False
          end
+          item
+            Name = 'TITULAR'
+            DataType = datString
+            Size = 255
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
+          end
+          item
+            Name = 'ENTIDAD'
+            DataType = datString
+            Size = 15
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
+          end
+          item
+            Name = 'SUCURSAL'
+            DataType = datString
+            Size = 15
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
+          end
+          item
+            Name = 'DC'
+            DataType = datString
+            Size = 15
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
+          end
+          item
+            Name = 'CUENTA'
+            DataType = datString
+            Size = 15
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
+          end
          item
            Name = 'POBLACION'
            DataType = datString
--- a/Source/Servidor/FactuGES_Server.bdsproj
+++ b/Source/Servidor/FactuGES_Server.bdsproj
@ -125,7 +125,7 @@
 			<Directories Name="PackageDCPOutputDir"></Directories>
 			<Directories Name="SearchPath">..\DataAbstract_D10\Lib</Directories>
 			<Directories Name="Packages">rtl;vclx;vcl;dbrtl;vcldb;dbxcds;dbexpress;vclib;ibxpress;indy;dclOfficeXP;VclSmp;dsnap;bdertl;teeui;teedb;tee;vcldbx;vclactnband;dxBarExtItemsD10;dxComnD10;dxBarD10;cxLibraryD10;cxEditorsD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarDBNavD10;dxBarExtDBItemsD10;tbx_d10;tb2k_d10;ccpack10;ccpack10dsg;cxExportD10;cxIntl5D10;adortl;DataAbstract_Core_D10;DataAbstract_DBXDriver_D10;DataAbstract_Scripting_D10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;fqb100;dxLayoutControlcxEditAdaptersD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSDBTeeChartD10;dxPSTeeChartD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;GUISDK_D10;JvAppFrmD10R;JvCoreD10R;Jcl;JclVcl;JvSystemD10R;JvStdCtrlsD10R;JvBandsD10R;JvDBD10R;JvDlgsD10R;JvBDED10R;JvCmpD10R;JvCryptD10R;JvCtrlsD10R;JvCustomD10R;JvDockingD10R;JvDotNetCtrlsD10R;JvEDID10R;JvGlobusD10R;JvHMID10R;JvInterpreterD10R;JvJansD10R;JvManagedThreadsD10R;JvMMD10R;JvNetD10R;JvPageCompsD10R;JvPluginD10R;JvPrintPreviewD10R;JvRuntimeDesignD10R;JvTimeFrameworkD10R;JvUIBD10R;JvValidatorsD10R;JvWizardD10R;JvXPCtrlsD10R;PluginSDK_D10R;PNG_D10;PngComponentsD10;inet;RemObjects_WebBroker_D10;RemObjects_RODX_D10;RemObjects_BPDX_D10;RemObjects_Indy_D10;PascalScript_RO_D10;IndyProtocols;IndyCore;IndySystem;DataAbstract_IDE_D10;fsTee10;fs10;frx10;frxADO10;frxBDE10;frxDB10;frxDBX10;frxe10;frxIBX10;frxTee10;fsADO10;fsBDE10;fsDB10;fsIBX10</Directories>
-			<Directories Name="Conditionals"></Directories>
+			<Directories Name="Conditionals">EUREKALOG;EUREKALOG_VER5</Directories>
 			<Directories Name="DebugSourceDirs"></Directories>
 			<Directories Name="UsePackages">False</Directories>
 		</Directories>
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@ -3,6 +3,7 @@ program FactuGES_Server;
 {#ROGEN:..\Servicios\FactuGES.rodl} // RemObjects: Careful, do not remove!

 uses
+  ExceptionLog,
  uROComInit,
  Forms,
  uServerMainForm in 'uServerMainForm.pas' {fServerForm},
--- a/Source/Servidor/FactuGES_Server.res
+++ b/Source/Servidor/FactuGES_Server.res