Acana_Interiorismo/FactuGES2
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Version 5.2.8 se revisa la carga de imagenes en la lista de articulos para que no lo haga y los tiempos de respuesta sena mejores, solo se recupera la imagen al editar.

Browse Source 
Cambios varios en informes y presupuestos y contratos para tener en cuenta referencia de proveedor y atencion de....
This commit is contained in:
roberto 2026-10-08 10:09:58 +02:00
parent 35a6644a2a
commit 9f742f8b5a
31 changed files with 943 additions and 534 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Output/Debug/Servidor/Informes/5/3/InfContratoCliente.fr3
View File

File diff suppressed because one or more lines are too long

15
Output/Debug/Servidor/Informes/5/3/InfPresupuestoCliente.fr3
View File

File diff suppressed because one or more lines are too long

68
Source/ApplicationBase/ApplicationBase.dproj
View File

@ -56,40 +56,40 @@
<DelphiCompile Include="ApplicationBase.dpk"> <DelphiCompile Include="ApplicationBase.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" /> <DCCReference Include="..\Servidor\adortl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" /> <DCCReference Include="..\Servidor\Base.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" /> <DCCReference Include="..\Servidor\ccpackD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cfpack_d11.dcp" /> <DCCReference Include="..\Servidor\cfpack_d11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" /> <DCCReference Include="..\Servidor\cxDataD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" /> <DCCReference Include="..\Servidor\cxEditorsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" /> <DCCReference Include="..\Servidor\cxExtEditorsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" /> <DCCReference Include="..\Servidor\cxLibraryD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" /> <DCCReference Include="..\Servidor\DataAbstract_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" /> <DCCReference Include="..\Servidor\dbrtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" /> <DCCReference Include="..\Servidor\designide.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" /> <DCCReference Include="..\Servidor\dsnap.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxCoreD11.dcp" /> <DCCReference Include="..\Servidor\dxCoreD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" /> <DCCReference Include="..\Servidor\dxGDIPlusD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxNavBarD11.dcp" /> <DCCReference Include="..\Servidor\dxNavBarD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" /> <DCCReference Include="..\Servidor\dxThemeD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" /> <DCCReference Include="..\Servidor\GUIBase.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11R.dcp" /> <DCCReference Include="..\Servidor\GUISDK_D11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" /> <DCCReference Include="..\Servidor\Jcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" /> <DCCReference Include="..\Servidor\JclVcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" /> <DCCReference Include="..\Servidor\JvCoreD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" /> <DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvJansD11R.dcp" /> <DCCReference Include="..\Servidor\JvJansD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" /> <DCCReference Include="..\Servidor\JvMMD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" /> <DCCReference Include="..\Servidor\JvStdCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" /> <DCCReference Include="..\Servidor\JvSystemD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" /> <DCCReference Include="..\Servidor\RemObjects_Core_D11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" /> <DCCReference Include="..\Servidor\rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" /> <DCCReference Include="..\Servidor\vcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" /> <DCCReference Include="..\Servidor\vclactnband.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" /> <DCCReference Include="..\Servidor\vcldb.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" /> <DCCReference Include="..\Servidor\vcljpg.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" /> <DCCReference Include="..\Servidor\vclx.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" /> <DCCReference Include="..\Servidor\xmlrtl.dcp" />
<DCCReference Include="Configuracion\Controller\uConfiguracionController.pas" /> <DCCReference Include="Configuracion\Controller\uConfiguracionController.pas" />
<DCCReference Include="Configuracion\Controller\Views\uIViewConfiguracionBase.pas" /> <DCCReference Include="Configuracion\Controller\Views\uIViewConfiguracionBase.pas" />
<DCCReference Include="Configuracion\Views\uEditorConfiguracion.pas"> <DCCReference Include="Configuracion\Views\uEditorConfiguracion.pas">

112
Source/Base/Base.dproj
View File

@ -44,20 +44,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\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages> <Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages> <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
<Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages> <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
@ -72,56 +58,56 @@
<DelphiCompile Include="Base.dpk"> <DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="$(SystemRoot)\system32\adortl.dcp" />
<DCCReference Include="$(SystemRoot)\system32\cxDataD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\cxEditorsD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\cxExtEditorsD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\cxGridD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\cxLibraryD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\cxPageControlD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\DataAbstract_Core_D11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dbrtl.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dclIndyCore.dcp" />
<DCCReference Include="$(SystemRoot)\system32\designide.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dsnap.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dxCoreD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dxGDIPlusD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dxPSCoreD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dxThemeD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\GUISDK_D11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\IndyCore.dcp" />
<DCCReference Include="$(SystemRoot)\system32\IndyProtocols.dcp" />
<DCCReference Include="$(SystemRoot)\system32\IndySystem.dcp" />
<DCCReference Include="$(SystemRoot)\system32\Jcl.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JclVcl.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JSDialog100.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JvCmpD11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JvCoreD11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JvCtrlsD11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JvDlgsD11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JvMMD11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JvNetD11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JvPageCompsD11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JvStdCtrlsD11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JvSystemD11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\pckMD5.dcp" />
<DCCReference Include="$(SystemRoot)\system32\pckUCDataConnector.dcp" />
<DCCReference Include="$(SystemRoot)\system32\pckUserControl_RT.dcp" />
<DCCReference Include="$(SystemRoot)\system32\PluginSDK_D11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\PngComponentsD10.dcp" />
<DCCReference Include="$(SystemRoot)\system32\PNG_D10.dcp" />
<DCCReference Include="$(SystemRoot)\system32\RemObjects_Core_D11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\rtl.dcp" />
<DCCReference Include="$(SystemRoot)\system32\TB2k_D10.dcp" />
<DCCReference Include="$(SystemRoot)\system32\tbx_d10.dcp" />
<DCCReference Include="$(SystemRoot)\system32\vcl.dcp" />
<DCCReference Include="$(SystemRoot)\system32\vclactnband.dcp" />
<DCCReference Include="$(SystemRoot)\system32\vcldb.dcp" />
<DCCReference Include="$(SystemRoot)\system32\vcljpg.dcp" />
<DCCReference Include="$(SystemRoot)\system32\VclSmp.dcp" />
<DCCReference Include="$(SystemRoot)\system32\vclx.dcp" />
<DCCReference Include="$(SystemRoot)\system32\xmlrtl.dcp" />
<DCCReference Include="..\Servicios\FactuGES_Intf.pas" /> <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
<DCCReference Include="..\Servidor\adortl.dcp" />
<DCCReference Include="..\Servidor\cxDataD11.dcp" />
<DCCReference Include="..\Servidor\cxEditorsD11.dcp" />
<DCCReference Include="..\Servidor\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Servidor\cxGridD11.dcp" />
<DCCReference Include="..\Servidor\cxLibraryD11.dcp" />
<DCCReference Include="..\Servidor\cxPageControlD11.dcp" />
<DCCReference Include="..\Servidor\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Servidor\dbrtl.dcp" />
<DCCReference Include="..\Servidor\dclIndyCore.dcp" />
<DCCReference Include="..\Servidor\designide.dcp" />
<DCCReference Include="..\Servidor\dsnap.dcp" />
<DCCReference Include="..\Servidor\dxCoreD11.dcp" />
<DCCReference Include="..\Servidor\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Servidor\dxPSCoreD11.dcp" />
<DCCReference Include="..\Servidor\dxThemeD11.dcp" />
<DCCReference Include="..\Servidor\GUISDK_D11R.dcp" />
<DCCReference Include="..\Servidor\IndyCore.dcp" />
<DCCReference Include="..\Servidor\IndyProtocols.dcp" />
<DCCReference Include="..\Servidor\IndySystem.dcp" />
<DCCReference Include="..\Servidor\Jcl.dcp" />
<DCCReference Include="..\Servidor\JclVcl.dcp" />
<DCCReference Include="..\Servidor\JSDialog100.dcp" />
<DCCReference Include="..\Servidor\JvCmpD11R.dcp" />
<DCCReference Include="..\Servidor\JvCoreD11R.dcp" />
<DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Servidor\JvDlgsD11R.dcp" />
<DCCReference Include="..\Servidor\JvMMD11R.dcp" />
<DCCReference Include="..\Servidor\JvNetD11R.dcp" />
<DCCReference Include="..\Servidor\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Servidor\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Servidor\JvSystemD11R.dcp" />
<DCCReference Include="..\Servidor\pckMD5.dcp" />
<DCCReference Include="..\Servidor\pckUCDataConnector.dcp" />
<DCCReference Include="..\Servidor\pckUserControl_RT.dcp" />
<DCCReference Include="..\Servidor\PluginSDK_D11R.dcp" />
<DCCReference Include="..\Servidor\PngComponentsD10.dcp" />
<DCCReference Include="..\Servidor\PNG_D10.dcp" />
<DCCReference Include="..\Servidor\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Servidor\rtl.dcp" />
<DCCReference Include="..\Servidor\TB2k_D10.dcp" />
<DCCReference Include="..\Servidor\tbx_d10.dcp" />
<DCCReference Include="..\Servidor\vcl.dcp" />
<DCCReference Include="..\Servidor\vclactnband.dcp" />
<DCCReference Include="..\Servidor\vcldb.dcp" />
<DCCReference Include="..\Servidor\vcljpg.dcp" />
<DCCReference Include="..\Servidor\VclSmp.dcp" />
<DCCReference Include="..\Servidor\vclx.dcp" />
<DCCReference Include="..\Servidor\xmlrtl.dcp" />
<DCCReference Include="Conexion\uConfigurarConexion.pas"> <DCCReference Include="Conexion\uConfigurarConexion.pas">
<Form>fConfigurarConexion</Form> <Form>fConfigurarConexion</Form>
<DesignClass>TForm</DesignClass> <DesignClass>TForm</DesignClass>

3
Source/Cliente/FactuGES.dproj
View File

@ -52,8 +52,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">5</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">7</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">5.2.7.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">5.2.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <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">5</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">8</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">5.2.8.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">5.2.8.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages> <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject> </Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>

16
Source/Informes/5/3/InfContratoCliente.fr3
View File

File diff suppressed because one or more lines are too long

15
Source/Informes/5/3/InfPresupuestoCliente.fr3
View File

File diff suppressed because one or more lines are too long

14
Source/Modulos/Articulos/Controller/uArticulosController.pas
View File

@ -111,10 +111,10 @@ type
implementation implementation
uses uses
SysUtils, cxControls, uDataTableUtils, DB, uEditorRegistryUtils, schArticulosClient_Intf, uFactuGES_App, SysUtils, Dialogs, cxControls, uDataTableUtils, DB, uEditorRegistryUtils, schArticulosClient_Intf, uFactuGES_App,
uIEditorArticulos, uIEditorArticulo, uIEditorElegirArticulos, uSistemaFunc, uIEditorArticulos, uIEditorArticulo, uIEditorElegirArticulos, uSistemaFunc,
uDataModuleArticulos, uDataModuleUsuarios, uDAInterfaces, uDataModuleArticulos, uDataModuleUsuarios, uDAInterfaces,
uDateUtils, uROTypes, DateUtils, Controls, Windows; uDateUtils, uROTypes, uROClasses, DateUtils, Controls, Windows, uDAMemDataTable;
{ TArticulosController } { TArticulosController }
@ -600,8 +600,16 @@ begin
end; end;
procedure TArticulosController.RecuperarObjetos(AArticulo: IBizArticulo); procedure TArticulosController.RecuperarObjetos(AArticulo: IBizArticulo);
var
LImagen: IROStream;
begin begin
// if AArticulo.Active
and not AArticulo.EsNuevo then
begin
LImagen := (FDataModule as IDataModuleArticulos).GetImagen(AArticulo.ID);
AArticulo.GetImagen(LImagen);
end;
end; end;
function TArticulosController.EsEliminable(AArticulo: IBizArticulo): Boolean; function TArticulosController.EsEliminable(AArticulo: IBizArticulo): Boolean;

2
Source/Modulos/Articulos/Data/Articulos_data.dproj
View File

