Se adapta informe de pedido a proveedor de tecsitel mantenimiento para que sea página vertical y se arregla fallo al elegir imprimir el pedido sin importes, además de otro fallo en sentencia que hacia que saliesen importes aún no queriendo.

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@838 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
roberto 2009-01-14 17:01:26 +00:00
parent 8af3cf5be8
commit 1691a77629
5 changed files with 464 additions and 437 deletions

View File

@ -45,8 +45,6 @@
<Borland.ProjectType>Package</Borland.ProjectType> <Borland.ProjectType>Package</Borland.ProjectType>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">Libreria base de FactuGES</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">Libreria base de FactuGES</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages> <Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages> <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">Base.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> </Excluded_Packages><Source><Source Name="MainSource">Base.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
@ -56,57 +54,57 @@
<DelphiCompile Include="Base.dpk"> <DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Modulos\Gestor de informes\adortl.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\adortl.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\cxDataD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\cxEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\cxExportD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\cxExtEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\cxGridD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\cxIntl6D11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\cxIntl6D11.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\cxIntlPrintSys3D11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\cxIntlPrintSys3D11.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\cxLibraryD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\cxPageControlD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\DataAbstract_Core_D11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\dbrtl.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\dclIndyCore.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\designide.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\designide.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\dsnap.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dsnap.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\dxGDIPlusD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\dxPSCoreD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\dxThemeD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\GUISDK_D11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\GUISDK_D11.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\IndyCore.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\IndyProtocols.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\IndySystem.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\Jcl.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\Jcl.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\JclVcl.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\JSDialog100.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\JvCmpD11R.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\JvCoreD11R.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\JvCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\JvDlgsD11R.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\JvMMD11R.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\JvNetD11R.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\JvPageCompsD11R.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\JvStdCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\JvSystemD11R.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\pckMD5.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\pckUCDataConnector.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\pckUserControl_RT.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\PngComponentsD10.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\PNG_D10.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\RemObjects_Core_D11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\RemObjects_Indy_D11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\RemObjects_Indy_D11.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\rtl.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\rtl.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\TB2k_D10.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\tbx_d10.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\vcl.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\vcl.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\vclactnband.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\vcldb.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\vcldb.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\vcljpg.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\VclSmp.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\vclx.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\vclx.dcp" />
<DCCReference Include="..\Modulos\Gestor de informes\xmlrtl.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" /> <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="Conexion\uConfigurarConexion.pas"> <DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form> <Form>fConfigurarConexion</Form>

Binary file not shown.

File diff suppressed because one or more lines are too long

View File

