From ff3c571ffb93843387746c71e4d300ec9b1e423b Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Thu, 20 Dec 2007 20:34:59 +0000
Subject: [PATCH] =?UTF-8?q?Art=C3=ADculos=20->=20Nuevo=20campo=20"unidad?=
 =?UTF-8?q?=20de=20medida".?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@191 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 .../Articulos/Articulos_Group.groupproj       |  26 ++--
 .../Articulos/Data/uDataModuleArticulos.dfm   |  12 +-
 .../Model/schArticulosClient_Intf.pas         | 138 +++++++++++++-----
 .../Model/schArticulosServer_Intf.pas         |  94 +++++++++++-
 .../Articulos/Servidor/srvArticulos_Impl.dfm  |  87 +++++++----
 .../Articulos/Views/Articulos_view.dpk        |   1 +
 .../Articulos/Views/Articulos_view.dproj      |  54 ++-----
 .../Modulos/Articulos/Views/Articulos_view.rc |  22 +++
 .../Articulos/Views/Articulos_view.res        | Bin 32 -> 384 bytes
 .../Articulos/Views/uEditorArticulo.dfm       |  14 +-
 .../Articulos/Views/uEditorArticulo.pas       |   2 +-
 .../Modulos/Articulos/Views/uViewArticulo.dfm |  73 ++++++---
 .../Modulos/Articulos/Views/uViewArticulo.pas |  83 ++++++++++-
 .../Articulos/Views/uViewArticulos.dfm        |   6 +-
 .../Articulos/Views/uViewArticulos.pas        |   1 +
 .../Views/uViewDetallesArticulos.dfm          |  18 ++-
 .../Views/uViewDetallesArticulos.pas          |  33 ++++-
 17 files changed, 498 insertions(+), 166 deletions(-)

diff --git a/Source/Modulos/Articulos/Articulos_Group.groupproj b/Source/Modulos/Articulos/Articulos_Group.groupproj
index 3f402ca4..85a972b6 100644
--- a/Source/Modulos/Articulos/Articulos_Group.groupproj
+++ b/Source/Modulos/Articulos/Articulos_Group.groupproj
@@ -8,7 +8,7 @@
     <Projects Include="..\..\Base\Base.dproj" />
     <Projects Include="..\..\Cliente\FactuGES.dproj" />
     <Projects Include="..\..\GUIBase\GUIBase.dproj" />
-    <Projects Include="..\..\Servidor\FactuGES_Server.dproj" />
+    <Projects Include="..\Contactos\Views\Contactos_view.dproj" />
     <Projects Include="Controller\Articulos_controller.dproj" />
     <Projects Include="Data\Articulos_data.dproj" />
     <Projects Include="Model\Articulos_model.dproj" />
@@ -48,6 +48,15 @@
   <Target Name="ApplicationBase:Make">
     <MSBuild Projects="..\..\ApplicationBase\ApplicationBase.dproj" Targets="Make" />
   </Target>
+  <Target Name="Contactos_view">
+    <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="" />
+  </Target>
+  <Target Name="Contactos_view:Clean">
+    <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="Contactos_view:Make">
+    <MSBuild Projects="..\Contactos\Views\Contactos_view.dproj" Targets="Make" />
+  </Target>
   <Target Name="Articulos_model">
     <MSBuild Projects="Model\Articulos_model.dproj" Targets="" />
   </Target>
@@ -102,23 +111,14 @@
   <Target Name="FactuGES:Make">
     <MSBuild Projects="..\..\Cliente\FactuGES.dproj" Targets="Make" />
   </Target>
-  <Target Name="FactuGES_Server">
-    <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="" />
-  </Target>
-  <Target Name="FactuGES_Server:Clean">
-    <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="FactuGES_Server:Make">
-    <MSBuild Projects="..\..\Servidor\FactuGES_Server.dproj" Targets="Make" />
-  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;Articulos_plugin;FactuGES;FactuGES_Server" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_view;Articulos_model;Articulos_data;Articulos_controller;Articulos_view;Articulos_plugin;FactuGES" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;Articulos_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_view:Clean;Articulos_model:Clean;Articulos_data:Clean;Articulos_controller:Clean;Articulos_view:Clean;Articulos_plugin:Clean;FactuGES:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;Articulos_plugin:Make;FactuGES:Make;FactuGES_Server:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_view:Make;Articulos_model:Make;Articulos_data:Make;Articulos_controller:Make;Articulos_view:Make;Articulos_plugin:Make;FactuGES:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>
\ No newline at end of file
diff --git a/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm b/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm
index edf41a27..b3d36c5c 100644
--- a/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm
+++ b/Source/Modulos/Articulos/Data/uDataModuleArticulos.dfm
@@ -54,6 +54,11 @@ inherited DataModuleArticulos: TDataModuleArticulos
         DisplayLabel = 'Descripci'#243'n'
         DictionaryEntry = 'Articulos_DESCRIPCION'
       end
+      item
+        Name = 'UNIDAD_MEDIDA'
+        DataType = datString
+        Size = 255
+      end
       item
         Name = 'FAMILIA'
         DataType = datString
@@ -178,6 +183,11 @@ inherited DataModuleArticulos: TDataModuleArticulos
         DataType = datString
         Size = 255
       end
+      item
+        Name = 'UNIDAD_MEDIDA'
+        DataType = datString
+        Size = 255
+      end
       item
         Name = 'FAMILIA'
         DataType = datString
@@ -246,7 +256,7 @@ inherited DataModuleArticulos: TDataModuleArticulos
     Params = <
       item
         Name = 'ID_CLIENTE'
-        Value = ''
+        Value = '2'
         ParamType = daptInput
       end>
     StreamingOptions = [soDisableEventsWhileStreaming]
diff --git a/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas b/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas
index f23ea174..57ec9644 100644
--- a/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas
+++ b/Source/Modulos/Articulos/Model/schArticulosClient_Intf.pas
@@ -9,8 +9,8 @@ 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_Articulos = '{96B1BC75-3838-4481-8FAB-C5709E2A2B97}';
-  RID_ArticulosParaCliente = '{1C488DD9-5F46-43A2-9440-617591319C59}';
+  RID_Articulos = '{79461C02-C303-4849-B89B-1A86EB440B71}';
+  RID_ArticulosParaCliente = '{79CE72E6-EEE0-4CD7-BF63-178D4CBAD3E7}';
 
   { Data table names }
   nme_Articulos = 'Articulos';
@@ -21,6 +21,7 @@ const
   fld_ArticulosID_EMPRESA = 'ID_EMPRESA';
   fld_ArticulosREFERENCIA = 'REFERENCIA';
   fld_ArticulosDESCRIPCION = 'DESCRIPCION';
+  fld_ArticulosUNIDAD_MEDIDA = 'UNIDAD_MEDIDA';
   fld_ArticulosFAMILIA = 'FAMILIA';
   fld_ArticulosIMAGEN = 'IMAGEN';
   fld_ArticulosCOMISIONABLE = 'COMISIONABLE';
@@ -42,27 +43,29 @@ const
   idx_ArticulosID_EMPRESA = 1;
   idx_ArticulosREFERENCIA = 2;
   idx_ArticulosDESCRIPCION = 3;
