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

- Repaso de pedidos de proveedor: elección de dirección de entrega (almacén / direccion de cliente / otra dirección)

Browse Source 
- Build de FinalBuilder con opción 'Release' para intentar que el programa vaya más rápido.

git-svn-id: https://192.168.0.254/svn/Proyectos.Acana_FactuGES2/trunk@652 f4e31baf-9722-1c47-927c-6f952f962d4b
This commit is contained in:
David Arranz 2016-09-12 17:36:53 +00:00
parent 3877d4b360
commit 00077c4227
42 changed files with 546 additions and 386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Build/Build.fbpInf
View File

@ -14,8 +14,8 @@
<Notes> <Notes>
<![CDATA[]]> <![CDATA[]]>
</Notes> </Notes>
<LastBuildRun>00:02:33</LastBuildRun> <LastBuildRun>00:03:22</LastBuildRun>
<LastBuildStart>13/01/2015 11:30:18</LastBuildStart> <LastBuildStart>09/09/2016 18:07:38</LastBuildStart>
<LastBuildState>False</LastBuildState> <LastBuildState>False</LastBuildState>
</properties> </properties>
</project> </project>

BIN
Build/Build.fbz6
View File

Binary file not shown.

21
Build/Build.release.fbpInf Normal file
View File

@ -0,0 +1,21 @@
<project ServerProjectName="">
<watches/>
<collapsedNodes></collapsedNodes>
<breakpoints></breakpoints>
<actions/>
<propertysets/>
<variables>
<project_path>
<![CDATA[C:\Codigo Acana]]>
</project_path>
</variables>
<properties>
<Author></Author>
<Notes>
<![CDATA[]]>
</Notes>
<LastBuildRun>00:00:03</LastBuildRun>
<LastBuildStart>12/09/2016 11:17:57</LastBuildStart>
<LastBuildState>False</LastBuildState>
</properties>
</project>

BIN
Build/Build.release.fbz6 Normal file
View File

Binary file not shown.

BIN
Database/ACANA.FDB
View File

Binary file not shown.

103
Source/Base/Base.dproj
View File

@ -44,13 +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>
@ -65,55 +58,55 @@
<DelphiCompile Include="Base.dpk"> <DelphiCompile Include="Base.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Modulos\Contratos de cliente\adortl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxDataD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxExtEditorsD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxGridD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxLibraryD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\cxPageControlD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\DataAbstract_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dbrtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dclIndyCore.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\designide.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dsnap.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxPSCoreD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\dxThemeD11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\GUISDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\IndyCore.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\IndyProtocols.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\IndySystem.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\Jcl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JclVcl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JSDialog100.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvCmpD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvCoreD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvDlgsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvMMD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvNetD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvPageCompsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvStdCtrlsD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\JvSystemD11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\pckMD5.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\pckUCDataConnector.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\pckUserControl_RT.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\PluginSDK_D11R.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\PngComponentsD10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\PNG_D10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\RemObjects_Core_D11.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\rtl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\TB2k_D10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\tbx_d10.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcl.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vclactnband.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcldb.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vcljpg.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\VclSmp.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\vclx.dcp" />
<DCCReference Include="..\Modulos\Contratos de cliente\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\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>

1
Source/Cliente/FactuGES.dpr
View File

@ -1,7 +1,6 @@
program FactuGES; program FactuGES;
uses uses
ExceptionLog,
Forms, Forms,
Windows, Windows,
SysUtils, SysUtils,

10
Source/Cliente/FactuGES.dproj
View File

@ -43,7 +43,7 @@
<DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ResourcePath> <DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ResourcePath>
<DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ObjPath> <DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_ObjPath>
<DCC_IncludePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_IncludePath> <DCC_IncludePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib</DCC_IncludePath>
<DCC_Define>DEBUG;EUREKALOG;EUREKALOG_VER6</DCC_Define> <DCC_Define>DEBUG;</DCC_Define>
<DCC_DebugInfoInExe>True</DCC_DebugInfoInExe> <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
<DCC_DebugVN>True</DCC_DebugVN> <DCC_DebugVN>True</DCC_DebugVN>
<DCC_MapFile>3</DCC_MapFile> <DCC_MapFile>3</DCC_MapFile>
@ -52,7 +52,9 @@
<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">2</VersionInfo><VersionInfo Name="MinorVer">7</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">2.7.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">2.7.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">2</VersionInfo><VersionInfo Name="MinorVer">7</VersionInfo><VersionInfo Name="Release">9</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">2.7.9.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">2.7.9.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>
@ -81,7 +83,7 @@
<!-- EurekaLog First Line <!-- EurekaLog First Line
[Exception Log] [Exception Log]
EurekaLog Version=6006 EurekaLog Version=6006
Activate=1 Activate=0
Activate Handle=1 Activate Handle=1
Save Log File=1 Save Log File=1
Foreground Tab=0 Foreground Tab=0
@ -199,7 +201,7 @@ soNetDNS1=1
soNetDNS2=1 soNetDNS2=1
soNetDHCP=1 soNetDHCP=1
soCustomData=1 soCustomData=1
sndShowSendDialog=1 sndShowSendDialog=0
sndShowSuccessFailureMsg=0 sndShowSuccessFailureMsg=0
sndSendEntireLog=1 sndSendEntireLog=1
sndSendXMLLogCopy=0 sndSendXMLLogCopy=0

8
Source/Cliente/FactuGES.rc
View File

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

BIN
Source/Cliente/FactuGES.res
View File

Binary file not shown.

56
Source/GUIBase/GUIBase.dproj
View File

@ -58,34 +58,34 @@
<DelphiCompile Include="GUIBase.dpk"> <DelphiCompile Include="GUIBase.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\Base.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\ccpackD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\ccpackD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\cxDataD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\cxEditorsD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\cxExportD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\cxLibraryD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dbrtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxGDIPlusD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxLayoutControlD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxPScxCommonD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGrid6LnkD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxPScxGrid6LnkD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\dxThemeD11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\frx11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\frx11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\frxe11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\frxe11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\fs11.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\fs11.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvAppFrmD11R.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\JvAppFrmD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\JvCtrlsD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\JvGlobusD11R.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\PngComponentsD10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\PNG_D10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\rtl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\tb2k_d10.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\tb2k_d10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\tbx_d10.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\vcl.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\vclactnband.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\vcldb.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\vcljpg.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" /> <DCCReference Include="..\Modulos\Pedidos a proveedor\vclx.dcp" />
<DCCReference Include="uDialogBase.pas"> <DCCReference Include="uDialogBase.pas">
<Form>fDialogBase</Form> <Form>fDialogBase</Form>
</DCCReference> </DCCReference>

9
Source/Modulos/Articulos/Controller/uControllerDetallesArticulos.pas
View File

@ -361,8 +361,13 @@ begin
if Assigned(AArticulos) then if Assigned(AArticulos) then
begin begin
ADetalles.DataTable.FieldByName(CAMPO_ID_ARTICULOS).AsVariant := AArticulos.ID; ADetalles.DataTable.FieldByName(CAMPO_ID_ARTICULOS).AsVariant := AArticulos.ID;
ADetalles.DataTable.FieldByName(CAMPO_REFERENCIA).AsVariant := AArticulos.REFERENCIA;
ADetalles.DataTable.FieldByName(CAMPO_REFERENCIA_PROVEEDOR).AsVariant := AArticulos.REFERENCIA_PROV; if Assigned(ADetalles.DataTable.FindField(CAMPO_REFERENCIA)) then
ADetalles.DataTable.FieldByName(CAMPO_REFERENCIA).AsVariant := AArticulos.REFERENCIA;
if Assigned(ADetalles.DataTable.FindField(CAMPO_REFERENCIA_PROVEEDOR)) then
ADetalles.DataTable.FieldByName(CAMPO_REFERENCIA_PROVEEDOR).AsVariant := AArticulos.REFERENCIA_PROV;
ADetalles.DataTable.FieldByName(CAMPO_CONCEPTO).AsVariant := AArticulos.DESCRIPCION; ADetalles.DataTable.FieldByName(CAMPO_CONCEPTO).AsVariant := AArticulos.DESCRIPCION;
end; end;
end; end;

10
Source/Modulos/Articulos/Views/Articulos_view.dproj
View File

@ -55,11 +55,11 @@
<DelphiCompile Include="Articulos_view.dpk"> <DelphiCompile Include="Articulos_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="C:\Documents and Settings\Usuario\Articulos_controller.dcp" /> <DCCReference Include="..\..\..\Servidor\Articulos_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Articulos_model.dcp" /> <DCCReference Include="..\..\..\Servidor\Articulos_model.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_view.dcp" /> <DCCReference Include="..\..\..\Servidor\Contactos_view.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\Familias_controller.dcp" /> <DCCReference Include="..\..\..\Servidor\Familias_controller.dcp" />
<DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" /> <DCCReference Include="..\..\..\Servidor\GUIBase.dcp" />
<DCCReference Include="uArticulosViewRegister.pas" /> <DCCReference Include="uArticulosViewRegister.pas" />
<DCCReference Include="uEditorArticulo.pas"> <DCCReference Include="uEditorArticulo.pas">
<Form>fEditorArticulo</Form> <Form>fEditorArticulo</Form>

23
Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm
View File

