Version 4.2.6

git-svn-id: https://192.168.0.254/svn/Proyectos.LuisLeon_FactuGES2/trunk@177 b2cfbe5a-eba1-4a0c-8b32-7feea0a119f2
This commit is contained in:
roberto 2013-01-09 12:25:53 +00:00
parent 5d81128f82
commit 1c0a01ff61
15 changed files with 378 additions and 118 deletions

Binary file not shown.

View File

@ -54,58 +54,58 @@
<DelphiCompile Include="Base.dpk"> <DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Modulos\Comisiones\adortl.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\adortl.dcp" />
<DCCReference Include="..\Modulos\Comisiones\cxDataD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Comisiones\cxEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Comisiones\cxExportD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxExportD11.dcp" />
<DCCReference Include="..\Modulos\Comisiones\cxExtEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Comisiones\cxGridD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Comisiones\cxIntl6D11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxIntl6D11.dcp" />
<DCCReference Include="..\Modulos\Comisiones\cxIntlPrintSys3D11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxIntlPrintSys3D11.dcp" />
<DCCReference Include="..\Modulos\Comisiones\cxLibraryD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Comisiones\cxPageControlD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Comisiones\DataAbstract_Core_D11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Comisiones\dbrtl.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Comisiones\dclIndyCore.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Comisiones\designide.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\designide.dcp" />
<DCCReference Include="..\Modulos\Comisiones\dsnap.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\dsnap.dcp" />
<DCCReference Include="..\Modulos\Comisiones\dxCoreD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\dxCoreD11.dcp" />
<DCCReference Include="..\Modulos\Comisiones\dxGDIPlusD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Comisiones\dxPSCoreD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Comisiones\dxThemeD11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Comisiones\GUISDK_D11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\GUISDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Comisiones\IndyCore.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Comisiones\IndyProtocols.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Comisiones\IndySystem.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Comisiones\Jcl.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\Jcl.dcp" />
<DCCReference Include="..\Modulos\Comisiones\JclVcl.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Comisiones\JSDialog100.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Comisiones\JvCmpD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Comisiones\JvCoreD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Comisiones\JvCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Comisiones\JvDlgsD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Comisiones\JvMMD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Comisiones\JvNetD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Comisiones\JvPageCompsD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Comisiones\JvStdCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Comisiones\JvSystemD11R.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Comisiones\pckMD5.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Comisiones\pckUCDataConnector.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Comisiones\pckUserControl_RT.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Comisiones\PngComponentsD10.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Comisiones\PNG_D10.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Comisiones\RemObjects_Core_D11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Comisiones\RemObjects_Indy_D11.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\RemObjects_Indy_D11.dcp" />
<DCCReference Include="..\Modulos\Comisiones\rtl.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\rtl.dcp" />
<DCCReference Include="..\Modulos\Comisiones\TB2k_D10.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Comisiones\tbx_d10.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Comisiones\vcl.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\vcl.dcp" />
<DCCReference Include="..\Modulos\Comisiones\vclactnband.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Comisiones\vcldb.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\vcldb.dcp" />
<DCCReference Include="..\Modulos\Comisiones\vcljpg.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Comisiones\VclSmp.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Comisiones\vclx.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\vclx.dcp" />
<DCCReference Include="..\Modulos\Comisiones\xmlrtl.dcp" /> <DCCReference Include="..\Modulos\Albaranes de cliente\xmlrtl.dcp" />
<DCCReference Include="..\Modulos\Impresiones\Data\uDataModuleImpresiones.pas"> <DCCReference Include="..\Modulos\Impresiones\Data\uDataModuleImpresiones.pas">
<Form>DataModuleImpresiones</Form> <Form>DataModuleImpresiones</Form>
<DesignClass>TDataModule</DesignClass> <DesignClass>TDataModule</DesignClass>

View File

