* Ticket #166 -> En los pedidos a proveedor poder elegir una dirección si el proveedor tiene varias sucursales

* Repaso a presupuestos (apariencia de editor ficha).
* Limpieza de código repetido en contactos.

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@784 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Build/Build.fbp5

@@ -688,7 +688,7 @@ source_path
               <Property name="PauseInterval" type="Cardinal">0</Property>
               <Property MultiValue="0" name="ProjectFile" type="WideString">%source_path%\Servidor\FactuGES_Server.dpr</Property>
               <Property name="RegenerateResource" type="WordBool">True</Property>
-              <Property name="ReleaseVersion" type="Integer">5</Property>
+              <Property name="ReleaseVersion" type="Integer">6</Property>
               <Property MultiValue="0" name="ResourceCompilerOptions" type="string"></Property>
               <Property MultiValue="0" name="ResourceCompilerPath" type="string"></Property>
               <Property name="ResourceCompilerType" type="TFBDelphiResourceCompiler">rcBorland</Property>
@@ -703,15 +703,15 @@ source_path
               <Property name="UseVersionFromDOF" type="Boolean">True</Property>
               <Property MultiValue="1" name="VersionInfoKeys" type="WideString"><![CDATA[CompanyName=
 FileDescription=
-FileVersion=1.4.5.0
+FileVersion=1.4.6.0
 InternalName=
 LegalCopyright=
 LegalTrademarks=
 OriginalFilename=
 ProductName=
-ProductVersion=1.4.5.0
+ProductVersion=1.4.6.0
 Comments=
-CompileDate=lunes, 10 de noviembre de 2008 14:07
+CompileDate=martes, 11 de noviembre de 2008 20:02
 ]]>
                 </Property>
               <Property MultiValue="0" name="VersionInfoPropertySetName" type="string"></Property>
@@ -9506,7 +9506,7 @@ Comments=
                   <Property name="DebugVersionNumbers" type="Boolean">False</Property>
                   <Property MultiValue="1" name="Description" type="string"><![CDATA[Compile Modulos\Banca electronica\Controller\BancaElectronica_controller.dpk]]>
                     </Property>
-                  <Property name="Enabled" type="WordBool">True</Property>
+                  <Property name="Enabled" type="WordBool">False</Property>
                   <Property name="ExpandActionLogTitle" type="Boolean">True</Property>
                   <Property MultiValue="0" name="ExtraCommandline" type="WideString"></Property>
                   <Property name="HintsAsError" type="Boolean">False</Property>
@@ -9625,7 +9625,7 @@ Comments=
                   <Property name="DebugVersionNumbers" type="Boolean">False</Property>
                   <Property MultiValue="1" name="Description" type="string"><![CDATA[Compile Modulos\Banca electronica\Views\BancaElectronica_view.dpk]]>
                     </Property>
-                  <Property name="Enabled" type="WordBool">True</Property>
+                  <Property name="Enabled" type="WordBool">False</Property>
                   <Property name="ExpandActionLogTitle" type="Boolean">True</Property>
                   <Property MultiValue="0" name="ExtraCommandline" type="WideString"></Property>
                   <Property name="HintsAsError" type="Boolean">False</Property>

Database/scripts/factuges.sql

