From ed8598d8d95c02ef84df70d9eb3eeb14124528ab Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Wed, 18 Jun 2008 15:10:06 +0000
Subject: [PATCH] Fallo en lista de articulos no sacaba la referencia del
 fabricante.

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@461 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 .../Empresas/Model/schEmpresasClient_Intf.pas |  14 ++--
 .../Empresas/Model/schEmpresasServer_Intf.pas |   8 +--
 .../Empresas/Model/uBizEmpresasServer.pas     |  10 ++-
 .../Empresas/Servidor/srvEmpresas_Impl.dfm    |  12 +++-
 .../Controller/uArticulosController.pas       |   3 +-
 .../Modulos/Articulos/Views/uViewArticulo.dfm |  65 +++++++++---------
 .../Articulos/Views/uViewArticulos.dfm        |   2 +-
 .../Views/PedidosProveedor_view.dpk           |   2 +-
 .../Views/PedidosProveedor_view.dproj         |  49 ++++++-------
 .../Views/PedidosProveedor_view.res           | Bin 384 -> 4748 bytes
 .../uEditorElegirPersonaContactoPedido.dfm    |   3 +-
 .../uEditorElegirPersonaContactoPedido.pas    |   8 ++-
 Source/Servidor/FactuGES_Server.dpr           |   6 +-
 13 files changed, 104 insertions(+), 78 deletions(-)

diff --git a/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas b/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas
index 61cc75e5..f266657e 100644
--- a/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas
+++ b/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas
@@ -3,14 +3,14 @@ unit schEmpresasClient_Intf;
 interface
 
 uses
-  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf;
 
 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_Empresas = '{0818A25D-E23C-4CFF-82F0-313FD818251C}';
-  RID_EmpresasDatosBanco = '{3F6CB778-A561-495F-AA36-903B1F94E7B7}';
+  RID_Empresas = '{44B01133-DAC4-424A-9152-B369DB57858D}';
+  RID_EmpresasDatosBanco = '{FA3FAB23-9A95-4DD2-8AF7-046B04689D22}';
 
   { Data table names }
   nme_Empresas = 'Empresas';
@@ -99,7 +99,7 @@ const
 type
   { IEmpresas }
   IEmpresas = interface(IDAStronglyTypedDataTable)
