Repaso de general de contactos

git-svn-id: https://192.168.0.254/svn/Proyectos.Noviseda_FactuGES2/trunk@7 f33bb606-9f5c-448d-9c99-757f00063c96

Database/scripts/factuges.sql

@@ -1907,8 +1907,7 @@ FECHA_MODIFICACION,
 USUARIO,
 ID_EMPRESA,
 REFERENCIA,
-COMISION,
+COMISION)
-ID_USUARIO)
  AS 
 SELECT V_CONTACTOS.ID,
   V_CONTACTOS.ID_CATEGORIA,
@@ -1933,8 +1932,7 @@ SELECT V_CONTACTOS.ID,
   V_CONTACTOS.USUARIO,
   V_CONTACTOS.ID_EMPRESA, 
   V_CONTACTOS.REFERENCIA,
-  VENDEDORES_DATOS.COMISION,
+  VENDEDORES_DATOS.COMISION
-  VENDEDORES_DATOS.ID_USUARIO
   
 FROM V_CONTACTOS
 INNER JOIN VENDEDORES_DATOS ON (VENDEDORES_DATOS.ID_VENDEDOR = V_CONTACTOS.ID)

Database/scripts/factuges_sysdata.sql

@@ -36,8 +36,9 @@ INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (11,
 INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (12, NULL, 'REF_PROVEEDORES', '0000000001', 'Ref. proveedores');
 INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (13, NULL, 'REF_EMPLEADOS', '00001', 'Ref. empleados');
 INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (14, NULL, 'REF_ARTICULOS', '1', 'Ref. artículos');
+INSERT INTO REFERENCIAS (ID, ID_EMPRESA, CODIGO, VALOR, DESCRIPCION) VALUES (15, NULL, 'REF_VENDEDORES', '0000000001', 'Ref. vendedores');
 
-SET GENERATOR GEN_REFERENCIAS_ID TO 15;
+SET GENERATOR GEN_REFERENCIAS_ID TO 16;
 COMMIT WORK;
 
 INSERT INTO TIPOS_IVA (ID, REFERENCIA, DESCRIPCION, IVA, RE) VALUES (1, 'IVA16', 'IVA16', 16, 4);

Source/Base/Base.dpk

@@ -116,6 +116,7 @@ contains
   uEMailUtils in 'Utiles\uEMailUtils.pas',
   uSaveClipboard in 'Utiles\uSaveClipboard.pas',
   MidasSpeedFix in 'Utiles\MidasSpeedFix.pas',
-  uGridUtils in 'Utiles\uGridUtils.pas';
+  uGridUtils in 'Utiles\uGridUtils.pas',
+  uCIFNIFUtils in 'Utiles\uCIFNIFUtils.pas';
 
 end.

Source/Base/Base.dproj

@@ -45,6 +45,10 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">Libreria base de FactuGES</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
+      
+      
       <Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">Base.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
@@ -132,6 +136,7 @@
     <DCCReference Include="Utiles\tbx_d10.dcp" />
     <DCCReference Include="Utiles\uAppInfoUtils.pas" />
     <DCCReference Include="Utiles\uCalculosUtils.pas" />
+    <DCCReference Include="Utiles\uCIFNIFUtils.pas" />
     <DCCReference Include="Utiles\uDataTableUtils.pas" />
     <DCCReference Include="Utiles\uDateUtils.pas" />
     <DCCReference Include="Utiles\uDBSelectionListUtils.pas" />

Source/Cliente/uBootStrap.pas

@@ -24,13 +24,13 @@ begin
     LoadModule('FormasPago_plugin.bpl');
     LoadModule('TiposIVA_plugin.bpl');
     LoadModule('Familias_plugin.bpl');
-    LoadModule('Fabricantes_plugin.bpl');    
+//    LoadModule('Fabricantes_plugin.bpl');
-    LoadModule('UnidadesMedida_plugin.bpl');
+//    LoadModule('UnidadesMedida_plugin.bpl');
 
     LoadModule('Contactos_plugin.bpl');
 
     LoadModule('Almacenes_plugin.bpl');
-    LoadModule('Obras_plugin.bpl');    
+//    LoadModule('Obras_plugin.bpl');
     LoadModule('Articulos_plugin.bpl');
 
 //    LoadModule(MODULENAME_PRESUPUESTOS_CLIENTE);

Source/Modulos/Articulos/Views/uEditorArticulo.dfm

@@ -34,12 +34,18 @@ inherited fEditorArticulo: TfEditorArticulo
         4495BD38333E3DC0F0B71000FEC966E74A55381F0000000049454E44AE426082}
       ExplicitLeft = 607
     end
+    inherited lblDesbloquear: TcxLabel
+      Left = 780
+      ExplicitLeft = 780
+      AnchorX = 825
+      AnchorY = 14
+    end
   end
   inherited TBXDock: TTBXDock
     Width = 905
     ExplicitWidth = 905
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 400
+      ExplicitWidth = 330
       inherited TBXItem2: TTBXItem
         Visible = False
       end
@@ -98,7 +104,6 @@ inherited fEditorArticulo: TfEditorArticulo
   inherited pgPaginas: TPageControl
     Width = 899
     Height = 404
-    ActivePage = TabSheet1
     ExplicitWidth = 899
     ExplicitHeight = 404
     inherited pagGeneral: TTabSheet
@@ -356,8 +361,10 @@ inherited fEditorArticulo: TfEditorArticulo
     object actFamilias: TAction
       Category = 'Acciones'
       Caption = 'Familias'
+      Enabled = False
       Hint = 'Acceder a la gesti'#243'n de familias de art'#237'culos'
       ImageIndex = 21
+      Visible = False
       OnExecute = actFamiliasExecute
     end
   end

Source/Modulos/Articulos/Views/uEditorArticulo.pas

@@ -18,7 +18,7 @@ uses
   cxGridCustomTableView, cxGridTableView, cxGridDBTableView, cxGridLevel,
   cxClasses, cxControls, cxGridCustomView, cxGrid, uViewDetallesGenerico,
   uViewArticulosProveedores,  dxLayoutControl, cxContainer,
-  cxTextEdit, cxMaskEdit, cxSpinEdit, cxDBEdit, cxCurrencyEdit;
+  cxTextEdit, cxMaskEdit, cxSpinEdit, cxDBEdit, cxCurrencyEdit, cxLabel;
 
 type
   TfEditorArticulo = class(TfEditorDBItem, IEditorArticulo)

Source/Modulos/Articulos/Views/uEditorArticulos.dfm

@@ -33,7 +33,7 @@ inherited fEditorArticulos: TfEditorArticulos
     Width = 657
     ExplicitWidth = 657
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 657
+      ExplicitWidth = 632
     end
     inherited tbxFiltro: TTBXToolbar
       inherited tbxEditFiltro: TTBXEditItem
@@ -116,16 +116,20 @@ inherited fEditorArticulos: TfEditorArticulos
                 StyleHot.LookAndFeel.SkinName = ''
               end
               inherited edtFechaFinFiltro: TcxDateEdit
+                Left = 363
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitLeft = 363
               end
               inherited eLista: TcxComboBox
+                Left = 613
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitLeft = 613
                 ExplicitWidth = 20
                 Width = 20
               end
@@ -171,7 +175,9 @@ inherited fEditorArticulos: TfEditorArticulos
     end
     object pagArticulosPorProveedor: TTabSheet
       Caption = 'Art'#237'culos por proveedor'
+      Enabled = False
       ImageIndex = 1
+      TabVisible = False
       inline frViewArticulosPorProveedor1: TfrViewArticulosPorProveedor
         Left = 0
         Top = 0
@@ -225,16 +231,20 @@ inherited fEditorArticulos: TfEditorArticulos
                 StyleHot.LookAndFeel.SkinName = ''
               end
               inherited edtFechaFinFiltro: TcxDateEdit
+                Left = 363
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitLeft = 363
               end
               inherited eLista: TcxComboBox
+                Left = 613
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
+                ExplicitLeft = 613
                 ExplicitWidth = 20
                 Width = 20
               end