@@ -987,6 +987,8 @@ CREATE TABLE PEDIDOS_PROVEEDOR (
     ID                   TIPO_ID NOT NULL,
     ID_EMPRESA           TIPO_ID,
     ID_PROVEEDOR         TIPO_ID,
+    ID_DIRECCION         TIPO_ID,
+    PERSONA_CONTACTO_PROV VARCHAR(255),
     REFERENCIA           VARCHAR(255),
     FECHA_PEDIDO         DATE,
     FECHA_CONFIRMACION   DATE,
@@ -998,7 +1000,7 @@ CREATE TABLE PEDIDOS_PROVEEDOR (
     INCIDENCIAS_ACTIVAS  SMALLINT DEFAULT 0 NOT NULL,
     FECHA_ALTA           TIMESTAMP,
     FECHA_MODIFICACION   TIMESTAMP,
-    USUARIO              TIPO_USUARIO,
+    USUARIO              TIPO_USUARIO,    
     CALLE                VARCHAR(255),
     CODIGO_POSTAL        VARCHAR(10),
     POBLACION            VARCHAR(255),
@@ -2945,7 +2947,9 @@ CREATE VIEW V_PEDIDOS_PROVEEDOR(
     ID,
     ID_EMPRESA,
     ID_PROVEEDOR,
-    NOMBRE,
+    NOMBRE,    
+    ID_DIRECCION,
+    PERSONA_CONTACTO_PROV,
     REFERENCIA,
     SITUACION,
     FECHA_ENVIO,
@@ -2988,6 +2992,8 @@ SELECT
   PEDIDOS_PROVEEDOR.ID_EMPRESA,
   PEDIDOS_PROVEEDOR.ID_PROVEEDOR,
   CONTACTOS.NOMBRE,
+  PEDIDOS_PROVEEDOR.ID_DIRECCION,
+  PEDIDOS_PROVEEDOR.PERSONA_CONTACTO_PROV,
   PEDIDOS_PROVEEDOR.REFERENCIA,
   TRIM(V_PED_PROV_SITUACION.SITUACION),
   PEDIDOS_PROVEEDOR.FECHA_ENVIO,

Source/Base/Base.cfg

@@ -1,36 +0,0 @@
--$A8
--$B-
--$C+
--$D+
--$E-
--$F-
--$G+
--$H+
--$I+
--$J-
--$K-
--$L+
--$M-
--$N+
--$O-
--$P+
--$Q-
--$R-
--$S-
--$T-
--$U-
--$V+
--$W+
--$X+
--$YD
--$Z1
--cg
--AWinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;
--H+
--W+
--M
--$M16384,1048576
--K$00400000
--N0".\"
--LE"..\..\Output\Debug\Cliente"
--LN"..\Lib"

Source/Modulos/Contactos/Controller/Contactos_controller.dpk

@@ -73,6 +73,6 @@ contains
   uIEditorDatoBancarioContacto in 'View\uIEditorDatoBancarioContacto.pas',
   uPersonalContactoController in 'uPersonalContactoController.pas',
   uIEditorPersonalContacto in 'View\uIEditorPersonalContacto.pas',
-  uIEditorElegirPersonaContactoCliente in 'View\uIEditorElegirPersonaContactoCliente.pas';
+  uIEditorElegirPersonaContacto in 'View\uIEditorElegirPersonaContacto.pas';
 
 end.

Source/Modulos/Contactos/Controller/Contactos_controller.dproj

@@ -84,7 +84,7 @@
     <DCCReference Include="View\uIEditorElegirClientes.pas" />
     <DCCReference Include="View\uIEditorElegirContactos.pas" />
     <DCCReference Include="View\uIEditorElegirDireccionEntrega.pas" />
-    <DCCReference Include="View\uIEditorElegirPersonaContactoCliente.pas" />
+    <DCCReference Include="View\uIEditorElegirPersonaContacto.pas" />
     <DCCReference Include="View\uIEditorElegirProveedores.pas" />
     <DCCReference Include="View\uIEditorEmpleado.pas" />
     <DCCReference Include="View\uIEditorEmpleados.pas" />

Source/Modulos/Contactos/Controller/View/uIEditorElegirPersonaContacto.pas

@@ -1,4 +1,4 @@
-unit uIEditorElegirPersonaContactoCliente;
+unit uIEditorElegirPersonaContacto;
 
 interface
 
@@ -6,8 +6,8 @@ uses
   uBizContactosPersonal, uGUIBase;
 
 type
-  IEditorElegirPersonaContactoCliente = interface
+  IEditorElegirPersonaContacto = interface
-    ['{40EBA9D9-EFE4-4A0E-B433-AD61E2EAF94F}']
+    ['{B069A079-BC05-4027-BC1D-D78849F173D0}']
     function GetPersonas: IBizContactoPersonal;
     procedure SetPersonas(const Value: IBizContactoPersonal);
     property Personas: IBizContactoPersonal read GetPersonas write SetPersonas;

Source/Modulos/Contactos/Controller/uClientesController.pas

@@ -14,7 +14,6 @@ type
     function BuscarTodosTiendaWeb: IBizCliente;
     function TieneDatosBancarios(ACliente: IBizCliente) : Boolean;
     function ElegirDireccionEntrega(ACliente: IBizCliente; AMensaje: String): IBizDireccionesContacto;
-    function ElegirPersonaContacto(APersonal: IBizContactoPersonal; AMensaje: String): IBizContactoPersonal;
     function EsEliminable(ACliente: IBizContacto): Boolean;
     function Eliminar(ACliente: IBizContacto; AllItems: Boolean = false): Boolean; overload;
     procedure Preview(ACliente : IBizCliente; AllItems: Boolean = false);
@@ -46,8 +45,6 @@ type
     function TieneDatosBancarios(ACliente: IBizCliente) : Boolean;
     function ElegirDireccionEntrega(ACliente: IBizCliente;
       AMensaje: String): IBizDireccionesContacto;
-    function ElegirPersonaContacto(APersonal: IBizContactoPersonal;
-      AMensaje: String): IBizContactoPersonal;
     function EsEliminable(ACliente: IBizContacto): Boolean;
     function Eliminar(ACliente: IBizContacto; AllItems: Boolean = false): Boolean; overload;
     procedure Preview(ACliente : IBizCliente; AllItems: Boolean = false);
@@ -64,7 +61,7 @@ uses
   Forms, Classes, Windows, SysUtils, Controls, cxControls, uDialogUtils, uDataModuleClientes, uEditorRegistryUtils,
   uDataTableUtils, uDADataTable, DB, schContactosClient_Intf, uEtiquetasContactosReportController,
   uIEditorElegirClientes, uIEditorElegirDireccionEntrega, uEditorGridBase, uModuleController,
-  Dialogs, uIntegerListUtils, uIEditorElegirPersonaContactoCliente, uFactuGES_App,
+  Dialogs, uIntegerListUtils, uFactuGES_App,
   uPlugins_Intf;
 
 { TClientesController }
@@ -156,29 +153,6 @@ begin
   end;
 end;
 
-function TClientesController.ElegirPersonaContacto(
-  APersonal: IBizContactoPersonal; AMensaje: String): IBizContactoPersonal;
-var
-  AEditor : IEditorElegirPersonaContactoCliente;
-begin
-  Result := NIL;
-
-  CreateEditor('EditorElegirPersonaContactoCliente', IEditorElegirPersonaContactoCliente, AEditor);
-  if Assigned(AEditor) then
-  begin
-    try
-      AEditor.Personas := APersonal;
-      AEditor.Mensaje := AMensaje;
-      if IsPositiveResult(AEditor.ShowModal) then
-        Result := AEditor.PersonaSeleccionada;
-    finally
-      AEditor.Release;
-      AEditor := NIL;
-      Application.ProcessMessages;
-    end;
-  end;
-end;
-
 function TClientesController.Eliminar(ACliente: IBizContacto; AllItems: Boolean): Boolean;
 //En el caso de eliminar almenos un elemento del conjunto se devuelve true
 var

Source/Modulos/Contactos/Controller/uContactosController.pas

@@ -6,7 +6,7 @@ interface
 uses
   Windows, Forms, Classes, Controls, Contnrs, SysUtils, uDADataTable,
   uBizContactos, uBizContactosDatosBancarios, uIDataModuleContactos,
-  uControllerBase;
+  uControllerBase, uBizContactosPersonal;
 
 type
   IContactosController = interface(IControllerBase)
@@ -26,6 +26,8 @@ type
     function Localizar(AContactos: IBizContacto; const ID : Integer): Boolean;
     function ElegirContacto(AContactos : IBizContacto;
       AMensaje: String; AMultiSelect: Boolean): IBizContacto;
+    function ElegirPersonaContacto(APersonal: IBizContactoPersonal;
+      AMensaje: String): IBizContactoPersonal;
 
     function ExtraerSeleccionados(AContactos: IBizContacto) : IBizContacto;
     function DarListaPersonalConMovil(const IDContacto : Integer): TStringList;
@@ -59,6 +61,8 @@ type
     procedure VerTodos(AContactos: IBizContacto); virtual; abstract;
     function ElegirContacto(AContactos : IBizContacto;
       AMensaje: String; AMultiSelect: Boolean): IBizContacto; virtual; abstract;
+    function ElegirPersonaContacto(APersonal: IBizContactoPersonal;
+      AMensaje: String): IBizContactoPersonal;
     function DarListaPersonalConMovil(const IDContacto : Integer): TStringList;
   end;
 
@@ -66,7 +70,7 @@ implementation
 
 uses
   Dialogs, uEditorRegistryUtils, cxControls, DB, uDAInterfaces, uDataTableUtils,
-  schContactosClient_Intf, uFactuGES_App;
+  schContactosClient_Intf, uFactuGES_App, uIEditorElegirPersonaContacto;
 
 { TContactosController }
 
@@ -154,6 +158,29 @@ begin
   inherited;
 end;
 
+function TContactosController.ElegirPersonaContacto(
+  APersonal: IBizContactoPersonal; AMensaje: String): IBizContactoPersonal;
+var
+  AEditor : IEditorElegirPersonaContacto;
+begin
+  Result := NIL;
+
+  CreateEditor('EditorElegirPersonaContacto', IEditorElegirPersonaContacto, AEditor);
+  if Assigned(AEditor) then
+  begin
+    try
+      AEditor.Personas := APersonal;
+      AEditor.Mensaje := AMensaje;
+      if IsPositiveResult(AEditor.ShowModal) then
+        Result := AEditor.PersonaSeleccionada;
+    finally
+      AEditor.Release;
+      AEditor := NIL;
+      Application.ProcessMessages;
+    end;
+  end;
+end;
+
 function TContactosController.Eliminar(AContacto: IBizContacto): Boolean;
 begin
   Result := False;

Source/Modulos/Contactos/Controller/uProveedoresController.pas

@@ -3,8 +3,10 @@ unit uProveedoresController;
 interface
 
 uses
-  Classes, uCustomEditor, uContactosController, uBizContactos, uBizDireccionesContacto, uDireccionesContactoController,
+  Classes, uCustomEditor, uContactosController, uBizContactos,
-  uIEditorProveedores, uIEditorProveedor, uIDataModuleContactos, uIDataModuleProveedores;
+  uBizDireccionesContacto, uDireccionesContactoController, 
+  uIEditorProveedores, uIEditorProveedor, uIDataModuleContactos,
+  uIDataModuleProveedores;
 
 type
   IProveedoresController = interface(IContactosController)

Source/Modulos/Contactos/Views/Contactos_view.dpk

@@ -96,7 +96,7 @@ contains
   uViewDireccionesEntrega in 'uViewDireccionesEntrega.pas' {frViewDireccionesEntrega: TFrame},
   uViewClienteDescuentos in 'uViewClienteDescuentos.pas' {frViewClienteDescuentos: TFrame},
   uEditorDatoBancario in 'uEditorDatoBancario.pas' {fEditorDatoBancario},
-  uEditorElegirPersonaContactoCliente in 'uEditorElegirPersonaContactoCliente.pas' {fEditorElegirPersonaContactoCliente: TfEditorElegirDireccionEntrega},
+  uEditorElegirPersonaContacto in 'uEditorElegirPersonaContacto.pas' {fEditorElegirPersonaContacto: TfEditorElegirDireccionEntrega},
   uViewContactoDatosBancarios in 'uViewContactoDatosBancarios.pas' {frViewClienteDatosBancarios: TFrame},
   uViewProveedorDatosComerciales in 'uViewProveedorDatosComerciales.pas' {frViewProveedorDatosComerciales: TFrame},
   uViewClienteDatosComerciales in 'uViewClienteDatosComerciales.pas' {frViewClienteDatosComerciales: TFrame},

Source/Modulos/Contactos/Views/Contactos_view.dproj

@@ -49,52 +49,46 @@
     <DelphiCompile Include="Contactos_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Obras\adortl.dcp" />
+    <DCCReference Include="adortl.dcp" />
-    <DCCReference Include="..\..\Obras\ApplicationBase.dcp" />
+    <DCCReference Include="ApplicationBase.dcp" />
-    <DCCReference Include="..\..\Obras\Base.dcp" />
+    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="..\..\Obras\bdertl.dcp" />
+    <DCCReference Include="bdertl.dcp" />
-    <DCCReference Include="..\..\Obras\ccpackD11.dcp" />
+    <DCCReference Include="ccpackD11.dcp" />
-    <DCCReference Include="..\..\Obras\cfpack_d11.dcp" />
+    <DCCReference Include="cfpack_d11.dcp" />
-    <DCCReference Include="..\..\Obras\Contactos_controller.dcp" />
+    <DCCReference Include="Contactos_controller.dcp" />
-    <DCCReference Include="..\..\Obras\Contactos_model.dcp" />
+    <DCCReference Include="Contactos_model.dcp" />
-    <DCCReference Include="..\..\Obras\cxDataD11.dcp" />
+    <DCCReference Include="cxDataD11.dcp" />
-    <DCCReference Include="..\..\Obras\cxEditorsD11.dcp" />
+    <DCCReference Include="cxEditorsD11.dcp" />
-    <DCCReference Include="..\..\Obras\cxExportD11.dcp" />
+    <DCCReference Include="cxExportD11.dcp" />
-    <DCCReference Include="..\..\Obras\cxExtEditorsD11.dcp" />
+    <DCCReference Include="cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\..\Obras\cxGridD11.dcp" />
+    <DCCReference Include="cxGridD11.dcp" />
-    <DCCReference Include="..\..\Obras\cxLibraryD11.dcp" />
+    <DCCReference Include="cxLibraryD11.dcp" />
-    <DCCReference Include="..\..\Obras\cxPageControlD11.dcp" />
+    <DCCReference Include="cxPageControlD11.dcp" />
-    <DCCReference Include="..\..\Obras\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\..\Obras\dbrtl.dcp" />
+    <DCCReference Include="dbrtl.dcp" />
-    <DCCReference Include="..\..\Obras\designide.dcp" />
+    <DCCReference Include="designide.dcp" />
-    <DCCReference Include="..\..\Obras\dsnap.dcp" />
+    <DCCReference Include="dsnap.dcp" />
-    <DCCReference Include="..\..\Obras\dxComnD11.dcp" />
+    <DCCReference Include="dxComnD11.dcp" />
-    <DCCReference Include="..\..\Obras\dxGDIPlusD11.dcp" />
+    <DCCReference Include="dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\..\Obras\dxLayoutControlD11.dcp" />
+    <DCCReference Include="dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\..\Obras\dxThemeD11.dcp" />
+    <DCCReference Include="dxThemeD11.dcp" />
-    <DCCReference Include="..\..\Obras\FormasPago_controller.dcp" />
+    <DCCReference Include="FormasPago_controller.dcp" />
-    <DCCReference Include="..\..\Obras\FormasPago_model.dcp" />
+    <DCCReference Include="FormasPago_model.dcp" />
-    <DCCReference Include="..\..\Obras\GUIBase.dcp" />
+    <DCCReference Include="GUIBase.dcp" />
-    <DCCReference Include="..\..\Obras\GUISDK_D11.dcp" />
+    <DCCReference Include="GUISDK_D11.dcp" />
-    <DCCReference Include="..\..\Obras\Jcl.dcp" />
+    <DCCReference Include="Jcl.dcp" />
-    <DCCReference Include="..\..\Obras\JclVcl.dcp" />
+    <DCCReference Include="JclVcl.dcp" />
-    <DCCReference Include="..\..\Obras\JvCoreD11R.dcp" />
+    <DCCReference Include="JvCoreD11R.dcp" />
-    <DCCReference Include="..\..\Obras\JvCtrlsD11R.dcp" />
+    <DCCReference Include="JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\..\Obras\JvGlobusD11R.dcp" />
+    <DCCReference Include="JvGlobusD11R.dcp" />
-    <DCCReference Include="..\..\Obras\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\..\Obras\JvSystemD11R.dcp" />
+    <DCCReference Include="JvSystemD11R.dcp" />
-    <DCCReference Include="..\..\Obras\PngComponentsD10.dcp" />
+    <DCCReference Include="PngComponentsD10.dcp" />
-    <DCCReference Include="..\..\Obras\PNG_D10.dcp" />
+    <DCCReference Include="PNG_D10.dcp" />
-    <DCCReference Include="..\..\Obras\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\..\Obras\rtl.dcp" />
+    <DCCReference Include="rtl.dcp" />
-    <DCCReference Include="..\..\Obras\TiposIVA_controller.dcp" />
+    <DCCReference Include="TiposIVA_controller.dcp" />
-    <DCCReference Include="..\..\Obras\TiposIVA_model.dcp" />
+    <DCCReference Include="TiposIVA_model.dcp" />
-    <DCCReference Include="..\..\Obras\vcl.dcp" />
-    <DCCReference Include="..\..\Obras\vclactnband.dcp" />
-    <DCCReference Include="..\..\Obras\vcldb.dcp" />
-    <DCCReference Include="..\..\Obras\vcljpg.dcp" />
-    <DCCReference Include="..\..\Obras\vclx.dcp" />
-    <DCCReference Include="..\..\Obras\xmlrtl.dcp" />
     <DCCReference Include="uContactosViewRegister.pas" />
     <DCCReference Include="uEditorCliente.pas">
       <Form>fEditorCliente</Form>
@@ -127,8 +121,8 @@
       <Form>fEditorElegirDireccionEntrega</Form>
       <DesignClass>TCustomEditor</DesignClass>
     </DCCReference>
-    <DCCReference Include="uEditorElegirPersonaContactoCliente.pas">
+    <DCCReference Include="uEditorElegirPersonaContacto.pas">
-      <Form>fEditorElegirPersonaContactoCliente</Form>
+      <Form>fEditorElegirPersonaContacto</Form>
       <DesignClass>TfEditorElegirDireccionEntrega</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorElegirProveedores.pas">
@@ -247,6 +241,12 @@
       <Form>frViewProveedores</Form>
       <DesignClass>TCustomView</DesignClass>
     </DCCReference>
+    <DCCReference Include="vcl.dcp" />
+    <DCCReference Include="vclactnband.dcp" />
+    <DCCReference Include="vcldb.dcp" />
+    <DCCReference Include="vcljpg.dcp" />
+    <DCCReference Include="vclx.dcp" />
+    <DCCReference Include="xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line

Source/Modulos/Contactos/Views/uContactosViewRegister.pas

@@ -15,7 +15,7 @@ uses
   uEditorEmpleado, uEditorElegirProveedores, uEditorDireccion,
   uEditorElegirDireccionEntrega, uEditorGruposCliente, uEditorGruposProveedor, uEditorGruposEmpleado,
   uEditorFichasEmpleadoReport, uEditorEtiquetasContactosReport,
-  uEditorDatoBancario, uEditorPersonal, uEditorElegirPersonaContactoCliente;
+  uEditorDatoBancario, uEditorPersonal, uEditorElegirPersonaContacto;
 
 procedure RegisterViews;
 begin
@@ -44,7 +44,7 @@ begin
   EditorRegistry.RegisterClass(TfEditorFichasEmpleadoPreview, 'EditorFichasEmpleadoPreview');
   EditorRegistry.RegisterClass(TfEditorEtiquetasContactosPreview, 'EditorEtiquetasContactosPreview');
 
-  EditorRegistry.RegisterClass(TfEditorElegirPersonaContactoCliente, 'EditorElegirPersonaContactoCliente');
+  EditorRegistry.RegisterClass(TfEditorElegirPersonaContacto, 'EditorElegirPersonaContacto');
 end;
 
 procedure UnregisterViews;
@@ -74,7 +74,7 @@ begin
   EditorRegistry.UnRegisterClass(TfEditorFichasEmpleadoPreview);
   EditorRegistry.UnRegisterClass(TfEditorEtiquetasContactosPreview);
 
-  EditorRegistry.UnRegisterClass(TfEditorElegirPersonaContactoCliente);
+  EditorRegistry.UnRegisterClass(TfEditorElegirPersonaContacto);
 end;
 
 end.

Source/Modulos/Contactos/Views/uEditorElegirPersonaContacto.dfm

@@ -1,4 +1,4 @@
-object fEditorElegirPersonaContactoCliente: TfEditorElegirPersonaContactoCliente
+object fEditorElegirPersonaContacto: TfEditorElegirPersonaContacto
   Left = 227
   Top = 108
   BorderStyle = bsDialog

Source/Modulos/Contactos/Views/uEditorElegirPersonaContacto.pas

@@ -1,16 +1,16 @@
-unit uEditorElegirPersonaContactoCliente;
+unit uEditorElegirPersonaContacto;
 
 interface
 
 uses Windows, SysUtils, Classes, Graphics, Forms, Controls, StdCtrls,
   Buttons, ExtCtrls, Mask, DBCtrls, DB, uDADataTable,
   cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit,
-  uIEditorElegirPersonaContactoCliente, uCustomView,
+  uIEditorElegirPersonaContacto, uCustomView,
   uViewBase, uViewBarraSeleccion, JvExControls, JvComponent, JvgWizardHeader,
   DBCGrids, uBizContactosPersonal, uDAInterfaces;
 
 type
-  TfEditorElegirPersonaContactoCliente = class(TForm, IEditorElegirPersonaContactoCliente)
+  TfEditorElegirPersonaContacto = class(TForm, IEditorElegirPersonaContacto)
     dsPersonas: TDADataSource;
     frViewBarraSeleccion1: TfrViewBarraSeleccion;
     JvgWizardHeader1: TJvgWizardHeader;
@@ -54,46 +54,46 @@ uses
 
 { TfEditorDireccionEntrega }
 
-procedure TfEditorElegirPersonaContactoCliente.DBCtrlGrid1DblClick(Sender: TObject);
+procedure TfEditorElegirPersonaContacto.DBCtrlGrid1DblClick(Sender: TObject);
 begin
   frViewBarraSeleccion1.actSeleccionar.Execute;
 end;
 
-procedure TfEditorElegirPersonaContactoCliente.ComponenteDblClick(Sender: TObject);
+procedure TfEditorElegirPersonaContacto.ComponenteDblClick(Sender: TObject);
 begin
   DBCtrlGrid1DblClick(Sender);
 end;
 
-procedure TfEditorElegirPersonaContactoCliente.frViewBarraSeleccion1actCancelarExecute(
+procedure TfEditorElegirPersonaContacto.frViewBarraSeleccion1actCancelarExecute(
   Sender: TObject);
 begin
   ModalResult := mrCancel;
 end;
 
-procedure TfEditorElegirPersonaContactoCliente.frViewBarraSeleccion1actSeleccionarExecute(
+procedure TfEditorElegirPersonaContacto.frViewBarraSeleccion1actSeleccionarExecute(
   Sender: TObject);
 begin
   ModalResult := mrOk;
 end;
 
-function TfEditorElegirPersonaContactoCliente.GetPersonas: IBizContactoPersonal;
+function TfEditorElegirPersonaContacto.GetPersonas: IBizContactoPersonal;
 begin
   Result := FPersonas;
 end;
 
-function TfEditorElegirPersonaContactoCliente.GetPersonaSeleccionada: IBizContactoPersonal;
+function TfEditorElegirPersonaContacto.GetPersonaSeleccionada: IBizContactoPersonal;
 begin
   // Devuelvo el mismo objeto que recibo pero con el punto de lectura
   // posicionado en la dirección elegida.
   Result := FPersonas;
 end;
 
-function TfEditorElegirPersonaContactoCliente.GetMensaje: String;
+function TfEditorElegirPersonaContacto.GetMensaje: String;
 begin
   Result := JvgWizardHeader1.Comments.Text;
 end;
 
-procedure TfEditorElegirPersonaContactoCliente.SetPersonas(const Value: IBizContactoPersonal);
+procedure TfEditorElegirPersonaContacto.SetPersonas(const Value: IBizContactoPersonal);
 begin
   FPersonas := Value;
   if Assigned(FPersonas) then
@@ -102,7 +102,7 @@ begin
     dsPersonas.DataTable := NIL;
 end;
 
-procedure TfEditorElegirPersonaContactoCliente.SetMensaje(const AValue: String);
+procedure TfEditorElegirPersonaContacto.SetMensaje(const AValue: String);
 begin
   JvgWizardHeader1.Comments.Text := AValue;
 end;

Source/Modulos/Pedidos a proveedor/Controller/uPedidosProveedorController.pas

@@ -146,6 +146,9 @@ uses
 
 procedure TPedidosProveedorController.Anadir(APedido: IBizPedidoProveedor);
 begin
+  if not Assigned(APedido) then
+    raise Exception.Create ('Pedido no asignado (Anadir)');
+
   APedido.Insert;
 end;
 

Source/Modulos/Pedidos a proveedor/Data/uDataModulePedidosProveedor.dfm

@@ -54,6 +54,18 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor
         ServerAutoRefresh = True
         DictionaryEntry = 'PedidosProveedor_NOMBRE'
       end
+      item
+        Name = 'ID_DIRECCION'
+        DataType = datInteger
+        DictionaryEntry = 'PedidosProveedor_ID_DIRECCION'
+      end
+      item
+        Name = 'PERSONA_CONTACTO_PROV'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Contacto del proveedor'
+        DictionaryEntry = 'PedidosProveedor_PERSONA_CONTACTO_PROV'
+      end
       item
         Name = 'REFERENCIA'
         DataType = datString
@@ -101,7 +113,9 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor
         Name = 'TIPO_ALMACEN'
         DataType = datString
         Size = 10
+        DisplayLabel = 'PedidosProveedor_TIPO_ALMACEN'
         ServerAutoRefresh = True
+        DictionaryEntry = 'PedidosProveedor_TIPO_ALMACEN'
       end
       item
         Name = 'NOMBRE_ALMACEN'
@@ -279,11 +293,15 @@ inherited DataModulePedidosProveedor: TDataModulePedidosProveedor
       item
         Name = 'ID_FACTURA'
         DataType = datInteger
+        DisplayLabel = 'PedidosProveedor_ID_FACTURA'
+        DictionaryEntry = 'PedidosProveedor_ID_FACTURA'
       end
       item
         Name = 'REF_FACTURA_PROV'
         DataType = datString
         Size = 255
+        DisplayLabel = 'PedidosProveedor_REF_FACTURA_PROV'
+        DictionaryEntry = 'PedidosProveedor_REF_FACTURA_PROV'
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]

Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorClient_Intf.pas

@@ -9,9 +9,9 @@ const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_PedidosProveedor = '{4CB69ADB-F44A-4A75-85F7-9979348A5A4F}';
+  RID_PedidosProveedor = '{8C8CD94B-CD11-495F-A16A-8F3B9BEABA73}';
-  RID_PedidosProveedor_Detalles = '{10828B55-F8E8-4748-A031-675BE16BE268}';
+  RID_PedidosProveedor_Detalles = '{52075C87-DC98-4AD7-AE4B-027415F6B511}';
-  RID_PedidosProveedor_Articulos_Pendientes = '{A5CBDE98-7F16-45C9-A42D-51E06CFB3F01}';
+  RID_PedidosProveedor_Articulos_Pendientes = '{C5807540-7274-400F-8400-28EDB852A39D}';
 
   { Data table names }
   nme_PedidosProveedor = 'PedidosProveedor';
@@ -23,6 +23,8 @@ const
   fld_PedidosProveedorID_EMPRESA = 'ID_EMPRESA';
   fld_PedidosProveedorID_PROVEEDOR = 'ID_PROVEEDOR';
   fld_PedidosProveedorNOMBRE = 'NOMBRE';
+  fld_PedidosProveedorID_DIRECCION = 'ID_DIRECCION';
+  fld_PedidosProveedorPERSONA_CONTACTO_PROV = 'PERSONA_CONTACTO_PROV';
   fld_PedidosProveedorREFERENCIA = 'REFERENCIA';
   fld_PedidosProveedorSITUACION = 'SITUACION';
   fld_PedidosProveedorFECHA_ENVIO = 'FECHA_ENVIO';
@@ -65,42 +67,44 @@ const
   idx_PedidosProveedorID_EMPRESA = 1;
   idx_PedidosProveedorID_PROVEEDOR = 2;
   idx_PedidosProveedorNOMBRE = 3;
-  idx_PedidosProveedorREFERENCIA = 4;
+  idx_PedidosProveedorID_DIRECCION = 4;
-  idx_PedidosProveedorSITUACION = 5;
+  idx_PedidosProveedorPERSONA_CONTACTO_PROV = 5;
-  idx_PedidosProveedorFECHA_ENVIO = 6;
+  idx_PedidosProveedorREFERENCIA = 6;
-  idx_PedidosProveedorFECHA_PEDIDO = 7;
+  idx_PedidosProveedorSITUACION = 7;
-  idx_PedidosProveedorFECHA_CONFIRMACION = 8;
+  idx_PedidosProveedorFECHA_ENVIO = 8;
-  idx_PedidosProveedorFECHA_ENTREGA = 9;
+  idx_PedidosProveedorFECHA_PEDIDO = 9;
-  idx_PedidosProveedorID_ALMACEN = 10;
+  idx_PedidosProveedorFECHA_CONFIRMACION = 10;
-  idx_PedidosProveedorTIPO_ALMACEN = 11;
+  idx_PedidosProveedorFECHA_ENTREGA = 11;
-  idx_PedidosProveedorNOMBRE_ALMACEN = 12;
+  idx_PedidosProveedorID_ALMACEN = 12;
-  idx_PedidosProveedorID_OBRA = 13;
+  idx_PedidosProveedorTIPO_ALMACEN = 13;
-  idx_PedidosProveedorNOMBRE_OBRA = 14;
+  idx_PedidosProveedorNOMBRE_ALMACEN = 14;
-  idx_PedidosProveedorOBSERVACIONES = 15;
+  idx_PedidosProveedorID_OBRA = 15;
-  idx_PedidosProveedorIMPORTE_TOTAL = 16;
+  idx_PedidosProveedorNOMBRE_OBRA = 16;
-  idx_PedidosProveedorINCIDENCIAS = 17;
+  idx_PedidosProveedorOBSERVACIONES = 17;
-  idx_PedidosProveedorINCIDENCIAS_ACTIVAS = 18;
+  idx_PedidosProveedorIMPORTE_TOTAL = 18;
-  idx_PedidosProveedorCALLE = 19;
+  idx_PedidosProveedorINCIDENCIAS = 19;
-  idx_PedidosProveedorPOBLACION = 20;
+  idx_PedidosProveedorINCIDENCIAS_ACTIVAS = 20;
-  idx_PedidosProveedorPROVINCIA = 21;
+  idx_PedidosProveedorCALLE = 21;
-  idx_PedidosProveedorCODIGO_POSTAL = 22;
+  idx_PedidosProveedorPOBLACION = 22;
-  idx_PedidosProveedorPERSONA_CONTACTO = 23;
+  idx_PedidosProveedorPROVINCIA = 23;
-  idx_PedidosProveedorTELEFONO = 24;
+  idx_PedidosProveedorCODIGO_POSTAL = 24;
-  idx_PedidosProveedorFECHA_ALTA = 25;
+  idx_PedidosProveedorPERSONA_CONTACTO = 25;
-  idx_PedidosProveedorFECHA_MODIFICACION = 26;
+  idx_PedidosProveedorTELEFONO = 26;
-  idx_PedidosProveedorUSUARIO = 27;
+  idx_PedidosProveedorFECHA_ALTA = 27;
-  idx_PedidosProveedorID_PEDIDO_CLIENTE = 28;
+  idx_PedidosProveedorFECHA_MODIFICACION = 28;
-  idx_PedidosProveedorREF_PED_CLIENTE = 29;
+  idx_PedidosProveedorUSUARIO = 29;
-  idx_PedidosProveedorIMPORTE_NETO = 30;
+  idx_PedidosProveedorID_PEDIDO_CLIENTE = 30;
-  idx_PedidosProveedorIMPORTE_PORTE = 31;
+  idx_PedidosProveedorREF_PED_CLIENTE = 31;
-  idx_PedidosProveedorDESCUENTO = 32;
+  idx_PedidosProveedorIMPORTE_NETO = 32;
-  idx_PedidosProveedorIMPORTE_DESCUENTO = 33;
+  idx_PedidosProveedorIMPORTE_PORTE = 33;
-  idx_PedidosProveedorBASE_IMPONIBLE = 34;
+  idx_PedidosProveedorDESCUENTO = 34;
-  idx_PedidosProveedorIVA = 35;
+  idx_PedidosProveedorIMPORTE_DESCUENTO = 35;
-  idx_PedidosProveedorIMPORTE_IVA = 36;
+  idx_PedidosProveedorBASE_IMPONIBLE = 36;
-  idx_PedidosProveedorID_FORMA_PAGO = 37;
+  idx_PedidosProveedorIVA = 37;
-  idx_PedidosProveedorID_FACTURA = 38;
+  idx_PedidosProveedorIMPORTE_IVA = 38;
-  idx_PedidosProveedorREF_FACTURA_PROV = 39;
+  idx_PedidosProveedorID_FORMA_PAGO = 39;
+  idx_PedidosProveedorID_FACTURA = 40;
+  idx_PedidosProveedorREF_FACTURA_PROV = 41;
 
   { PedidosProveedor_Detalles fields }
   fld_PedidosProveedor_DetallesID = 'ID';
@@ -157,7 +161,7 @@ const
 type
   { IPedidosProveedor }
   IPedidosProveedor = interface(IDAStronglyTypedDataTable)
-  ['{662D38EC-3CAA-4034-8A93-F8BEDFCDEFB0}']
+  ['{77A2BA43-5DE9-4272-986F-3D3A120352D6}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -175,6 +179,14 @@ type
     procedure SetNOMBREValue(const aValue: String);
     function GetNOMBREIsNull: Boolean;
     procedure SetNOMBREIsNull(const aValue: Boolean);
+    function GetID_DIRECCIONValue: Integer;
+    procedure SetID_DIRECCIONValue(const aValue: Integer);
+    function GetID_DIRECCIONIsNull: Boolean;
+    procedure SetID_DIRECCIONIsNull(const aValue: Boolean);
+    function GetPERSONA_CONTACTO_PROVValue: String;
+    procedure SetPERSONA_CONTACTO_PROVValue(const aValue: String);
+    function GetPERSONA_CONTACTO_PROVIsNull: Boolean;
+    procedure SetPERSONA_CONTACTO_PROVIsNull(const aValue: Boolean);
     function GetREFERENCIAValue: String;
     procedure SetREFERENCIAValue(const aValue: String);
     function GetREFERENCIAIsNull: Boolean;
@@ -328,6 +340,10 @@ type
     property ID_PROVEEDORIsNull: Boolean read GetID_PROVEEDORIsNull write SetID_PROVEEDORIsNull;
     property NOMBRE: String read GetNOMBREValue write SetNOMBREValue;
     property NOMBREIsNull: Boolean read GetNOMBREIsNull write SetNOMBREIsNull;
+    property ID_DIRECCION: Integer read GetID_DIRECCIONValue write SetID_DIRECCIONValue;
+    property ID_DIRECCIONIsNull: Boolean read GetID_DIRECCIONIsNull write SetID_DIRECCIONIsNull;
+    property PERSONA_CONTACTO_PROV: String read GetPERSONA_CONTACTO_PROVValue write SetPERSONA_CONTACTO_PROVValue;
+    property PERSONA_CONTACTO_PROVIsNull: Boolean read GetPERSONA_CONTACTO_PROVIsNull write SetPERSONA_CONTACTO_PROVIsNull;
     property REFERENCIA: String read GetREFERENCIAValue write SetREFERENCIAValue;
     property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
     property SITUACION: String read GetSITUACIONValue write SetSITUACIONValue;
@@ -427,6 +443,14 @@ type
     procedure SetNOMBREValue(const aValue: String); virtual;
     function GetNOMBREIsNull: Boolean; virtual;
     procedure SetNOMBREIsNull(const aValue: Boolean); virtual;
+    function GetID_DIRECCIONValue: Integer; virtual;
+    procedure SetID_DIRECCIONValue(const aValue: Integer); virtual;
+    function GetID_DIRECCIONIsNull: Boolean; virtual;
+    procedure SetID_DIRECCIONIsNull(const aValue: Boolean); virtual;
+    function GetPERSONA_CONTACTO_PROVValue: String; virtual;
+    procedure SetPERSONA_CONTACTO_PROVValue(const aValue: String); virtual;
+    function GetPERSONA_CONTACTO_PROVIsNull: Boolean; virtual;
+    procedure SetPERSONA_CONTACTO_PROVIsNull(const aValue: Boolean); virtual;
     function GetREFERENCIAValue: String; virtual;
     procedure SetREFERENCIAValue(const aValue: String); virtual;
     function GetREFERENCIAIsNull: Boolean; virtual;
@@ -579,6 +603,10 @@ type
     property ID_PROVEEDORIsNull: Boolean read GetID_PROVEEDORIsNull write SetID_PROVEEDORIsNull;
     property NOMBRE: String read GetNOMBREValue write SetNOMBREValue;
     property NOMBREIsNull: Boolean read GetNOMBREIsNull write SetNOMBREIsNull;
+    property ID_DIRECCION: Integer read GetID_DIRECCIONValue write SetID_DIRECCIONValue;
+    property ID_DIRECCIONIsNull: Boolean read GetID_DIRECCIONIsNull write SetID_DIRECCIONIsNull;
+    property PERSONA_CONTACTO_PROV: String read GetPERSONA_CONTACTO_PROVValue write SetPERSONA_CONTACTO_PROVValue;
+    property PERSONA_CONTACTO_PROVIsNull: Boolean read GetPERSONA_CONTACTO_PROVIsNull write SetPERSONA_CONTACTO_PROVIsNull;
     property REFERENCIA: String read GetREFERENCIAValue write SetREFERENCIAValue;
     property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
     property SITUACION: String read GetSITUACIONValue write SetSITUACIONValue;
@@ -660,7 +688,7 @@ type
 
   { IPedidosProveedor_Detalles }
   IPedidosProveedor_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{DC9CA387-5FEC-48F1-AA50-3C235D7DDEDE}']
+  ['{1688B7AF-8975-402E-B175-13632647A605}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -875,7 +903,7 @@ type
 
   { IPedidosProveedor_Articulos_Pendientes }
   IPedidosProveedor_Articulos_Pendientes = interface(IDAStronglyTypedDataTable)
-  ['{DA816701-F81A-4BAB-A93D-AF4D96E5F977}']
+  ['{23BF9A89-AD50-447F-9532-E9C5A8AE052B}']
     { Property getters and setters }
     function GetID_PEDIDOValue: Integer;
     procedure SetID_PEDIDOValue(const aValue: Integer);
@@ -1087,6 +1115,48 @@ begin
     DataTable.Fields[idx_PedidosProveedorNOMBRE].AsVariant := Null;
 end;
 
+function TPedidosProveedorDataTableRules.GetID_DIRECCIONValue: Integer;
+begin
+  result := DataTable.Fields[idx_PedidosProveedorID_DIRECCION].AsInteger;
+end;
+
+procedure TPedidosProveedorDataTableRules.SetID_DIRECCIONValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_PedidosProveedorID_DIRECCION].AsInteger := aValue;
+end;
+
+function TPedidosProveedorDataTableRules.GetID_DIRECCIONIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_PedidosProveedorID_DIRECCION].IsNull;
+end;
+
+procedure TPedidosProveedorDataTableRules.SetID_DIRECCIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_PedidosProveedorID_DIRECCION].AsVariant := Null;
+end;
+
+function TPedidosProveedorDataTableRules.GetPERSONA_CONTACTO_PROVValue: String;
+begin
+  result := DataTable.Fields[idx_PedidosProveedorPERSONA_CONTACTO_PROV].AsString;
+end;
+
+procedure TPedidosProveedorDataTableRules.SetPERSONA_CONTACTO_PROVValue(const aValue: String);
+begin
+  DataTable.Fields[idx_PedidosProveedorPERSONA_CONTACTO_PROV].AsString := aValue;
+end;
+
+function TPedidosProveedorDataTableRules.GetPERSONA_CONTACTO_PROVIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_PedidosProveedorPERSONA_CONTACTO_PROV].IsNull;
+end;
+
+procedure TPedidosProveedorDataTableRules.SetPERSONA_CONTACTO_PROVIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_PedidosProveedorPERSONA_CONTACTO_PROV].AsVariant := Null;
+end;
+
 function TPedidosProveedorDataTableRules.GetREFERENCIAValue: String;
 begin
   result := DataTable.Fields[idx_PedidosProveedorREFERENCIA].AsString;

Source/Modulos/Pedidos a proveedor/Model/schPedidosProveedorServer_Intf.pas

@@ -9,19 +9,21 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_PedidosProveedorDelta = '{8408B177-CF20-4F20-81E0-C05E43FECA8A}';
+  RID_PedidosProveedorDelta = '{92B2043D-D31C-48BF-9253-B9FEEA699B6A}';
-  RID_PedidosProveedor_DetallesDelta = '{01EDC541-A23C-4981-BC41-F2352465DC6E}';
+  RID_PedidosProveedor_DetallesDelta = '{11A37703-CD98-4D9B-AFE2-BA7D4C9E1B31}';
-  RID_PedidosProveedor_Articulos_PendientesDelta = '{96EE04BA-6E41-482F-BBAA-D3888AAF2BB0}';
+  RID_PedidosProveedor_Articulos_PendientesDelta = '{A84711B7-4198-47B3-8A46-D337D23E9E96}';
 
 type
   { IPedidosProveedorDelta }
   IPedidosProveedorDelta = interface(IPedidosProveedor)
-  ['{8408B177-CF20-4F20-81E0-C05E43FECA8A}']
+  ['{92B2043D-D31C-48BF-9253-B9FEEA699B6A}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
     function GetOldID_PROVEEDORValue : Integer;
     function GetOldNOMBREValue : String;
+    function GetOldID_DIRECCIONValue : Integer;
+    function GetOldPERSONA_CONTACTO_PROVValue : String;
     function GetOldREFERENCIAValue : String;
     function GetOldSITUACIONValue : String;
     function GetOldFECHA_ENVIOValue : DateTime;
@@ -64,6 +66,8 @@ type
     property OldID_EMPRESA : Integer read GetOldID_EMPRESAValue;
     property OldID_PROVEEDOR : Integer read GetOldID_PROVEEDORValue;
     property OldNOMBRE : String read GetOldNOMBREValue;
+    property OldID_DIRECCION : Integer read GetOldID_DIRECCIONValue;
+    property OldPERSONA_CONTACTO_PROV : String read GetOldPERSONA_CONTACTO_PROVValue;
     property OldREFERENCIA : String read GetOldREFERENCIAValue;
     property OldSITUACION : String read GetOldSITUACIONValue;
     property OldFECHA_ENVIO : DateTime read GetOldFECHA_ENVIOValue;
@@ -135,6 +139,18 @@ type
     function GetOldNOMBREIsNull: Boolean; virtual;
     procedure SetNOMBREValue(const aValue: String); virtual;
     procedure SetNOMBREIsNull(const aValue: Boolean); virtual;
+    function GetID_DIRECCIONValue: Integer; virtual;
+    function GetID_DIRECCIONIsNull: Boolean; virtual;
+    function GetOldID_DIRECCIONValue: Integer; virtual;
+    function GetOldID_DIRECCIONIsNull: Boolean; virtual;
+    procedure SetID_DIRECCIONValue(const aValue: Integer); virtual;
+    procedure SetID_DIRECCIONIsNull(const aValue: Boolean); virtual;
+    function GetPERSONA_CONTACTO_PROVValue: String; virtual;
+    function GetPERSONA_CONTACTO_PROVIsNull: Boolean; virtual;
+    function GetOldPERSONA_CONTACTO_PROVValue: String; virtual;
+    function GetOldPERSONA_CONTACTO_PROVIsNull: Boolean; virtual;
+    procedure SetPERSONA_CONTACTO_PROVValue(const aValue: String); virtual;
+    procedure SetPERSONA_CONTACTO_PROVIsNull(const aValue: Boolean); virtual;
     function GetREFERENCIAValue: String; virtual;
     function GetREFERENCIAIsNull: Boolean; virtual;
     function GetOldREFERENCIAValue: String; virtual;
@@ -367,6 +383,14 @@ type
     property NOMBREIsNull : Boolean read GetNOMBREIsNull write SetNOMBREIsNull;
     property OldNOMBRE : String read GetOldNOMBREValue;
     property OldNOMBREIsNull : Boolean read GetOldNOMBREIsNull;
+    property ID_DIRECCION : Integer read GetID_DIRECCIONValue write SetID_DIRECCIONValue;
+    property ID_DIRECCIONIsNull : Boolean read GetID_DIRECCIONIsNull write SetID_DIRECCIONIsNull;
+    property OldID_DIRECCION : Integer read GetOldID_DIRECCIONValue;
+    property OldID_DIRECCIONIsNull : Boolean read GetOldID_DIRECCIONIsNull;
+    property PERSONA_CONTACTO_PROV : String read GetPERSONA_CONTACTO_PROVValue write SetPERSONA_CONTACTO_PROVValue;
+    property PERSONA_CONTACTO_PROVIsNull : Boolean read GetPERSONA_CONTACTO_PROVIsNull write SetPERSONA_CONTACTO_PROVIsNull;
+    property OldPERSONA_CONTACTO_PROV : String read GetOldPERSONA_CONTACTO_PROVValue;
+    property OldPERSONA_CONTACTO_PROVIsNull : Boolean read GetOldPERSONA_CONTACTO_PROVIsNull;
     property REFERENCIA : String read GetREFERENCIAValue write SetREFERENCIAValue;
     property REFERENCIAIsNull : Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
     property OldREFERENCIA : String read GetOldREFERENCIAValue;
@@ -520,7 +544,7 @@ type
 
   { IPedidosProveedor_DetallesDelta }
   IPedidosProveedor_DetallesDelta = interface(IPedidosProveedor_Detalles)
-  ['{01EDC541-A23C-4981-BC41-F2352465DC6E}']
+  ['{11A37703-CD98-4D9B-AFE2-BA7D4C9E1B31}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_PEDIDOValue : Integer;
@@ -734,7 +758,7 @@ type
 
   { IPedidosProveedor_Articulos_PendientesDelta }
   IPedidosProveedor_Articulos_PendientesDelta = interface(IPedidosProveedor_Articulos_Pendientes)
-  ['{96EE04BA-6E41-482F-BBAA-D3888AAF2BB0}']
+  ['{A84711B7-4198-47B3-8A46-D337D23E9E96}']
     { Property getters and setters }
     function GetOldID_PEDIDOValue : Integer;
     function GetOldREFERENCIAValue : String;
@@ -986,6 +1010,68 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorNOMBRE] := Null;
 end;
 
+function TPedidosProveedorBusinessProcessorRules.GetID_DIRECCIONValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorID_DIRECCION];
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetID_DIRECCIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorID_DIRECCION]);
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetOldID_DIRECCIONValue: Integer;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_PedidosProveedorID_DIRECCION];
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetOldID_DIRECCIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_PedidosProveedorID_DIRECCION]);
+end;
+
+procedure TPedidosProveedorBusinessProcessorRules.SetID_DIRECCIONValue(const aValue: Integer);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorID_DIRECCION] := aValue;
+end;
+
+procedure TPedidosProveedorBusinessProcessorRules.SetID_DIRECCIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorID_DIRECCION] := Null;
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetPERSONA_CONTACTO_PROVValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorPERSONA_CONTACTO_PROV];
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetPERSONA_CONTACTO_PROVIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorPERSONA_CONTACTO_PROV]);
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetOldPERSONA_CONTACTO_PROVValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_PedidosProveedorPERSONA_CONTACTO_PROV];
+end;
+
+function TPedidosProveedorBusinessProcessorRules.GetOldPERSONA_CONTACTO_PROVIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_PedidosProveedorPERSONA_CONTACTO_PROV]);
+end;
+
+procedure TPedidosProveedorBusinessProcessorRules.SetPERSONA_CONTACTO_PROVValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorPERSONA_CONTACTO_PROV] := aValue;
+end;
+
+procedure TPedidosProveedorBusinessProcessorRules.SetPERSONA_CONTACTO_PROVIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorPERSONA_CONTACTO_PROV] := Null;
+end;
+
 function TPedidosProveedorBusinessProcessorRules.GetREFERENCIAValue: String;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_PedidosProveedorREFERENCIA];