@ -20,14 +20,15 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos
inherited TBXDock: TTBXDock inherited TBXDock: TTBXDock
Top = 91 Top = 91
Width = 656 Width = 656
Height = 49 Height = 60
ExplicitTop = 91 ExplicitTop = 91
ExplicitWidth = 656 ExplicitWidth = 656
ExplicitHeight = 49 ExplicitHeight = 60
inherited tbxMain: TTBXToolbar inherited tbxMain: TTBXToolbar
Align = alLeft Align = alLeft
DockPos = -6 DockPos = -6
ExplicitWidth = 269 ExplicitWidth = 336
ExplicitHeight = 31
inherited TBXItem2: TTBXItem inherited TBXItem2: TTBXItem
Visible = False Visible = False
end end
@ -45,13 +46,13 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos
end end
end end
inherited tbxFiltro: TTBXToolbar inherited tbxFiltro: TTBXToolbar
Left = 269 Left = 336
Top = 23 Top = 29
Align = alLeft Align = alLeft
DockPos = 101 DockPos = 101
DockRow = 1 DockRow = 1
ExplicitLeft = 269 ExplicitLeft = 336
ExplicitTop = 23 ExplicitTop = 29
inherited TBXItem34: TTBXItem inherited TBXItem34: TTBXItem
Action = actQuitarFiltro2 Action = actQuitarFiltro2
end end
@ -60,12 +61,12 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos
ExplicitWidth = 656 ExplicitWidth = 656
end end
inherited TBXTMain2: TTBXToolbar inherited TBXTMain2: TTBXToolbar
Left = 538 Left = 620
Top = 23 Top = 29
DockPos = 536 DockPos = 536
DockRow = 1 DockRow = 1
ExplicitLeft = 538 ExplicitLeft = 620
ExplicitTop = 23 ExplicitTop = 29
end end
end end
inherited StatusBar: TJvStatusBar inherited StatusBar: TJvStatusBar

10
Source/Modulos/Contactos/Controller/uContactosController.pas
View File

@ -7,7 +7,7 @@ uses
Windows, Forms, Classes, Controls, Contnrs, SysUtils, uDADataTable, Windows, Forms, Classes, Controls, Contnrs, SysUtils, uDADataTable,
uBizContactos, uBizContactosDatosBancarios, uIDataModuleContactos, uBizContactos, uBizContactosDatosBancarios, uIDataModuleContactos,
uBizDireccionesContacto, uDireccionesContactoController, uBizDireccionesContacto, uDireccionesContactoController,
uControllerBase, uBizContactosPersonal; uControllerBase, uBizContactosPersonal, uBizContactosDirecciones;
type type
IContactosController = interface(IControllerBase) IContactosController = interface(IControllerBase)
@ -34,6 +34,7 @@ type
function ElegirPersonaContacto(APersonal: IBizContactoPersonal; function ElegirPersonaContacto(APersonal: IBizContactoPersonal;
AMensaje: String): IBizContactoPersonal; AMensaje: String): IBizContactoPersonal;
function DarDireccionSocial(AContacto : IBizContacto): IBizDireccionesContacto; function DarDireccionSocial(AContacto : IBizContacto): IBizDireccionesContacto;
function DarTodasDirecciones(const IDContacto : Integer): IBizContactosDirecciones;
end; end;
TContactosController = class(TControllerBase, IContactosController) TContactosController = class(TControllerBase, IContactosController)
@ -69,6 +70,7 @@ type
function ElegirPersonaContacto(APersonal: IBizContactoPersonal; function ElegirPersonaContacto(APersonal: IBizContactoPersonal;
AMensaje: String): IBizContactoPersonal; AMensaje: String): IBizContactoPersonal;
function DarDireccionSocial(AContacto : IBizContacto): IBizDireccionesContacto; function DarDireccionSocial(AContacto : IBizContacto): IBizDireccionesContacto;
function DarTodasDirecciones(const IDContacto : Integer): IBizContactosDirecciones;
end; end;
implementation implementation
@ -146,6 +148,12 @@ begin
end; end;
end; end;
function TContactosController.DarTodasDirecciones(
const IDContacto : Integer): IBizContactosDirecciones;
begin
Result := FDataModule.GetContactoDirecciones(IDContacto);
end;
procedure TContactosController.DescartarCambios(AContacto: IBizContacto); procedure TContactosController.DescartarCambios(AContacto: IBizContacto);
begin begin
if not Assigned(AContacto) then if not Assigned(AContacto) then

12
Source/Modulos/Contactos/Data/uDataModuleClientes.dfm
View File

@ -281,7 +281,7 @@ inherited DataModuleClientes: TDataModuleClientes
item item
Name = 'VENCIMIENTO_FACTURAS_3' Name = 'VENCIMIENTO_FACTURAS_3'
DataType = datInteger DataType = datInteger
end end
item item
Name = 'LISTA_NOMBRES' Name = 'LISTA_NOMBRES'
DataType = datString DataType = datString
@ -293,8 +293,6 @@ inherited DataModuleClientes: TDataModuleClientes
StreamingOptions = [soDisableEventsWhileStreaming] StreamingOptions = [soDisableEventsWhileStreaming]
RemoteDataAdapter = rda_Contactos RemoteDataAdapter = rda_Contactos
LocalDataStreamer = Bin2DataStreamer LocalDataStreamer = Bin2DataStreamer
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'Clientes' LogicalName = 'Clientes'
IndexDefs = <> IndexDefs = <>
Left = 296 Left = 296
@ -350,8 +348,6 @@ inherited DataModuleClientes: TDataModuleClientes
MasterSource = ds_Clientes MasterSource = ds_Clientes
MasterFields = 'ID' MasterFields = 'ID'
DetailFields = 'ID_CLIENTE' DetailFields = 'ID_CLIENTE'
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'ClientesDescuentos' LogicalName = 'ClientesDescuentos'
IndexDefs = <> IndexDefs = <>
Left = 448 Left = 448
@ -385,8 +381,6 @@ inherited DataModuleClientes: TDataModuleClientes
StreamingOptions = [soDisableEventsWhileStreaming] StreamingOptions = [soDisableEventsWhileStreaming]
RemoteDataAdapter = rda_Contactos RemoteDataAdapter = rda_Contactos
LocalDataStreamer = Bin2DataStreamer LocalDataStreamer = Bin2DataStreamer
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'GruposCliente' LogicalName = 'GruposCliente'
IndexDefs = <> IndexDefs = <>
Left = 552 Left = 552
@ -449,8 +443,6 @@ inherited DataModuleClientes: TDataModuleClientes
MasterSource = ds_Clientes MasterSource = ds_Clientes
MasterFields = 'ID' MasterFields = 'ID'
DetailFields = 'ID_CONTACTO' DetailFields = 'ID_CONTACTO'
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'SubCuentasContacto' LogicalName = 'SubCuentasContacto'
IndexDefs = <> IndexDefs = <>
Left = 600 Left = 600
@ -483,8 +475,6 @@ inherited DataModuleClientes: TDataModuleClientes
Params = <> Params = <>
StreamingOptions = [soDisableEventsWhileStreaming] StreamingOptions = [soDisableEventsWhileStreaming]
RemoteDataAdapter = rda_Contactos RemoteDataAdapter = rda_Contactos
DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
LogicalName = 'ProcedenciasCliente' LogicalName = 'ProcedenciasCliente'
IndexDefs = <> IndexDefs = <>
Left = 648 Left = 648

112
Source/Modulos/Contactos/Data/uDataModuleContactos.dfm
View File

@ -510,4 +510,116 @@ inherited DataModuleContactos: TDataModuleContactos
Left = 296 Left = 296
Top = 80 Top = 80
end end
object tbl_ContactosDirecciones: TDAMemDataTable
RemoteUpdatesOptions = []
Fields = <
item
Name = 'ID_CONTACTO'
DataType = datInteger
DisplayLabel = 'ContactosDirecciones_ID_CONTACTO'
DictionaryEntry = 'ContactosDirecciones_ID_CONTACTO'
InPrimaryKey = True
end
item
Name = 'ID_DIRECCION'
DataType = datInteger
DisplayLabel = 'ContactosDirecciones_ID_DIRECCION'
DictionaryEntry = 'ContactosDirecciones_ID_DIRECCION'
end
item
Name = 'NOMBRE'
DataType = datString
Size = 255
DisplayLabel = 'Nombre'
DictionaryEntry = 'ContactosDirecciones_NOMBRE'
end
item
Name = 'NIF_CIF'
DataType = datString
Size = 15
DisplayLabel = 'NIF/CIF'
DictionaryEntry = 'ContactosDirecciones_NIF_CIF'
end
item
Name = 'CALLE'
DataType = datString
Size = 255
DisplayLabel = 'Calle'
DictionaryEntry = 'ContactosDirecciones_CALLE'
end
item
Name = 'POBLACION'
DataType = datString
Size = 255
DisplayLabel = 'Poblaci'#243'n'
DictionaryEntry = 'ContactosDirecciones_POBLACION'
end
item
Name = 'PROVINCIA'
DataType = datString
Size = 255
DisplayLabel = 'Provincia'
DictionaryEntry = 'ContactosDirecciones_PROVINCIA'
end
item
Name = 'CODIGO_POSTAL'
DataType = datString
Size = 10
DisplayLabel = 'C'#243'digo Postal'
DictionaryEntry = 'ContactosDirecciones_CODIGO_POSTAL'
end
item
Name = 'TELEFONO'
DataType = datString
Size = 25
DisplayLabel = 'Tel'#233'fono'
DictionaryEntry = 'ContactosDirecciones_TELEFONO'
end
item
Name = 'MOVIL'
DataType = datString
Size = 25
DisplayLabel = 'M'#243'vil'
DictionaryEntry = 'ContactosDirecciones_MOVIL'
end
item
Name = 'FAX'
DataType = datString
Size = 25
DisplayLabel = 'Fax'
DictionaryEntry = 'ContactosDirecciones_FAX'
end
item
Name = 'EMAIL'
DataType = datString
Size = 255
DisplayLabel = 'Email'
DictionaryEntry = 'ContactosDirecciones_EMAIL'
end
item
Name = 'PERSONA_CONTACTO'
DataType = datString
Size = 255
DisplayLabel = 'Persona de contacto'
DictionaryEntry = 'ContactosDirecciones_PERSONA_CONTACTO'
end>
Params = <>
MasterMappingMode = mmWhere
StreamingOptions = [soDisableEventsWhileStreaming]
RemoteDataAdapter = rda_Contactos
LocalDataStreamer = Bin2DataStreamer
MasterSource = ds_Contactos
MasterFields = 'ID'
DetailFields = 'ID_CONTACTO'
LogicalName = 'ContactosDirecciones'
IndexDefs = <>
Left = 296
Top = 168
end
object ds_ContactosDirecciones: TDADataSource
DataSet = tbl_ContactosDirecciones.Dataset
DataTable = tbl_ContactosDirecciones
Left = 296
Top = 232
end
end end