@ -54,7 +54,7 @@
<DelphiCompile Include="Articulos_data.dpk"> <DelphiCompile Include="Articulos_data.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="C:\Documents and Settings\Usuario\Articulos_model.dcp" /> <DCCReference Include="$(SystemRoot)\system32\Articulos_model.dcp" />
<DCCReference Include="uDataModuleArticulos.pas"> <DCCReference Include="uDataModuleArticulos.pas">
<Form>DataModuleArticulos</Form> <Form>DataModuleArticulos</Form>
</DCCReference> </DCCReference>

27
Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm
View File

@ -386,4 +386,31 @@ inherited DataModuleArticulos: TDataModuleArticulos
Left = 400 Left = 400
Top = 216 Top = 216
end end
object tbl_GetImagen: TDAMemDataTable
RemoteUpdatesOptions = []
Fields = <
item
Name = 'ID'
DataType = datInteger
ServerAutoRefresh = True
InPrimaryKey = True
end
item
Name = 'IMAGEN'
DataType = datBlob
end>
Params = <>
StreamingOptions = [soDisableEventsWhileStreaming]
RemoteDataAdapter = rda_Articulos
LogicalName = 'GetImagen'
IndexDefs = <>
Left = 232
Top = 248
end
object ds_GetImagen: TDADataSource
DataSet = tbl_GetImagen.Dataset
DataTable = tbl_GetImagen
Left = 232
Top = 192
end
end end

45
Source/Modulos/Articulos/Data/uDataModuleArticulos.pas
View File

@ -6,7 +6,7 @@ uses
SysUtils, Classes, DB, uDADataTable, uDABINAdapter, SysUtils, Classes, DB, uDADataTable, uDABINAdapter,
uDAScriptingProvider, uROWinInetHttpChannel, uROTypes, uDAScriptingProvider, uROWinInetHttpChannel, uROTypes,
uRORemoteService, uROClient, uROBinMessage, uRORemoteService, uROClient, uROBinMessage,
uDADesigntimeCall, uDADesigntimeCall, uROClasses,
uIDataModuleArticulos, uBizArticulos, uDataModuleBase, uDARemoteDataAdapter, uIDataModuleArticulos, uBizArticulos, uDataModuleBase, uDARemoteDataAdapter,
uDADataStreamer, uDABin2DataStreamer, uDAInterfaces, uDAMemDataTable; uDADataStreamer, uDABin2DataStreamer, uDAInterfaces, uDAMemDataTable;
@ -21,6 +21,8 @@ type
ds_ArticulosParaCliente: TDADataSource; ds_ArticulosParaCliente: TDADataSource;
tbl_ArticulosParaCompra: TDAMemDataTable; tbl_ArticulosParaCompra: TDAMemDataTable;
ds_ArticulosParaCompra: TDADataSource; ds_ArticulosParaCompra: TDADataSource;
tbl_GetImagen: TDAMemDataTable;
ds_GetImagen: TDADataSource;
procedure DAClientDataModuleCreate(Sender: TObject); procedure DAClientDataModuleCreate(Sender: TObject);
private private
// function GetItems: IBizArticulo; overload; // function GetItems: IBizArticulo; overload;
@ -35,6 +37,7 @@ type
function NewItem : IBizArticulo; function NewItem : IBizArticulo;
function EliminarImagen(const ID: Integer): Boolean; function EliminarImagen(const ID: Integer): Boolean;
function AnadirImagen(const ID: Integer; const AFileName: String): Boolean; function AnadirImagen(const ID: Integer; const AFileName: String): Boolean;
function GetImagen(const IDArticulo : Integer) : IROStream;
end; end;
implementation implementation
@ -42,8 +45,7 @@ implementation
{$R *.DFM} {$R *.DFM}
uses uses
FactuGES_Intf, uDataModuleConexion, uDataTableUtils, cxControls, FactuGES_Intf, schArticulosClient_Intf, uDataModuleConexion, uDataTableUtils, cxControls;
schArticulosClient_Intf;
{ TdmArticulos } { TdmArticulos }
@ -77,6 +79,43 @@ begin
Result := GetItem(ID_NULO) Result := GetItem(ID_NULO)
end; end;
function TDataModuleArticulos.GetImagen(const IDArticulo: Integer): IROStream;
var
AImagenArticulo : TDAMemDataTable;
Condicion: TDAWhereExpression;
begin
ShowHourglassCursor;
Result := nil;
AImagenArticulo := CloneDataTable(tbl_GetImagen);
try
with AImagenArticulo.DynamicWhere do
begin
// (ID = :ID)
Condicion := NewBinaryExpression(NewField('', fld_ArticulosID), NewConstant(IDArticulo, datInteger), dboEqual);
if IsEmpty then
Expression := Condicion
else
Expression := NewBinaryExpression(Expression, Condicion, dboAnd);
end;
AImagenArticulo.Active := True;
if AImagenArticulo.IsEmpty
or AImagenArticulo.FieldByName(fld_ArticulosIMAGEN).IsNull then
Exit;
Result := NewROStream;
AImagenArticulo.FieldByName(fld_ArticulosIMAGEN).SaveToStream(Result);
Result.Position := 0;
finally
HideHourglassCursor;
end;
end;
function TDataModuleArticulos.GetItem(const ID: Integer; AClienteID: Integer = -1): IBizArticulo; function TDataModuleArticulos.GetItem(const ID: Integer; AClienteID: Integer = -1): IBizArticulo;
var var
Condicion: TDAWhereExpression; Condicion: TDAWhereExpression;

5
Source/Modulos/Articulos/Model/Data/uIDataModuleArticulos.pas
View File

@ -3,7 +3,7 @@ unit uIDataModuleArticulos;
interface interface
uses uses
uBizArticulos; uBizArticulos, uROClasses;
type type
TEnumArticulos = (txArticulo, txProveedor); TEnumArticulos = (txArticulo, txProveedor);
@ -15,7 +15,8 @@ type
function GetItem(const ID : Integer; AClienteID: Integer = -1) : IBizArticulo; function GetItem(const ID : Integer; AClienteID: Integer = -1) : IBizArticulo;
function NewItem : IBizArticulo; function NewItem : IBizArticulo;
function EliminarImagen(const ID: Integer): Boolean; function EliminarImagen(const ID: Integer): Boolean;
function AnadirImagen(const ID: Integer; const AFileName: String): Boolean; function AnadirImagen(const ID: Integer; const AFileName: String): Boolean;
function GetImagen(const IDArticulo : Integer) : IROStream;
end; end;
implementation implementation

183
Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas
View File