Source/Modulos/Pedidos a proveedor/PedidosProveedor_Group.groupproj

@@ -12,19 +12,14 @@
     <Projects Include="..\Albaranes de cliente\Data\AlbaranesCliente_data.dproj" />
     <Projects Include="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" />
     <Projects Include="..\Albaranes de proveedor\Data\AlbaranesProveedor_data.dproj" />
-    <Projects Include="..\Albaranes de proveedor\Model\AlbaranesProveedor_model.dproj" />
-    <Projects Include="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" />
     <Projects Include="..\Articulos\Controller\Articulos_controller.dproj" />
     <Projects Include="..\Articulos\Data\Articulos_data.dproj" />
     <Projects Include="..\Articulos\Views\Articulos_view.dproj" />
     <Projects Include="..\Contactos\Controller\Contactos_controller.dproj" />
     <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
-    <Projects Include="..\Facturas de cliente\Views\FacturasCliente_view.dproj" />
     <Projects Include="..\Facturas de proveedor\Controller\FacturasProveedor_controller.dproj" />
     <Projects Include="..\Inventario\Controller\Inventario_controller.dproj" />
     <Projects Include="..\Inventario\Data\Inventario_data.dproj" />
-    <Projects Include="..\Inventario\Views\Inventario_view.dproj" />
-    <Projects Include="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" />
     <Projects Include="..\Relaciones\Pedidos de proveedor - Albaranes de proveedor\PedProv_AlbProv_relation.dproj" />
     <Projects Include="..\Relaciones\Pedidos de proveedor - Facturas de proveedor\PedProv_FacProv_relation.dproj" />
     <Projects Include="Controller\PedidosProveedor_controller.dproj" />
@@ -138,24 +133,6 @@
   <Target Name="PedidosProveedor_controller:Make">
     <MSBuild Projects="Controller\PedidosProveedor_controller.dproj" Targets="Make" />
   </Target>
-  <Target Name="PedidosProveedor_view">
-    <MSBuild Projects="Views\PedidosProveedor_view.dproj" Targets="" />
-  </Target>
-  <Target Name="PedidosProveedor_view:Clean">
-    <MSBuild Projects="Views\PedidosProveedor_view.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="PedidosProveedor_view:Make">
-    <MSBuild Projects="Views\PedidosProveedor_view.dproj" Targets="Make" />
-  </Target>
-  <Target Name="PedidosProveedor_plugin">
-    <MSBuild Projects="Plugin\PedidosProveedor_plugin.dproj" Targets="" />
-  </Target>
-  <Target Name="PedidosProveedor_plugin:Clean">
-    <MSBuild Projects="Plugin\PedidosProveedor_plugin.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="PedidosProveedor_plugin:Make">
-    <MSBuild Projects="Plugin\PedidosProveedor_plugin.dproj" Targets="Make" />
-  </Target>
   <Target Name="AlbaranesProveedor_controller">
     <MSBuild Projects="..\Albaranes de proveedor\Controller\AlbaranesProveedor_controller.dproj" Targets="" />
   </Target>
@@ -201,6 +178,24 @@
   <Target Name="PedProv_FacProv_relation:Make">
     <MSBuild Projects="..\Relaciones\Pedidos de proveedor - Facturas de proveedor\PedProv_FacProv_relation.dproj" Targets="Make" />
   </Target>
+  <Target Name="PedidosProveedor_view">
+    <MSBuild Projects="Views\PedidosProveedor_view.dproj" Targets="" />
+  </Target>
+  <Target Name="PedidosProveedor_view:Clean">
+    <MSBuild Projects="Views\PedidosProveedor_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="PedidosProveedor_view:Make">
+    <MSBuild Projects="Views\PedidosProveedor_view.dproj" Targets="Make" />
+  </Target>
+  <Target Name="PedidosProveedor_plugin">
+    <MSBuild Projects="Plugin\PedidosProveedor_plugin.dproj" Targets="" />
+  </Target>
+  <Target Name="PedidosProveedor_plugin:Clean">
+    <MSBuild Projects="Plugin\PedidosProveedor_plugin.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="PedidosProveedor_plugin:Make">
+    <MSBuild Projects="Plugin\PedidosProveedor_plugin.dproj" Targets="Make" />
+  </Target>
   <Target Name="AlbaranesProveedor_data">
     <MSBuild Projects="..\Albaranes de proveedor\Data\AlbaranesProveedor_data.dproj" Targets="" />
   </Target>
@@ -237,42 +232,6 @@
   <Target Name="FactuGES_Server:Make">
     <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
   </Target>
-  <Target Name="AlbaranesProveedor_view">
-    <MSBuild Projects="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" Targets="" />
-  </Target>
-  <Target Name="AlbaranesProveedor_view:Clean">
-    <MSBuild Projects="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="AlbaranesProveedor_view:Make">
-    <MSBuild Projects="..\Albaranes de proveedor\Views\AlbaranesProveedor_view.dproj" Targets="Make" />
-  </Target>
-  <Target Name="AlbaranesProveedor_model">
-    <MSBuild Projects="..\Albaranes de proveedor\Model\AlbaranesProveedor_model.dproj" Targets="" />
-  </Target>
-  <Target Name="AlbaranesProveedor_model:Clean">
-    <MSBuild Projects="..\Albaranes de proveedor\Model\AlbaranesProveedor_model.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="AlbaranesProveedor_model:Make">
-    <MSBuild Projects="..\Albaranes de proveedor\Model\AlbaranesProveedor_model.dproj" Targets="Make" />
-  </Target>
-  <Target Name="Inventario_view">
-    <MSBuild Projects="..\Inventario\Views\Inventario_view.dproj" Targets="" />
-  </Target>
-  <Target Name="Inventario_view:Clean">
-    <MSBuild Projects="..\Inventario\Views\Inventario_view.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="Inventario_view:Make">
-    <MSBuild Projects="..\Inventario\Views\Inventario_view.dproj" Targets="Make" />
-  </Target>
-  <Target Name="PresupuestosCliente_view">
-    <MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="" />
-  </Target>
-  <Target Name="PresupuestosCliente_view:Clean">
-    <MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="PresupuestosCliente_view:Make">
-    <MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="Make" />
-  </Target>
   <Target Name="Inventario_data">
     <MSBuild Projects="..\Inventario\Data\Inventario_data.dproj" Targets="" />
   </Target>
@@ -282,23 +241,14 @@
   <Target Name="Inventario_data:Make">
     <MSBuild Projects="..\Inventario\Data\Inventario_data.dproj" Targets="Make" />
   </Target>
-  <Target Name="FacturasCliente_view">
-    <MSBuild Projects="..\Facturas de cliente\Views\FacturasCliente_view.dproj" Targets="" />
-  </Target>
-  <Target Name="FacturasCliente_view:Clean">
-    <MSBuild Projects="..\Facturas de cliente\Views\FacturasCliente_view.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="FacturasCliente_view:Make">
-    <MSBuild Projects="..\Facturas de cliente\Views\FacturasCliente_view.dproj" Targets="Make" />
-  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_controller;Contactos_view;Articulos_data;Articulos_controller;Articulos_view;PedidosProveedor_model;PedidosProveedor_data;PedidosProveedor_controller;PedidosProveedor_view;PedidosProveedor_plugin;AlbaranesProveedor_controller;Inventario_controller;PedProv_AlbProv_relation;FacturasProveedor_controller;PedProv_FacProv_relation;AlbaranesProveedor_data;AlbaranesCliente_data;FactuGES;FactuGES_Server;AlbaranesProveedor_view;AlbaranesProveedor_model;Inventario_view;PresupuestosCliente_view;Inventario_data;FacturasCliente_view" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_controller;Contactos_view;Articulos_data;Articulos_controller;Articulos_view;PedidosProveedor_model;PedidosProveedor_data;PedidosProveedor_controller;AlbaranesProveedor_controller;Inventario_controller;PedProv_AlbProv_relation;FacturasProveedor_controller;PedProv_FacProv_relation;PedidosProveedor_view;PedidosProveedor_plugin;AlbaranesProveedor_data;AlbaranesCliente_data;FactuGES;FactuGES_Server;Inventario_data" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;PedidosProveedor_model:Clean;PedidosProveedor_data:Clean;PedidosProveedor_controller:Clean;PedidosProveedor_view:Clean;PedidosProveedor_plugin:Clean;AlbaranesProveedor_controller:Clean;Inventario_controller:Clean;PedProv_AlbProv_relation:Clean;FacturasProveedor_controller:Clean;PedProv_FacProv_relation:Clean;AlbaranesProveedor_data:Clean;AlbaranesCliente_data:Clean;FactuGES:Clean;FactuGES_Server:Clean;AlbaranesProveedor_view:Clean;AlbaranesProveedor_model:Clean;Inventario_view:Clean;PresupuestosCliente_view:Clean;Inventario_data:Clean;FacturasCliente_view:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;PedidosProveedor_model:Clean;PedidosProveedor_data:Clean;PedidosProveedor_controller:Clean;AlbaranesProveedor_controller:Clean;Inventario_controller:Clean;PedProv_AlbProv_relation:Clean;FacturasProveedor_controller:Clean;PedProv_FacProv_relation:Clean;PedidosProveedor_view:Clean;PedidosProveedor_plugin:Clean;AlbaranesProveedor_data:Clean;AlbaranesCliente_data:Clean;FactuGES:Clean;FactuGES_Server:Clean;Inventario_data:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;PedidosProveedor_model:Make;PedidosProveedor_data:Make;PedidosProveedor_controller:Make;PedidosProveedor_view:Make;PedidosProveedor_plugin:Make;AlbaranesProveedor_controller:Make;Inventario_controller:Make;PedProv_AlbProv_relation:Make;FacturasProveedor_controller:Make;PedProv_FacProv_relation:Make;AlbaranesProveedor_data:Make;AlbaranesCliente_data:Make;FactuGES:Make;FactuGES_Server:Make;AlbaranesProveedor_view:Make;AlbaranesProveedor_model:Make;Inventario_view:Make;PresupuestosCliente_view:Make;Inventario_data:Make;FacturasCliente_view:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;PedidosProveedor_model:Make;PedidosProveedor_data:Make;PedidosProveedor_controller:Make;AlbaranesProveedor_controller:Make;Inventario_controller:Make;PedProv_AlbProv_relation:Make;FacturasProveedor_controller:Make;PedProv_FacProv_relation:Make;PedidosProveedor_view:Make;PedidosProveedor_plugin:Make;AlbaranesProveedor_data:Make;AlbaranesCliente_data:Make;FactuGES:Make;FactuGES_Server:Make;Inventario_data:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>

Source/Modulos/Pedidos a proveedor/Servidor/srvPedidosProveedor_Impl.dfm

@@ -180,6 +180,14 @@ object srvPedidosProveedor: TsrvPedidosProveedor
               item
                 DatasetField = 'REF_FACTURA_PROV'
                 TableField = 'REF_FACTURA_PROV'
+              end
+              item
+                DatasetField = 'ID_DIRECCION'
+                TableField = 'ID_DIRECCION'
+              end
+              item
+                DatasetField = 'PERSONA_CONTACTO_PROV'
+                TableField = 'PERSONA_CONTACTO_PROV'
               end>
           end>
         Name = 'PedidosProveedor'
@@ -209,6 +217,17 @@ object srvPedidosProveedor: TsrvPedidosProveedor
             ServerAutoRefresh = True
             DictionaryEntry = 'PedidosProveedor_NOMBRE'
           end
+          item
+            Name = 'ID_DIRECCION'
+            DataType = datInteger
+            DictionaryEntry = 'PedidosProveedor_ID_DIRECCION'
+          end
+          item
+            Name = 'PERSONA_CONTACTO_PROV'
+            DataType = datString
+            Size = 255
+            DictionaryEntry = 'PedidosProveedor_PERSONA_CONTACTO_PROV'
+          end
           item
             Name = 'REFERENCIA'
             DataType = datString
@@ -251,6 +270,7 @@ object srvPedidosProveedor: TsrvPedidosProveedor
             DataType = datString
             Size = 10
             ServerAutoRefresh = True
+            DictionaryEntry = 'PedidosProveedor_TIPO_ALMACEN'
           end
           item
             Name = 'NOMBRE_ALMACEN'
@@ -399,11 +419,13 @@ object srvPedidosProveedor: TsrvPedidosProveedor
           item
             Name = 'ID_FACTURA'
             DataType = datInteger
+            DictionaryEntry = 'PedidosProveedor_ID_FACTURA'
           end
           item
             Name = 'REF_FACTURA_PROV'
             DataType = datString
             Size = 255
+            DictionaryEntry = 'PedidosProveedor_REF_FACTURA_PROV'
           end>
       end
       item
@@ -701,6 +723,10 @@ object srvPedidosProveedor: TsrvPedidosProveedor
       end
       item
         Params = <
+          item
+            Name = 'PERSONA_CONTACTO_PROV'
+            Value = ''
+          end
           item
             Name = 'ID'
             DataType = datAutoInc
@@ -715,6 +741,10 @@ object srvPedidosProveedor: TsrvPedidosProveedor
             Name = 'ID_PROVEEDOR'
             Value = ''
           end
+          item
+            Name = 'ID_DIRECCION'
+            Value = ''
+          end
           item
             Name = 'REFERENCIA'
             Value = ''
@@ -833,21 +863,22 @@ object srvPedidosProveedor: TsrvPedidosProveedor
             TargetTable = 'PEDIDOS_PROVEEDOR'
             SQL = 
               'INSERT'#10'  INTO PEDIDOS_PROVEEDOR'#10'    (ID, ID_EMPRESA, ID_PROVEEDO' +
-              'R, REFERENCIA, FECHA_PEDIDO,'#10'     FECHA_CONFIRMACION, FECHA_ENTR' +
+              'R, ID_DIRECCION,'#10'     PERSONA_CONTACTO_PROV, REFERENCIA, FECHA_P' +
-              'EGA, ID_ALMACEN, ID_OBRA,'#10'     OBSERVACIONES, INCIDENCIAS, INCID' +
+              'EDIDO,'#10'     FECHA_CONFIRMACION, FECHA_ENTREGA, ID_ALMACEN, ID_OB' +
-              'ENCIAS_ACTIVAS, CALLE, CODIGO_POSTAL,'#10'     POBLACION, PROVINCIA,' +
+              'RA,'#10'     OBSERVACIONES, INCIDENCIAS, INCIDENCIAS_ACTIVAS, CALLE,' +
-              ' PERSONA_CONTACTO, TELEFONO, ID_PEDIDO_CLIENTE,'#10'     IMPORTE_NET' +
+              ' CODIGO_POSTAL,'#10'     POBLACION, PROVINCIA, PERSONA_CONTACTO, TEL' +
-              'O, IMPORTE_PORTE, DESCUENTO, IMPORTE_DESCUENTO,'#10'     BASE_IMPONI' +
+              'EFONO, ID_PEDIDO_CLIENTE,'#10'     IMPORTE_NETO, IMPORTE_PORTE, DESC' +
-              'BLE, IVA, IMPORTE_IVA, IMPORTE_TOTAL, ID_FORMA_PAGO,'#10'     FECHA_' +
+              'UENTO, IMPORTE_DESCUENTO,'#10'     BASE_IMPONIBLE, IVA, IMPORTE_IVA,' +
-              'ENVIO, USUARIO, FECHA_ALTA, ID_FACTURA)'#10'  VALUES'#10'    (:ID, :ID_E' +
+              ' IMPORTE_TOTAL, ID_FORMA_PAGO,'#10'     FECHA_ENVIO, USUARIO, FECHA_' +
-              'MPRESA, :ID_PROVEEDOR, :REFERENCIA, :FECHA_PEDIDO,'#10'     :FECHA_C' +
+              'ALTA, ID_FACTURA)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, :ID_PROVEEDOR,' +
-              'ONFIRMACION, :FECHA_ENTREGA, :ID_ALMACEN, :ID_OBRA,'#10'     :OBSERV' +
+              ' :ID_DIRECCION,'#10'     :PERSONA_CONTACTO_PROV, :REFERENCIA, :FECHA' +
-              'ACIONES, :INCIDENCIAS, :INCIDENCIAS_ACTIVAS,'#10'     :CALLE, :CODIG' +
+              '_PEDIDO,'#10'     :FECHA_CONFIRMACION, :FECHA_ENTREGA, :ID_ALMACEN, ' +
-              'O_POSTAL, :POBLACION, :PROVINCIA, :PERSONA_CONTACTO,'#10'     :TELEF' +
+              ':ID_OBRA,'#10'     :OBSERVACIONES, :INCIDENCIAS, :INCIDENCIAS_ACTIVA' +
-              'ONO, :ID_PEDIDO_CLIENTE, :IMPORTE_NETO, :IMPORTE_PORTE,'#10'     :DE' +
+              'S,'#10'     :CALLE, :CODIGO_POSTAL, :POBLACION, :PROVINCIA, :PERSONA' +
-              'SCUENTO, :IMPORTE_DESCUENTO, :BASE_IMPONIBLE, :IVA,'#10'     :IMPORT' +
+              '_CONTACTO,'#10'     :TELEFONO, :ID_PEDIDO_CLIENTE, :IMPORTE_NETO, :I' +
-              'E_IVA, :IMPORTE_TOTAL, :ID_FORMA_PAGO, :FECHA_ENVIO,'#10'     :USUAR' +
+              'MPORTE_PORTE,'#10'     :DESCUENTO, :IMPORTE_DESCUENTO, :BASE_IMPONIB' +
-              'IO, CURRENT_TIMESTAMP, :ID_FACTURA)'#10
+              'LE, :IVA,'#10'     :IMPORTE_IVA, :IMPORTE_TOTAL, :ID_FORMA_PAGO, :FE' +
+              'CHA_ENVIO,'#10'     :USUARIO, CURRENT_TIMESTAMP, :ID_FACTURA)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -855,6 +886,10 @@ object srvPedidosProveedor: TsrvPedidosProveedor
       end
       item
         Params = <
+          item
+            Name = 'PERSONA_CONTACTO_PROV'
+            Value = ''
+          end
           item
             Name = 'ID'
             DataType = datAutoInc
@@ -877,6 +912,10 @@ object srvPedidosProveedor: TsrvPedidosProveedor
             Name = 'ID_PROVEEDOR'
             Value = ''
           end
+          item
+            Name = 'ID_DIRECCION'
+            Value = ''
+          end
           item
             Name = 'FECHA_ENVIO'
             Value = ''
@@ -992,22 +1031,23 @@ object srvPedidosProveedor: TsrvPedidosProveedor
             SQL = 
               'UPDATE PEDIDOS_PROVEEDOR'#10'  SET'#10'    ID = :ID,'#10'    OBSERVACIONES =' +
               ' :OBSERVACIONES,'#10'    REFERENCIA = :REFERENCIA,'#10'    ID_EMPRESA = ' +