39
Source/Modulos/Contactos/Data/uDataModuleContactos.pas
View File

@ -11,7 +11,7 @@ uses
uBizDireccionesContacto, uIDataModuleListadosContactosReport, uBizDireccionesContacto, uIDataModuleListadosContactosReport,
uIDataModuleContactos, uDADesigntimeCall, uROTypes, uRODynamicRequest, uIDataModuleContactos, uDADesigntimeCall, uROTypes, uRODynamicRequest,
uDAInterfaces, uDADataStreamer, uDARemoteDataAdapter, uDABin2DataStreamer, uDAInterfaces, uDADataStreamer, uDARemoteDataAdapter, uDABin2DataStreamer,
uDAMemDataTable, uDataModuleBase, uBizContactosPersonal; uDAMemDataTable, uDataModuleBase, uBizContactosPersonal, uBizContactosDirecciones;
type type
TDataModuleContactos = class(TDataModuleBase, IDataModuleContactos, IDataModuleListadosContactosReport) TDataModuleContactos = class(TDataModuleBase, IDataModuleContactos, IDataModuleListadosContactosReport)
@ -26,6 +26,8 @@ type
ds_DatosBancarios: TDADataSource; ds_DatosBancarios: TDADataSource;
tbl_PersonalContacto: TDAMemDataTable; tbl_PersonalContacto: TDAMemDataTable;
ds_PersonalContacto: TDADataSource; ds_PersonalContacto: TDADataSource;
tbl_ContactosDirecciones: TDAMemDataTable;
ds_ContactosDirecciones: TDADataSource;
procedure DAClientDataModuleCreate(Sender: TObject); procedure DAClientDataModuleCreate(Sender: TObject);
procedure DataModuleDestroy(Sender: TObject); procedure DataModuleDestroy(Sender: TObject);
public public
@ -34,6 +36,9 @@ type
function _GetPersonal: IBizContactoPersonal; function _GetPersonal: IBizContactoPersonal;
function _GetItems (IDCategoria : Integer): IBizContacto; virtual; function _GetItems (IDCategoria : Integer): IBizContacto; virtual;
function NewDireccion : IBizDireccionesContacto; function NewDireccion : IBizDireccionesContacto;
function GetContactosDirecciones : IBizContactosDirecciones;
function GetContactoDirecciones(const IDContacto: Integer) : IBizContactosDirecciones;
// Report // Report
function GetReportInformeEtiquetas(const ListaID: TIntegerList): Binary; function GetReportInformeEtiquetas(const ListaID: TIntegerList): Binary;
@ -61,6 +66,38 @@ begin
// //
end; end;
function TDataModuleContactos.GetContactoDirecciones(
const IDContacto: Integer): IBizContactosDirecciones;
begin
ShowHourglassCursor;
try
Result := Self.GetContactosDirecciones;
with Result.DataTable.DynamicWhere do
begin
Clear;
// (ID = :ID)
Expression := NewBinaryExpression(NewField('', fld_ContactosDireccionesID_CONTACTO), NewConstant(IDContacto, datInteger), dboEqual);
end;
finally
HideHourglassCursor;
end;
end;
function TDataModuleContactos.GetContactosDirecciones: IBizContactosDirecciones;
var
ADirecciones : TDAMemDataTable;
begin
ShowHourglassCursor;
try
ADirecciones := CloneDataTable(tbl_ContactosDirecciones);
ADirecciones.BusinessRulesID := BIZ_CLIENT_CONTACTOS_DIRECCIONES;
Result := (ADirecciones as IBizContactosDirecciones);
finally
HideHourglassCursor;
end;
end;
function TDataModuleContactos.GetReportInformeEtiquetas(const ListaID: TIntegerList): Binary; function TDataModuleContactos.GetReportInformeEtiquetas(const ListaID: TIntegerList): Binary;
var var
AParam : TIntegerArray; AParam : TIntegerArray;

BIN
Source/Modulos/Contactos/Model/Contactos_model.dpk
View File

Binary file not shown.

31
Source/Modulos/Contactos/Model/Contactos_model.dproj
View File

@ -50,37 +50,38 @@
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\Utiles\uRegimenIVAUtils.pas" /> <DCCReference Include="..\Utiles\uRegimenIVAUtils.pas" />
<DCCReference Include="Data\adortl.dcp" /> <DCCReference Include="adortl.dcp" />
<DCCReference Include="Data\ApplicationBase.dcp" /> <DCCReference Include="ApplicationBase.dcp" />
<DCCReference Include="Data\Base.dcp" /> <DCCReference Include="Base.dcp" />
<DCCReference Include="Data\DataAbstract_Core_D11.dcp" /> <DCCReference Include="DataAbstract_Core_D11.dcp" />
<DCCReference Include="Data\dbrtl.dcp" />
<DCCReference Include="Data\dsnap.dcp" />
<DCCReference Include="Data\FormasPago_controller.dcp" />
<DCCReference Include="Data\FormasPago_model.dcp" />
<DCCReference Include="Data\GUIBase.dcp" />
<DCCReference Include="Data\RemObjects_Core_D11.dcp" />
<DCCReference Include="Data\rtl.dcp" />
<DCCReference Include="Data\TiposIVA_controller.dcp" />
<DCCReference Include="Data\TiposIVA_model.dcp" />
<DCCReference Include="Data\uIDataModuleClientes.pas" /> <DCCReference Include="Data\uIDataModuleClientes.pas" />
<DCCReference Include="Data\uIDataModuleContactos.pas" /> <DCCReference Include="Data\uIDataModuleContactos.pas" />
<DCCReference Include="Data\uIDataModuleListadosContactosReport.pas" /> <DCCReference Include="Data\uIDataModuleListadosContactosReport.pas" />
<DCCReference Include="Data\uIDataModuleProveedores.pas" /> <DCCReference Include="Data\uIDataModuleProveedores.pas" />
<DCCReference Include="Data\uIDataModuleVendedores.pas" /> <DCCReference Include="Data\uIDataModuleVendedores.pas" />
<DCCReference Include="Data\vcl.dcp" /> <DCCReference Include="dbrtl.dcp" />
<DCCReference Include="Data\vcldb.dcp" /> <DCCReference Include="dsnap.dcp" />
<DCCReference Include="FormasPago_controller.dcp" />
<DCCReference Include="FormasPago_model.dcp" />
<DCCReference Include="GUIBase.dcp" />
<DCCReference Include="RemObjects_Core_D11.dcp" />
<DCCReference Include="rtl.dcp" />
<DCCReference Include="schContactosClient_Intf.pas" /> <DCCReference Include="schContactosClient_Intf.pas" />
<DCCReference Include="schContactosServer_Intf.pas" /> <DCCReference Include="schContactosServer_Intf.pas" />
<DCCReference Include="TiposIVA_controller.dcp" />
<DCCReference Include="TiposIVA_model.dcp" />
<DCCReference Include="uBizClientesDescuentos.pas" /> <DCCReference Include="uBizClientesDescuentos.pas" />
<DCCReference Include="uBizContactos.pas" /> <DCCReference Include="uBizContactos.pas" />
<DCCReference Include="uBizContactosDatosBancarios.pas" /> <DCCReference Include="uBizContactosDatosBancarios.pas" />
<DCCReference Include="uBizContactosDirecciones.pas" />
<DCCReference Include="uBizContactosPersonal.pas" /> <DCCReference Include="uBizContactosPersonal.pas" />
<DCCReference Include="uBizDireccionesContacto.pas" /> <DCCReference Include="uBizDireccionesContacto.pas" />
<DCCReference Include="uBizGruposCliente.pas" /> <DCCReference Include="uBizGruposCliente.pas" />
<DCCReference Include="uBizGruposProveedor.pas" /> <DCCReference Include="uBizGruposProveedor.pas" />
<DCCReference Include="uBizProcedenciasCliente.pas" /> <DCCReference Include="uBizProcedenciasCliente.pas" />
<DCCReference Include="uBizSubCuentasContacto.pas" /> <DCCReference Include="uBizSubCuentasContacto.pas" />
<DCCReference Include="vcl.dcp" />
<DCCReference Include="vcldb.dcp" />
</ItemGroup> </ItemGroup>
</Project> </Project>
<!-- EurekaLog First Line <!-- EurekaLog First Line

3
Source/Modulos/Contactos/Model/Data/uIDataModuleClientes.pas
View File

@ -4,7 +4,7 @@ interface
uses uses
uBizContactos, uIDataModuleContactos, uBizGruposCliente, uBizProcedenciasCliente, uBizContactos, uIDataModuleContactos, uBizGruposCliente, uBizProcedenciasCliente,
uBizContactosDatosBancarios; uBizContactosDatosBancarios, uBizContactosDirecciones;
type type
IDataModuleClientes = interface(IDataModuleContactos) IDataModuleClientes = interface(IDataModuleContactos)
@ -18,6 +18,7 @@ type
function GetItemsTiendaWeb : IBizCliente; function GetItemsTiendaWeb : IBizCliente;
function GetGruposCliente : IBizGrupoCliente; function GetGruposCliente : IBizGrupoCliente;
function GetProcedenciasCliente : IBizProcedenciaCliente; function GetProcedenciasCliente : IBizProcedenciaCliente;
function GetContactosDirecciones: IBizContactosDirecciones;
end; end;

4
Source/Modulos/Contactos/Model/Data/uIDataModuleContactos.pas
View File