-  idx_ArticulosFAMILIA = 4;
-  idx_ArticulosIMAGEN = 5;
-  idx_ArticulosCOMISIONABLE = 6;
-  idx_ArticulosFECHA_ALTA = 7;
-  idx_ArticulosFECHA_MODIFICACION = 8;
-  idx_ArticulosUSUARIO = 9;
-  idx_ArticulosREFERENCIA_PROV = 10;
-  idx_ArticulosPRECIO_COSTE = 11;
-  idx_ArticulosPRECIO_PORTE = 12;
-  idx_ArticulosDESCUENTO = 13;
-  idx_ArticulosPRECIO_NETO = 14;
-  idx_ArticulosINVENTARIABLE = 15;
-  idx_ArticulosID_PROVEEDOR = 16;
-  idx_ArticulosNOMBRE_PROVEEDOR = 17;
-  idx_ArticulosELIMINADO = 18;
+  idx_ArticulosUNIDAD_MEDIDA = 4;
+  idx_ArticulosFAMILIA = 5;
+  idx_ArticulosIMAGEN = 6;
+  idx_ArticulosCOMISIONABLE = 7;
+  idx_ArticulosFECHA_ALTA = 8;
+  idx_ArticulosFECHA_MODIFICACION = 9;
+  idx_ArticulosUSUARIO = 10;
+  idx_ArticulosREFERENCIA_PROV = 11;
+  idx_ArticulosPRECIO_COSTE = 12;
+  idx_ArticulosPRECIO_PORTE = 13;
+  idx_ArticulosDESCUENTO = 14;
+  idx_ArticulosPRECIO_NETO = 15;
+  idx_ArticulosINVENTARIABLE = 16;
+  idx_ArticulosID_PROVEEDOR = 17;
+  idx_ArticulosNOMBRE_PROVEEDOR = 18;
+  idx_ArticulosELIMINADO = 19;
 
   { ArticulosParaCliente fields }
   fld_ArticulosParaClienteID = 'ID';
   fld_ArticulosParaClienteID_EMPRESA = 'ID_EMPRESA';
   fld_ArticulosParaClienteREFERENCIA = 'REFERENCIA';
   fld_ArticulosParaClienteDESCRIPCION = 'DESCRIPCION';
+  fld_ArticulosParaClienteUNIDAD_MEDIDA = 'UNIDAD_MEDIDA';
   fld_ArticulosParaClienteFAMILIA = 'FAMILIA';
   fld_ArticulosParaClienteIMAGEN = 'IMAGEN';
   fld_ArticulosParaClienteCOMISIONABLE = 'COMISIONABLE';
@@ -84,26 +87,27 @@ const
   idx_ArticulosParaClienteID_EMPRESA = 1;
   idx_ArticulosParaClienteREFERENCIA = 2;
   idx_ArticulosParaClienteDESCRIPCION = 3;
-  idx_ArticulosParaClienteFAMILIA = 4;
-  idx_ArticulosParaClienteIMAGEN = 5;
-  idx_ArticulosParaClienteCOMISIONABLE = 6;
-  idx_ArticulosParaClienteFECHA_ALTA = 7;
-  idx_ArticulosParaClienteFECHA_MODIFICACION = 8;
-  idx_ArticulosParaClienteUSUARIO = 9;
-  idx_ArticulosParaClienteREFERENCIA_PROV = 10;
-  idx_ArticulosParaClientePRECIO_COSTE = 11;
-  idx_ArticulosParaClientePRECIO_PORTE = 12;
-  idx_ArticulosParaClienteDESCUENTO = 13;
-  idx_ArticulosParaClientePRECIO_NETO = 14;
-  idx_ArticulosParaClienteINVENTARIABLE = 15;
-  idx_ArticulosParaClienteID_PROVEEDOR = 16;
-  idx_ArticulosParaClienteNOMBRE_PROVEEDOR = 17;
-  idx_ArticulosParaClienteELIMINADO = 18;
+  idx_ArticulosParaClienteUNIDAD_MEDIDA = 4;
+  idx_ArticulosParaClienteFAMILIA = 5;
+  idx_ArticulosParaClienteIMAGEN = 6;
+  idx_ArticulosParaClienteCOMISIONABLE = 7;
+  idx_ArticulosParaClienteFECHA_ALTA = 8;
+  idx_ArticulosParaClienteFECHA_MODIFICACION = 9;
+  idx_ArticulosParaClienteUSUARIO = 10;
+  idx_ArticulosParaClienteREFERENCIA_PROV = 11;
+  idx_ArticulosParaClientePRECIO_COSTE = 12;
+  idx_ArticulosParaClientePRECIO_PORTE = 13;
+  idx_ArticulosParaClienteDESCUENTO = 14;
+  idx_ArticulosParaClientePRECIO_NETO = 15;
+  idx_ArticulosParaClienteINVENTARIABLE = 16;
+  idx_ArticulosParaClienteID_PROVEEDOR = 17;
+  idx_ArticulosParaClienteNOMBRE_PROVEEDOR = 18;
+  idx_ArticulosParaClienteELIMINADO = 19;
 
 type
   { IArticulos }
   IArticulos = interface(IDAStronglyTypedDataTable)
-  ['{E4DF8395-5D03-4DF6-8828-6CC926D541A4}']
+  ['{1F24EC6B-18D1-43B7-B276-6889F602834E}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -121,6 +125,10 @@ type
     procedure SetDESCRIPCIONValue(const aValue: String);
     function GetDESCRIPCIONIsNull: Boolean;
     procedure SetDESCRIPCIONIsNull(const aValue: Boolean);
+    function GetUNIDAD_MEDIDAValue: String;
+    procedure SetUNIDAD_MEDIDAValue(const aValue: String);
+    function GetUNIDAD_MEDIDAIsNull: Boolean;
+    procedure SetUNIDAD_MEDIDAIsNull(const aValue: Boolean);
     function GetFAMILIAValue: String;
     procedure SetFAMILIAValue(const aValue: String);
     function GetFAMILIAIsNull: Boolean;
@@ -191,6 +199,8 @@ type
     property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
     property DESCRIPCION: String read GetDESCRIPCIONValue write SetDESCRIPCIONValue;
     property DESCRIPCIONIsNull: Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull;
+    property UNIDAD_MEDIDA: String read GetUNIDAD_MEDIDAValue write SetUNIDAD_MEDIDAValue;
+    property UNIDAD_MEDIDAIsNull: Boolean read GetUNIDAD_MEDIDAIsNull write SetUNIDAD_MEDIDAIsNull;
     property FAMILIA: String read GetFAMILIAValue write SetFAMILIAValue;
     property FAMILIAIsNull: Boolean read GetFAMILIAIsNull write SetFAMILIAIsNull;
     property IMAGEN: IROStream read GetIMAGENValue;
@@ -246,6 +256,10 @@ type
     procedure SetDESCRIPCIONValue(const aValue: String); virtual;
     function GetDESCRIPCIONIsNull: Boolean; virtual;
     procedure SetDESCRIPCIONIsNull(const aValue: Boolean); virtual;
+    function GetUNIDAD_MEDIDAValue: String; virtual;
+    procedure SetUNIDAD_MEDIDAValue(const aValue: String); virtual;
+    function GetUNIDAD_MEDIDAIsNull: Boolean; virtual;
+    procedure SetUNIDAD_MEDIDAIsNull(const aValue: Boolean); virtual;
     function GetFAMILIAValue: String; virtual;
     procedure SetFAMILIAValue(const aValue: String); virtual;
     function GetFAMILIAIsNull: Boolean; virtual;
@@ -315,6 +329,8 @@ type
     property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
     property DESCRIPCION: String read GetDESCRIPCIONValue write SetDESCRIPCIONValue;
     property DESCRIPCIONIsNull: Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull;
+    property UNIDAD_MEDIDA: String read GetUNIDAD_MEDIDAValue write SetUNIDAD_MEDIDAValue;
+    property UNIDAD_MEDIDAIsNull: Boolean read GetUNIDAD_MEDIDAIsNull write SetUNIDAD_MEDIDAIsNull;
     property FAMILIA: String read GetFAMILIAValue write SetFAMILIAValue;
     property FAMILIAIsNull: Boolean read GetFAMILIAIsNull write SetFAMILIAIsNull;
     property IMAGEN: IROStream read GetIMAGENValue;
@@ -354,7 +370,7 @@ type
 
   { IArticulosParaCliente }
   IArticulosParaCliente = interface(IDAStronglyTypedDataTable)
-  ['{C30A8751-1293-43C0-AEE1-8E0C09A5671F}']
+  ['{009C7FBB-A768-4BF4-9FB7-5CDB273A163C}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -372,6 +388,10 @@ type
     procedure SetDESCRIPCIONValue(const aValue: String);
     function GetDESCRIPCIONIsNull: Boolean;
     procedure SetDESCRIPCIONIsNull(const aValue: Boolean);
+    function GetUNIDAD_MEDIDAValue: String;
+    procedure SetUNIDAD_MEDIDAValue(const aValue: String);
+    function GetUNIDAD_MEDIDAIsNull: Boolean;
+    procedure SetUNIDAD_MEDIDAIsNull(const aValue: Boolean);
     function GetFAMILIAValue: String;
     procedure SetFAMILIAValue(const aValue: String);
     function GetFAMILIAIsNull: Boolean;
@@ -442,6 +462,8 @@ type
     property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
     property DESCRIPCION: String read GetDESCRIPCIONValue write SetDESCRIPCIONValue;
     property DESCRIPCIONIsNull: Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull;
+    property UNIDAD_MEDIDA: String read GetUNIDAD_MEDIDAValue write SetUNIDAD_MEDIDAValue;
+    property UNIDAD_MEDIDAIsNull: Boolean read GetUNIDAD_MEDIDAIsNull write SetUNIDAD_MEDIDAIsNull;
     property FAMILIA: String read GetFAMILIAValue write SetFAMILIAValue;
     property FAMILIAIsNull: Boolean read GetFAMILIAIsNull write SetFAMILIAIsNull;
     property IMAGEN: IROStream read GetIMAGENValue;
@@ -497,6 +519,10 @@ type
     procedure SetDESCRIPCIONValue(const aValue: String); virtual;
     function GetDESCRIPCIONIsNull: Boolean; virtual;
     procedure SetDESCRIPCIONIsNull(const aValue: Boolean); virtual;
+    function GetUNIDAD_MEDIDAValue: String; virtual;
+    procedure SetUNIDAD_MEDIDAValue(const aValue: String); virtual;
+    function GetUNIDAD_MEDIDAIsNull: Boolean; virtual;
+    procedure SetUNIDAD_MEDIDAIsNull(const aValue: Boolean); virtual;
     function GetFAMILIAValue: String; virtual;
     procedure SetFAMILIAValue(const aValue: String); virtual;
     function GetFAMILIAIsNull: Boolean; virtual;
@@ -566,6 +592,8 @@ type
     property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
     property DESCRIPCION: String read GetDESCRIPCIONValue write SetDESCRIPCIONValue;
     property DESCRIPCIONIsNull: Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull;
+    property UNIDAD_MEDIDA: String read GetUNIDAD_MEDIDAValue write SetUNIDAD_MEDIDAValue;
+    property UNIDAD_MEDIDAIsNull: Boolean read GetUNIDAD_MEDIDAIsNull write SetUNIDAD_MEDIDAIsNull;
     property FAMILIA: String read GetFAMILIAValue write SetFAMILIAValue;
     property FAMILIAIsNull: Boolean read GetFAMILIAIsNull write SetFAMILIAIsNull;
     property IMAGEN: IROStream read GetIMAGENValue;
@@ -713,6 +741,27 @@ begin
     DataTable.Fields[idx_ArticulosDESCRIPCION].AsVariant := Null;
 end;
 
+function TArticulosDataTableRules.GetUNIDAD_MEDIDAValue: String;
+begin
+  result := DataTable.Fields[idx_ArticulosUNIDAD_MEDIDA].AsString;
+end;
+
+procedure TArticulosDataTableRules.SetUNIDAD_MEDIDAValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ArticulosUNIDAD_MEDIDA].AsString := aValue;
+end;
+
+function TArticulosDataTableRules.GetUNIDAD_MEDIDAIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ArticulosUNIDAD_MEDIDA].IsNull;
+end;
+
+procedure TArticulosDataTableRules.SetUNIDAD_MEDIDAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ArticulosUNIDAD_MEDIDA].AsVariant := Null;
+end;
+
 function TArticulosDataTableRules.GetFAMILIAValue: String;
 begin
   result := DataTable.Fields[idx_ArticulosFAMILIA].AsString;