-              ':ID_EMPRESA,'#10'    ID_PROVEEDOR = :ID_PROVEEDOR,'#10'    FECHA_ENVIO =' +
+              ':ID_EMPRESA,'#10'    ID_PROVEEDOR = :ID_PROVEEDOR,'#10'    ID_DIRECCION ' +
-              ' :FECHA_ENVIO,'#10'    FECHA_PEDIDO = :FECHA_PEDIDO, '#10'    FECHA_CONF' +
+              '= :ID_DIRECCION,'#10'    PERSONA_CONTACTO_PROV = :PERSONA_CONTACTO_P' +
-              'IRMACION = :FECHA_CONFIRMACION, '#10'    FECHA_ENTREGA = :FECHA_ENTR' +
+              'ROV,'#10'    FECHA_ENVIO = :FECHA_ENVIO,'#10'    FECHA_PEDIDO = :FECHA_P' +
-              'EGA, '#10'    INCIDENCIAS = :INCIDENCIAS, '#10'    IMPORTE_TOTAL = :IMPO' +
+              'EDIDO, '#10'    FECHA_CONFIRMACION = :FECHA_CONFIRMACION, '#10'    FECHA' +
-              'RTE_TOTAL, '#10'    INCIDENCIAS_ACTIVAS = :INCIDENCIAS_ACTIVAS, '#10'   ' +
+              '_ENTREGA = :FECHA_ENTREGA, '#10'    INCIDENCIAS = :INCIDENCIAS, '#10'   ' +
-              ' ID_ALMACEN = :ID_ALMACEN, '#10'    ID_OBRA = :ID_OBRA,'#10'    CALLE = ' +
+              ' IMPORTE_TOTAL = :IMPORTE_TOTAL, '#10'    INCIDENCIAS_ACTIVAS = :INC' +
-              ':CALLE, '#10'    POBLACION = :POBLACION, '#10'    PROVINCIA = :PROVINCIA' +
+              'IDENCIAS_ACTIVAS, '#10'    ID_ALMACEN = :ID_ALMACEN, '#10'    ID_OBRA = ' +
-              ', '#10'    CODIGO_POSTAL = :CODIGO_POSTAL, '#10'    PERSONA_CONTACTO = :' +
+              ':ID_OBRA,'#10'    CALLE = :CALLE, '#10'    POBLACION = :POBLACION, '#10'    ' +
-              'PERSONA_CONTACTO, '#10'    TELEFONO = :TELEFONO, '#10'    ID_PEDIDO_CLIE' +
+              'PROVINCIA = :PROVINCIA, '#10'    CODIGO_POSTAL = :CODIGO_POSTAL, '#10'  ' +
-              'NTE = :ID_PEDIDO_CLIENTE, '#10'    IMPORTE_NETO = :IMPORTE_NETO, '#10'  ' +
+              '  PERSONA_CONTACTO = :PERSONA_CONTACTO, '#10'    TELEFONO = :TELEFON' +
-              '  IMPORTE_PORTE = :IMPORTE_PORTE, '#10'    DESCUENTO = :DESCUENTO, '#10 +
+              'O, '#10'    ID_PEDIDO_CLIENTE = :ID_PEDIDO_CLIENTE, '#10'    IMPORTE_NET' +
-              '    IMPORTE_DESCUENTO = :IMPORTE_DESCUENTO, '#10'    BASE_IMPONIBLE ' +
+              'O = :IMPORTE_NETO, '#10'    IMPORTE_PORTE = :IMPORTE_PORTE, '#10'    DES' +
-              '= :BASE_IMPONIBLE, '#10'    IVA = :IVA, '#10'    IMPORTE_IVA = :IMPORTE_' +
+              'CUENTO = :DESCUENTO, '#10'    IMPORTE_DESCUENTO = :IMPORTE_DESCUENTO' +
-              'IVA, '#10'    ID_FORMA_PAGO = :ID_FORMA_PAGO,'#10'    USUARIO = :USUARIO' +
+              ', '#10'    BASE_IMPONIBLE = :BASE_IMPONIBLE, '#10'    IVA = :IVA, '#10'    I' +
-              ','#10'    FECHA_MODIFICACION = CURRENT_TIMESTAMP,'#10'    ID_FACTURA = :' +
+              'MPORTE_IVA = :IMPORTE_IVA, '#10'    ID_FORMA_PAGO = :ID_FORMA_PAGO,'#10 +
-              'ID_FACTURA'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
+              '    USUARIO = :USUARIO,'#10'    FECHA_MODIFICACION = CURRENT_TIMESTA' +
+              'MP,'#10'    ID_FACTURA = :ID_FACTURA'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1566,6 +1606,32 @@ object srvPedidosProveedor: TsrvPedidosProveedor
         DataType = datString
         Size = 255
         DisplayLabel = 'Obra'
+      end
+      item
+        Name = 'PedidosProveedor_ID_DIRECCION'
+        DataType = datInteger
+        DisplayLabel = 'ID_DIRECCION'
+      end
+      item
+        Name = 'PedidosProveedor_TIPO_ALMACEN'
+        DataType = datString
+        Size = 10
+        ServerAutoRefresh = True
+      end
+      item
+        Name = 'PedidosProveedor_ID_FACTURA'
+        DataType = datInteger
+      end
+      item
+        Name = 'PedidosProveedor_REF_FACTURA_PROV'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'PedidosProveedor_PERSONA_CONTACTO_PROV'
+        DataType = datString
+        Size = 255
+        DisplayLabel = 'Contacto del proveedor'
       end>
     Left = 56
     Top = 144

Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dpk

@@ -36,30 +36,7 @@ requires
   Articulos_view,
   Obras_model,
   Obras_controller,
-  vcl,
-  rtl,
-  cxLibraryD11,
-  dxThemeD11,
-  dxGDIPlusD11,
-  cxEditorsD11,
-  cxDataD11,
-  dbrtl,
-  vcljpg,
-  vcldb,
   PedProv_AlbProv_relation,
-  DataAbstract_Core_D11,
-  dsnap,
-  adortl,
-  RemObjects_Core_D11,
-  GUISDK_D11,
-  xmlrtl,
-  cfpack_d11,
-  vclx,
-  vclactnband,
-  designide,
-  ccpackD11,
-  dxLayoutControlD11,
-  dxComnD11,
   PedProv_FacProv_relation,
   GestorInformes_controller;
 
@@ -80,6 +57,7 @@ contains
   uViewProveedorPedido in 'uViewProveedorPedido.pas' {frViewProveedorPedido: TFrame},
   uEditorElegirPersonaContactoPedido in 'uEditorElegirPersonaContactoPedido.pas' {fEditorElegirPersonaContactoPedido: TfEditorSituacionPedidoProveedor},
   uViewObraReserva in 'uViewObraReserva.pas' {frViewObraReserva: TFrame},
-  uDialogOpcionesImpresion in 'uDialogOpcionesImpresion.pas' {fDialogOpcionesImpresion: T};
+  uDialogOpcionesImpresion in 'uDialogOpcionesImpresion.pas' {fDialogOpcionesImpresion: TForm},
+  uViewDatosYSeleccionProveedorPedido in 'uViewDatosYSeleccionProveedorPedido.pas' {frViewDatosYSeleccionProveedorPedido: TFrame};
 
 end.

Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj

@@ -49,46 +49,23 @@
     <DelphiCompile Include="PedidosProveedor_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\adortl.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\Almacenes_controller.dcp" />
-    <DCCReference Include="..\Almacenes_controller.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\Almacenes_model.dcp" />
-    <DCCReference Include="..\Almacenes_model.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\Articulos_view.dcp" />
-    <DCCReference Include="..\Articulos_view.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\Contactos_controller.dcp" />
-    <DCCReference Include="..\ccpackD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\Contactos_model.dcp" />
-    <DCCReference Include="..\cfpack_d11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\Contactos_view.dcp" />
-    <DCCReference Include="..\Contactos_controller.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\GestorInformes_controller.dcp" />
-    <DCCReference Include="..\Contactos_model.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\GUIBase.dcp" />
-    <DCCReference Include="..\Contactos_view.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\Obras_controller.dcp" />
-    <DCCReference Include="..\cxDataD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\Obras_model.dcp" />
-    <DCCReference Include="..\cxEditorsD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\PedidosProveedor_controller.dcp" />
-    <DCCReference Include="..\cxLibraryD11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\PedidosProveedor_model.dcp" />
-    <DCCReference Include="..\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\PedProv_AlbProv_relation.dcp" />
-    <DCCReference Include="..\dbrtl.dcp" />
+    <DCCReference Include="..\..\..\..\Resources\Iconos\Contactos\16x16\PedProv_FacProv_relation.dcp" />
-    <DCCReference Include="..\designide.dcp" />
-    <DCCReference Include="..\dsnap.dcp" />
-    <DCCReference Include="..\dxComnD11.dcp" />
-    <DCCReference Include="..\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\dxThemeD11.dcp" />
-    <DCCReference Include="..\GestorInformes_controller.dcp" />
-    <DCCReference Include="..\GUIBase.dcp" />
-    <DCCReference Include="..\GUISDK_D11.dcp" />
-    <DCCReference Include="..\Obras_controller.dcp" />
-    <DCCReference Include="..\Obras_model.dcp" />
-    <DCCReference Include="..\PedidosProveedor_controller.dcp" />
-    <DCCReference Include="..\PedidosProveedor_model.dcp" />
-    <DCCReference Include="..\PedProv_AlbProv_relation.dcp" />
-    <DCCReference Include="..\PedProv_FacProv_relation.dcp" />
-    <DCCReference Include="..\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\rtl.dcp" />
-    <DCCReference Include="..\vcl.dcp" />
-    <DCCReference Include="..\vclactnband.dcp" />
-    <DCCReference Include="..\vcldb.dcp" />
-    <DCCReference Include="..\vcljpg.dcp" />
-    <DCCReference Include="..\vclx.dcp" />
-    <DCCReference Include="..\xmlrtl.dcp" />
     <DCCReference Include="uDialogOpcionesImpresion.pas">
       <Form>fDialogOpcionesImpresion</Form>
-      <DesignClass>T</DesignClass>
+      <DesignClass>TForm</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorDireccionEntregaPedidoProveedor.pas">
       <Form>fEditorDireccionEntregaPedidoProveedor </Form>
@@ -123,6 +100,10 @@
       <DesignClass>TfEditorSituacionPedidoProveedor</DesignClass>
     </DCCReference>
     <DCCReference Include="uPedidosProveedorViewRegister.pas" />
+    <DCCReference Include="uViewDatosYSeleccionProveedorPedido.pas">
+      <Form>fruViewDatosYSeleccionProveedorPedido</Form>
+      <DesignClass>TFrame</DesignClass>
+    </DCCReference>
     <DCCReference Include="uViewDetallesPedidoProveedor.pas">
       <Form>frViewDetallesPedidoProveedor</Form>
       <DesignClass>TFrame</DesignClass>

Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.dfm

@@ -115,18 +115,24 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
           Height = 46
           ExplicitWidth = 865
           ExplicitHeight = 46
+          inherited ToolButton3: TToolButton
+            Wrap = False
+          end
           inherited ToolButton4: TToolButton
+            Left = 278
+            Top = 0
             Wrap = True
+            ExplicitLeft = 278
+            ExplicitTop = 0
           end
           inherited ToolButton14: TToolButton
             Left = 0
-            Top = 22
             Wrap = False
             ExplicitLeft = 0
-            ExplicitTop = 22
           end
           inherited FontName: TJvFontComboBox
             Left = 65
+            Top = 22
             ExplicitLeft = 399
             ExplicitTop = 0
           end
@@ -173,10 +179,8 @@ inherited fEditorPedidoProveedor: TfEditorPedidoProveedor
           inherited ToolButton12: TToolButton
             Left = 216
             Top = 27
-            Wrap = False
             ExplicitLeft = 216
             ExplicitTop = 27
-            ExplicitHeight = 22
           end
           inherited ToolButton9: TToolButton
             Left = 224

Source/Modulos/Pedidos a proveedor/Views/uEditorPedidoProveedor.pas

@@ -231,12 +231,15 @@ end;
 
 procedure TfEditorPedidoProveedor.OnProveedorChanged(Sender: TObject);
 begin
-  FPedido.Proveedor := ViewPedido.ViewProveedorPedido.Proveedor;
+	if Assigned(FPedido) then
-
+	begin
-  // Si el pedido tiene detalles hay que mirar si los descuentos y otros campos
+	  FPedido.Proveedor := ViewPedido.ViewProveedorPedido.Proveedor;
-  // para los artículos hay que cambiarlos.
+	
-  if (FPedido.Detalles.RecordCount > 0) then
+	  // Si el pedido tiene detalles hay que mirar si los descuentos y otros campos
-     FController.DetallesController.ActualizarDetalles(FPedido.Detalles, FPedido.Proveedor);
+	  // para los artículos hay que cambiarlos.
+	  if (FPedido.Detalles.RecordCount > 0) then
+	     FController.DetallesController.ActualizarDetalles(FPedido.Detalles, FPedido.Proveedor);
+	end;
 end;
 
 procedure TfEditorPedidoProveedor.pgPaginasChanging(Sender: TObject; var AllowChange: Boolean);
@@ -317,12 +320,14 @@ begin
 
     if Assigned(FViewPedido) then
     begin
-      FViewPedido.Pedido := FPedido;
       ViewPedido.ViewProveedorPedido.OnProveedorChanged := NIL;
-      ViewPedido.ViewProveedorPedido.Proveedor := FPedido.Proveedor;
+      try
-      ViewPedido.ViewProveedorPedido.OnProveedorChanged := OnProveedorChanged;
+        FViewPedido.Pedido := FPedido;
-      frViewDetallesPedidoProveedor1.Detalles := FPedido.Detalles;
+        frViewDetallesPedidoProveedor1.Detalles := FPedido.Detalles;
-      frViewDetallesPedidoProveedor1.Pedido := FPedido; //Para poder sacar los articulos del proveedor seleccionado
+        frViewDetallesPedidoProveedor1.Pedido := FPedido; //Para poder sacar los articulos del proveedor seleccionado
+      finally
+        ViewPedido.ViewProveedorPedido.OnProveedorChanged := OnProveedorChanged;
+      end;
     end;
   end;
 end;

Source/Modulos/Pedidos a proveedor/Views/uViewDatosYSeleccionProveedorPedido.dfm