@ -5,7 +5,7 @@ interface
uses uses
SysUtils, Classes, SysUtils, Classes,
uBizContactos, uBizContactosDatosBancarios, uBizDireccionesContacto, uBizContactos, uBizContactosDatosBancarios, uBizDireccionesContacto,
uBizContactosPersonal; uBizContactosPersonal, uBizContactosDirecciones;
type type
IDataModuleContactos = interface IDataModuleContactos = interface
@ -15,6 +15,8 @@ type
function _GetDirecciones: IBizDireccionesContacto; function _GetDirecciones: IBizDireccionesContacto;
function _GetPersonal: IBizContactoPersonal; function _GetPersonal: IBizContactoPersonal;
function NewDireccion : IBizDireccionesContacto; function NewDireccion : IBizDireccionesContacto;
function GetContactosDirecciones : IBizContactosDirecciones;
function GetContactoDirecciones(const IDContacto: Integer) : IBizContactosDirecciones;
end; end;
implementation implementation

51
Source/Modulos/Contactos/Model/uBizContactosDirecciones.pas Normal file
View File

@ -0,0 +1,51 @@
unit uBizContactosDirecciones;
interface
uses
uDAInterfaces, uDADataTable,
schContactosClient_Intf;
const
BIZ_CLIENT_CONTACTOS_DIRECCIONES = 'Client.ContactosDirecciones';
type
IBizContactosDirecciones = interface(IContactosDirecciones)
['{971F415B-A468-455B-BF86-1795E36858F3}']
end;
TBizContactosDirecciones = class(TContactosDireccionesDataTableRules, IBizContactosDirecciones)
protected
procedure BeforeInsert(Sender: TDADataTable); override;
public
procedure OnNewRecord(Sender: TDADataTable); override;
end;
implementation
uses
Dialogs,uDataTableUtils, DB;
{ TBizDatosBancarios }
procedure TBizContactosDirecciones.BeforeInsert(Sender: TDADataTable);
var
AMasterTable : TDADataTable;
begin
inherited;
AMasterTable := DataTable.GetMasterDataTable;
if Assigned(AMasterTable) and (AMasterTable.State in dsEditModes) then
AMasterTable.Post;
end;
procedure TBizContactosDirecciones.OnNewRecord(Sender: TDADataTable);
begin
inherited;
// ID := GetRecNo; // -1, -2, -3...
end;
initialization
RegisterDataTableRules(BIZ_CLIENT_CONTACTOS_DIRECCIONES, TBizContactosDirecciones);
end.

7
Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas
View File

@ -342,6 +342,7 @@ begin
// INCIDENCIAS := Nil; // INCIDENCIAS := Nil;
REF_CON_CLIENTE := ''; REF_CON_CLIENTE := '';
ID_CONTRATO_CLIENTE := 0; ID_CONTRATO_CLIENTE := 0;
ID_DIRECCION_CLIENTE := 0;
end; end;
Result.AsignarVendedor; Result.AsignarVendedor;
@ -366,16 +367,16 @@ begin
if (APedido.Detalles.DataTable.State in dsEditModes) then if (APedido.Detalles.DataTable.State in dsEditModes) then
APedido.Detalles.DataTable.Post; APedido.Detalles.DataTable.Post;
if (APedido.ID_PROVEEDOR < 0) then if (APedido.ID_PROVEEDOR <= 0) then
// Si hay altas automáticas no hay objeto Proveedor pero sí hay ID_PROVEEDOR // Si hay altas automáticas no hay objeto Proveedor pero sí hay ID_PROVEEDOR
{(not Assigned(APedido.Proveedor)) or {(not Assigned(APedido.Proveedor)) or
(APedido.Proveedor.IsEmpty) then} (APedido.Proveedor.IsEmpty) then}
raise Exception.Create('Debe indicar el proveedor de esta pedido'); raise Exception.Create('Debe indicar el proveedor de este pedido');
if (EsFechaVacia(APedido.FECHA_PEDIDO)) then if (EsFechaVacia(APedido.FECHA_PEDIDO)) then
raise Exception.Create('Debe indicar la fecha de este pedido'); raise Exception.Create('Debe indicar la fecha de este pedido');
if (Length(APedido.CALLE) = 0) and (APedido.ID_ALMACEN = 0) then if (Length(APedido.CALLE) = 0) and (APedido.ID_ALMACEN = 0) and (APedido.ID_DIRECCION_CLIENTE = 0) then
raise Exception.Create('Debe indicar una dirección de entrega o almacén para este pedido'); raise Exception.Create('Debe indicar una dirección de entrega o almacén para este pedido');
if (APedido.Detalles.DataTable.RecordCount = 0) then if (APedido.Detalles.DataTable.RecordCount = 0) then

8
Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas
View File

