Pedidos a proveedor:
- Añadir selección de persona que recibirá el pedido a partir de los empleados o personal de la subcontrata. - Adaptación de los informes. git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@353 0c75b7a4-871f-7646-8a2f-f78d34cc349f
This commit is contained in:
parent
215634d57d
commit
72e18c7cdf
@ -548,7 +548,7 @@ source_path
|
||||
<Property name="ActionTextColor" type="Cardinal">0</Property>
|
||||
<Property MultiValue="0" name="ActionTypeID" type="string"></Property>
|
||||
<Property MultiValue="0" name="Description" type="string">Servidor</Property>
|
||||
<Property name="Enabled" type="WordBool">True</Property>
|
||||
<Property name="Enabled" type="WordBool">False</Property>
|
||||
<Property name="ExpandActionLogTitle" type="Boolean">True</Property>
|
||||
<Property name="IgnoreFailure" type="WordBool">False</Property>
|
||||
<Property name="IsAction" type="Boolean">True</Property>
|
||||
@ -10979,7 +10979,7 @@ Comments=
|
||||
<Property name="IgnoreFailure" type="WordBool">False</Property>
|
||||
<Property name="IncludeCompileDate" type="WordBool">False</Property>
|
||||
<Property name="IncludeManifest" type="Boolean">False</Property>
|
||||
<Property name="IncludeVerInfo" type="WordBool">False</Property>
|
||||
<Property name="IncludeVerInfo" type="WordBool">True</Property>
|
||||
<Property name="IsAction" type="Boolean">True</Property>
|
||||
<Property name="IsBreakPoint" type="WordBool">False</Property>
|
||||
<Property name="IsDebug" type="WordBool">False</Property>
|
||||
@ -10989,7 +10989,7 @@ Comments=
|
||||
<Property name="IsSpecial" type="WordBool">False</Property>
|
||||
<Property name="KeepCFG" type="Boolean">False</Property>
|
||||
<Property name="LinkProductVersionToFileVersion" type="Boolean">False</Property>
|
||||
<Property name="Locale" type="Integer">3081</Property>
|
||||
<Property name="Locale" type="Integer">3082</Property>
|
||||
<Property MultiValue="0" name="LogToVariable" type="string"></Property>
|
||||
<Property name="MajorVersion" type="Integer">1</Property>
|
||||
<Property MultiValue="0" name="ManifestFile" type="string"></Property>
|
||||
@ -11013,7 +11013,16 @@ Comments=
|
||||
<Property name="UseProjectSettings" type="TFBUseProjectSettings">[usPackages,usCompiler,usLinker,usVersionInfo]</Property>
|
||||
<Property name="UsePropertySet" type="Boolean">False</Property>
|
||||
<Property name="UseVersionFromDOF" type="Boolean">False</Property>
|
||||
<Property MultiValue="1" name="VersionInfoKeys" type="WideString"><![CDATA[FileVersion=1.0.0.0
|
||||
<Property MultiValue="1" name="VersionInfoKeys" type="WideString"><![CDATA[CompanyName=
|
||||
FileDescription=
|
||||
FileVersion=1.0.0.0
|
||||
InternalName=
|
||||
LegalCopyright=
|
||||
LegalTrademarks=
|
||||
OriginalFilename=
|
||||
ProductName=
|
||||
ProductVersion=1.0.0.0
|
||||
Comments=
|
||||
]]>
|
||||
</Property>
|
||||
<Property MultiValue="0" name="VersionInfoPropertySetName" type="string"></Property>
|
||||
@ -16833,7 +16842,7 @@ Comments=
|
||||
<Property name="IgnoreFailure" type="WordBool">False</Property>
|
||||
<Property name="IncludeCompileDate" type="WordBool">False</Property>
|
||||
<Property name="IncludeManifest" type="Boolean">False</Property>
|
||||
<Property name="IncludeVerInfo" type="WordBool">False</Property>
|
||||
<Property name="IncludeVerInfo" type="WordBool">True</Property>
|
||||
<Property name="IsAction" type="Boolean">True</Property>
|
||||
<Property name="IsBreakPoint" type="WordBool">False</Property>
|
||||
<Property name="IsDebug" type="WordBool">False</Property>
|
||||
@ -16843,7 +16852,7 @@ Comments=
|
||||
<Property name="IsSpecial" type="WordBool">False</Property>
|
||||
<Property name="KeepCFG" type="Boolean">False</Property>
|
||||
<Property name="LinkProductVersionToFileVersion" type="Boolean">False</Property>
|
||||
<Property name="Locale" type="Integer">3081</Property>
|
||||
<Property name="Locale" type="Integer">3082</Property>
|
||||
<Property MultiValue="0" name="LogToVariable" type="string"></Property>
|
||||
<Property name="MajorVersion" type="Integer">1</Property>
|
||||
<Property MultiValue="0" name="ManifestFile" type="string"></Property>
|
||||
@ -16867,7 +16876,16 @@ Comments=
|
||||
<Property name="UseProjectSettings" type="TFBUseProjectSettings">[usPackages,usCompiler,usLinker,usVersionInfo]</Property>
|
||||
<Property name="UsePropertySet" type="Boolean">False</Property>
|
||||
<Property name="UseVersionFromDOF" type="Boolean">False</Property>
|
||||
<Property MultiValue="1" name="VersionInfoKeys" type="WideString"><![CDATA[FileVersion=1.0.0.0
|
||||
<Property MultiValue="1" name="VersionInfoKeys" type="WideString"><![CDATA[CompanyName=
|
||||
FileDescription=
|
||||
FileVersion=1.0.0.0
|
||||
InternalName=
|
||||
LegalCopyright=
|
||||
LegalTrademarks=
|
||||
OriginalFilename=
|
||||
ProductName=
|
||||
ProductVersion=1.0.0.0
|
||||
Comments=
|
||||
]]>
|
||||
</Property>
|
||||
<Property MultiValue="0" name="VersionInfoPropertySetName" type="string"></Property>
|
||||
|
||||
File diff suppressed because one or more lines are too long
Binary file not shown.
@ -1,4 +1,5 @@
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProjectGuid>{7ed85635-c723-4c0b-bf1d-f719e0ea33ad}</ProjectGuid>
|
||||
<MainSource>PedidosProveedor_controller.dpk</MainSource>
|
||||
@ -48,10 +49,10 @@
|
||||
<DelphiCompile Include="PedidosProveedor_controller.dpk">
|
||||
<MainSource>MainSource</MainSource>
|
||||
</DelphiCompile>
|
||||
<DCCReference Include="..\Articulos_controller.dcp" />
|
||||
<DCCReference Include="..\Base.dcp" />
|
||||
<DCCReference Include="..\Contactos_controller.dcp" />
|
||||
<DCCReference Include="..\PedidosProveedor_data.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Articulos_controller.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_data.dcp" />
|
||||
<DCCReference Include="uArticulosPedidoProveedorController.pas" />
|
||||
<DCCReference Include="uDetallesPedidoProveedorController.pas" />
|
||||
<DCCReference Include="uPedidosProveedorController.pas" />
|
||||
@ -67,7 +68,7 @@
|
||||
</Project>
|
||||
<!-- EurekaLog First Line
|
||||
[Exception Log]
|
||||
EurekaLog Version=6006
|
||||
EurekaLog Version=6011
|
||||
Activate=0
|
||||
Activate Handle=1
|
||||
Save Log File=1
|
||||
|
||||
@ -341,6 +341,12 @@ begin
|
||||
and (APedido.ID_PROVEEDOR <> APedido.Proveedor.ID) then
|
||||
APedido.ID_PROVEEDOR := APedido.Proveedor.ID;
|
||||
|
||||
if (APedido.ID_ALMACEN = 0) then
|
||||
APedido.DataTable.FieldByName(fld_PedidosProveedorID_ALMACEN).AsVariant := NULL;
|
||||
|
||||
if (APedido.ID_OBRA = 0) then
|
||||
APedido.DataTable.FieldByName(fld_PedidosProveedorID_OBRA).AsVariant := NULL;
|
||||
|
||||
Result := True;
|
||||
finally
|
||||
APedido.Post;
|
||||
|
||||
Binary file not shown.
@ -1,4 +1,5 @@
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProjectGuid>{38eef566-1895-4bdd-8007-f92f5e32cce6}</ProjectGuid>
|
||||
<MainSource>PedidosProveedor_data.dpk</MainSource>
|
||||
@ -41,64 +42,23 @@
|
||||
<Borland.Personality>Delphi.Personality</Borland.Personality>
|
||||
<Borland.ProjectType>Package</Borland.ProjectType>
|
||||
<BorlandProject>
|
||||
<BorlandProject xmlns=""> <Delphi.Personality> <Parameters>
|
||||
<Parameters Name="UseLauncher">False</Parameters>
|
||||
<Parameters Name="LoadAllSymbols">True</Parameters>
|
||||
<Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
|
||||
</Parameters>
|
||||
<Package_Options>
|
||||
<Package_Options Name="ImplicitBuild">True</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 Name="Comments"></VersionInfoKeys>
|
||||
</VersionInfoKeys>
|
||||
<Source>
|
||||
<Source Name="MainSource">PedidosProveedor_data.dpk</Source>
|
||||
</Source>
|
||||
</Delphi.Personality> </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="ImplicitBuild">True</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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">PedidosProveedor_data.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
|
||||
</ProjectExtensions>
|
||||
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
|
||||
<ItemGroup>
|
||||
<DelphiCompile Include="PedidosProveedor_data.dpk">
|
||||
<MainSource>MainSource</MainSource>
|
||||
</DelphiCompile>
|
||||
<DCCReference Include="..\..\Presupuestos de cliente\Data\Base.dcp" />
|
||||
<DCCReference Include="..\..\Presupuestos de cliente\Data\PedidosProveedor_model.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_model.dcp" />
|
||||
<DCCReference Include="uDataModulePedidosProveedor.pas">
|
||||
<Form>DataModulePedidosProveedor</Form>
|
||||
</DCCReference>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
<!-- EurekaLog First Line
|
||||
[Exception Log]
|
||||
EurekaLog Version=6006
|
||||
EurekaLog Version=6011
|
||||
Activate=0
|
||||
Activate Handle=1
|
||||
Save Log File=1
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
1 VERSIONINFO
|
||||
FILEVERSION 1,0,0,0
|
||||
PRODUCTVERSION 1,0,0,0
|
||||
FILEFLAGSMASK 0x3FL
|
||||
FILEFLAGS 0x00L
|
||||
FILEOS 0x40004L
|
||||
FILETYPE 0x1L
|
||||
FILESUBTYPE 0x0L
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "0C0A04E4"
|
||||
BEGIN
|
||||
VALUE "FileVersion", "1.0.0.0\0"
|
||||
VALUE "ProductVersion", "1.0.0.0\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x0C0A, 1252
|
||||
END
|
||||
END
|
||||
Binary file not shown.
@ -22,7 +22,7 @@ package PedidosProveedor_model;
|
||||
{$WRITEABLECONST OFF}
|
||||
{$MINENUMSIZE 1}
|
||||
{$IMAGEBASE $400000}
|
||||
{$IMPLICITBUILD ON}
|
||||
{$IMPLICITBUILD OFF}
|
||||
|
||||
requires
|
||||
Base,
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProjectGuid>{a7225a8d-f40d-4878-9a27-c5de0e7cb638}</ProjectGuid>
|
||||
<MainSource>PedidosProveedor_model.dpk</MainSource>
|
||||
@ -41,7 +42,13 @@
|
||||
<Borland.Personality>Delphi.Personality</Borland.Personality>
|
||||
<Borland.ProjectType>Package</Borland.ProjectType>
|
||||
<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="ImplicitBuild">True</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 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><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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
|
||||
<Excluded_Packages Name="C:\Archivos de programa\EurekaLog 5\Delphi10\ExceptionExpert10.bpl">EurekaLog 5.1.9</Excluded_Packages>
|
||||
</Excluded_Packages><Source><Source Name="MainSource">PedidosProveedor_model.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
|
||||
@ -51,8 +58,8 @@
|
||||
<DelphiCompile Include="PedidosProveedor_model.dpk">
|
||||
<MainSource>MainSource</MainSource>
|
||||
</DelphiCompile>
|
||||
<DCCReference Include="Base.dcp" />
|
||||
<DCCReference Include="Contactos_model.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
|
||||
<DCCReference Include="Data\uIDataModulePedidosProveedor.pas" />
|
||||
<DCCReference Include="Data\uIDataModulePedidosProveedorReport.pas" />
|
||||
<DCCReference Include="schPedidosProveedorClient_Intf.pas" />
|
||||
|
||||
@ -10,6 +10,7 @@
|
||||
<Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
|
||||
<Projects Include="..\Articulos\Controller\Articulos_controller.dproj" />
|
||||
<Projects Include="..\Articulos\Views\Articulos_view.dproj" />
|
||||
<Projects Include="..\Contactos\Controller\Contactos_controller.dproj" />
|
||||
<Projects Include="..\Contactos\Views\Contactos_view.dproj" />
|
||||
<Projects Include="Controller\PedidosProveedor_controller.dproj" />
|
||||
<Projects Include="Data\PedidosProveedor_data.dproj" />
|
||||
@ -41,6 +42,15 @@
|
||||
<Target Name="GUIBase:Make">
|
||||
<MSBuild Projects="..\..\GUIBase\GUIBase.dproj" Targets="Make" />
|
||||
</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="Contactos_view">
|
||||
<MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="" />
|
||||
</Target>
|
||||
@ -132,13 +142,13 @@
|
||||
<MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
|
||||
</Target>
|
||||
<Target Name="Build">
|
||||
<CallTarget Targets="Base;GUIBase;Contactos_view;Articulos_controller;Articulos_view;PedidosProveedor_model;PedidosProveedor_data;PedidosProveedor_controller;PedidosProveedor_view;PedidosProveedor_plugin;FactuGES;FactuGES_Server" />
|
||||
<CallTarget Targets="Base;GUIBase;Contactos_controller;Contactos_view;Articulos_controller;Articulos_view;PedidosProveedor_model;PedidosProveedor_data;PedidosProveedor_controller;PedidosProveedor_view;PedidosProveedor_plugin;FactuGES;FactuGES_Server" />
|
||||
</Target>
|
||||
<Target Name="Clean">
|
||||
<CallTarget Targets="Base:Clean;GUIBase: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" />
|
||||
<CallTarget Targets="Base:Clean;GUIBase:Clean;Contactos_controller: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" />
|
||||
</Target>
|
||||
<Target Name="Make">
|
||||
<CallTarget Targets="Base:Make;GUIBase: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" />
|
||||
<CallTarget Targets="Base:Make;GUIBase:Make;Contactos_controller: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" />
|
||||
</Target>
|
||||
<Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
|
||||
</Project>
|
||||
Binary file not shown.
@ -1,4 +1,5 @@
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProjectGuid>{e7d762a1-3a15-46b2-bd5b-3821d13b8347}</ProjectGuid>
|
||||
<MainSource>PedidosProveedor_plugin.dpk</MainSource>
|
||||
@ -41,46 +42,7 @@
|
||||
<Borland.Personality>Delphi.Personality</Borland.Personality>
|
||||
<Borland.ProjectType>Package</Borland.ProjectType>
|
||||
<BorlandProject>
|
||||
<BorlandProject xmlns=""> <Delphi.Personality> <Parameters>
|
||||
<Parameters Name="UseLauncher">False</Parameters>
|
||||
<Parameters Name="LoadAllSymbols">True</Parameters>
|
||||
<Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
|
||||
</Parameters>
|
||||
<Package_Options>
|
||||
<Package_Options Name="ImplicitBuild">True</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 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><Package_Options><Package_Options Name="ImplicitBuild">True</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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
|
||||
|
||||
|
||||
|
||||
@ -97,28 +59,38 @@
|
||||
|
||||
<Excluded_Packages Name="C:\Archivos de programa\RemObjects Software\Pascal Script\Dcu\D10\PascalScript_RO_D10.bpl">RemObjects Pascal Script - RemObjects SDK 3.0 Integration</Excluded_Packages>
|
||||
<Excluded_Packages Name="C:\Archivos de programa\EurekaLog 5\Delphi10\ExceptionExpert10.bpl">EurekaLog 5.1.9</Excluded_Packages>
|
||||
</Excluded_Packages>
|
||||
<Source>
|
||||
<Source Name="MainSource">PedidosProveedor_plugin.dpk</Source>
|
||||
</Source>
|
||||
</Delphi.Personality> </BorlandProject></BorlandProject>
|
||||
</Excluded_Packages><Source><Source Name="MainSource">PedidosProveedor_plugin.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
|
||||
</ProjectExtensions>
|
||||
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
|
||||
<ItemGroup>
|
||||
<DelphiCompile Include="PedidosProveedor_plugin.dpk">
|
||||
<MainSource>MainSource</MainSource>
|
||||
</DelphiCompile>
|
||||
<DCCReference Include="..\..\Lib\PedidosProveedor_controller.dcp" />
|
||||
<DCCReference Include="..\..\Lib\PedidosProveedor_view.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationB.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBaPedidosProveedor_model.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBasePedidosProveedor_model.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBasPedidosProveedor_model.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBPedidosProveedor_model.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Articulos_view.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_view.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Obras_controller.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Obras_model.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_controller.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_model.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_view.dcp" />
|
||||
<DCCReference Include="uPluginPedidosProveedor.pas">
|
||||
<Form>PluginPedidosProveedor</Form>
|
||||
</DCCReference>
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
||||
<!-- EurekaLog First Line
|
||||
[Exception Log]
|
||||
EurekaLog Version=6006
|
||||
EurekaLog Version=6011
|
||||
Activate=0
|
||||
Activate Handle=1
|
||||
Save Log File=1
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
1 VERSIONINFO
|
||||
FILEVERSION 1,0,0,0
|
||||
PRODUCTVERSION 1,0,0,0
|
||||
FILEFLAGSMASK 0x3FL
|
||||
FILEFLAGS 0x00L
|
||||
FILEOS 0x40004L
|
||||
FILETYPE 0x1L
|
||||
FILESUBTYPE 0x0L
|
||||
BEGIN
|
||||
BLOCK "StringFileInfo"
|
||||
BEGIN
|
||||
BLOCK "0C0A04E4"
|
||||
BEGIN
|
||||
VALUE "FileVersion", "1.0.0.0\0"
|
||||
VALUE "ProductVersion", "1.0.0.0\0"
|
||||
END
|
||||
END
|
||||
BLOCK "VarFileInfo"
|
||||
BEGIN
|
||||
VALUE "Translation", 0x0C0A, 1252
|
||||
END
|
||||
END
|
||||
Binary file not shown.
@ -16,7 +16,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
Params = <
|
||||
item
|
||||
Name = 'ID'
|
||||
Value = '3'
|
||||
Value = '2'
|
||||
ParamType = daptInput
|
||||
end>
|
||||
Statements = <
|
||||
@ -26,24 +26,14 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
'SELECT'#10' V_PEDIDOS_PROVEEDOR.ID,'#10' V_PEDIDOS_PROVEEDOR.ID_EMPRES' +
|
||||
'A,'#10' V_PEDIDOS_PROVEEDOR.REFERENCIA,'#10' V_PEDIDOS_PROVEEDOR.FECHA' +
|
||||
'_PEDIDO,'#10' V_PEDIDOS_PROVEEDOR.OBSERVACIONES,'#10' V_PROVEEDORES.NO' +
|
||||
'MBRE,'#10' V_PROVEEDORES.FAX,'#10' ALMACENES.NOMBRE AS NOMBRE_ALMACEN,' +
|
||||
#10#10' CASE WHEN (ALMACENES.ID > 0)'#10' THEN ALMACENES.CALL' +
|
||||
'E'#10' ELSE V_PEDIDOS_PROVEEDOR.CALLE'#10' END as CALLE,'#10#10' ' +
|
||||
'CASE WHEN (ALMACENES.ID > 0)'#10' THEN ALMACENES.POBLACIO' +
|
||||
'N'#10' ELSE V_PEDIDOS_PROVEEDOR.POBLACION'#10' END as POBLAC' +
|
||||
'ION,'#10#10' CASE WHEN (ALMACENES.ID > 0)'#10' THEN ALMACENES.' +
|
||||
'PROVINCIA'#10' ELSE V_PEDIDOS_PROVEEDOR.PROVINCIA'#10' END a' +
|
||||
's PROVINCIA,'#10#10' CASE WHEN (ALMACENES.ID > 0)'#10' THEN AL' +
|
||||
'MACENES.CODIGO_POSTAL'#10' ELSE V_PEDIDOS_PROVEEDOR.CODIG' +
|
||||
'O_POSTAL'#10' END as CODIGO_POSTAL,'#10#10' CASE WHEN (ALMACENES.ID > 0)' +
|
||||
#10' THEN ALMACENES.PERSONA_CONTACTO'#10' ELSE V_' +
|
||||
'PEDIDOS_PROVEEDOR.PERSONA_CONTACTO'#10' END as PERSONA_CONTACTO,'#10#10' ' +
|
||||
' CASE WHEN (ALMACENES.ID > 0)'#10' THEN ALMACENES.TELEFON' +
|
||||
'O'#10' ELSE V_PEDIDOS_PROVEEDOR.TELEFONO'#10' END as TELEFON' +
|
||||
'O'#10'FROM'#10' V_PEDIDOS_PROVEEDOR'#10' LEFT OUTER JOIN V_PROVEEDORES ON ' +
|
||||
'(V_PROVEEDORES.ID = V_PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10' LEFT OUT' +
|
||||
'ER JOIN ALMACENES ON (ALMACENES.ID = V_PEDIDOS_PROVEEDOR.ID_ALMA' +
|
||||
'CEN)'#10'WHERE V_PEDIDOS_PROVEEDOR.ID = :ID'#10
|
||||
'MBRE,'#10' V_PROVEEDORES.FAX,'#10' V_PROVEEDORES.PERSONA_CONTACTO,'#10' V' +
|
||||
'_PROVEEDORES.CODIGO_ASIGNADO AS CODIGO_CLIENTE,'#10' V_PEDIDOS_PROV' +
|
||||
'EEDOR.CALLE,'#10' V_PEDIDOS_PROVEEDOR.POBLACION,'#10' V_PEDIDOS_PROVEE' +
|
||||
'DOR.PROVINCIA,'#10' V_PEDIDOS_PROVEEDOR.CODIGO_POSTAL,'#10' V_PEDIDOS_' +
|
||||
'PROVEEDOR.PERSONA_CONTACTO AS ENTREGAR_A'#10'FROM'#10' V_PEDIDOS_PROVEE' +
|
||||
'DOR'#10' LEFT OUTER JOIN V_PROVEEDORES ON (V_PROVEEDORES.ID = V_PED' +
|
||||
'IDOS_PROVEEDOR.ID_PROVEEDOR)'#10'WHERE V_PEDIDOS_PROVEEDOR.ID = :ID'#10 +
|
||||
#10
|
||||
StatementType = stSQL
|
||||
ColumnMappings = <
|
||||
item
|
||||
@ -74,10 +64,6 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
DatasetField = 'FAX'
|
||||
TableField = 'FAX'
|
||||
end
|
||||
item
|
||||
DatasetField = 'NOMBRE_ALMACEN'
|
||||
TableField = 'NOMBRE_ALMACEN'
|
||||
end
|
||||
item
|
||||
DatasetField = 'CALLE'
|
||||
TableField = 'CALLE'
|
||||
@ -99,8 +85,12 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
TableField = 'PERSONA_CONTACTO'
|
||||
end
|
||||
item
|
||||
DatasetField = 'TELEFONO'
|
||||
TableField = 'TELEFONO'
|
||||
DatasetField = 'CODIGO_CLIENTE'
|
||||
TableField = 'CODIGO_CLIENTE'
|
||||
end
|
||||
item
|
||||
DatasetField = 'ENTREGAR_A'
|
||||
TableField = 'ENTREGAR_A'
|
||||
end>
|
||||
end>
|
||||
Name = 'Informe_Cabecera'
|
||||
@ -137,7 +127,12 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
Size = 25
|
||||
end
|
||||
item
|
||||
Name = 'NOMBRE_ALMACEN'
|
||||
Name = 'PERSONA_CONTACTO'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'CODIGO_CLIENTE'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
@ -162,14 +157,9 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
Size = 10
|
||||
end
|
||||
item
|
||||
Name = 'PERSONA_CONTACTO'
|
||||
Name = 'ENTREGAR_A'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'TELEFONO'
|
||||
DataType = datString
|
||||
Size = 25
|
||||
end>
|
||||
ReadOnly = True
|
||||
end
|
||||
@ -326,7 +316,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
PrintOptions.Printer = 'Por defecto'
|
||||
PrintOptions.PrintOnSheet = 0
|
||||
ReportOptions.CreateDate = 39065.872423495400000000
|
||||
ReportOptions.LastChange = 39512.849204282400000000
|
||||
ReportOptions.LastChange = 39532.667815752300000000
|
||||
ScriptLanguage = 'PascalScript'
|
||||
ScriptText.Strings = (
|
||||
''
|
||||
@ -352,62 +342,6 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
'}'
|
||||
'end;'
|
||||
''
|
||||
'procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);'
|
||||
'var'
|
||||
' ACadena : String;'
|
||||
'begin'
|
||||
'{ ACadena := '#39#39';'
|
||||
' DireccionEnvio.Lines.Clear;'
|
||||
' if (<frxDBCabecera."REFERENCIA_CLIENTE"> <> '#39#39') then'
|
||||
' ACadena := <frxDBCabecera."REFERENCIA_CLIENTE">;'
|
||||
''
|
||||
' if (<frxDBCabecera."PERSONA_CONTACTO"> <> '#39#39') then'
|
||||
|
||||
' ACadena := ACadena + '#39' '#39' + <frxDBCabecera."PERSONA_CONTACT' +
|
||||
'O">;'
|
||||
''
|
||||
' DireccionEnvio.Lines.Add(ACadena);'
|
||||
' ACadena := '#39#39';'
|
||||
' DireccionEnvio.Lines.Add(<frxDBCabecera."CALLE">);'
|
||||
' if (<frxDBCabecera."CODIGO_POSTAL"> <> '#39#39') then'
|
||||
' ACadena := <frxDBCabecera."CODIGO_POSTAL"> + '#39' '#39';'
|
||||
' if (<frxDBCabecera."POBLACION"> <> '#39#39') then'
|
||||
' ACadena := ACadena + <frxDBCabecera."CODIGO_POSTAL">;'
|
||||
''
|
||||
' if (ACadena <> '#39#39') then'
|
||||
' DireccionEnvio.Lines.Add(ACadena);'
|
||||
''
|
||||
' if (<frxDBCabecera."PROVINCIA"> <> '#39#39') then'
|
||||
' DireccionEnvio.Lines.Add(<frxDBCabecera."PROVINCIA">);'
|
||||
''
|
||||
' if (<frxDBCabecera."TELEFONO"> <> '#39#39') then'
|
||||
' DireccionEnvio.Lines.Add(<frxDBCabecera."TELEFONO">);'
|
||||
'}'
|
||||
'end;'
|
||||
''
|
||||
'procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);'
|
||||
'begin'
|
||||
'{ if not Engine.FinalPass then'
|
||||
' Set('#39'TotalPaginas'#39', (<TotalPaginas> + 1));'
|
||||
''
|
||||
' if Engine.FinalPass then'
|
||||
' Set('#39'Pagina'#39', (<Pagina> + 1));} '
|
||||
'end;'
|
||||
''
|
||||
'procedure frxReportOnStartReport(Sender: TfrxComponent);'
|
||||
'begin'
|
||||
' Set('#39'Pagina'#39', 0);'
|
||||
' Set('#39'TotalPaginas'#39', 0);'
|
||||
' Set('#39'Capitulo'#39', 0);'
|
||||
' Set('#39'NumCapitulos'#39', 0); '
|
||||
'end;'
|
||||
''
|
||||
'procedure Memo4OnBeforePrint(Sender: TfrxComponent);'
|
||||
'begin'
|
||||
'{ if (Length(<frxDBCabecera."OBSERVACIONES">) = 0) then'
|
||||
' Memo4.Visible := False;} '
|
||||
'end;'
|
||||
''
|
||||
'begin'
|
||||
''
|
||||
'end.')
|
||||
@ -432,6 +366,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
Top = 24
|
||||
end
|
||||
object IBDatabase1: TIBDatabase
|
||||
Connected = True
|
||||
DatabaseName = 'C:\Codigo Tecsitel\Output\Debug\Database\FACTUGES.FDB'
|
||||
Params.Strings = (
|
||||
'user_name=sysdba'
|
||||
@ -443,6 +378,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
Top = 296
|
||||
end
|
||||
object IBTransaction1: TIBTransaction
|
||||
Active = True
|
||||
Left = 48
|
||||
Top = 352
|
||||
end
|
||||
@ -459,6 +395,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
object cabecera: TIBQuery
|
||||
Database = IBDatabase1
|
||||
Transaction = IBTransaction1
|
||||
Active = True
|
||||
SQL.Strings = (
|
||||
'SELECT'
|
||||
' V_PEDIDOS_PROVEEDOR.ID,'
|
||||
@ -468,46 +405,19 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
' V_PEDIDOS_PROVEEDOR.OBSERVACIONES,'
|
||||
' V_PROVEEDORES.NOMBRE,'
|
||||
' V_PROVEEDORES.FAX,'
|
||||
' ALMACENES.NOMBRE AS NOMBRE_ALMACEN,'
|
||||
''
|
||||
' CASE WHEN (ALMACENES.ID > 0)'
|
||||
' THEN ALMACENES.CALLE'
|
||||
' ELSE V_PEDIDOS_PROVEEDOR.CALLE'
|
||||
' END as CALLE,'
|
||||
''
|
||||
' CASE WHEN (ALMACENES.ID > 0)'
|
||||
' THEN ALMACENES.POBLACION'
|
||||
' ELSE V_PEDIDOS_PROVEEDOR.POBLACION'
|
||||
' END as POBLACION,'
|
||||
''
|
||||
' CASE WHEN (ALMACENES.ID > 0)'
|
||||
' THEN ALMACENES.PROVINCIA'
|
||||
' ELSE V_PEDIDOS_PROVEEDOR.PROVINCIA'
|
||||
' END as PROVINCIA,'
|
||||
''
|
||||
' CASE WHEN (ALMACENES.ID > 0)'
|
||||
' THEN ALMACENES.CODIGO_POSTAL'
|
||||
' ELSE V_PEDIDOS_PROVEEDOR.CODIGO_POSTAL'
|
||||
' END as CODIGO_POSTAL,'
|
||||
''
|
||||
' CASE WHEN (ALMACENES.ID > 0)'
|
||||
' THEN ALMACENES.PERSONA_CONTACTO'
|
||||
' ELSE V_PEDIDOS_PROVEEDOR.PERSONA_CONTACTO'
|
||||
' END as PERSONA_CONTACTO,'
|
||||
''
|
||||
' CASE WHEN (ALMACENES.ID > 0)'
|
||||
' THEN ALMACENES.TELEFONO'
|
||||
' ELSE V_PEDIDOS_PROVEEDOR.TELEFONO'
|
||||
' END as TELEFONO'
|
||||
' V_PROVEEDORES.PERSONA_CONTACTO,'
|
||||
' V_PROVEEDORES.CODIGO_ASIGNADO AS CODIGO_CLIENTE,'
|
||||
' V_PEDIDOS_PROVEEDOR.CALLE,'
|
||||
' V_PEDIDOS_PROVEEDOR.POBLACION,'
|
||||
' V_PEDIDOS_PROVEEDOR.PROVINCIA,'
|
||||
' V_PEDIDOS_PROVEEDOR.CODIGO_POSTAL,'
|
||||
' V_PEDIDOS_PROVEEDOR.PERSONA_CONTACTO AS ENTREGAR_A'
|
||||
'FROM'
|
||||
' V_PEDIDOS_PROVEEDOR'
|
||||
|
||||
' LEFT OUTER JOIN V_PROVEEDORES ON (V_PROVEEDORES.ID = V_PEDIDOS' +
|
||||
'_PROVEEDOR.ID_PROVEEDOR)'
|
||||
|
||||
' LEFT OUTER JOIN ALMACENES ON (ALMACENES.ID = V_PEDIDOS_PROVEED' +
|
||||
'OR.ID_ALMACEN)'
|
||||
'WHERE V_PEDIDOS_PROVEEDOR.ID = 3')
|
||||
'WHERE V_PEDIDOS_PROVEEDOR.ID = 2')
|
||||
Left = 136
|
||||
Top = 296
|
||||
object cabeceraID: TIntegerField
|
||||
@ -544,45 +454,46 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
Origin = '"V_PROVEEDORES"."FAX"'
|
||||
Size = 25
|
||||
end
|
||||
object cabeceraNOMBRE_ALMACEN: TIBStringField
|
||||
FieldName = 'NOMBRE_ALMACEN'
|
||||
Origin = '"ALMACENES"."NOMBRE"'
|
||||
object cabeceraPERSONA_CONTACTO: TIBStringField
|
||||
FieldName = 'PERSONA_CONTACTO'
|
||||
Origin = '"V_PROVEEDORES"."PERSONA_CONTACTO"'
|
||||
Size = 255
|
||||
end
|
||||
object cabeceraCODIGO_CLIENTE: TIBStringField
|
||||
FieldName = 'CODIGO_CLIENTE'
|
||||
Origin = '"V_PROVEEDORES"."CODIGO_ASIGNADO"'
|
||||
Size = 255
|
||||
end
|
||||
object cabeceraCALLE: TIBStringField
|
||||
FieldName = 'CALLE'
|
||||
ProviderFlags = []
|
||||
Origin = '"V_PEDIDOS_PROVEEDOR"."CALLE"'
|
||||
Size = 255
|
||||
end
|
||||
object cabeceraPOBLACION: TIBStringField
|
||||
FieldName = 'POBLACION'
|
||||
ProviderFlags = []
|
||||
Origin = '"V_PEDIDOS_PROVEEDOR"."POBLACION"'
|
||||
Size = 255
|
||||
end
|
||||
object cabeceraPROVINCIA: TIBStringField
|
||||
FieldName = 'PROVINCIA'
|
||||
ProviderFlags = []
|
||||
Origin = '"V_PEDIDOS_PROVEEDOR"."PROVINCIA"'
|
||||
Size = 255
|
||||
end
|
||||
object cabeceraCODIGO_POSTAL: TIBStringField
|
||||
FieldName = 'CODIGO_POSTAL'
|
||||
ProviderFlags = []
|
||||
Origin = '"V_PEDIDOS_PROVEEDOR"."CODIGO_POSTAL"'
|
||||
Size = 10
|
||||
end
|
||||
object cabeceraPERSONA_CONTACTO: TIBStringField
|
||||
FieldName = 'PERSONA_CONTACTO'
|
||||
ProviderFlags = []
|
||||
object cabeceraENTREGAR_A: TIBStringField
|
||||
FieldName = 'ENTREGAR_A'
|
||||
Origin = '"V_PEDIDOS_PROVEEDOR"."PERSONA_CONTACTO"'
|
||||
Size = 255
|
||||
end
|
||||
object cabeceraTELEFONO: TIBStringField
|
||||
FieldName = 'TELEFONO'
|
||||
ProviderFlags = []
|
||||
Size = 25
|
||||
end
|
||||
end
|
||||
object detalles: TIBQuery
|
||||
Database = IBDatabase1
|
||||
Transaction = IBTransaction1
|
||||
Active = True
|
||||
SQL.Strings = (
|
||||
'SELECT DET.ID, DET.ID_PEDIDO,'
|
||||
' DET.POSICION, DET.TIPO_DETALLE,'
|
||||
@ -592,7 +503,7 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
' ARTICULOS.REFERENCIA_FABR as REFERENCIA_FABRICANTE'
|
||||
'FROM PEDIDOS_PROVEEDOR_DETALLES DET'
|
||||
'LEFT OUTER JOIN ARTICULOS ON (DET.ID_ARTICULO = ARTICULOS.ID)'
|
||||
'WHERE DET.ID_PEDIDO = 3 AND DET.VISIBLE = 1 '
|
||||
'WHERE DET.ID_PEDIDO = 2 AND DET.VISIBLE = 1 '
|
||||
'ORDER BY DET.ID_PEDIDO, DET.POSICION;')
|
||||
Left = 136
|
||||
Top = 352
|
||||
@ -813,7 +724,12 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
Size = 25
|
||||
end
|
||||
item
|
||||
Name = 'NOMBRE_ALMACEN'
|
||||
Name = 'PERSONA_CONTACTO'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'CODIGO_CLIENTE'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
@ -838,19 +754,14 @@ object RptPedidosProveedor: TRptPedidosProveedor
|
||||
Size = 10
|
||||
end
|
||||
item
|
||||
Name = 'PERSONA_CONTACTO'
|
||||
Name = 'ENTREGAR_A'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'TELEFONO'
|
||||
DataType = datString
|
||||
Size = 25
|
||||
end>
|
||||
Params = <
|
||||
item
|
||||
Name = 'ID'
|
||||
Value = ''
|
||||
Value = '2'
|
||||
ParamType = daptInput
|
||||
end>
|
||||
LogChanges = False
|
||||
|
||||
@ -33,20 +33,6 @@ type
|
||||
DADSDetalles: TDADataSource;
|
||||
tbl_Detalles: TDAMemDataTable;
|
||||
tbl_Cabecera: TDAMemDataTable;
|
||||
cabeceraID: TIntegerField;
|
||||
cabeceraID_EMPRESA: TIntegerField;
|
||||
cabeceraREFERENCIA: TIBStringField;
|
||||
cabeceraFECHA_PEDIDO: TDateField;
|
||||
cabeceraOBSERVACIONES: TMemoField;
|
||||
cabeceraNOMBRE: TIBStringField;
|
||||
cabeceraFAX: TIBStringField;
|
||||
cabeceraNOMBRE_ALMACEN: TIBStringField;
|
||||
cabeceraCALLE: TIBStringField;
|
||||
cabeceraPOBLACION: TIBStringField;
|
||||
cabeceraPROVINCIA: TIBStringField;
|
||||
cabeceraCODIGO_POSTAL: TIBStringField;
|
||||
cabeceraPERSONA_CONTACTO: TIBStringField;
|
||||
cabeceraTELEFONO: TIBStringField;
|
||||
detallesID: TIntegerField;
|
||||
detallesID_PEDIDO: TIntegerField;
|
||||
detallesPOSICION: TIntegerField;
|
||||
@ -59,6 +45,20 @@ type
|
||||
detallesIMPORTE_TOTAL: TIBBCDField;
|
||||
detallesREFERENCIA_PROVEEDOR: TIBStringField;
|
||||
detallesREFERENCIA_FABRICANTE: TIBStringField;
|
||||
cabeceraID: TIntegerField;
|
||||
cabeceraID_EMPRESA: TIntegerField;
|
||||
cabeceraREFERENCIA: TIBStringField;
|
||||
cabeceraFECHA_PEDIDO: TDateField;
|
||||
cabeceraOBSERVACIONES: TMemoField;
|
||||
cabeceraNOMBRE: TIBStringField;
|
||||
cabeceraFAX: TIBStringField;
|
||||
cabeceraPERSONA_CONTACTO: TIBStringField;
|
||||
cabeceraCODIGO_CLIENTE: TIBStringField;
|
||||
cabeceraCALLE: TIBStringField;
|
||||
cabeceraPOBLACION: TIBStringField;
|
||||
cabeceraPROVINCIA: TIBStringField;
|
||||
cabeceraCODIGO_POSTAL: TIBStringField;
|
||||
cabeceraENTREGAR_A: TIBStringField;
|
||||
schReport: TDASchema;
|
||||
DataDictionary: TDADataDictionary;
|
||||
procedure DataModuleCreate(Sender: TObject);
|
||||
|
||||
@ -22,25 +22,15 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
|
||||
'SELECT'#10' V_PEDIDOS_PROVEEDOR.ID,'#10' V_PEDIDOS_PROVEEDOR.ID_EMPRES' +
|
||||
'A,'#10' V_PEDIDOS_PROVEEDOR.REFERENCIA,'#10' V_PEDIDOS_PROVEEDOR.FECHA' +
|
||||
'_PEDIDO,'#10' V_PEDIDOS_PROVEEDOR.OBSERVACIONES,'#10' V_PROVEEDORES.NO' +
|
||||
'MBRE,'#10' V_PROVEEDORES.FAX,'#10' ALMACENES.NOMBRE AS NOMBRE_ALMACEN,' +
|
||||
#10#10' CASE WHEN (ALMACENES.ID > 0)'#10' THEN ALMACENES.CALL' +
|
||||
'E'#10' ELSE V_PEDIDOS_PROVEEDOR.CALLE'#10' END as CALLE_ALMA' +
|
||||
'CEN,'#10#10' CASE WHEN (ALMACENES.ID > 0)'#10' THEN ALMACENES.' +
|
||||
'POBLACION'#10' ELSE V_PEDIDOS_PROVEEDOR.POBLACION'#10' END a' +
|
||||
's POBLACION_ALMACEN,'#10#10' CASE WHEN (ALMACENES.ID > 0)'#10' ' +
|
||||
' THEN ALMACENES.PROVINCIA'#10' ELSE V_PEDIDOS_PROVEEDOR.P' +
|
||||
'ROVINCIA'#10' END as PROVINCIA_ALMACEN,'#10#10' CASE WHEN (ALMACENES.ID ' +
|
||||
'> 0)'#10' THEN ALMACENES.CODIGO_POSTAL'#10' ELSE V' +
|
||||
'_PEDIDOS_PROVEEDOR.CODIGO_POSTAL'#10' END as CODIGO_POSTAL_ALMACEN,' +
|
||||
#10#10' CASE WHEN (ALMACENES.ID > 0)'#10' THEN ALMACENES.PERS' +
|
||||
'ONA_CONTACTO'#10' ELSE V_PEDIDOS_PROVEEDOR.PERSONA_CONTAC' +
|
||||
'TO'#10' END as PERSONA_CONTACTO_ALMACEN,'#10#10' CASE WHEN (ALMACENES.ID' +
|
||||
' > 0)'#10' THEN ALMACENES.TELEFONO'#10' ELSE V_PED' +
|
||||
'IDOS_PROVEEDOR.TELEFONO'#10' END as TELEFONO_ALMACEN'#10'FROM'#10' V_PEDID' +
|
||||
'OS_PROVEEDOR'#10' LEFT OUTER JOIN V_PROVEEDORES ON (V_PROVEEDORES.I' +
|
||||
'D = V_PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10' LEFT OUTER JOIN ALMACENE' +
|
||||
'S ON (ALMACENES.ID = V_PEDIDOS_PROVEEDOR.ID_ALMACEN)'#10'WHERE V_PED' +
|
||||
'IDOS_PROVEEDOR.ID = :ID'#10
|
||||
'MBRE,'#10' V_PROVEEDORES.FAX,'#10' V_PROVEEDORES.PERSONA_CONTACTO,'#10' V' +
|
||||
'_PROVEEDORES.CODIGO_ASIGNADO AS CODIGO_CLIENTE,'#10' V_PEDIDOS_PROV' +
|
||||
'EEDOR.CALLE AS CALLE_ALMACEN,'#10' V_PEDIDOS_PROVEEDOR.POBLACION AS' +
|
||||
' POBLACION_ALMACEN,'#10' V_PEDIDOS_PROVEEDOR.PROVINCIA AS PROVINCIA' +
|
||||
'_ALMACEN,'#10' V_PEDIDOS_PROVEEDOR.CODIGO_POSTAL AS CODIGO_POSTAL_A' +
|
||||
'LMACEN,'#10' V_PEDIDOS_PROVEEDOR.PERSONA_CONTACTO AS PERSONA_CONTAC' +
|
||||
'TO_ALMACEN'#10'FROM'#10' V_PEDIDOS_PROVEEDOR'#10' LEFT OUTER JOIN V_PROVEE' +
|
||||
'DORES ON (V_PROVEEDORES.ID = V_PEDIDOS_PROVEEDOR.ID_PROVEEDOR)'#10'W' +
|
||||
'HERE V_PEDIDOS_PROVEEDOR.ID = :ID'#10#10
|
||||
StatementType = stSQL
|
||||
ColumnMappings = <
|
||||
item
|
||||
@ -71,10 +61,6 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
|
||||
DatasetField = 'FAX'
|
||||
TableField = 'FAX'
|
||||
end
|
||||
item
|
||||
DatasetField = 'NOMBRE_ALMACEN'
|
||||
TableField = 'NOMBRE_ALMACEN'
|
||||
end
|
||||
item
|
||||
DatasetField = 'CALLE_ALMACEN'
|
||||
TableField = 'CALLE_ALMACEN'
|
||||
@ -96,8 +82,12 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
|
||||
TableField = 'PERSONA_CONTACTO_ALMACEN'
|
||||
end
|
||||
item
|
||||
DatasetField = 'TELEFONO_ALMACEN'
|
||||
TableField = 'TELEFONO_ALMACEN'
|
||||
DatasetField = 'PERSONA_CONTACTO'
|
||||
TableField = 'PERSONA_CONTACTO'
|
||||
end
|
||||
item
|
||||
DatasetField = 'CODIGO_CLIENTE'
|
||||
TableField = 'CODIGO_CLIENTE'
|
||||
end>
|
||||
end>
|
||||
Name = 'Informe_Cabecera'
|
||||
@ -134,7 +124,12 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
|
||||
Size = 25
|
||||
end
|
||||
item
|
||||
Name = 'NOMBRE_ALMACEN'
|
||||
Name = 'PERSONA_CONTACTO'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'CODIGO_CLIENTE'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
@ -162,11 +157,6 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
|
||||
Name = 'PERSONA_CONTACTO_ALMACEN'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'TELEFONO_ALMACEN'
|
||||
DataType = datString
|
||||
Size = 25
|
||||
end>
|
||||
ReadOnly = True
|
||||
end
|
||||
@ -354,7 +344,12 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
|
||||
Size = 25
|
||||
end
|
||||
item
|
||||
Name = 'NOMBRE_ALMACEN'
|
||||
Name = 'PERSONA_CONTACTO'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'CODIGO_CLIENTE'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
@ -382,11 +377,6 @@ object RptWordPedidoProveedor: TRptWordPedidoProveedor
|
||||
Name = 'PERSONA_CONTACTO_ALMACEN'
|
||||
DataType = datString
|
||||
Size = 255
|
||||
end
|
||||
item
|
||||
Name = 'TELEFONO_ALMACEN'
|
||||
DataType = datString
|
||||
Size = 25
|
||||
end>
|
||||
Params = <
|
||||
item
|
||||
|
||||
@ -265,11 +265,11 @@ begin
|
||||
FieldByName('CODIGOPOSTALALMACEN').AsString + ' ' + FieldByName('POBLACIONALMACEN').AsString + ', ' + FieldByName('PROVINCIAALMACEN').AsString);}
|
||||
|
||||
ReplaceBookmark('PersonaEntrega', FieldByName('PERSONA_CONTACTO_ALMACEN').AsString);
|
||||
ReplaceBookmark('NombreProveedor', FieldByName('NOMBRE').AsString);
|
||||
|
||||
ReplaceBookmark('NombreProveedor', FieldByName('NOMBRE').AsString);
|
||||
ReplaceBookmark('FaxProveedor', FieldByName('FAX').AsString);
|
||||
|
||||
{ ReplaceBookmark('PersonaContactoProveedor', FieldByName('PERSONA_CONTACTO').AsString);
|
||||
ReplaceBookmark('CodigoClienteProveedor', FieldByName('CODIGO_CLIENTE').AsString);}
|
||||
ReplaceBookmark('PersonaContactoProveedor', FieldByName('PERSONA_CONTACTO').AsString);
|
||||
ReplaceBookmark('CodigoClienteProveedor', FieldByName('CODIGO_CLIENTE').AsString);
|
||||
|
||||
if FImportes then
|
||||
ReplaceBookmark('ImporteTotal', FormatFloat(DISPLAY_EUROS2, FieldByName('IMPORTE_TOTAL').AsFloat))
|
||||
|
||||
@ -22,7 +22,7 @@ package PedidosProveedor_view;
|
||||
{$WRITEABLECONST OFF}
|
||||
{$MINENUMSIZE 1}
|
||||
{$IMAGEBASE $400000}
|
||||
{$IMPLICITBUILD ON}
|
||||
{$IMPLICITBUILD OFF}
|
||||
|
||||
requires
|
||||
GUIBase,
|
||||
@ -30,11 +30,23 @@ requires
|
||||
PedidosProveedor_controller,
|
||||
Almacenes_model,
|
||||
Almacenes_controller,
|
||||
Contactos_model,
|
||||
Contactos_controller,
|
||||
Contactos_view,
|
||||
Articulos_view,
|
||||
Obras_model,
|
||||
Obras_controller;
|
||||
|
||||
Obras_controller,
|
||||
vcl,
|
||||
rtl,
|
||||
cxLibraryD11,
|
||||
dxThemeD11,
|
||||
dxGDIPlusD11,
|
||||
cxEditorsD11,
|
||||
cxDataD11,
|
||||
dbrtl,
|
||||
vcljpg,
|
||||
vcldb;
|
||||
|
||||
contains
|
||||
uPedidosProveedorViewRegister in 'uPedidosProveedorViewRegister.pas',
|
||||
uEditorPedidosProveedor in 'uEditorPedidosProveedor.pas' {fEditorPedidosProveedor: TfEditorPedidosProveedor},
|
||||
@ -49,6 +61,7 @@ contains
|
||||
uViewElegirArticulosPedidosProveedor in 'uViewElegirArticulosPedidosProveedor.pas' {frViewElegirArticulosPedidosProveedor: TFrame},
|
||||
uEditorElegirArticulosPedidoProveedor in 'uEditorElegirArticulosPedidoProveedor.pas' {fEditorElegirArticulosPedidoProveedor: TForm},
|
||||
uEditorSituacionPedidoProveedor in 'uEditorSituacionPedidoProveedor.pas' {fEditorSituacionPedidoProveedor: TfEditorSituacionPedidoProveedor},
|
||||
uViewProveedorPedido in 'uViewProveedorPedido.pas' {frViewProveedorPedido: TFrame};
|
||||
uViewProveedorPedido in 'uViewProveedorPedido.pas' {frViewProveedorPedido: TFrame},
|
||||
uEditorElegirPersonaContactoPedido in 'uEditorElegirPersonaContactoPedido.pas';
|
||||
|
||||
end.
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<PropertyGroup>
|
||||
<ProjectGuid>{9e558626-cf49-4cff-a178-e12c186758ac}</ProjectGuid>
|
||||
<MainSource>PedidosProveedor_view.dpk</MainSource>
|
||||
@ -41,23 +42,34 @@
|
||||
<Borland.Personality>Delphi.Personality</Borland.Personality>
|
||||
<Borland.ProjectType>Package</Borland.ProjectType>
|
||||
<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="ImplicitBuild">True</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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">PedidosProveedor_view.dpk</Source></Source></Delphi.Personality></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="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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">PedidosProveedor_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
|
||||
</ProjectExtensions>
|
||||
<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
|
||||
<ItemGroup>
|
||||
<DelphiCompile Include="PedidosProveedor_view.dpk">
|
||||
<MainSource>MainSource</MainSource>
|
||||
</DelphiCompile>
|
||||
<DCCReference Include="..\..\Contactos\Plugin\Almacenes_controller.dcp" />
|
||||
<DCCReference Include="..\..\Contactos\Plugin\Almacenes_model.dcp" />
|
||||
<DCCReference Include="..\..\Contactos\Plugin\Articulos_view.dcp" />
|
||||
<DCCReference Include="..\..\Contactos\Plugin\Contactos_view.dcp" />
|
||||
<DCCReference Include="..\..\Contactos\Plugin\GUIBase.dcp" />
|
||||
<DCCReference Include="..\..\Contactos\Plugin\Obras_controller.dcp" />
|
||||
<DCCReference Include="..\..\Contactos\Plugin\Obras_controllercontainsuPedidosProveedorViewRegisterin.dcp" />
|
||||
<DCCReference Include="..\..\Contactos\Plugin\Obras_model.dcp" />
|
||||
<DCCReference Include="..\..\Contactos\Plugin\PedidosProveedor_controller.dcp" />
|
||||
<DCCReference Include="..\..\Contactos\Plugin\PedidosProveedor_model.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Almacenes_controller.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Almacenes_model.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Articulos_view.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Contactos_view.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Obras_controller.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\Obras_model.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_controller.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\PedidosProveedor_model.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
|
||||
<DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
|
||||
<DCCReference Include="uEditorDireccionEntregaPedidoProveedor.pas">
|
||||
<Form>fEditorDireccionEntregaPedidoProveedor </Form>
|
||||
<DesignClass>TfEditorDireccionEntregaPedidoProveedor</DesignClass>
|
||||
@ -70,6 +82,7 @@
|
||||
<Form>fEditorElegirPedidosProveedor</Form>
|
||||
<DesignClass>TForm</DesignClass>
|
||||
</DCCReference>
|
||||
<DCCReference Include="uEditorElegirPersonaContactoPedido.pas" />
|
||||
<DCCReference Include="uEditorPedidoProveedor.pas">
|
||||
<Form>fEditorPedidoProveedor</Form>
|
||||
<DesignClass>TfEditorPedidoProveedor</DesignClass>
|
||||
|
||||
@ -3,7 +3,7 @@ object fEditorDireccionEntregaPedidoProveedor: TfEditorDireccionEntregaPedidoPro
|
||||
Top = 108
|
||||
BorderStyle = bsDialog
|
||||
Caption = 'Datos de la direcci'#243'n de entrega:'
|
||||
ClientHeight = 257
|
||||
ClientHeight = 189
|
||||
ClientWidth = 453
|
||||
Color = clBtnFace
|
||||
ParentFont = True
|
||||
@ -13,14 +13,14 @@ object fEditorDireccionEntregaPedidoProveedor: TfEditorDireccionEntregaPedidoPro
|
||||
OnShow = FormShow
|
||||
DesignSize = (
|
||||
453
|
||||
257)
|
||||
189)
|
||||
PixelsPerInch = 96
|
||||
TextHeight = 13
|
||||
object Bevel1: TBevel
|
||||
Left = 8
|
||||
Top = 14
|
||||
Width = 349
|
||||
Height = 225
|
||||
Height = 163
|
||||
Anchors = [akLeft, akTop, akRight]
|
||||
Shape = bsFrame
|
||||
end
|
||||
@ -56,22 +56,6 @@ object fEditorDireccionEntregaPedidoProveedor: TfEditorDireccionEntregaPedidoPro
|
||||
AutoSize = False
|
||||
Caption = 'C'#243'digo postal:'
|
||||
end
|
||||
object Label6: TLabel
|
||||
Left = 20
|
||||
Top = 185
|
||||
Width = 109
|
||||
Height = 13
|
||||
AutoSize = False
|
||||
Caption = 'Persona de contacto:'
|
||||
end
|
||||
object Label7: TLabel
|
||||
Left = 21
|
||||
Top = 210
|
||||
Width = 109
|
||||
Height = 13
|
||||
AutoSize = False
|
||||
Caption = 'Tel'#233'fono:'
|
||||
end
|
||||
object OKBtn: TButton
|
||||
Left = 370
|
||||
Top = 13
|
||||
@ -132,24 +116,6 @@ object fEditorDireccionEntregaPedidoProveedor: TfEditorDireccionEntregaPedidoPro
|
||||
DataSource = dsDireccion
|
||||
TabOrder = 5
|
||||
end
|
||||
object ePersonaContacto: TDBEdit
|
||||
Left = 135
|
||||
Top = 182
|
||||
Width = 210
|
||||
Height = 21
|
||||
DataField = 'PERSONA_CONTACTO'
|
||||
DataSource = dsDireccion
|
||||
TabOrder = 6
|
||||
end
|
||||
object eTelefono: TDBEdit
|
||||
Left = 136
|
||||
Top = 207
|
||||
Width = 210
|
||||
Height = 21
|
||||
DataField = 'TELEFONO'
|
||||
DataSource = dsDireccion
|
||||
TabOrder = 7
|
||||
end
|
||||
object dsDireccion: TDADataSource
|
||||
Left = 16
|
||||
Top = 46
|
||||
|
||||
@ -5,7 +5,7 @@ interface
|
||||
uses Windows, SysUtils, Classes, Graphics, Forms, Controls, StdCtrls,
|
||||
Buttons, ExtCtrls, Mask, DBCtrls, DB, uDADataTable,
|
||||
cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit,
|
||||
uIEditorDireccionEntregaPedidoProveedor, uBizPedidosProveedor;
|
||||
uIEditorDireccionEntregaPedidoProveedor, uBizPedidosProveedor, uDAInterfaces;
|
||||
|
||||
type
|
||||
TfEditorDireccionEntregaPedidoProveedor = class(TForm, IEditorDireccionEntregaPedidoProveedor)
|
||||
@ -21,10 +21,6 @@ type
|
||||
Label3: TLabel;
|
||||
Label4: TLabel;
|
||||
dsDireccion: TDADataSource;
|
||||
Label6: TLabel;
|
||||
ePersonaContacto: TDBEdit;
|
||||
Label7: TLabel;
|
||||
eTelefono: TDBEdit;
|
||||
|
||||
procedure FormShow(Sender: TObject);
|
||||
procedure FormClose(Sender: TObject; var Action: TCloseAction);
|
||||
@ -34,12 +30,11 @@ type
|
||||
pPoblacion: String;
|
||||
pProvincia: String;
|
||||
pCodigoPostal: String;
|
||||
pPersonaContacto: String;
|
||||
pTelefono: String;
|
||||
|
||||
FPedido : IBizPedidoProveedor;
|
||||
function GetPedido: IBizPedidoProveedor;
|
||||
procedure SetPedido(const Value: IBizPedidoProveedor);
|
||||
public
|
||||
property Pedido: IBizPedidoProveedor read GetPedido write SetPedido;
|
||||
end;
|
||||
|
||||
@ -58,8 +53,6 @@ begin
|
||||
ePoblacion.Field.Value := pPoblacion;
|
||||
eProvincia.Field.Value := pProvincia;
|
||||
eCodigoPostal.Field.Value := pCodigoPostal;
|
||||
ePersonaContacto.Field.Value := pPersonaContacto;
|
||||
eTelefono.Field.Value := pTelefono;
|
||||
end;
|
||||
end;
|
||||
|
||||
@ -70,8 +63,6 @@ begin
|
||||
pPoblacion := ePoblacion.Text;
|
||||
pProvincia := eProvincia.Text;
|
||||
pCodigoPostal := eCodigoPostal.Text;
|
||||
pPersonaContacto := ePersonaContacto.Text;
|
||||
pTelefono := eTelefono.Text;
|
||||
end;
|
||||
|
||||
function TfEditorDireccionEntregaPedidoProveedor.GetPedido: IBizPedidoProveedor;
|
||||
|
||||
@ -0,0 +1,140 @@
|
||||
inherited fEditorElegirPersonaContactoPedido: TfEditorElegirPersonaContactoPedido
|
||||
BorderStyle = bsDialog
|
||||
Caption = 'Entrega del material del pedido'
|
||||
ClientHeight = 269
|
||||
ClientWidth = 410
|
||||
Position = poScreenCenter
|
||||
OnCreate = CustomEditorCreate
|
||||
OnShow = CustomEditorShow
|
||||
ExplicitWidth = 416
|
||||
ExplicitHeight = 294
|
||||
PixelsPerInch = 96
|
||||
TextHeight = 13
|
||||
object Label1: TLabel
|
||||
Left = 21
|
||||
Top = 16
|
||||
Width = 278
|
||||
Height = 13
|
||||
Anchors = [akLeft, akTop, akRight]
|
||||
Caption = 'Indique a qui'#233'n se deber'#225' entregar el material del pedido:'
|
||||
end
|
||||
object Panel1: TPanel
|
||||
Left = 0
|
||||
Top = 228
|
||||
Width = 410
|
||||
Height = 41
|
||||
Align = alBottom
|
||||
TabOrder = 0
|
||||
DesignSize = (
|
||||
410
|
||||
41)
|
||||
object bAceptar: TButton
|
||||
Left = 246
|
||||
Top = 8
|
||||
Width = 75
|
||||
Height = 25
|
||||
Anchors = [akTop, akRight]
|
||||
Caption = 'Aceptar'
|
||||
ModalResult = 1
|
||||
TabOrder = 0
|
||||
end
|
||||
object bCancelar: TButton
|
||||
Left = 327
|
||||
Top = 8
|
||||
Width = 75
|
||||
Height = 25
|
||||
Anchors = [akTop, akRight]
|
||||
Cancel = True
|
||||
Caption = 'Cancelar'
|
||||
ModalResult = 2
|
||||
TabOrder = 1
|
||||
end
|
||||
end
|
||||
object rdxDestino1: TRadioButton
|
||||
Left = 48
|
||||
Top = 45
|
||||
Width = 335
|
||||
Height = 17
|
||||
Action = actEmpleadoEmpresa
|
||||
TabOrder = 1
|
||||
TabStop = True
|
||||
end
|
||||
object cbListaEmpleados: TcxComboBox
|
||||
Left = 63
|
||||
Top = 68
|
||||
Style.LookAndFeel.Kind = lfStandard
|
||||
Style.LookAndFeel.NativeStyle = True
|
||||
StyleDisabled.LookAndFeel.Kind = lfStandard
|
||||
StyleDisabled.LookAndFeel.NativeStyle = True
|
||||
StyleFocused.LookAndFeel.Kind = lfStandard
|
||||
StyleFocused.LookAndFeel.NativeStyle = True
|
||||
StyleHot.LookAndFeel.Kind = lfStandard
|
||||
StyleHot.LookAndFeel.NativeStyle = True
|
||||
TabOrder = 2
|
||||
Width = 320
|
||||
end
|
||||
object cbListaPersonalSubcontrata: TcxComboBox
|
||||
Left = 63
|
||||
Top = 121
|
||||
Style.LookAndFeel.Kind = lfStandard
|
||||
Style.LookAndFeel.NativeStyle = True
|
||||
StyleDisabled.LookAndFeel.Kind = lfStandard
|
||||
StyleDisabled.LookAndFeel.NativeStyle = True
|
||||
StyleFocused.LookAndFeel.Kind = lfStandard
|
||||
StyleFocused.LookAndFeel.NativeStyle = True
|
||||
StyleHot.LookAndFeel.Kind = lfStandard
|
||||
StyleHot.LookAndFeel.NativeStyle = True
|
||||
TabOrder = 3
|
||||
Width = 320
|
||||
end
|
||||
object RadioButton1: TRadioButton
|
||||
Left = 48
|
||||
Top = 98
|
||||
Width = 335
|
||||
Height = 17
|
||||
Action = actSubcontrata
|
||||
TabOrder = 4
|
||||
end
|
||||
object rdxDestino2: TRadioButton
|
||||
Left = 48
|
||||
Top = 151
|
||||
Width = 335
|
||||
Height = 17
|
||||
Action = actOtro
|
||||
TabOrder = 5
|
||||
end
|
||||
object edtTextoPersona: TcxTextEdit
|
||||
Left = 63
|
||||
Top = 174
|
||||
Style.LookAndFeel.Kind = lfStandard
|
||||
Style.LookAndFeel.NativeStyle = True
|
||||
StyleDisabled.LookAndFeel.Kind = lfStandard
|
||||
StyleDisabled.LookAndFeel.NativeStyle = True
|
||||
StyleFocused.LookAndFeel.Kind = lfStandard
|
||||
StyleFocused.LookAndFeel.NativeStyle = True
|
||||
StyleHot.LookAndFeel.Kind = lfStandard
|
||||
StyleHot.LookAndFeel.NativeStyle = True
|
||||
TabOrder = 6
|
||||
Width = 320
|
||||
end
|
||||
object ActionList1: TActionList
|
||||
Left = 8
|
||||
Top = 80
|
||||
object actEmpleadoEmpresa: TAction
|
||||
Caption = 'Empleado de '
|
||||
Checked = True
|
||||
GroupIndex = 1
|
||||
OnExecute = actEmpleadoEmpresaExecute
|
||||
end
|
||||
object actSubcontrata: TAction
|
||||
Caption = 'Personal de contacto de la obra:'
|
||||
GroupIndex = 1
|
||||
OnExecute = actSubcontrataExecute
|
||||
end
|
||||
object actOtro: TAction
|
||||
Caption = 'A la siguiente persona:'
|
||||
GroupIndex = 1
|
||||
OnExecute = actOtroExecute
|
||||
end
|
||||
end
|
||||
end
|
||||
@ -0,0 +1,259 @@
|
||||
unit uEditorElegirPersonaContactoPedido;
|
||||
|
||||
interface
|
||||
|
||||
uses
|
||||
Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
|
||||
uEditorBasico, ActnList, StdCtrls, ExtCtrls, cxGraphics, cxControls,
|
||||
cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit;
|
||||
|
||||
type
|
||||
TfEditorElegirPersonaContactoPedido = class(TfEditorBasico)
|
||||
Panel1: TPanel;
|
||||
bAceptar: TButton;
|
||||
bCancelar: TButton;
|
||||
Label1: TLabel;
|
||||
rdxDestino1: TRadioButton;
|
||||
cbListaEmpleados: TcxComboBox;
|
||||
cbListaPersonalSubcontrata: TcxComboBox;
|
||||
RadioButton1: TRadioButton;
|
||||
rdxDestino2: TRadioButton;
|
||||
ActionList1: TActionList;
|
||||
actEmpleadoEmpresa: TAction;
|
||||
actSubcontrata: TAction;
|
||||
edtTextoPersona: TcxTextEdit;
|
||||
actOtro: TAction;
|
||||
procedure CustomEditorCreate(Sender: TObject);
|
||||
procedure CustomEditorShow(Sender: TObject);
|
||||
procedure actSubcontrataExecute(Sender: TObject);
|
||||
procedure actOtroExecute(Sender: TObject);
|
||||
procedure actEmpleadoEmpresaExecute(Sender: TObject);
|
||||
private
|
||||
FIDSubcontrata: Integer;
|
||||
FPersonaContacto : String;
|
||||
procedure RefrescarEstado;
|
||||
procedure RellenarEmpleados;
|
||||
procedure RellenarPersonalSubcontrata;
|
||||
procedure BuscarPersonaContacto;
|
||||
function GetPersonaContacto: String;
|
||||
procedure SetPersonaContacto(const Value: String);
|
||||
public
|
||||
property ID_Subcontrata : Integer read FIDSubcontrata write FIDSubcontrata;
|
||||
property PersonaContacto : String read GetPersonaContacto write SetPersonaContacto;
|
||||
end;
|
||||
|
||||
function ElegirPersonaContactoPedido(const AID_Subcontrata: Integer; var ANombrePersona: String): Boolean;
|
||||
|
||||
implementation
|
||||
|
||||
{$R *.dfm}
|
||||
|
||||
uses
|
||||
uFactuGES_App, uEmpleadosController, uBizContactos, uProveedoresController,
|
||||
uStringsUtils;
|
||||
|
||||
|
||||
function ElegirPersonaContactoPedido(const AID_Subcontrata: Integer; var ANombrePersona: String): Boolean;
|
||||
begin
|
||||
with TfEditorElegirPersonaContactoPedido.Create(NIL) do
|
||||
try
|
||||
ID_Subcontrata := AID_Subcontrata;
|
||||
PersonaContacto := ANombrePersona;
|
||||
if IsPositiveResult(ShowModal) then
|
||||
begin
|
||||
ANombrePersona := PersonaContacto;
|
||||
Result := True;
|
||||
end
|
||||
else
|
||||
Result := False;
|
||||
finally
|
||||
Free;
|
||||
end;
|
||||
end;
|
||||
|
||||
|
||||
procedure TfEditorElegirPersonaContactoPedido.actEmpleadoEmpresaExecute(
|
||||
Sender: TObject);
|
||||
begin
|
||||
actEmpleadoEmpresa.Checked := True;
|
||||
RefrescarEstado;
|
||||
end;
|
||||
|
||||
procedure TfEditorElegirPersonaContactoPedido.actOtroExecute(Sender: TObject);
|
||||
begin
|
||||
actOtro.Checked := True;
|
||||
RefrescarEstado;
|
||||
end;
|
||||
|
||||
procedure TfEditorElegirPersonaContactoPedido.actSubcontrataExecute(
|
||||
Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
actSubcontrata.Checked := True;
|
||||
RefrescarEstado;
|
||||
end;
|
||||
|
||||
procedure TfEditorElegirPersonaContactoPedido.BuscarPersonaContacto;
|
||||
var
|
||||
i : integer;
|
||||
begin
|
||||
// ¿Es un empleado?
|
||||
for i := 0 to (cbListaEmpleados.Properties.Items.Count - 1) do
|
||||
begin
|
||||
if (Pos(FPersonaContacto, cbListaEmpleados.Properties.Items[i]) > 0) then
|
||||
begin
|
||||
cbListaEmpleados.Text := FPersonaContacto;
|
||||
actEmpleadoEmpresa.Checked := True;
|
||||
RefrescarEstado;
|
||||
Exit;
|
||||
end;
|
||||
end;
|
||||
|
||||
// ¿Es personal de una subcontrata?
|
||||
if (ID_Subcontrata > 0) then
|
||||
for i := 0 to (cbListaPersonalSubcontrata.Properties.Items.Count - 1) do
|
||||
begin
|
||||
if (Pos(FPersonaContacto, cbListaPersonalSubcontrata.Properties.Items[i]) > 0) then
|
||||
begin
|
||||
cbListaPersonalSubcontrata.Text := FPersonaContacto;
|
||||
actSubcontrata.Checked := True;
|
||||
RefrescarEstado;
|
||||
Exit;
|
||||
end;
|
||||
end;
|
||||
|
||||
// Es otra persona
|
||||
edtTextoPersona.Text := FPersonaContacto;
|
||||
actOtro.Checked := True;
|
||||
RefrescarEstado;
|
||||
end;
|
||||
|
||||
procedure TfEditorElegirPersonaContactoPedido.CustomEditorCreate(
|
||||
Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
FPersonaContacto := '';
|
||||
FIDSubcontrata := -1;
|
||||
actEmpleadoEmpresa.Caption := actEmpleadoEmpresa.Caption + AppFactuGES.EmpresaActiva.NOMBRE + ':';
|
||||
end;
|
||||
|
||||
procedure TfEditorElegirPersonaContactoPedido.CustomEditorShow(Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
|
||||
RellenarEmpleados;
|
||||
|
||||
if (ID_Subcontrata > 0) then
|
||||
RellenarPersonalSubcontrata
|
||||
else
|
||||
actSubcontrata.Enabled := False;
|
||||
|
||||
if not EsCadenaVacia(FPersonaContacto) then
|
||||
BuscarPersonaContacto;
|
||||
end;
|
||||
|
||||
function TfEditorElegirPersonaContactoPedido.GetPersonaContacto: String;
|
||||
begin
|
||||
if (actOtro.Checked) then
|
||||
FPersonaContacto := edtTextoPersona.Text;
|
||||
|
||||
if (actEmpleadoEmpresa.Checked) then
|
||||
FPersonaContacto := cbListaEmpleados.Text;
|
||||
|
||||
if (actSubcontrata.Checked) then
|
||||
FPersonaContacto := cbListaPersonalSubcontrata.Text;
|
||||
|
||||
Result := FPersonaContacto;
|
||||
end;
|
||||
|
||||
procedure TfEditorElegirPersonaContactoPedido.RefrescarEstado;
|
||||
begin
|
||||
if (actOtro.Checked) then
|
||||
begin
|
||||
edtTextoPersona.Enabled := True;
|
||||
cbListaEmpleados.Enabled := False;
|
||||
cbListaPersonalSubcontrata.Enabled := False;
|
||||
end;
|
||||
|
||||
if (actEmpleadoEmpresa.Checked) then
|
||||
begin
|
||||
edtTextoPersona.Enabled := False;
|
||||
cbListaEmpleados.Enabled := True;
|
||||
cbListaPersonalSubcontrata.Enabled := False;
|
||||
end;
|
||||
|
||||
if (actSubcontrata.Checked) then
|
||||
begin
|
||||
edtTextoPersona.Enabled := False;
|
||||
cbListaEmpleados.Enabled := False;
|
||||
cbListaPersonalSubcontrata.Enabled := True;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfEditorElegirPersonaContactoPedido.RellenarEmpleados;
|
||||
var
|
||||
FEmpleadosController : IEmpleadosController;
|
||||
FEmpleados : TStringList;
|
||||
i : integer;
|
||||
begin
|
||||
FEmpleadosController := TEmpleadosController.Create;
|
||||
FEmpleados := FEmpleadosController.DarListaEmpleadosConMovil;
|
||||
|
||||
ShowHourglassCursor;
|
||||
try
|
||||
with cbListaEmpleados.Properties.Items do
|
||||
begin
|
||||
BeginUpdate;
|
||||
try
|
||||
Clear;
|
||||
for i := 0 to FEmpleados.Count - 1 do
|
||||
begin
|
||||
Add(FEmpleados[i]);
|
||||
end;
|
||||
finally
|
||||
EndUpdate;
|
||||
end;
|
||||
end;
|
||||
finally
|
||||
FreeAndNIL(FEmpleados);
|
||||
FEmpleadosController := NIL;
|
||||
HideHourglassCursor;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfEditorElegirPersonaContactoPedido.RellenarPersonalSubcontrata;
|
||||
var
|
||||
FProveedoresController : IProveedoresController;
|
||||
FPersonal : TStringList;
|
||||
i : integer;
|
||||
begin
|
||||
FProveedoresController := TProveedoresController.Create;
|
||||
|
||||
ShowHourglassCursor;
|
||||
try
|
||||
FPersonal := FProveedoresController.DarListaPersonalConMovil(ID_Subcontrata);
|
||||
with cbListaPersonalSubcontrata.Properties.Items do
|
||||
begin
|
||||
BeginUpdate;
|
||||
try
|
||||
Clear;
|
||||
for i := 0 to FPersonal.Count - 1 do
|
||||
Add(FPersonal[i]);
|
||||
finally
|
||||
EndUpdate;
|
||||
end;
|
||||
end;
|
||||
finally
|
||||
FreeAndNIL(FPersonal);
|
||||
FProveedoresController := NIL;
|
||||
HideHourglassCursor;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfEditorElegirPersonaContactoPedido.SetPersonaContacto(
|
||||
const Value: String);
|
||||
begin
|
||||
FPersonaContacto := Value;
|
||||
end;
|
||||
|
||||
end.
|
||||
@ -1,20 +1,27 @@
|
||||
inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
|
||||
Width = 586
|
||||
Height = 301
|
||||
Height = 476
|
||||
ExplicitWidth = 586
|
||||
ExplicitHeight = 301
|
||||
ExplicitHeight = 476
|
||||
object dxLayoutControl1: TdxLayoutControl
|
||||
Left = 0
|
||||
Top = 0
|
||||
Width = 586
|
||||
Height = 301
|
||||
Height = 476
|
||||
Align = alClient
|
||||
ParentBackground = True
|
||||
TabOrder = 0
|
||||
AutoContentSizes = [acsWidth, acsHeight]
|
||||
DesignSize = (
|
||||
586
|
||||
301)
|
||||
476)
|
||||
object Bevel1: TBevel
|
||||
Left = 10
|
||||
Top = 434
|
||||
Width = 529
|
||||
Height = 5
|
||||
Shape = bsBottomLine
|
||||
end
|
||||
object rdxDestino1: TRadioButton
|
||||
Left = 10
|
||||
Top = 10
|
||||
@ -65,7 +72,7 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
|
||||
end
|
||||
object bModificar: TBitBtn
|
||||
Left = 448
|
||||
Top = 266
|
||||
Top = 403
|
||||
Width = 128
|
||||
Height = 25
|
||||
Caption = 'Modificar la direcci'#243'n...'
|
||||
@ -109,7 +116,6 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
|
||||
Properties.ListOptions.SyncMode = True
|
||||
Properties.ListSource = dsObras
|
||||
Properties.PostPopupValueOnTab = True
|
||||
Properties.OnInitPopup = cbListaObrasPropertiesInitPopup
|
||||
Style.BorderColor = clWindowFrame
|
||||
Style.BorderStyle = ebs3D
|
||||
Style.HotTrack = False
|
||||
@ -122,6 +128,31 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
|
||||
TabOrder = 3
|
||||
Width = 551
|
||||
end
|
||||
object edtEntregarA: TcxDBButtonEdit
|
||||
Left = 70
|
||||
Top = 445
|
||||
DataBinding.DataField = 'PERSONA_CONTACTO'
|
||||
DataBinding.DataSource = dsPedido
|
||||
Properties.Buttons = <
|
||||
item
|
||||
Default = True
|
||||
Kind = bkEllipsis
|
||||
end>
|
||||
Properties.ReadOnly = True
|
||||
Properties.OnButtonClick = edtEntregarAPropertiesButtonClick
|
||||
Style.BorderColor = clWindowFrame
|
||||
Style.Color = clWindow
|
||||
Style.LookAndFeel.Kind = lfStandard
|
||||
Style.LookAndFeel.NativeStyle = True
|
||||
StyleDisabled.LookAndFeel.Kind = lfStandard
|
||||
StyleDisabled.LookAndFeel.NativeStyle = True
|
||||
StyleFocused.LookAndFeel.Kind = lfStandard
|
||||
StyleFocused.LookAndFeel.NativeStyle = True
|
||||
StyleHot.LookAndFeel.Kind = lfStandard
|
||||
StyleHot.LookAndFeel.NativeStyle = True
|
||||
TabOrder = 7
|
||||
Width = 121
|
||||
end
|
||||
object dxLayoutGroup1: TdxLayoutGroup
|
||||
ShowCaption = False
|
||||
Hidden = True
|
||||
@ -177,6 +208,17 @@ inherited frViewDireccionEntregaPedidoProv: TfrViewDireccionEntregaPedidoProv
|
||||
Control = bModificar
|
||||
ControlOptions.ShowBorder = False
|
||||
end
|
||||
object dxLayoutControl1Item8: TdxLayoutItem
|
||||
Caption = 'Bevel1'
|
||||
ShowCaption = False
|
||||
Control = Bevel1
|
||||
ControlOptions.ShowBorder = False
|
||||
end
|
||||
object dxLayoutControl1Item7: TdxLayoutItem
|
||||
Caption = 'Entregar a:'
|
||||
Control = edtEntregarA
|
||||
ControlOptions.ShowBorder = False
|
||||
end
|
||||
end
|
||||
end
|
||||
object ActionList1: TActionList
|
||||
|
||||
@ -8,7 +8,8 @@ uses
|
||||
cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit, cxLookupEdit,
|
||||
cxDBLookupEdit, cxDBLookupComboBox, StdCtrls, cxControls, DB, uDADataTable,
|
||||
ActnList, uBizAlmacenes, uAlmacenesController, uPedidosProveedorController,
|
||||
Buttons, uDAInterfaces, uBizObras, uObrasController;
|
||||
Buttons, uDAInterfaces, uBizObras, uObrasController, cxButtonEdit, cxDBEdit,
|
||||
ExtCtrls;
|
||||
|
||||
type
|
||||
IViewDireccionEntregaPedidoProv = interface(IViewBase)
|
||||
@ -42,14 +43,19 @@ type
|
||||
cbListaObras: TcxDBLookupComboBox;
|
||||
dsObras: TDADataSource;
|
||||
actListaObras: TAction;
|
||||
Bevel1: TBevel;
|
||||
dxLayoutControl1Item8: TdxLayoutItem;
|
||||
edtEntregarA: TcxDBButtonEdit;
|
||||
dxLayoutControl1Item7: TdxLayoutItem;
|
||||
procedure actListaAlmacenesExecute(Sender: TObject);
|
||||
procedure actOtroExecute(Sender: TObject);
|
||||
procedure cbListaAlmacenesPropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
|
||||
procedure cbListaObrasPropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
|
||||
procedure bModificarClick(Sender: TObject);
|
||||
procedure txtDireccionDblClick(Sender: TObject);
|
||||
procedure cbListaObrasPropertiesInitPopup(Sender: TObject);
|
||||
procedure actListaObrasExecute(Sender: TObject);
|
||||
procedure edtEntregarAPropertiesButtonClick(Sender: TObject;
|
||||
AButtonIndex: Integer);
|
||||
protected
|
||||
FAlmacenesController : IAlmacenesController;
|
||||
FAlmacenes: IBizAlmacen;
|
||||
@ -75,7 +81,7 @@ implementation
|
||||
{$R *.dfm}
|
||||
|
||||
uses
|
||||
uEditorRegistryUtils, uCustomView;
|
||||
uEditorRegistryUtils, uCustomView, uEditorElegirPersonaContactoPedido;
|
||||
|
||||
procedure TfrViewDireccionEntregaPedidoProv.actListaAlmacenesExecute(Sender: TObject);
|
||||
begin
|
||||
@ -124,13 +130,12 @@ begin
|
||||
if Assigned(FPedido) and Assigned(FAlmacenes) then
|
||||
begin
|
||||
FPedido.Edit;
|
||||
FPedido.ID_OBRA := 0;
|
||||
FPedido.CALLE := FAlmacenes.CALLE;
|
||||
FPedido.POBLACION := FAlmacenes.POBLACION;
|
||||
FPedido.POBLACION := FAlmacenes.POBLACION;
|
||||
FPedido.PROVINCIA := FAlmacenes.PROVINCIA;
|
||||
FPedido.CODIGO_POSTAL := FAlmacenes.CODIGO_POSTAL;
|
||||
FPedido.PERSONA_CONTACTO := FAlmacenes.PERSONA_CONTACTO;
|
||||
FPedido.TELEFONO := FAlmacenes.TELEFONO;
|
||||
RefrescarDireccion;
|
||||
end;
|
||||
end;
|
||||
@ -140,27 +145,16 @@ begin
|
||||
if Assigned(FPedido) and Assigned(FObras) then
|
||||
begin
|
||||
FPedido.Edit;
|
||||
FPedido.ID_ALMACEN := 0;
|
||||
FPedido.CALLE := FObras.CALLE;
|
||||
FPedido.POBLACION := FObras.POBLACION;
|
||||
FPedido.POBLACION := FObras.POBLACION;
|
||||
FPedido.PROVINCIA := FObras.PROVINCIA;
|
||||
FPedido.CODIGO_POSTAL := FObras.CODIGO_POSTAL;
|
||||
FPedido.PERSONA_CONTACTO := FObras.PERSONA_CONTACTO;
|
||||
FPedido.TELEFONO := FObras.TELEFONO;
|
||||
RefrescarDireccion;
|
||||
end;
|
||||
end;
|
||||
|
||||
procedure TfrViewDireccionEntregaPedidoProv.cbListaObrasPropertiesInitPopup(
|
||||
Sender: TObject);
|
||||
begin
|
||||
inherited;
|
||||
FObrasController := TObrasController.Create;
|
||||
FObras := FObrasController.BuscarTodos;
|
||||
FObras.DataTable.Active := True;
|
||||
dsObras.DataTable := FObras.DataTable;
|
||||
end;
|
||||
|
||||
procedure TfrViewDireccionEntregaPedidoProv.cbListaObrasPropertiesValidate(
|
||||
Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
|
||||
var Error: Boolean);
|
||||
@ -185,6 +179,11 @@ begin
|
||||
FAlmacenes := FAlmacenesController.BuscarTodos;
|
||||
FAlmacenes.DataTable.Active := True;
|
||||
dsAlmacenes.DataTable := FAlmacenes.DataTable;
|
||||
|
||||
FObrasController := TObrasController.Create;
|
||||
FObras := FObrasController.BuscarTodos;
|
||||
FObras.DataTable.Active := True;
|
||||
dsObras.DataTable := FObras.DataTable;
|
||||
end;
|
||||
|
||||
destructor TfrViewDireccionEntregaPedidoProv.Destroy;
|
||||
@ -202,6 +201,25 @@ begin
|
||||
inherited;
|
||||
end;
|
||||
|
||||
procedure TfrViewDireccionEntregaPedidoProv.edtEntregarAPropertiesButtonClick(
|
||||
Sender: TObject; AButtonIndex: Integer);
|
||||
var
|
||||
AID_Subcontrata : Integer;
|
||||
APersonaContacto : String;
|
||||
begin
|
||||
inherited;
|
||||
AID_Subcontrata := -1;
|
||||
if actListaObras.Checked then
|
||||
AID_Subcontrata := FObras.ID_SUBCONTRATA;
|
||||
APersonaContacto := FPedido.PERSONA_CONTACTO;
|
||||
|
||||
if ElegirPersonaContactoPedido(AID_Subcontrata, APersonaContacto) then
|
||||
begin
|
||||
FPedido.Edit;
|
||||
FPedido.PERSONA_CONTACTO := APersonaContacto;
|
||||
end;
|
||||
end;
|
||||
|
||||
function TfrViewDireccionEntregaPedidoProv.GetPedidoProveedor: IBizPedidoProveedor;
|
||||
begin
|
||||
Result := FPedido;
|
||||
|
||||
@ -1,23 +1,22 @@
|
||||
inherited frViewPedidoProveedor: TfrViewPedidoProveedor
|
||||
Width = 787
|
||||
Height = 522
|
||||
Height = 615
|
||||
OnCreate = CustomViewCreate
|
||||
OnDestroy = CustomViewDestroy
|
||||
ExplicitWidth = 787
|
||||
ExplicitHeight = 522
|
||||
ExplicitHeight = 615
|
||||
object dxLayoutControl1: TdxLayoutControl
|
||||
Left = 0
|
||||
Top = 0
|
||||
Width = 787
|
||||
Height = 522
|
||||
Height = 615
|
||||
Align = alClient
|
||||
ParentBackground = True
|
||||
TabOrder = 0
|
||||
AutoContentSizes = [acsWidth, acsHeight]
|
||||
ExplicitWidth = 908
|
||||
DesignSize = (
|
||||
787
|
||||
522)
|
||||
615)
|
||||
object edtFechaPedido: TcxDBDateEdit
|
||||
Left = 137
|
||||
Top = 55
|
||||
@ -140,8 +139,14 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
|
||||
inherited dxLayoutControl1: TdxLayoutControl
|
||||
Width = 325
|
||||
Height = 194
|
||||
ExplicitWidth = 445
|
||||
ExplicitHeight = 166
|
||||
ExplicitWidth = 325
|
||||
ExplicitHeight = 194
|
||||
inherited Bevel1: TBevel
|
||||
Top = 272
|
||||
Width = 529
|
||||
ExplicitTop = 272
|
||||
ExplicitWidth = 529
|
||||
end
|
||||
inherited rdxDestino1: TRadioButton
|
||||
Width = 255
|
||||
ExplicitWidth = 255
|
||||
@ -156,23 +161,31 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
|
||||
end
|
||||
inherited bModificar: TBitBtn
|
||||
Left = 217
|
||||
Top = 159
|
||||
Top = 241
|
||||
ExplicitLeft = 217
|
||||
ExplicitTop = 159
|
||||
ExplicitTop = 241
|
||||
end
|
||||
inherited txtDireccion: TStaticText
|
||||
Height = 177
|
||||
ExplicitHeight = 177
|
||||
end
|
||||
inherited edtEntregarA: TcxDBButtonEdit
|
||||
Top = 283
|
||||
ExplicitTop = 283
|
||||
ExplicitWidth = 121
|
||||
Width = 121
|
||||
end
|
||||
end
|
||||
inherited ActionList1: TActionList
|
||||
Left = 32
|
||||
Top = 0
|
||||
Left = 72
|
||||
end
|
||||
inherited dsPedido: TDADataSource
|
||||
Left = 0
|
||||
Top = 0
|
||||
end
|
||||
inherited dsObras: TDADataSource
|
||||
Left = 272
|
||||
end
|
||||
end
|
||||
object cbFormaPago: TcxDBLookupComboBox
|
||||
Left = 137
|
||||
@ -285,7 +298,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
|
||||
inherited dxLayoutControl1: TdxLayoutControl
|
||||
Width = 92
|
||||
Height = 266
|
||||
ExplicitWidth = 454
|
||||
ExplicitWidth = 92
|
||||
ExplicitHeight = 266
|
||||
inherited edtlNombre: TcxDBTextEdit
|
||||
ExplicitWidth = 276
|
||||
@ -424,6 +437,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
|
||||
object dxLayoutControl1Group8: TdxLayoutGroup
|
||||
AutoAligns = []
|
||||
AlignHorz = ahClient
|
||||
AlignVert = avClient
|
||||
Caption = 'Datos de la entrega'
|
||||
object dxLayoutControl1Item8: TdxLayoutItem
|
||||
AutoAligns = [aaHorizontal]
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
inherited frViewPedidosProveedor: TfrViewPedidosProveedor
|
||||
Width = 596
|
||||
Height = 479
|
||||
ExplicitWidth = 596
|
||||
ExplicitHeight = 479
|
||||
Width = 839
|
||||
Height = 489
|
||||
ExplicitWidth = 839
|
||||
ExplicitHeight = 489
|
||||
inherited cxGrid: TcxGrid
|
||||
Width = 596
|
||||
Height = 351
|
||||
Width = 839
|
||||
Height = 361
|
||||
RootLevelOptions.DetailTabsPosition = dtpTop
|
||||
OnActiveTabChanged = cxGridActiveTabChanged
|
||||
ExplicitWidth = 596
|
||||
@ -171,12 +171,12 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor
|
||||
end
|
||||
end
|
||||
inherited frViewFiltroBase1: TfrViewFiltroBase
|
||||
Width = 596
|
||||
Width = 839
|
||||
ExplicitWidth = 596
|
||||
inherited TBXDockablePanel1: TTBXDockablePanel
|
||||
ExplicitWidth = 596
|
||||
inherited dxLayoutControl1: TdxLayoutControl
|
||||
Width = 596
|
||||
Width = 839
|
||||
ExplicitWidth = 596
|
||||
inherited txtFiltroTodo: TcxTextEdit
|
||||
ExplicitWidth = 273
|
||||
@ -187,32 +187,32 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor
|
||||
Width = 121
|
||||
end
|
||||
inherited edtFechaFinFiltro: TcxDateEdit
|
||||
Left = 251
|
||||
ExplicitLeft = 251
|
||||
Left = 347
|
||||
ExplicitLeft = 347
|
||||
ExplicitWidth = 294
|
||||
Width = 294
|
||||
end
|
||||
end
|
||||
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
|
||||
Width = 596
|
||||
Width = 839
|
||||
ExplicitWidth = 596
|
||||
inherited tbxBotones: TTBXToolbar
|
||||
Width = 586
|
||||
Width = 829
|
||||
ExplicitWidth = 586
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
inherited pnlAgrupaciones: TTBXDockablePanel
|
||||
Top = 453
|
||||
Top = 463
|
||||
Visible = True
|
||||
ExplicitTop = 453
|
||||
ExplicitWidth = 596
|
||||
inherited TBXAlignmentPanel1: TTBXAlignmentPanel
|
||||
Width = 596
|
||||
Width = 839
|
||||
ExplicitWidth = 596
|
||||
inherited TBXToolbar1: TTBXToolbar
|
||||
Width = 586
|
||||
Width = 829
|
||||
ExplicitWidth = 586
|
||||
object TBXSeparatorItem2: TTBXSeparatorItem
|
||||
end
|
||||
|
||||
Loading…
Reference in New Issue
Block a user