@@ -291,15 +301,21 @@ inherited fEditorArticulos: TfEditorArticulos
     inherited actImprimir: TAction
       Visible = True
     end
+    inherited actExportarExcel: TAction
+      Enabled = False
+      Visible = False
+    end
     inherited actExpandir: TAction
-      Visible = True
+      Enabled = False
     end
     inherited actContraer: TAction
-      Visible = True
+      Enabled = False
     end
     object actFamilias: TAction
       Category = 'Acciones'
       Caption = 'Familias de art'#237'culos'
+      Enabled = False
+      Visible = False
       OnExecute = actFamiliasExecute
     end
   end

Source/Modulos/Articulos/Views/uViewArticulo.dfm

@@ -1,6 +1,6 @@
 inherited frViewArticulo: TfrViewArticulo
-  Width = 614
+  Width = 666
-  Height = 376
+  Height = 419
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -9,8 +9,8 @@ inherited frViewArticulo: TfrViewArticulo
   object dxLayoutControlArticulo: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 614
+    Width = 666
-    Height = 376
+    Height = 419
     Align = alClient
     ParentBackground = True
     TabOrder = 0
@@ -19,10 +19,10 @@ inherited frViewArticulo: TfrViewArticulo
     ExplicitWidth = 451
     ExplicitHeight = 304
     DesignSize = (
-      614
+      666
-      376)
+      419)
     object PngSpeedButton2: TPngSpeedButton
-      Left = 552
+      Left = 604
       Top = 304
       Width = 23
       Height = 22
@@ -49,7 +49,7 @@ inherited frViewArticulo: TfrViewArticulo
       PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
     end
     object PngSpeedButton1: TPngSpeedButton
-      Left = 552
+      Left = 604
       Top = 332
       Width = 23
       Height = 22
@@ -342,6 +342,7 @@ inherited frViewArticulo: TfrViewArticulo
               AutoAligns = [aaVertical]
               AlignHorz = ahClient
               Caption = 'Familia:'
+              Visible = False
               Control = cbFamilia
               ControlOptions.ShowBorder = False
             end
@@ -349,6 +350,7 @@ inherited frViewArticulo: TfrViewArticulo
               AutoAligns = [aaVertical]
               AlignHorz = ahClient
               Caption = 'Unidad de medida:'
+              Visible = False
               Control = cbUnidadMedida
               ControlOptions.ShowBorder = False
             end
@@ -360,6 +362,7 @@ inherited frViewArticulo: TfrViewArticulo
                 AutoAligns = [aaVertical]
                 AlignHorz = ahClient
                 Caption = ' '
+                Visible = False
                 Control = cbNoInventariable
                 ControlOptions.ShowBorder = False
               end
@@ -378,6 +381,7 @@ inherited frViewArticulo: TfrViewArticulo
           Caption = 'Datos del fabricante'
           object dxLayoutControlArticuloItem10: TdxLayoutItem
             Caption = 'Fabricante:'
+            Visible = False
             Control = cbFabricante
             ControlOptions.ShowBorder = False
           end

Source/Modulos/Articulos/Views/uViewArticulos.pas

@@ -15,7 +15,7 @@ uses
   cxGridCustomPopupMenu, cxGridPopupMenu, cxCurrencyEdit, cxSpinEdit, cxCheckBox,
   cxCheckComboBox, cxImageComboBox, TB2Item, TBX, TB2Toolbar, TBXDkPanels,
   TB2Dock, uViewFiltroBase, dxPgsDlg, uDAInterfaces,  
-  uArticulosController;
+  uArticulosController, uCustomView, uViewBase;
 
 type
   IViewArticulos = interface(IViewGrid)

Source/Modulos/Articulos/Views/uViewArticulosPorProveedor.pas

@@ -15,7 +15,7 @@ uses
   cxGridCustomPopupMenu, cxGridPopupMenu, cxCurrencyEdit, cxSpinEdit, cxCheckBox,
   cxCheckComboBox, cxImageComboBox, TB2Item, TBX, TB2Toolbar, TBXDkPanels,
   TB2Dock, uViewFiltroBase, dxPgsDlg, uDAInterfaces,  
-  uArticulosController, uViewArticulos;
+  uArticulosController, uViewArticulos, uCustomView, uViewBase;
 
 type
   TfrViewArticulosPorProveedor = class(TfrViewGrid, IViewArticulos)

Source/Modulos/Contactos/Model/schContactosClient_Intf.pas

@@ -9,21 +9,21 @@ 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_Contactos = '{52215A06-B5F6-4B8B-B3D6-61FDCE7F0A02}';
+  RID_Contactos = '{A1CF6237-ADAC-42E6-AE86-84987E1D9A8A}';
-  RID_GruposCliente = '{746E4BBC-4CA3-4DE9-932C-D576793B8707}';
+  RID_GruposCliente = '{426F8320-5441-4BF4-B7F9-71D02177057C}';
-  RID_DatosBancarios = '{E61CE62F-F7B0-4798-9AF4-8A708FAA0ABB}';
+  RID_DatosBancarios = '{01BE961A-FF3F-4B62-915C-A08398C216B0}';
-  RID_Vendedores = '{16DA5424-5344-4928-B51A-BD081F33C26D}';
+  RID_Vendedores = '{1727E068-2906-459B-A1CE-7FB4EE19047F}';
-  RID_Clientes = '{FD66540E-D3CC-4491-895A-E1CBBE7888F3}';
+  RID_Clientes = '{445569C9-B8CA-43C9-836E-701F6D584591}';
-  RID_Proveedores = '{934ED130-F8E4-46BB-90F1-CE8BD6BE4389}';
+  RID_Proveedores = '{8816F065-39E8-4369-8250-6909A74234D6}';
-  RID_Empleados = '{1ACE1F7E-0591-4593-9DCA-0B65277537FD}';
+  RID_Empleados = '{51EDCDDE-D2EF-415A-AA14-E91BE3F06034}';
-  RID_DireccionesContacto = '{E1A726F9-A26D-41C3-9B35-DCA4EF2EC328}';
+  RID_DireccionesContacto = '{4604C16C-DEAF-4F60-BEDC-8CF3E6DB85EF}';
-  RID_ClientesDescuentos = '{2E6F77DB-AE75-4A13-863F-1EF3452E5F30}';
+  RID_ClientesDescuentos = '{5145DC3B-13B9-4A12-808B-74A6D36DA114}';
-  RID_GruposProveedor = '{40761E35-0E27-47AA-A2A3-C208CE49F6AD}';
+  RID_GruposProveedor = '{43C92773-4D36-4B3F-BF7E-8ECE4C3C57F9}';
-  RID_GruposEmpleado = '{61BB0B58-C13C-49DD-B70F-7C4CE98EB729}';
+  RID_GruposEmpleado = '{50E1E891-C651-4961-AD9C-EC0615F97853}';
-  RID_Contactos_Refresh = '{C6BF0A3F-D05B-419E-A316-3AE899576B66}';
+  RID_Contactos_Refresh = '{97FBFB9B-C20B-498B-911B-53D65F760099}';
-  RID_ContratosEmpleados = '{12A95676-F905-4503-8A22-AE446B1AA1B1}';
+  RID_ContratosEmpleados = '{674BE5D7-5D36-4740-9F1B-774F6284BD0B}';
-  RID_DescripcionesProveedores = '{94370019-7DDC-4B96-9570-9D4CF75EE987}';
+  RID_DescripcionesProveedores = '{23D7C3B8-6E6E-4082-98AD-63D1237794D8}';
-  RID_PersonalContacto = '{C90D2E26-B9C9-43D7-8403-9CBE20ED143E}';
+  RID_PersonalContacto = '{8F9DDF1A-0719-4F38-9A7B-3DA787476947}';
 
   { Data table names }
   nme_Contactos = 'Contactos';
@@ -147,7 +147,6 @@ const
   fld_VendedoresID_EMPRESA = 'ID_EMPRESA';
   fld_VendedoresREFERENCIA = 'REFERENCIA';
   fld_VendedoresCOMISION = 'COMISION';