-  ['{80F28C5F-7541-4940-8747-D39D8B8426D9}']
+  ['{1ACDCBE0-0B63-44A7-974E-40FB704DE038}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -255,7 +255,7 @@ type
   end;
 
   { TEmpresasDataTableRules }
-  TEmpresasDataTableRules = class(TIntfObjectDADataTableRules, IEmpresas)
+  TEmpresasDataTableRules = class(TDADataTableRules, IEmpresas)
   private
     f_NOTAS: IROStrings;
     f_LOGOTIPO: IROStream;
@@ -422,7 +422,7 @@ type
 
   { IEmpresasDatosBanco }
   IEmpresasDatosBanco = interface(IDAStronglyTypedDataTable)
-  ['{2808E04A-4851-4816-ACAD-9B4B8357B765}']
+  ['{5FEF9BFD-162A-4DBA-9B7B-6F99C3672E57}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -496,7 +496,7 @@ type
   end;
 
   { TEmpresasDatosBancoDataTableRules }
-  TEmpresasDatosBancoDataTableRules = class(TIntfObjectDADataTableRules, IEmpresasDatosBanco)
+  TEmpresasDatosBancoDataTableRules = class(TDADataTableRules, IEmpresasDatosBanco)
   private
   protected
     { Property getters and setters }
diff --git a/Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas b/Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas
index 4b03e239..74e2fb7b 100644
--- a/Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas
+++ b/Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas
@@ -9,13 +9,13 @@ 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_EmpresasDelta = '{39AC9440-BEDB-4468-8B08-49600891084A}';
-  RID_EmpresasDatosBancoDelta = '{A084800E-091E-40AD-9B45-63974394595E}';
+  RID_EmpresasDelta = '{56A33A56-CCD5-4F9C-A1AE-2A164D288BB2}';
+  RID_EmpresasDatosBancoDelta = '{0B56774E-9818-404A-AB4E-F54B831D2794}';
 
 type
   { IEmpresasDelta }
   IEmpresasDelta = interface(IEmpresas)
-  ['{39AC9440-BEDB-4468-8B08-49600891084A}']
+  ['{56A33A56-CCD5-4F9C-A1AE-2A164D288BB2}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldNIF_CIFValue : String;
@@ -339,7 +339,7 @@ type
 
   { IEmpresasDatosBancoDelta }
   IEmpresasDatosBancoDelta = interface(IEmpresasDatosBanco)
-  ['{A084800E-091E-40AD-9B45-63974394595E}']
+  ['{0B56774E-9818-404A-AB4E-F54B831D2794}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
diff --git a/Source/ApplicationBase/Empresas/Model/uBizEmpresasServer.pas b/Source/ApplicationBase/Empresas/Model/uBizEmpresasServer.pas
index 35d9d47d..cd6a2eac 100644
--- a/Source/ApplicationBase/Empresas/Model/uBizEmpresasServer.pas
+++ b/Source/ApplicationBase/Empresas/Model/uBizEmpresasServer.pas
@@ -30,6 +30,8 @@ procedure TBizEmpresasServer.AfterProcessChange(Sender: TDABusinessProcessor;
   aChange: TDADeltaChange; Processed: Boolean; var CanRemoveFromDelta: Boolean);
 var
   AConn : IDAConnection;
+  ParamTiempo: Variant;
+  ParamMargen: Variant;
 
 begin
   inherited;
@@ -39,14 +41,16 @@ begin
 
   case aChange.ChangeType of
     ctInsert, ctUpdate: begin
-      if ((Sender.CurrentChange.OldValueByName[fld_EmpresasPARAM_TIEMPO] <> Sender.CurrentChange.NewValueByName[fld_EmpresasPARAM_TIEMPO])
-      or (Sender.CurrentChange.OldValueByName[fld_EmpresasPARAM_MARGEN] <> Sender.CurrentChange.NewValueByName[fld_EmpresasPARAM_MARGEN])) then
+      ParamTiempo := Sender.CurrentChange.NewValueByName[fld_EmpresasPARAM_TIEMPO];
+      ParamMargen := Sender.CurrentChange.NewValueByName[fld_EmpresasPARAM_MARGEN];
+      if ((Sender.CurrentChange.OldValueByName[fld_EmpresasPARAM_TIEMPO] <> ParamTiempo)
+      or (Sender.CurrentChange.OldValueByName[fld_EmpresasPARAM_MARGEN] <> ParamMargen)) then
       begin
         try
           //Recalculamos los PVP del catalogo
           AConn := dmServer.ConnectionManager.NewConnection(dmServer.ConnectionManager.GetDefaultConnectionName);
           AConn.BeginTransaction;
-          Sender.Schema.NewCommand(AConn, 'RecalcularPVPArticulos', ['ID_EMPRESA'], [Sender.CurrentChange.OldValueByName[fld_EmpresasID]]);
+          Sender.Schema.NewCommand(AConn, 'RecalcularPVPArticulos', ['ID_EMPRESA', 'PARAM_MARGEN', 'PARAM_TIEMPO'], [Sender.CurrentChange.OldValueByName[fld_EmpresasID], ParamMargen, ParamTiempo]);
           AConn.CommitTransaction;
         except
           AConn.RollbackTransaction;
diff --git a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm
index 64e06ad8..acb8253e 100644
--- a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm
+++ b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm
@@ -405,6 +405,14 @@ object srvEmpresas: TsrvEmpresas
           item
             Name = 'id_empresa'
             Value = ''
+          end
+          item
+            Name = 'param_margen'
+            Value = ''
+          end
+          item
+            Name = 'param_tiempo'
+            Value = ''
           end>
         Statements = <
           item
@@ -412,7 +420,9 @@ object srvEmpresas: TsrvEmpresas
             ConnectionType = 'Interbase'
             Default = True
             Name = 'IBX'
-            SQL = 'execute procedure PRO_ART_RECALCULAR_PVP :id_empresa'#10
+            SQL = 
+              'execute procedure PRO_ART_RECALCULAR_PVP :id_empresa, :param_mar' +
+              'gen, :param_tiempo'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
diff --git a/Source/Modulos/Articulos/Controller/uArticulosController.pas b/Source/Modulos/Articulos/Controller/uArticulosController.pas
index 5f27ddf9..6cb0313d 100644
--- a/Source/Modulos/Articulos/Controller/uArticulosController.pas
+++ b/Source/Modulos/Articulos/Controller/uArticulosController.pas
@@ -363,8 +363,9 @@ begin
     Result.Edit;
     with Result do
     begin
-	  ID_EMPRESA := AppFactuGES.EmpresaActiva.ID;	
+  	  ID_EMPRESA := AppFactuGES.EmpresaActiva.ID;
       USUARIO := AppFactuGES.UsuarioActivo.UserName;
+      REFERENCIA := '';
     end;
 
     Result.Post;
diff --git a/Source/Modulos/Articulos/Views/uViewArticulo.dfm b/Source/Modulos/Articulos/Views/uViewArticulo.dfm
index 4d5d9103..d915c955 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulo.dfm
+++ b/Source/Modulos/Articulos/Views/uViewArticulo.dfm
@@ -1,6 +1,6 @@
 inherited frViewArticulo: TfrViewArticulo
-  Width = 1042
-  Height = 510
+  Width = 953
+  Height = 514
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -10,16 +10,16 @@ inherited frViewArticulo: TfrViewArticulo
   object dxLayoutControlArticulo: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 1042
+    Width = 953
     Height = 507
     Align = alTop
     ParentBackground = True
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth]
-    ExplicitWidth = 954
+    ExplicitWidth = 451
     DesignSize = (
-      1042
+      953
       507)
     object PngSpeedButton2: TPngSpeedButton
       Left = 529
@@ -58,10 +58,11 @@ inherited frViewArticulo: TfrViewArticulo
     end
     object eReferencia: TcxDBTextEdit
       Left = 132
-      Top = 55
+      Top = 28
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'REFERENCIA'
       DataBinding.DataSource = dsViewArticulo
+      Enabled = False
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
       Style.Color = clWindow
@@ -74,12 +75,12 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 1
-      Width = 200
+      TabOrder = 0
+      Width = 420
     end
     object eDescripcion: TcxDBTextEdit
       Left = 132
-      Top = 28
+      Top = 55
       DataBinding.DataField = 'DESCRIPCION'
       DataBinding.DataSource = dsViewArticulo
       Style.BorderColor = clWindowFrame
@@ -94,8 +95,8 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 0
-      Width = 200
+      TabOrder = 1
+      Width = 420
     end
     object eNoComisionable: TcxDBCheckBox
       Left = 132
@@ -119,7 +120,7 @@ inherited frViewArticulo: TfrViewArticulo
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 5
-      Width = 200
+      Width = 420
     end
     object eImagen: TcxImage
       Left = 28
@@ -141,7 +142,7 @@ inherited frViewArticulo: TfrViewArticulo
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 14
       Height = 98
-      Width = 200
+      Width = 495
     end
     object cbFamilia: TcxDBComboBox
       Left = 132
@@ -165,7 +166,7 @@ inherited frViewArticulo: TfrViewArticulo
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 2
-      Width = 200
+      Width = 420
     end
     inline frViewDatosYSeleccionProveedor1: TfrViewDatosYSeleccionProveedor
       Left = 582
@@ -207,12 +208,12 @@ inherited frViewArticulo: TfrViewArticulo
           Width = 221
         end
         inherited edtCodigoPostal: TcxDBTextEdit
-          Left = 329
-          ExplicitLeft = 329
+          Left = 240
+          ExplicitLeft = 240
         end
         inherited Button3: TBitBtn
-          Left = 213
-          ExplicitLeft = 213
+          Left = 124
+          ExplicitLeft = 124
         end
       end
     end
@@ -251,7 +252,7 @@ inherited frViewArticulo: TfrViewArticulo
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 17
-      Width = 340
+      Width = 86
     end
     object eDescuento: TcxDBSpinEdit
       Left = 663
@@ -276,7 +277,7 @@ inherited frViewArticulo: TfrViewArticulo
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 18
-      Width = 340
+      Width = 86
     end
     object ePrecioNeto: TcxDBCurrencyEdit
       Left = 663
@@ -301,7 +302,7 @@ inherited frViewArticulo: TfrViewArticulo
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 19
-      Width = 340
+      Width = 86
     end
     object ePrecioPorte: TcxDBCurrencyEdit
       Left = 663
@@ -345,7 +346,7 @@ inherited frViewArticulo: TfrViewArticulo
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 4
-      Width = 200
+      Width = 420
     end
     object cbUnidadMedida: TcxDBComboBox
       Left = 132
@@ -369,7 +370,7 @@ inherited frViewArticulo: TfrViewArticulo
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 3
-      Width = 200
+      Width = 420
     end
     object cbFabricante: TcxDBComboBox
       Left = 132
@@ -393,7 +394,7 @@ inherited frViewArticulo: TfrViewArticulo
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 12
-      Width = 200
+      Width = 420
     end
     object eReferenciaFabr: TcxDBTextEdit
       Left = 132
@@ -490,7 +491,7 @@ inherited frViewArticulo: TfrViewArticulo
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 10
-      Width = 100
+      Width = 112
     end
     object eParamMargen: TcxDBSpinEdit
       Left = 132
@@ -584,13 +585,6 @@ inherited frViewArticulo: TfrViewArticulo
           AutoAligns = []
           AlignHorz = ahClient
           Caption = 'Datos del art'#237'culo'
-          object dxLayoutControlArticuloItem8: TdxLayoutItem
-            AutoAligns = [aaVertical]
-            AlignHorz = ahClient
-            Caption = 'Descripci'#243'n:'
-            Control = eDescripcion
-            ControlOptions.ShowBorder = False
-          end
           object dxLayoutControlArticuloItem3: TdxLayoutItem
             AutoAligns = [aaVertical]
             AlignHorz = ahClient
@@ -598,6 +592,13 @@ inherited frViewArticulo: TfrViewArticulo
             Control = eReferencia
             ControlOptions.ShowBorder = False
           end
+          object dxLayoutControlArticuloItem8: TdxLayoutItem
+            AutoAligns = [aaVertical]
+            AlignHorz = ahClient
+            Caption = 'Descripci'#243'n:'
+            Control = eDescripcion
+            ControlOptions.ShowBorder = False
+          end
           object dxLayoutControlArticuloGroup4: TdxLayoutGroup
             ShowCaption = False
             Hidden = True
diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.dfm b/Source/Modulos/Articulos/Views/uViewArticulos.dfm
index 7ebe866b..db4de101 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uViewArticulos.dfm
@@ -94,7 +94,7 @@ inherited frViewArticulos: TfrViewArticulos
       end
       object cxGridViewREFERENCIA_FABR: TcxGridDBColumn
         Caption = 'Ref. fabricante'
-        DataBinding.FieldName = 'REFERENCIA_FABRICANTE'
+        DataBinding.FieldName = 'REFERENCIA_FABR'
         BestFitMaxWidth = 60
         Width = 60
       end
diff --git a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dpk b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dpk
index 0199307b..12fdb34c 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dpk	
+++ b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dpk	
@@ -63,6 +63,6 @@ contains
   uEditorElegirArticulosPedidoProveedor in 'uEditorElegirArticulosPedidoProveedor.pas' {fEditorElegirArticulosPedidoProveedor: TForm},
   uEditorSituacionPedidoProveedor in 'uEditorSituacionPedidoProveedor.pas' {fEditorSituacionPedidoProveedor: TfEditorSituacionPedidoProveedor},
   uViewProveedorPedido in 'uViewProveedorPedido.pas' {frViewProveedorPedido: TFrame},
-  uEditorElegirPersonaContactoPedido in 'uEditorElegirPersonaContactoPedido.pas';
+  uEditorElegirPersonaContactoPedido in 'uEditorElegirPersonaContactoPedido.pas' {fEditorElegirPersonaContactoPedido: TfEditorElegirPersonaContactoPedido};
 
 end.
diff --git a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj
index 4137da8e..fd4120b1 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj	
+++ b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.dproj	
@@ -49,28 +49,28 @@
     <DelphiCompile Include="PedidosProveedor_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Lib\Almacenes_controller.dcp" />
-    <DCCReference Include="..\..\Lib\Almacenes_model.dcp" />
-    <DCCReference Include="..\..\Lib\Articulos_view.dcp" />
-    <DCCReference Include="..\..\Lib\Contactos_controller.dcp" />
-    <DCCReference Include="..\..\Lib\Contactos_model.dcp" />
-    <DCCReference Include="..\..\Lib\Contactos_view.dcp" />
-    <DCCReference Include="..\..\Lib\cxDataD11.dcp" />
-    <DCCReference Include="..\..\Lib\cxEditorsD11.dcp" />
-    <DCCReference Include="..\..\Lib\cxLibraryD11.dcp" />
-    <DCCReference Include="..\..\Lib\dbrtl.dcp" />
-    <DCCReference Include="..\..\Lib\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\..\Lib\dxThemeD11.dcp" />
-    <DCCReference Include="..\..\Lib\GUIBase.dcp" />
-    <DCCReference Include="..\..\Lib\Obras_controller.dcp" />
-    <DCCReference Include="..\..\Lib\Obras_model.dcp" />
-    <DCCReference Include="..\..\Lib\PedidosProveedor_controller.dcp" />
-    <DCCReference Include="..\..\Lib\PedidosProveedor_model.dcp" />
-    <DCCReference Include="..\..\Lib\PedProv_AlbProv_relation.dcp" />
-    <DCCReference Include="..\..\Lib\rtl.dcp" />
-    <DCCReference Include="..\..\Lib\vcl.dcp" />
-    <DCCReference Include="..\..\Lib\vcldb.dcp" />
-    <DCCReference Include="..\..\Lib\vcljpg.dcp" />
+    <DCCReference Include="..\Almacenes_controller.dcp" />
+    <DCCReference Include="..\Almacenes_model.dcp" />
+    <DCCReference Include="..\Articulos_view.dcp" />
+    <DCCReference Include="..\Contactos_controller.dcp" />
+    <DCCReference Include="..\Contactos_model.dcp" />
+    <DCCReference Include="..\Contactos_view.dcp" />
+    <DCCReference Include="..\cxDataD11.dcp" />
+    <DCCReference Include="..\cxEditorsD11.dcp" />
+    <DCCReference Include="..\cxLibraryD11.dcp" />
+    <DCCReference Include="..\dbrtl.dcp" />
+    <DCCReference Include="..\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\dxThemeD11.dcp" />
+    <DCCReference Include="..\GUIBase.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="..\rtl.dcp" />
+    <DCCReference Include="..\vcl.dcp" />
+    <DCCReference Include="..\vcldb.dcp" />
+    <DCCReference Include="..\vcljpg.dcp" />
     <DCCReference Include="uEditorDireccionEntregaPedidoProveedor.pas">
       <Form>fEditorDireccionEntregaPedidoProveedor </Form>
       <DesignClass>TfEditorDireccionEntregaPedidoProveedor</DesignClass>
@@ -83,7 +83,10 @@
       <Form>fEditorElegirPedidosProveedor</Form>
       <DesignClass>TForm</DesignClass>
     </DCCReference>
-    <DCCReference Include="uEditorElegirPersonaContactoPedido.pas" />
+    <DCCReference Include="uEditorElegirPersonaContactoPedido.pas">
+      <Form>fEditorElegirPersonaContactoPedido</Form>
+      <DesignClass>TfEditorSituacionPedidoProveedor</DesignClass>
+    </DCCReference>
     <DCCReference Include="uEditorPedidoProveedor.pas">
       <Form>fEditorPedidoProveedor</Form>
       <DesignClass>TfEditorPedidoProveedor</DesignClass>
diff --git a/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.res b/Source/Modulos/Pedidos a proveedor/Views/PedidosProveedor_view.res
index 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644
GIT binary patch
literal 4748
zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg
zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?<w4U-ol;S2jC7
zx4(byej2@_#)0HWvg0i^wC4Xli+W*aXJ^(njceK|Kb@c3qFNX>p${kR>3GhM`oH*q
zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W
zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7
z{BT%G%irdMe*|oDJmgvJ<ltI;x5J<Oc>aA2`9B<Z5Toyra?r{a4$fnJHGXo6Pmcq8
z{JGCD500t1h4|yI?-f&xoj9;YT&Ch&JLO*X#NC3sCI0Xmc<f_vh`jn-1E!?th$%QM
znzGM|)$vl3f7;nE+9qR}|A?C$H3K&BFdq9?uxrIqHIne#5?8G@da2ybWLGKA686M2
z*LJMMMk4<U`dzFC9}HrSxLfOGll{P#??xir)$c2}C;ql+y-&Wa(LP{PgPk1E1@{uR
zIMCNz;u9;r(axhQvEx%?i#p<Vn=Z!SK%f10?4_`0@RY8lXRM3(t(nFSzJ$4kJr6&x
ze)~B%biu*TY$HDstHD=|UGxJceYiUQQa0Gu(p3og@%ZJ><6Xi*?M~Q;)@Sbfwf3uf
zVaWkbU<NjR3%=~AdoZbkXp`f@b0%GBT^$^V5e(n|#O(?P)hBbF)4n%2cw6U#adPM!
zz(!`V|Bfl{aH0)Y&w;SK7R4<z{p;Gwz1D%l86L3ZFZQ&=pB$<&esXT|OZ?=AGaWoe
z{>jU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv
zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N|
z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc
z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0
zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38=
zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W
zVvPDBKHh;i=RU4J_ta3E;)M<P+=2X7;VbzliQZ=IHV#+fr#{!(ukt%UJMS8=332qg
z7jD)rSbpCW+^j*cd6LUEe8#9n&v!NEJM(@?SHvB$=h@|)fjw|&qD?NQ5A&R>n>Y+L
zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m
z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJu<OVP
zzHjp+hnwo*3NQE$JTA(agu~silV5T`du+GJgWGi_7mAy`Nk8fLt~%GF$;XXcE-ri?
zyIglyyzA`K-);4Eem2MZm07RBza@W3UP)d`Rz=RFk-I);`s{$L%yyBNX0OTjo5Gk0
zs}g44uXg*l%xo^{`#0=kd*2?}Cz22Bv2;Gu?;3o~(D#gk1OKYQSCAb$(&vu@_pvWO
z>gbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T
z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC
zy(^m((;DnQmDQ<zX+PK(Lfu@ox#mOnbZjSDl}IBqv$qwK+2@))5$ba>Katmw!@c`|
G?EMQ&4NnpP

delta 11
ScmeBCZD5|Duvteife`=|>;pCc

diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPersonaContactoPedido.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPersonaContactoPedido.dfm
index 9beb02e6..72c191eb 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPersonaContactoPedido.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPersonaContactoPedido.dfm	
@@ -7,7 +7,7 @@ inherited fEditorElegirPersonaContactoPedido: TfEditorElegirPersonaContactoPedid
   OnCreate = CustomEditorCreate
   OnShow = CustomEditorShow
   ExplicitWidth = 416
-  ExplicitHeight = 294
+  ExplicitHeight = 301
   PixelsPerInch = 96
   TextHeight = 13
   object Label1: TLabel
@@ -93,6 +93,7 @@ inherited fEditorElegirPersonaContactoPedido: TfEditorElegirPersonaContactoPedid
     Width = 335
     Height = 17
     Action = actSubcontrata
+    Caption = 'Personal de contacto de la subcontrata:'
     TabOrder = 4
   end
   object rdxDestino2: TRadioButton
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPersonaContactoPedido.pas b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPersonaContactoPedido.pas
index e926573a..5ccb1a5c 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPersonaContactoPedido.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPersonaContactoPedido.pas	
@@ -5,7 +5,13 @@ interface
 uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   uEditorBasico, ActnList, StdCtrls, ExtCtrls, cxGraphics, cxControls,
-  cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit;
+  cxContainer, cxEdit, cxTextEdit, cxMaskEdit, cxDropDownEdit, dxSkinsCore,
+  dxSkinBlack, dxSkinBlue, dxSkinCaramel, dxSkinCoffee, dxSkinGlassOceans,
+  dxSkiniMaginary, dxSkinLilian, dxSkinLiquidSky, dxSkinLondonLiquidSky,
+  dxSkinMcSkin, dxSkinMoneyTwins, dxSkinOffice2007Black, dxSkinOffice2007Blue,
+  dxSkinOffice2007Green, dxSkinOffice2007Pink, dxSkinOffice2007Silver,
+  dxSkinSilver, dxSkinStardust, dxSkinsDefaultPainters, dxSkinValentine,
+  dxSkinXmas2008Blue;
 
 type
   TfEditorElegirPersonaContactoPedido = class(TfEditorBasico)
diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr
index 08aa9aa1..4280f3a7 100644
--- a/Source/Servidor/FactuGES_Server.dpr
+++ b/Source/Servidor/FactuGES_Server.dpr
@@ -124,10 +124,10 @@ uses
   srvProvinciasPoblaciones_Impl in '..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas',
   schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas',
   schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas',
-  schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
-  schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
   uBizArticulosServer in '..\Modulos\Articulos\Model\uBizArticulosServer.pas',
-  uBizEmpresasServer in '..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas';
+  uBizEmpresasServer in '..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas',
+  schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
+  schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}