@ -53,7 +53,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType>VCLApplication</Borland.ProjectType> <Borland.ProjectType>VCLApplication</Borland.ProjectType>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">5</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.2.5.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.2.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">6</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.2.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.2.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" /> <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
<ItemGroup> <ItemGroup>

View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo\Resources\Iconos\Factuges.ico" MAINICON ICON "C:\Codigo\Resources\Iconos\Factuges.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 4,2,5,0 FILEVERSION 4,2,6,0
PRODUCTVERSION 4,2,5,0 PRODUCTVERSION 4,2,6,0
FILEFLAGSMASK 0x3FL FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L FILEFLAGS 0x00L
FILEOS 0x40004L FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4" BLOCK "0C0A04E4"
BEGIN BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0" VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "4.2.5.0\0" VALUE "FileVersion", "4.2.6.0\0"
VALUE "InternalName", "FactuGES\0" VALUE "InternalName", "FactuGES\0"
VALUE "ProductName", "FactuGES\0" VALUE "ProductName", "FactuGES\0"
VALUE "ProductVersion", "4.2.5.0\0" VALUE "ProductVersion", "4.2.6.0\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

Binary file not shown.

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -129,6 +129,10 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
BestFitMaxWidth = 45 BestFitMaxWidth = 45
Width = 39 Width = 39
end end
object cxGridViewREF_CLIENTE: TcxGridDBColumn
Caption = 'Ref. Cliente'
DataBinding.FieldName = 'REFERENCIA_CLIENTE'
end
object cxGridViewFECHA_PREVISTA_ENVIO: TcxGridDBColumn object cxGridViewFECHA_PREVISTA_ENVIO: TcxGridDBColumn
DataBinding.FieldName = 'FECHA_PREVISTA_ENVIO' DataBinding.FieldName = 'FECHA_PREVISTA_ENVIO'
BestFitMaxWidth = 45 BestFitMaxWidth = 45

View File

@ -67,6 +67,7 @@ type
actAgentes: TAction; actAgentes: TAction;
TBXSeparatorItem3: TTBXSeparatorItem; TBXSeparatorItem3: TTBXSeparatorItem;
TBXItem4: TTBXItem; TBXItem4: TTBXItem;
cxGridViewREF_CLIENTE: TcxGridDBColumn;
procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel:
TcxGridLevel); TcxGridLevel);
procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;

View File