-  fld_VendedoresID_USUARIO = 'ID_USUARIO';
 
   { Vendedores field indexes }
   idx_VendedoresID = 0;
@@ -174,7 +173,6 @@ const
   idx_VendedoresID_EMPRESA = 21;
   idx_VendedoresREFERENCIA = 22;
   idx_VendedoresCOMISION = 23;
-  idx_VendedoresID_USUARIO = 24;
 
   { Clientes fields }
   fld_ClientesID = 'ID';
@@ -557,7 +555,7 @@ const
 type
   { IContactos }
   IContactos = interface(IDAStronglyTypedDataTable)
-  ['{618830B4-3FE0-4B45-8C92-C5E1FCBAAF13}']
+  ['{C7934361-0344-4AEA-BFA4-144630740B11}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -856,7 +854,7 @@ type
 
   { IGruposCliente }
   IGruposCliente = interface(IDAStronglyTypedDataTable)
-  ['{CA38071D-9111-4091-9B15-4825B95BD4A2}']
+  ['{102B395B-EA51-40BA-9517-392F849648B3}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -903,7 +901,7 @@ type
 
   { IDatosBancarios }
   IDatosBancarios = interface(IDAStronglyTypedDataTable)
-  ['{665F71BA-04C9-4634-9732-17C17187ABA1}']
+  ['{51757B84-1D4D-46EA-9CD9-4AC552EFEB7D}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1034,7 +1032,7 @@ type
 
   { IVendedores }
   IVendedores = interface(IDAStronglyTypedDataTable)
-  ['{65C2DA77-8B4E-4465-9178-0B8656ACBEC0}']
+  ['{FC903BBD-4F5D-44F3-A1E8-50A8C465A548}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1131,10 +1129,6 @@ type
     procedure SetCOMISIONValue(const aValue: Currency);
     function GetCOMISIONIsNull: Boolean;
     procedure SetCOMISIONIsNull(const aValue: Boolean);
-    function GetID_USUARIOValue: Integer;
-    procedure SetID_USUARIOValue(const aValue: Integer);
-    function GetID_USUARIOIsNull: Boolean;
-    procedure SetID_USUARIOIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -1186,8 +1180,6 @@ type
     property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
     property COMISION: Currency read GetCOMISIONValue write SetCOMISIONValue;
     property COMISIONIsNull: Boolean read GetCOMISIONIsNull write SetCOMISIONIsNull;
-    property ID_USUARIO: Integer read GetID_USUARIOValue write SetID_USUARIOValue;
-    property ID_USUARIOIsNull: Boolean read GetID_USUARIOIsNull write SetID_USUARIOIsNull;
   end;
 
   { TVendedoresDataTableRules }
@@ -1292,10 +1284,6 @@ type
     procedure SetCOMISIONValue(const aValue: Currency); virtual;
     function GetCOMISIONIsNull: Boolean; virtual;
     procedure SetCOMISIONIsNull(const aValue: Boolean); virtual;
-    function GetID_USUARIOValue: Integer; virtual;
-    procedure SetID_USUARIOValue(const aValue: Integer); virtual;
-    function GetID_USUARIOIsNull: Boolean; virtual;
-    procedure SetID_USUARIOIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -1346,8 +1334,6 @@ type
     property REFERENCIAIsNull: Boolean read GetREFERENCIAIsNull write SetREFERENCIAIsNull;
     property COMISION: Currency read GetCOMISIONValue write SetCOMISIONValue;
     property COMISIONIsNull: Boolean read GetCOMISIONIsNull write SetCOMISIONIsNull;
-    property ID_USUARIO: Integer read GetID_USUARIOValue write SetID_USUARIOValue;
-    property ID_USUARIOIsNull: Boolean read GetID_USUARIOIsNull write SetID_USUARIOIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -1357,7 +1343,7 @@ type
 
   { IClientes }
   IClientes = interface(IDAStronglyTypedDataTable)
-  ['{5C6F2DDB-001B-4EAA-87D6-34F59279006B}']
+  ['{F7755B64-ECA3-4B91-BEB4-0CD322904DD8}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1836,7 +1822,7 @@ type
 
   { IProveedores }
   IProveedores = interface(IDAStronglyTypedDataTable)
-  ['{F1DAC973-4FAB-4611-AD23-06241A02F2B6}']
+  ['{117DF76C-65CE-4B27-9A1C-29E814758355}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2303,7 +2289,7 @@ type
 
   { IEmpleados }
   IEmpleados = interface(IDAStronglyTypedDataTable)
-  ['{C787A7E8-2C90-4A80-89CC-959FCE591319}']
+  ['{9504B80C-3095-4E8B-BC52-323CCD57C131}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2734,7 +2720,7 @@ type
 
   { IDireccionesContacto }
   IDireccionesContacto = interface(IDAStronglyTypedDataTable)
-  ['{246EC7C6-26FA-4ACC-B70E-795AEF23462B}']
+  ['{C1B52BCF-C2A2-48A3-AEF6-41F708493841}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2949,7 +2935,7 @@ type
 
   { IClientesDescuentos }
   IClientesDescuentos = interface(IDAStronglyTypedDataTable)
-  ['{1395C1EC-8334-46AA-800D-8AFF16B44895}']
+  ['{3150E9EF-9538-432A-B26E-5DA75531C702}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3032,7 +3018,7 @@ type
 
   { IGruposProveedor }
   IGruposProveedor = interface(IDAStronglyTypedDataTable)
-  ['{20E93C12-03EE-4D46-935D-512F2DBF2194}']
+  ['{5A7A04F2-FBE8-41C9-BF4C-2721A50C76FD}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3079,7 +3065,7 @@ type
 
   { IGruposEmpleado }
   IGruposEmpleado = interface(IDAStronglyTypedDataTable)
-  ['{F4714CC1-86E1-49E2-B1F2-988B4F0B665D}']
+  ['{D1CF82BD-3AE2-4FDC-88F8-A79B181C7BFE}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3126,7 +3112,7 @@ type
 
   { IContactos_Refresh }
   IContactos_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{0A5C95F3-9AC8-4C19-B3FD-D6BA6AC5F24D}']
+  ['{9046F0B4-E194-4050-A796-F7129BDE7A16}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3401,7 +3387,7 @@ type
 
   { IContratosEmpleados }
   IContratosEmpleados = interface(IDAStronglyTypedDataTable)
-  ['{D7149642-353C-41C5-B0D4-3799C1A20EFC}']
+  ['{8B8ECB16-A934-4365-BAC6-13022B79269E}']
     { Property getters and setters }
     function GetCONTRATOValue: String;
     procedure SetCONTRATOValue(const aValue: String);
@@ -3436,7 +3422,7 @@ type
 
   { IDescripcionesProveedores }
   IDescripcionesProveedores = interface(IDAStronglyTypedDataTable)
-  ['{0FDFD980-5623-47FC-8B4E-00ADCABE6456}']
+  ['{18DD39A9-3E32-4D1A-AD50-309FF1965707}']
     { Property getters and setters }
     function GetDESCRIPCION_PROVEEDORValue: String;
     procedure SetDESCRIPCION_PROVEEDORValue(const aValue: String);
@@ -3471,7 +3457,7 @@ type
 
   { IPersonalContacto }
   IPersonalContacto = interface(IDAStronglyTypedDataTable)
-  ['{52B5054D-52ED-444F-8373-B5223CA70FDA}']
+  ['{E13E09AE-DFD1-4B74-BA1E-9FA1E40E722F}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -4895,27 +4881,6 @@ begin
     DataTable.Fields[idx_VendedoresCOMISION].AsVariant := Null;
 end;
 
-function TVendedoresDataTableRules.GetID_USUARIOValue: Integer;
-begin
-  result := DataTable.Fields[idx_VendedoresID_USUARIO].AsInteger;
-end;
-
-procedure TVendedoresDataTableRules.SetID_USUARIOValue(const aValue: Integer);
-begin
-  DataTable.Fields[idx_VendedoresID_USUARIO].AsInteger := aValue;
-end;
-
-function TVendedoresDataTableRules.GetID_USUARIOIsNull: boolean;
-begin
-  result := DataTable.Fields[idx_VendedoresID_USUARIO].IsNull;
-end;
-
-procedure TVendedoresDataTableRules.SetID_USUARIOIsNull(const aValue: Boolean);
-begin
-  if aValue then
-    DataTable.Fields[idx_VendedoresID_USUARIO].AsVariant := Null;
-end;
-
 
 { TClientesDataTableRules }
 constructor TClientesDataTableRules.Create(aDataTable: TDADataTable);

Source/Modulos/Contactos/Model/schContactosServer_Intf.pas

@@ -9,26 +9,26 @@ 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_ContactosDelta = '{78E1A4A1-63B0-4E85-98EA-565A0306F82E}';
+  RID_ContactosDelta = '{9BDE25F2-7BDE-4D22-BF7E-66AE44521AAE}';
-  RID_GruposClienteDelta = '{290A5A9F-B59B-45F9-A271-46A92145DDCB}';
+  RID_GruposClienteDelta = '{ECD51523-CFDC-4373-9A05-79BB438E7FBB}';
-  RID_DatosBancariosDelta = '{DCA36A24-7DCE-4AF9-8342-183225570C66}';
+  RID_DatosBancariosDelta = '{C98E544A-1635-49DE-A36F-CCB35E100511}';
-  RID_VendedoresDelta = '{CAC5FD1A-F276-4C36-BB58-DD0685700DB6}';
+  RID_VendedoresDelta = '{B982EFCF-B572-461B-AE81-4986117F3982}';
-  RID_ClientesDelta = '{3BE928CA-A7BA-488E-B1B1-87F09940A0F7}';
+  RID_ClientesDelta = '{5266A7F5-C1E1-4488-8228-F9489F614E23}';
-  RID_ProveedoresDelta = '{DE785016-DE19-44FF-B627-D1C3AD915FF6}';
+  RID_ProveedoresDelta = '{945D63D8-4D00-499A-A9F2-7F32031B7DFC}';
-  RID_EmpleadosDelta = '{EF80BF60-AF2F-436E-97C9-1A4B3AFD559A}';
+  RID_EmpleadosDelta = '{7DF4DC2D-402C-4068-AA25-FF0898A50272}';
-  RID_DireccionesContactoDelta = '{7AC64912-0319-4ADB-BEA6-5051D52A1D95}';
+  RID_DireccionesContactoDelta = '{ED48ADE8-DE49-491B-884F-C80631F13C81}';
-  RID_ClientesDescuentosDelta = '{6EF380DA-11DB-41F0-A91E-595A542B3473}';
+  RID_ClientesDescuentosDelta = '{8A886F27-2311-469C-BEB6-365405639C58}';
-  RID_GruposProveedorDelta = '{C8CABA26-6C4F-4CAB-852D-434A8070D46B}';
+  RID_GruposProveedorDelta = '{5C7DFC7C-95CA-4B4F-B1C9-6DA162E941E0}';
-  RID_GruposEmpleadoDelta = '{F2A92F29-335A-45F0-890E-2B947D8FB7FB}';
+  RID_GruposEmpleadoDelta = '{A465A4A2-7B8F-47B5-A20E-5B444B27376C}';
-  RID_Contactos_RefreshDelta = '{BA88A3B8-C3B2-4BC5-9168-8DDF9DA964E3}';
+  RID_Contactos_RefreshDelta = '{CF3A1DF8-8F5C-439E-8908-9AFB100422CD}';
-  RID_ContratosEmpleadosDelta = '{9FE82855-89AA-477A-B489-A0CFFF68B94C}';
+  RID_ContratosEmpleadosDelta = '{D01B787D-9A4F-4DE4-935E-F65AA7EC6E73}';
-  RID_DescripcionesProveedoresDelta = '{FEA124F6-B430-442A-BDAC-AD93C50499B2}';
+  RID_DescripcionesProveedoresDelta = '{F3E3C88C-9995-4F34-A9F1-B26D897BD3AF}';
-  RID_PersonalContactoDelta = '{FC2B1815-0CA1-4BE7-933D-B3477B1E3E1A}';
+  RID_PersonalContactoDelta = '{33B35E63-AE8B-489F-A124-89FFA1DA9726}';
 
 type
   { IContactosDelta }
   IContactosDelta = interface(IContactos)
-  ['{78E1A4A1-63B0-4E85-98EA-565A0306F82E}']
+  ['{9BDE25F2-7BDE-4D22-BF7E-66AE44521AAE}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -327,7 +327,7 @@ type
 
   { IGruposClienteDelta }
   IGruposClienteDelta = interface(IGruposCliente)
-  ['{290A5A9F-B59B-45F9-A271-46A92145DDCB}']
+  ['{ECD51523-CFDC-4373-9A05-79BB438E7FBB}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -373,7 +373,7 @@ type
 
   { IDatosBancariosDelta }
   IDatosBancariosDelta = interface(IDatosBancarios)
-  ['{DCA36A24-7DCE-4AF9-8342-183225570C66}']
+  ['{C98E544A-1635-49DE-A36F-CCB35E100511}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -503,7 +503,7 @@ type
 
   { IVendedoresDelta }
   IVendedoresDelta = interface(IVendedores)
-  ['{CAC5FD1A-F276-4C36-BB58-DD0685700DB6}']
+  ['{B982EFCF-B572-461B-AE81-4986117F3982}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -529,7 +529,6 @@ type
     function GetOldID_EMPRESAValue : Integer;
     function GetOldREFERENCIAValue : String;
     function GetOldCOMISIONValue : Currency;
-    function GetOldID_USUARIOValue : Integer;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -556,7 +555,6 @@ type
     property OldID_EMPRESA : Integer read GetOldID_EMPRESAValue;
     property OldREFERENCIA : String read GetOldREFERENCIAValue;
     property OldCOMISION : Currency read GetOldCOMISIONValue;
-    property OldID_USUARIO : Integer read GetOldID_USUARIOValue;
   end;
 
   { TVendedoresBusinessProcessorRules }
@@ -709,12 +707,6 @@ type
     function GetOldCOMISIONIsNull: Boolean; virtual;
     procedure SetCOMISIONValue(const aValue: Currency); virtual;
     procedure SetCOMISIONIsNull(const aValue: Boolean); virtual;
-    function GetID_USUARIOValue: Integer; virtual;
-    function GetID_USUARIOIsNull: Boolean; virtual;
-    function GetOldID_USUARIOValue: Integer; virtual;
-    function GetOldID_USUARIOIsNull: Boolean; virtual;
-    procedure SetID_USUARIOValue(const aValue: Integer); virtual;
-    procedure SetID_USUARIOIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -813,10 +805,6 @@ type
     property COMISIONIsNull : Boolean read GetCOMISIONIsNull write SetCOMISIONIsNull;
     property OldCOMISION : Currency read GetOldCOMISIONValue;
     property OldCOMISIONIsNull : Boolean read GetOldCOMISIONIsNull;
-    property ID_USUARIO : Integer read GetID_USUARIOValue write SetID_USUARIOValue;
-    property ID_USUARIOIsNull : Boolean read GetID_USUARIOIsNull write SetID_USUARIOIsNull;
-    property OldID_USUARIO : Integer read GetOldID_USUARIOValue;
-    property OldID_USUARIOIsNull : Boolean read GetOldID_USUARIOIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -826,7 +814,7 @@ type
 
   { IClientesDelta }
   IClientesDelta = interface(IClientes)
-  ['{3BE928CA-A7BA-488E-B1B1-87F09940A0F7}']
+  ['{5266A7F5-C1E1-4488-8228-F9489F614E23}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -1305,7 +1293,7 @@ type
 
   { IProveedoresDelta }
   IProveedoresDelta = interface(IProveedores)
-  ['{DE785016-DE19-44FF-B627-D1C3AD915FF6}']
+  ['{945D63D8-4D00-499A-A9F2-7F32031B7DFC}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -1772,7 +1760,7 @@ type
 
   { IEmpleadosDelta }
   IEmpleadosDelta = interface(IEmpleados)
-  ['{EF80BF60-AF2F-436E-97C9-1A4B3AFD559A}']
+  ['{7DF4DC2D-402C-4068-AA25-FF0898A50272}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -2207,7 +2195,7 @@ type
 
   { IDireccionesContactoDelta }
   IDireccionesContactoDelta = interface(IDireccionesContacto)
-  ['{7AC64912-0319-4ADB-BEA6-5051D52A1D95}']
+  ['{ED48ADE8-DE49-491B-884F-C80631F13C81}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -2422,7 +2410,7 @@ type
 
   { IClientesDescuentosDelta }
   IClientesDescuentosDelta = interface(IClientesDescuentos)
-  ['{6EF380DA-11DB-41F0-A91E-595A542B3473}']
+  ['{8A886F27-2311-469C-BEB6-365405639C58}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CLIENTEValue : Integer;
@@ -2504,7 +2492,7 @@ type
 
   { IGruposProveedorDelta }
   IGruposProveedorDelta = interface(IGruposProveedor)
-  ['{C8CABA26-6C4F-4CAB-852D-434A8070D46B}']
+  ['{5C7DFC7C-95CA-4B4F-B1C9-6DA162E941E0}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -2550,7 +2538,7 @@ type
 
   { IGruposEmpleadoDelta }
   IGruposEmpleadoDelta = interface(IGruposEmpleado)
-  ['{F2A92F29-335A-45F0-890E-2B947D8FB7FB}']
+  ['{A465A4A2-7B8F-47B5-A20E-5B444B27376C}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -2596,7 +2584,7 @@ type
 
   { IContactos_RefreshDelta }
   IContactos_RefreshDelta = interface(IContactos_Refresh)
-  ['{BA88A3B8-C3B2-4BC5-9168-8DDF9DA964E3}']
+  ['{CF3A1DF8-8F5C-439E-8908-9AFB100422CD}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldNIF_CIFValue : String;
@@ -2871,7 +2859,7 @@ type
 
   { IContratosEmpleadosDelta }
   IContratosEmpleadosDelta = interface(IContratosEmpleados)
-  ['{9FE82855-89AA-477A-B489-A0CFFF68B94C}']
+  ['{D01B787D-9A4F-4DE4-935E-F65AA7EC6E73}']
     { Property getters and setters }
     function GetOldCONTRATOValue : String;
 
@@ -2905,7 +2893,7 @@ type
 
   { IDescripcionesProveedoresDelta }
   IDescripcionesProveedoresDelta = interface(IDescripcionesProveedores)
-  ['{FEA124F6-B430-442A-BDAC-AD93C50499B2}']
+  ['{F3E3C88C-9995-4F34-A9F1-B26D897BD3AF}']
     { Property getters and setters }
     function GetOldDESCRIPCION_PROVEEDORValue : String;
 
@@ -2939,7 +2927,7 @@ type
 
   { IPersonalContactoDelta }
   IPersonalContactoDelta = interface(IPersonalContacto)
-  ['{FC2B1815-0CA1-4BE7-933D-B3477B1E3E1A}']
+  ['{33B35E63-AE8B-489F-A124-89FFA1DA9726}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -4945,37 +4933,6 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_VendedoresCOMISION] := Null;
 end;
 
-function TVendedoresBusinessProcessorRules.GetID_USUARIOValue: Integer;
-begin
-  result := BusinessProcessor.CurrentChange.NewValueByName[fld_VendedoresID_USUARIO];
-end;
-
-function TVendedoresBusinessProcessorRules.GetID_USUARIOIsNull: Boolean;
-begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_VendedoresID_USUARIO]);
-end;
-
-function TVendedoresBusinessProcessorRules.GetOldID_USUARIOValue: Integer;
-begin
-  result := BusinessProcessor.CurrentChange.OldValueByName[fld_VendedoresID_USUARIO];
-end;
-
-function TVendedoresBusinessProcessorRules.GetOldID_USUARIOIsNull: Boolean;
-begin
-  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_VendedoresID_USUARIO]);
-end;
-
-procedure TVendedoresBusinessProcessorRules.SetID_USUARIOValue(const aValue: Integer);
-begin
-  BusinessProcessor.CurrentChange.NewValueByName[fld_VendedoresID_USUARIO] := aValue;
-end;
-
-procedure TVendedoresBusinessProcessorRules.SetID_USUARIOIsNull(const aValue: Boolean);
-begin
-  if aValue then
-    BusinessProcessor.CurrentChange.NewValueByName[fld_VendedoresID_USUARIO] := Null;
-end;
-
 
 { TClientesBusinessProcessorRules }
 constructor TClientesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

Source/Modulos/Contactos/Model/uBizContactos.pas

@@ -225,11 +225,7 @@ type
     function GetCOMISIONValue: Float;
     procedure SetCOMISIONValue(const aValue: Float);
 
-    function GetID_USUARIOValue: Integer;
-    procedure SetID_USUARIOValue(const aValue: Integer);
-
     property COMISION: Float read GetCOMISIONValue write SetCOMISIONValue;
-    property ID_USUARIO: Integer read GetID_USUARIOValue write SetID_USUARIOValue;
   end;
 
   TBizContacto = class(TContactosDataTableRules, IBizContacto, ISeleccionable)
@@ -460,12 +456,8 @@ type
     function GetCOMISIONValue: Float;
     procedure SetCOMISIONValue(const aValue: Float);
 
-    function GetID_USUARIOValue: Integer;
-    procedure SetID_USUARIOValue(const aValue: Integer);
-
   public
     property COMISION: Float read GetCOMISIONValue write SetCOMISIONValue;
-    property ID_USUARIO: Integer read GetID_USUARIOValue write SetID_USUARIOValue;
     procedure IniciarValoresContactoNuevo; override;
   end;
 
@@ -1020,11 +1012,6 @@ begin
   result := DataTable.Fields[idx_VendedoresCOMISION].AsFloat;
 end;
 
-function TBizVendedor.GetID_USUARIOValue: Integer;
-begin
-  result := DataTable.Fields[idx_VendedoresID_USUARIO].AsInteger;
-end;
-
 procedure TBizVendedor.IniciarValoresContactoNuevo;
 begin
   inherited;
@@ -1036,11 +1023,6 @@ begin
   DataTable.Fields[idx_VendedoresCOMISION].AsFloat := aValue;
 end;
 
-procedure TBizVendedor.SetID_USUARIOValue(const aValue: Integer);
-begin
-  DataTable.Fields[idx_VendedoresID_USUARIO].AsInteger := aValue;
-end;
-
 initialization
   RegisterDataTableRules(BIZ_CLIENT_CONTACTO, TBizContacto);
   RegisterDataTableRules(BIZ_CLIENT_CLIENTE, TBizCliente);

Source/Modulos/Contactos/Plugin/uPluginContactos.dfm

@@ -231,23 +231,29 @@ object PluginContactos: TPluginContactos
     object actEmpleados: TAction
       Category = 'Ventas'
       Caption = 'Empleados'
+      Enabled = False
       ImageIndex = 2
+      Visible = False
       OnExecute = actEmpleadosExecute
       OnUpdate = actEmpleadosUpdate
     end
     object actGruposCliente: TAction
-      Caption = 'Grupos de cliente'
+      Caption = 'Procedencias de cliente'
       ImageIndex = 5
       OnExecute = actGruposClienteExecute
     end
     object actGruposProveedor: TAction
       Caption = 'Grupos de proveedor'
+      Enabled = False
       ImageIndex = 5
+      Visible = False
       OnExecute = actGruposProveedorExecute
     end
     object actGruposEmpleado: TAction
       Caption = 'Categorias de empleado'
+      Enabled = False
       ImageIndex = 4
+      Visible = False
       OnExecute = actGruposEmpleadoExecute
     end
     object actVendedores: TAction

Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm

@@ -490,10 +490,6 @@ object srvContactos: TsrvContactos
               item
                 DatasetField = 'COMISION'
                 TableField = 'COMISION'
-              end
-              item
-                DatasetField = 'ID_USUARIO'
-                TableField = 'ID_USUARIO'
               end>
           end>
         Name = 'Vendedores'
@@ -638,11 +634,6 @@ object srvContactos: TsrvContactos
             Name = 'COMISION'
             DataType = datCurrency
             DictionaryEntry = 'Vendedores_COMISION'
-          end
-          item
-            Name = 'ID_USUARIO'
-            DataType = datInteger
-            DictionaryEntry = 'Vendedores_ID_USUARIO'
           end>
       end
       item
@@ -3178,11 +3169,6 @@ object srvContactos: TsrvContactos
       end
       item
         Params = <
-          item
-            Name = 'ID_USUARIO'
-            DataType = datInteger
-            Value = ''
-          end
           item
             Name = 'COMISION'
             DataType = datCurrency
@@ -3200,9 +3186,8 @@ object srvContactos: TsrvContactos
             TargetTable = 'VENDEDORES_DATOS'
             Name = 'IBX'
             SQL = 
-              'UPDATE VENDEDORES_DATOS'#10'  SET'#10'    ID_USUARIO = :ID_USUARIO,'#10'    ' +
+              'UPDATE VENDEDORES_DATOS'#10'  SET'#10'    COMISION = :COMISION'#10'  WHERE'#10' ' +
-              'COMISION = :COMISION'#10'  WHERE'#10'    (ID_VENDEDOR = :OLD_ID_VENDEDOR' +
+              '   (ID_VENDEDOR = :OLD_ID_VENDEDOR)'#10
-              ')'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -3215,11 +3200,6 @@ object srvContactos: TsrvContactos
             DataType = datInteger
             Value = ''
           end
-          item
-            Name = 'ID_USUARIO'
-            DataType = datInteger
-            Value = ''
-          end
           item
             Name = 'COMISION'
             DataType = datCurrency
@@ -3233,8 +3213,8 @@ object srvContactos: TsrvContactos
             TargetTable = 'VENDEDORES_DATOS'
             Name = 'IBX'
             SQL = 
-              'INSERT'#10'  INTO VENDEDORES_DATOS'#10'    (ID_VENDEDOR, ID_USUARIO, COM' +
+              'INSERT'#10'  INTO VENDEDORES_DATOS'#10'    (ID_VENDEDOR, COMISION)'#10'  VAL' +
-              'ISION)'#10'  VALUES'#10'    (:ID_VENDEDOR, :ID_USUARIO, :COMISION)'#10
+              'UES'#10'    (:ID_VENDEDOR, :COMISION)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

Source/Modulos/Contactos/Servidor/srvContactos_Impl.pas

@@ -32,9 +32,9 @@ type
     bpClientesDescuentos: TDABusinessProcessor;
     Bin2DataStreamer: TDABin2DataStreamer;
     bpPersonalContacto: TDABusinessProcessor;
+    bpVendedores: TDABusinessProcessor;
     schContactos: TDASchema;
     DataDictionary: TDADataDictionary;
-    bpVendedores: TDABusinessProcessor;
     procedure DARemoteServiceBeforeGetDatasetData(const Dataset: IDADataset;
       const IncludeSchema: Boolean; const MaxRecords: Integer);
     procedure DARemoteServiceCreate(Sender: TObject);

Source/Modulos/Contactos/Views/Contactos_view.dproj

@@ -49,63 +49,63 @@
     <DelphiCompile Include="Contactos_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\..\Base\Utiles\adortl.dcp" />
+    <DCCReference Include="..\adortl.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\ApplicationBase.dcp" />
+    <DCCReference Include="..\ApplicationBase.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\Base.dcp" />
+    <DCCReference Include="..\Base.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\bdertl.dcp" />
+    <DCCReference Include="..\bdertl.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\ccpackD11.dcp" />
+    <DCCReference Include="..\ccpackD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\cfpack_d11.dcp" />
+    <DCCReference Include="..\cfpack_d11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\Contactos_controller.dcp" />
+    <DCCReference Include="..\Contactos_controller.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\Contactos_model.dcp" />
+    <DCCReference Include="..\Contactos_model.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\cxDataD11.dcp" />
+    <DCCReference Include="..\cxDataD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\cxEditorsD11.dcp" />
+    <DCCReference Include="..\cxEditorsD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\cxExportD11.dcp" />
+    <DCCReference Include="..\cxExportD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\cxGridD11.dcp" />
+    <DCCReference Include="..\cxGridD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\cxLibraryD11.dcp" />
+    <DCCReference Include="..\cxLibraryD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\cxPageControlD11.dcp" />
+    <DCCReference Include="..\cxPageControlD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\dbrtl.dcp" />
+    <DCCReference Include="..\dbrtl.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\dclcxLibraryD11.dcp" />
+    <DCCReference Include="..\dclcxLibraryD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\designide.dcp" />
+    <DCCReference Include="..\designide.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\dsnap.dcp" />
+    <DCCReference Include="..\dsnap.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\dxComnD11.dcp" />
+    <DCCReference Include="..\dxComnD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\dxCoreD11.dcp" />
+    <DCCReference Include="..\dxCoreD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\dxPSCoreD11.dcp" />
+    <DCCReference Include="..\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\dxPScxCommonD11.dcp" />
+    <DCCReference Include="..\dxPScxCommonD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="..\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\dxPSLnksD11.dcp" />
+    <DCCReference Include="..\dxPSLnksD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\dxThemeD11.dcp" />
+    <DCCReference Include="..\dxThemeD11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\FormasPago_controller.dcp" />
+    <DCCReference Include="..\FormasPago_controller.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\FormasPago_model.dcp" />
+    <DCCReference Include="..\FormasPago_model.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\GUIBase.dcp" />
+    <DCCReference Include="..\GUIBase.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\GUISDK_D11R.dcp" />
+    <DCCReference Include="..\GUISDK_D11R.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\Jcl.dcp" />
+    <DCCReference Include="..\Jcl.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\JclVcl.dcp" />
+    <DCCReference Include="..\JclVcl.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\JSDialog100.dcp" />
+    <DCCReference Include="..\JSDialog100.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\JvCoreD11R.dcp" />
+    <DCCReference Include="..\JvCoreD11R.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\JvGlobusD11R.dcp" />
+    <DCCReference Include="..\JvGlobusD11R.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\JvPageCompsD11R.dcp" />
+    <DCCReference Include="..\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="..\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\JvSystemD11R.dcp" />
+    <DCCReference Include="..\JvSystemD11R.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\PngComponentsD10.dcp" />
+    <DCCReference Include="..\PngComponentsD10.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\PNG_D10.dcp" />
+    <DCCReference Include="..\PNG_D10.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\rtl.dcp" />
+    <DCCReference Include="..\rtl.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\tb2k_d10.dcp" />
+    <DCCReference Include="..\tb2k_d10.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\tbx_d10.dcp" />
+    <DCCReference Include="..\tbx_d10.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\TiposIVA_controller.dcp" />
+    <DCCReference Include="..\TiposIVA_controller.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\TiposIVA_model.dcp" />
+    <DCCReference Include="..\TiposIVA_model.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\vcl.dcp" />
+    <DCCReference Include="..\vcl.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\vclactnband.dcp" />
+    <DCCReference Include="..\vclactnband.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\vcldb.dcp" />
+    <DCCReference Include="..\vcldb.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\vcljpg.dcp" />
+    <DCCReference Include="..\vcljpg.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\vclshlctrls.dcp" />
+    <DCCReference Include="..\vclshlctrls.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\vclx.dcp" />
+    <DCCReference Include="..\vclx.dcp" />
-    <DCCReference Include="..\..\..\Base\Utiles\xmlrtl.dcp" />
+    <DCCReference Include="..\xmlrtl.dcp" />
     <DCCReference Include="uContactosViewRegister.pas" />
     <DCCReference Include="uEditorCliente.pas">
       <Form>fEditorCliente</Form>

Source/Modulos/Contactos/Views/uEditorCliente.dfm

@@ -61,7 +61,7 @@ inherited fEditorCliente: TfEditorCliente
       Left = 3
       DockPos = 3
       ExplicitLeft = 3
-      ExplicitWidth = 606
+      ExplicitWidth = 475
       object TBXItem7: TTBXItem [7]
         Action = actGruposCliente
         DisplayMode = nbdmImageAndText
@@ -71,6 +71,7 @@ inherited fEditorCliente: TfEditorCliente
         DisplayMode = nbdmImageAndText
         DropdownCombo = True
         ImageIndex = 22
+        Visible = False
         object TBXItem36: TTBXItem
           Action = actDocumentosPresupuestos
         end
@@ -163,43 +164,49 @@ inherited fEditorCliente: TfEditorCliente
             ExplicitTop = 162
           end
           inherited eCalle: TcxDBTextEdit
+            Left = 138
             Top = 267
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 138
             ExplicitTop = 267
             ExplicitWidth = 246
             Width = 246
           end
           inherited cbProvincia: TcxDBComboBox
+            Left = 138
             Top = 294
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 138
             ExplicitTop = 294
             ExplicitWidth = 145
             Width = 145
           end
           inherited cbPoblacion: TcxDBComboBox
+            Left = 138
             Top = 321
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 138
             ExplicitTop = 321
             ExplicitWidth = 246
             Width = 246
           end
           inherited eCodigoPostal: TcxDBTextEdit
-            Left = 303
+            Left = 306
             Top = 294
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 303
+            ExplicitLeft = 306
             ExplicitTop = 294
           end
           inherited eObservaciones: TcxDBMemo
@@ -215,11 +222,13 @@ inherited fEditorCliente: TfEditorCliente
             Width = 656
           end
           inherited eNombreComercial: TcxDBTextEdit
+            Left = 138
             Top = 84
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 138
             ExplicitTop = 84
             ExplicitWidth = 246
             Width = 246
@@ -235,170 +244,201 @@ inherited fEditorCliente: TfEditorCliente
             Width = 356
           end
           inherited cbGrupoCliente: TcxDBComboBox
+            Left = 138
             Top = 138
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 138
             ExplicitTop = 138
             ExplicitWidth = 246
             Width = 246
           end
           inherited eBloqueo: TcxDBTextEdit
+            Left = 138
             Top = 216
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 138
             ExplicitTop = 216
             ExplicitWidth = 246
             Width = 246
           end
           inherited eCodigoAsignado: TcxDBTextEdit
+            Left = 138
             Top = 111
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 138
             ExplicitTop = 111
             ExplicitWidth = 246
             Width = 246
           end
           inherited eTlfParticular: TcxDBTextEdit
-            Left = 491
+            Left = 494
             Top = 57
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 491
+            ExplicitLeft = 494
             ExplicitTop = 57
             ExplicitWidth = 177
             Width = 177
           end
           inherited eTlfTrabajo: TcxDBTextEdit
-            Left = 491
+            Left = 494
             Top = 30
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 491
+            ExplicitLeft = 494
             ExplicitTop = 30
             ExplicitWidth = 177
             Width = 177
           end
           inherited eTlfMovil: TcxDBTextEdit
-            Left = 491
+            Left = 494
             Top = 84
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 491
+            ExplicitLeft = 494
             ExplicitTop = 84
             ExplicitWidth = 177
             Width = 177
           end
           inherited eFax: TcxDBTextEdit
-            Left = 491
+            Left = 494
             Top = 111
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 491
+            ExplicitLeft = 494
             ExplicitTop = 111
             ExplicitWidth = 177
             Width = 177
           end
           inherited eNombre: TcxDBTextEdit
+            Left = 138
             Top = 57
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 138
             ExplicitTop = 57
             ExplicitWidth = 246
             Width = 246
           end
           inherited eNIFCIF: TcxDBTextEdit
-            Left = 212
+            Left = 217
             Top = 30
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 212
+            ExplicitLeft = 217
             ExplicitTop = 30
             ExplicitWidth = 162
             Width = 162
           end
           inherited eMailTrabajo: TcxDBHyperLinkEdit
-            Left = 491
+            Left = 494
             Top = 162
             Properties.Prefix = 'mailto:'
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 491
+            ExplicitLeft = 494
             ExplicitTop = 162
             ExplicitWidth = 148
             Width = 148
           end
           inherited eMailParticular: TcxDBHyperLinkEdit
-            Left = 491
+            Left = 494
             Top = 190
             Properties.Prefix = 'mailto:'
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 491
+            ExplicitLeft = 494
             ExplicitTop = 190
             ExplicitWidth = 148
             Width = 148
           end
+          inherited cbFelicitacion: TcxDBCheckBox
+            Left = 399
+            Top = 270
+            ExplicitLeft = 399
+            ExplicitTop = 270
+            ExplicitWidth = 370
+            Width = 370
+          end
           inherited ePaginaWeb: TcxDBHyperLinkEdit
-            Left = 491
+            Left = 494
             Top = 217
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 491
+            ExplicitLeft = 494
             ExplicitTop = 217
             ExplicitWidth = 148
             Width = 148
           end
           inherited eReferencia: TcxDBTextEdit
+            Left = 138
             Top = 30
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 138
             ExplicitTop = 30
             ExplicitWidth = 31
             Width = 31
           end
           inherited ePersonaContacto: TcxDBTextEdit
+            Left = 138
             Top = 348
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 138
             ExplicitTop = 348
             ExplicitWidth = 246
             Width = 246
           end
-          inherited cbFelicitacion: TcxDBCheckBox
+          inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
-            Left = 396
+            inherited dxLayoutControlContactoGroup9: TdxLayoutGroup
-            Top = 270
+              inherited dxLayoutControlContactoGroup4: TdxLayoutGroup
-            ExplicitLeft = 396
+                inherited dxLayoutControlContactoGroup1: TdxLayoutGroup
-            ExplicitTop = 270
+                  inherited dxLayoutControlContactoItem19: TdxLayoutItem
-            ExplicitWidth = 370
+                    Caption = 'Procedencia de cliente:'
-            Width = 370
+                  end
+                end
+                inherited dxLayoutControlContactoGroup18: TdxLayoutGroup
+                  Visible = False
+                end
+              end
+              inherited dxLayoutControlContactoGroup6: TdxLayoutGroup
+                inherited dxLayoutControlContactoGroup8: TdxLayoutGroup
+                  Visible = False
+                end
+              end
+            end
           end
         end
         inherited dsContacto: TDADataSource
@@ -578,7 +618,9 @@ inherited fEditorCliente: TfEditorCliente
     end
     object pagDirecciones: TTabSheet [3]
       Caption = 'Direcciones'
+      Enabled = False
       ImageIndex = 1
+      TabVisible = False
       inline frViewDireccionesEntrega1: TfrViewDireccionesEntrega
         Left = 0
         Top = 0
@@ -610,18 +652,6 @@ inherited fEditorCliente: TfEditorCliente
         inherited ToolBar1: TToolBar
           Width = 778
           ExplicitWidth = 778
-          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
     end
@@ -670,6 +700,8 @@ inherited fEditorCliente: TfEditorCliente
       end
     end
     inherited pagPersonal: TTabSheet
+      Enabled = False
+      TabVisible = False
       ExplicitWidth = 778
       ExplicitHeight = 502
       inherited frViewPersonalContacto1: TfrViewPersonalContacto
@@ -720,32 +752,40 @@ inherited fEditorCliente: TfEditorCliente
     end
     object actGruposCliente: TAction
       Category = 'Acciones'
-      Caption = 'Grupos de cliente'
+      Caption = 'Procedencias de cliente'
       ImageIndex = 21
       OnExecute = actGruposClienteExecute
     end
     object actDocumentosFacturas: TAction
       Category = 'Acciones'
       Caption = 'Facturas'
+      Enabled = False
       ImageIndex = 25
+      Visible = False
       OnExecute = actDocumentosFacturasExecute
     end
     object actDocumentosPresupuestos: TAction
       Category = 'Acciones'
       Caption = 'Presupuestos'
+      Enabled = False
       ImageIndex = 23
+      Visible = False
       OnExecute = actDocumentosPresupuestosExecute
     end
     object actDocumentosAlbaranes: TAction
       Category = 'Acciones'
       Caption = 'Albaranes'
+      Enabled = False
       ImageIndex = 24
+      Visible = False
       OnExecute = actDocumentosAlbaranesExecute
     end
     object actDocumentosRecibos: TAction
       Category = 'Acciones'
       Caption = 'Recibos'
+      Enabled = False
       ImageIndex = 26
+      Visible = False
       OnExecute = actDocumentosRecibosExecute
     end
   end

Source/Modulos/Contactos/Views/uEditorClientes.dfm

@@ -52,13 +52,14 @@ inherited fEditorClientes: TfEditorClientes
     Width = 857
     ExplicitWidth = 857
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 857
+      ExplicitWidth = 632
       object TBXSubmenuItem3: TTBXSubmenuItem [13]
         Caption = 'Documentos relacionados'
         DisplayMode = nbdmImageAndText
         DropdownCombo = True
         ImageIndex = 24
         Images = SmallImages
+        Visible = False
         object TBXItem43: TTBXItem
           Action = actDocumentosPresupuestos
         end
@@ -248,7 +249,9 @@ inherited fEditorClientes: TfEditorClientes
     object actDocumentosFacturas: TAction [2]
       Category = 'Acciones'
       Caption = 'Facturas'
+      Enabled = False
       ImageIndex = 27
+      Visible = False
       OnExecute = actDocumentosFacturasExecute
       OnUpdate = actDocumentosFacturasUpdate
     end
@@ -260,24 +263,34 @@ inherited fEditorClientes: TfEditorClientes
       Enabled = True
       Visible = True
     end
+    inherited actExportarExcel: TAction
+      Enabled = False
+      Visible = False
+    end
     object actDocumentosPresupuestos: TAction
       Category = 'Acciones'
       Caption = 'Presupuestos'
+      Enabled = False
       ImageIndex = 25
+      Visible = False
       OnExecute = actDocumentosPresupuestosExecute
       OnUpdate = actDocumentosFacturasUpdate
     end
     object actDocumentosAlbaranes: TAction
       Category = 'Acciones'
       Caption = 'Albaranes'
+      Enabled = False
       ImageIndex = 26
+      Visible = False
       OnExecute = actDocumentosAlbaranesExecute
       OnUpdate = actDocumentosFacturasUpdate
     end
     object actDocumentosRecibos: TAction
       Category = 'Acciones'
       Caption = 'Recibos'
+      Enabled = False
       ImageIndex = 28
+      Visible = False
       OnExecute = actDocumentosRecibosExecute
       OnUpdate = actDocumentosFacturasUpdate
     end

Source/Modulos/Contactos/Views/uEditorGruposCliente.dfm

@@ -4,7 +4,7 @@ object fEditorGruposCliente: TfEditorGruposCliente
   ActiveControl = ListaGruposCliente
   BorderIcons = [biSystemMenu]
   BorderStyle = bsSingle
-  Caption = 'Administraci'#243'n de grupos de clientes'
+  Caption = 'Administraci'#243'n de procedencias de clientes'
   ClientHeight = 499
   ClientWidth = 404
   Color = clBtnFace
@@ -47,17 +47,13 @@ object fEditorGruposCliente: TfEditorGruposCliente
     ActivePage = TabSheet1
     TabOrder = 0
     object TabSheet1: TTabSheet
-      Caption = 'Grupos de cliente'
+      Caption = 'Procedencias de cliente'
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       object Label1: TLabel
         Left = 10
         Top = 12
-        Width = 121
+        Width = 153
         Height = 13
-        Caption = 'Lista de grupos de cliente'
+        Caption = 'Lista de procedencias de cliente'
       end
       object ListaGruposCliente: TDBLookupListBox
         Left = 8
@@ -82,14 +78,14 @@ object fEditorGruposCliente: TfEditorGruposCliente
         Top = 318
         Width = 369
         Height = 84
-        Caption = 'A'#241'adir un nuevo grupo de cliente'
+        Caption = 'A'#241'adir una nueva procedencia de cliente'
         TabOrder = 2
         object eCategoria: TLabel
           Left = 18
           Top = 20
-          Width = 87
+          Width = 128
           Height = 13
-          Caption = 'Nombre del grupo:'
+          Caption = 'Nombre de la procedencia:'
         end
         object bAnadir: TButton
           Left = 282

Source/Modulos/Contactos/Views/uViewCliente.dfm

@@ -248,6 +248,7 @@ inherited frViewCliente: TfrViewCliente
     end
     inherited eNIFCIF: TcxDBTextEdit
       Left = 283
+      Properties.OnValidate = eNIFCIFPropertiesValidate
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
@@ -280,6 +281,30 @@ inherited frViewCliente: TfrViewCliente
       ExplicitWidth = 209
       Width = 209
     end
+    object cbFelicitacion: TcxDBCheckBox [21]
+      Left = 404
+      Top = 280
+      Caption = 'Mandar felicitaci'#243'n navide'#241'a a este cliente'
+      DataBinding.DataField = 'FELICITACION'
+      DataBinding.DataSource = dsContacto
+      Properties.ImmediatePost = True
+      Properties.NullStyle = nssUnchecked
+      Properties.ValueChecked = 1
+      Properties.ValueUnchecked = 0
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 20
+      Width = 370
+    end
     inherited ePaginaWeb: TcxDBHyperLinkEdit
       Left = 499
       Style.LookAndFeel.SkinName = ''
@@ -312,30 +337,6 @@ inherited frViewCliente: TfrViewCliente
       ExplicitWidth = 260
       Width = 260
     end
-    object cbFelicitacion: TcxDBCheckBox [24]
-      Left = 404
-      Top = 280
-      Caption = 'Mandar felicitaci'#243'n navide'#241'a a este cliente'
-      DataBinding.DataField = 'FELICITACION'
-      DataBinding.DataSource = dsContacto
-      Properties.ImmediatePost = True
-      Properties.NullStyle = nssUnchecked
-      Properties.ValueChecked = 1
-      Properties.ValueUnchecked = 0
-      Style.BorderColor = clWindowFrame
-      Style.BorderStyle = ebs3D
-      Style.HotTrack = False
-      Style.LookAndFeel.Kind = lfStandard
-      Style.LookAndFeel.NativeStyle = True
-      StyleDisabled.LookAndFeel.Kind = lfStandard
-      StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleFocused.LookAndFeel.Kind = lfStandard
-      StyleFocused.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.Kind = lfStandard
-      StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 20
-      Width = 370
-    end
     inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
       AutoAligns = [aaHorizontal]
       AlignVert = avBottom

Source/Modulos/Contactos/Views/uViewCliente.pas

@@ -40,6 +40,8 @@ type
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure actBloqueoClienteExecute(Sender: TObject);
+    procedure eNIFCIFPropertiesValidate(Sender: TObject;
+      var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
   protected
     FGrupoController: IGruposClienteController;
     procedure SetContacto(const Value: IBizContacto); override;
@@ -50,7 +52,7 @@ implementation
 {$R *.dfm}
 
 uses
-  uBizGruposCliente;
+  uCIFNIFUtils, uBizGruposCliente;
 
 { TfrViewCliente }
 
@@ -114,6 +116,14 @@ begin
   inherited;
 end;
 
+procedure TfrViewCliente.eNIFCIFPropertiesValidate(Sender: TObject;
+  var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
+begin
+  inherited;
+  if not EsCif(DisplayValue) then
+     Application.MessageBox('El NIF/CIF introducido no es correcto', 'Atención', MB_OK);
+end;
+
 procedure TfrViewCliente.SetContacto(const Value: IBizContacto);
 begin
   inherited;

Source/Servidor/FactuGES_Server.dproj

@@ -38,6 +38,9 @@
 <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">2</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">2.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">2.0.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 17 de diciembre de 2009 12:03</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       
+      
+      
+      
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>