@@ -1135,6 +1184,27 @@ begin
     DataTable.Fields[idx_ArticulosParaClienteDESCRIPCION].AsVariant := Null;
 end;
 
+function TArticulosParaClienteDataTableRules.GetUNIDAD_MEDIDAValue: String;
+begin
+  result := DataTable.Fields[idx_ArticulosParaClienteUNIDAD_MEDIDA].AsString;
+end;
+
+procedure TArticulosParaClienteDataTableRules.SetUNIDAD_MEDIDAValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ArticulosParaClienteUNIDAD_MEDIDA].AsString := aValue;
+end;
+
+function TArticulosParaClienteDataTableRules.GetUNIDAD_MEDIDAIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ArticulosParaClienteUNIDAD_MEDIDA].IsNull;
+end;
+
+procedure TArticulosParaClienteDataTableRules.SetUNIDAD_MEDIDAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ArticulosParaClienteUNIDAD_MEDIDA].AsVariant := Null;
+end;
+
 function TArticulosParaClienteDataTableRules.GetFAMILIAValue: String;
 begin
   result := DataTable.Fields[idx_ArticulosParaClienteFAMILIA].AsString;
diff --git a/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas b/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas
index a3134983..6606e504 100644
--- a/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas
+++ b/Source/Modulos/Articulos/Model/schArticulosServer_Intf.pas
@@ -9,18 +9,19 @@ 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_ArticulosDelta = '{1EF85C21-66D6-4680-A910-2679A098D282}';
-  RID_ArticulosParaClienteDelta = '{CE4D74E0-1868-4D88-9483-CED9CD6BC658}';
+  RID_ArticulosDelta = '{C0937769-365F-4948-AE41-A6B3B28A4C51}';
+  RID_ArticulosParaClienteDelta = '{D132BF20-DB8F-4A41-A479-9F31BABB1922}';
 
 type
   { IArticulosDelta }
   IArticulosDelta = interface(IArticulos)