@ -212,12 +212,13 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
'ZON_SOCIAL_EMPRESA,'#10' EMPRESAS.TELEFONO_1 AS TELEFONO_1_EMPRESA,' + 'ZON_SOCIAL_EMPRESA,'#10' EMPRESAS.TELEFONO_1 AS TELEFONO_1_EMPRESA,' +
#10' EMPRESAS.FAX AS FAX_EMPRESA,'#10' EMPRESAS.MOVIL_1 AS MOVIL_1_EM' + #10' EMPRESAS.FAX AS FAX_EMPRESA,'#10' EMPRESAS.MOVIL_1 AS MOVIL_1_EM' +
'PRESA,'#10' EMPRESAS.EMAIL_1 AS EMAIL_1_EMPRESA,'#10' EMPRESAS.PAGINA_' + 'PRESA,'#10' EMPRESAS.EMAIL_1 AS EMAIL_1_EMPRESA,'#10' EMPRESAS.PAGINA_' +
'WEB AS PAGINA_WEB_EMPRESA'#10'FROM'#10' V_ALBARANES_PROVEEDOR'#10' LEFT ' + 'WEB AS PAGINA_WEB_EMPRESA,'#10' V_ALBARANES_PROVEEDOR.OBSERVACIONES' +
'OUTER JOIN V_PROVEEDORES ON (V_PROVEEDORES.ID = V_ALBARANES_PROV' + ','#10' V_ALBARANES_PROVEEDOR.INCIDENCIAS'#10'FROM'#10' V_ALBARANES_PROVE' +
'EEDOR.ID_PROVEEDOR)'#10' LEFT OUTER JOIN ALMACENES ON (ALMACENES.ID' + 'EDOR'#10' LEFT OUTER JOIN V_PROVEEDORES ON (V_PROVEEDORES.ID = V_AL' +
' = V_ALBARANES_PROVEEDOR.ID_ALMACEN)'#10' LEFT OUTER JOIN EMPRESAS ' + 'BARANES_PROVEEDOR.ID_PROVEEDOR)'#10' LEFT OUTER JOIN ALMACENES ON (' +
'ON (EMPRESAS.ID = V_ALBARANES_PROVEEDOR.ID_EMPRESA)'#10'WHERE V_ALBA' + 'ALMACENES.ID = V_ALBARANES_PROVEEDOR.ID_ALMACEN)'#10' LEFT OUTER JO' +
'RANES_PROVEEDOR.ID = :ID'#10#10 'IN EMPRESAS ON (EMPRESAS.ID = V_ALBARANES_PROVEEDOR.ID_EMPRESA)'#10 +
'WHERE V_ALBARANES_PROVEEDOR.ID = :ID'#10#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item
@ -319,6 +320,14 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
item item
DatasetField = 'PAGINA_WEB_EMPRESA' DatasetField = 'PAGINA_WEB_EMPRESA'
TableField = 'PAGINA_WEB_EMPRESA' TableField = 'PAGINA_WEB_EMPRESA'
end
item
DatasetField = 'OBSERVACIONES1'
TableField = 'OBSERVACIONES1'
end
item
DatasetField = 'INCIDENCIAS'
TableField = 'INCIDENCIAS'
end> end>
end> end>
Name = 'Informe_Cabecera' Name = 'Informe_Cabecera'
@ -441,6 +450,14 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
Name = 'PAGINA_WEB_EMPRESA' Name = 'PAGINA_WEB_EMPRESA'
DataType = datString DataType = datString
Size = 255 Size = 255
end
item
Name = 'OBSERVACIONES1'
DataType = datMemo
end
item
Name = 'INCIDENCIAS'
DataType = datMemo
end> end>
end end
item item
@ -589,7 +606,7 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
PrintOptions.Printer = 'Por defecto' PrintOptions.Printer = 'Por defecto'
PrintOptions.PrintOnSheet = 0 PrintOptions.PrintOnSheet = 0
ReportOptions.CreateDate = 39065.872423495400000000 ReportOptions.CreateDate = 39065.872423495400000000
ReportOptions.LastChange = 39829.854499780090000000 ReportOptions.LastChange = 41283.504346134260000000
ScriptLanguage = 'PascalScript' ScriptLanguage = 'PascalScript'
ScriptText.Strings = ( ScriptText.Strings = (
'' ''
@ -597,7 +614,7 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
'var' 'var'
' Cadena: String;' ' Cadena: String;'
'begin' 'begin'
'{ DatosEmpresa.Lines.Clear;' ' DatosEmpresa.Lines.Clear;'
' if (<frxDBCabecera."TELEFONO_1_EMPRESA"> <> '#39#39') then' ' if (<frxDBCabecera."TELEFONO_1_EMPRESA"> <> '#39#39') then'
' Cadena := '#39'TLF: '#39' + <frxDBCabecera."TELEFONO_1_EMPRESA">;' ' Cadena := '#39'TLF: '#39' + <frxDBCabecera."TELEFONO_1_EMPRESA">;'
' if (<frxDBCabecera."FAX_EMPRESA"> <> '#39#39') then' ' if (<frxDBCabecera."FAX_EMPRESA"> <> '#39#39') then'
@ -605,62 +622,143 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
' Cadena := Cadena + '#39' FAX: '#39' + <frxDBCabecera."FAX_EMPRESA' + ' Cadena := Cadena + '#39' FAX: '#39' + <frxDBCabecera."FAX_EMPRESA' +
'">;' '">;'
' DatosEmpresa.Lines.Add(Cadena);' ' DatosEmpresa.Lines.Add(Cadena);'
'}' ' Memo19.Lines.Clear;'
' Memo19.Lines.Add(Cadena); ' +
' '
'end;' 'end;'
'' ''
'procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);' 'procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);'
'begin' 'begin'
'{ NombreEmpresa.Lines.Clear;' ' NombreEmpresa.Lines.Clear;'
' NombreEmpresa.Lines.Add(<frxDBCabecera."NOMBRE_EMPRESA">);' ' NombreEmpresa.Lines.Add(<frxDBCabecera."NOMBRE_EMPRESA">);'
'}' ' Memo15.Lines.Clear;'
' Memo15.Lines.Add(<frxDBCabecera."NOMBRE_EMPRESA">);'
'end;' 'end;'
'' ''
'procedure Memo35OnBeforePrint(Sender: TfrxComponent);' 'procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);'
'var'
' ACadena : String;'
'begin' 'begin'
' ACadena := '#39#39';'
' DireccionEnvio.Lines.Clear;'
''
' if (<frxDBCabecera."PERSONA_CONTACTO"> <> '#39#39') then'
' ACadena := <frxDBCabecera."PERSONA_CONTACTO">;'
' if (<frxDBCabecera."TELEFONO"> <> '#39#39') then'
'{ if not <ImprimirPrecio> then ' + ' ACadena := ACadena + '#39' (tlf: '#39' + <frxDBCabecera."TELEFONO">' +
' ' ' + '#39' )'#39';'
' Memo35.Lines.Clear;} '
'end;'
'' ''
'procedure Memo36OnBeforePrint(Sender: TfrxComponent);' ' DireccionEnvio.Lines.Add(ACadena);'
'begin' ' ACadena := '#39#39';'
' DireccionEnvio.Lines.Add(ACadena);'
''
' DireccionEnvio.Lines.Add(<frxDBCabecera."CALLE">);'
' if (<frxDBCabecera."CODIGO_POSTAL"> <> '#39#39') then'
' ACadena := <frxDBCabecera."CODIGO_POSTAL"> + '#39' '#39';'
' if (<frxDBCabecera."POBLACION"> <> '#39#39') then'
' ACadena := ACadena + <frxDBCabecera."CODIGO_POSTAL">;'
''
' if (ACadena <> '#39#39') then'
' DireccionEnvio.Lines.Add(ACadena);'
''
' if (<frxDBCabecera."PROVINCIA"> <> '#39#39') then'
' DireccionEnvio.Lines.Add(<frxDBCabecera."PROVINCIA">);'
''
' Memo24.Lines.Clear;'
'// Memo24.Lines.Add(DireccionEnvio.Lines);'
'{ if not <ImprimirPrecio> then ' + 'Memo24.Memo.Text := DireccionEnvio.Memo.Text; ' +
' ' ' '
' Memo36.Lines.Clear;} '
'end;' 'end;'
'' ''
'procedure Memo6OnBeforePrint(Sender: TfrxComponent);' 'procedure Memo2OnBeforePrint(Sender: TfrxComponent);'
'begin' 'begin'
' Memo2.Lines.Clear;'
'{ if not <ImprimirRefProveedor> then ' + ' Memo9.Lines.Clear; '
' ' ' if (StrToFloat(<frxDBCabecera."IMPORTE_TOTAL">) < 0) then'
' Memo6.Lines.Clear;} ' ' begin '
' Memo2.Lines.Add('#39'ORDEN DE DEVOLUCI'#211'N'#39'); '
' Memo9.Lines.Add('#39'ORDEN DE DEVOLUCI'#211'N'#39'); '
' end '
' else'
' begin '
' Memo2.Lines.Add('#39'ALBAR'#193'N DE PROVEEDOR'#39'); '
' Memo9.Lines.Add('#39'ALBAR'#193'N DE PROVEEDOR'#39'); '
' end '
'end;' 'end;'
'' ''
'procedure PageHeader2OnBeforePrint(Sender: TfrxComponent);' 'procedure Memo5OnBeforePrint(Sender: TfrxComponent);'
'begin' 'begin'
' if not Engine.FinalPass then' ' if (StrToFloat(<frxDBCabecera."IMPORTE_TOTAL">) < 0) then'
' begin'
' Memo5.Lines.Clear;'
' Memo5.Lines.Add('#39'N'#186' orden:'#39');'
' end;'
'end;'
''
'procedure Memo1OnBeforePrint(Sender: TfrxComponent);'
'begin'
' if (StrToFloat(<frxDBCabecera."IMPORTE_TOTAL">) < 0) then'
' begin'
' Memo1.Lines.Clear;'
' Memo1.Lines.Add('#39'Fecha orden:'#39');'
' end;'
'end;'
''
'procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);'
'begin'
' if not Engine.FinalPass then'
' Set('#39'TotalPaginas'#39', (<TotalPaginas> + 1));' ' Set('#39'TotalPaginas'#39', (<TotalPaginas> + 1));'
'' ''
' if Engine.FinalPass then' ' if Engine.FinalPass then'
' Set('#39'Pagina'#39', (<Pagina> + 1)); ' ' Set('#39'Pagina'#39', (<Pagina> + 1));'
'end;' 'end;'
'' ''
'procedure frxReportOnStartReport(Sender: TfrxComponent);' 'procedure frxReportOnStartReport(Sender: TfrxComponent);'
'begin' 'begin'
' Set('#39'Pagina'#39', 0);' ' Set('#39'Pagina'#39', 0);'
' Set('#39'TotalPaginas'#39', 0); ' ' Set('#39'TotalPaginas'#39', 0);'
'end;' 'end;'
'' ''
'procedure Memo21OnBeforePrint(Sender: TfrxComponent);' ''
'procedure eImporteUnidadOnBeforePrint(Sender: TfrxComponent);'
'begin' 'begin'
' if (<frxDBCabecera."TIPO"> = '#39'D'#39') then' ' if <ImprimirPrecio> then'
' begin ' ' begin '
' Memo21.Lines.Clear;' ' eImporteUnidad.Visible := True; '
' Memo21.Lines.Add('#39'ORDEN DE DEVOLUCION'#39');' ' lImporteUnidad.Visible := True; '
' end; ' ' eImporteTotal.Visible := True; '
' lImporteTotal.Visible := True; '
' ImporteUnidad.Visible := True; '
' ImporteTotal.Visible := True; '
' end'
' else'
' begin '
' eImporteUnidad.Visible := False; '
' lImporteUnidad.Visible := False; '
' eImporteTotal.Visible := False; '
' lImporteTotal.Visible := False; '
' ImporteUnidad.Visible := False; '
' ImporteTotal.Visible := False;'
' eConcepto.Width := eConcepto.Width + ImporteTotal.Width + I' +
'mporteUnidad.Width + 10;'
' Concepto.Width := Concepto.Width + ImporteTotal.Width + Imp' +
'orteUnidad.Width; '
' end '
'end;'
''
'procedure Page2OnBeforePrint(Sender: TfrxComponent);'
'begin'
' if (<frxDBCabecera."OBSERVACIONES"> <> '#39#39') or (<frxDBCabecera.' +
'"INCIDENCIAS"> <> '#39#39') then'
' Page2.Visible := true'
' else'
' Page2.Visible := false; '
'end;' 'end;'
'' ''
'begin' 'begin'
@ -847,6 +945,11 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
Name = 'ID_PROVEEDOR' Name = 'ID_PROVEEDOR'
DataType = datInteger DataType = datInteger
end end
item
Name = 'NOMBRE'
DataType = datString
Size = 255
end
item item
Name = 'FECHA_ALBARAN' Name = 'FECHA_ALBARAN'
DataType = datDateTime DataType = datDateTime
@ -857,22 +960,16 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
Size = 255 Size = 255
end end
item item
Name = 'REFERENCIA_PROVEEDOR' Name = 'ID_PEDIDO'
DataType = datInteger
end
item
Name = 'REF_PED_PROVEEDOR'
DataType = datString DataType = datString
Size = 255 Size = 255
end end
item item
Name = 'NIF_CIF' Name = 'NOMBRE_ALMACEN'
DataType = datString
Size = 15
end
item
Name = 'NOMBRE'
DataType = datString
Size = 255
end
item
Name = 'PERSONA_CONTACTO'
DataType = datString DataType = datString
Size = 255 Size = 255
end end
@ -881,6 +978,11 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
DataType = datString DataType = datString
Size = 255 Size = 255
end end
item
Name = 'CODIGO_POSTAL'
DataType = datString
Size = 10
end
item item
Name = 'POBLACION' Name = 'POBLACION'
DataType = datString DataType = datString
@ -892,9 +994,70 @@ object RptAlbaranesProveedor: TRptAlbaranesProveedor
Size = 255 Size = 255
end end
item item
Name = 'CODIGO_POSTAL' Name = 'PERSONA_CONTACTO'
DataType = datString DataType = datString
Size = 10 Size = 255
end
item
Name = 'TELEFONO'
DataType = datString
Size = 25
end
item
Name = 'OBSERVACIONES'
DataType = datMemo
end
item
Name = 'IMPORTE_TOTAL'
DataType = datCurrency
end
item
Name = 'NIF_CIF_EMPRESA'
DataType = datString
Size = 15
end
item
Name = 'NOMBRE_EMPRESA'
DataType = datString
Size = 255
end
item
Name = 'RAZON_SOCIAL_EMPRESA'
DataType = datString
Size = 255
end
item
Name = 'TELEFONO_1_EMPRESA'
DataType = datString
Size = 25
end
item
Name = 'FAX_EMPRESA'
DataType = datString
Size = 25
end
item
Name = 'MOVIL_1_EMPRESA'
DataType = datString
Size = 25
end
item
Name = 'EMAIL_1_EMPRESA'
DataType = datString
Size = 255
end
item
Name = 'PAGINA_WEB_EMPRESA'
DataType = datString
Size = 255
end
item
Name = 'OBSERVACIONES1'
DataType = datMemo
end
item
Name = 'INCIDENCIAS'
DataType = datMemo
end> end>
Params = < Params = <
item item

Binary file not shown.

View File

@ -35,7 +35,7 @@
<Borland.Personality>Delphi.Personality</Borland.Personality> <Borland.Personality>Delphi.Personality</Borland.Personality>
<Borland.ProjectType/> <Borland.ProjectType/>
<BorlandProject> <BorlandProject>
<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">5</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">4.2.5.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">4.2.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 31 de agosto de 2012 19:05</VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">6</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">4.2.6.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">4.2.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">lunes, 15 de octubre de 2012 18:34</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages> <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject> </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>

View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo\Resources\Iconos\Servidor.ico" MAINICON ICON "C:\Codigo\Resources\Iconos\Servidor.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 4,2,5,0 FILEVERSION 4,2,6,0
PRODUCTVERSION 4,2,5,0 PRODUCTVERSION 4,2,6,0
FILEFLAGSMASK 0x3FL FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L FILEFLAGS 0x00L
FILEOS 0x40004L FILEOS 0x40004L
@ -12,9 +12,9 @@ BEGIN
BEGIN BEGIN
BLOCK "0C0A04E4" BLOCK "0C0A04E4"
BEGIN BEGIN
VALUE "FileVersion", "4.2.5.0\0" VALUE "FileVersion", "4.2.6.0\0"
VALUE "ProductVersion", "4.2.5.0\0" VALUE "ProductVersion", "4.2.6.0\0"
VALUE "CompileDate", "lunes, 15 de octubre de 2012 18:34\0" VALUE "CompileDate", "miércoles, 09 de enero de 2013 13:17\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"