@@ -0,0 +1,657 @@
+inherited frViewDatosYSeleccionProveedorPedido: TfrViewDatosYSeleccionProveedorPedido
+  Width = 505
+  Height = 171
+  ExplicitWidth = 505
+  ExplicitHeight = 171
+  object dxLayoutControl1: TdxLayoutControl
+    Left = 0
+    Top = 0
+    Width = 505
+    Height = 171
+    Margins.Left = 0
+    Margins.Top = 0
+    Margins.Right = 0
+    Margins.Bottom = 0
+    Align = alClient
+    ParentBackground = True
+    TabOrder = 0
+    TabStop = False
+    AutoContentSizes = [acsWidth, acsHeight]
+    DesignSize = (
+      505
+      171)
+    object edtlNombre: TcxDBTextEdit
+      Left = 63
+      Top = 41
+      Anchors = [akLeft, akTop, akRight]
+      AutoSize = False
+      DataBinding.DataField = 'NOMBRE'
+      DataBinding.DataSource = dsProveedor
+      Enabled = False
+      ParentFont = False
+      Properties.ReadOnly = True
+      Properties.UseLeftAlignmentOnEditing = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleDisabled.TextColor = clWindowText
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 2
+      Height = 21
+      Width = 224
+    end
+    object edtNIFCIF: TcxDBTextEdit
+      Left = 392
+      Top = 41
+      Anchors = [akLeft, akTop, akRight]
+      AutoSize = False
+      DataBinding.DataField = 'NIF_CIF'
+      DataBinding.DataSource = dsProveedor
+      Enabled = False
+      ParentFont = False
+      Properties.ReadOnly = True
+      Properties.UseLeftAlignmentOnEditing = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleDisabled.TextColor = clWindowText
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 3
+      Height = 21
+      Width = 103
+    end
+    object edtPersonaContacto: TcxDBTextEdit
+      Left = 63
+      Top = 101
+      Anchors = [akLeft, akTop, akRight]
+      AutoSize = False
+      DataBinding.DataField = 'PERSONA_CONTACTO_PROV'
+      DataBinding.DataSource = dsPedido
+      ParentFont = False
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleDisabled.TextColor = clWindowText
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 6
+      Height = 21
+      Width = 283
+    end
+    object edtDireccion: TcxTextEdit
+      Left = 63
+      Top = 70
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleDisabled.TextColor = clWindowText
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 4
+      Width = 121
+    end
+    object Button4: TButton
+      Left = 472
+      Top = 68
+      Width = 23
+      Height = 25
+      Action = actElegirDireccion
+      TabOrder = 5
+    end
+    object Button5: TButton
+      Left = 472
+      Top = 99
+      Width = 23
+      Height = 25
+      Action = actElegirPersonaContacto
+      TabOrder = 7
+    end
+    object Button3: TBitBtn
+      Left = 297
+      Top = 130
+      Width = 198
+      Height = 25
+      Action = actVerContacto
+      Caption = 'Ver ficha completa del proveedor...'
+      TabOrder = 8
+      Glyph.Data = {
+        36040000424D3604000000000000360000002800000010000000100000000100
+        2000000000000004000000000000000000000000000000000000FF00FF00FF00
+        FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00D3BDAE006543
+        2E0065432E0065432E0065432E0065432E0065432E0065432E0065432E006543
+        2E0065432E0065432E0065432E0065432E0065432E0065432E00D3BDAE00F6F1
+        EE00B49F8F00B49F8F00B49F8F00B49F8F00B49F8F00B49F8F00B49F8F00B49F
+        8F00B49F8F00B49F8F00B49F8F00B49F8F00B49F8F0065432E00D3BDAE00241B
+        7C00190B6B00190B6B00190B6B00190B6B00190B6B00190B6B00241B7C00E2D3
+        CC00DFCFC700DECDC400DBC9BF00DAC7BD00B49F8F0065432E00D3BDAE00584D
+        A5002C2D870031299D003123A1003123A20030299B002B2C8900190B6B00E6DA
+        D3009E7058009E7058009E7058009E705800B49F8F0065432E00D3BDAE007C75
+        B9002D2B92003223A300402F9800412F9B003324A4002D299200190B6B00E9DF
+        D800E6DAD300E3D5CE00E1D1C900DECDC400B49F8F0065432E00D3BDAE00CFCB
+        E700473DA400412A90006D8BA8006B8DA300422D8E00190B6B00EEE7E200ECE3
+        DE009E7058009E7058009E7058009E705800B49F8F0065432E00D3BDAE00FFFF
+        FF00C7B6DC004B9A9D005198C6004A93C0004A8A8B00ADA5C000F1EBE700EEE7
+        E200ECE3DE00E9DFD800E6DAD300E3D5CE00B49F8F0065432E00D3BDAE00FFFF
+        FF00A2CBE70059A6DC0058A6DC0053A1D7004D97CA009DB7C800F5EFEC00F1EB
+        E700EEE7E200ECE3DE00E9DFD800E6DAD300B49F8F0065432E00D3BDAE00EBF6
+        FA0068B6DE0061AEE40061ADE4005BA8DE00529FD500649BBC00F7F4F000F5EF
+        EC00F1EBE700EEE7E200ECE3DE00E9DFD800B49F8F0065432E00D3BDAE00E8F6
+        FA0057ADD30058A3D30061ACDE005EABE10054A0D6002F81A400FAF8F600F7F4
+        F000F79D6F00F79D6F00F79D6F00F79D6F00B49F8F0065432E00D3BDAE00F4FA
+        FC0074BEDC00529DCB00529AC8004F99C8004089B8002F81A400FDFCFB00FAF8
+        F600F7F4F000F5EFEC00F1EBE700EEE7E200B49F8F0065432E00D3BDAE00FFFF
+        FF00CCE9F4005EB2DD0059A4D300478EBC002F81A400C4DBE500FFFFFF00FDFC
+        FB00F79D6F00F79D6F00F79D6F00F79D6F00B49F8F0065432E00D3BDAE00FFFF
+        FF00FFFFFF00CCE9F400A2CBE700A2CBE700CCE9F400FFFFFF00FFFFFF00FFFF
+        FF00FEFEFD00FCFAF900F9F6F400F6F1EE00F2EDE90065432E00D3BDAE00D3BD
+        AE00D3BDAE00D3BDAE00D3BDAE00D3BDAE00D3BDAE00D3BDAE00D3BDAE00D3BD
+        AE00D3BDAE00D3BDAE00D3BDAE00D3BDAE00D3BDAE00D3BDAE00FF00FF00FF00
+        FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00}
+    end
+    object Button1: TBitBtn
+      Left = 10
+      Top = 10
+      Width = 120
+      Height = 25
+      Action = actElegirContacto
+      Caption = 'Elegir un proveedor'
+      TabOrder = 0
+      Glyph.Data = {
+        36040000424D3604000000000000360000002800000010000000100000000100
+        2000000000000004000000000000000000000000000000000000FF00FF00FF00
+        FF00FF00FF00EB00EB00C507C600AB13AD00A119A2009F19A000A215A400AA10
+        AC00B608B800CE00CE00EF00EF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00B118C10040407B00344A830031498F002F4596002F4499002F4597003148
+        900033498500374678005A3E5300D201D200FF00FF00FF00FF00FF00FF00FF00
+        FF004E42860035508100314990002E429C002C3CA6002B3AAA002B3BA7002D40
+        9E0030479200344F840038577500A0189F00FF00FF00FF00FF00FF00FF00FF00
+        FF004C428900334D89002F4499002B3CA8002835B4002631BB002734B6002A3A
+        AB002E429C00324B8C0036537B00B015B100FF00FF00FF00FF00FF00FF00FF00
+        FF008726B300324A8D002D409E002938AF003138B6007A7BCB002830BF002835
+        B2002D3FA10031499000483B8700EC01EC00FF00FF00FF00FF00FF00FF00FF00
+        FF00F002F60051379D002D409F002937B000808AA300D2D3D3008181BB002834
+        B2002D3FA2003A3F9300C511CE00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00EE02F4007324B7003C359300598CAE00498CBB004A81A600392A
+        71005929A600D608E100FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00FF00FF00EA0CF400608CD00054A2D80053A1D6004F9DD300488B
+        C2009D11AC00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00FF00FF008C67DE005CA9DD005CA9DD005AA7DC0056A4D900519F
+        D400565FAB00EA00EA00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00EC0DF60060A7DE0063B0E30063B0E30061AEE1005CA9DD0056A4
+        D9004E94CC00C105C600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00C532ED0066B2E5006BB7E9006BB7E90067B3E60061AEE1005AA7
+        DC00539FD500A817BE00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00BA3AE7004989B1004A85AC005895BD0068B2E30064B0E4005CA9
+        DE0053A0D400AA1BC300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00CA23E8005098C400539AC7004E93BE00437DA2005190BA005198
+        C6003C79A000BE08C300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00F804FC006995D40062ACDA005DA6D3005299C6004284AD003C7F
+        A900535AA100F300F300FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00FF00FF00C140ED0071BAEA0068B2E00059A1CF004990BC004378
+        AA00C315D600FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00FF00FF00FF00FF00C83EF000808BDF00668BCC007C60C700D116
+        E400FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00}
+    end
+    object BitBtn1: TBitBtn
+      Left = 136
+      Top = 10
+      Width = 149
+      Height = 25
+      Action = actAnadirContacto
+      Caption = 'Dar de alta un proveedor'
+      TabOrder = 1
+      Glyph.Data = {
+        36040000424D3604000000000000360000002800000010000000100000000100
+        2000000000000004000000000000000000000000000000000000FF00FF00FF00
+        FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00D5BFB1006947
+        3100694731006947310069473100694731006947310069473100694731006947
+        3100694731006947310069473100694731006947310069473100D5BFB100F6F2
+        EF00B7A29300B7A29300B7A29300B7A29300B7A29300B7A29300B7A29300B7A2
+        9300B7A29300B7A29300B7A29300B7A29300B7A2930069473100D5BFB100271E
+        80001C0D6F001C0D6F001C0D6F001C0D6F001C0D6F001C0D6F00271E8000E3D5
+        CE00E0D1C900DFCFC600DCCBC100DBC9BF00B7A2930069473100D5BFB1005C51
+        A8002F308B00352CA0003526A4003526A500332C9E002E2F8D001C0D6F00E7DB
+        D500A1745C00A1745C00A1745C00A1745C00B7A2930069473100D5BFB1008079
+        BC00302E95003626A60044329B0045329E003727A700302C95001C0D6F00EAE0
+        DA00E7DBD500E4D7D000E2D3CB00DFCFC600B7A2930069473100D5BFB100D1CD
+        E8004B41A700452D9400718FAB006F91A600463092001C0D6F00EFE8E300EDE4
+        DF00A1745C00A1745C00A1745C00A1745C00B7A2930069473100D5BFB100FFFF
+        FF00C9B9DD004F9DA000559BC8004E96C2004E8E8F00B0A8C200F2ECE800EFE8
+        E300EDE4DF00EAE0DA00E7DBD500E4D7D000B7A2930069473100D5BFB100FFFF
+        FF00A5CDE8005DA9DD005CA9DD0057A4D900519ACC00A0BACA00F5F0ED00F2EC
+        E800EFE8E300EDE4DF00EAE0DA00E7DBD500B7A2930069473100D5BFB100ECF6
+        FA006CB9DF0065B1E50065B0E5005FABDF0056A2D700689EBE00F7F4F100F5F0
+        ED00F2ECE800006000000060000000600000B7A2930069473100D5BFB100E9F6
+        FA005BB0D5005CA6D50065AFDF0062AEE20058A3D8003285A700FAF8F600F7F4
+        F100F7A073000060000033CB510000600000B7A2930069473100D5BFB100F4FA
+        FC0078C0DD0056A0CD00569DCA00539CCA00448DBB003285A700FDFCFB000060
+        0000006000000060000040D86500006000000060000000600000D5BFB100FFFF
+        FF00CEEAF40062B5DE005DA7D5004B92BE003285A700C6DCE600FFFFFF000060
+        000060F898005AF28F004DE57A0040D865003AD25C0000600000D5BFB100FFFF
+        FF00FFFFFF00CEEAF400A5CDE800A5CDE800CEEAF400FFFFFF00FFFFFF000060
+        000000600000006000005AF28F00006000000060000000600000D5BFB100D5BF
+        B100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BFB100D5BF
+        B100D5BFB1000060000060F8980000600000D5BFB100D5BFB100FF00FF00FF00
+        FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00
+        FF00FF00FF00006000000060000000600000FF00FF00FF00FF00}
+    end
+    object dxLayoutControl1Group_Root: TdxLayoutGroup
+      ShowCaption = False
+      Hidden = True
+      ShowBorder = False
+      object dxLayoutControl1Group1: TdxLayoutGroup
+        ShowCaption = False
+        Hidden = True
+        LayoutDirection = ldHorizontal
+        ShowBorder = False
+        object dxLayoutControl1Item7: TdxLayoutItem
+          ShowCaption = False
+          Control = Button1
+          ControlOptions.ShowBorder = False
+        end
+        object dxLayoutControl1Item10: TdxLayoutItem
+          ShowCaption = False
+          Control = BitBtn1
+          ControlOptions.ShowBorder = False
+        end
+      end
+      object dxLayoutControl1Group4: TdxLayoutGroup
+        ShowCaption = False
+        Hidden = True
+        LayoutDirection = ldHorizontal
+        ShowBorder = False
+        object dxLayoutControl1Item1: TdxLayoutItem
+          AutoAligns = [aaVertical]
+          AlignHorz = ahClient
+          Caption = 'Nombre:'
+          Control = edtlNombre
+          ControlOptions.ShowBorder = False
+        end
+        object dxLayoutControl1Item2: TdxLayoutItem
+          AutoAligns = [aaVertical]
+          AlignHorz = ahRight
+          Caption = 'NIF/CIF:'
+          Control = edtNIFCIF
+          ControlOptions.ShowBorder = False
+        end
+      end
+      object dxLayoutControl1Group3: TdxLayoutGroup
+        ShowCaption = False
+        Hidden = True
+        LayoutDirection = ldHorizontal
+        ShowBorder = False
+        object dxLayoutControl1Item4: TdxLayoutItem
+          AutoAligns = []
+          AlignHorz = ahClient
+          AlignVert = avCenter
+          Caption = 'Direcci'#243'n'
+          Control = edtDireccion
+          ControlOptions.ShowBorder = False
+        end
+        object dxLayoutControl1Item5: TdxLayoutItem
+          AutoAligns = [aaVertical]
+          AlignHorz = ahRight
+          Caption = 'Button4'
+          ShowCaption = False
+          Control = Button4
+          ControlOptions.ShowBorder = False
+        end
+      end
+      object dxLayoutControl1Group5: TdxLayoutGroup
+        ShowCaption = False
+        Hidden = True
+        ShowBorder = False
+        object dxLayoutControl1Group2: TdxLayoutGroup
+          ShowCaption = False
+          Hidden = True
+          LayoutDirection = ldHorizontal
+          ShowBorder = False
+          object dxLayoutControl1Item3: TdxLayoutItem
+            AutoAligns = []
+            AlignHorz = ahClient
+            AlignVert = avCenter
+            Caption = 'Contacto:'
+            Control = edtPersonaContacto
+            ControlOptions.ShowBorder = False
+          end
+          object dxLayoutControl1Item6: TdxLayoutItem
+            AutoAligns = [aaVertical]
+            AlignHorz = ahRight
+            ShowCaption = False
+            Control = Button5
+            ControlOptions.ShowBorder = False
+          end
+        end
+        object dxLayoutControl1Item9: TdxLayoutItem
+          AutoAligns = [aaVertical]
+          AlignHorz = ahRight
+          ShowCaption = False
+          Control = Button3
+          ControlOptions.ShowBorder = False
+        end
+      end
+    end
+  end
+  object dsProveedor: TDADataSource
+    Left = 400
+    Top = 8
+  end
+  object ActionList1: TActionList
+    Images = PngImageList
+    Left = 368
+    Top = 8
+    object actElegirContacto: TAction
+      Caption = 'Elegir un proveedor'
+      ImageIndex = 1
+      OnExecute = actElegirContactoExecute
+    end
+    object actAnadirContacto: TAction
+      Caption = 'Dar de alta un proveedor'
+      ImageIndex = 0
+      OnExecute = actAnadirContactoExecute
+    end
+    object actVerContacto: TAction
+      Caption = 'Ver ficha completa del proveedor...'
+      ImageIndex = 2
+      OnExecute = actVerContactoExecute
+      OnUpdate = actVerContactoUpdate
+    end
+    object actElegirDireccion: TAction
+      Caption = '...'
+      OnExecute = actElegirDireccionExecute
+      OnUpdate = actElegirDireccionUpdate
+    end
+    object actElegirPersonaContacto: TAction
+      Caption = '...'
+      OnExecute = actElegirPersonaContactoExecute
+      OnUpdate = actElegirPersonaContactoUpdate
+    end
+  end
+  object dsPedido: TDADataSource
+    Left = 336
+    Top = 8
+  end
+  object PngImageList: TPngImageList
+    PngImages = <
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          610000000970485973000017120000171201679FD25200000A4D694343505068
+          6F746F73686F70204943432070726F66696C65000078DA9D53775893F7163EDF
+          F7650F5642D8F0B1976C81002223AC08C81059A21092006184101240C585880A
+          561415119C4855C482D50A489D88E2A028B867418A885A8B555C38EE1FDCA7B5
+          7D7AEFEDEDFBD7FBBCE79CE7FCCE79CF0F8011122691E6A26A003952853C3AD8
+          1F8F4F48C4C9BD80021548E0042010E6CBC26705C50000F00379787E74B03FFC
+          01AF6F00020070D52E2412C7E1FF83BA50265700209100E02212E70B01905200
+          C82E54C81400C81800B053B3640A009400006C797C422200AA0D00ECF4493E05
+          00D8A993DC1700D8A21CA908008D0100992847240240BB00605581522C02C0C2
+          00A0AC40222E04C0AE018059B632470280BD0500768E58900F4060008099422C
+          CC0020380200431E13CD03204C03A030D2BFE0A95F7085B8480100C0CB95CD97
+          4BD23314B895D01A77F2F0E0E221E2C26CB142611729106609E4229C979B2313
+          48E7034CCE0C00001AF9D1C1FE383F90E7E6E4E1E666E76CEFF4C5A2FE6BF06F
+          223E21F1DFFEBC8C020400104ECFEFDA5FE5E5D60370C701B075BF6BA95B00DA
+          560068DFF95D33DB09A05A0AD07AF98B7938FC401E9EA150C83C1D1C0A0B0BED
+          2562A1BD30E38B3EFF33E16FE08B7EF6FC401EFEDB7AF000719A4099ADC0A383
+          FD71616E76AE528EE7CB0442316EF7E723FEC7857FFD8E29D1E234B15C2C158A
+          F15889B850224DC779B952914421C995E212E97F32F11F96FD0993770D00AC86
+          4FC04EB607B5CB6CC07EEE01028B0E58D27600407EF32D8C1A0B910010673432
+          79F7000093BFF98F402B0100CD97A4E30000BCE8185CA894174CC608000044A0
+          812AB041070CC114ACC00E9CC11DBCC01702610644400C24C03C104206E4801C
+          0AA11896411954C03AD804B5B0031AA0119AE110B4C131380DE7E0125C81EB70
+          170660189EC218BC86090441C8081361213A8811628ED822CE0817998E042261
+          48349280A420E988145122C5C872A402A9426A915D4823F22D7214398D5C40FA
+          90DBC820328AFC8ABC47319481B25103D4027540B9A81F1A8AC6A073D174340F
+          5D8096A26BD11AB41E3D80B6A2A7D14BE87574007D8A8E6380D1310E668CD961
+          5C8C87456089581A26C71663E55835568F35631D583776151BC09E61EF082402
+          8B8013EC085E8410C26C82909047584C5843A825EC23B412BA085709838431C2
+          272293A84FB4257A12F9C478623AB1905846AC26EE211E219E255E270E135F93
+          48240EC992E44E0A21259032490B496B48DB482DA453A43ED210699C4C26EB90
+          6DC9DEE408B280AC209791B7900F904F92FBC9C3E4B7143AC588E24C09A22452
+          A494124A35653FE504A59F324299A0AA51CDA99ED408AA883A9F5A496DA07650
+          2F5387A91334759A25CD9B1643CBA42DA3D5D09A696769F7682FE974BA09DD83
+          1E4597D097D26BE807E9E7E983F4770C0D860D83C7486228196B197B19A718B7
+          192F994CA605D39799C85430D7321B9967980F986F55582AF62A7C1591CA1295
+          3A9556957E95E7AA545573553FD579AA0B54AB550FAB5E567DA64655B350E3A9
+          09D416ABD5A91D55BBA936AECE5277528F50CF515FA3BE5FFD82FA630DB28685
+          46A08648A35463B7C6198D2116C63265F15842D6725603EB2C6B984D625BB2F9
+          EC4C7605FB1B762F7B4C534373AA66AC6691669DE671CD010EC6B1E0F039D99C
+          4ACE21CE0DCE7B2D032D3F2DB1D66AAD66AD7EAD37DA7ADABEDA62ED72ED16ED
+          EBDAEF75709D409D2C9DF53A6D3AF77509BA36BA51BA85BADB75CFEA3ED363EB
+          79E909F5CAF50EE9DDD147F56DF4A3F517EAEFD6EFD11F373034083690196C31
+          3863F0CC9063E86B9869B8D1F084E1A811CB68BA91C468A3D149A327B826EE87
+          67E33578173E66AC6F1C62AC34DE65DC6B3C61626932DBA4C4A4C5E4BE29CD94
+          6B9A66BAD1B4D374CCCCC82CDCACD8ACC9EC8E39D59C6B9E61BED9BCDBFC8D85
+          A5459CC54A8B368BC796DA967CCB05964D96F7AC98563E567956F556D7AC49D6
+          5CEB2CEB6DD6576C501B579B0C9B3A9BCBB6A8AD9BADC4769B6DDF14E2148F29
+          D229F5536EDA31ECFCEC0AEC9AEC06ED39F661F625F66DF6CF1DCC1C121DD63B
+          743B7C727475CC766C70BCEBA4E134C3A9C4A9C3E957671B67A1739DF33517A6
+          4B90CB1297769717536DA78AA76E9F7ACB95E51AEEBAD2B5D3F5A39BBB9BDCAD
+          D96DD4DDCC3DC57DABFB4D2E9B1BC95DC33DEF41F4F0F758E271CCE39DA79BA7
+          C2F390E72F5E765E595EFBBD1E4FB39C269ED6306DC8DBC45BE0BDCB7B603A3E
+          3D65FACEE9033EC63E029F7A9F87BEA6BE22DF3DBE237ED67E997E07FC9EFB3B
+          FACBFD8FF8BFE179F216F14E056001C101E501BD811A81B3036B031F049904A5
+          0735058D05BB062F0C3E15420C090D591F72936FC017F21BF96333DC672C9AD1
+          15CA089D155A1BFA30CC264C1ED6118E86CF08DF107E6FA6F94CE9CCB60888E0
+          476C88B81F69199917F97D14292A32AA2EEA51B453747174F72CD6ACE459FB67
+          BD8EF18FA98CB93BDB6AB6727667AC6A6C526C63EC9BB880B8AAB8817887F845
+          F1971274132409ED89E4C4D8C43D89E37302E76C9A339CE49A54967463AEE5DC
+          A2B917E6E9CECB9E773C593559907C3885981297B23FE5832042502F184FE5A7
+          6E4D1D13F2849B854F45BEA28DA251B1B7B84A3C92E69D5695F638DD3B7D43FA
+          68864F4675C633094F522B79911992B923F34D5644D6DEACCFD971D92D39949C
+          949CA3520D6996B42BD730B728B74F662B2B930DE479E66DCA1B9387CAF7E423
+          F973F3DB156C854CD1A3B452AE500E164C2FA82B785B185B78B848BD485AD433
+          DF66FEEAF9230B82167CBD90B050B8B0B3D8B87859F1E022BF45BB16238B5317
+          772E315D52BA647869F0D27DCB68CBB296FD50E2585255F26A79DCF28E5283D2
+          A5A5432B82573495A994C9CB6EAEF45AB9631561956455EF6A97D55B567F2A17
+          955FAC70ACA8AEF8B046B8E6E2574E5FD57CF5796DDADADE4AB7CAEDEB48EBA4
+          EB6EACF759BFAF4ABD6A41D5D086F00DAD1BF18DE51B5F6D4ADE74A17A6AF58E
+          CDB4CDCACD03356135ED5BCCB6ACDBF2A136A3F67A9D7F5DCB56FDADABB7BED9
+          26DAD6BFDD777BF30E831D153BDEEF94ECBCB52B78576BBD457DF56ED2EE82DD
+          8F1A621BBABFE67EDDB847774FC59E8F7BA57B07F645EFEB6A746F6CDCAFBFBF
+          B2096D52368D1E483A70E59B806FDA9BED9A77B5705A2A0EC241E5C127DFA67C
+          7BE350E8A1CEC3DCC3CDDF997FB7F508EB48792BD23ABF75AC2DA36DA03DA1BD
+          EFE88CA39D1D5E1D47BEB7FF7EEF31E36375C7358F579EA09D283DF1F9E48293
+          E3A764A79E9D4E3F3DD499DC79F74CFC996B5D515DBD6743CF9E3F1774EE4CB7
+          5FF7C9F3DEE78F5DF0BC70F422F762DB25B74BAD3DAE3D477E70FDE148AF5B6F
+          EB65F7CBED573CAE74F44DEB3BD1EFD37FFA6AC0D573D7F8D72E5D9F79BDEFC6
+          EC1BB76E26DD1CB825BAF5F876F6ED17770AEE4CDC5D7A8F78AFFCBEDAFDEA07
+          FA0FEA7FB4FEB165C06DE0F860C060CFC3590FEF0E09879EFE94FFD387E1D247
+          CC47D52346238D8F9D1F1F1B0D1ABDF264CE93E1A7B2A713CFCA7E56FF79EB73
+          ABE7DFFDE2FB4BCF58FCD8F00BF98BCFBFAE79A9F372EFABA9AF3AC723C71FBC
+          CE793DF1A6FCADCEDB7DEFB8EFBADFC7BD1F9928FC40FE50F3D1FA63C7A7D04F
+          F73EE77CFEFC2FF784F3FB25D29F33000002254944415478DA95936D48535118
+          C7FFB7E58535192C322B880A217A238841238212E94B048EA217E88B26158210
+          548322082422FD52862D30823230BF14A4511823D2185834B60537F37DA516B2
+          B6B6E6BABB77F7DC97EE3DE6192303F7C0E1790E9CFFEFFFF0F01C0EA5443D0C
+          567782B312D7DB3F642C55EF7DB41D1D1DF5686CEC446FDD1018A0B67A1BBD88
+          89287ECF0CD3BA7CFD56382A76CD3F3AC531485BFB499C3FD7CDEE0C60897F84
+          FC90E608E28914E2D959EC3FE1C7DAAA3D1460394B8A8244364B8F5577DD1A9C
+          071CDABB015383D7F1EB6B0C9A66620D0D994C06493985A39742283B6D638E67
+          2E57E37EEB407107073DAB301EB800E438ACB0DB613301393187E8F418BC17DF
+          83A81AAE3D056E0ED871B8C98D6777C3B853D387078F9F2F002AF13DD80C5ECE
+          C39AB34214C89284597525DCC7DBA0AA3A85ACF139997311C09A413CD20D71E2
+          95D53F544290CD29D0377A51B5FB18155B670144888637EF3E160362810F087E
+          BB812D3A6F7690475806DCEB1AB0F940CD3F622B07434201E071AAE8F75DC1CF
+          A482CA861D20CB74241F0E6372F2337CE302155FBDFDA268273C3B5717008EC0
+          138CBEEC814BE621963B613397CC2ECE215596C7D854124D42843993BF9D8485
+          9102406A6FC1CC1701152A8FE50AE88EE6791D691BC1742C85B391105AEE05FE
+          DF41B4EE08D26971D1F575B91CA8ED7B4D5D35DDA05937F3A7D18902609F7B13
+          BA7ADE96F4AFAC6080E6567FC962B68986B1E4CFB868FC01A6204E3EB3788BD6
+          0000000049454E44AE426082}
+        Name = 'PngImage0'
+        Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          61000000097048597300000AC400000AC401666D82D400000A4D694343505068
+          6F746F73686F70204943432070726F66696C65000078DA9D53775893F7163EDF
+          F7650F5642D8F0B1976C81002223AC08C81059A21092006184101240C585880A
+          561415119C4855C482D50A489D88E2A028B867418A885A8B555C38EE1FDCA7B5
+          7D7AEFEDEDFBD7FBBCE79CE7FCCE79CF0F8011122691E6A26A003952853C3AD8
+          1F8F4F48C4C9BD80021548E0042010E6CBC26705C50000F00379787E74B03FFC
+          01AF6F00020070D52E2412C7E1FF83BA50265700209100E02212E70B01905200
+          C82E54C81400C81800B053B3640A009400006C797C422200AA0D00ECF4493E05
+          00D8A993DC1700D8A21CA908008D0100992847240240BB00605581522C02C0C2
+          00A0AC40222E04C0AE018059B632470280BD0500768E58900F4060008099422C
+          CC0020380200431E13CD03204C03A030D2BFE0A95F7085B8480100C0CB95CD97
+          4BD23314B895D01A77F2F0E0E221E2C26CB142611729106609E4229C979B2313
+          48E7034CCE0C00001AF9D1C1FE383F90E7E6E4E1E666E76CEFF4C5A2FE6BF06F
+          223E21F1DFFEBC8C020400104ECFEFDA5FE5E5D60370C701B075BF6BA95B00DA
+          560068DFF95D33DB09A05A0AD07AF98B7938FC401E9EA150C83C1D1C0A0B0BED
+          2562A1BD30E38B3EFF33E16FE08B7EF6FC401EFEDB7AF000719A4099ADC0A383
+          FD71616E76AE528EE7CB0442316EF7E723FEC7857FFD8E29D1E234B15C2C158A
+          F15889B850224DC779B952914421C995E212E97F32F11F96FD0993770D00AC86
+          4FC04EB607B5CB6CC07EEE01028B0E58D27600407EF32D8C1A0B910010673432
+          79F7000093BFF98F402B0100CD97A4E30000BCE8185CA894174CC608000044A0
+          812AB041070CC114ACC00E9CC11DBCC01702610644400C24C03C104206E4801C
+          0AA11896411954C03AD804B5B0031AA0119AE110B4C131380DE7E0125C81EB70
+          170660189EC218BC86090441C8081361213A8811628ED822CE0817998E042261
+          48349280A420E988145122C5C872A402A9426A915D4823F22D7214398D5C40FA
+          90DBC820328AFC8ABC47319481B25103D4027540B9A81F1A8AC6A073D174340F
+          5D8096A26BD11AB41E3D80B6A2A7D14BE87574007D8A8E6380D1310E668CD961
+          5C8C87456089581A26C71663E55835568F35631D583776151BC09E61EF082402
+          8B8013EC085E8410C26C82909047584C5843A825EC23B412BA085709838431C2
+          272293A84FB4257A12F9C478623AB1905846AC26EE211E219E255E270E135F93
+          48240EC992E44E0A21259032490B496B48DB482DA453A43ED210699C4C26EB90
+          6DC9DEE408B280AC209791B7900F904F92FBC9C3E4B7143AC588E24C09A22452
+          A494124A35653FE504A59F324299A0AA51CDA99ED408AA883A9F5A496DA07650
+          2F5387A91334759A25CD9B1643CBA42DA3D5D09A696769F7682FE974BA09DD83
+          1E4597D097D26BE807E9E7E983F4770C0D860D83C7486228196B197B19A718B7
+          192F994CA605D39799C85430D7321B9967980F986F55582AF62A7C1591CA1295
+          3A9556957E95E7AA545573553FD579AA0B54AB550FAB5E567DA64655B350E3A9
+          09D416ABD5A91D55BBA936AECE5277528F50CF515FA3BE5FFD82FA630DB28685
+          46A08648A35463B7C6198D2116C63265F15842D6725603EB2C6B984D625BB2F9
+          EC4C7605FB1B762F7B4C534373AA66AC6691669DE671CD010EC6B1E0F039D99C
+          4ACE21CE0DCE7B2D032D3F2DB1D66AAD66AD7EAD37DA7ADABEDA62ED72ED16ED
+          EBDAEF75709D409D2C9DF53A6D3AF77509BA36BA51BA85BADB75CFEA3ED363EB
+          79E909F5CAF50EE9DDD147F56DF4A3F517EAEFD6EFD11F373034083690196C31
+          3863F0CC9063E86B9869B8D1F084E1A811CB68BA91C468A3D149A327B826EE87
+          67E33578173E66AC6F1C62AC34DE65DC6B3C61626932DBA4C4A4C5E4BE29CD94
+          6B9A66BAD1B4D374CCCCC82CDCACD8ACC9EC8E39D59C6B9E61BED9BCDBFC8D85
+          A5459CC54A8B368BC796DA967CCB05964D96F7AC98563E567956F556D7AC49D6
+          5CEB2CEB6DD6576C501B579B0C9B3A9BCBB6A8AD9BADC4769B6DDF14E2148F29
+          D229F5536EDA31ECFCEC0AEC9AEC06ED39F661F625F66DF6CF1DCC1C121DD63B
+          743B7C727475CC766C70BCEBA4E134C3A9C4A9C3E957671B67A1739DF33517A6
+          4B90CB1297769717536DA78AA76E9F7ACB95E51AEEBAD2B5D3F5A39BBB9BDCAD
+          D96DD4DDCC3DC57DABFB4D2E9B1BC95DC33DEF41F4F0F758E271CCE39DA79BA7
+          C2F390E72F5E765E595EFBBD1E4FB39C269ED6306DC8DBC45BE0BDCB7B603A3E
+          3D65FACEE9033EC63E029F7A9F87BEA6BE22DF3DBE237ED67E997E07FC9EFB3B
+          FACBFD8FF8BFE179F216F14E056001C101E501BD811A81B3036B031F049904A5
+          0735058D05BB062F0C3E15420C090D591F72936FC017F21BF96333DC672C9AD1
+          15CA089D155A1BFA30CC264C1ED6118E86CF08DF107E6FA6F94CE9CCB60888E0
+          476C88B81F69199917F97D14292A32AA2EEA51B453747174F72CD6ACE459FB67
+          BD8EF18FA98CB93BDB6AB6727667AC6A6C526C63EC9BB880B8AAB8817887F845
+          F1971274132409ED89E4C4D8C43D89E37302E76C9A339CE49A54967463AEE5DC
+          A2B917E6E9CECB9E773C593559907C3885981297B23FE5832042502F184FE5A7
+          6E4D1D13F2849B854F45BEA28DA251B1B7B84A3C92E69D5695F638DD3B7D43FA
+          68864F4675C633094F522B79911992B923F34D5644D6DEACCFD971D92D39949C
+          949CA3520D6996B42BD730B728B74F662B2B930DE479E66DCA1B9387CAF7E423
+          F973F3DB156C854CD1A3B452AE500E164C2FA82B785B185B78B848BD485AD433
+          DF66FEEAF9230B82167CBD90B050B8B0B3D8B87859F1E022BF45BB16238B5317
+          772E315D52BA647869F0D27DCB68CBB296FD50E2585255F26A79DCF28E5283D2
+          A5A5432B82573495A994C9CB6EAEF45AB9631561956455EF6A97D55B567F2A17
+          955FAC70ACA8AEF8B046B8E6E2574E5FD57CF5796DDADADE4AB7CAEDEB48EBA4
+          EB6EACF759BFAF4ABD6A41D5D086F00DAD1BF18DE51B5F6D4ADE74A17A6AF58E
+          CDB4CDCACD03356135ED5BCCB6ACDBF2A136A3F67A9D7F5DCB56FDADABB7BED9
+          26DAD6BFDD777BF30E831D153BDEEF94ECBCB52B78576BBD457DF56ED2EE82DD
+          8F1A621BBABFE67EDDB847774FC59E8F7BA57B07F645EFEB6A746F6CDCAFBFBF
+          B2096D52368D1E483A70E59B806FDA9BED9A77B5705A2A0EC241E5C127DFA67C
+          7BE350E8A1CEC3DCC3CDDF997FB7F508EB48792BD23ABF75AC2DA36DA03DA1BD
+          EFE88CA39D1D5E1D47BEB7FF7EEF31E36375C7358F579EA09D283DF1F9E48293
+          E3A764A79E9D4E3F3DD499DC79F74CFC996B5D515DBD6743CF9E3F1774EE4CB7
+          5FF7C9F3DEE78F5DF0BC70F422F762DB25B74BAD3DAE3D477E70FDE148AF5B6F
+          EB65F7CBED573CAE74F44DEB3BD1EFD37FFA6AC0D573D7F8D72E5D9F79BDEFC6
+          EC1BB76E26DD1CB825BAF5F876F6ED17770AEE4CDC5D7A8F78AFFCBEDAFDEA07
+          FA0FEA7FB4FEB165C06DE0F860C060CFC3590FEF0E09879EFE94FFD387E1D247
+          CC47D52346238D8F9D1F1F1B0D1ABDF264CE93E1A7B2A713CFCA7E56FF79EB73
+          ABE7DFFDE2FB4BCF58FCD8F00BF98BCFBFAE79A9F372EFABA9AF3AC723C71FBC
+          CE793DF1A6FCADCEDB7DEFB8EFBADFC7BD1F9928FC40FE50F3D1FA63C7A7D04F
+          F73EE77CFEFC2FF784F3FB25D29F33000002B44944415478DA7D925F4853511C
+          C77F67F75EF7A799BB9A6E3A5B85A0203EA820F892502121119A523E14141A41
+          F5A244819144E4430F452F99580385A4D0CC2009410B940CCC4CA60BB2F04F43
+          65B639B7DD6DF7EEFED93D9D2D144DE60F0E07CEF97D3FE7F7FBFE0EC218433C
+          1042B01973AFAF5C0088DDF007B82CCF7AD0E15C70DFBF63774EC0B6D8D2FD0F
+          70F65C6C345BD8673C1FD5F8FD41F0F903E0F571FCA8E34F4DE7E0FCC89E80BE
+          E6727D7E699ECBA0D7668A920CA15004DCDE0028B204EE7561AEA9FD5B19490D
+          2707DCABA8CC31A70F531A0A045186154F042C19FBC1A803F8E5F2E0B61EE7C9
+          F9656E2429E0537B75E34658B2CB0A02D6B41FF20F9A00A90A48621478418047
+          2FA71ABA865D5D4901939DD575D66C733FCD3089B398A2804CCA97451144318A
+          EFDA271BFBC7579203DEB41DCD2EC93FEC6252521204555549FF72C2038E8B28
+          35AD1F2A577DE2E89E5398B6D7F6A6A51ACE25920820168B5721C3C4ECEADCE5
+          C79315E4D8BB27A0BBB9DC5A54689E326A198B4AEEE26D6C04C3D2ADE7D34D5F
+          7EF83B928E311E2DD6828C9C5CE629C2A6B3D67A1B4A05F20722C49BDE0D9C6B
+          084E3804E1EA8BEF4B33DB3FD416A0E550119B9E478F6762B590151408D5D543
+          71552DAC0DBC0561F01504F631E0A534A121257466646CE1E32E40EBF1D227AC
+          1E5D677919D8A8025AD041E6892A08BF1F8010B1D46F60C8A2614DC4CB0FBE3A
+          4A30877D3B00B74F95B94C14B699C8EB6904601463A0555490290491140A823A
+          1A027A1AFC64B77B17EBD7C6BC7D3B00374F972DA6D2E8489AF84F6C9054A055
+          6222F156603410D652C011711CD4BDFCFB9AE7B3BB6307E0FCB1E24B590C7A98
+          C150E946ACA2F8EB14B9520940A43410411A08A8587AA78DCDFE1C9A69C01276
+          EE9A0219E5019D8D2E305A0C36D05384031A2C2AB2129579C52773FC6ACC4DD2
+          968826B0A9F90BC88690F0ED1F7E3F0000000049454E44AE426082}
+        Name = 'PngImage1'
+        Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          610000000970485973000017120000171201679FD252000001FA4944415478DA
+          A5934B6813511486BF342610A2C50A86A220150BA2145C58D120828ABA2AD2BA
+          F0B510C48D1B1154A828A55D5877825474AB45375D58A80B9385292DA8A8B151
+          6B6D8DB50F43C1B4C624364C1E73E7E19DA96408B50BCDC0E5CC65E6FFFE7FCE
+          DCE3324D936A2E577FE46355041BD076B0C9DE280B23E412E3F6FD9A4DDBF107
+          76965F3464524D33109A8E2A7459350E1FBFEC002CF1FCEB1EF28B82F98534C9
+          5C9203A7EFB2A1712F9A6E70A557AD706EA88970FFD1C012E0E8BECDCC3EEF22
+          33338DAECBA7A64E36FB8B5431C389EBB12557B93461D8CED6FE71F8A5036809
+          AE271EBA0879177E9F0FB704284A9ED8B7498EB5476D71671F2B276809D63337
+          D481B75892EEC86F5429140A7CD7D6D17CEA4E85B3D5070B181A8A3A00AB07C9
+          B70F512643567E8410E4F22A46432B8D7B4E2E130BD9C4672F629580A9D02B86
+          E76EB0CDF0CA0425A205D8B5F11C5B8F1C5A26B6D6F09B0F0E2058AB11B97495
+          D44F95FAB34D881A831F0F26989A9EA0FDEB275B7CEDD6938A1EECDE117000FE
+          701FF1A703D4153D28AB6B71E3C2A72C92F6A8C413292E8CBD2F3B8B3F67213A
+          3AEE000AB7BB49CC8E11D03CAC92BFDB251D4A5E93B45B90984973FEDD08DDF7
+          C22B27889D69239355FE7A54EBD6FA690D0FDAAEBA61DAD59075F4F31707B0BF
+          790BBDFD83FF3C076540D7CD9EFF1FA66AC7F93783B161288AF0DFC000000000
+          49454E44AE426082}
+        Name = 'PngImage2'
+        Background = clWindow
+      end>
+    Left = 432
+    Top = 8
+    Bitmap = {}
+  end
+end