@ -353,16 +353,17 @@ object RptPedidosProveedor: TRptPedidosProveedor
'SELECT DET.ID, DET.ID_PEDIDO,'#10' DET.POSICION, DET.TIPO_DETA' + 'SELECT DET.ID, DET.ID_PEDIDO,'#10' DET.POSICION, DET.TIPO_DETA' +
'LLE,'#10' ARTICULOS.REFERENCIA, DET.CONCEPTO, DET.CANTIDAD,'#10' ' + 'LLE,'#10' ARTICULOS.REFERENCIA, DET.CONCEPTO, DET.CANTIDAD,'#10' ' +
' DET.UNIDAD_MEDIDA, DET.IMPORTE_UNIDAD - (DET.IMPORTE_UNIDAD' + ' DET.UNIDAD_MEDIDA, DET.IMPORTE_UNIDAD - (DET.IMPORTE_UNIDAD' +
' * (DET.DESCUENTO / 100)) as IMPORTE_UNIDAD, DET.IMPORTE_TOTAL,'#10 + ' * (COALESCE(DET.DESCUENTO,0) / 100)) as IMPORTE_UNIDAD, DET.IMP' +
' ARTICULOS_PROVEEDORES.REFERENCIA_PROV as REFERENCIA_PROVE' + 'ORTE_TOTAL,'#10' ARTICULOS_PROVEEDORES.REFERENCIA_PROV as REFE' +
'EDOR,'#10' ARTICULOS.REFERENCIA_FABR as REFERENCIA_FABRICANTE'#10 + 'RENCIA_PROVEEDOR,'#10' ARTICULOS.REFERENCIA_FABR as REFERENCIA' +
'FROM PEDIDOS_PROVEEDOR_DETALLES DET'#10'LEFT OUTER JOIN ARTICULOS ON' + '_FABRICANTE'#10'FROM PEDIDOS_PROVEEDOR_DETALLES DET'#10'LEFT OUTER JOIN ' +
' (DET.ID_ARTICULO = ARTICULOS.ID)'#10'LEFT JOIN PEDIDOS_PROVEEDOR ON' + 'ARTICULOS ON (DET.ID_ARTICULO = ARTICULOS.ID)'#10'LEFT JOIN PEDIDOS_' +
' (PEDIDOS_PROVEEDOR.ID = DET.ID_PEDIDO)'#10'LEFT JOIN ARTICULOS_PROV' + 'PROVEEDOR ON (PEDIDOS_PROVEEDOR.ID = DET.ID_PEDIDO)'#10'LEFT JOIN AR' +
'EEDORES ON ((ARTICULOS_PROVEEDORES.ID_ARTICULO = ARTICULOS.ID) A' + 'TICULOS_PROVEEDORES ON ((ARTICULOS_PROVEEDORES.ID_ARTICULO = ART' +
'ND (ARTICULOS_PROVEEDORES.ID_PROVEEDOR = PEDIDOS_PROVEEDOR.ID_PR' + 'ICULOS.ID) AND (ARTICULOS_PROVEEDORES.ID_PROVEEDOR = PEDIDOS_PRO' +
'OVEEDOR))'#10#10'WHERE DET.ID_PEDIDO = :ID_PEDIDO AND DET.VISIBLE = 1 ' + 'VEEDOR.ID_PROVEEDOR))'#10#10'WHERE DET.ID_PEDIDO = :ID_PEDIDO AND DET.' +
'AND {Where}'#10'ORDER BY DET.ID_PEDIDO, DET.POSICION;'#10#10#10#10#10#10#10 'VISIBLE = 1 AND {Where}'#10'ORDER BY DET.ID_PEDIDO, DET.POSICION;'#10#10#10 +
#10#10#10#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -496,7 +497,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
PrintOptions.Printer = 'Por defecto' PrintOptions.Printer = 'Por defecto'
PrintOptions.PrintOnSheet = 0 PrintOptions.PrintOnSheet = 0
ReportOptions.CreateDate = 39065.872423495400000000 ReportOptions.CreateDate = 39065.872423495400000000
ReportOptions.LastChange = 39696.439732523150000000 ReportOptions.LastChange = 39827.743311446760000000
ScriptLanguage = 'PascalScript' ScriptLanguage = 'PascalScript'
ScriptText.Strings = ( ScriptText.Strings = (
'' ''
@ -535,20 +536,48 @@ object RptPedidosProveedor: TRptPedidosProveedor
'procedure Memo35OnBeforePrint(Sender: TfrxComponent);' 'procedure Memo35OnBeforePrint(Sender: TfrxComponent);'
'begin' 'begin'
' Memo35.Visible := ImprimirPrecios; ' + ' if not <ImprimirPrecio> then ' +
' ' ' '
' Memo35.Lines.Clear; '
'end;' 'end;'
'' ''
'procedure Memo36OnBeforePrint(Sender: TfrxComponent);' 'procedure Memo36OnBeforePrint(Sender: TfrxComponent);'
'begin' 'begin'
' Memo36.Visible := ImprimirPrecios; '
' if not <ImprimirPrecio> then ' +
' '
' Memo36.Lines.Clear; '
'end;' 'end;'
'' ''
'procedure Memo6OnBeforePrint(Sender: TfrxComponent);' 'procedure Memo6OnBeforePrint(Sender: TfrxComponent);'
'begin' 'begin'
' Memo6.Visible := ImprimirRefProveedor; ' + ' if not <ImprimirRefProveedor> then ' +
' ' ' '
' Memo6.Lines.Clear; '
'end;'
''
'procedure PageHeader2OnBeforePrint(Sender: TfrxComponent);'
'begin'
' if not Engine.FinalPass then'
' Set('#39'TotalPaginas'#39', (<TotalPaginas> + 1));'
''
' if Engine.FinalPass then'
' Set('#39'Pagina'#39', (<Pagina> + 1)); '
'end;'
''
'procedure frxReportOnStartReport(Sender: TfrxComponent);'
'begin'
' Set('#39'Pagina'#39', 0);'
' Set('#39'TotalPaginas'#39', 0); '
'end;'
''
'procedure Memo34OnBeforePrint(Sender: TfrxComponent);'
'begin'
' if not <ImprimirPrecio> then ' +
' '
' Memo34.Lines.Clear; '
'end;' 'end;'
'' ''
'begin' 'begin'

View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid> <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>