-  ['{1EF85C21-66D6-4680-A910-2679A098D282}']
+  ['{C0937769-365F-4948-AE41-A6B3B28A4C51}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
     function GetOldREFERENCIAValue : String;
     function GetOldDESCRIPCIONValue : String;
+    function GetOldUNIDAD_MEDIDAValue : String;
     function GetOldFAMILIAValue : String;
     function GetOldIMAGENValue : IROStream;
     function GetOldCOMISIONABLEValue : Integer;
@@ -42,6 +43,7 @@ type
     property OldID_EMPRESA : Integer read GetOldID_EMPRESAValue;
     property OldREFERENCIA : String read GetOldREFERENCIAValue;
     property OldDESCRIPCION : String read GetOldDESCRIPCIONValue;
+    property OldUNIDAD_MEDIDA : String read GetOldUNIDAD_MEDIDAValue;
     property OldFAMILIA : String read GetOldFAMILIAValue;
     property OldIMAGEN : IROStream read GetOldIMAGENValue;
     property OldCOMISIONABLE : Integer read GetOldCOMISIONABLEValue;
@@ -90,6 +92,12 @@ type
     function GetOldDESCRIPCIONIsNull: Boolean; virtual;
     procedure SetDESCRIPCIONValue(const aValue: String); virtual;
     procedure SetDESCRIPCIONIsNull(const aValue: Boolean); virtual;
+    function GetUNIDAD_MEDIDAValue: String; virtual;
+    function GetUNIDAD_MEDIDAIsNull: Boolean; virtual;
+    function GetOldUNIDAD_MEDIDAValue: String; virtual;
+    function GetOldUNIDAD_MEDIDAIsNull: Boolean; virtual;
+    procedure SetUNIDAD_MEDIDAValue(const aValue: String); virtual;
+    procedure SetUNIDAD_MEDIDAIsNull(const aValue: Boolean); virtual;
     function GetFAMILIAValue: String; virtual;
     function GetFAMILIAIsNull: Boolean; virtual;
     function GetOldFAMILIAValue: String; virtual;
@@ -197,6 +205,10 @@ type
     property DESCRIPCIONIsNull : Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull;
     property OldDESCRIPCION : String read GetOldDESCRIPCIONValue;
     property OldDESCRIPCIONIsNull : Boolean read GetOldDESCRIPCIONIsNull;
+    property UNIDAD_MEDIDA : String read GetUNIDAD_MEDIDAValue write SetUNIDAD_MEDIDAValue;
+    property UNIDAD_MEDIDAIsNull : Boolean read GetUNIDAD_MEDIDAIsNull write SetUNIDAD_MEDIDAIsNull;
+    property OldUNIDAD_MEDIDA : String read GetOldUNIDAD_MEDIDAValue;
+    property OldUNIDAD_MEDIDAIsNull : Boolean read GetOldUNIDAD_MEDIDAIsNull;
     property FAMILIA : String read GetFAMILIAValue write SetFAMILIAValue;
     property FAMILIAIsNull : Boolean read GetFAMILIAIsNull write SetFAMILIAIsNull;
     property OldFAMILIA : String read GetOldFAMILIAValue;
@@ -266,12 +278,13 @@ type
 
   { IArticulosParaClienteDelta }
   IArticulosParaClienteDelta = interface(IArticulosParaCliente)
-  ['{CE4D74E0-1868-4D88-9483-CED9CD6BC658}']
+  ['{D132BF20-DB8F-4A41-A479-9F31BABB1922}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
     function GetOldREFERENCIAValue : String;
     function GetOldDESCRIPCIONValue : String;
+    function GetOldUNIDAD_MEDIDAValue : String;
     function GetOldFAMILIAValue : String;
     function GetOldIMAGENValue : IROStream;
     function GetOldCOMISIONABLEValue : SmallInt;
@@ -293,6 +306,7 @@ type
     property OldID_EMPRESA : Integer read GetOldID_EMPRESAValue;
     property OldREFERENCIA : String read GetOldREFERENCIAValue;
     property OldDESCRIPCION : String read GetOldDESCRIPCIONValue;
+    property OldUNIDAD_MEDIDA : String read GetOldUNIDAD_MEDIDAValue;
     property OldFAMILIA : String read GetOldFAMILIAValue;
     property OldIMAGEN : IROStream read GetOldIMAGENValue;
     property OldCOMISIONABLE : SmallInt read GetOldCOMISIONABLEValue;
@@ -341,6 +355,12 @@ type
     function GetOldDESCRIPCIONIsNull: Boolean; virtual;
     procedure SetDESCRIPCIONValue(const aValue: String); virtual;
     procedure SetDESCRIPCIONIsNull(const aValue: Boolean); virtual;
+    function GetUNIDAD_MEDIDAValue: String; virtual;
+    function GetUNIDAD_MEDIDAIsNull: Boolean; virtual;
+    function GetOldUNIDAD_MEDIDAValue: String; virtual;
+    function GetOldUNIDAD_MEDIDAIsNull: Boolean; virtual;
+    procedure SetUNIDAD_MEDIDAValue(const aValue: String); virtual;
+    procedure SetUNIDAD_MEDIDAIsNull(const aValue: Boolean); virtual;
     function GetFAMILIAValue: String; virtual;
     function GetFAMILIAIsNull: Boolean; virtual;
     function GetOldFAMILIAValue: String; virtual;
@@ -448,6 +468,10 @@ type
     property DESCRIPCIONIsNull : Boolean read GetDESCRIPCIONIsNull write SetDESCRIPCIONIsNull;
     property OldDESCRIPCION : String read GetOldDESCRIPCIONValue;
     property OldDESCRIPCIONIsNull : Boolean read GetOldDESCRIPCIONIsNull;
+    property UNIDAD_MEDIDA : String read GetUNIDAD_MEDIDAValue write SetUNIDAD_MEDIDAValue;
+    property UNIDAD_MEDIDAIsNull : Boolean read GetUNIDAD_MEDIDAIsNull write SetUNIDAD_MEDIDAIsNull;
+    property OldUNIDAD_MEDIDA : String read GetOldUNIDAD_MEDIDAValue;
+    property OldUNIDAD_MEDIDAIsNull : Boolean read GetOldUNIDAD_MEDIDAIsNull;
     property FAMILIA : String read GetFAMILIAValue write SetFAMILIAValue;
     property FAMILIAIsNull : Boolean read GetFAMILIAIsNull write SetFAMILIAIsNull;
     property OldFAMILIA : String read GetOldFAMILIAValue;
@@ -666,6 +690,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosDESCRIPCION] := Null;
 end;
 
+function TArticulosBusinessProcessorRules.GetUNIDAD_MEDIDAValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosUNIDAD_MEDIDA];
+end;
+
+function TArticulosBusinessProcessorRules.GetUNIDAD_MEDIDAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosUNIDAD_MEDIDA]);
+end;
+
+function TArticulosBusinessProcessorRules.GetOldUNIDAD_MEDIDAValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosUNIDAD_MEDIDA];
+end;
+
+function TArticulosBusinessProcessorRules.GetOldUNIDAD_MEDIDAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosUNIDAD_MEDIDA]);
+end;
+
+procedure TArticulosBusinessProcessorRules.SetUNIDAD_MEDIDAValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosUNIDAD_MEDIDA] := aValue;
+end;
+
+procedure TArticulosBusinessProcessorRules.SetUNIDAD_MEDIDAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosUNIDAD_MEDIDA] := Null;
+end;
+
 function TArticulosBusinessProcessorRules.GetFAMILIAValue: String;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosFAMILIA];
@@ -1279,6 +1334,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteDESCRIPCION] := Null;
 end;
 
+function TArticulosParaClienteBusinessProcessorRules.GetUNIDAD_MEDIDAValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteUNIDAD_MEDIDA];
+end;
+
+function TArticulosParaClienteBusinessProcessorRules.GetUNIDAD_MEDIDAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteUNIDAD_MEDIDA]);
+end;
+
+function TArticulosParaClienteBusinessProcessorRules.GetOldUNIDAD_MEDIDAValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClienteUNIDAD_MEDIDA];
+end;
+
+function TArticulosParaClienteBusinessProcessorRules.GetOldUNIDAD_MEDIDAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ArticulosParaClienteUNIDAD_MEDIDA]);
+end;
+
+procedure TArticulosParaClienteBusinessProcessorRules.SetUNIDAD_MEDIDAValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteUNIDAD_MEDIDA] := aValue;
+end;
+
+procedure TArticulosParaClienteBusinessProcessorRules.SetUNIDAD_MEDIDAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteUNIDAD_MEDIDA] := Null;
+end;
+
 function TArticulosParaClienteBusinessProcessorRules.GetFAMILIAValue: String;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_ArticulosParaClienteFAMILIA];
diff --git a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm
index b2df3907..e48d5af6 100644
--- a/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm
+++ b/Source/Modulos/Articulos/Servidor/srvArticulos_Impl.dfm
@@ -204,6 +204,10 @@ object srvArticulos: TsrvArticulos
               item
                 DatasetField = 'ELIMINADO'
                 TableField = 'ELIMINADO'
+              end
+              item
+                DatasetField = 'UNIDAD_MEDIDA'
+                TableField = 'UNIDAD_MEDIDA'
               end>
           end>
         Name = 'Articulos'
@@ -233,6 +237,11 @@ object srvArticulos: TsrvArticulos
             Size = 255
             DictionaryEntry = 'Articulos_DESCRIPCION'
           end
+          item
+            Name = 'UNIDAD_MEDIDA'
+            DataType = datString
+            Size = 255
+          end
           item
             Name = 'FAMILIA'
             DataType = datString
@@ -316,7 +325,7 @@ object srvArticulos: TsrvArticulos
         Params = <
           item
             Name = 'ID_CLIENTE'
-            Value = ''
+            Value = '2'
             ParamType = daptInput
           end>
         Statements = <
@@ -325,17 +334,18 @@ object srvArticulos: TsrvArticulos
             TargetTable = 'ARTICULOS'
             SQL = 
               'SELECT V_ARTICULOS.ID, V_ARTICULOS.ID_EMPRESA, V_ARTICULOS.REFER' +