@ -9,8 +9,8 @@ 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_PedidosProveedor = '{F9A04E72-CC9B-404C-B543-59DC545248DE}'; RID_PedidosProveedor = '{0FA0E444-2C09-4A09-AF1B-B0C792E6C02A}';
RID_PedidosProveedor_Detalles = '{B001B59E-8710-467D-879E-63C7BE102CD6}'; RID_PedidosProveedor_Detalles = '{772E5829-8C5A-4EF5-8411-23B614592C6F}';
{ Data table names } { Data table names }
nme_PedidosProveedor = 'PedidosProveedor'; nme_PedidosProveedor = 'PedidosProveedor';
@ -135,7 +135,7 @@ const
type type
{ IPedidosProveedor } { IPedidosProveedor }
IPedidosProveedor = interface(IDAStronglyTypedDataTable) IPedidosProveedor = interface(IDAStronglyTypedDataTable)
['{D09B45C4-717B-4D44-B535-0ABAAE743DBD}'] ['{E2601C1F-FDAF-4BEE-82BF-1F8B1A14983A}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);
@ -662,7 +662,7 @@ type
{ IPedidosProveedor_Detalles } { IPedidosProveedor_Detalles }
IPedidosProveedor_Detalles = interface(IDAStronglyTypedDataTable) IPedidosProveedor_Detalles = interface(IDAStronglyTypedDataTable)
['{64CF9676-7BE9-4830-A7C1-CB33770836E1}'] ['{54914245-300B-4B3A-B1EA-5E77F73F3A8E}']
{ Property getters and setters } { Property getters and setters }
function GetIDValue: Integer; function GetIDValue: Integer;
procedure SetIDValue(const aValue: Integer); procedure SetIDValue(const aValue: Integer);

8
Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorServer_Intf.pas
View File

@ -9,13 +9,13 @@ 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_PedidosProveedorDelta = '{89722FDC-B6E6-4109-8393-E2204281481F}'; RID_PedidosProveedorDelta = '{35F5A87E-FE86-4633-951A-CC8FDF16EA54}';
RID_PedidosProveedor_DetallesDelta = '{F7F93BEC-E7C5-40A0-AD03-62DA49D17ABC}'; RID_PedidosProveedor_DetallesDelta = '{606BD1BC-BDFD-4B41-81DD-963DF48A7EBB}';
type type
{ IPedidosProveedorDelta } { IPedidosProveedorDelta }
IPedidosProveedorDelta = interface(IPedidosProveedor) IPedidosProveedorDelta = interface(IPedidosProveedor)
['{89722FDC-B6E6-4109-8393-E2204281481F}'] ['{35F5A87E-FE86-4633-951A-CC8FDF16EA54}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_EMPRESAValue : Integer; function GetOldID_EMPRESAValue : Integer;
@ -543,7 +543,7 @@ type
{ IPedidosProveedor_DetallesDelta } { IPedidosProveedor_DetallesDelta }
IPedidosProveedor_DetallesDelta = interface(IPedidosProveedor_Detalles) IPedidosProveedor_DetallesDelta = interface(IPedidosProveedor_Detalles)
['{F7F93BEC-E7C5-40A0-AD03-62DA49D17ABC}'] ['{606BD1BC-BDFD-4B41-81DD-963DF48A7EBB}']
{ Property getters and setters } { Property getters and setters }
function GetOldIDValue : Integer; function GetOldIDValue : Integer;
function GetOldID_PEDIDOValue : Integer; function GetOldID_PEDIDOValue : Integer;

16
Source/Modulos/Pedidos a proveedor/PedidosProveedor_Group.groupproj
View File

@ -13,6 +13,7 @@
<Projects Include="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" /> <Projects Include="..\Albaranes de cliente\Views\AlbaranesCliente_view.dproj" />
<Projects Include="..\Articulos\Controller\Articulos_controller.dproj" /> <Projects Include="..\Articulos\Controller\Articulos_controller.dproj" />
<Projects Include="..\Articulos\Views\Articulos_view.dproj" /> <Projects Include="..\Articulos\Views\Articulos_view.dproj" />
<Projects Include="..\Contactos\Controller\Contactos_controller.dproj" />
<Projects Include="..\Contactos\Views\Contactos_view.dproj" /> <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
<Projects Include="..\Contratos de cliente\Controller\ContratosCliente_controller.dproj" /> <Projects Include="..\Contratos de cliente\Controller\ContratosCliente_controller.dproj" />
<Projects Include="..\Contratos de cliente\Views\ContratosCliente_view.dproj" /> <Projects Include="..\Contratos de cliente\Views\ContratosCliente_view.dproj" />
@ -221,14 +222,23 @@
<Target Name="ConCli_PedProv_relation:Make"> <Target Name="ConCli_PedProv_relation:Make">
<MSBuild Projects="..\Relaciones\Contratos de cliente - Pedidos de proveedor\ConCli_PedProv_relation.dproj" Targets="Make" /> <MSBuild Projects="..\Relaciones\Contratos de cliente - Pedidos de proveedor\ConCli_PedProv_relation.dproj" Targets="Make" />
</Target> </Target>
<Target Name="Contactos_controller">
<MSBuild Projects="..\Contactos\Controller\Contactos_controller.dproj" Targets="" />
</Target>
<Target Name="Contactos_controller:Clean">
<MSBuild Projects="..\Contactos\Controller\Contactos_controller.dproj" Targets="Clean" />
</Target>
<Target Name="Contactos_controller:Make">
<MSBuild Projects="..\Contactos\Controller\Contactos_controller.dproj" Targets="Make" />
</Target>
<Target Name="Build"> <Target Name="Build">
<CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_controller;Articulos_view;PedidosProveedor_model;PedidosProveedor_data;PedidosProveedor_controller;PedidosProveedor_view;PedidosProveedor_plugin;FactuGES;FactuGES_Server;ContratosCliente_view;ContratosCliente_controller;AlbaranesCliente_data;GestorDocumentos_data;GestorDocumentos_controller;AlbaranesCliente_view;FacturasCliente_view;ConCli_PedProv_relation" /> <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_controller;Articulos_view;PedidosProveedor_model;PedidosProveedor_data;PedidosProveedor_controller;PedidosProveedor_view;PedidosProveedor_plugin;FactuGES;FactuGES_Server;ContratosCliente_view;ContratosCliente_controller;AlbaranesCliente_data;GestorDocumentos_data;GestorDocumentos_controller;AlbaranesCliente_view;FacturasCliente_view;ConCli_PedProv_relation;Contactos_controller" />
</Target> </Target>
<Target Name="Clean"> <Target Name="Clean">
<CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;PedidosProveedor_model:Clean;PedidosProveedor_data:Clean;PedidosProveedor_controller:Clean;PedidosProveedor_view:Clean;PedidosProveedor_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;ContratosCliente_view:Clean;ContratosCliente_controller:Clean;AlbaranesCliente_data:Clean;GestorDocumentos_data:Clean;GestorDocumentos_controller:Clean;AlbaranesCliente_view:Clean;FacturasCliente_view:Clean;ConCli_PedProv_relation:Clean" /> <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;PedidosProveedor_model:Clean;PedidosProveedor_data:Clean;PedidosProveedor_controller:Clean;PedidosProveedor_view:Clean;PedidosProveedor_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;ContratosCliente_view:Clean;ContratosCliente_controller:Clean;AlbaranesCliente_data:Clean;GestorDocumentos_data:Clean;GestorDocumentos_controller:Clean;AlbaranesCliente_view:Clean;FacturasCliente_view:Clean;ConCli_PedProv_relation:Clean;Contactos_controller:Clean" />
</Target> </Target>
<Target Name="Make"> <Target Name="Make">
<CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;PedidosProveedor_model:Make;PedidosProveedor_data:Make;PedidosProveedor_controller:Make;PedidosProveedor_view:Make;PedidosProveedor_plugin:Make;FactuGES:Make;FactuGES_Server:Make;ContratosCliente_view:Make;ContratosCliente_controller:Make;AlbaranesCliente_data:Make;GestorDocumentos_data:Make;GestorDocumentos_controller:Make;AlbaranesCliente_view:Make;FacturasCliente_view:Make;ConCli_PedProv_relation:Make" /> <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;PedidosProveedor_model:Make;PedidosProveedor_data:Make;PedidosProveedor_controller:Make;PedidosProveedor_view:Make;PedidosProveedor_plugin:Make;FactuGES:Make;FactuGES_Server:Make;ContratosCliente_view:Make;ContratosCliente_controller:Make;AlbaranesCliente_data:Make;GestorDocumentos_data:Make;GestorDocumentos_controller:Make;AlbaranesCliente_view:Make;FacturasCliente_view:Make;ConCli_PedProv_relation:Make;Contactos_controller:Make" />
</Target> </Target>
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" /> <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
</Project> </Project>

27
Source/Modulos/Pedidos a proveedor/Reports/uRptPedidosProveedor_Server.dfm
View File

@ -96,22 +96,17 @@ object RptPedidosProveedor: TRptPedidosProveedor
'MBRE,'#10' PROVEEDOR.FAX,'#10#10' CONTRATOS_CLIENTE.referencia as refere' + 'MBRE,'#10' PROVEEDOR.FAX,'#10#10' CONTRATOS_CLIENTE.referencia as refere' +
'ncia_contrato,'#10' CONTRATOS_CLIENTE.referencia_CLIENTE,'#10' CLIENTE' + 'ncia_contrato,'#10' CONTRATOS_CLIENTE.referencia_CLIENTE,'#10' CLIENTE' +
'S.NOMBRE AS NOMBRE_CLIENTE,'#10' '#10' PEDIDOS_PROVEEDOR.ID_ALMACEN,'#10' ' + 'S.NOMBRE AS NOMBRE_CLIENTE,'#10' '#10' PEDIDOS_PROVEEDOR.ID_ALMACEN,'#10' ' +
' '#10' IIF ((PEDIDOS_PROVEEDOR.ID_ALMACEN = 0), PEDIDOS_PROVEEDOR.C' + ' '#10' PEDIDOS_PROVEEDOR.CALLE,'#10' PEDIDOS_PROVEEDOR.POBLACION,'#10' PE' +
'ALLE, ALMACENES.CALLE) AS CALLE,'#10' IIF ((PEDIDOS_PROVEEDOR.ID_AL' + 'DIDOS_PROVEEDOR.PROVINCIA,'#10' PEDIDOS_PROVEEDOR.CODIGO_POSTAL,'#10' ' +
'MACEN = 0), PEDIDOS_PROVEEDOR.POBLACION, ALMACENES.POBLACION) AS' + 'PEDIDOS_PROVEEDOR.PERSONA_CONTACTO,'#10' PEDIDOS_PROVEEDOR.TELEFONO' +
' POBLACION,'#10' IIF ((PEDIDOS_PROVEEDOR.ID_ALMACEN = 0), PEDIDOS_P' + #10#10'FROM'#10' PEDIDOS_PROVEEDOR'#10' LEFT OUTER JOIN CONTACTOS PROVEEDOR' +
'ROVEEDOR.PROVINCIA, ALMACENES.PROVINCIA) AS PROVINCIA,'#10' IIF ((P' + ' ON (PROVEEDOR .ID = PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10' LEFT OUTE' +
'EDIDOS_PROVEEDOR.ID_ALMACEN = 0), PEDIDOS_PROVEEDOR.CODIGO_POSTA' + 'R JOIN CONTACTOS VENDEDORES ON (VENDEDORES.ID = PEDIDOS_PROVEEDO' +
'L, ALMACENES.CODIGO_POSTAL) AS CODIGO_POSTAL,'#10' PEDIDOS_PROVEEDO' + 'R.ID_VENDEDOR)'#10' LEFT OUTER JOIN CONTRATOS_CLIENTE ON (CONTRATOS' +
'R.PERSONA_CONTACTO,'#10' PEDIDOS_PROVEEDOR.TELEFONO'#10#10'FROM'#10' PEDIDOS' + '_CLIENTE.ID = PEDIDOS_PROVEEDOR.ID_CONTRATO_CLIENTE)'#10' LEFT OUTE' +
'_PROVEEDOR'#10' LEFT OUTER JOIN CONTACTOS PROVEEDOR ON (PROVEEDOR .' + 'R JOIN CONTACTOS CLIENTES ON (CLIENTES.ID = CONTRATOS_CLIENTE.ID' +
'ID = PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10' LEFT OUTER JOIN CONTACTOS' + '_CLIENTE)'#10' LEFT OUTER JOIN ALMACENES ON (ALMACENES.ID = PEDIDOS' +
' VENDEDORES ON (VENDEDORES.ID = PEDIDOS_PROVEEDOR.ID_VENDEDOR)'#10' ' + '_PROVEEDOR.ID_ALMACEN)'#10'WHERE PEDIDOS_PROVEEDOR.ID = :ID'#10
' LEFT OUTER JOIN CONTRATOS_CLIENTE ON (CONTRATOS_CLIENTE.ID = PE' +
'DIDOS_PROVEEDOR.ID_CONTRATO_CLIENTE)'#10' LEFT OUTER JOIN CONTACTOS' +
' CLIENTES ON (CLIENTES.ID = CONTRATOS_CLIENTE.ID_CLIENTE)'#10' LEFT' +
' OUTER JOIN ALMACENES ON (ALMACENES.ID = PEDIDOS_PROVEEDOR.ID_AL' +
'MACEN)'#10'WHERE PEDIDOS_PROVEEDOR.ID = :ID'#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = < ColumnMappings = <
item item

34
Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm
View File

@ -749,6 +749,11 @@ object srvPedidosProveedor: TsrvPedidosProveedor
end end
item item
Params = < Params = <
item
Name = 'ID_DIRECCION_CLIENTE'
DataType = datInteger
Value = ''
end
item item
Name = 'ID' Name = 'ID'
DataType = datAutoInc DataType = datAutoInc
@ -932,15 +937,16 @@ object srvPedidosProveedor: TsrvPedidosProveedor
', '#10' TELEFONO, ID_CONTRATO_CLIENTE, IMPORTE_NETO, IMPORTE_POR' + ', '#10' TELEFONO, ID_CONTRATO_CLIENTE, IMPORTE_NETO, IMPORTE_POR' +
'TE,'#10' DESCUENTO, IMPORTE_DESCUENTO, BASE_IMPONIBLE, IVA, '#10' ' + 'TE,'#10' DESCUENTO, IMPORTE_DESCUENTO, BASE_IMPONIBLE, IVA, '#10' ' +
' IMPORTE_IVA, ID_FORMA_PAGO, ID_TIENDA, ID_VENDEDOR, DESCRIPCIO' + ' IMPORTE_IVA, ID_FORMA_PAGO, ID_TIENDA, ID_VENDEDOR, DESCRIPCIO' +
'N_GENERAL)'#10' VALUES'#10' (:ID, :ID_EMPRESA, CURRENT_TIMESTAMP, :I' + 'N_GENERAL,'#10' ID_DIRECCION_CLIENTE)'#10' VALUES'#10' (:ID, :ID_EMP' +
'D_PROVEEDOR,'#10' :USUARIO, :OBSERVACIONES, :REFERENCIA, :FECHA_' + 'RESA, CURRENT_TIMESTAMP, :ID_PROVEEDOR,'#10' :USUARIO, :OBSERVAC' +
'ENVIO,'#10' :FECHA_PEDIDO, :FECHA_CONFIRMACION, :FECHA_ENTREGA, ' + 'IONES, :REFERENCIA, :FECHA_ENVIO,'#10' :FECHA_PEDIDO, :FECHA_CON' +
':INCIDENCIAS,'#10' :IMPORTE_TOTAL, :INCIDENCIAS_ACTIVAS, :ID_ALM' + 'FIRMACION, :FECHA_ENTREGA, :INCIDENCIAS,'#10' :IMPORTE_TOTAL, :I' +
'ACEN, :CALLE,'#10' :POBLACION, :PROVINCIA, :CODIGO_POSTAL, :PERS' + 'NCIDENCIAS_ACTIVAS, :ID_ALMACEN, :CALLE,'#10' :POBLACION, :PROVI' +
'ONA_CONTACTO,'#10' :TELEFONO, :ID_CONTRATO_CLIENTE, :IMPORTE_NET' + 'NCIA, :CODIGO_POSTAL, :PERSONA_CONTACTO,'#10' :TELEFONO, :ID_CON' +
'O, :IMPORTE_PORTE,'#10' :DESCUENTO, :IMPORTE_DESCUENTO, :BASE_IM' + 'TRATO_CLIENTE, :IMPORTE_NETO, :IMPORTE_PORTE,'#10' :DESCUENTO, :' +
'PONIBLE, :IVA,'#10' :IMPORTE_IVA, :ID_FORMA_PAGO, :ID_TIENDA, :I' + 'IMPORTE_DESCUENTO, :BASE_IMPONIBLE, :IVA,'#10' :IMPORTE_IVA, :ID' +
'D_VENDEDOR, :DESCRIPCION_GENERAL)'#10' '#10' '#10' '#10' '#10#10 '_FORMA_PAGO, :ID_TIENDA, :ID_VENDEDOR, :DESCRIPCION_GENERAL,'#10' ' +
' :ID_DIRECCION_CLIENTE)'#10' '#10' '#10' '#10' '#10#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = <> ColumnMappings = <>
end> end>
@ -1010,6 +1016,11 @@ object srvPedidosProveedor: TsrvPedidosProveedor
DataType = datSmallInt DataType = datSmallInt
Value = '' Value = ''
end end
item
Name = 'ID_DIRECCION_CLIENTE'
DataType = datInteger
Value = ''
end
item item
Name = 'ID_ALMACEN' Name = 'ID_ALMACEN'
DataType = datInteger DataType = datInteger
@ -1138,8 +1149,9 @@ object srvPedidosProveedor: TsrvPedidosProveedor
'ORTE_DESCUENTO, '#10' BASE_IMPONIBLE = :BASE_IMPONIBLE, '#10' IVA ' + 'ORTE_DESCUENTO, '#10' BASE_IMPONIBLE = :BASE_IMPONIBLE, '#10' IVA ' +
'= :IVA, '#10' IMPORTE_IVA = :IMPORTE_IVA, '#10' ID_FORMA_PAGO = :I' + '= :IVA, '#10' IMPORTE_IVA = :IMPORTE_IVA, '#10' ID_FORMA_PAGO = :I' +
'D_FORMA_PAGO,'#10' ID_TIENDA = :ID_TIENDA,'#10' ID_VENDEDOR = :ID_' + 'D_FORMA_PAGO,'#10' ID_TIENDA = :ID_TIENDA,'#10' ID_VENDEDOR = :ID_' +
'VENDEDOR,'#10' DESCRIPCION_GENERAL = :DESCRIPCION_GENERAL'#10' WHERE' + 'VENDEDOR,'#10' DESCRIPCION_GENERAL = :DESCRIPCION_GENERAL,'#10' ID' +
#10' (ID = :OLD_ID)'#10 '_DIRECCION_CLIENTE = :ID_DIRECCION_CLIENTE'#10' WHERE'#10' (ID = :OL' +
'D_ID)'#10
StatementType = stSQL StatementType = stSQL
ColumnMappings = <> ColumnMappings = <>
end> end>

42
Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj
View File

@ -49,27 +49,27 @@
<DelphiCompile Include="PedidosProveedor_view.dpk"> <DelphiCompile Include="PedidosProveedor_view.dpk">
<MainSource>MainSource</MainSource> <MainSource>MainSource</MainSource>
</DelphiCompile> </DelphiCompile>
<DCCReference Include="..\..\Presupuestos de cliente\Almacenes_controller.dcp" /> <DCCReference Include="..\..\Contratos de cliente\Almacenes_controller.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\Almacenes_model.dcp" /> <DCCReference Include="..\..\Contratos de cliente\Almacenes_model.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\Articulos_view.dcp" /> <DCCReference Include="..\..\Contratos de cliente\Articulos_view.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\Contactos_view.dcp" /> <DCCReference Include="..\..\Contratos de cliente\Contactos_view.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\ContratosCliente_controller.dcp" /> <DCCReference Include="..\..\Contratos de cliente\ContratosCliente_controller.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\ContratosCliente_model.dcp" /> <DCCReference Include="..\..\Contratos de cliente\ContratosCliente_model.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\cxLibraryD11.dcp" /> <DCCReference Include="..\..\Contratos de cliente\cxLibraryD11.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\dxCoreD11.dcp" /> <DCCReference Include="..\..\Contratos de cliente\dxCoreD11.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\dxGDIPlusD11.dcp" /> <DCCReference Include="..\..\Contratos de cliente\dxGDIPlusD11.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\dxThemeD11.dcp" /> <DCCReference Include="..\..\Contratos de cliente\dxThemeD11.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\GUIBase.dcp" /> <DCCReference Include="..\..\Contratos de cliente\GUIBase.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\PedidosProveedor_controller.dcp" /> <DCCReference Include="..\..\Contratos de cliente\PedidosProveedor_controller.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\PedidosProveedor_model.dcp" /> <DCCReference Include="..\..\Contratos de cliente\PedidosProveedor_model.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\PngComponentsD10.dcp" /> <DCCReference Include="..\..\Contratos de cliente\PngComponentsD10.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\PNG_D10.dcp" /> <DCCReference Include="..\..\Contratos de cliente\PNG_D10.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\rtl.dcp" /> <DCCReference Include="..\..\Contratos de cliente\rtl.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\tb2k_d10.dcp" /> <DCCReference Include="..\..\Contratos de cliente\tb2k_d10.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\tbx_d10.dcp" /> <DCCReference Include="..\..\Contratos de cliente\tbx_d10.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\vcl.dcp" /> <DCCReference Include="..\..\Contratos de cliente\vcl.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\vclactnband.dcp" /> <DCCReference Include="..\..\Contratos de cliente\vclactnband.dcp" />
<DCCReference Include="..\..\Presupuestos de cliente\vclx.dcp" /> <DCCReference Include="..\..\Contratos de cliente\vclx.dcp" />
<DCCReference Include="uEditorDireccionEntregaPedidoProveedor.pas"> <DCCReference Include="uEditorDireccionEntregaPedidoProveedor.pas">
<Form>fEditorDireccionEntregaPedidoProveedor </Form> <Form>fEditorDireccionEntregaPedidoProveedor </Form>
<DesignClass>TfEditorDireccionEntregaPedidoProveedor</DesignClass> <DesignClass>TfEditorDireccionEntregaPedidoProveedor</DesignClass>

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

@ -74,7 +74,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
inherited pgPaginas: TPageControl inherited pgPaginas: TPageControl
Width = 916 Width = 916
Height = 482 Height = 482
ActivePage = pagDocumentos
TabOrder = 1 TabOrder = 1
OnChanging = pgPaginasChanging OnChanging = pgPaginasChanging
ExplicitWidth = 916 ExplicitWidth = 916
@ -112,7 +111,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitWidth = 357 ExplicitWidth = 357
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 357 Width = 357
ExplicitWidth = 317
inherited edtlNombre: TcxDBTextEdit inherited edtlNombre: TcxDBTextEdit
ExplicitWidth = 283 ExplicitWidth = 283
Width = 283 Width = 283
@ -167,8 +165,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 273 Width = 273
Height = 166 Height = 166
ExplicitWidth = 496
ExplicitHeight = 20
inherited rdxDestino1: TRadioButton inherited rdxDestino1: TRadioButton
Width = 253 Width = 253
ExplicitWidth = 253 ExplicitWidth = 253
@ -182,8 +178,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
Width = 238 Width = 238
end end
inherited bModificar: TBitBtn inherited bModificar: TBitBtn
Left = 337 Left = 285
ExplicitLeft = 337 ExplicitLeft = 285
end end
inherited txtDireccion: TStaticText inherited txtDireccion: TStaticText
Width = 238 Width = 238
@ -228,7 +224,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitWidth = 357 ExplicitWidth = 357
inherited dxLayoutControl1: TdxLayoutControl inherited dxLayoutControl1: TdxLayoutControl
Width = 357 Width = 357
ExplicitWidth = 317
inherited cbTienda: TcxComboBox inherited cbTienda: TcxComboBox
ExplicitWidth = 390 ExplicitWidth = 390
Width = 390 Width = 390
@ -240,7 +235,6 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
ExplicitWidth = 422 ExplicitWidth = 422
inherited memObservaciones: TcxDBMemo inherited memObservaciones: TcxDBMemo
DataBinding.DataSource = frViewPedidoProveedor1.DADataSource DataBinding.DataSource = frViewPedidoProveedor1.DADataSource
ExplicitWidth = 360
Width = 422 Width = 422
end end
end end
@ -262,6 +256,10 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
object pagContenido: TTabSheet object pagContenido: TTabSheet
Caption = 'Contenido' Caption = 'Contenido'
ImageIndex = 1 ImageIndex = 1
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
inline frViewDetallesPedidoProveedor1: TfrViewDetallesPedidoProveedor inline frViewDetallesPedidoProveedor1: TfrViewDetallesPedidoProveedor
Left = 0 Left = 0
Top = 0 Top = 0
@ -365,9 +363,9 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
Top = 53 Top = 53
Width = 908 Width = 908
Height = 401 Height = 401
ExplicitTop = 50 ExplicitTop = 53
ExplicitWidth = 908 ExplicitWidth = 908
ExplicitHeight = 413 ExplicitHeight = 401
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
inherited cxGridViewIMPORTENETO: TcxGridDBColumn inherited cxGridViewIMPORTENETO: TcxGridDBColumn
Options.Editing = True Options.Editing = True
@ -387,6 +385,10 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
object pagInicidencias: TTabSheet object pagInicidencias: TTabSheet
Caption = 'Incidencias' Caption = 'Incidencias'
ImageIndex = 2 ImageIndex = 2
ExplicitLeft = 0
ExplicitTop = 0
ExplicitWidth = 0
ExplicitHeight = 0
inline frViewIncidenciasProv: TfrViewIncidencias inline frViewIncidenciasProv: TfrViewIncidencias
Left = 0 Left = 0
Top = 0 Top = 0
@ -655,18 +657,18 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
inherited PnlComentario: TPanel [5] inherited PnlComentario: TPanel [5]
Width = 922 Width = 922
ExplicitWidth = 922 ExplicitWidth = 922
inherited lbComentario: TLabel
Width = 912
Height = 25
end
end end
inherited EditorActionList: TActionList [9] inherited EditorActionList: TActionList [9]
Left = 72
Top = 120
inherited actDuplicar: TAction inherited actDuplicar: TAction
Enabled = False Enabled = False
Visible = False Visible = False
end end
end end
inherited dsDataTable: TDADataSource [10] inherited dsDataTable: TDADataSource [10]
Left = 112
Top = 104
end end
inherited JvAppRegistryStorage: TJvAppRegistryStorage [11] inherited JvAppRegistryStorage: TJvAppRegistryStorage [11]
end end

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

@ -1,89 +1,5 @@
inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor
Width = 1039
Height = 727
inherited ToolBar1: TToolBar
Width = 1039
Height = 24
inherited ToolButton4: TToolButton
Wrap = False
end
inherited ToolButton14: TToolButton
Left = 334
Top = 0
ExplicitLeft = 334
ExplicitTop = 0
end
inherited FontName: TJvFontComboBox
Left = 368
Top = 0
ExplicitLeft = 368
ExplicitTop = 0
end
inherited FontSize: TEdit
Left = 513
Top = 0
ExplicitLeft = 513
ExplicitTop = 0
end
inherited UpDown1: TUpDown
Left = 555
Top = 0
ExplicitLeft = 555
ExplicitTop = 0
end
inherited ToolButton13: TToolButton
Left = 572
Top = 0
ExplicitLeft = 572
ExplicitTop = 0
end
inherited ToolButton6: TToolButton
Left = 580
Top = 0
ExplicitLeft = 580
ExplicitTop = 0
end
inherited ToolButton7: TToolButton
Left = 614
Top = 0
ExplicitLeft = 614
ExplicitTop = 0
end
inherited ToolButton8: TToolButton
Left = 648
Top = 0
ExplicitLeft = 648
ExplicitTop = 0
end
inherited ToolButton12: TToolButton
Left = 682
Top = 0
ExplicitLeft = 682
ExplicitTop = 0
end
inherited ToolButton9: TToolButton
Left = 690
Top = 0
ExplicitLeft = 690
ExplicitTop = 0
end
inherited ToolButton10: TToolButton
Left = 724
Top = 0
ExplicitLeft = 724
ExplicitTop = 0
end
inherited ToolButton11: TToolButton
Left = 758
Top = 0
ExplicitLeft = 758
ExplicitTop = 0
end
end
inherited cxGrid: TcxGrid inherited cxGrid: TcxGrid
Top = 53
Width = 1039
Height = 674
ExplicitTop = 75 ExplicitTop = 75
ExplicitHeight = 229 ExplicitHeight = 229
inherited cxGridView: TcxGridDBTableView inherited cxGridView: TcxGridDBTableView
@ -92,11 +8,4 @@ inherited frViewDetallesPedidoProveedor: TfrViewDetallesPedidoProveedor
end end
end end
end end
inherited TBXDock1: TTBXDock
Top = 24
Width = 1039
inherited TBXToolbar1: TTBXToolbar
ExplicitWidth = 731
end
end
end end

36
Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.dfm
View File

@ -1,21 +1,21 @@
inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
Width = 586 Width = 906
Height = 301 Height = 551
ExplicitWidth = 586 ExplicitWidth = 906
ExplicitHeight = 301 ExplicitHeight = 551
object dxLayoutControl1: TdxLayoutControl object dxLayoutControl1: TdxLayoutControl
Left = 0 Left = 0
Top = 0 Top = 0
Width = 586 Width = 906
Height = 301 Height = 551
Align = alClient Align = alClient
ParentBackground = True ParentBackground = True
TabOrder = 0 TabOrder = 0
TabStop = False TabStop = False
AutoContentSizes = [acsWidth, acsHeight] AutoContentSizes = [acsWidth, acsHeight]
DesignSize = ( DesignSize = (
586 906
301) 551)
object rdxDestino1: TRadioButton object rdxDestino1: TRadioButton
Left = 10 Left = 10
Top = 10 Top = 10
@ -65,9 +65,9 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
Width = 425 Width = 425
end end
object bModificar: TBitBtn object bModificar: TBitBtn
Left = 448 Left = 716
Top = 266 Top = 516
Width = 128 Width = 180
Height = 25 Height = 25
Caption = 'Modificar la direcci'#243'n...' Caption = 'Modificar la direcci'#243'n...'
TabOrder = 6 TabOrder = 6
@ -100,12 +100,20 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
Enabled = False Enabled = False
Properties.DropDownListStyle = lsFixedList Properties.DropDownListStyle = lsFixedList
Properties.ImmediatePost = True Properties.ImmediatePost = True
Properties.KeyFieldNames = 'ID' Properties.KeyFieldNames = 'ID_DIRECCION'
Properties.ListColumns = < Properties.ListColumns = <
item item
FieldName = 'NOMBRE' Fixed = True
FieldName = 'CALLE'
end
item
Fixed = True
FieldName = 'POBLACION'
end
item
Fixed = True
FieldName = 'PROVINCIA'
end> end>
Properties.ListOptions.AnsiSort = True
Properties.ListOptions.GridLines = glNone Properties.ListOptions.GridLines = glNone
Properties.ListOptions.ShowHeader = False Properties.ListOptions.ShowHeader = False
Properties.ListOptions.SyncMode = True Properties.ListOptions.SyncMode = True

55
Source/Modulos/Pedidos a proveedor/Views/uViewDireccionEntregaPedidoProv.pas
View File

@ -9,7 +9,7 @@ uses
cxDBLookupEdit, cxDBLookupComboBox, StdCtrls, cxControls, DB, uDADataTable, cxDBLookupEdit, cxDBLookupComboBox, StdCtrls, cxControls, DB, uDADataTable,
ActnList, uBizAlmacenes, uAlmacenesController, uPedidosProveedorController, ActnList, uBizAlmacenes, uAlmacenesController, uPedidosProveedorController,
Buttons, uDAInterfaces, uClientesController, uDireccionesContactoController, Buttons, uDAInterfaces, uClientesController, uDireccionesContactoController,
uBizDireccionesContacto, uBizContratosCliente, uContratosClienteController; uBizContactosDirecciones, uBizContratosCliente, uContratosClienteController;
type type
IViewDireccionEntregaPedidoProv = interface(IViewBase) IViewDireccionEntregaPedidoProv = interface(IViewBase)
@ -51,14 +51,15 @@ type
procedure bModificarClick(Sender: TObject); procedure bModificarClick(Sender: TObject);
procedure txtDireccionDblClick(Sender: TObject); procedure txtDireccionDblClick(Sender: TObject);
procedure actListaClienteExecute(Sender: TObject); procedure actListaClienteExecute(Sender: TObject);
procedure actBotonElegirDirClienteUpdate(Sender: TObject);
protected protected
FAlmacenesController : IAlmacenesController; FAlmacenesController : IAlmacenesController;
FAlmacenes: IBizAlmacen; FAlmacenes: IBizAlmacen;
FClientesController: IClientesController; FDireccionesCliente : IBizContactosDirecciones;
FDireccionesCliente : IBizDireccionesContacto;
FPedido : IBizPedidoProveedor; FPedido : IBizPedidoProveedor;
FController : IPedidosProveedorController; FController : IPedidosProveedorController;
function GetPedidoProveedor: IBizPedidoProveedor; function GetPedidoProveedor: IBizPedidoProveedor;
function HayContratoAsociado: Boolean;
procedure SetPedidoProveedor(const Value: IBizPedidoProveedor); procedure SetPedidoProveedor(const Value: IBizPedidoProveedor);
procedure CambioDireccionAlmacen; procedure CambioDireccionAlmacen;
procedure CambioDireccionCliente; procedure CambioDireccionCliente;
@ -79,6 +80,13 @@ implementation
uses uses
uEditorRegistryUtils, uCustomView, uStringsUtils, uFactuGES_App; uEditorRegistryUtils, uCustomView, uStringsUtils, uFactuGES_App;
procedure TfrViewDireccionEntregaPedidoProv.actBotonElegirDirClienteUpdate(
Sender: TObject);
begin
inherited;
(Sender as TAction).Enabled := HayContratoAsociado and (rdxDestinoCliente.Checked);
end;
procedure TfrViewDireccionEntregaPedidoProv.actListaClienteExecute( procedure TfrViewDireccionEntregaPedidoProv.actListaClienteExecute(
Sender: TObject); Sender: TObject);
begin begin
@ -149,8 +157,7 @@ procedure TfrViewDireccionEntregaPedidoProv.cbListaDireccionesClientePropertiesV
Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
var Error: Boolean); var Error: Boolean);
begin begin
if Assigned(FPedido) and Assigned(FDireccionesCliente) if Assigned(FPedido) and Assigned(FDireccionesCliente) then
and (FPedido.ID_DIRECCION_CLIENTE <> FDireccionesCliente.ID) then
CambioDireccionCliente; CambioDireccionCliente;
end; end;
@ -158,8 +165,7 @@ procedure TfrViewDireccionEntregaPedidoProv.cbListaPropertiesValidate(
Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
var Error: Boolean); var Error: Boolean);
begin begin
if Assigned(FPedido) and Assigned(FAlmacenes) if Assigned(FPedido) and Assigned(FAlmacenes) then
and (FPedido.ID_ALMACEN <> FAlmacenes.ID) then
CambioDireccionAlmacen; CambioDireccionAlmacen;
end; end;
@ -181,8 +187,8 @@ begin
cbListaDireccionesCliente.Properties.OnValidate := Nil; cbListaDireccionesCliente.Properties.OnValidate := Nil;
cbLista.Properties.OnValidate := Nil; cbLista.Properties.OnValidate := Nil;
FDireccionesCliente := NIL;
dsDireccionesCliente.DataTable := NIL; dsDireccionesCliente.DataTable := NIL;
FDireccionesCliente := NIL;
FAlmacenesController := Nil; FAlmacenesController := Nil;
FAlmacenes := Nil; FAlmacenes := Nil;
@ -195,28 +201,40 @@ begin
Result := FPedido; Result := FPedido;
end; end;
function TfrViewDireccionEntregaPedidoProv.HayContratoAsociado: Boolean;
begin
Result := Assigned(FPedido) and (FPedido.ID_CONTRATO_CLIENTE > 0);
end;
procedure TfrViewDireccionEntregaPedidoProv.RecuperarClienteAsociado; procedure TfrViewDireccionEntregaPedidoProv.RecuperarClienteAsociado;
var var
AClientesController: IClientesController;
AContratoController : IContratosClienteController; AContratoController : IContratosClienteController;
AContrato : IBizContratoCliente; AContrato : IBizContratoCliente;
begin begin
FDireccionesCliente := NIL; FDireccionesCliente := NIL;
dsDireccionesCliente.DataTable := NIL; dsDireccionesCliente.DataTable := NIL;
if (FPedido.ID_CONTRATO_CLIENTE > 0) then if (HayContratoAsociado()) then
begin begin
ShowHourglassCursor;
AClientesController := TClientesController.Create;
AContratoController := TContratosClienteController.Create; AContratoController := TContratosClienteController.Create;
try try
AContrato := AContratoController.Buscar(FPedido.ID_CONTRATO_CLIENTE); AContrato := AContratoController.Buscar(FPedido.ID_CONTRATO_CLIENTE);
if Assigned(AContrato) then if Assigned(AContrato) then
begin begin
AContrato.DataTable.Active := True; AContrato.DataTable.Active := True;
AContratoController.RecuperarCliente(AContrato);
FDireccionesCliente := AContrato._Cliente.Direcciones; FDireccionesCliente := AClientesController.DarTodasDirecciones(AContrato.ID_CLIENTE);
if Assigned(FDireccionesCliente) then
FDireccionesCliente.DataTable.Open;
end; end;
finally finally
AClientesController := NIL;
AContratoController := NIL; AContratoController := NIL;
AContrato := NIL; AContrato := NIL;
HideHourglassCursor;
end; end;
end end
end; end;
@ -281,9 +299,6 @@ begin
FPedido := Value; FPedido := Value;
dsPedido.DataTable := FPedido.DataTable;
cbLista.Properties.OnValidate := cbListaPropertiesValidate;
RecuperarClienteAsociado; RecuperarClienteAsociado;
if Assigned(FDireccionesCliente) then if Assigned(FDireccionesCliente) then
begin begin
@ -291,10 +306,18 @@ begin
cbListaDireccionesCliente.Properties.OnValidate := cbListaDireccionesClientePropertiesValidate; cbListaDireccionesCliente.Properties.OnValidate := cbListaDireccionesClientePropertiesValidate;
end; end;
cbLista.Properties.OnValidate := cbListaPropertiesValidate;
dsPedido.DataTable := FPedido.DataTable;
if (FPedido.ID_ALMACEN < 1) then if (FPedido.ID_ALMACEN < 1) then
actOtro.Checked := True begin
if (FPedido.ID_DIRECCION_CLIENTE < 1) then
actOtro.Checked := True
else
actListaCliente.Checked := True
end
else else
CambioDireccionAlmacen; actLista.Checked := True;
RefrescarDireccion; RefrescarDireccion;
end; end;