@ -9,22 +9,32 @@ const
{ Data table rules ids { Data table rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_ExisteImagen = '{3AD233F0-E79E-4E31-882D-43BAE44A2158}'; RID_GetImagen = '{1643778B-1A19-4B7F-81A7-24D0F1872106}';
RID_Articulos = '{2F0FDE8A-B8A4-46BF-BAF7-046B4AAA8A03}'; RID_ExisteArticulo = '{410B4C21-36C0-4C2D-8D22-5453E38BB10E}';
RID_ArticulosParaCliente = '{195AB374-2B0F-4747-8C7A-B01C0A0793E7}'; RID_Articulos = '{D1F00341-820A-4825-986A-3A7720D95A24}';
RID_ArticulosParaCompra = '{7D256ACD-F7D1-46AF-9451-E43EFEF4DAC2}'; RID_ArticulosParaCliente = '{EE5780D7-F5DD-4987-A837-E242126C522E}';
RID_ArticulosParaCompra = '{4DBDDF0D-0C4E-4CB6-ACD6-B93C64A72750}';
{ Data table names } { Data table names }
nme_ExisteImagen = 'ExisteImagen'; nme_GetImagen = 'GetImagen';
nme_ExisteArticulo = 'ExisteArticulo';
nme_Articulos = 'Articulos'; nme_Articulos = 'Articulos';
nme_ArticulosParaCliente = 'ArticulosParaCliente'; nme_ArticulosParaCliente = 'ArticulosParaCliente';
nme_ArticulosParaCompra = 'ArticulosParaCompra'; nme_ArticulosParaCompra = 'ArticulosParaCompra';
{ ExisteImagen fields } { GetImagen fields }
fld_ExisteImagenID = 'ID'; fld_GetImagenID = 'ID';
fld_GetImagenIMAGEN = 'IMAGEN';
{ ExisteImagen field indexes } { GetImagen field indexes }
idx_ExisteImagenID = 0; idx_GetImagenID = 0;
idx_GetImagenIMAGEN = 1;
{ ExisteArticulo fields }
fld_ExisteArticuloID = 'ID';
{ ExisteArticulo field indexes }
idx_ExisteArticuloID = 0;
{ Articulos fields } { Articulos fields }
fld_ArticulosID = 'ID'; fld_ArticulosID = 'ID';
@ -163,9 +173,56 @@ const
idx_ArticulosParaCompraNOTAS = 20; idx_ArticulosParaCompraNOTAS = 20;
type type
{ IExisteImagen } { IGetImagen }
IExisteImagen = interface(IDAStronglyTypedDataTable) IGetImagen = interface(IDAStronglyTypedDataTable)
['{749AADD1-83B8-48EB-A064-49602BFF17AD}'] ['{67AAA11D-2309-40A0-9481-FB1E9DC90D2F}']
{ Property getters and setters }
function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer);
function GetIDIsNull: Boolean;
procedure SetIDIsNull(const aValue: Boolean);
function GetIMAGENValue: IROStream;
function GetIMAGENIsNull: Boolean;
procedure SetIMAGENIsNull(const aValue: Boolean);
{ Properties }
property ID: Integer read GetIDValue write SetIDValue;
property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull;
property IMAGEN: IROStream read GetIMAGENValue;
property IMAGENIsNull: Boolean read GetIMAGENIsNull write SetIMAGENIsNull;
end;
{ TGetImagenDataTableRules }
TGetImagenDataTableRules = class(TIntfObjectDADataTableRules, IGetImagen)
private
f_IMAGEN: IROStream;
procedure IMAGEN_OnChange(Sender: TObject);
protected
{ Property getters and setters }
function GetIDValue: Integer; virtual;
procedure SetIDValue(const aValue: Integer); virtual;
function GetIDIsNull: Boolean; virtual;
procedure SetIDIsNull(const aValue: Boolean); virtual;
function GetIMAGENValue: IROStream; virtual;
function GetIMAGENIsNull: Boolean; virtual;
procedure SetIMAGENIsNull(const aValue: Boolean); virtual;
{ Properties }
property ID: Integer read GetIDValue write SetIDValue;
property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull;
property IMAGEN: IROStream read GetIMAGENValue;
property IMAGENIsNull: Boolean read GetIMAGENIsNull write SetIMAGENIsNull;
public
constructor Create(aDataTable: TDADataTable); override;
destructor Destroy; override;
end;
{ IExisteArticulo }
IExisteArticulo = interface(IDAStronglyTypedDataTable)
['{F6ECAD42-8537-4AF7-A767-C0B6ABB201A9}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -178,8 +235,8 @@ type
property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull; property IDIsNull: Boolean read GetIDIsNull write SetIDIsNull;
end; end;
{ TExisteImagenDataTableRules } { TExisteArticuloDataTableRules }
TExisteImagenDataTableRules = class(TIntfObjectDADataTableRules, IExisteImagen) TExisteArticuloDataTableRules = class(TIntfObjectDADataTableRules, IExisteArticulo)
private private
protected protected
{ Property getters and setters } { Property getters and setters }
@ -200,7 +257,7 @@ type
{ IArticulos } { IArticulos }
IArticulos = interface(IDAStronglyTypedDataTable) IArticulos = interface(IDAStronglyTypedDataTable)
['{C7114081-6A85-4579-A1BB-1BA1D5A37528}'] ['{6ED77527-1D54-4F5E-8E19-218DF170B9F8}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -475,7 +532,7 @@ type
{ IArticulosParaCliente } { IArticulosParaCliente }
IArticulosParaCliente = interface(IDAStronglyTypedDataTable) IArticulosParaCliente = interface(IDAStronglyTypedDataTable)
['{3879CF1A-00FB-4CD5-A2B4-5AFA21731234}'] ['{1E22D0EE-BE0A-40F6-9013-E4D4E8A95EBF}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -738,7 +795,7 @@ type
{ IArticulosParaCompra } { IArticulosParaCompra }
IArticulosParaCompra = interface(IDAStronglyTypedDataTable) IArticulosParaCompra = interface(IDAStronglyTypedDataTable)
['{9E50D976-2A70-4B10-ABD0-82D86C23BD36}'] ['{15ABBE84-3506-4258-A10F-4C66A4574D1E}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -1015,36 +1072,101 @@ implementation
uses Variants, uROBinaryHelpers; uses Variants, uROBinaryHelpers;
{ TExisteImagenDataTableRules } { TGetImagenDataTableRules }
constructor TExisteImagenDataTableRules.Create(aDataTable: TDADataTable); constructor TGetImagenDataTableRules.Create(aDataTable: TDADataTable);
var
ROStream: TROStream;
begin
inherited;
ROStream := TROStream.Create;
ROStream.OnChange := IMAGEN_OnChange;
f_IMAGEN := ROStream;
end;
destructor TGetImagenDataTableRules.Destroy;
begin begin
inherited; inherited;
end; end;
destructor TExisteImagenDataTableRules.Destroy; procedure TGetImagenDataTableRules.IMAGEN_OnChange(Sender: TObject);
begin begin
inherited; if DataTable.Editing then DataTable.Fields[idx_GetImagenIMAGEN].LoadFromStream(TROStream(Sender));
end; end;
function TExisteImagenDataTableRules.GetIDValue: Integer; function TGetImagenDataTableRules.GetIDValue: Integer;
begin begin
result := DataTable.Fields[idx_ExisteImagenID].AsInteger; result := DataTable.Fields[idx_GetImagenID].AsInteger;
end; end;
procedure TExisteImagenDataTableRules.SetIDValue(const aValue: Integer); procedure TGetImagenDataTableRules.SetIDValue(const aValue: Integer);
begin begin
DataTable.Fields[idx_ExisteImagenID].AsInteger := aValue; DataTable.Fields[idx_GetImagenID].AsInteger := aValue;
end; end;
function TExisteImagenDataTableRules.GetIDIsNull: boolean; function TGetImagenDataTableRules.GetIDIsNull: boolean;
begin begin
result := DataTable.Fields[idx_ExisteImagenID].IsNull; result := DataTable.Fields[idx_GetImagenID].IsNull;
end; end;
procedure TExisteImagenDataTableRules.SetIDIsNull(const aValue: Boolean); procedure TGetImagenDataTableRules.SetIDIsNull(const aValue: Boolean);
begin begin
if aValue then if aValue then
DataTable.Fields[idx_ExisteImagenID].AsVariant := Null; DataTable.Fields[idx_GetImagenID].AsVariant := Null;
end;
function TGetImagenDataTableRules.GetIMAGENValue: IROStream;
begin
result := f_IMAGEN;
result.Position := 0;
if not Result.InUpdateMode then begin
DataTable.Fields[idx_GetImagenIMAGEN].SaveToStream(result);
result.Position := 0;
end;
end;
function TGetImagenDataTableRules.GetIMAGENIsNull: boolean;
begin
result := DataTable.Fields[idx_GetImagenIMAGEN].IsNull;
end;
procedure TGetImagenDataTableRules.SetIMAGENIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_GetImagenIMAGEN].AsVariant := Null;
end;
{ TExisteArticuloDataTableRules }
constructor TExisteArticuloDataTableRules.Create(aDataTable: TDADataTable);
begin
inherited;
end;
destructor TExisteArticuloDataTableRules.Destroy;
begin
inherited;
end;
function TExisteArticuloDataTableRules.GetIDValue: Integer;
begin
result := DataTable.Fields[idx_ExisteArticuloID].AsInteger;
end;
procedure TExisteArticuloDataTableRules.SetIDValue(const aValue: Integer);
begin
DataTable.Fields[idx_ExisteArticuloID].AsInteger := aValue;
end;
function TExisteArticuloDataTableRules.GetIDIsNull: boolean;
begin
result := DataTable.Fields[idx_ExisteArticuloID].IsNull;
end;
procedure TExisteArticuloDataTableRules.SetIDIsNull(const aValue: Boolean);
begin
if aValue then
DataTable.Fields[idx_ExisteArticuloID].AsVariant := Null;
end; end;
@ -2420,7 +2542,8 @@ end;
initialization initialization
RegisterDataTableRules(RID_ExisteImagen, TExisteImagenDataTableRules); RegisterDataTableRules(RID_GetImagen, TGetImagenDataTableRules);
RegisterDataTableRules(RID_ExisteArticulo, TExisteArticuloDataTableRules);
RegisterDataTableRules(RID_Articulos, TArticulosDataTableRules); RegisterDataTableRules(RID_Articulos, TArticulosDataTableRules);
RegisterDataTableRules(RID_ArticulosParaCliente, TArticulosParaClienteDataTableRules); RegisterDataTableRules(RID_ArticulosParaCliente, TArticulosParaClienteDataTableRules);
RegisterDataTableRules(RID_ArticulosParaCompra, TArticulosParaCompraDataTableRules); RegisterDataTableRules(RID_ArticulosParaCompra, TArticulosParaCompraDataTableRules);

193
Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas
View File

@ -9,15 +9,63 @@ const
{ Delta rules ids { Delta rules ids
Feel free to change them to something more human readable Feel free to change them to something more human readable
but make sure they are unique in the context of your application } but make sure they are unique in the context of your application }
RID_ExisteImagenDelta = '{394E1C02-44F5-4370-AB37-58AB68E6F75A}'; RID_GetImagenDelta = '{66673239-89DA-4758-9515-7DEE419F45F1}';
RID_ArticulosDelta = '{3D55AF84-A384-48E7-A570-7D4A14EE4B9D}'; RID_ExisteArticuloDelta = '{4D44B13A-E7DD-46F6-A156-9651821D2D80}';
RID_ArticulosParaClienteDelta = '{A6BBA92D-0313-47A2-9C8C-DC429B161D37}'; RID_ArticulosDelta = '{9AA9B416-A148-452A-AB0F-8E4C7DF45CB0}';
RID_ArticulosParaCompraDelta = '{1CB7CDD3-8EF0-44BA-976B-CF992ABF4D00}'; RID_ArticulosParaClienteDelta = '{5F2B4067-1382-4ABA-BB06-E188BCAFC3B1}';
RID_ArticulosParaCompraDelta = '{62A06201-C13D-4481-9C2B-08D51F539963}';
type type
{ IExisteImagenDelta } { IGetImagenDelta }
IExisteImagenDelta = interface(IExisteImagen) IGetImagenDelta = interface(IGetImagen)
['{394E1C02-44F5-4370-AB37-58AB68E6F75A}'] ['{66673239-89DA-4758-9515-7DEE419F45F1}']
{ Property getters and setters }
function GetOldIDValue : Integer;
function GetOldIMAGENValue : IROStream;
{ Properties }
property OldID : Integer read GetOldIDValue;
property OldIMAGEN : IROStream read GetOldIMAGENValue;
end;
{ TGetImagenBusinessProcessorRules }
TGetImagenBusinessProcessorRules = class(TDABusinessProcessorRules, IGetImagen, IGetImagenDelta)
private
f_IMAGEN: IROStream;
procedure IMAGEN_OnChange(Sender: Tobject);
protected
{ Property getters and setters }
function GetIDValue: Integer; virtual;
function GetIDIsNull: Boolean; virtual;
function GetOldIDValue: Integer; virtual;
function GetOldIDIsNull: Boolean; virtual;
procedure SetIDValue(const aValue: Integer); virtual;
procedure SetIDIsNull(const aValue: Boolean); virtual;
function GetIMAGENValue: IROStream; virtual;
function GetIMAGENIsNull: Boolean; virtual;
function GetOldIMAGENValue: IROStream; virtual;
function GetOldIMAGENIsNull: Boolean; virtual;
procedure SetIMAGENIsNull(const aValue: Boolean); virtual;
{ Properties }
property ID : Integer read GetIDValue write SetIDValue;
property IDIsNull : Boolean read GetIDIsNull write SetIDIsNull;
property OldID : Integer read GetOldIDValue;
property OldIDIsNull : Boolean read GetOldIDIsNull;
property IMAGEN : IROStream read GetIMAGENValue;
property IMAGENIsNull : Boolean read GetIMAGENIsNull write SetIMAGENIsNull;
property OldIMAGEN : IROStream read GetOldIMAGENValue;
property OldIMAGENIsNull : Boolean read GetOldIMAGENIsNull;
public
constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
destructor Destroy; override;
end;
{ IExisteArticuloDelta }
IExisteArticuloDelta = interface(IExisteArticulo)
['{4D44B13A-E7DD-46F6-A156-9651821D2D80}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
@ -25,8 +73,8 @@ type
property OldID : Integer read GetOldIDValue; property OldID : Integer read GetOldIDValue;
end; end;
{ TExisteImagenBusinessProcessorRules } { TExisteArticuloBusinessProcessorRules }
TExisteImagenBusinessProcessorRules = class(TDABusinessProcessorRules, IExisteImagen, IExisteImagenDelta) TExisteArticuloBusinessProcessorRules = class(TDABusinessProcessorRules, IExisteArticulo, IExisteArticuloDelta)
private private
protected protected
{ Property getters and setters } { Property getters and setters }
@ -51,7 +99,7 @@ type
{ IArticulosDelta } { IArticulosDelta }
IArticulosDelta = interface(IArticulos) IArticulosDelta = interface(IArticulos)
['{3D55AF84-A384-48E7-A570-7D4A14EE4B9D}'] ['{9AA9B416-A148-452A-AB0F-8E4C7DF45CB0}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer; function GetOldID_EMPRESAValue : Integer;
@ -326,7 +374,7 @@ type
{ IArticulosParaClienteDelta } { IArticulosParaClienteDelta }
IArticulosParaClienteDelta = interface(IArticulosParaCliente) IArticulosParaClienteDelta = interface(IArticulosParaCliente)
['{A6BBA92D-0313-47A2-9C8C-DC429B161D37}'] ['{5F2B4067-1382-4ABA-BB06-E188BCAFC3B1}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer; function GetOldID_EMPRESAValue : Integer;
@ -589,7 +637,7 @@ type
{ IArticulosParaCompraDelta } { IArticulosParaCompraDelta }
IArticulosParaCompraDelta = interface(IArticulosParaCompra) IArticulosParaCompraDelta = interface(IArticulosParaCompra)
['{1CB7CDD3-8EF0-44BA-976B-CF992ABF4D00}'] ['{62A06201-C13D-4481-9C2B-08D51F539963}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer; function GetOldID_EMPRESAValue : Integer;
@ -867,46 +915,132 @@ implementation
uses uses
Variants, uROBinaryHelpers, uDAInterfaces; Variants, uROBinaryHelpers, uDAInterfaces;
{ TExisteImagenBusinessProcessorRules } { TGetImagenBusinessProcessorRules }
constructor TExisteImagenBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); constructor TGetImagenBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
var
ROStream: TROStream;
begin
inherited;
ROStream := TROStream.Create;
ROStream.OnChange := IMAGEN_OnChange;
f_IMAGEN := ROStream;
end;
destructor TGetImagenBusinessProcessorRules.Destroy;
begin begin
inherited; inherited;
end; end;
destructor TExisteImagenBusinessProcessorRules.Destroy; procedure TGetImagenBusinessProcessorRules.IMAGEN_OnChange(Sender: TObject);
begin begin
inherited; BusinessProcessor.CurrentChange.NewValueByName[fld_GetImagenIMAGEN] := BinaryToBlobVariant((TROStream(Sender) as IROStream).Stream);
end; end;
function TExisteImagenBusinessProcessorRules.GetIDValue: Integer; function TGetImagenBusinessProcessorRules.GetIDValue: Integer;
begin begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_ExisteImagenID]; result := BusinessProcessor.CurrentChange.NewValueByName[fld_GetImagenID];
end; end;
function TExisteImagenBusinessProcessorRules.GetIDIsNull: Boolean; function TGetImagenBusinessProcessorRules.GetIDIsNull: Boolean;
begin begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ExisteImagenID]); result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_GetImagenID]);
end; end;
function TExisteImagenBusinessProcessorRules.GetOldIDValue: Integer; function TGetImagenBusinessProcessorRules.GetOldIDValue: Integer;
begin begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_ExisteImagenID]; result := BusinessProcessor.CurrentChange.OldValueByName[fld_GetImagenID];
end; end;
function TExisteImagenBusinessProcessorRules.GetOldIDIsNull: Boolean; function TGetImagenBusinessProcessorRules.GetOldIDIsNull: Boolean;
begin begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ExisteImagenID]); result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_GetImagenID]);
end; end;
procedure TExisteImagenBusinessProcessorRules.SetIDValue(const aValue: Integer); procedure TGetImagenBusinessProcessorRules.SetIDValue(const aValue: Integer);
begin begin
BusinessProcessor.CurrentChange.NewValueByName[fld_ExisteImagenID] := aValue; BusinessProcessor.CurrentChange.NewValueByName[fld_GetImagenID] := aValue;
end; end;
procedure TExisteImagenBusinessProcessorRules.SetIDIsNull(const aValue: Boolean); procedure TGetImagenBusinessProcessorRules.SetIDIsNull(const aValue: Boolean);
begin begin
if aValue then if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_ExisteImagenID] := Null; BusinessProcessor.CurrentChange.NewValueByName[fld_GetImagenID] := Null;
end;
function TGetImagenBusinessProcessorRules.GetIMAGENValue: IROStream;
begin
result := f_IMAGEN;
result.Position := 0;
if not Result.InUpdateMode then begin
BlobVariantToBinary(BusinessProcessor.CurrentChange.NewValueByName[fld_GetImagenIMAGEN], result.Stream);
result.Position := 0;
end;
end;
function TGetImagenBusinessProcessorRules.GetIMAGENIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_GetImagenIMAGEN]);
end;
function TGetImagenBusinessProcessorRules.GetOldIMAGENValue: IROStream;
begin
result := NewROStream();
BlobVariantToBinary(BusinessProcessor.CurrentChange.OldValueByName[fld_GetImagenIMAGEN], result.Stream);
end;
function TGetImagenBusinessProcessorRules.GetOldIMAGENIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_GetImagenIMAGEN]);
end;
procedure TGetImagenBusinessProcessorRules.SetIMAGENIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_GetImagenIMAGEN] := Null;
end;
{ TExisteArticuloBusinessProcessorRules }
constructor TExisteArticuloBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
begin
inherited;
end;
destructor TExisteArticuloBusinessProcessorRules.Destroy;
begin
inherited;
end;
function TExisteArticuloBusinessProcessorRules.GetIDValue: Integer;
begin
result := BusinessProcessor.CurrentChange.NewValueByName[fld_ExisteArticuloID];
end;
function TExisteArticuloBusinessProcessorRules.GetIDIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ExisteArticuloID]);
end;
function TExisteArticuloBusinessProcessorRules.GetOldIDValue: Integer;
begin
result := BusinessProcessor.CurrentChange.OldValueByName[fld_ExisteArticuloID];
end;
function TExisteArticuloBusinessProcessorRules.GetOldIDIsNull: Boolean;
begin
result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ExisteArticuloID]);
end;
procedure TExisteArticuloBusinessProcessorRules.SetIDValue(const aValue: Integer);
begin
BusinessProcessor.CurrentChange.NewValueByName[fld_ExisteArticuloID] := aValue;
end;
procedure TExisteArticuloBusinessProcessorRules.SetIDIsNull(const aValue: Boolean);
begin
if aValue then
BusinessProcessor.CurrentChange.NewValueByName[fld_ExisteArticuloID] := Null;
end; end;
@ -2905,7 +3039,8 @@ end;
initialization initialization
RegisterBusinessProcessorRules(RID_ExisteImagenDelta, TExisteImagenBusinessProcessorRules); RegisterBusinessProcessorRules(RID_GetImagenDelta, TGetImagenBusinessProcessorRules);
RegisterBusinessProcessorRules(RID_ExisteArticuloDelta, TExisteArticuloBusinessProcessorRules);
RegisterBusinessProcessorRules(RID_ArticulosDelta, TArticulosBusinessProcessorRules); RegisterBusinessProcessorRules(RID_ArticulosDelta, TArticulosBusinessProcessorRules);
RegisterBusinessProcessorRules(RID_ArticulosParaClienteDelta, TArticulosParaClienteBusinessProcessorRules); RegisterBusinessProcessorRules(RID_ArticulosParaClienteDelta, TArticulosParaClienteBusinessProcessorRules);
RegisterBusinessProcessorRules(RID_ArticulosParaCompraDelta, TArticulosParaCompraBusinessProcessorRules); RegisterBusinessProcessorRules(RID_ArticulosParaCompraDelta, TArticulosParaCompraBusinessProcessorRules);