-              'ENCIA, V_ARTICULOS.DESCRIPCION,'#10'       V_ARTICULOS.FAMILIA, V_AR' +
-              'TICULOS.IMAGEN, V_ARTICULOS.COMISIONABLE, V_ARTICULOS.FECHA_ALTA' +
-              ','#10'       V_ARTICULOS.FECHA_MODIFICACION, V_ARTICULOS.USUARIO,'#10'  ' +
-              '     V_ARTICULOS.REFERENCIA_PROV,'#10'       V_ARTICULOS.PRECIO_COST' +
-              'E,'#10'       V_ARTICULOS.PRECIO_PORTE,'#10'       CLIENTES_DTOS_PROVEED' +
-              'ORES.DESCUENTO,'#10'       V_ARTICULOS.PRECIO_NETO,'#10'       V_ARTICUL' +
-              'OS.INVENTARIABLE,'#10'       V_ARTICULOS.ID_PROVEEDOR,'#10'       V_ARTI' +
-              'CULOS.NOMBRE_PROVEEDOR,'#10'       V_ARTICULOS.ELIMINADO'#10'FROM V_ARTI' +
-              'CULOS'#10'LEFT OUTER JOIN CLIENTES_DTOS_PROVEEDORES'#10'ON ((CLIENTES_DT' +
-              'OS_PROVEEDORES.ID_PROVEEDOR = V_ARTICULOS.ID_PROVEEDOR)'#10'AND (CLI' +
-              'ENTES_DTOS_PROVEEDORES.ID_CLIENTE = :ID_CLIENTE))'#10'where {where}'#10
+              'ENCIA, V_ARTICULOS.DESCRIPCION,'#10'       V_ARTICULOS.UNIDAD_MEDIDA' +
+              ','#10'       V_ARTICULOS.FAMILIA, V_ARTICULOS.IMAGEN, V_ARTICULOS.CO' +
+              'MISIONABLE, V_ARTICULOS.FECHA_ALTA,'#10'       V_ARTICULOS.FECHA_MOD' +
+              'IFICACION, V_ARTICULOS.USUARIO,'#10'       V_ARTICULOS.REFERENCIA_PR' +
+              'OV,'#10'       V_ARTICULOS.PRECIO_COSTE,'#10'       V_ARTICULOS.PRECIO_P' +
+              'ORTE,'#10'       CLIENTES_DTOS_PROVEEDORES.DESCUENTO,'#10'       V_ARTIC' +
+              'ULOS.PRECIO_NETO,'#10'       V_ARTICULOS.INVENTARIABLE,'#10'       V_ART' +
+              'ICULOS.ID_PROVEEDOR,'#10'       V_ARTICULOS.NOMBRE_PROVEEDOR,'#10'      ' +
+              ' V_ARTICULOS.ELIMINADO'#10'FROM V_ARTICULOS'#10'LEFT OUTER JOIN CLIENTES' +
+              '_DTOS_PROVEEDORES'#10'ON ((CLIENTES_DTOS_PROVEEDORES.ID_PROVEEDOR = ' +
+              'V_ARTICULOS.ID_PROVEEDOR)'#10'AND (CLIENTES_DTOS_PROVEEDORES.ID_CLIE' +
+              'NTE = :ID_CLIENTE))'#10'where {where}'#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -414,6 +424,10 @@ object srvArticulos: TsrvArticulos
               item
                 DatasetField = 'ELIMINADO'
                 TableField = 'ELIMINADO'
+              end
+              item
+                DatasetField = 'UNIDAD_MEDIDA'
+                TableField = 'UNIDAD_MEDIDA'
               end>
           end>
         Name = 'ArticulosParaCliente'
@@ -437,6 +451,11 @@ object srvArticulos: TsrvArticulos
             DataType = datString
             Size = 255
           end
+          item
+            Name = 'UNIDAD_MEDIDA'
+            DataType = datString
+            Size = 255
+          end
           item
             Name = 'FAMILIA'
             DataType = datString
@@ -510,8 +529,6 @@ object srvArticulos: TsrvArticulos
         Params = <
           item
             Name = 'ID'
-            DataType = datAutoInc
-            GeneratorName = 'GEN_ARTICULOS_ID'
             Value = ''
           end
           item
@@ -526,6 +543,10 @@ object srvArticulos: TsrvArticulos
             Name = 'DESCRIPCION'
             Value = ''
           end
+          item
+            Name = 'UNIDAD_MEDIDA'
+            Value = ''
+          end
           item
             Name = 'FAMILIA'
             Value = ''
@@ -588,14 +609,14 @@ object srvArticulos: TsrvArticulos
             TargetTable = 'ARTICULOS'
             SQL = 
               'INSERT'#10'  INTO ARTICULOS'#10'    (ID, ID_EMPRESA, REFERENCIA, DESCRIP' +
-              'CION, FAMILIA, IMAGEN, '#10'     COMISIONABLE, FECHA_ALTA, FECHA_MOD' +
-              'IFICACION, USUARIO, '#10'     PRECIO_COSTE, PRECIO_PORTE, DESCUENTO,' +
-              ' ID_PROVEEDOR, '#10'     PRECIO_NETO, REFERENCIA_PROV, INVENTARIABLE' +
-              ', ELIMINADO)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, :REFERENCIA, :DESCR' +
-              'IPCION, :FAMILIA, '#10'     :IMAGEN, :COMISIONABLE, :FECHA_ALTA, :FE' +
-              'CHA_MODIFICACION, '#10'     :USUARIO, :PRECIO_COSTE, :PRECIO_PORTE, ' +
-              ':DESCUENTO, '#10'     :ID_PROVEEDOR, :PRECIO_NETO, :REFERENCIA_PROV,' +
-              #10'     :INVENTARIABLE, :ELIMINADO)'
+              'CION, UNIDAD_MEDIDA, FAMILIA, IMAGEN,'#10'     COMISIONABLE, FECHA_A' +
+              'LTA, FECHA_MODIFICACION, USUARIO, '#10'     PRECIO_COSTE, PRECIO_POR' +
+              'TE, DESCUENTO, ID_PROVEEDOR, '#10'     PRECIO_NETO, REFERENCIA_PROV,' +
+              ' INVENTARIABLE, ELIMINADO)'#10'  VALUES'#10'    (:ID, :ID_EMPRESA, :REFE' +
+              'RENCIA, :DESCRIPCION, :UNIDAD_MEDIDA, :FAMILIA,'#10'     :IMAGEN, :C' +
+              'OMISIONABLE, :FECHA_ALTA, :FECHA_MODIFICACION, '#10'     :USUARIO, :' +
+              'PRECIO_COSTE, :PRECIO_PORTE, :DESCUENTO, '#10'     :ID_PROVEEDOR, :P' +
+              'RECIO_NETO, :REFERENCIA_PROV,'#10'     :INVENTARIABLE, :ELIMINADO)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -633,6 +654,10 @@ object srvArticulos: TsrvArticulos
             Name = 'DESCRIPCION'
             Value = ''
           end
+          item
+            Name = 'UNIDAD_MEDIDA'
+            Value = ''
+          end
           item
             Name = 'FAMILIA'
             Value = ''
@@ -699,15 +724,15 @@ object srvArticulos: TsrvArticulos
             TargetTable = 'ARTICULOS'
             SQL = 
               'UPDATE ARTICULOS'#10'  SET '#10'    ID_EMPRESA = :ID_EMPRESA,'#10'    REFERE' +
-              'NCIA = :REFERENCIA, '#10'    DESCRIPCION = :DESCRIPCION, '#10'    FAMILI' +
-              'A = :FAMILIA, '#10'    IMAGEN = :IMAGEN, '#10'    COMISIONABLE = :COMISI' +
-              'ONABLE, '#10'    FECHA_ALTA = :FECHA_ALTA, '#10'    FECHA_MODIFICACION =' +
-              ' :FECHA_MODIFICACION, '#10'    USUARIO = :USUARIO, '#10'    PRECIO_COSTE' +
-              ' = :PRECIO_COSTE, '#10'    PRECIO_PORTE = :PRECIO_PORTE, '#10'    DESCUE' +
-              'NTO = :DESCUENTO, '#10'    ID_PROVEEDOR = :ID_PROVEEDOR, '#10'    PRECIO' +
-              '_NETO = :PRECIO_NETO,'#10'    INVENTARIABLE = :INVENTARIABLE,'#10'    RE' +
-              'FERENCIA_PROV = :REFERENCIA_PROV,'#10'    ELIMINADO = :ELIMINADO'#10'  W' +
-              'HERE'#10'    (ID = :OLD_ID)'#10
+              'NCIA = :REFERENCIA, '#10'    DESCRIPCION = :DESCRIPCION, '#10'    UNIDAD' +
+              '_MEDIDA = :UNIDAD_MEDIDA,'#10'    FAMILIA = :FAMILIA, '#10'    IMAGEN = ' +
+              ':IMAGEN, '#10'    COMISIONABLE = :COMISIONABLE, '#10'    FECHA_ALTA = :F' +
+              'ECHA_ALTA, '#10'    FECHA_MODIFICACION = :FECHA_MODIFICACION, '#10'    U' +
+              'SUARIO = :USUARIO, '#10'    PRECIO_COSTE = :PRECIO_COSTE, '#10'    PRECI' +
+              'O_PORTE = :PRECIO_PORTE, '#10'    DESCUENTO = :DESCUENTO, '#10'    ID_PR' +
+              'OVEEDOR = :ID_PROVEEDOR, '#10'    PRECIO_NETO = :PRECIO_NETO,'#10'    IN' +
+              'VENTARIABLE = :INVENTARIABLE,'#10'    REFERENCIA_PROV = :REFERENCIA_' +
+              'PROV,'#10'    ELIMINADO = :ELIMINADO'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
diff --git a/Source/Modulos/Articulos/Views/Articulos_view.dpk b/Source/Modulos/Articulos/Views/Articulos_view.dpk
index 68d2370c..f6deb99e 100644
--- a/Source/Modulos/Articulos/Views/Articulos_view.dpk
+++ b/Source/Modulos/Articulos/Views/Articulos_view.dpk
@@ -29,6 +29,7 @@ requires
   Articulos_model,
   Articulos_controller,
   Familias_controller,