13
Source/Modulos/Pedidos a proveedor/Views/uViewDocumentosPedidoProveedor.pas
View File

@ -98,11 +98,14 @@ begin
ShowInfoMessage('Recuerde guardar los cambios si quiere previsualizar o imprimir.'); ShowInfoMessage('Recuerde guardar los cambios si quiere previsualizar o imprimir.');
end; end;
} }
try if Assigned(FPedido) then
ShowHourglassCursor; begin
Controller.GestorDocumentosController.SincronizarDocumentos(Pedido.ID, ListaFicheros, Directorio); try
finally ShowHourglassCursor;
HideHourglassCursor; Controller.GestorDocumentosController.SincronizarDocumentos(Pedido.ID, ListaFicheros, Directorio);
finally
HideHourglassCursor;
end;
end; end;
end; end;

24
Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm
View File

@ -180,27 +180,11 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
Height = 166 Height = 166
ExplicitWidth = 273 ExplicitWidth = 273
ExplicitHeight = 166 ExplicitHeight = 166
inherited rdxDestino1: TRadioButton
Width = 255
ExplicitWidth = 255
end
inherited rdxDestino2: TRadioButton
Width = 287
ExplicitWidth = 287
end
inherited cbLista: TcxDBLookupComboBox
ExplicitWidth = 425
Width = 425
end
inherited bModificar: TBitBtn inherited bModificar: TBitBtn
Left = 366 Left = 314
Top = 159 Top = 190
ExplicitLeft = 366 ExplicitLeft = 314
ExplicitTop = 159 ExplicitTop = 190
end
inherited txtDireccion: TStaticText
Height = 177
ExplicitHeight = 177
end end
end end
inherited ActionList1: TActionList inherited ActionList1: TActionList