22
Source/Modulos/Articulos/Model/uBizArticulos.pas
View File

@ -3,7 +3,7 @@ unit uBizArticulos;
interface interface
uses uses
uDAInterfaces, uDADataTable, schArticulosClient_Intf, uDBSelectionListUtils; uDAInterfaces, uROClasses, uDADataTable, schArticulosClient_Intf, uDBSelectionListUtils;
const const
BIZ_CLIENT_ARTICULO = 'Client.Articulo'; BIZ_CLIENT_ARTICULO = 'Client.Articulo';
@ -15,6 +15,7 @@ type
function HayImagen: Boolean; function HayImagen: Boolean;
procedure SalvarImagen(const AFileName: String); procedure SalvarImagen(const AFileName: String);
procedure CargarImagen(const AFileName: String); procedure CargarImagen(const AFileName: String);
procedure GetImagen(const AStream: IROStream);
// procedure QuitarImagen; // procedure QuitarImagen;
end; end;
@ -27,6 +28,7 @@ type
function HayImagen: Boolean; function HayImagen: Boolean;
procedure SalvarImagen(const AFileName: String); procedure SalvarImagen(const AFileName: String);
procedure CargarImagen(const AFileName: String); procedure CargarImagen(const AFileName: String);
procedure GetImagen(const AStream: IROStream);
// procedure QuitarImagen; // procedure QuitarImagen;
function EsNuevo : Boolean; function EsNuevo : Boolean;
constructor Create(aDataTable: TDADataTable); override; constructor Create(aDataTable: TDADataTable); override;
@ -38,7 +40,7 @@ type
implementation implementation
uses uses
uFactuGES_App, uDataTableUtils, SysUtils, uROClasses, Classes; uFactuGES_App, Variants, uDataTableUtils, SysUtils, Classes;
{ TBizArticulo } { TBizArticulo }
@ -67,6 +69,22 @@ begin
Result := (ID < 0); Result := (ID < 0);
end; end;
procedure TBizArticulo.GetImagen(const AStream: IROStream);
begin
Self.DataTable.Edit;
if not Assigned(AStream) then
begin
Self.DataTable.FieldByName(fld_ArticulosIMAGEN).AsVariant := NULL;
Self.DataTable.Post;
Exit;
end;
AStream.Position := 0;
Self.DataTable.FieldByName(fld_ArticulosIMAGEN).LoadFromStream(AStream);
Self.DataTable.Post;
AStream.Position := 0
end;
function TBizArticulo.HayImagen: Boolean; function TBizArticulo.HayImagen: Boolean;
var var
AStream : TMemoryStream; AStream : TMemoryStream;

34
Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm
View File

@ -120,6 +120,38 @@ object srvArticulos: TsrvArticulos
DataDictionary = DataDictionary DataDictionary = DataDictionary
Diagrams = Diagrams Diagrams = Diagrams
Datasets = < Datasets = <
item
Params = <>
Statements = <
item
ConnectionType = 'Interbase'
Default = True
Name = 'IBX'
SQL = 'select id, imagen'#10'from articulos'#10'where {where}'#10
StatementType = stSQL
ColumnMappings = <
item
DatasetField = 'IMAGEN'
TableField = 'IMAGEN'
end
item
DatasetField = 'ID'
TableField = 'ID'
end>
end>
Name = 'GetImagen'
Fields = <
item
Name = 'ID'
DataType = datInteger
ServerAutoRefresh = True
InPrimaryKey = True
end
item
Name = 'IMAGEN'
DataType = datBlob
end>
end
item item
Params = < Params = <
item item
@ -140,7 +172,7 @@ object srvArticulos: TsrvArticulos
TableField = 'ID' TableField = 'ID'
end> end>
end> end>
Name = 'ExisteImagen' Name = 'ExisteArticulo'
Fields = < Fields = <
item item
Name = 'ID' Name = 'ID'

3
Source/Modulos/Articulos/Servidor/srvArticulos_Impl.pas
View File

@ -61,7 +61,7 @@ begin
try try
try try
dsData := schArticulos.NewDataset(AConn, 'ExisteImagen', ['ID'], [ID_ARTICULO]); dsData := schArticulos.NewDataset(AConn, 'ExisteArticulo', ['ID'], [ID_ARTICULO]);
dsData.Active := True; dsData.Active := True;
Result := (dsData.FieldValues[0] > 0); Result := (dsData.FieldValues[0] > 0);
AConn.CommitTransaction; AConn.CommitTransaction;
@ -146,6 +146,7 @@ begin
end; end;
end; end;
initialization initialization
TROClassFactory.Create('srvArticulos', Create_srvArticulos, TsrvArticulos_Invoker); TROClassFactory.Create('srvArticulos', Create_srvArticulos, TsrvArticulos_Invoker);

34
Source/Modulos/Articulos/Views/uViewArticulo.dfm
View File

@ -1,6 +1,6 @@
inherited frViewArticulo: TfrViewArticulo inherited frViewArticulo: TfrViewArticulo
Width = 1169 Width = 451
Height = 528 Height = 304
Align = alClient Align = alClient
OnCreate = CustomViewCreate OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy OnDestroy = CustomViewDestroy
@ -10,20 +10,18 @@ inherited frViewArticulo: TfrViewArticulo
object dxLayoutControlArticulo: TdxLayoutControl object dxLayoutControlArticulo: TdxLayoutControl
Left = 0 Left = 0
Top = 0 Top = 0
Width = 1169 Width = 451
Height = 528 Height = 304
Align = alClient Align = alClient
ParentBackground = True ParentBackground = True
TabOrder = 0 TabOrder = 0
TabStop = False TabStop = False
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
ExplicitWidth = 451
ExplicitHeight = 304
DesignSize = ( DesignSize = (
1169 451
528) 304)
object PngSpeedButton2: TPngSpeedButton object PngSpeedButton2: TPngSpeedButton
Left = 1078 Left = 708
Top = 28 Top = 28
Width = 23 Width = 23
Height = 22 Height = 22
@ -50,7 +48,7 @@ inherited frViewArticulo: TfrViewArticulo
PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled] PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
end end
object PngSpeedButton1: TPngSpeedButton object PngSpeedButton1: TPngSpeedButton
Left = 1107 Left = 737
Top = 28 Top = 28
Width = 23 Width = 23
Height = 22 Height = 22
@ -194,22 +192,6 @@ inherited frViewArticulo: TfrViewArticulo
Align = alClient Align = alClient
ExplicitWidth = 656 ExplicitWidth = 656
ExplicitHeight = 277 ExplicitHeight = 277
inherited edtNIFCIF: TcxDBTextEdit
ExplicitWidth = 562
Width = 562
end
inherited edtCalle: TcxDBTextEdit
ExplicitWidth = 562
Width = 562
end
inherited edtPoblacion: TcxDBTextEdit
ExplicitWidth = 177
Width = 177
end
inherited edtProvincia: TcxDBTextEdit
ExplicitWidth = 327
Width = 327
end
inherited edtCodigoPostal: TcxDBTextEdit inherited edtCodigoPostal: TcxDBTextEdit
Left = 564 Left = 564
ExplicitLeft = 564 ExplicitLeft = 564

116
Source/Modulos/Contactos/Views/Contactos_view.dproj
View File