+  UnidadesMedida_controller,
   Contactos_view;
 
 contains
diff --git a/Source/Modulos/Articulos/Views/Articulos_view.dproj b/Source/Modulos/Articulos/Views/Articulos_view.dproj
index c3b541f2..d1560b90 100644
--- a/Source/Modulos/Articulos/Views/Articulos_view.dproj
+++ b/Source/Modulos/Articulos/Views/Articulos_view.dproj
@@ -42,55 +42,14 @@
     <DCC_ResourcePath>..\..\..\Lib;..\..\Lib</DCC_ResourcePath>
     <DCC_ObjPath>..\..\..\Lib;..\..\Lib</DCC_ObjPath>
     <DCC_IncludePath>..\..\..\Lib;..\..\Lib</DCC_IncludePath>
-    <DCC_Define>DEBUG</DCC_Define>
   </PropertyGroup>
   <ProjectExtensions>
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject xmlns=""> <Delphi.Personality>   <Parameters>
-      <Parameters Name="UseLauncher">False</Parameters>
-      <Parameters Name="LoadAllSymbols">True</Parameters>
-      <Parameters Name="LoadUnspecifiedSymbols">False</Parameters>
-    </Parameters>
-    <Package_Options>
-      <Package_Options Name="ImplicitBuild">True</Package_Options>
-      <Package_Options Name="DesigntimeOnly">False</Package_Options>
-      <Package_Options Name="RuntimeOnly">False</Package_Options>
-    </Package_Options>
-    <VersionInfo>
-      <VersionInfo Name="IncludeVerInfo">True</VersionInfo>
-      <VersionInfo Name="AutoIncBuild">False</VersionInfo>
-      <VersionInfo Name="MajorVer">1</VersionInfo>
-      <VersionInfo Name="MinorVer">0</VersionInfo>
-      <VersionInfo Name="Release">0</VersionInfo>
-      <VersionInfo Name="Build">0</VersionInfo>
-      <VersionInfo Name="Debug">False</VersionInfo>
-      <VersionInfo Name="PreRelease">False</VersionInfo>
-      <VersionInfo Name="Special">False</VersionInfo>
-      <VersionInfo Name="Private">False</VersionInfo>
-      <VersionInfo Name="DLL">False</VersionInfo>
-      <VersionInfo Name="Locale">3082</VersionInfo>
-      <VersionInfo Name="CodePage">1252</VersionInfo>
-    </VersionInfo>
-    <VersionInfoKeys>
-      <VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
-      <VersionInfoKeys Name="FileDescription"></VersionInfoKeys>
-      <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
-      <VersionInfoKeys Name="InternalName"></VersionInfoKeys>
-      <VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys>
-      <VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
-      <VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
-      <VersionInfoKeys Name="ProductName"></VersionInfoKeys>
-      <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
-      <VersionInfoKeys Name="Comments"></VersionInfoKeys>
-    </VersionInfoKeys>
-    <Source>
-      <Source Name="MainSource">Articulos_view.dpk</Source>
-    </Source>
-  </Delphi.Personality> </BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">True</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Source><Source Name="MainSource">Articulos_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
-  <ItemGroup />
+  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
     <DelphiCompile Include="Articulos_view.dpk">
       <MainSource>MainSource</MainSource>
@@ -103,26 +62,31 @@
     <DCCReference Include="uArticulosViewRegister.pas" />
     <DCCReference Include="uEditorArticulo.pas">
       <Form>fEditorArticulo</Form>
+      <DesignClass>TfEditorArticulo</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorArticulos.pas">
       <Form>fEditorArticulos</Form>
+      <DesignClass>TfEditorArticulos</DesignClass>
     </DCCReference>
     <DCCReference Include="uEditorElegirArticulos.pas">
       <Form>fEditorElegirArticulos</Form>
+      <DesignClass>TfEditorElegirArticulos</DesignClass>
     </DCCReference>
+    <DCCReference Include="UnidadesMedida_controller.dcp" />
     <DCCReference Include="uViewArticulo.pas">
       <Form>frViewArticulo</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewArticulos.pas">
       <Form>frViewArticulos</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
     <DCCReference Include="uViewDetallesArticulos.pas">
       <Form>frViewDetallesArticulos</Form>
+      <DesignClass>TFrame</DesignClass>
     </DCCReference>
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
 </Project>
-
 <!-- EurekaLog First Line
 [Exception Log]
 EurekaLog Version=6006