12
Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm
View File

@ -147,27 +147,15 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
Width = 903 Width = 903
ExplicitWidth = 903 ExplicitWidth = 903
inherited txtFiltroTodo: TcxTextEdit inherited txtFiltroTodo: TcxTextEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 806 ExplicitWidth = 806
Width = 806 Width = 806
end end
inherited edtFechaIniFiltro: TcxDateEdit inherited edtFechaIniFiltro: TcxDateEdit
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitWidth = 285 ExplicitWidth = 285
Width = 285 Width = 285
end end
inherited edtFechaFinFiltro: TcxDateEdit inherited edtFechaFinFiltro: TcxDateEdit
Left = 389 Left = 389
Style.LookAndFeel.SkinName = ''
StyleDisabled.LookAndFeel.SkinName = ''
StyleFocused.LookAndFeel.SkinName = ''
StyleHot.LookAndFeel.SkinName = ''
ExplicitLeft = 389 ExplicitLeft = 389
ExplicitWidth = 504 ExplicitWidth = 504
Width = 504 Width = 504

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

@ -53,6 +53,8 @@ begin
// APedido.NIF_CIF := AContrato.NIF_CIF; // APedido.NIF_CIF := AContrato.NIF_CIF;
APedido.ID_ALMACEN := 0; APedido.ID_ALMACEN := 0;
APedido.ID_DIRECCION_CLIENTE := 0;
APedido.NOMBRE_CLIENTE := AContrato.NOMBRE; APedido.NOMBRE_CLIENTE := AContrato.NOMBRE;
APedido.CALLE := AContrato.CALLE; APedido.CALLE := AContrato.CALLE;
APedido.POBLACION := AContrato.POBLACION; APedido.POBLACION := AContrato.POBLACION;