@ -47,63 +47,63 @@
<DelphiCompile Include="Contactos_view.dpk"> <DelphiCompile Include="Contactos_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="$(SystemRoot)\system32\adortl.dcp" /> <DCCReference Include="..\..\..\Servidor\adortl.dcp" />
<DCCReference Include="$(SystemRoot)\system32\ApplicationBase.dcp" /> <DCCReference Include="..\..\..\Servidor\ApplicationBase.dcp" />
<DCCReference Include="$(SystemRoot)\system32\Base.dcp" /> <DCCReference Include="..\..\..\Servidor\Base.dcp" />
<DCCReference Include="$(SystemRoot)\system32\bdertl.dcp" /> <DCCReference Include="..\..\..\Servidor\bdertl.dcp" />
<DCCReference Include="$(SystemRoot)\system32\Contactos_controller.dcp" /> <DCCReference Include="..\..\..\Servidor\Contactos_controller.dcp" />
<DCCReference Include="$(SystemRoot)\system32\Contactos_model.dcp" /> <DCCReference Include="..\..\..\Servidor\Contactos_model.dcp" />
<DCCReference Include="$(SystemRoot)\system32\cxDataD11.dcp" /> <DCCReference Include="..\..\..\Servidor\cxDataD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\cxEditorsD11.dcp" /> <DCCReference Include="..\..\..\Servidor\cxEditorsD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\cxExportD11.dcp" /> <DCCReference Include="..\..\..\Servidor\cxExportD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\cxExtEditorsD11.dcp" /> <DCCReference Include="..\..\..\Servidor\cxExtEditorsD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\cxGridD11.dcp" /> <DCCReference Include="..\..\..\Servidor\cxGridD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\cxLibraryD11.dcp" /> <DCCReference Include="..\..\..\Servidor\cxLibraryD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\cxPageControlD11.dcp" /> <DCCReference Include="..\..\..\Servidor\cxPageControlD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\DataAbstract_Core_D11.dcp" /> <DCCReference Include="..\..\..\Servidor\DataAbstract_Core_D11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dbrtl.dcp" /> <DCCReference Include="..\..\..\Servidor\dbrtl.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dclcxLibraryD11.dcp" /> <DCCReference Include="..\..\..\Servidor\dclcxLibraryD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dcldxCoreD11.dcp" /> <DCCReference Include="..\..\..\Servidor\dcldxCoreD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\designide.dcp" /> <DCCReference Include="..\..\..\Servidor\designide.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dsnap.dcp" /> <DCCReference Include="..\..\..\Servidor\dsnap.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dxComnD11.dcp" /> <DCCReference Include="..\..\..\Servidor\dxComnD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dxCoreD11.dcp" /> <DCCReference Include="..\..\..\Servidor\dxCoreD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dxGDIPlusD11.dcp" /> <DCCReference Include="..\..\..\Servidor\dxGDIPlusD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dxLayoutControlD11.dcp" /> <DCCReference Include="..\..\..\Servidor\dxLayoutControlD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dxPSCoreD11.dcp" /> <DCCReference Include="..\..\..\Servidor\dxPSCoreD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dxPScxCommonD11.dcp" /> <DCCReference Include="..\..\..\Servidor\dxPScxCommonD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dxPScxGrid6LnkD11.dcp" /> <DCCReference Include="..\..\..\Servidor\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dxPSLnksD11.dcp" /> <DCCReference Include="..\..\..\Servidor\dxPSLnksD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\dxThemeD11.dcp" /> <DCCReference Include="..\..\..\Servidor\dxThemeD11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\FormasPago_controller.dcp" /> <DCCReference Include="..\..\..\Servidor\FormasPago_controller.dcp" />
<DCCReference Include="$(SystemRoot)\system32\FormasPago_model.dcp" /> <DCCReference Include="..\..\..\Servidor\FormasPago_model.dcp" />
<DCCReference Include="$(SystemRoot)\system32\GestorInformes_controller.dcp" /> <DCCReference Include="..\..\..\Servidor\GestorInformes_controller.dcp" />
<DCCReference Include="$(SystemRoot)\system32\GUIBase.dcp" /> <DCCReference Include="..\..\..\Servidor\GUIBase.dcp" />
<DCCReference Include="$(SystemRoot)\system32\GUISDK_D11R.dcp" /> <DCCReference Include="..\..\..\Servidor\GUISDK_D11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\Jcl.dcp" /> <DCCReference Include="..\..\..\Servidor\Jcl.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JclVcl.dcp" /> <DCCReference Include="..\..\..\Servidor\JclVcl.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JSDialog100.dcp" /> <DCCReference Include="..\..\..\Servidor\JSDialog100.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JvCoreD11R.dcp" /> <DCCReference Include="..\..\..\Servidor\JvCoreD11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JvCtrlsD11R.dcp" /> <DCCReference Include="..\..\..\Servidor\JvCtrlsD11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JvGlobusD11R.dcp" /> <DCCReference Include="..\..\..\Servidor\JvGlobusD11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JvPageCompsD11R.dcp" /> <DCCReference Include="..\..\..\Servidor\JvPageCompsD11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JvStdCtrlsD11R.dcp" /> <DCCReference Include="..\..\..\Servidor\JvStdCtrlsD11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\JvSystemD11R.dcp" /> <DCCReference Include="..\..\..\Servidor\JvSystemD11R.dcp" />
<DCCReference Include="$(SystemRoot)\system32\PngComponentsD10.dcp" /> <DCCReference Include="..\..\..\Servidor\PngComponentsD10.dcp" />
<DCCReference Include="$(SystemRoot)\system32\PNG_D10.dcp" /> <DCCReference Include="..\..\..\Servidor\PNG_D10.dcp" />
<DCCReference Include="$(SystemRoot)\system32\RemObjects_Core_D11.dcp" /> <DCCReference Include="..\..\..\Servidor\RemObjects_Core_D11.dcp" />
<DCCReference Include="$(SystemRoot)\system32\rtl.dcp" /> <DCCReference Include="..\..\..\Servidor\rtl.dcp" />
<DCCReference Include="$(SystemRoot)\system32\tb2k_d10.dcp" /> <DCCReference Include="..\..\..\Servidor\tb2k_d10.dcp" />
<DCCReference Include="$(SystemRoot)\system32\tbx_d10.dcp" /> <DCCReference Include="..\..\..\Servidor\tbx_d10.dcp" />
<DCCReference Include="$(SystemRoot)\system32\TiposIVA_controller.dcp" /> <DCCReference Include="..\..\..\Servidor\TiposIVA_controller.dcp" />
<DCCReference Include="$(SystemRoot)\system32\TiposIVA_model.dcp" /> <DCCReference Include="..\..\..\Servidor\TiposIVA_model.dcp" />
<DCCReference Include="$(SystemRoot)\system32\vcl.dcp" /> <DCCReference Include="..\..\..\Servidor\vcl.dcp" />
<DCCReference Include="$(SystemRoot)\system32\vclactnband.dcp" /> <DCCReference Include="..\..\..\Servidor\vclactnband.dcp" />
<DCCReference Include="$(SystemRoot)\system32\vcldb.dcp" /> <DCCReference Include="..\..\..\Servidor\vcldb.dcp" />
<DCCReference Include="$(SystemRoot)\system32\vcljpg.dcp" /> <DCCReference Include="..\..\..\Servidor\vcljpg.dcp" />
<DCCReference Include="$(SystemRoot)\system32\vclshlctrls.dcp" /> <DCCReference Include="..\..\..\Servidor\vclshlctrls.dcp" />
<DCCReference Include="$(SystemRoot)\system32\vclx.dcp" /> <DCCReference Include="..\..\..\Servidor\vclx.dcp" />
<DCCReference Include="$(SystemRoot)\system32\xmlrtl.dcp" /> <DCCReference Include="..\..\..\Servidor\xmlrtl.dcp" />
<DCCReference Include="uContactosViewRegister.pas" /> <DCCReference Include="uContactosViewRegister.pas" />
<DCCReference Include="uEditorCliente.pas"> <DCCReference Include="uEditorCliente.pas">
<Form>fEditorCliente</Form> <Form>fEditorCliente</Form>
@ -228,7 +228,7 @@
<DesignClass>TFrame</DesignClass> <DesignClass>TFrame</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="uViewDatosYSeleccionInstalador.pas"> <DCCReference Include="uViewDatosYSeleccionInstalador.pas">
<Form>frViewInstalador</Form> <Form>frViewDatosYSeleccionInstalador</Form>
<DesignClass>TFrame</DesignClass> <DesignClass>TFrame</DesignClass>
</DCCReference> </DCCReference>
<DCCReference Include="uViewDatosYSeleccionProveedor.pas"> <DCCReference Include="uViewDatosYSeleccionProveedor.pas">

16
Source/Modulos/Contratos de cliente/Reports/uRptContratosCliente_Server.dfm
View File

@ -771,6 +771,10 @@ object RptContratosCliente: TRptContratosCliente
item item
DatasetField = 'IMPORTE_NETO' DatasetField = 'IMPORTE_NETO'
TableField = 'IMPORTE_NETO' TableField = 'IMPORTE_NETO'
end
item
DatasetField = 'REFERENCIA_PROVEEDOR'
TableField = 'REFERENCIA_PROVEEDOR'
end> end>
end> end>
Name = 'Informe_Capitulos_Detalles' Name = 'Informe_Capitulos_Detalles'
@ -854,6 +858,11 @@ object RptContratosCliente: TRptContratosCliente
item item
Name = 'VISIBLE' Name = 'VISIBLE'
DataType = datSmallInt DataType = datSmallInt
end
item
Name = 'REFERENCIA_PROVEEDOR'
DataType = datString
Size = 255
end> end>
ReadOnly = True ReadOnly = True
end end
@ -1067,7 +1076,7 @@ object RptContratosCliente: TRptContratosCliente
PrintOptions.Printer = 'Por defecto' PrintOptions.Printer = 'Por defecto'
PrintOptions.PrintOnSheet = 0 PrintOptions.PrintOnSheet = 0
ReportOptions.CreateDate = 39065.872423495400000000 ReportOptions.CreateDate = 39065.872423495400000000
ReportOptions.LastChange = 44397.806315266210000000 ReportOptions.LastChange = 46289.445317986110000000
ScriptLanguage = 'PascalScript' ScriptLanguage = 'PascalScript'
ShowProgress = False ShowProgress = False
StoreInDFM = False StoreInDFM = False
@ -1763,6 +1772,11 @@ object RptContratosCliente: TRptContratosCliente
item item
Name = 'VISIBLE' Name = 'VISIBLE'
DataType = datSmallInt DataType = datSmallInt
end
item
Name = 'REFERENCIA_PROVEEDOR'
DataType = datString
Size = 255
end> end>
Params = < Params = <
item item

69
Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm
View File