Source/Modulos/Pedidos a proveedor/Views/uViewDatosYSeleccionProveedorPedido.pas

@@ -0,0 +1,411 @@
+unit uViewDatosYSeleccionProveedorPedido;
+
+interface
+
+uses
+  Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
+  Dialogs, uViewBase, StdCtrls, cxControls, cxContainer, cxEdit, cxLabel,
+  cxDBLabel, ExtCtrls, DB, uDADataTable, uBizContactos,
+  ComCtrls, ToolWin, ActnList, ImgList, PngImageList, cxTextEdit, cxDBEdit,
+  pngimage, JvExControls, JvComponent, JvButton, JvTransparentButton, Mask,
+  DBCtrls, uProveedoresController, dxLayoutControl, Buttons, uDAInterfaces,
+  cxMaskEdit, cxButtonEdit, uBizPedidosProveedor, uBizDireccionesContacto,
+  uDireccionesContactoController, Menus, cxLookAndFeelPainters, cxButtons;
+
+type
+  IViewDatosYSeleccionProveedorPedido = interface(IViewBase)
+    ['{F1E1FFC0-02C9-47F5-92BC-BE10FA2C5134}']
+    function GetPedido: IBizPedidoProveedor;
+    procedure SetPedido(const Value: IBizPedidoProveedor);
+    property Pedido: IBizPedidoProveedor read GetPedido write SetPedido;
+
+    function GetProveedor: IBizProveedor;
+    procedure SetProveedor(Value: IBizProveedor);
+    property Proveedor: IBizProveedor read GetProveedor write SetProveedor;
+
+    function GetID_Proveedor: integer;
+    procedure SetID_Proveedor(const Value: integer);
+    property ID_Proveedor: integer read GetID_Proveedor write SetID_Proveedor;
+
+    function GetOnProveedorChanged : TNotifyEvent;
+    procedure SetOnProveedorChanged (const Value : TNotifyEvent);
+    property OnProveedorChanged : TNotifyEvent read GetOnProveedorChanged
+      write SetOnProveedorChanged;
+
+    procedure ElegirPersonaContacto;
+    procedure ElegirDireccionProveedor;
+    procedure ElegirProveedor;
+    procedure VerFichaProveedor;
+    procedure AnadirNuevoProveedor;
+    procedure RefrescarDireccion;
+  end;
+
+  TfrViewDatosYSeleccionProveedorPedido = class(TfrViewBase, IViewDatosYSeleccionProveedorPedido)
+    dsProveedor: TDADataSource;
+    ActionList1: TActionList;
+    actElegirContacto: TAction;
+    actAnadirContacto: TAction;
+    actVerContacto: TAction;
+    dxLayoutControl1Group_Root: TdxLayoutGroup;
+    dxLayoutControl1: TdxLayoutControl;
+    dxLayoutControl1Item1: TdxLayoutItem;
+    edtlNombre: TcxDBTextEdit;
+    dxLayoutControl1Item2: TdxLayoutItem;
+    edtNIFCIF: TcxDBTextEdit;
+    dsPedido: TDADataSource;
+    actElegirDireccion: TAction;
+    actElegirPersonaContacto: TAction;
+    dxLayoutControl1Item3: TdxLayoutItem;
+    edtPersonaContacto: TcxDBTextEdit;
+    dxLayoutControl1Group4: TdxLayoutGroup;
+    dxLayoutControl1Item4: TdxLayoutItem;
+    edtDireccion: TcxTextEdit;
+    Button4: TButton;
+    dxLayoutControl1Item5: TdxLayoutItem;
+    dxLayoutControl1Group3: TdxLayoutGroup;
+    dxLayoutControl1Item6: TdxLayoutItem;
+    Button5: TButton;
+    dxLayoutControl1Group5: TdxLayoutGroup;
+    dxLayoutControl1Item9: TdxLayoutItem;
+    Button3: TBitBtn;
+    dxLayoutControl1Group2: TdxLayoutGroup;
+    dxLayoutControl1Item7: TdxLayoutItem;
+    Button1: TBitBtn;
+    dxLayoutControl1Item10: TdxLayoutItem;
+    BitBtn1: TBitBtn;
+    dxLayoutControl1Group1: TdxLayoutGroup;
+    PngImageList: TPngImageList;
+    procedure actElegirContactoExecute(Sender: TObject);
+    procedure actAnadirContactoExecute(Sender: TObject);
+    procedure actVerContactoUpdate(Sender: TObject);
+    procedure edtPersonaContactoPropertiesButtonClick(Sender: TObject;
+      AButtonIndex: Integer);
+    procedure edtDireccionPropertiesButtonClick(Sender: TObject;
+      AButtonIndex: Integer);
+    procedure actVerContactoExecute(Sender: TObject);
+    procedure actElegirDireccionUpdate(Sender: TObject);
+    procedure actElegirDireccionExecute(Sender: TObject);
+    procedure actElegirPersonaContactoExecute(Sender: TObject);
+    procedure actElegirPersonaContactoUpdate(Sender: TObject);
+
+  private
+    FOnProveedorChanged : TNotifyEvent;
+    FMsgElegirProveedor: String;
+  protected
+    FProveedoresController : IProveedoresController;
+    FDireccionesController : IDireccionesContactoController;
+    FPedido : IBizPedidoProveedor;
+    FProveedor : IBizProveedor;
+    FDireccion : IBizDireccionesContacto;
+    function GetProveedor: IBizProveedor; virtual;
+    procedure SetProveedor(Value: IBizProveedor); virtual;
+    function GetOnProveedorChanged : TNotifyEvent;
+    procedure SetOnProveedorChanged (const Value : TNotifyEvent);
+    procedure SetReadOnly(Value: Boolean); override;
+    function GetID_Proveedor: integer; virtual;
+    procedure SetID_Proveedor(const Value: integer); virtual;
+    function GetPedido: IBizPedidoProveedor;
+    procedure SetPedido(const Value: IBizPedidoProveedor);
+    procedure EscribirTextoDireccion;
+  public
+    constructor Create(AOwner: TComponent); override;
+    destructor Destroy; override;
+    procedure ElegirPersonaContacto;
+    procedure ElegirDireccionProveedor;
+    procedure ElegirProveedor;
+    procedure VerFichaProveedor;
+    procedure AnadirNuevoProveedor;
+    procedure RefrescarDireccion;
+    property Pedido: IBizPedidoProveedor read GetPedido write SetPedido;
+    property Proveedor: IBizProveedor read GetProveedor write SetProveedor;
+    property OnProveedorChanged : TNotifyEvent read GetOnProveedorChanged write SetOnProveedorChanged;
+    property ID_Proveedor: integer read GetID_Proveedor write SetID_Proveedor;
+  end;
+
+implementation
+
+{$R *.dfm}
+
+uses
+  uDataModuleProveedores, Math, uCustomView, uBizContactosPersonal, uDialogUtils;
+
+
+procedure TfrViewDatosYSeleccionProveedorPedido.actElegirContactoExecute(Sender: TObject);
+begin
+  ElegirProveedor;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.actElegirDireccionExecute(
+  Sender: TObject);
+begin
+  inherited;
+  ElegirDireccionProveedor;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.actElegirDireccionUpdate(
+  Sender: TObject);
+begin
+  inherited;
+  (Sender as TAction).Enabled := not ReadOnly and Assigned(FProveedor.Direcciones) and
+      (FProveedor.Direcciones.Active) and (FProveedor.Direcciones.RecordCount > 0);
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.actElegirPersonaContactoExecute(
+  Sender: TObject);
+begin
+  inherited;
+  ElegirPersonaContacto;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.actElegirPersonaContactoUpdate(
+  Sender: TObject);
+begin
+  inherited;
+  (Sender as TAction).Enabled := not ReadOnly and Assigned(FProveedor.Personal) and
+      (FProveedor.Personal.Active) and (FProveedor.Personal.RecordCount > 0);
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.actAnadirContactoExecute(
+  Sender: TObject);
+begin
+  AnadirNuevoProveedor;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.actVerContactoExecute(
+  Sender: TObject);
+begin
+  inherited;
+  VerFichaProveedor;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.actVerContactoUpdate(Sender: TObject);
+begin
+  inherited;
+  (Sender as TAction).Enabled := (Length(edtlNombre.Text) > 0);
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.AnadirNuevoProveedor;
+var
+  AProveedor : IBizProveedor;
+begin
+  inherited;
+  AProveedor := (FProveedoresController.Nuevo as IBizProveedor);
+  FProveedoresController.Ver(AProveedor);
+  Self.Proveedor := AProveedor;
+end;
+
+constructor TfrViewDatosYSeleccionProveedorPedido.Create(AOwner: TComponent);
+begin
+  inherited;
+  FMsgElegirProveedor := 'Elija el proveedor al que se le realizará el pedido.';
+  FProveedoresController := TProveedoresController.Create;
+  FDireccionesController := TDireccionesContactoController.Create;
+
+  edtlNombre.Enabled := False;
+  edtNIFCIF.Enabled := False;
+  edtDireccion.Enabled := False;
+  edtPersonaContacto.Enabled := False;
+end;
+
+destructor TfrViewDatosYSeleccionProveedorPedido.Destroy;
+begin
+  FProveedoresController := NIL;
+  FDireccionesController := NIL;
+  inherited;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.edtDireccionPropertiesButtonClick(
+  Sender: TObject; AButtonIndex: Integer);
+begin
+  inherited;
+  ElegirDireccionProveedor;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.edtPersonaContactoPropertiesButtonClick(
+  Sender: TObject; AButtonIndex: Integer);
+begin
+  inherited;
+  ElegirPersonaContacto;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.ElegirProveedor;
+var
+  AProveedor : IBizProveedor;
+begin
+  inherited;
+
+  AProveedor := (FProveedoresController.ElegirContacto(FProveedoresController.BuscarTodos, FMsgElegirProveedor, False) as IBizProveedor);
+
+  if Assigned(AProveedor) then
+    Self.Proveedor := AProveedor;
+  AProveedor := Nil;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.ElegirDireccionProveedor;
+var
+  ADireccion : IBizDireccionesContacto;
+begin
+  inherited;
+  ADireccion := FProveedoresController.ElegirDireccionEntrega(FProveedor, ' ');
+
+  if Assigned(ADireccion) then
+  begin
+    FDireccion := ADireccion;
+    FPedido.Edit;
+
+    if FDireccion.IDIsNull then
+    begin
+      FPedido.ClearField('ID_DIRECCION');
+      FPedido.ClearField('IMPORTE_PORTE');
+    end
+    else begin
+      FPedido.ID_DIRECCION := FDireccion.ID;
+      FPedido.IMPORTE_PORTE := FDireccion.PORTE;
+      FPedido.PERSONA_CONTACTO_PROV := FDireccion.PERSONA_CONTACTO;
+    end;
+    EscribirTextoDireccion;
+  end;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.ElegirPersonaContacto;
+var
+  APersona : IBizContactoPersonal;
+begin
+  inherited;
+  APersona := FProveedoresController.ElegirPersonaContacto(FProveedor.Personal,
+    'El proveedor dispone de personas de contacto dadas de alta en su ficha. Seleccione la que quiere utilizar.');
+  if Assigned(APersona) then
+  begin
+    FPedido.Edit;
+    FPedido.PERSONA_CONTACTO_PROV := APersona.NOMBRE;
+  end;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.EscribirTextoDireccion;
+var
+  ACadena : String;
+begin
+  ACadena := '';
+
+  if Assigned(FDireccion) then
+    ACadena := Format('%s %s %s %s',
+      [FDireccion.CALLE, FDireccion.POBLACION,
+      FDireccion.CODIGO_POSTAL, FDireccion.PROVINCIA]);
+
+  edtDireccion.Text := ACadena;
+end;
+
+function TfrViewDatosYSeleccionProveedorPedido.GetProveedor: IBizProveedor;
+begin
+  Result := FProveedor;
+end;
+
+function TfrViewDatosYSeleccionProveedorPedido.GetID_Proveedor: integer;
+begin
+  Result := -1;
+  if Assigned(FProveedor) then
+    Result := FProveedor.ID;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.SetProveedor(Value: IBizProveedor);
+begin
+  FProveedor := Value;
+  if Assigned(FProveedor) then
+  begin
+    dsProveedor.DataTable := FProveedor.DataTable;
+
+    if not FProveedor.DataTable.Active then
+      FProveedor.DataTable.Active := True;
+
+    edtPersonaContacto.Enabled := True;
+    RefrescarDireccion;
+  end
+  else begin
+    dsProveedor.DataTable := NIL;
+    FProveedor := NIL;
+    FDireccion := NIL;
+    edtPersonaContacto.Enabled := False;
+  end;
+
+  if Assigned(FOnProveedorChanged) then
+    FOnProveedorChanged(Self);
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.SetID_Proveedor(const Value: integer);
+begin
+  Self.Proveedor := IBizProveedor(FProveedoresController.Buscar(Value));
+end;
+
+function TfrViewDatosYSeleccionProveedorPedido.GetOnProveedorChanged: TNotifyEvent;
+begin
+  Result := FOnProveedorChanged;
+end;
+
+function TfrViewDatosYSeleccionProveedorPedido.GetPedido: IBizPedidoProveedor;
+begin
+  Result := FPedido;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.RefrescarDireccion;
+begin
+  FDireccion := FDireccionesController.Nuevo;
+
+  if (not FPedido.ID_DIRECCIONIsNull) and
+    (FDireccionesController.Localizar(FProveedor.Direcciones, FPedido.ID_DIRECCION)) then
+      FDireccionesController.CopiarDireccion(FProveedor.Direcciones, FDireccion)
+  else
+    FDireccionesController.CopiarDireccionFiscal(FProveedor, FDireccion);
+
+  EscribirTextoDireccion;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.SetOnProveedorChanged(
+  const Value: TNotifyEvent);
+begin
+  FOnProveedorChanged := Value;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.SetPedido(
+  const Value: IBizPedidoProveedor);
+begin
+  FPedido := Value;
+  if Assigned(FPedido) then
+  begin
+    dsPedido.DataTable := FPedido.DataTable;
+
+    FProveedor := FPedido.Proveedor;
+    dsProveedor.DataTable := FProveedor.DataTable;
+
+    if not FProveedor.DataTable.Active then
+      FProveedor.DataTable.Active := True;
+
+    RefrescarDireccion;
+  end
+  else begin
+    dsPedido.DataTable := NIL;
+    FProveedor := NIL;
+    FDireccion := NIL;
+  end;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.SetReadOnly(Value: Boolean);
+begin
+  inherited;
+
+  if (csLoading in Self.ComponentState) then
+    Exit;
+  
+  actAnadirContacto.Enabled := not ReadOnly;
+  actElegirContacto.Enabled := not ReadOnly;
+end;
+
+procedure TfrViewDatosYSeleccionProveedorPedido.VerFichaProveedor;
+begin
+  if not Assigned(Proveedor) then
+    ShowErrorMessage('No se ha indicado un proveedor', 'El pedido no tiene ningún proveedor asociado a mostrar.')
+  else begin
+    FProveedoresController.Ver(Proveedor);
+  end;
+end;
+
+end.

Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.dfm

@@ -46,8 +46,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Width = 333
     end
     object edtFechaConfirmacion: TcxDBDateEdit
-      Left = 599
+      Left = 578
-      Top = 240
+      Top = 262
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_CONFIRMACION'
       DataBinding.DataSource = DADataSource
@@ -71,8 +71,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Width = 344
     end
     object edtFechaEntrega: TcxDBDateEdit