diff --git a/Source/Modulos/Articulos/Views/Articulos_view.rc b/Source/Modulos/Articulos/Views/Articulos_view.rc
index e69de29b..153736af 100644
--- a/Source/Modulos/Articulos/Views/Articulos_view.rc
+++ b/Source/Modulos/Articulos/Views/Articulos_view.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
diff --git a/Source/Modulos/Articulos/Views/Articulos_view.res b/Source/Modulos/Articulos/Views/Articulos_view.res
index 36f26e234a8ac66a47e95cec6d496cf2f1442471..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644
GIT binary patch
literal 384
zcmZ9HOA3Ne6ox;+L5PEv(4cV`IIrjdPAV##hV&wc1g%+%X(R2Xc{`~7t6e0Ioa?#%
zkMj%AQhz>WYy7LeWAUaqx~Kv?-;(-Hs4-^ATIZOBrid9+-6Ne7&88mi>kUR<df0cb
zK*7~xk>4lo#jxZ;#*s4zxg9yNlk=H9sqkCD2^cEXKpiTBNfgkKpXJBWWaLt(Qkv@0
w5yv*t82((Wlr2{_+FDoDHKW2QCXvc+s**ul{{$<ciMHlSp2)Sz;Q3GY3%t`XzW@LL

delta 5
McmZo*R+yjw00c1sQ~&?~

diff --git a/Source/Modulos/Articulos/Views/uEditorArticulo.dfm b/Source/Modulos/Articulos/Views/uEditorArticulo.dfm
index b4c51fda..94904bba 100644
--- a/Source/Modulos/Articulos/Views/uEditorArticulo.dfm
+++ b/Source/Modulos/Articulos/Views/uEditorArticulo.dfm
@@ -39,7 +39,7 @@ inherited fEditorArticulo: TfEditorArticulo
     Width = 624
     ExplicitWidth = 624
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 394
+      ExplicitWidth = 400
       inherited TBXItem2: TTBXItem
         Visible = False
       end
@@ -96,15 +96,15 @@ inherited fEditorArticulo: TfEditorArticulo
     end
   end
   inherited pgPaginas: TPageControl
-    Width = 624
-    Height = 385
-    ExplicitWidth = 624
-    ExplicitHeight = 385
+    Width = 618
+    Height = 379
+    ExplicitWidth = 618
+    ExplicitHeight = 379
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
-      ExplicitWidth = 616
-      ExplicitHeight = 357
+      ExplicitWidth = 610
+      ExplicitHeight = 351
     end
   end
   inherited StatusBar: TJvStatusBar
diff --git a/Source/Modulos/Articulos/Views/uEditorArticulo.pas b/Source/Modulos/Articulos/Views/uEditorArticulo.pas
index 86965f34..d9ac13c0 100644
--- a/Source/Modulos/Articulos/Views/uEditorArticulo.pas
+++ b/Source/Modulos/Articulos/Views/uEditorArticulo.pas
@@ -13,7 +13,7 @@ uses
   JvAppStorage, JvAppRegistryStorage, JvFormPlacement, JvComponentBase,
 
   uViewArticulos, uIEditorArticulo, uArticulosController, JvExComCtrls,
-  JvStatusBar, dxLayoutLookAndFeels;
+  JvStatusBar, dxLayoutLookAndFeels, uDAInterfaces;
 
 type
   TfEditorArticulo = class(TfEditorDBItem, IEditorArticulo)
diff --git a/Source/Modulos/Articulos/Views/uViewArticulo.dfm b/Source/Modulos/Articulos/Views/uViewArticulo.dfm
index cc48a58b..73365f01 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulo.dfm
+++ b/Source/Modulos/Articulos/Views/uViewArticulo.dfm
@@ -116,11 +116,11 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 3
+      TabOrder = 4
       Width = 144
     end
     object eImagen: TcxImage
-      Left = 409
+      Left = 437
       Top = 28
       Properties.GraphicClassName = 'TJPEGImage'
       Properties.ImmediatePost = True
@@ -137,7 +137,7 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 5
+      TabOrder = 6
       Height = 100
       Width = 140
     end
@@ -163,7 +163,7 @@ inherited frViewArticulo: TfrViewArticulo
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 2
-      Width = 70
+      Width = 162
     end
     inline frViewDatosYSeleccionProveedor1: TfrViewDatosYSeleccionProveedor
       Left = 219
@@ -176,7 +176,7 @@ inherited frViewArticulo: TfrViewArticulo
       Font.Name = 'Tahoma'
       Font.Style = []
       ParentFont = False
-      TabOrder = 11
+      TabOrder = 12
       ReadOnly = False
       ExplicitLeft = 219
       ExplicitTop = 166
@@ -213,7 +213,7 @@ inherited frViewArticulo: TfrViewArticulo
       StyleDisabled.LookAndFeel.NativeStyle = True
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 6
+      TabOrder = 7
       Width = 86
     end
     object ePrecioCoste: TcxDBCurrencyEdit
@@ -233,7 +233,7 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 7
+      TabOrder = 8
       Width = 86
     end
     object eDescuento: TcxDBSpinEdit
@@ -256,7 +256,7 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 8
+      TabOrder = 9
       Width = 86
     end
     object ePrecioNeto: TcxDBCurrencyEdit
@@ -281,7 +281,7 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.TextColor = clWindowText
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 9
+      TabOrder = 10
       Width = 86
     end
     object ePrecioPorte: TcxDBCurrencyEdit
@@ -301,11 +301,11 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 10
+      TabOrder = 11
       Width = 86
     end
     object cbNoInventariable: TcxDBCheckBox
-      Left = 242
+      Left = 259
       Top = 109
       Caption = 'Art'#237'culo no inventariable'
       DataBinding.DataField = 'INVENTARIABLE'
@@ -325,9 +325,33 @@ inherited frViewArticulo: TfrViewArticulo
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 4
+      TabOrder = 5
       Width = 144
     end
+    object cbUnidadMedida: TcxDBComboBox
+      Left = 292
+      Top = 82
+      DataBinding.DataField = 'UNIDAD_MEDIDA'
+      DataBinding.DataSource = dsViewArticulo
+      Properties.DropDownRows = 16
+      Properties.ImmediatePost = True
+      Properties.OnInitPopup = cbUnidadMedidaPropertiesInitPopup
+      Properties.OnValidate = cbUnidadMedidaPropertiesValidate
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 3
+      Width = 164
+    end
     object dxLayoutControlArticuloGroup_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -364,12 +388,25 @@ inherited frViewArticulo: TfrViewArticulo
               ShowCaption = False
               Hidden = True
               ShowBorder = False
-              object dxLayoutControlArticuloItem4: TdxLayoutItem
-                AutoAligns = [aaVertical]
-                AlignHorz = ahClient
-                Caption = 'Familia:'
-                Control = cbFamilia
-                ControlOptions.ShowBorder = False
+              object dxLayoutControlArticuloGroup9: TdxLayoutGroup
+                ShowCaption = False
+                Hidden = True
+                LayoutDirection = ldHorizontal
+                ShowBorder = False
+                object dxLayoutControlArticuloItem4: TdxLayoutItem
+                  AutoAligns = [aaVertical]
+                  AlignHorz = ahClient
+                  Caption = 'Familia:'
+                  Control = cbFamilia
+                  ControlOptions.ShowBorder = False
+                end
+                object dxLayoutControlArticuloItem9: TdxLayoutItem
+                  AutoAligns = [aaVertical]
+                  AlignHorz = ahClient
+                  Caption = 'Unid. medida:'
+                  Control = cbUnidadMedida
+                  ControlOptions.ShowBorder = False
+                end
               end
               object dxLayoutControlArticuloGroup8: TdxLayoutGroup
                 ShowCaption = False
diff --git a/Source/Modulos/Articulos/Views/uViewArticulo.pas b/Source/Modulos/Articulos/Views/uViewArticulo.pas
index aa1fc46d..4edfc60a 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulo.pas
+++ b/Source/Modulos/Articulos/Views/uViewArticulo.pas
@@ -10,7 +10,7 @@ uses
   cxDBEdit, dxLayoutControl, cxCheckBox, PngSpeedButton, cxImage, ActnList,
   ImgList, PngImageList, cxGraphics, cxMaskEdit, cxDropDownEdit,
   uFamiliasController, uViewDatosYSeleccionProveedor, cxSpinEdit, cxCurrencyEdit,
-  uArticulosController, uDAInterfaces;
+  uArticulosController, uUnidadesMedidaController, uDAInterfaces;
 
 type
   IViewArticulo = interface(IViewBase)
@@ -71,6 +71,9 @@ type
     dxLayoutControlArticuloItem7: TdxLayoutItem;
     cbNoInventariable: TcxDBCheckBox;
     dxLayoutControlArticuloGroup8: TdxLayoutGroup;
+    dxLayoutControlArticuloItem9: TdxLayoutItem;
+    cbUnidadMedida: TcxDBComboBox;
+    dxLayoutControlArticuloGroup9: TdxLayoutGroup;
     procedure actEliminarExecute(Sender: TObject);
     procedure actAnadirExecute(Sender: TObject);
     procedure cbFamiliaPropertiesInitPopup(Sender: TObject);
@@ -80,11 +83,15 @@ type
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
     procedure CustomViewShow(Sender: TObject);
     procedure PrecioNetoChanged(Sender: TObject);
+    procedure cbUnidadMedidaPropertiesInitPopup(Sender: TObject);
+    procedure cbUnidadMedidaPropertiesValidate(Sender: TObject;
+      var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
   private
     procedure CargarImagen;
     procedure SalvarImagen;
   protected
     FFamiliasController: IFamiliasController;
+    FUnidadesController: IUnidadesMedidaController;
     FController: IArticulosController;
     FArticulo: IBizArticulo;
     function GetArticulo: IBizArticulo;
@@ -99,7 +106,9 @@ type
 
 implementation
 
-uses uDataModuleArticulos, uSistemaFunc, uBizFamilias, uBizContactos;
+uses
+  uDataModuleArticulos, uSistemaFunc, uBizFamilias, uBizContactos,
+  uBizUnidadesMedida;
 
 {$R *.dfm}
 
@@ -152,12 +161,17 @@ begin
   inherited;
   with cbFamilia.Properties.Items do
   begin
-    BeginUpdate;
-    try
-      Clear;
-      AddStrings(FFamiliasController.DarListaFamilias);
-    finally
-      EndUpdate;
+    if (Count = 0) then
+    begin
+      ShowHourglassCursor;
+      BeginUpdate;
+      try
+        Clear;
+        AddStrings(FFamiliasController.DarListaFamilias);
+      finally
+        EndUpdate;
+        HideHourglassCursor;
+      end;
     end;
   end;
 end;
@@ -173,6 +187,7 @@ begin
     if (Length(DisplayValue) > 0) and (DisplayValue <> FArticulo.FAMILIA) then
       if Properties.LookupItems.IndexOf(DisplayValue) < 0 then
       begin
+        ShowHourglassCursor;
         Properties.LookupItems.BeginUpdate;
         AFamilias := FFamiliasController.BuscarTodos;
         AFamilias.DataTable.Active := True;
@@ -183,21 +198,73 @@ begin
           Properties.LookupItems.Add(DisplayValue);
         finally
           Properties.LookupItems.EndUpdate;
+          HideHourglassCursor;
           AFamilias := NIL;
         end;
       end;
   end;
 end;
 
+procedure TfrViewArticulo.cbUnidadMedidaPropertiesInitPopup(Sender: TObject);
+begin
+  inherited;
+  with cbUnidadMedida.Properties.Items do
+  begin
+    if (Count = 0) then
+    begin
+      ShowHourglassCursor;
+      BeginUpdate;
+      try
+        Clear;
+        AddStrings(FUnidadesController.DarListaUnidadesMedida);
+      finally
+        EndUpdate;
+        HideHourglassCursor;
+      end;
+    end;
+  end;
+end;
+
+procedure TfrViewArticulo.cbUnidadMedidaPropertiesValidate(Sender: TObject;
+  var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
+var
+  AUnidades : IBizUnidadMedida;
+begin
+  inherited;
+  with (Sender as TcxDBComboBox) do
+  begin
+    if (Length(DisplayValue) > 0) and (DisplayValue <> FArticulo.FAMILIA) then
+      if Properties.LookupItems.IndexOf(DisplayValue) < 0 then
+      begin
+        ShowHourglassCursor;
+        Properties.LookupItems.BeginUpdate;
+        AUnidades := FUnidadesController.BuscarTodos;
+        AUnidades.DataTable.Active := True;
+        try
+          FUnidadesController.Anadir(AUnidades);
+          AUnidades.DESCRIPCION := DisplayValue;
+          FUnidadesController.Guardar(AUnidades);
+          Properties.LookupItems.Add(DisplayValue);
+        finally
+          Properties.LookupItems.EndUpdate;
+          HideHourglassCursor;
+          AUnidades := NIL;
+        end;
+      end;
+  end;
+end;
+
 procedure TfrViewArticulo.CustomViewCreate(Sender: TObject);
 begin
   inherited;
   FFamiliasController := TFamiliasController.Create;
+  FUnidadesController := TUnidadesMedidaController.Create;
 end;
 
 procedure TfrViewArticulo.CustomViewDestroy(Sender: TObject);
 begin
   FFamiliasController := Nil;
+  FUnidadesController := NIL;
   ePrecioCoste.Properties.OnEditValueChanged := Nil;
   eDescuento.Properties.OnEditValueChanged := Nil;
   inherited;
diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.dfm b/Source/Modulos/Articulos/Views/uViewArticulos.dfm
index 3bd34949..8da06b5a 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uViewArticulos.dfm
@@ -80,6 +80,11 @@ inherited frViewArticulos: TfrViewArticulos
         BestFitMaxWidth = 120
         Width = 120
       end
+      object cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn
+        Caption = 'Unid. medida'
+        DataBinding.FieldName = 'UNIDAD_MEDIDA'
+        Width = 60
+      end
       object cxGridViewFAMILIA: TcxGridDBColumn
         Caption = 'Familia'
         DataBinding.FieldName = 'FAMILIA'
@@ -153,7 +158,6 @@ inherited frViewArticulos: TfrViewArticulos
   end
   inherited pnlAgrupaciones: TTBXDockablePanel
     Visible = True
-    ExplicitWidth = 554
     inherited TBXAlignmentPanel1: TTBXAlignmentPanel
       inherited TBXToolbar1: TTBXToolbar
         object TBXSeparatorItem1: TTBXSeparatorItem
diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.pas b/Source/Modulos/Articulos/Views/uViewArticulos.pas
index 3f4b77b0..84918dc8 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulos.pas
+++ b/Source/Modulos/Articulos/Views/uViewArticulos.pas
@@ -37,6 +37,7 @@ type
     TBXSeparatorItem1: TTBXSeparatorItem;
     TBXSeparatorItem2: TTBXSeparatorItem;
     cxGridViewINVENTARIABLE: TcxGridDBColumn;
+    cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn;
     procedure cxGridViewIDCustomDrawCell(
       Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
       AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
index 33bcd8c2..4221f034 100644
--- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
@@ -1,7 +1,10 @@
 inherited frViewDetallesArticulos: TfrViewDetallesArticulos
+  Width = 771
+  Height = 463
   ParentBiDiMode = False
   OnShow = CustomViewShow
   inherited ToolBar1: TToolBar
+    Width = 771
     inherited ToolButton4: TToolButton
       Wrap = True
     end
@@ -62,6 +65,8 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
     end
   end
   inherited cxGrid: TcxGrid
+    Width = 771
+    Height = 391
     inherited cxGridView: TcxGridDBTableView
       inherited cxGridViewTIPO: TcxGridDBColumn
         Width = 26
@@ -89,6 +94,15 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
       inherited cxGridViewCANTIDAD: TcxGridDBColumn
         Width = 48
       end
+      object cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn [8]
+        Caption = 'Unid. medida'
+        PropertiesClassName = 'TcxComboBoxProperties'
+        Properties.ImmediatePost = True
+        Properties.ImmediateUpdateText = True
+        Properties.OnInitPopup = cxGridViewUNIDAD_MEDIDAPropertiesInitPopup
+        Visible = False
+        Width = 60
+      end
       inherited cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
         Width = 48
       end
@@ -105,8 +119,10 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
     end
   end
   inherited TBXDock1: TTBXDock
+    Width = 771
+    ExplicitWidth = 451
     inherited TBXToolbar1: TTBXToolbar
-      ExplicitWidth = 451
+      ExplicitWidth = 548
       object TBXItem12: TTBXItem [0]
         Action = actAnadirArticulos
         DisplayMode = nbdmImageAndText
diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas
index 7fe67bd5..6eec7067 100644
--- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas
+++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.pas
@@ -11,7 +11,7 @@ uses
   cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxClasses,
   cxControls, cxGridCustomView, cxGrid, ComCtrls, StdCtrls, JvExStdCtrls,
   JvCombobox, JvColorCombo, ToolWin, uControllerDetallesArticulos,
-  cxTextEdit, uDAInterfaces;
+  cxTextEdit, uDAInterfaces, cxDropDownEdit;
 
 type
   IViewDetallesArticulos = interface(IViewDetallesDTO)
@@ -24,6 +24,7 @@ type
     cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn;
     actAnadirArticulos: TAction;
     TBXItem12: TTBXItem;
+    cxGridViewUNIDAD_MEDIDA: TcxGridDBColumn;
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure actAnadirArticulosExecute(Sender: TObject);
@@ -31,6 +32,7 @@ type
     procedure OnValidateReferencia(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
     procedure OnValidateReferenciaProveedor(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
     procedure CustomViewShow(Sender: TObject);
+    procedure cxGridViewUNIDAD_MEDIDAPropertiesInitPopup(Sender: TObject);
 
   protected
     procedure AnadirArticulosInterno; virtual;
@@ -40,7 +42,8 @@ type
 implementation
 {$R *.dfm}
 
-uses uViewDetallesBase;
+uses
+  uViewDetallesBase, uUnidadesMedidaController;
 
 procedure TfrViewDetallesArticulos.actAnadirArticulosExecute(Sender: TObject);
 begin
@@ -82,6 +85,32 @@ begin
   SeleccionarRowActual;
 end;
 
+procedure TfrViewDetallesArticulos.cxGridViewUNIDAD_MEDIDAPropertiesInitPopup(
+  Sender: TObject);
+var
+  AUnidController : IUnidadesMedidaController;
+begin
+  inherited;
+  with TcxComboBoxProperties(cxGridViewUNIDAD_MEDIDA.Properties).Items do
+  begin
+    if (Count = 0) then
+    begin
+      ShowHourglassCursor;
+      BeginUpdate;
+      AUnidController := TUnidadesMedidaController.Create;      
+      try
+        Clear;
+        AddStrings(AUnidController.DarListaUnidadesMedida);
+      finally
+        EndUpdate;
+        AUnidController := NIL;
+        HideHourglassCursor;
+      end;
+    end;
+  end;
+
+end;
+
 procedure TfrViewDetallesArticulos.OnValidateReferencia(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
 var
   lsReferencia : String;