@ -80,6 +80,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 1021 Width = 1021
Height = 622 Height = 622
ActivePage = pagContenido
TabOrder = 1 TabOrder = 1
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitTop = 111 ExplicitTop = 111
@ -310,81 +311,95 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 1013 Width = 1013
Height = 24 Height = 24
ButtonWidth = 123
ExplicitWidth = 1013 ExplicitWidth = 1013
ExplicitHeight = 24 ExplicitHeight = 24
inherited ToolButton1: TToolButton
ExplicitWidth = 119
end
inherited ToolButton2: TToolButton
Left = 119
ExplicitWidth = 127
end
inherited ToolButton3: TToolButton
Left = 246
ExplicitWidth = 58
end
inherited ToolButton4: TToolButton inherited ToolButton4: TToolButton
Left = 304
Wrap = False Wrap = False
ExplicitWidth = 57
end end
inherited ToolButton14: TToolButton inherited ToolButton14: TToolButton
Left = 334 Left = 361
Top = 0 Top = 0
ExplicitLeft = 334 ExplicitLeft = 361
ExplicitTop = 0 ExplicitTop = 0
end end
inherited FontName: TJvFontComboBox inherited FontName: TJvFontComboBox
Left = 368 Left = 395
Top = 0 Top = 0
ExplicitLeft = 368 ExplicitLeft = 395
ExplicitTop = 0 ExplicitTop = 0
end end
inherited FontSize: TEdit inherited FontSize: TEdit
Left = 513 Left = 540
Top = 0 Top = 0
ExplicitLeft = 513 ExplicitLeft = 540
ExplicitTop = 0 ExplicitTop = 0
end end
inherited UpDown1: TUpDown inherited UpDown1: TUpDown
Left = 555 Left = 582
Top = 0 Top = 0
ExplicitLeft = 555 ExplicitLeft = 582
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton13: TToolButton inherited ToolButton13: TToolButton
Left = 572 Left = 599
Top = 0 Top = 0
ExplicitLeft = 572 ExplicitLeft = 599
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton6: TToolButton inherited ToolButton6: TToolButton
Left = 580 Left = 607
Top = 0 Top = 0
ExplicitLeft = 580 ExplicitLeft = 607
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton7: TToolButton inherited ToolButton7: TToolButton
Left = 614 Left = 641
Top = 0 Top = 0
ExplicitLeft = 614 ExplicitLeft = 641
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton8: TToolButton inherited ToolButton8: TToolButton
Left = 648 Left = 675
Top = 0 Top = 0
ExplicitLeft = 648 ExplicitLeft = 675
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton12: TToolButton inherited ToolButton12: TToolButton
Left = 682 Left = 709
Top = 0 Top = 0
ExplicitLeft = 682 ExplicitLeft = 709
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton9: TToolButton inherited ToolButton9: TToolButton
Left = 690 Left = 717
Top = 0 Top = 0
ExplicitLeft = 690 ExplicitLeft = 717
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton10: TToolButton inherited ToolButton10: TToolButton
Left = 724 Left = 751
Top = 0 Top = 0
ExplicitLeft = 724 ExplicitLeft = 751
ExplicitTop = 0 ExplicitTop = 0
end end
inherited ToolButton11: TToolButton inherited ToolButton11: TToolButton
Left = 758 Left = 785
Top = 0 Top = 0
ExplicitLeft = 758 ExplicitLeft = 785
ExplicitTop = 0 ExplicitTop = 0
end end
end end
@ -393,8 +408,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
Width = 1013 Width = 1013
Height = 544 Height = 544
ExplicitTop = 50 ExplicitTop = 50
ExplicitWidth = 908 ExplicitWidth = 1013
ExplicitHeight = 411 ExplicitHeight = 544
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
inherited cxGridViewIMPORTENETO: TcxGridDBColumn inherited cxGridViewIMPORTENETO: TcxGridDBColumn
Options.Editing = True Options.Editing = True
@ -405,7 +420,7 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
Top = 24 Top = 24
Width = 1013 Width = 1013
ExplicitTop = 24 ExplicitTop = 24
ExplicitWidth = 908 ExplicitWidth = 1013
inherited TBXToolbar1: TTBXToolbar inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 597 ExplicitWidth = 597
end end

4
Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.dfm
View File

@ -12,8 +12,4 @@ inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor
end end
end end
end end
inherited TBXDock1: TTBXDock
ExplicitTop = 46
ExplicitWidth = 451
end
end end

7
Source/Modulos/Pedidos a proveedor/Views/uViewDetallesPedidoProveedor.pas
View File

@ -23,6 +23,7 @@ type
TfrViewDetallesPedidoProveedor = class(TfrViewDetallesArticulos, IViewDetallesPedidoProveedor) TfrViewDetallesPedidoProveedor = class(TfrViewDetallesArticulos, IViewDetallesPedidoProveedor)
procedure CustomViewDestroy(Sender: TObject); procedure CustomViewDestroy(Sender: TObject);
procedure CustomViewCreate(Sender: TObject);
protected protected
FPedido: IBizPedidoProveedor; FPedido: IBizPedidoProveedor;
function GetPedido: IBizPedidoProveedor; function GetPedido: IBizPedidoProveedor;
@ -50,6 +51,12 @@ begin
else (Controller as IDetallesPedidoProveedorController).AnadirArticulos(Detalles); else (Controller as IDetallesPedidoProveedorController).AnadirArticulos(Detalles);
end; end;
procedure TfrViewDetallesPedidoProveedor.CustomViewCreate(Sender: TObject);
begin
inherited;
cxGridViewREFERENCIA_PROVEEDOR.Properties.OnValidate := Nil;
end;
procedure TfrViewDetallesPedidoProveedor.CustomViewDestroy(Sender: TObject); procedure TfrViewDetallesPedidoProveedor.CustomViewDestroy(Sender: TObject);
begin begin
FPedido := Nil; FPedido := Nil;

16
Source/Modulos/Presupuestos de cliente/Reports/uRptPresupuestosCliente_Server.dfm
View File

@ -628,6 +628,10 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
item item
DatasetField = 'IMPORTE_NETO' DatasetField = 'IMPORTE_NETO'
TableField = 'IMPORTE_NETO' TableField = 'IMPORTE_NETO'
end
item
DatasetField = 'REFERENCIA_PROVEEDOR'
TableField = 'REFERENCIA_PROVEEDOR'
end> end>
end> end>
Name = 'Informe_Capitulos_Detalles' Name = 'Informe_Capitulos_Detalles'
@ -712,6 +716,11 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
item item
Name = 'VISIBLE' Name = 'VISIBLE'
DataType = datSmallInt DataType = datSmallInt
end
item
Name = 'REFERENCIA_PROVEEDOR'
DataType = datString
Size = 255
end> end>
ReadOnly = True ReadOnly = True
end end
@ -926,7 +935,7 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
PrintOptions.Printer = 'Por defecto' PrintOptions.Printer = 'Por defecto'
PrintOptions.PrintOnSheet = 0 PrintOptions.PrintOnSheet = 0
ReportOptions.CreateDate = 39065.872423495400000000 ReportOptions.CreateDate = 39065.872423495400000000
ReportOptions.LastChange = 45462.732395833340000000 ReportOptions.LastChange = 46302.725771307870000000
ScriptLanguage = 'PascalScript' ScriptLanguage = 'PascalScript'
ShowProgress = False ShowProgress = False
StoreInDFM = False StoreInDFM = False
@ -1698,6 +1707,11 @@ object RptPresupuestosCliente: TRptPresupuestosCliente
item item
Name = 'VISIBLE' Name = 'VISIBLE'
DataType = datSmallInt DataType = datSmallInt
end
item
Name = 'REFERENCIA_PROVEEDOR'
DataType = datString
Size = 255
end> end>
Params = < Params = <
item item

373
Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
View File