-      Left = 599
+      Left = 578
-      Top = 267
+      Top = 289
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_ENTREGA'
       DataBinding.DataSource = DADataSource
@@ -94,8 +94,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Width = 344
     end
     object memObservaciones: TcxDBMemo
-      Left = 484
+      Left = 463
-      Top = 324
+      Top = 346
       Anchors = [akLeft, akTop, akRight, akBottom]
       DataBinding.DataField = 'OBSERVACIONES'
       DataBinding.DataSource = DADataSource
@@ -168,26 +168,36 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
           248)
         inherited Bevel1: TBevel
           Top = 200
+          Width = 566
           ExplicitTop = 200
+          ExplicitWidth = 566
         end
         inherited lblObra: TLabel
           Left = 239
           ExplicitLeft = 239
         end
+        inherited rdxDestino3: TRadioButton
+          Width = 566
+          ExplicitWidth = 566
+        end
         inherited cbListaAlmacenes: TcxDBLookupComboBox
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
+          ExplicitWidth = 551
+          Width = 551
         end
         inherited bModificar: TBitBtn
-          Left = 294
+          Left = 273
           Top = 164
-          ExplicitLeft = 294
+          ExplicitLeft = 273
           ExplicitTop = 164
         end
         inherited txtDireccion: TStaticText
+          Width = 882
           Height = 68
+          ExplicitWidth = 882
           ExplicitHeight = 68
         end
         inherited rdxDestino2: TRadioButton
@@ -201,6 +211,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
           ExplicitTop = 231
+          ExplicitWidth = 334
+          Width = 334
         end
       end
       inherited ActionList1: TActionList
@@ -249,7 +261,7 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Width = 195
     end
     object bFormasPago: TButton
-      Left = 322
+      Left = 301
       Top = 82
       Width = 132
       Height = 21
@@ -258,8 +270,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       OnClick = bFormasPagoClick
     end
     object edtFechaEnvio: TcxDBDateEdit
-      Left = 599
+      Left = 578
-      Top = 213
+      Top = 235
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_ENVIO'
       DataBinding.DataSource = DADataSource
@@ -310,113 +322,13 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
       Width = 195
     end
     object bVerPedidoCliente: TButton
-      Left = 322
+      Left = 301
       Top = 109
       Width = 132
       Height = 23
       Action = actVerPedidoCli
       TabOrder = 5
     end
-    inline frViewProveedorPedido1: TfrViewProveedorPedido
-      Left = 484
-      Top = 28
-      Width = 459
-      Height = 149
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -11
-      Font.Name = 'Tahoma'
-      Font.Style = []
-      ParentFont = False
-      TabOrder = 8
-      ReadOnly = False
-      ExplicitLeft = 484
-      ExplicitTop = 28
-      ExplicitWidth = 459
-      ExplicitHeight = 149
-      inherited dxLayoutControl1: TdxLayoutControl
-        Width = 459
-        Height = 266
-        ExplicitWidth = 459
-        ExplicitHeight = 266
-        inherited edtlNombre: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 331
-          Width = 331
-        end
-        inherited edtNIFCIF: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 331
-          Width = 331
-        end
-        inherited edtCalle: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 331
-          Width = 331
-        end
-        inherited edtPoblacion: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 213
-          Width = 213
-        end
-        inherited edtProvincia: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 331
-          Width = 331
-        end
-        inherited edtCodigoPostal: TcxDBTextEdit
-          Left = 367
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 367
-        end
-        inherited Button3: TBitBtn
-          Left = 251
-          ExplicitLeft = 251
-        end
-        inherited edtPersonaContacto: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 331
-          Width = 331
-        end
-        inherited edtReferenciaAsignada: TcxDBTextEdit
-          Left = 328
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 328
-        end
-        inherited edtFax: TcxDBTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 138
-          Width = 138
-        end
-      end
-    end
     inline frViewObraReserva1: TfrViewObraReserva
       Left = 22
       Top = 168
@@ -444,8 +356,8 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
           ExplicitWidth = 202
         end
         inherited Button3: TBitBtn
-          Left = 278
+          Left = 257
-          ExplicitLeft = 278
+          ExplicitLeft = 257
         end
         inherited cbObraReserva: TcxComboBox
           Style.LookAndFeel.SkinName = ''
@@ -465,6 +377,68 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
         Top = 24
       end
     end
+    inline frViewDatosYSeleccionProveedorPedido1: TfrViewDatosYSeleccionProveedorPedido
+      Left = 463
+      Top = 28
+      Width = 505
+      Height = 171
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = []
+      ParentFont = False
+      TabOrder = 8
+      ReadOnly = False
+      ExplicitLeft = 463
+      ExplicitTop = 28
+      inherited dxLayoutControl1: TdxLayoutControl
+        inherited edtlNombre: TcxDBTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitWidth = 224
+          Width = 224
+        end
+        inherited edtNIFCIF: TcxDBTextEdit
+          Left = 367
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 367
+        end
+        inherited edtPersonaContacto: TcxDBTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitWidth = 283
+          Width = 283
+        end
+        inherited edtDireccion: TcxTextEdit
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitWidth = 121
+          Width = 121
+        end
+        inherited Button4: TButton
+          Left = 447
+          ExplicitLeft = 447
+        end
+        inherited Button5: TButton
+          Left = 447
+          ExplicitLeft = 447
+        end
+        inherited Button3: TBitBtn
+          Left = 272
+          ExplicitLeft = 272
+        end
+      end
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -574,7 +548,9 @@ inherited frViewPedidoProveedor: TfrViewPedidoProveedor
           AlignHorz = ahClient
           Caption = 'Datos del proveedor'
           object dxLayoutControl1Item1: TdxLayoutItem
-            Control = frViewProveedorPedido1
+            Caption = 'New Item'
+            ShowCaption = False
+            Control = frViewDatosYSeleccionProveedorPedido1
             ControlOptions.AutoColor = True
             ControlOptions.ShowBorder = False
           end

Source/Modulos/Pedidos a proveedor/Views/uViewPedidoProveedor.pas

@@ -7,18 +7,18 @@ uses
   Dialogs, uViewBase, uBizPedidosProveedor, DB, uDADataTable, uCustomView,
   AppEvnts, StdCtrls, Mask, DBCtrls,
 
-  uViewObservaciones,  uViewDatosYSeleccionProveedor,
+  uViewObservaciones,
   cxGraphics, cxDropDownEdit, cxImageComboBox, cxDBEdit, cxContainer, cxEdit,
   cxTextEdit, cxMaskEdit, cxCalendar, dxLayoutControl, cxControls, cxMemo,
   uViewDireccionEntregaPedidoProv, cxLookupEdit, cxDBLookupEdit,
 //  uBizPedidosCliente, uPedidosClienteController,
   cxDBLookupComboBox, uFormasPagoController, ActnList, uDAInterfaces, uBizFormasPago,
   uViewProveedorPedido, uViewObraReserva, uObrasController,
-  uPedidosProveedorController;
+  uPedidosProveedorController, uViewDatosYSeleccionProveedorPedido;
 
 type
   IViewPedidoProveedor = interface(IViewBase)
-  ['{C5385699-C1A4-4AEB-B3D0-EE3BDB322FE2}']
+  ['{6FF2FC16-307F-4B8B-A46A-3FEA270ED568}']
     function GetPedido: IBizPedidoProveedor;
     procedure SetPedido(const Value: IBizPedidoProveedor);
     property Pedido: IBizPedidoProveedor read GetPedido write SetPedido;
@@ -27,9 +27,8 @@ type
     procedure SetController (const Value : IPedidosProveedorController);
     property Controller : IPedidosProveedorController read GetController write SetController;
 
-    function GetViewProveedorPedido: TfrViewDatosYSeleccionProveedor;
+    function GetViewProveedorPedido: IViewDatosYSeleccionProveedorPedido;
-    procedure SetViewProveedorPedido(const Value: TfrViewDatosYSeleccionProveedor);
+    property ViewProveedorPedido: IViewDatosYSeleccionProveedorPedido read GetViewProveedorPedido;
-    property ViewProveedorPedido: TfrViewDatosYSeleccionProveedor read GetViewProveedorPedido write SetViewProveedorPedido;
   end;
 
   TfrViewPedidoProveedor = class(TfrViewBase, IViewPedidoProveedor)
@@ -71,11 +70,11 @@ type
     dxLayoutControl1Group10: TdxLayoutGroup;
     ActionList1: TActionList;
     actVerPedidoCli: TAction;
-    dxLayoutControl1Item1: TdxLayoutItem;
-    frViewProveedorPedido1: TfrViewProveedorPedido;
     dxLayoutControl1Item13: TdxLayoutItem;
     frViewObraReserva1: TfrViewObraReserva;
     dxLayoutControl1Group11: TdxLayoutGroup;
+    frViewDatosYSeleccionProveedorPedido1: TfrViewDatosYSeleccionProveedorPedido;
+    dxLayoutControl1Item1: TdxLayoutItem;
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure bFormasPagoClick(Sender: TObject);
@@ -85,11 +84,10 @@ type
     procedure frViewProveedorPedidoButton2Click(Sender: TObject);
     procedure ObraReservaEditValueChanged(Sender: TObject);
     procedure CustomViewShow(Sender: TObject);
-
   protected
     FPedido : IBizPedidoProveedor;
     FController : IPedidosProveedorController;
-    FViewProveedorPedido : TfrViewDatosYSeleccionProveedor;
+    FViewProveedorPedido : IViewDatosYSeleccionProveedorPedido;
     FFormasPago : IBizFormaPago;
     FFormasPagoController : IFormasPagoController;
     FObras: TStringList;
@@ -101,13 +99,11 @@ type
     procedure SetPedido(const Value: IBizPedidoProveedor); virtual;
     function GetController : IPedidosProveedorController;
     procedure SetController (const Value : IPedidosProveedorController);
-    function GetViewProveedorPedido: TfrViewDatosYSeleccionProveedor;
+    function GetViewProveedorPedido: IViewDatosYSeleccionProveedorPedido;
-    procedure SetViewProveedorPedido(const Value: TfrViewDatosYSeleccionProveedor);
-
   public
     property Pedido: IBizPedidoProveedor read GetPedido write SetPedido;
     property Controller : IPedidosProveedorController read GetController write SetController;
-    property ViewProveedorPedido: TfrViewDatosYSeleccionProveedor read GetViewProveedorPedido;
+    property ViewProveedorPedido: IViewDatosYSeleccionProveedorPedido read GetViewProveedorPedido;
   end;
 
 implementation
@@ -145,12 +141,8 @@ begin
   FFormasPagoController := TFormasPagoController.Create;
   FObrasController := TObrasController.Create;
   FObras := FObrasController.DarListaObras;
-  FViewProveedorPedido := frViewProveedorPedido1;
+  FViewProveedorPedido := frViewDatosYSeleccionProveedorPedido1;
-  FViewProveedorPedido.MsgElegirProveedor := 'Elija el proveedor al que se le realizará el pedido.';
   eReferencia.Enabled := False;
-//  eReferenciaPedidoCli.Enabled := False;
-//  FPedidoCliAsociado := NIL;
-//  FPedidoCliController := TPedidosClienteController.Create;
 end;
 
 procedure TfrViewPedidoProveedor.CustomViewDestroy(Sender: TObject);
@@ -207,7 +199,7 @@ begin
     if (Application.MessageBox('Si cambia de proveedor, se eliminarán todos sus artículos del pedido actual, ¿Desea continuar?', 'Atención', MB_YESNO) = IDNO) then
       Exit;
   end;
-  frViewProveedorPedido1.actElegirContacto.Execute;
+  FViewProveedorPedido.ElegirProveedor;
 end;
 
 procedure TfrViewPedidoProveedor.frViewProveedorPedidoButton2Click(Sender: TObject);
@@ -218,7 +210,7 @@ begin
     if (Application.MessageBox('Si cambia de proveedor, se eliminarán todos sus artículos del pedido actual, ¿Desea continuar?', 'Atención', MB_YESNO) = IDNO) then
       Exit;
   end;
-  frViewProveedorPedido1.actAnadirContacto.Execute;
+  FViewProveedorPedido.AnadirNuevoProveedor;
 end;
 
 function TfrViewPedidoProveedor.GetController: IPedidosProveedorController;
@@ -231,7 +223,7 @@ begin
   Result := FPedido;
 end;
 
-function TfrViewPedidoProveedor.GetViewProveedorPedido: TfrViewDatosYSeleccionProveedor;
+function TfrViewPedidoProveedor.GetViewProveedorPedido: IViewDatosYSeleccionProveedorPedido;
 begin
   Result := FViewProveedorPedido;
 end;
@@ -239,10 +231,6 @@ end;
 procedure TfrViewPedidoProveedor.SetController(const Value: IPedidosProveedorController);
 begin
   FController := Value;
-
-  if Assigned(FController)
-  and Assigned(FViewProveedorPedido) then
-      ViewProveedorPedido.Controller := Controller.ProveedorController;
 end;
 
 procedure TfrViewPedidoProveedor.SetPedido(const Value: IBizPedidoProveedor);
@@ -272,29 +260,19 @@ begin
 //    else
 //      eReferenciaPedidoCli.Text := 'No hay pedido asociado';
 
-    frViewProveedorPedido1.Proveedor := FPedido.Proveedor;
+    FViewProveedorPedido.Pedido := FPedido;
     frViewDireccionEntregaPedidoProv1.PedidoProveedor := FPedido;
 
-
     frViewObraReserva1.Obras := FObras;
     frViewObraReserva1.ObrasController := FObrasController;
-
-
   end
   else begin
     DADataSource.DataTable := NIL;
     dsFormaPago.DataTable := NIL;
 //    FPedidoCliAsociado := NIL;
+    FViewProveedorPedido.Pedido := NIL;
   end;
-
-
-
-
 end;
 
-procedure TfrViewPedidoProveedor.SetViewProveedorPedido(const Value: TfrViewDatosYSeleccionProveedor);
-begin
-  FViewProveedorPedido := Value;
-end;
 
 end.

Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm

@@ -2,11 +2,11 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
   Left = 332
   Top = 147
   Caption = 'Nuevo presupuesto de cliente'
-  ClientHeight = 615
+  ClientHeight = 592
   ClientWidth = 764
   OnClose = CustomEditorClose
   ExplicitWidth = 772
-  ExplicitHeight = 649
+  ExplicitHeight = 626
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -169,16 +169,16 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
   end
   inherited pgPaginas: TPageControl
     Width = 758
-    Height = 238
+    Height = 366
     TabOrder = 1
     OnChanging = pgPaginasChanging
     ExplicitWidth = 758
-    ExplicitHeight = 238
+    ExplicitHeight = 366
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
       ExplicitWidth = 750
-      ExplicitHeight = 210
+      ExplicitHeight = 338
     end
     object pagContenido: TTabSheet
       Caption = 'Contenido'
@@ -187,7 +187,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         Left = 0
         Top = 0
         Width = 750
-        Height = 210
+        Height = 338
         Align = alClient
         BiDiMode = bdLeftToRight
         Font.Charset = DEFAULT_CHARSET
@@ -200,90 +200,106 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 750
-        ExplicitHeight = 210
+        ExplicitHeight = 338
         inherited ToolBar1: TToolBar
           Width = 750
-          Height = 78
+          Height = 46
           ExplicitWidth = 750
-          ExplicitHeight = 78
+          ExplicitHeight = 46
-          inherited ToolButton14: TToolButton
+          inherited ToolButton3: TToolButton
             Wrap = False
           end
+          inherited ToolButton4: TToolButton
+            Left = 278
+            Top = 0
+            ExplicitLeft = 278
+            ExplicitTop = 0
+          end
+          inherited ToolButton14: TToolButton
+            Left = 334
+            Top = 0
+            ExplicitLeft = 334
+            ExplicitTop = 0
+          end
           inherited FontName: TJvFontComboBox
-            Left = 399
+            Top = 22
-            Top = 0
+            ExplicitTop = 22
-            ExplicitLeft = 399
-            ExplicitTop = 0
           end
-          inherited ToolButton13: TToolButton [6]
+          inherited FontSize: TEdit
-            Left = 0
+            Top = 22
-            Top = 0
-            Wrap = True
-            ExplicitLeft = 0
-            ExplicitTop = 0
-            ExplicitHeight = 27
-          end
-          inherited FontSize: TEdit [7]
-            Left = 0
-            Top = 27
             Width = 200
-            ExplicitLeft = 0
+            ExplicitTop = 22
-            ExplicitTop = 27
             ExplicitWidth = 200
           end
-          inherited UpDown1: TUpDown [8]
+          inherited UpDown1: TUpDown
-            Left = 200
+            Left = 345
-            Top = 27
+            Top = 22
-            ExplicitLeft = 200
+            ExplicitLeft = 345
-            ExplicitTop = 27
+            ExplicitTop = 22
+          end
+          inherited ToolButton13: TToolButton
+            Left = 362
+            Top = 22
+            ExplicitLeft = 362
+            ExplicitTop = 22
           end
           inherited ToolButton6: TToolButton
-            Left = 217
+            Left = 370
-            Top = 27
+            Top = 22
-            ExplicitLeft = 217
+            ExplicitLeft = 370
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton7: TToolButton
-            Left = 283
+            Left = 436
-            Top = 27
+            Top = 22
-            ExplicitLeft = 283
+            ExplicitLeft = 436
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton8: TToolButton
-            Left = 350
+            Left = 503
-            Top = 27
+            Top = 22
-            ExplicitLeft = 350
+            ExplicitLeft = 503
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton12: TToolButton
-            Top = 27
+            Left = 0
-            ExplicitTop = 27
+            Top = 22
+            Wrap = True
+            ExplicitLeft = 0
+            ExplicitTop = 22
+            ExplicitHeight = 27
           end
           inherited ToolButton9: TToolButton
-            Top = 54
+            Left = 0
-            ExplicitTop = 54
+            Top = 49
+            ExplicitLeft = 0
+            ExplicitTop = 49
           end
           inherited ToolButton10: TToolButton
-            Top = 54
+            Left = 145
-            ExplicitTop = 54
+            Top = 49
+            ExplicitLeft = 145
+            ExplicitTop = 49
           end
           inherited ToolButton11: TToolButton
-            Top = 54
+            Left = 270
-            ExplicitTop = 54
+            Top = 49
+            ExplicitLeft = 270
+            ExplicitTop = 49
           end
         end
         inherited cxGrid: TcxGrid
-          Top = 104
+          Top = 99
           Width = 750
-          Height = 106
+          Height = 239
-          ExplicitTop = 104
+          ExplicitTop = 99
           ExplicitWidth = 750
-          ExplicitHeight = 106
+          ExplicitHeight = 231
         end
         inherited TBXDock1: TTBXDock
-          Top = 78
+          Top = 73
           Width = 750
-          ExplicitTop = 78
+          ExplicitTop = 73
           ExplicitWidth = 750
           inherited TBXToolbar1: TTBXToolbar
             ExplicitWidth = 750
@@ -307,10 +323,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         Left = 0
         Top = 0
         Width = 145
-        Height = 210
+        Height = 338
         Align = alLeft
         TabOrder = 0
-        ExplicitHeight = 374
+        ExplicitHeight = 330
         object Image2: TImage
           Left = 16
           Top = 16
@@ -398,7 +414,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         Left = 145
         Top = 0
         Width = 605
-        Height = 210
+        Height = 338
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -410,7 +426,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         ReadOnly = False
         ExplicitLeft = 145
         ExplicitWidth = 605
-        ExplicitHeight = 210
+        ExplicitHeight = 338
         inherited TBXDock1: TTBXDock
           Width = 605
           ExplicitWidth = 605
@@ -426,8 +442,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
           DataBinding.DataSource = dsDataTable
           Style.IsFontAssigned = True
           ExplicitWidth = 605
-          ExplicitHeight = 184
+          ExplicitHeight = 312
-          Height = 184
+          Height = 312
           Width = 605
         end
       end
@@ -439,10 +455,10 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         Left = 0
         Top = 0
         Width = 145
-        Height = 210
+        Height = 338
         Align = alLeft
         TabOrder = 0
-        ExplicitHeight = 374
+        ExplicitHeight = 330
         object Image3: TImage
           Left = 16
           Top = 16
@@ -701,7 +717,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         Left = 145
         Top = 0
         Width = 605
-        Height = 210
+        Height = 338
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -713,7 +729,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         ReadOnly = False
         ExplicitLeft = 145
         ExplicitWidth = 605
-        ExplicitHeight = 210
+        ExplicitHeight = 338
         inherited TBXDock1: TTBXDock
           Width = 605
           ExplicitWidth = 605
@@ -729,8 +745,8 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
           DataBinding.DataSource = dsDataTable
           Style.IsFontAssigned = True
           ExplicitWidth = 605
-          ExplicitHeight = 184
+          ExplicitHeight = 312
-          Height = 184
+          Height = 312
           Width = 605
         end
       end
@@ -742,7 +758,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         Left = 0
         Top = 0
         Width = 750
-        Height = 210
+        Height = 338
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -753,7 +769,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 750
-        ExplicitHeight = 210
+        ExplicitHeight = 338
         inherited pnlSup: TPanel
           Width = 750
           ExplicitWidth = 750
@@ -763,13 +779,13 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         end
         inherited GroupBox1: TGroupBox
           Width = 750
-          Height = 182
+          Height = 310
           ExplicitWidth = 750
-          ExplicitHeight = 182
+          ExplicitHeight = 302
           inherited eIncidencias: TcxDBMemo
             ExplicitWidth = 727
-            ExplicitHeight = 149
+            ExplicitHeight = 277
-            Height = 149
+            Height = 277
             Width = 727
           end
         end
@@ -782,7 +798,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         Left = 0
         Top = 0
         Width = 750
-        Height = 210
+        Height = 338
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -793,35 +809,35 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 750
-        ExplicitHeight = 210
+        ExplicitHeight = 338
         inherited TBXDock: TTBXDock
           Width = 750
           ExplicitWidth = 750
         end
         inherited ListView1: TListView
           Width = 750
-          Height = 187
+          Height = 315
           ExplicitWidth = 750
-          ExplicitHeight = 351
+          ExplicitHeight = 307
         end
       end
     end
   end
   inherited StatusBar: TJvStatusBar
-    Top = 596
+    Top = 573
     Width = 764
     Panels = <
       item
         Width = 200
       end>
-    ExplicitTop = 596
+    ExplicitTop = 573
     ExplicitWidth = 764
   end
   inline frViewTotalesPresupuesto1: TfrViewTotalesPresupuesto [4]
     Left = 0
-    Top = 320
+    Top = 448
     Width = 764
-    Height = 276
+    Height = 125
     Align = alBottom
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -831,153 +847,222 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     ParentFont = False
     TabOrder = 4
     ReadOnly = False
-    ExplicitTop = 320
+    ExplicitTop = 448
     ExplicitWidth = 764
-    ExplicitHeight = 276
+    ExplicitHeight = 125
     inherited dxLayoutControl1: TdxLayoutControl
       Width = 764
+      Height = 125
+      Align = alClient
+      AutoContentSizes = [acsWidth]
       ExplicitWidth = 764
+      ExplicitHeight = 125
       inherited Bevel1: TBevel
+        Left = 103
+        Top = 110
         Width = 73
+        ExplicitLeft = 103
+        ExplicitTop = 110
         ExplicitWidth = 73
       end
       inherited Bevel3: TBevel
-        Left = 441
+        Left = 432
-        Height = 122
+        Top = 29
-        ExplicitLeft = 441
+        Height = 75
-        ExplicitHeight = 122
+        ExplicitLeft = 432
+        ExplicitTop = 29
+        ExplicitHeight = 75
       end
       inherited Bevel4: TBevel
-        Left = 553
+        Left = 544
+        Top = 110
         Width = 192
-        ExplicitLeft = 553
+        ExplicitLeft = 544
+        ExplicitTop = 110
         ExplicitWidth = 192
       end
       inherited ImporteDto: TcxDBCurrencyEdit