6
Source/Servidor/FactuGES_Server.dpr
View File

@ -135,10 +135,10 @@ uses
schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas', schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
uRptListadosContactos_Server in '..\Modulos\Contactos\Reports\uRptListadosContactos_Server.pas' {RptListadosContactos: TDataModule}, uRptListadosContactos_Server in '..\Modulos\Contactos\Reports\uRptListadosContactos_Server.pas' {RptListadosContactos: TDataModule},
uRptPedidosProveedor_Server in '..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas' {RptPedidosProveedor: TDataModule}, uRptPedidosProveedor_Server in '..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas' {RptPedidosProveedor: TDataModule},
schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas',
schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas', schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas'; schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas',
schPedidosProveedorClient_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas',
schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_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">2</VersionInfo><VersionInfo Name="MinorVer">7</VersionInfo><VersionInfo Name="Release">5</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.7.5.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">2.7.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">viernes, 22 de julio de 2016 18:53</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">2</VersionInfo><VersionInfo Name="MinorVer">7</VersionInfo><VersionInfo Name="Release">9</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">2.7.9.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">2.7.9.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">lunes, 12 de septiembre de 2016 17:15</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>

10
Source/Servidor/FactuGES_Server.rc
View File

@ -1,7 +1,7 @@
MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico" MAINICON ICON "C:\Codigo Acana\Resources\Iconos\Servidor.ico"
1 VERSIONINFO 1 VERSIONINFO
FILEVERSION 2,7,5,0 FILEVERSION 2,7,9,0
PRODUCTVERSION 2,7,5,0 PRODUCTVERSION 2,7,9,0
FILEFLAGSMASK 0x3FL FILEFLAGSMASK 0x3FL
FILEFLAGS 0x00L FILEFLAGS 0x00L
FILEOS 0x40004L FILEOS 0x40004L
@ -13,10 +13,10 @@ BEGIN
BLOCK "0C0A04E4" BLOCK "0C0A04E4"
BEGIN BEGIN
VALUE "CompanyName", "Rodax Software S.L.\0" VALUE "CompanyName", "Rodax Software S.L.\0"
VALUE "FileVersion", "2.7.5.0\0" VALUE "FileVersion", "2.7.9.0\0"
VALUE "ProductName", "FactuGES (Servidor)\0" VALUE "ProductName", "FactuGES (Servidor)\0"
VALUE "ProductVersion", "2.7.5.0\0" VALUE "ProductVersion", "2.7.9.0\0"
VALUE "CompileDate", "viernes, 09 de septiembre de 2016 18:07\0" VALUE "CompileDate", "lunes, 12 de septiembre de 2016 19:29\0"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

BIN
Source/Servidor/FactuGES_Server.res
View File

Binary file not shown.