@ -2,19 +2,19 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Left = 332 Left = 332
Top = 147 Top = 147
Caption = 'Nuevo presupuesto de cliente' Caption = 'Nuevo presupuesto de cliente'
ClientHeight = 801 ClientHeight = 941
ClientWidth = 848 ClientWidth = 1155
OnClose = CustomEditorClose OnClose = CustomEditorClose
ExplicitWidth = 864 ExplicitWidth = 1171
ExplicitHeight = 839 ExplicitHeight = 979
PixelsPerInch = 96 PixelsPerInch = 96
TextHeight = 13 TextHeight = 13
inherited JvNavPanelHeader: TJvNavPanelHeader inherited JvNavPanelHeader: TJvNavPanelHeader
Width = 848 Width = 1155
Caption = 'Nuevo presupuesto de cliente' Caption = 'Nuevo presupuesto de cliente'
ExplicitWidth = 848 ExplicitWidth = 1155
inherited Image1: TImage inherited Image1: TImage
Left = 821 Left = 1128
Picture.Data = { Picture.Data = {
0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800 0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
0000180806000000E0773DF80000000970485973000017120000171201679FD2 0000180806000000E0773DF80000000970485973000017120000171201679FD2
@ -125,17 +125,17 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitLeft = 735 ExplicitLeft = 735
end end
inherited lblDesbloquear: TcxLabel inherited lblDesbloquear: TcxLabel
Left = 723 Left = 1030
Enabled = True Enabled = True
Visible = True Visible = True
ExplicitLeft = 723 ExplicitLeft = 1030
AnchorX = 768 AnchorX = 1075
AnchorY = 14 AnchorY = 14
end end
end end
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Width = 848 Width = 1155
ExplicitWidth = 848 ExplicitWidth = 1155
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
ExplicitWidth = 518 ExplicitWidth = 518
inherited TBXItem2: TTBXItem inherited TBXItem2: TTBXItem
@ -163,7 +163,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end end
end end
inherited tbxMenu: TTBXToolbar inherited tbxMenu: TTBXToolbar
ExplicitWidth = 848 ExplicitWidth = 1155
object TBXSubmenuItem2: TTBXSubmenuItem [4] object TBXSubmenuItem2: TTBXSubmenuItem [4]
Caption = 'A&cciones' Caption = 'A&cciones'
object TBXItem34: TTBXItem object TBXItem34: TTBXItem
@ -173,52 +173,55 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end end
end end
inherited StatusBar: TJvStatusBar inherited StatusBar: TJvStatusBar
Top = 782 Top = 922
Width = 848 Width = 1155
Panels = < Panels = <
item item
Width = 200 Width = 200
end> end>
ExplicitTop = 782 ExplicitTop = 922
ExplicitWidth = 848 ExplicitWidth = 1155
end end
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 842 Width = 1149
Height = 440 Height = 580
ActivePage = pagContenido
TabOrder = 1 TabOrder = 1
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitTop = 111 ExplicitTop = 111
ExplicitWidth = 842 ExplicitWidth = 1149
ExplicitHeight = 440 ExplicitHeight = 580
inherited pagGeneral: TTabSheet inherited pagGeneral: TTabSheet
ExplicitLeft = 4 ExplicitLeft = 4
ExplicitTop = 24 ExplicitTop = 24
ExplicitWidth = 834 ExplicitWidth = 1141
ExplicitHeight = 412 ExplicitHeight = 552
inline frViewPresupuestoCliente1: TfrViewPresupuestoCliente inline frViewPresupuestoCliente1: TfrViewPresupuestoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 834 Width = 1141
Height = 412 Height = 552
Align = alClient Align = alClient
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 834 ExplicitWidth = 1141
ExplicitHeight = 412 ExplicitHeight = 552
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 834 Width = 1141
Height = 412 Height = 552
ExplicitWidth = 834 ExplicitWidth = 1141
ExplicitHeight = 412 ExplicitHeight = 552
inherited edtFechaPresupuesto: TcxDBDateEdit inherited edtFechaPresupuesto: TcxDBDateEdit
ExplicitWidth = 187 ExplicitWidth = 187
Width = 187 Width = 187
end end
inherited memObservaciones: TcxDBMemo inherited memObservaciones: TcxDBMemo
Left = 403 Left = 557
ExplicitLeft = 403 Top = 299
ExplicitLeft = 557
ExplicitTop = 299
ExplicitWidth = 793 ExplicitWidth = 793
ExplicitHeight = 245
Height = 245
Width = 793 Width = 793
end end
inherited eReferencia: TcxDBTextEdit inherited eReferencia: TcxDBTextEdit
@ -230,12 +233,12 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 122 Width = 122
end end
inherited bFormasPago: TButton inherited bFormasPago: TButton
Left = 241 Left = 395
ExplicitLeft = 241 ExplicitLeft = 395
end end
inherited edtFechaDecision: TcxDBDateEdit inherited edtFechaDecision: TcxDBDateEdit
Left = 287 Left = 367
ExplicitLeft = 287 ExplicitLeft = 367
ExplicitWidth = 260 ExplicitWidth = 260
Width = 260 Width = 260
end end
@ -248,23 +251,27 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 260 Width = 260
end end
inherited frViewDatosYSeleccionClientePresupuesto1: TfrViewDatosYSeleccionClientePresupuesto inherited frViewDatosYSeleccionClientePresupuesto1: TfrViewDatosYSeleccionClientePresupuesto
Left = 403 Left = 557
Width = 320 Width = 562
ExplicitLeft = 403 Height = 235
ExplicitWidth = 320 ExplicitLeft = 557
ExplicitWidth = 562
ExplicitHeight = 235
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 320 Width = 562
Height = 235
ExplicitWidth = 320
inherited edtlNombre: TcxDBTextEdit inherited edtlNombre: TcxDBTextEdit
ExplicitWidth = 224 ExplicitWidth = 224
Width = 224 Width = 224
end end
inherited edtNIFCIF: TcxDBTextEdit inherited edtNIFCIF: TcxDBTextEdit
Left = 279 Left = 449
ExplicitLeft = 279 ExplicitLeft = 449
end end
inherited Button3: TBitBtn inherited Button3: TBitBtn
Left = 190 Left = 360
ExplicitLeft = 190 ExplicitLeft = 360
end end
inherited edtPersonaContacto: TcxDBTextEdit inherited edtPersonaContacto: TcxDBTextEdit
ExplicitWidth = 283 ExplicitWidth = 283
@ -275,12 +282,12 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 121 Width = 121
end end
inherited Button4: TButton inherited Button4: TButton
Left = 359 Left = 529
ExplicitLeft = 359 ExplicitLeft = 529
end end
inherited Button5: TButton inherited Button5: TButton
Left = 359 Left = 529
ExplicitLeft = 359 ExplicitLeft = 529
end end
inherited edtTelefonos: TcxTextEdit inherited edtTelefonos: TcxTextEdit
ExplicitWidth = 363 ExplicitWidth = 363
@ -295,8 +302,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 475 Width = 475
end end
inherited memPlazoEntrega: TcxDBMemo inherited memPlazoEntrega: TcxDBMemo
Top = 434 Top = 448
ExplicitTop = 434 ExplicitTop = 448
ExplicitWidth = 396 ExplicitWidth = 396
ExplicitHeight = 100 ExplicitHeight = 100
Height = 100 Height = 100
@ -307,8 +314,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 27 Width = 27
end end
inherited cbTipoPresupuesto: TcxDBComboBox inherited cbTipoPresupuesto: TcxDBComboBox
Left = 282 Left = 365
ExplicitLeft = 282 ExplicitLeft = 365
ExplicitWidth = 186 ExplicitWidth = 186
Width = 186 Width = 186
end end
@ -321,6 +328,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitWidth = 451 ExplicitWidth = 451
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 451 Width = 451
ExplicitWidth = 451
inherited cbTienda: TcxComboBox inherited cbTienda: TcxComboBox
ExplicitWidth = 390 ExplicitWidth = 390
Width = 390 Width = 390
@ -331,6 +339,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitWidth = 111 ExplicitWidth = 111
Width = 111 Width = 111
end end
inherited cbPresupuestador: TcxDBLookupComboBox
ExplicitWidth = 279
Width = 279
end
end end
end end
end end
@ -340,8 +352,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
inline frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente inline frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 834 Width = 1141
Height = 412 Height = 552
Align = alClient Align = alClient
BiDiMode = bdLeftToRight BiDiMode = bdLeftToRight
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -353,102 +365,97 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 834 ExplicitWidth = 1141
ExplicitHeight = 412 ExplicitHeight = 552
inherited ToolBar1: TToolBar inherited ToolBar1: TToolBar
Width = 834 Width = 1141
Height = 46 Height = 24
ExplicitWidth = 834 ExplicitWidth = 1141
ExplicitHeight = 46 ExplicitHeight = 24
inherited ToolButton3: TToolButton
Wrap = False
end
inherited ToolButton4: TToolButton inherited ToolButton4: TToolButton
Left = 278
Top = 0
Wrap = True
ExplicitLeft = 278
ExplicitTop = 0
end
inherited ToolButton14: TToolButton
Left = 0
Wrap = False Wrap = False
ExplicitLeft = 0
end end
inherited FontName: TJvFontComboBox inherited FontName: TJvFontComboBox
Left = 34 Left = 334
Top = 22 Top = 0
ExplicitLeft = 34 ExplicitLeft = 334
ExplicitTop = 22 ExplicitTop = 0
end end
inherited FontSize: TEdit inherited FontSize: TEdit
Left = 179 Left = 479
Top = 22 Top = 0
ExplicitLeft = 179 ExplicitLeft = 479
ExplicitTop = 22 ExplicitTop = 0
end end
inherited UpDown1: TUpDown inherited UpDown1: TUpDown [6]
Left = 349 Left = 697
Top = 22 Top = 0
ExplicitLeft = 349 ExplicitLeft = 697
ExplicitTop = 22 ExplicitTop = 0
end
inherited ToolButton14: TToolButton [7]
Left = 714
Top = 0
Wrap = False
ExplicitLeft = 714
ExplicitTop = 0
end end
inherited ToolButton13: TToolButton inherited ToolButton13: TToolButton
Left = 366 Left = 748
Top = 22 Top = 0
ExplicitLeft = 366 ExplicitLeft = 748
ExplicitTop = 22 ExplicitTop = 0
end end
inherited ToolButton6: TToolButton inherited ToolButton6: TToolButton
Left = 374 Left = 756
Top = 22 Top = 0
ExplicitLeft = 374 ExplicitLeft = 756
ExplicitTop = 22 ExplicitTop = 0
end end
inherited ToolButton7: TToolButton inherited ToolButton7: TToolButton
Left = 408 Left = 790
Top = 22 Top = 0
ExplicitLeft = 408 ExplicitLeft = 790
ExplicitTop = 22 ExplicitTop = 0
end end
inherited ToolButton8: TToolButton inherited ToolButton8: TToolButton
Left = 442 Left = 824
Top = 22 Top = 0
ExplicitLeft = 442 ExplicitLeft = 824
ExplicitTop = 22 ExplicitTop = 0
end end
inherited ToolButton12: TToolButton inherited ToolButton12: TToolButton
Left = 476 Left = 858
Top = 22 Top = 0
ExplicitLeft = 476 ExplicitLeft = 858
ExplicitTop = 22 ExplicitTop = 0
end end
inherited ToolButton9: TToolButton inherited ToolButton9: TToolButton
Left = 484 Left = 866
Top = 22 Top = 0
ExplicitLeft = 484 ExplicitLeft = 866
ExplicitTop = 22 ExplicitTop = 0
end end
inherited ToolButton10: TToolButton inherited ToolButton10: TToolButton
Left = 518 Left = 900
Top = 22 Top = 0
ExplicitLeft = 518 ExplicitLeft = 900
ExplicitTop = 22 ExplicitTop = 0
end end
inherited ToolButton11: TToolButton inherited ToolButton11: TToolButton
Left = 552 Left = 934
Top = 22 Top = 0
ExplicitLeft = 552 ExplicitLeft = 934
ExplicitTop = 22 ExplicitTop = 0
end end
end end
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Top = 72 Top = 50
Width = 834 Width = 1141
Height = 340 Height = 502
ExplicitTop = 72 ExplicitTop = 50
ExplicitWidth = 834 ExplicitWidth = 1141
ExplicitHeight = 340 ExplicitHeight = 502
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
inherited cxGridViewVISIBLE2: TcxGridDBColumn inherited cxGridViewVISIBLE2: TcxGridDBColumn
Width = 29 Width = 29
@ -489,10 +496,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end end
end end
inherited TBXDock1: TTBXDock inherited TBXDock1: TTBXDock
Top = 46 Top = 24
Width = 834 Width = 1141
ExplicitTop = 46 ExplicitTop = 24
ExplicitWidth = 834 ExplicitWidth = 1141
inherited TBXToolbar1: TTBXToolbar inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 806 ExplicitWidth = 806
end end
@ -521,8 +528,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
object dxLayoutControl1: TdxLayoutControl object dxLayoutControl1: TdxLayoutControl
Left = 0 Left = 0
Top = 0 Top = 0
Width = 834 Width = 1141
Height = 412 Height = 552
Align = alClient Align = alClient
TabOrder = 0 TabOrder = 0
TabStop = False TabStop = False
@ -568,8 +575,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
inline frViewIncidenciasCli: TfrViewIncidencias inline frViewIncidenciasCli: TfrViewIncidencias
Left = 0 Left = 0
Top = 0 Top = 0
Width = 834 Width = 1141
Height = 412 Height = 552
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -579,25 +586,25 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 834 ExplicitWidth = 1141
ExplicitHeight = 412 ExplicitHeight = 552
inherited pnlSup: TPanel inherited pnlSup: TPanel
Width = 834 Width = 1141
ExplicitWidth = 834 ExplicitWidth = 834
inherited eIncidenciaActiva: TcxDBCheckBox inherited eIncidenciaActiva: TcxDBCheckBox
ExplicitHeight = 21 ExplicitHeight = 21
end end
end end
inherited GroupBox1: TGroupBox inherited GroupBox1: TGroupBox
Width = 834 Width = 1141
Height = 384 Height = 524
ExplicitWidth = 834 ExplicitWidth = 1141
ExplicitHeight = 384 ExplicitHeight = 524
inherited eIncidencias: TcxDBMemo inherited eIncidencias: TcxDBMemo
ExplicitWidth = 830 ExplicitWidth = 1137
ExplicitHeight = 367 ExplicitHeight = 507
Height = 367 Height = 507
Width = 830 Width = 1137
end end
end end
end end
@ -609,8 +616,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
inline frViewDocumentosPresupuestoCliente1: TfrViewDocumentosPresupuestoCliente inline frViewDocumentosPresupuestoCliente1: TfrViewDocumentosPresupuestoCliente
Left = 0 Left = 0
Top = 0 Top = 0
Width = 834 Width = 1141
Height = 412 Height = 552
Align = alClient Align = alClient
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText Font.Color = clWindowText
@ -620,15 +627,15 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ParentFont = False ParentFont = False
TabOrder = 0 TabOrder = 0
ReadOnly = False ReadOnly = False
ExplicitWidth = 834 ExplicitWidth = 1141
ExplicitHeight = 412 ExplicitHeight = 552
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Width = 834 Width = 1141
ExplicitWidth = 834 ExplicitWidth = 834
end end
inherited ListView1: TListView inherited ListView1: TListView
Width = 834 Width = 1141
Height = 387 Height = 527
ExplicitTop = 25 ExplicitTop = 25
ExplicitWidth = 834 ExplicitWidth = 834
ExplicitHeight = 387 ExplicitHeight = 387
@ -641,18 +648,18 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
end end
end end
inherited PnlComentario: TPanel inherited PnlComentario: TPanel
Width = 848 Width = 1155
ExplicitTop = 78 ExplicitTop = 78
ExplicitWidth = 848 ExplicitWidth = 1155
inherited lbComentario: TLabel inherited lbComentario: TLabel
Width = 838 Width = 1145
Height = 25 Height = 25
end end
end end
inline frViewTotales1: TfrViewTotalesPresupuesto [5] inline frViewTotales1: TfrViewTotalesPresupuesto [5]
Left = 0 Left = 0
Top = 554 Top = 694
Width = 848 Width = 1155
Height = 228 Height = 228
Align = alBottom Align = alBottom
Font.Charset = DEFAULT_CHARSET Font.Charset = DEFAULT_CHARSET
@ -663,26 +670,26 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ParentFont = False ParentFont = False
TabOrder = 5 TabOrder = 5
ReadOnly = False ReadOnly = False
ExplicitTop = 554 ExplicitTop = 694
ExplicitWidth = 848 ExplicitWidth = 1155
ExplicitHeight = 228 ExplicitHeight = 228
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 848 Width = 1155
LookAndFeel = dxLayoutOfficeLookAndFeel1 LookAndFeel = dxLayoutOfficeLookAndFeel1
ExplicitWidth = 848 ExplicitWidth = 1155
inherited Bevel3: TBevel inherited Bevel3: TBevel
Left = 352 Left = 473
Top = 57 Top = 57
Height = 122 Height = 122
ExplicitLeft = 352 ExplicitLeft = 473
ExplicitTop = 57 ExplicitTop = 57
ExplicitHeight = 122 ExplicitHeight = 122
end end
inherited Bevel4: TBevel inherited Bevel4: TBevel
Left = 464 Left = 585
Top = 88 Top = 88
Width = 342 Width = 342
ExplicitLeft = 464 ExplicitLeft = 585
ExplicitTop = 88 ExplicitTop = 88
ExplicitWidth = 342 ExplicitWidth = 342
end end
@ -694,19 +701,19 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 93 Width = 93
end end
inherited ImporteIVA: TcxDBCurrencyEdit inherited ImporteIVA: TcxDBCurrencyEdit
Left = 535 Left = 656
Top = 108 Top = 108
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 535 ExplicitLeft = 656
ExplicitTop = 108 ExplicitTop = 108
ExplicitWidth = 137 ExplicitWidth = 137
Width = 137 Width = 137
end end
inherited ImporteTotal: TcxDBCurrencyEdit inherited ImporteTotal: TcxDBCurrencyEdit
Left = 465 Left = 586
Top = 189 Top = 189
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 465 ExplicitLeft = 586
ExplicitTop = 189 ExplicitTop = 189
ExplicitWidth = 137 ExplicitWidth = 137
Width = 137 Width = 137
@ -717,33 +724,33 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
ExplicitTop = 84 ExplicitTop = 84
end end
inherited edtIVA: TcxDBSpinEdit inherited edtIVA: TcxDBSpinEdit
Left = 464 Left = 585
Top = 108 Top = 108
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 464 ExplicitLeft = 585
ExplicitTop = 108 ExplicitTop = 108
end end
inherited ImporteBase: TcxDBCurrencyEdit inherited ImporteBase: TcxDBCurrencyEdit
Left = 464 Left = 585
Top = 57 Top = 57
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 464 ExplicitLeft = 585
ExplicitTop = 57 ExplicitTop = 57
ExplicitWidth = 92 ExplicitWidth = 92
Width = 92 Width = 92
end end
inherited edtRE: TcxDBSpinEdit inherited edtRE: TcxDBSpinEdit
Left = 464 Left = 585
Top = 162 Top = 162
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 464 ExplicitLeft = 585
ExplicitTop = 162 ExplicitTop = 162
end end
inherited ImporteRE: TcxDBCurrencyEdit inherited ImporteRE: TcxDBCurrencyEdit
Left = 535 Left = 656
Top = 162 Top = 162
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 535 ExplicitLeft = 656
ExplicitTop = 162 ExplicitTop = 162
ExplicitWidth = 56 ExplicitWidth = 56
Width = 56 Width = 56
@ -769,10 +776,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 81 Width = 81
end end
inherited bTiposIVA: TButton inherited bTiposIVA: TButton
Left = 204 Left = 325
Top = 138 Top = 138
OnClick = frViewTotales1bTiposIVAClick OnClick = frViewTotales1bTiposIVAClick
ExplicitLeft = 204 ExplicitLeft = 325
ExplicitTop = 138 ExplicitTop = 138
end end
inherited cbRecargoEquivalencia: TcxDBCheckBox inherited cbRecargoEquivalencia: TcxDBCheckBox
@ -790,17 +797,17 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
Width = 455 Width = 455
end end
inherited edtIRPF: TcxDBSpinEdit inherited edtIRPF: TcxDBSpinEdit
Left = 464 Left = 585
Top = 135 Top = 135
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 464 ExplicitLeft = 585
ExplicitTop = 135 ExplicitTop = 135
end end
inherited ImporteIRPF: TcxDBCurrencyEdit inherited ImporteIRPF: TcxDBCurrencyEdit
Left = 535 Left = 656
Top = 135 Top = 135
Style.IsFontAssigned = True Style.IsFontAssigned = True
ExplicitLeft = 535 ExplicitLeft = 656
ExplicitTop = 135 ExplicitTop = 135
ExplicitWidth = 216 ExplicitWidth = 216
Width = 216 Width = 216

2
Source/Modulos/Presupuestos de cliente/Views/uViewDatosYSeleccionClientePresupuesto.dfm
View File

@ -382,7 +382,7 @@ inherited frViewDatosYSeleccionClientePresupuesto: TfrViewDatosYSeleccionCliente
AutoAligns = [] AutoAligns = []
AlignHorz = ahClient AlignHorz = ahClient
AlignVert = avCenter AlignVert = avCenter
Caption = 'Contacto:' Caption = 'A/A:'
Control = edtPersonaContacto Control = edtPersonaContacto
ControlOptions.ShowBorder = False ControlOptions.ShowBorder = False
end end

2
Source/Modulos/Presupuestos de cliente/Views/uViewDatosYSeleccionClientePresupuesto.pas
View File

@ -278,7 +278,7 @@ begin
end; end;
//Siempre asignaremos la persona de contacto ya sea de las direcciones del contacto o la ID_Direccion=0 que es la principal de la ficha //Siempre asignaremos la persona de contacto ya sea de las direcciones del contacto o la ID_Direccion=0 que es la principal de la ficha
FPresupuesto.PERSONA_CONTACTO := FDireccion.PERSONA_CONTACTO; FPresupuesto.PERSONA_CONTACTO := FDireccion.NOMBRE;
EscribirTextoDireccion; EscribirTextoDireccion;
end; end;
end; end;

55
Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestoCliente.dfm
View File

@ -1,23 +1,23 @@
inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Width = 895 Width = 1235
Height = 555 Height = 722
OnCreate = CustomViewCreate OnCreate = CustomViewCreate
OnDestroy = CustomViewDestroy OnDestroy = CustomViewDestroy
ExplicitWidth = 895 ExplicitWidth = 1235
ExplicitHeight = 555 ExplicitHeight = 722
object dxLayoutControl1: TdxLayoutControl object dxLayoutControl1: TdxLayoutControl
Left = 0 Left = 0
Top = 0 Top = 0
Width = 895 Width = 1235
Height = 555 Height = 722
Align = alClient Align = alClient
ParentBackground = True ParentBackground = True
TabOrder = 0 TabOrder = 0
TabStop = False TabStop = False
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
DesignSize = ( DesignSize = (
895 1235
555) 722)
object edtFechaPresupuesto: TcxDBDateEdit object edtFechaPresupuesto: TcxDBDateEdit
Left = 131 Left = 131
Top = 82 Top = 82
@ -42,7 +42,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Width = 187 Width = 187
end end
object memObservaciones: TcxDBMemo object memObservaciones: TcxDBMemo
Left = 440 Left = 678
Top = 288 Top = 288
Anchors = [akLeft, akTop, akRight, akBottom] Anchors = [akLeft, akTop, akRight, akBottom]
DataBinding.DataField = 'OBSERVACIONES' DataBinding.DataField = 'OBSERVACIONES'
@ -60,8 +60,8 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.Kind = lfStandard
StyleHot.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True
TabOrder = 16 TabOrder = 16
Height = 245 Height = 400
Width = 793 Width = 611
end end
object eReferencia: TcxDBTextEdit object eReferencia: TcxDBTextEdit
Left = 131 Left = 131
@ -119,7 +119,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Width = 122 Width = 122
end end
object bFormasPago: TButton object bFormasPago: TButton
Left = 278 Left = 516
Top = 190 Top = 190
Width = 132 Width = 132
Height = 21 Height = 21
@ -128,7 +128,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
OnClick = bFormasPagoClick OnClick = bFormasPagoClick
end end
object edtFechaDecision: TcxDBDateEdit object edtFechaDecision: TcxDBDateEdit
Left = 306 Left = 430
Top = 136 Top = 136
Anchors = [akLeft, akTop, akRight] Anchors = [akLeft, akTop, akRight]
DataBinding.DataField = 'FECHA_DECISION' DataBinding.DataField = 'FECHA_DECISION'
@ -211,7 +211,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Width = 260 Width = 260
end end
inline frViewDatosYSeleccionClientePresupuesto1: TfrViewDatosYSeleccionClientePresupuesto inline frViewDatosYSeleccionClientePresupuesto1: TfrViewDatosYSeleccionClientePresupuesto
Left = 440 Left = 678
Top = 28 Top = 28
Width = 320 Width = 320
Height = 224 Height = 224
@ -223,26 +223,26 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
ParentFont = False ParentFont = False
TabOrder = 15 TabOrder = 15
ReadOnly = False ReadOnly = False
ExplicitLeft = 440 ExplicitLeft = 678
ExplicitTop = 28 ExplicitTop = 28
ExplicitWidth = 320 ExplicitWidth = 320
ExplicitHeight = 224 ExplicitHeight = 224
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 320 Width = 320
Height = 224 Height = 224
ExplicitWidth = 320 ExplicitWidth = 611
ExplicitHeight = 224 ExplicitHeight = 224
inherited edtlNombre: TcxDBTextEdit inherited edtlNombre: TcxDBTextEdit
ExplicitWidth = 224 ExplicitWidth = 224
Width = 224 Width = 224
end end
inherited edtNIFCIF: TcxDBTextEdit inherited edtNIFCIF: TcxDBTextEdit
Left = 320 Left = 422
ExplicitLeft = 320 ExplicitLeft = 422
end end
inherited Button3: TBitBtn inherited Button3: TBitBtn
Left = 231 Left = 333
ExplicitLeft = 231 ExplicitLeft = 333
end end
inherited edtPersonaContacto: TcxDBTextEdit inherited edtPersonaContacto: TcxDBTextEdit
ExplicitWidth = 283 ExplicitWidth = 283
@ -253,12 +253,12 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Width = 121 Width = 121
end end
inherited Button4: TButton inherited Button4: TButton
Left = 400 Left = 502
ExplicitLeft = 400 ExplicitLeft = 502
end end
inherited Button5: TButton inherited Button5: TButton
Left = 400 Left = 502
ExplicitLeft = 400 ExplicitLeft = 502
end end
inherited edtTelefonos: TcxTextEdit inherited edtTelefonos: TcxTextEdit
ExplicitWidth = 363 ExplicitWidth = 363
@ -290,7 +290,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
end end
object memPlazoEntrega: TcxDBMemo object memPlazoEntrega: TcxDBMemo
Left = 22 Left = 22
Top = 449 Top = 510
Anchors = [akLeft, akTop, akRight, akBottom] Anchors = [akLeft, akTop, akRight, akBottom]
DataBinding.DataField = 'PLAZO_ENTREGA' DataBinding.DataField = 'PLAZO_ENTREGA'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -341,7 +341,7 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
Width = 27 Width = 27
end end
object cbTipoPresupuesto: TcxDBComboBox object cbTipoPresupuesto: TcxDBComboBox
Left = 302 Left = 430
Top = 82 Top = 82
DataBinding.DataField = 'TIPO_PRESUPUESTO' DataBinding.DataField = 'TIPO_PRESUPUESTO'
DataBinding.DataSource = DADataSource DataBinding.DataSource = DADataSource
@ -391,6 +391,9 @@ inherited frViewPresupuestoCliente: TfrViewPresupuestoCliente
ReadOnly = False ReadOnly = False
ExplicitLeft = 22 ExplicitLeft = 22
ExplicitTop = 301 ExplicitTop = 301
inherited dxLayoutControl1: TdxLayoutControl
ExplicitWidth = 550
end
end end
object edtFechaUltRevision: TcxDBDateEdit object edtFechaUltRevision: TcxDBDateEdit
Left = 131 Left = 131

2
Source/Modulos/Relaciones/Contratos de cliente - Pedidos de proveedor/uGenerarPedidosProvUtils.pas
View File

@ -125,7 +125,7 @@ begin
begin begin
ADetallesController.Add(ADetalles, AArticulos.TIPO_DETALLE); ADetallesController.Add(ADetalles, AArticulos.TIPO_DETALLE);
ADetalles.Edit; ADetalles.Edit;
// ADetalles.REFERENCIA := AArticulos.REFERENCIA; ADetalles.REFERENCIA_PROVEEDOR := AArticulos.REFERENCIA_PROVEEDOR;
ADetalles.ID_ARTICULO := AArticulos.ID_ARTICULO; ADetalles.ID_ARTICULO := AArticulos.ID_ARTICULO;
if (AArticulos.PROPIEDAD <> '') then if (AArticulos.PROPIEDAD <> '') then
ADetalles.CONCEPTO := AArticulos.PROPIEDAD + ': '+ AArticulos.CONCEPTO ADetalles.CONCEPTO := AArticulos.PROPIEDAD + ': '+ AArticulos.CONCEPTO

6
Source/Servidor/FactuGES_Server.dpr
View File

@ -126,8 +126,6 @@ uses
schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas', schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas',
schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas', schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas',
schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas', schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas',
schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas',
schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas',
schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas', schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas',
schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas', schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas',
schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas', schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas',
@ -139,7 +137,9 @@ uses
schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas', schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas',
schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas', schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas',
schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas', schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas'; schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas',
schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas';
{$R *.res} {$R *.res}
{$R ..\Servicios\RODLFile.res} {$R ..\Servicios\RODLFile.res}

2
Source/Servidor/FactuGES_Server.dproj
View File

@ -28,7 +28,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><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">5</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">7</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">5.2.7.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">5.2.7.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 23 de abril de 2026 18:15</VersionInfoKeys></VersionInfoKeys><Excluded_Packages> <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">5</VersionInfo><VersionInfo Name="MinorVer">2</VersionInfo><VersionInfo Name="Release">8</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">5.2.8.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">5.2.8.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 07 de octubre de 2026 17:28</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages> <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject> </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
</ProjectExtensions> </ProjectExtensions>