+        Left = 174
+        Top = 130
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 174
+        ExplicitTop = 130
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 624
+        Left = 615
+        Top = 56
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 624
+        ExplicitLeft = 615
+        ExplicitTop = 56
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 554
+        Left = 545
+        Top = 130
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 554
+        ExplicitLeft = 545
+        ExplicitTop = 130
       end
       inherited edtDescuento: TcxDBSpinEdit
+        Left = 103
+        Top = 130
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 103
+        ExplicitTop = 130
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 553
+        Left = 544
+        Top = 56
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 553
+        ExplicitLeft = 544
+        ExplicitTop = 56
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 553
+        Left = 544
+        Top = 29
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 553
+        ExplicitLeft = 544
+        ExplicitTop = 29
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 553
+        Left = 544
+        Top = 83
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 553
+        ExplicitLeft = 544
+        ExplicitTop = 83
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 624
+        Left = 615
+        Top = 83
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 624
+        ExplicitLeft = 615
+        ExplicitTop = 83
       end
       inherited eImporteNeto: TcxDBCurrencyEdit
+        Left = 103
+        Top = 29
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 103
+        ExplicitTop = 29
       end
       inherited ePorte: TcxDBCurrencyEdit
+        Left = 103
+        Top = 157
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 103
+        ExplicitTop = 157
       end
       inherited eIVA: TcxDBLookupComboBox
+        Left = 103
+        Top = 56
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 103
+        ExplicitTop = 56
       end
       inherited bTiposIVA: TButton
-        Left = 293
+        Left = 284
-        ExplicitLeft = 293
+        Top = 56
+        ExplicitLeft = 284
+        ExplicitTop = 56
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
+        Left = 103
+        Top = 83
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 103
+        ExplicitTop = 83
         ExplicitWidth = 221
         Width = 221
       end
       inherited eDescripcionBonificacion: TcxDBTextEdit
+        Left = 103
+        Top = 211
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 103
+        ExplicitTop = 211
         ExplicitWidth = 325
         Width = 325
       end
       inherited eImporteBonificacion: TcxDBCurrencyEdit
+        Left = 103
+        Top = 238
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 103
+        ExplicitTop = 238
         ExplicitWidth = 277
         Width = 277
       end
       inherited cbBonificacion: TcxCheckBox
+        Left = 21
+        Top = 184
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
+        ExplicitLeft = 21
+        ExplicitTop = 184
         ExplicitWidth = 277
         Width = 277
       end
+      inherited dxLayoutControl1Group_Root: TdxLayoutGroup
+        inherited dxLayoutControl1Group1: TdxLayoutGroup
+          AutoAligns = [aaHorizontal]
+          AlignVert = avBottom
+          LookAndFeel = dxLayoutOfficeLookAndFeel1
+        end
+      end
     end
   end
   inherited EditorActionList: TActionList [5]

Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas

@@ -397,6 +397,7 @@ begin
     dsDataTable.DataTable := FPresupuesto.DataTable;
     frViewIncidenciasCli.DADataSource.DataTable := dsDataTable.DataTable;
     frViewTotalesPresupuesto1.DADataSource.DataTable := dsDataTable.DataTable;
+
     if Assigned(FViewPresupuesto) then
     begin
       ViewPresupuesto.ViewClientePresupuesto.OnClienteChanged := NIL;
@@ -409,7 +410,7 @@ begin
         frViewDocumentosPresupuestoCliente1.Presupuesto := FPresupuesto;
 
         frViewTotalesPresupuesto1.Presupuesto := FPresupuesto;
-        
+
       finally
         ViewPresupuesto.ViewClientePresupuesto.OnClienteChanged := OnClienteChanged;
       end;

Source/Modulos/Presupuestos de cliente/Views/uViewDatosYSeleccionClientePresupuesto.pas

@@ -91,9 +91,6 @@ type
   private
     FOnClienteChanged : TNotifyEvent;
     FMsgElegirCliente: String;
-    function GetMsgElegirCliente: String;
-    procedure SetMsgElegirCliente(const Value: String);
-
   protected
     FClientesController : IClientesController;
     FDireccionesController : IDireccionesContactoController;
@@ -207,6 +204,7 @@ begin
   edtlNombre.Enabled := False;
   edtNIFCIF.Enabled := False;
   edtDireccion.Enabled := False;
+  edtPersonaContacto.Enabled := False;
 end;
 
 destructor TfrViewDatosYSeleccionClientePresupuesto.Destroy;
@@ -308,11 +306,6 @@ begin
     Result := FCliente.ID;
 end;
 
-function TfrViewDatosYSeleccionClientePresupuesto.GetMsgElegirCliente: String;
-begin
-  //
-end;
-
 procedure TfrViewDatosYSeleccionClientePresupuesto.SetCliente(Value: IBizCliente);
 begin
   FCliente := Value;
@@ -322,11 +315,13 @@ begin
 
     if not FCliente.DataTable.Active then
       FCliente.DataTable.Active := True;
+    edtPersonaContacto.Enabled := True;
   end
   else begin
     dsCliente.DataTable := NIL;
     FCliente := NIL;
     FDireccion := NIL;
+    edtPersonaContacto.Enabled := False;
   end;
 
   if Assigned(FOnClienteChanged) then
@@ -338,12 +333,6 @@ begin
   Self.Cliente := IBizCliente(FClientesController.Buscar(Value));
 end;
 
-procedure TfrViewDatosYSeleccionClientePresupuesto.SetMsgElegirCliente(
-  const Value: String);
-begin
-
-end;
-
 function TfrViewDatosYSeleccionClientePresupuesto.GetOnClienteChanged: TNotifyEvent;
 begin
   Result := FOnClienteChanged;

Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm

@@ -187,8 +187,6 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 733
-          ExplicitWidth = 215
-          Width = 215
         end
         inherited dxLayoutControl1Group_Root: TdxLayoutGroup
           inherited dxLayoutControl1Group1: TdxLayoutGroup

Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas

@@ -162,7 +162,6 @@ end;
 procedure TfrViewPresupuestosCliente.AnadirFiltroFacturado;
 var
   FFiltro : TcxFilterCriteriaItemList;
-  Index: Integer;
 begin
   //Solo se aplica este filtro en el caso de tener activo el panel de detalle de filtro
   //y sobre la lista de articulos detallada por proveedor

Source/Modulos/Presupuestos de cliente/Views/uViewTotalesPresupuesto.dfm

@@ -1,31 +1,32 @@
 inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
-  Width = 848
+  Width = 924
-  Height = 287
+  Height = 293
   OnDestroy = CustomViewDestroy
   OnShow = CustomViewShow
-  ExplicitHeight = 287
+  ExplicitWidth = 924
+  ExplicitHeight = 293
   inherited dxLayoutControl1: TdxLayoutControl
-    Width = 848
+    Width = 924
     Height = 281
     ExplicitWidth = 451
     ExplicitHeight = 281
     DesignSize = (
-      848
+      924
       281)
     inherited Bevel1: TBevel
       Width = 73
       ExplicitWidth = 73
     end
     inherited Bevel3: TBevel
-      Left = 488
+      Left = 531
       Height = 122
-      ExplicitLeft = 488
+      ExplicitLeft = 531
       ExplicitHeight = 122
     end
     inherited Bevel4: TBevel
-      Left = 600
+      Left = 643
       Width = 192
-      ExplicitLeft = 600
+      ExplicitLeft = 643
       ExplicitWidth = 192
     end
     inherited ImporteDto: TcxDBCurrencyEdit
@@ -36,7 +37,7 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
       StyleHot.LookAndFeel.SkinName = ''
     end
     inherited ImporteIVA: TcxDBCurrencyEdit
-      Left = 671
+      Left = 714
       DataBinding.DataField = ''
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
@@ -44,17 +45,17 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 12
-      ExplicitLeft = 671
+      ExplicitLeft = 714
     end
     inherited ImporteTotal: TcxDBCurrencyEdit
-      Left = 601
+      Left = 644
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 15
-      ExplicitLeft = 601
+      ExplicitLeft = 644
     end
     inherited edtDescuento: TcxDBSpinEdit
       Style.LookAndFeel.SkinName = ''
@@ -64,27 +65,27 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
       StyleHot.LookAndFeel.SkinName = ''
     end
     inherited edtIVA: TcxDBSpinEdit
-      Left = 600
+      Left = 643
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 11
-      ExplicitLeft = 600
+      ExplicitLeft = 643
     end
     inherited ImporteBase: TcxDBCurrencyEdit
-      Left = 600
+      Left = 643
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 10
-      ExplicitLeft = 600
+      ExplicitLeft = 643
     end
     inherited edtRE: TcxDBSpinEdit
-      Left = 600
+      Left = 643
       DataBinding.DataField = ''
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
@@ -92,10 +93,10 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 13
-      ExplicitLeft = 600
+      ExplicitLeft = 643
     end
     inherited ImporteRE: TcxDBCurrencyEdit
-      Left = 671
+      Left = 714
       DataBinding.DataField = ''
       Style.LookAndFeel.SkinName = ''
       Style.IsFontAssigned = True
@@ -103,7 +104,7 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 14
-      ExplicitLeft = 671
+      ExplicitLeft = 714
     end
     inherited eImporteNeto: TcxDBCurrencyEdit
       Style.LookAndFeel.SkinName = ''
@@ -127,8 +128,8 @@ inherited frViewTotalesPresupuesto: TfrViewTotalesPresupuesto
       StyleHot.LookAndFeel.SkinName = ''
     end
     inherited bTiposIVA: TButton
-      Left = 340
+      Left = 383
-      ExplicitLeft = 340
+      ExplicitLeft = 383
     end
     inherited cbRecargoEquivalencia: TcxDBCheckBox
       DataBinding.DataField = ''

Source/Modulos/Remesas de cliente/Plugin/RemesasCliente_plugin.rc

@@ -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

Source/Modulos/Remesas de proveedor/Plugin/RemesasProveedor_plugin.rc

@@ -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

Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.dfm

@@ -160,6 +160,18 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor
         inherited ToolBar1: TToolBar
           Width = 676
           ExplicitWidth = 676
+          inherited ToolButton1: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton4: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton2: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton7: TToolButton
+            ExplicitWidth = 113
+          end
         end
       end
       inline frViewRemesaProveedor1: TfrViewRemesaProveedor
@@ -446,6 +458,7 @@ inherited fEditorRemesaProveedor: TfEditorRemesaProveedor
         ExplicitLeft = 92
         ExplicitTop = 64
         ExplicitWidth = 235
+        ExplicitHeight = 0
         Width = 235
       end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup

Source/Modulos/Remesas de proveedor/Views/uEditorRemesaProveedor.pas

@@ -75,7 +75,7 @@ implementation
 {$R *.dfm}
 
 uses
-  uDataTableUtils, cxControls, uDataModuleUsuarios, uDialogUtils, uCustomEditor,
+  uDataTableUtils, uDataModuleUsuarios, uDialogUtils, uCustomEditor,
   uDataModuleRemesasProveedor, uDataModuleBase, uBizFamilias, uFamiliasController,
   uFactuGES_App;
 //  uBancaElectronicaController;

Source/Servidor/FactuGES_Server.dproj

@@ -1,323 +1,323 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
+	<PropertyGroup>
-    <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
+		<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
-    <MainSource>FactuGES_Server.dpr</MainSource>
+		<MainSource>FactuGES_Server.dpr</MainSource>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+		<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
+		<DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
-    <DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
+		<DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
-  </PropertyGroup>
+	</PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Version>7.0</Version>
+		<Version>7.0</Version>
-    <DCC_DebugInformation>False</DCC_DebugInformation>
+		<DCC_DebugInformation>False</DCC_DebugInformation>
-    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+		<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+		<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-    <DCC_MapFile>3</DCC_MapFile>
+		<DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
+		<DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
-    <DCC_Define>RELEASE</DCC_Define>
+		<DCC_Define>RELEASE</DCC_Define>
-  </PropertyGroup>
+	</PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Version>7.0</Version>
+		<Version>7.0</Version>
-    <DCC_MapFile>3</DCC_MapFile>
+		<DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
+		<DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-    <DCC_Define>DEBUG;</DCC_Define>
+		<DCC_Define>DEBUG;</DCC_Define>
-    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-    <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
+		<DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
-    <DCC_DebugVN>True</DCC_DebugVN>
+		<DCC_DebugVN>True</DCC_DebugVN>
-    <DCC_UnitSearchPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
+		<DCC_UnitSearchPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
-    <DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
+		<DCC_ResourcePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
-    <DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
+		<DCC_ObjPath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
-    <DCC_IncludePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_IncludePath>
+		<DCC_IncludePath>$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_IncludePath>
-  </PropertyGroup>
+	</PropertyGroup>
-  <ProjectExtensions>
+	<ProjectExtensions>
-    <Borland.Personality>Delphi.Personality</Borland.Personality>
+		<Borland.Personality>Delphi.Personality</Borland.Personality>
-    <Borland.ProjectType />
+		<Borland.ProjectType/>
-    <BorlandProject>
+		<BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.4.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.4.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 11 de noviembre de 2008 20:02</VersionInfoKeys></VersionInfoKeys><Excluded_Packages /><Source><Source Name="MainSource">FactuGES_Server.dpr</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 Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.4.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.4.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 11 de noviembre de 2008 20:02</VersionInfoKeys></VersionInfoKeys><Excluded_Packages/><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
-  </ProjectExtensions>
+	</ProjectExtensions>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
+	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
-  <ItemGroup>
+	<ItemGroup>
-    <DelphiCompile Include="FactuGES_Server.dpr">
+		<DelphiCompile Include="FactuGES_Server.dpr">
-      <MainSource>MainSource</MainSource>
+			<MainSource>MainSource</MainSource>
-    </DelphiCompile>
+		</DelphiCompile>
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas" />
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas"/>
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas" />
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas"/>
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas" />
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas"/>
-    <DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
+		<DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
-      <Form>srvEmpresas</Form>
+			<Form>srvEmpresas</Form>
-      <DesignClass>TDARemoteService</DesignClass>
+			<DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
+		<DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
-      <Form>srvProvinciasPoblaciones_Impl</Form>
+			<Form>srvProvinciasPoblaciones_Impl</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas" />
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas"/>
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas" />
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas"/>
-    <DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
+		<DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
-      <Form>srvUsuarios</Form>
+			<Form>srvUsuarios</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Base\schBase_Intf.pas" />
+		<DCCReference Include="..\Base\schBase_Intf.pas"/>
-    <DCCReference Include="..\Base\Utiles\uSistemaFunc.pas" />
+		<DCCReference Include="..\Base\Utiles\uSistemaFunc.pas"/>
-    <DCCReference Include="..\Base\Utiles\uStringsUtils.pas" />
+		<DCCReference Include="..\Base\Utiles\uStringsUtils.pas"/>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas" />
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas"/>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
-      <Form>RptAlbaranesCliente</Form>
+			<Form>RptAlbaranesCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas">
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas">
-      <Form>RptWordAlbaranCliente</Form>
+			<Form>RptWordAlbaranCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
-      <Form>srvAlbaranesCliente</Form>
+			<Form>srvAlbaranesCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS" />
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS"/>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
-      <Form>srvAlbaranesProveedor</Form>
+			<Form>srvAlbaranesProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
+		<DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
-      <Form>srvAlmacenes</Form>
+			<Form>srvAlmacenes</Form>
-      <DesignClass>TDARemoteService</DesignClass>
+			<DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Articulos\Model\uBizArticulosServer.pas" />
+		<DCCReference Include="..\Modulos\Articulos\Model\uBizArticulosServer.pas"/>
-    <DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas">
+		<DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas">
-      <Form>srvArticulos</Form>
+			<Form>srvArticulos</Form>
-      <DesignClass>TDARemoteService</DesignClass>
+			<DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas" />
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas"/>
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas" />
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas"/>
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas" />
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas"/>
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas" />
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas"/>
-    <DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
+		<DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
-      <Form>RptEtiquetasContacto</Form>
+			<Form>RptEtiquetasContacto</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.pas">
+		<DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.pas">
-      <Form>RptFichasEmpleado</Form>
+			<Form>RptFichasEmpleado</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
+		<DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
-      <Form>srvContactos</Form>
+			<Form>srvContactos</Form>
-      <DesignClass>TDARemoteService</DesignClass>
+			<DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas">
+		<DCCReference Include="..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas">
-      <Form>srvFabricantes</Form>
+			<Form>srvFabricantes</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas" />
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas"/>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
+		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
-      <Form>RptFacturasCliente</Form>
+			<Form>RptFacturasCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptWordFacturaCliente.pas">
+		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptWordFacturaCliente.pas">
-      <Form>RptWordFacturaCliente</Form>
+			<Form>RptWordFacturaCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
+		<DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
-      <Form>srvFacturasCliente</Form>
+			<Form>srvFacturasCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas" />
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas"/>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
-      <Form>RptFacturasProveedor</Form>
+			<Form>RptFacturasProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
-      <Form>srvFacturasProveedor</Form>
+			<Form>srvFacturasProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas">
+		<DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas">
-      <Form>srvFamilias</Form>
+			<Form>srvFamilias</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas">
+		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas">
-      <Form>srvFormasPago</Form>
+			<Form>srvFormasPago</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
+		<DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
-      <Form>srvGestorDocumentos</Form>
+			<Form>srvGestorDocumentos</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
+		<DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
-      <Form>srvGestorInformes</Form>
+			<Form>srvGestorInformes</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
+		<DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
-      <Form>srvHistoricoMovimientos</Form>
+			<Form>srvHistoricoMovimientos</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
+		<DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
-      <Form>srvInventario</Form>
+			<Form>srvInventario</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Obras\Model\schObrasClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Obras\Model\schObrasClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Obras\Model\schObrasServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Obras\Model\schObrasServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Obras\Model\uBizObrasServer.pas" />
+		<DCCReference Include="..\Modulos\Obras\Model\uBizObrasServer.pas"/>
-    <DCCReference Include="..\Modulos\Obras\Servidor\srvObras_Impl.pas">
+		<DCCReference Include="..\Modulos\Obras\Servidor\srvObras_Impl.pas">
-      <Form>srvObras</Form>
+			<Form>srvObras</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas" />
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas"/>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
-      <Form>RptPedidosProveedor</Form>
+			<Form>RptPedidosProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas">
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas">
-      <Form>RptWordPedidoProveedor</Form>
+			<Form>RptWordPedidoProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
-      <Form>srvPedidosProveedor</Form>
+			<Form>srvPedidosProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas" />
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas"/>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
-      <Form>RptPresupuestosCliente</Form>
+			<Form>RptPresupuestosCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordCertificadoTrabajo_Server.pas">
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordCertificadoTrabajo_Server.pas">
-      <Form>RptWordCertificadoTrabajo</Form>
+			<Form>RptWordCertificadoTrabajo</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas">
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas">
-      <Form>RptWordPresupuestoCliente</Form>
+			<Form>RptWordPresupuestoCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
-      <Form>srvPresupuestosCliente</Form>
+			<Form>srvPresupuestosCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
+		<DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
-      <Form>RptRecibosCliente</Form>
+			<Form>RptRecibosCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
+		<DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
-      <Form>srvRecibosCliente</Form>
+			<Form>srvRecibosCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
-      <Form>RptRecibosProveedor</Form>
+			<Form>RptRecibosProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
-      <Form>srvRecibosProveedor</Form>
+			<Form>srvRecibosProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
+		<DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
-      <Form>srvReferencias</Form>
+			<Form>srvReferencias</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas" />
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas"/>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
+		<DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
-      <Form>srvRemesasCliente</Form>
+			<Form>srvRemesasCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas" />
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas"/>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
-      <Form>srvRemesasProveedor</Form>
+			<Form>srvRemesasProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas">
+		<DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas">
-      <Form>srvTiposIVA</Form>
+			<Form>srvTiposIVA</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas" />
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas" />
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas"/>
-    <DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
+		<DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
-      <Form>srvUnidadesMedida</Form>
+			<Form>srvUnidadesMedida</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
+		<DCCReference Include="..\Servicios\FactuGES_Intf.pas"/>
-    <DCCReference Include="..\Servicios\FactuGES_Invk.pas" />
+		<DCCReference Include="..\Servicios\FactuGES_Invk.pas"/>
-    <DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
+		<DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
-      <Form>srvConfiguracion</Form>
+			<Form>srvConfiguracion</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
+			<DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="Configuracion\uConexionBD.pas">
+		<DCCReference Include="Configuracion\uConexionBD.pas">
-      <Form>frConexionBD</Form>
+			<Form>frConexionBD</Form>
-      <DesignClass>TFrame</DesignClass>
+			<DesignClass>TFrame</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="Configuracion\uConfGeneral.pas">
+		<DCCReference Include="Configuracion\uConfGeneral.pas">
-      <Form>frConfGeneral</Form>
+			<Form>frConfGeneral</Form>
-      <DesignClass>TFrame</DesignClass>
+			<DesignClass>TFrame</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="Configuracion\uConfiguracion.pas">
+		<DCCReference Include="Configuracion\uConfiguracion.pas">
-      <Form>fConfiguracion</Form>
+			<Form>fConfiguracion</Form>
-      <DesignClass>TForm</DesignClass>
+			<DesignClass>TForm</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-      <Form>FrameConfiguracion</Form>
+			<Form>FrameConfiguracion</Form>
-      <DesignClass>TFrame</DesignClass>
+			<DesignClass>TFrame</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="srvLogin_Impl.pas">
+		<DCCReference Include="srvLogin_Impl.pas">
-      <Form>srvLogin</Form>
+			<Form>srvLogin</Form>
-      <DesignClass>TDARemoteService</DesignClass>
+			<DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="uAcercaDe.pas">
+		<DCCReference Include="uAcercaDe.pas">
-      <Form>fAcercaDe</Form>
+			<Form>fAcercaDe</Form>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="uDataModuleServer.pas">
+		<DCCReference Include="uDataModuleServer.pas">
-      <Form>dmServer</Form>
+			<Form>dmServer</Form>
-      <DesignClass>TDataModule</DesignClass>
+			<DesignClass>TDataModule</DesignClass>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="uServerMainForm.pas">
+		<DCCReference Include="uServerMainForm.pas">
-      <Form>fServerForm</Form>
+			<Form>fServerForm</Form>
-    </DCCReference>
+		</DCCReference>
-    <DCCReference Include="Utiles\AHWord97.pas" />
+		<DCCReference Include="Utiles\AHWord97.pas"/>
-    <DCCReference Include="Utiles\RegExpr.pas" />
+		<DCCReference Include="Utiles\RegExpr.pas"/>
-    <DCCReference Include="Utiles\uBusinessUtils.pas" />
+		<DCCReference Include="Utiles\uBusinessUtils.pas"/>
-    <DCCReference Include="Utiles\uDatabaseUtils.pas" />
+		<DCCReference Include="Utiles\uDatabaseUtils.pas"/>
-    <DCCReference Include="Utiles\uReferenciasUtils.pas" />
+		<DCCReference Include="Utiles\uReferenciasUtils.pas"/>
-    <DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas" />
+		<DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas"/>
-    <DCCReference Include="Utiles\uSchemaUtilsServer.pas" />
+		<DCCReference Include="Utiles\uSchemaUtilsServer.pas"/>
-    <DCCReference Include="Utiles\uServerAppUtils.pas" />
+		<DCCReference Include="Utiles\uServerAppUtils.pas"/>
-    <DCCReference Include="Utiles\uSesionesUtils.pas" />
+		<DCCReference Include="Utiles\uSesionesUtils.pas"/>
-  </ItemGroup>
+	</ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]

Source/Servidor/FactuGES_Server.rc

@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.4.6.0\0"
               VALUE "ProductVersion", "1.4.6.0\0"
-              VALUE "CompileDate", "jueves, 27 de noviembre de 2008 10:54\0"
+              VALUE "CompileDate", "jueves, 27 de noviembre de 2008 16:53\0"
          END
     END
     BLOCK "VarFileInfo"