From ba5e8299bb47de1bcf499077a66853869689bb31 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Wed, 9 Jan 2008 12:02:58 +0000
Subject: [PATCH] - Repaso general columnas de detalles - Contactos: Iconos en
 los grids.

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@209 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 Source/GUIBase/GUIBase.dproj                  |  35 ++--
 Source/GUIBase/uViewDetallesBase.dfm          | 118 +++++++------
 Source/GUIBase/uViewDetallesBase.pas          |  72 ++++++--
 Source/GUIBase/uViewDetallesDTO.dfm           | 157 +++++++++---------
 Source/GUIBase/uViewGrid.dfm                  |  69 ++++----
 Source/GUIBase/uViewGrid.pas                  |  59 ++++---
 .../Articulos/Views/Articulos_view.dproj      |  14 +-
 .../Views/uViewDetallesArticulos.dfm          | 102 +++++++++++-
 .../Contactos/Views/Contactos_view.dproj      |  24 +--
 .../Contactos/Views/Contactos_view.res        | Bin 4748 -> 384 bytes
 .../Contactos/Views/uEditorEmpleados.dfm      |  36 +---
 .../Modulos/Contactos/Views/uViewClientes.dfm |  12 +-
 .../Modulos/Contactos/Views/uViewClientes.pas |   6 +-
 .../Contactos/Views/uViewContactos.dfm        |  12 +-
 .../Contactos/Views/uViewContactos.pas        |   2 +-
 .../Contactos/Views/uViewEmpleados.dfm        |  46 ++++-
 .../Contactos/Views/uViewProveedores.dfm      |   9 +-
 .../Contactos/Views/uViewProveedores.pas      |   8 +-
 18 files changed, 469 insertions(+), 312 deletions(-)

diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj
index c079d2fd..8243ffa4 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -1,4 +1,5 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ProjectGuid>{0ca27a95-0b81-4724-84bf-8f8ed4e421ae}</ProjectGuid>
     <MainSource>GUIBase.dpk</MainSource>
@@ -57,22 +58,22 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Contactos\Base.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dxBarD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dxBarExtItemsD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dxPScxCommonD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\dxPsPrVwAdvD11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\frx11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\frxe11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\fs11.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvAppFrmD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Contactos\vcldb.dcp" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Views\Base.dcp" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Views\dbrtl.dcp" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Views\dxBarD11.dcp" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Views\dxBarExtItemsD11.dcp" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Views\dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Views\dxPScxCommonD11.dcp" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Views\dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Views\dxPsPrVwAdvD11.dcp" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Views\frx11.dcp" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Views\frxe11.dcp" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Views\fs11.dcp" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Views\JvAppFrmD11R.dcp" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Views\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Views\rtl.dcp" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Views\vcl.dcp" />
+    <DCCReference Include="..\ApplicationBase\Usuarios\Views\vcldb.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>
diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm
index 49917b1d..0d83341b 100644
--- a/Source/GUIBase/uViewDetallesBase.dfm
+++ b/Source/GUIBase/uViewDetallesBase.dfm
@@ -1,6 +1,6 @@
 inherited frViewDetallesBase: TfrViewDetallesBase
-  Width = 823
-  Height = 386
+  Width = 451
+  Height = 304
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -9,8 +9,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 823
-    Height = 51
+    Width = 451
+    Height = 73
     AutoSize = True
     ButtonWidth = 141
     Caption = 'ToolBar1'
@@ -25,8 +25,6 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     TabOrder = 0
     Transparent = True
     Visible = False
-    ExplicitWidth = 451
-    ExplicitHeight = 73
     object ToolButton1: TToolButton
       Left = 0
       Top = 0
@@ -56,16 +54,17 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       Top = 0
       Action = FontEdit1
       AutoSize = True
+      Wrap = True
     end
     object FontName: TJvFontComboBox
-      Left = 305
-      Top = 0
+      Left = 0
+      Top = 22
       Width = 145
       Height = 22
       DroppedDownWidth = 145
       MaxMRUCount = 0
       FontName = 'Tahoma'
-      ItemIndex = 35
+      ItemIndex = 34
       Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg]
       Sorted = True
       TabOrder = 2
@@ -74,8 +73,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       OnClick = FontNameChange
     end
     object FontSize: TEdit
-      Left = 450
-      Top = 0
+      Left = 145
+      Top = 22
       Width = 26
       Height = 22
       Hint = 'Font Size|Select font size'
@@ -85,8 +84,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       OnChange = FontSizeChange
     end
     object UpDown1: TUpDown
-      Left = 476
-      Top = 0
+      Left = 171
+      Top = 22
       Width = 16
       Height = 22
       Associate = FontSize
@@ -94,71 +93,68 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       Visible = False
     end
     object ToolButton13: TToolButton
-      Left = 0
-      Top = 0
+      Left = 187
+      Top = 22
       Width = 8
       Caption = 'ToolButton13'
       ImageIndex = 10
-      Wrap = True
       Style = tbsSeparator
     end
     object ToolButton6: TToolButton
-      Left = 0
-      Top = 30
+      Left = 195
+      Top = 22
       Action = RichEditBold1
       AutoSize = True
     end
     object ToolButton7: TToolButton
-      Left = 66
-      Top = 30
+      Left = 261
+      Top = 22
       Action = RichEditItalic1
       AutoSize = True
     end
     object ToolButton8: TToolButton
-      Left = 133
-      Top = 30
+      Left = 328
+      Top = 22
       Action = RichEditUnderline1
       AutoSize = True
     end
     object ToolButton12: TToolButton
-      Left = 216
-      Top = 30
+      Left = 0
+      Top = 22
       Width = 8
       Caption = 'ToolButton12'
       ImageIndex = 10
+      Wrap = True
       Style = tbsSeparator
     end
     object ToolButton9: TToolButton
-      Left = 224
-      Top = 30
+      Left = 0
+      Top = 52
       Action = RichEditAlignLeft1
       AutoSize = True
     end
     object ToolButton10: TToolButton
-      Left = 369
-      Top = 30
+      Left = 145
+      Top = 52
       Action = RichEditAlignCenter1
       AutoSize = True
     end
     object ToolButton11: TToolButton
-      Left = 494
-      Top = 30
+      Left = 270
+      Top = 52
       Action = RichEditAlignRight1
       AutoSize = True
     end
   end
   object cxGrid: TcxGrid
     Left = 0
-    Top = 77
-    Width = 823
-    Height = 309
+    Top = 99
+    Width = 451
+    Height = 205
     Align = alClient
     TabOrder = 1
     LookAndFeel.Kind = lfStandard
     LookAndFeel.NativeStyle = True
-    ExplicitTop = 99
-    ExplicitWidth = 451
-    ExplicitHeight = 205
     object cxGridView: TcxGridDBTableView
       NavigatorButtons.ConfirmDelete = False
       FilterBox.Visible = fvNever
@@ -197,13 +193,9 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       OptionsView.CellEndEllipsis = True
       OptionsView.CellAutoHeight = True
       OptionsView.ColumnAutoWidth = True
-      OptionsView.GridLineColor = cl3DLight
-      OptionsView.GridLines = glVertical
+      OptionsView.GridLines = glNone
       OptionsView.GroupByBox = False
       OptionsView.HeaderEndEllipsis = True
-      OptionsView.Indicator = True
-      OptionsView.RowSeparatorColor = clGradientInactiveCaption
-      OptionsView.RowSeparatorWidth = 1
       Styles.OnGetContentStyle = cxGridViewStylesGetContentStyle
       object cxGridViewID: TcxGridDBColumn
         DataBinding.FieldName = 'ID'
@@ -264,12 +256,12 @@ inherited frViewDetallesBase: TfrViewDetallesBase
         Properties.NullStyle = nssUnchecked
         Properties.ValueChecked = 1
         Properties.ValueUnchecked = 0
-        BestFitMaxWidth = 25
+        BestFitMaxWidth = 35
         FooterAlignmentHorz = taCenter
         HeaderAlignmentHorz = taCenter
-        MinWidth = 50
-        Styles.Content = cxStyleColumnaTIPO
-        Width = 50
+        MinWidth = 35
+        Options.HorzSizing = False
+        Width = 35
       end
       object cxGridViewTIPO: TcxGridDBColumn
         Caption = 'Tipo'
@@ -277,10 +269,9 @@ inherited frViewDetallesBase: TfrViewDetallesBase
         PropertiesClassName = 'TcxImageComboBoxProperties'
         Properties.ImmediatePost = True
         Properties.Items = <>
-        BestFitMaxWidth = 64
+        BestFitMaxWidth = 50
         MinWidth = 50
-        Styles.Content = cxStyleColumnaTIPO
-        Width = 119
+        Width = 50
       end
       object cxGridViewDESCRIPCION: TcxGridDBColumn
         Caption = 'Concepto'
@@ -331,13 +322,11 @@ inherited frViewDetallesBase: TfrViewDetallesBase
   end
   object TBXDock1: TTBXDock
     Left = 0
-    Top = 51
-    Width = 823
+    Top = 73
+    Width = 451
     Height = 26
     BackgroundOnToolbars = False
     UseParentBackground = True
-    ExplicitTop = 73
-    ExplicitWidth = 451
     object TBXToolbar1: TTBXToolbar
       Left = 0
       Top = 0
@@ -729,14 +718,33 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     Top = 168
     PixelsPerInch = 96
     object cxStyle_SUBTOTAL: TcxStyle
+      AssignedValues = [svColor]
+      Color = 552722127
     end
     object cxStyle_TITULO: TcxStyle
+      AssignedValues = [svColor]
+      Color = 546166271
     end
     object cxStyle_DESCUENTO: TcxStyle
-    end
-    object cxStyleColumnaTIPO: TcxStyle
       AssignedValues = [svColor]
-      Color = cl3DLight
+      Color = 549510336
+    end
+    object cxStyle_SOLO_LECTURA: TcxStyle
+      AssignedValues = [svColor]
+      Color = 15657963
+    end
+    object cxStyle_ESPECIALES: TcxStyle
+      AssignedValues = [svColor, svTextColor]
+      Color = 552984534
+      TextColor = 547699712
+    end
+    object cxStyle_NORMAL_PAR: TcxStyle
+      AssignedValues = [svColor]
+      Color = 552923887
+    end
+    object cxStyle_NORMAL_IMPAR: TcxStyle
+      AssignedValues = [svColor]
+      Color = clWindow
     end
   end
 end
diff --git a/Source/GUIBase/uViewDetallesBase.pas b/Source/GUIBase/uViewDetallesBase.pas
index 9c2ac63f..8f1c0874 100644
--- a/Source/GUIBase/uViewDetallesBase.pas
+++ b/Source/GUIBase/uViewDetallesBase.pas
@@ -105,8 +105,10 @@ type
     actDetallesCortar: TAction;
     actDetallesCopiar: TAction;
     actDetallesPegar: TAction;
-    cxStyleColumnaTIPO: TcxStyle;
-
+    cxStyle_SOLO_LECTURA: TcxStyle;
+    cxStyle_ESPECIALES: TcxStyle;
+    cxStyle_NORMAL_PAR: TcxStyle;
+    cxStyle_NORMAL_IMPAR: TcxStyle;
     procedure actAnadirExecute(Sender: TObject);
     procedure actEliminarExecute(Sender: TObject);
     procedure actSubirExecute(Sender: TObject);
@@ -190,7 +192,7 @@ implementation
 {$R *.dfm}
 
 uses
-  uDMBase, uCalculosUtils;
+  uDMBase, uCalculosUtils, dxOffice11;
 
 function EnumFontsProc(var LogFont: TLogFont; var TextMetric: TTextMetric;
   FontType: Integer; Data: Pointer): Integer; stdcall;
@@ -347,26 +349,57 @@ procedure TfrViewDetallesBase.cxGridViewCustomDrawCell(
   Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
   AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
 var
+   R : TRect;
+   sVal : String ;
+   iFlag : Integer ;
+begin
+{   R := AViewInfo.Bounds;
+   FillGradientRect(ACanvas.Handle, R, clWindow, AViewInfo.EditViewInfo.BackgroundColor, False);
+   if AViewInfo.GridRecord.Values[TcxGridDBColumn(AViewInfo.Item).Index] <> Null then
+   begin
+      sVal := AViewInfo.GridRecord.Values[TcxGridDBColumn(AViewInfo.Item).Index];
+      Dec(R.Right);
+      Inc(R.Left);
+      case TcxGridDBColumn(AViewInfo.Item).HeaderAlignmentHorz Of
+        taLeftJustify: iFlag := cxAlignLeft ;
+        taRightJustify: iFlag := cxAlignRight ;
+        taCenter: iFlag := cxAlignCenter ;
+      end;}
+      {// Draw text transparently
+      ACanvas.Brush.Style := bsClear ;
+      ACanvas.DrawTexT(sVal, r, cxAlignVCenter or iFlag);}
+//   end;
+   //ADone := True ;
+end;
+
+{var
   ATipo : String;
 begin
   inherited;
 
+  if not AViewInfo.Selected then
+  begin
+
+  end;
+
   ATipo := DarTipoConcepto(AViewInfo.GridRecord);
-  if (ATipo = TIPO_DETALLE_SUBTOTAL) and (AViewInfo.Item.Index <> cxGridViewTIPO.Index) then
+  if (ATipo = TIPO_DETALLE_SUBTOTAL) and
+     not (AViewInfo.Item.Index in [cxGridViewTIPO.Index, cxGridViewVISIBLE.Index]) then
   begin
       AViewInfo.EditViewInfo.Paint(ACanvas);
-      ACanvas.DrawComplexFrame(AViewInfo.Bounds, clBlack, clBlack, [bTop], 1);
+      AViewInfo.Item.Focused
+      if not AViewInfo.Item.FocusWithSelection then
+        FillGradientRect(ACanvas.Handle, AViewInfo.Bounds, clWindow, AViewInfo.EditViewInfo.BackgroundColor, False);
+      ACanvas.DrawComplexFrame(AViewInfo.Bounds, clBtnShadow, clBtnShadow, [bTop], 1);
       ADone := True;
   end
   else begin
-    {if ATipo = TIPO_DETALLE_TITULO then
-    begin
-        AViewInfo.EditViewInfo.Paint(ACanvas);
-        ACanvas.DrawComplexFrame(AViewInfo.Bounds, clBlack, clBlack, [bBottom], 1);
-        ADone := True;
-    end}
+      AViewInfo.EditViewInfo.Paint(ACanvas);
+      if not AViewInfo.Item.FocusWithSelection then
+        FillGradientRect(ACanvas.Handle, AViewInfo.Bounds, clWindow, AViewInfo.EditViewInfo.BackgroundColor, False);
+      ADone := True;
   end;
-end;
+end;}
 
 procedure TfrViewDetallesBase.cxGridViewEditing(Sender: TcxCustomGridTableView;
   AItem: TcxCustomGridTableItem; var AAllow: Boolean);
@@ -491,7 +524,18 @@ procedure TfrViewDetallesBase.cxGridViewStylesGetContentStyle(
 var
   ATipo : String;
 begin
-  AStyle := NIL;
+  inherited;
+  if Assigned(AItem) then
+  begin
+    if Odd(ARecord.Index) then
+      AStyle := cxStyle_NORMAL_PAR
+    else
+      AStyle := cxStyle_NORMAL_IMPAR;
+  end;
+
+
+
+{  AStyle := NIL;
   if Assigned(ARecord) then
   begin
     ATipo := DarTipoConcepto(ARecord);
@@ -504,7 +548,7 @@ begin
 
     if ATipo = TIPO_DETALLE_DESCUENTO then
       AStyle := cxStyle_DESCUENTO;
-  end;
+  end;}
 end;
 
 function TfrViewDetallesBase.DarFuentePorDefecto(const ATipo: String): TFont;
diff --git a/Source/GUIBase/uViewDetallesDTO.dfm b/Source/GUIBase/uViewDetallesDTO.dfm
index 6df51d38..ea838cab 100644
--- a/Source/GUIBase/uViewDetallesDTO.dfm
+++ b/Source/GUIBase/uViewDetallesDTO.dfm
@@ -1,9 +1,7 @@
 inherited frViewDetallesDTO: TfrViewDetallesDTO
-  Width = 451
-  Height = 304
   inherited ToolBar1: TToolBar
-    Width = 451
-    Height = 73
+    Height = 95
+    ExplicitHeight = 95
     inherited ToolButton1: TToolButton
       ExplicitWidth = 109
     end
@@ -16,90 +14,94 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
       Left = 223
       ExplicitLeft = 223
     end
-    inherited ToolButton4: TToolButton
-      Left = 278
-      ExplicitLeft = 278
-    end
-    inherited ToolButton14: TToolButton
-      Left = 334
+    inherited ToolButton13: TToolButton [3]
+      Left = 0
+      Top = 0
       Wrap = True
-      ExplicitLeft = 334
+      ExplicitLeft = 0
+      ExplicitTop = 0
+      ExplicitHeight = 30
+    end
+    inherited ToolButton4: TToolButton [4]
+      Top = 30
     end
     inherited FontName: TJvFontComboBox
-      Left = 0
-      Top = 22
-      ExplicitLeft = 0
-      ExplicitTop = 22
+      Left = 56
+      Top = 30
+      ExplicitLeft = 56
+      ExplicitTop = 30
     end
-    inherited FontSize: TEdit
-      Left = 145
-      Top = 22
-      ExplicitLeft = 145
-      ExplicitTop = 22
-    end
-    inherited UpDown1: TUpDown
-      Left = 171
-      Top = 22
-      ExplicitLeft = 171
-      ExplicitTop = 22
-    end
-    inherited ToolButton13: TToolButton
-      Left = 187
-      Top = 22
+    inherited ToolButton14: TToolButton [6]
+      Left = 201
+      Top = 30
       Wrap = False
-      ExplicitLeft = 187
-      ExplicitTop = 22
-      ExplicitHeight = 22
+      ExplicitLeft = 201
+      ExplicitTop = 30
     end
-    inherited ToolButton6: TToolButton
-      Left = 195
-      Top = 22
-      ExplicitLeft = 195
-      ExplicitTop = 22
+    inherited ToolButton6: TToolButton [7]
+      Left = 266
+      Top = 30
+      Wrap = True
+      ExplicitLeft = 266
+      ExplicitTop = 30
     end
-    inherited ToolButton7: TToolButton
-      Left = 261
-      Top = 22
-      ExplicitLeft = 261
-      ExplicitTop = 22
-    end
-    inherited ToolButton8: TToolButton
-      Left = 328
-      Top = 22
-      ExplicitLeft = 328
-      ExplicitTop = 22
-    end
-    inherited ToolButton12: TToolButton
+    inherited FontSize: TEdit [8]
       Left = 0
-      Top = 22
+      Top = 52
       ExplicitLeft = 0
-      ExplicitTop = 22
+      ExplicitTop = 52
+    end
+    inherited ToolButton7: TToolButton [9]
+      Left = 26
+      Top = 52
+      ExplicitLeft = 26
+      ExplicitTop = 52
+    end
+    inherited ToolButton11: TToolButton [10]
+      Left = 93
+      Top = 52
+      ExplicitLeft = 93
+      ExplicitTop = 52
+    end
+    inherited ToolButton10: TToolButton [11]
+      Left = 234
+      Top = 52
+      Wrap = True
+      ExplicitLeft = 234
+      ExplicitTop = 52
+    end
+    inherited UpDown1: TUpDown [12]
+      Left = 0
+      Top = 74
+      ExplicitLeft = 0
+      ExplicitTop = 74
     end
     inherited ToolButton9: TToolButton
-      Left = 0
-      Top = 52
-      ExplicitLeft = 0
-      ExplicitTop = 52
+      Left = 16
+      Top = 74
+      ExplicitLeft = 16
+      ExplicitTop = 74
     end
-    inherited ToolButton10: TToolButton
-      Left = 145
-      Top = 52
-      ExplicitLeft = 145
-      ExplicitTop = 52
+    inherited ToolButton8: TToolButton [14]
+      Left = 161
+      Top = 74
+      ExplicitLeft = 161
+      ExplicitTop = 74
     end
-    inherited ToolButton11: TToolButton
-      Left = 270
-      Top = 52
-      ExplicitLeft = 270
-      ExplicitTop = 52
+    inherited ToolButton12: TToolButton [15]
+      Left = 244
+      Top = 74
+      ExplicitLeft = 244
+      ExplicitTop = 74
     end
   end
   inherited cxGrid: TcxGrid
-    Top = 99
-    Width = 451
-    Height = 205
+    Top = 121
+    Height = 183
+    ExplicitTop = 99
+    ExplicitHeight = 205
     inherited cxGridView: TcxGridDBTableView
-      object cxGridViewDESCUENTO: TcxGridDBColumn [6]
+      object cxGridViewDESCUENTO: TcxGridDBColumn [7]
         Caption = 'Dto'
         DataBinding.FieldName = 'DESCUENTO'
         PropertiesClassName = 'TcxCurrencyEditProperties'
@@ -108,7 +110,7 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
         Properties.MaxValue = 100.000000000000000000
         Width = 30
       end
-      object cxGridViewIMPORTENETO: TcxGridDBColumn [7]
+      object cxGridViewIMPORTENETO: TcxGridDBColumn [8]
         Caption = 'Importe neto'
         DataBinding.ValueType = 'Currency'
         PropertiesClassName = 'TcxCurrencyEditProperties'
@@ -121,8 +123,8 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
         HeaderAlignmentHorz = taRightJustify
         Options.Editing = False
       end
-      object cxGridViewIMPORTEPORTE: TcxGridDBColumn [8]
-        Caption = 'Importe porte'
+      object cxGridViewIMPORTEPORTE: TcxGridDBColumn [9]
+        Caption = 'Porte unidad'
         DataBinding.FieldName = 'IMPORTE_PORTE'
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Properties.Alignment.Horz = taRightJustify
@@ -133,11 +135,8 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
     end
   end
   inherited TBXDock1: TTBXDock
-    Top = 73
-    Width = 451
-    inherited TBXToolbar1: TTBXToolbar
-      ExplicitWidth = 451
-    end
+    Top = 95
+    ExplicitTop = 68
   end
   inherited ActionListContenido: TActionList
     inherited actAnadir: TAction
diff --git a/Source/GUIBase/uViewGrid.dfm b/Source/GUIBase/uViewGrid.dfm
index 2221260d..54eb045b 100644
--- a/Source/GUIBase/uViewGrid.dfm
+++ b/Source/GUIBase/uViewGrid.dfm
@@ -1,13 +1,13 @@
 inherited frViewGrid: TfrViewGrid
   Width = 554
-  Height = 594
+  Height = 399
   ExplicitWidth = 554
-  ExplicitHeight = 594
+  ExplicitHeight = 399
   object cxGrid: TcxGrid [0]
     Left = 0
     Top = 102
     Width = 554
-    Height = 466
+    Height = 271
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -43,8 +43,8 @@ inherited frViewGrid: TfrViewGrid
       OptionsView.ColumnAutoWidth = True
       OptionsView.DataRowHeight = 22
       OptionsView.Footer = True
-      OptionsView.GridLineColor = clHighlight
-      OptionsView.GridLines = glHorizontal
+      OptionsView.GridLineColor = cl3DLight
+      OptionsView.GridLines = glNone
       OptionsView.GroupByBox = False
       OptionsView.HeaderEndEllipsis = True
       Styles.Inactive = cxStyleSelection
@@ -70,19 +70,9 @@ inherited frViewGrid: TfrViewGrid
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 554
         ExplicitWidth = 554
-        inherited txtFiltroTodo: TcxTextEdit
-          ExplicitWidth = 273
-          Width = 273
-        end
-        inherited edtFechaIniFiltro: TcxDateEdit
-          ExplicitWidth = 121
-          Width = 121
-        end
         inherited edtFechaFinFiltro: TcxDateEdit
-          Left = 344
-          ExplicitLeft = 344
-          ExplicitWidth = 121
-          Width = 121
+          Left = 343
+          ExplicitLeft = 343
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
@@ -97,7 +87,7 @@ inherited frViewGrid: TfrViewGrid
   end
   object pnlAgrupaciones: TTBXDockablePanel
     Left = 0
-    Top = 568
+    Top = 373
     MinClientHeight = 8
     Align = alBottom
     Caption = 'pnlAgrupaciones'
@@ -107,7 +97,6 @@ inherited frViewGrid: TfrViewGrid
     SupportedDocks = [dkStandardDock, dkMultiDock]
     TabOrder = 2
     Visible = False
-    ExplicitWidth = 128
     object TBXAlignmentPanel1: TTBXAlignmentPanel
       Left = 0
       Top = 0
@@ -155,7 +144,7 @@ inherited frViewGrid: TfrViewGrid
       PrinterPage.ScaleMode = smFit
       PrinterPage._dxMeasurementUnits_ = 0
       PrinterPage._dxLastMU_ = 2
-      ReportDocument.CreationDate = 39443.818585243050000000
+      ReportDocument.CreationDate = 39455.775459884260000000
       StyleManager = dxPrintStyleManager1
       OptionsCards.Shadow.Depth = 0
       OptionsExpanding.ExpandGroupRows = True
@@ -188,30 +177,42 @@ inherited frViewGrid: TfrViewGrid
     Left = 296
     Top = 128
     PixelsPerInch = 96
-    object cxStyleEven: TcxStyle
-    end
-    object cxStyleOdd: TcxStyle
-      AssignedValues = [svColor]
-      Color = clInactiveCaptionText
-    end
     object cxStyleSelection: TcxStyle
       AssignedValues = [svColor, svTextColor]
       Color = clHighlight
       TextColor = clHighlightText
     end
-    object cxStyleSinOrden: TcxStyle
-    end
-    object cxStyleConOrden: TcxStyle
+    object cxStyle_NORMAL_PAR: TcxStyle
       AssignedValues = [svColor]
-      Color = 16119285
+      Color = 552923887
     end
-    object cxStyleFiltered: TcxStyle
+    object cxStyle_NORMAL_IMPAR: TcxStyle
       AssignedValues = [svColor]
-      Color = clInfoBk
+      Color = clWindow
     end
-    object cxStyleFilteredConOrden: TcxStyle
+    object cxStyle_ORDENADO_PAR: TcxStyle
       AssignedValues = [svColor]
-      Color = 14546175
+      Color = 15131873
+    end
+    object cxStyle_ORDENADO_IMPAR: TcxStyle
+      AssignedValues = [svColor]
+      Color = 16052975
+    end
+    object cxStyle_FILTRADO_PAR: TcxStyle
+      AssignedValues = [svColor]
+      Color = 546166271
+    end
+    object cxStyle_FILTRADO_IMPAR: TcxStyle
+      AssignedValues = [svColor]
+      Color = 549513214
+    end
+    object cxStyle_FILTRADO_ORDENADO_PAR: TcxStyle
+      AssignedValues = [svColor]
+      Color = 545771513
+    end
+    object cxStyle_FILTRADO_ORDENADO_IMPAR: TcxStyle
+      AssignedValues = [svColor]
+      Color = 549249528
     end
   end
   object cxViewGridPopupMenu: TcxGridPopupMenu
diff --git a/Source/GUIBase/uViewGrid.pas b/Source/GUIBase/uViewGrid.pas
index 18cc7131..636cfdb1 100644
--- a/Source/GUIBase/uViewGrid.pas
+++ b/Source/GUIBase/uViewGrid.pas
@@ -36,15 +36,9 @@ type
     dxComponentPrinter: TdxComponentPrinter;
     dxPSEngineController1: TdxPSEngineController;
     cxStyleRepository1: TcxStyleRepository;
-    cxStyleEven: TcxStyle;
-    cxStyleOdd: TcxStyle;
     cxStyleSelection: TcxStyle;
-    cxStyleSinOrden: TcxStyle;
-    cxStyleConOrden: TcxStyle;
     cxViewGridPopupMenu: TcxGridPopupMenu;
     dxComponentPrinterLink: TdxGridReportLink;
-    cxStyleFiltered: TcxStyle;
-    cxStyleFilteredConOrden: TcxStyle;
     frViewFiltroBase1: TfrViewFiltroBase;
     ActionList1: TActionList;
     PngImageList10: TPngImageList;
@@ -61,6 +55,14 @@ type
     cxStyleSelectionInforme: TcxStyle;
     dxPrintStyleManager1: TdxPrintStyleManager;
     dxPrintStyleManager1Style1: TdxPSPrintStyle;
+    cxStyle_NORMAL_PAR: TcxStyle;
+    cxStyle_NORMAL_IMPAR: TcxStyle;
+    cxStyle_ORDENADO_PAR: TcxStyle;
+    cxStyle_ORDENADO_IMPAR: TcxStyle;
+    cxStyle_FILTRADO_PAR: TcxStyle;
+    cxStyle_FILTRADO_IMPAR: TcxStyle;
+    cxStyle_FILTRADO_ORDENADO_PAR: TcxStyle;
+    cxStyle_FILTRADO_ORDENADO_IMPAR: TcxStyle;
     procedure cxGridViewStylesGetContentStyle(
       Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
       AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
@@ -71,7 +73,6 @@ type
     function GetGrid : TcxGrid; override;
     function GetFocusedView : TcxGridDBTableView; override;
     procedure SetPopupMenu(const Value: TPopupMenu); override;
-    procedure FilterChanged(Sender : TObject); override;
     procedure OnChangeValoresFiltro(Sender: TObject);
     procedure SetViewFiltros(const Value: IViewFiltroBase); override;
     function AddFilterGrid(const Operacion: tcxFilterBoolOperatorKind): TcxFilterCriteriaItemList;
@@ -86,7 +87,7 @@ type
 implementation
 
 uses
-  uDMBase, uDBSelectionListUtils;
+  uDMBase, uDBSelectionListUtils, dxOffice11;
 
 {$R *.dfm}
 
@@ -188,12 +189,33 @@ begin
   inherited;
   if Assigned(AItem) then
   begin
-    if AItem.SortOrder = soNone then
-      AStyle := cxStyleSinOrden
-    else begin
-      AStyle := cxStyleConOrden;
-      if Filtered then
-        AStyle := cxStyleFilteredConOrden;
+    if Odd(ARecord.Index) then
+      AStyle := cxStyle_NORMAL_PAR
+    else
+      AStyle := cxStyle_NORMAL_IMPAR;
+
+    if (AItem.SortOrder <> soNone) then
+    begin
+      if Odd(ARecord.Index) then
+        AStyle := cxStyle_ORDENADO_PAR
+      else
+        AStyle := cxStyle_ORDENADO_IMPAR;
+    end;
+
+    if Filtered then
+    begin
+      if Odd(ARecord.Index) then
+        AStyle := cxStyle_FILTRADO_PAR
+      else
+        AStyle := cxStyle_FILTRADO_IMPAR;
+
+      if (AItem.SortOrder <> soNone) then
+      begin
+        if Odd(ARecord.Index) then
+          AStyle := cxStyle_FILTRADO_ORDENADO_PAR
+        else
+          AStyle := cxStyle_FILTRADO_ORDENADO_IMPAR;
+      end;
     end;
   end;
 end;
@@ -209,14 +231,5 @@ begin
   Result := not (cxGridView.Controller.FocusedRecord is TcxGridGroupRow);
 end;
 
-procedure TfrViewGrid.FilterChanged(Sender: TObject);
-begin
-  inherited;
-  if Filtered then
-    _FocusedView.Styles.Content := cxStyleFiltered
-  else
-    _FocusedView.Styles.Content := nil;
-end;
-
 end.
 
diff --git a/Source/Modulos/Articulos/Views/Articulos_view.dproj b/Source/Modulos/Articulos/Views/Articulos_view.dproj
index d1560b90..98437d09 100644
--- a/Source/Modulos/Articulos/Views/Articulos_view.dproj
+++ b/Source/Modulos/Articulos/Views/Articulos_view.dproj
@@ -54,11 +54,12 @@
     <DelphiCompile Include="Articulos_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="Articulos_controller.dcp" />
-    <DCCReference Include="Articulos_model.dcp" />
-    <DCCReference Include="Contactos_view.dcp" />
-    <DCCReference Include="Familias_controller.dcp" />
-    <DCCReference Include="GUIBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Articulos_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Articulos_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_view.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Familias_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\UnidadesMedida_controller.dcp" />
     <DCCReference Include="uArticulosViewRegister.pas" />
     <DCCReference Include="uEditorArticulo.pas">
       <Form>fEditorArticulo</Form>
@@ -72,7 +73,6 @@
       <Form>fEditorElegirArticulos</Form>
       <DesignClass>TfEditorElegirArticulos</DesignClass>
     </DCCReference>
-    <DCCReference Include="UnidadesMedida_controller.dcp" />
     <DCCReference Include="uViewArticulo.pas">
       <Form>frViewArticulo</Form>
       <DesignClass>TFrame</DesignClass>
@@ -89,7 +89,7 @@
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
-EurekaLog Version=6006
+EurekaLog Version=6011
 Activate=0
 Activate Handle=1
 Save Log File=1
diff --git a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
index 07133061..a3b96261 100644
--- a/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uViewDetallesArticulos.dfm
@@ -1,16 +1,103 @@
 inherited frViewDetallesArticulos: TfrViewDetallesArticulos
   ParentBiDiMode = False
   OnShow = CustomViewShow
+  inherited ToolBar1: TToolBar
+    Height = 95
+    ExplicitHeight = 95
+    inherited ToolButton13: TToolButton [3]
+      Left = 0
+      Top = 0
+      Wrap = True
+      ExplicitLeft = 0
+    end
+    inherited ToolButton4: TToolButton [4]
+      Top = 30
+    end
+    inherited ToolButton8: TToolButton [5]
+      Left = 56
+      Top = 30
+      ExplicitLeft = 56
+      ExplicitTop = 30
+    end
+    inherited ToolButton9: TToolButton [6]
+      Left = 139
+      Top = 30
+      ExplicitLeft = 139
+      ExplicitTop = 30
+    end
+    inherited ToolButton14: TToolButton [7]
+      Left = 284
+      Top = 30
+      ExplicitLeft = 284
+      ExplicitTop = 30
+    end
+    inherited ToolButton6: TToolButton [8]
+      Left = 0
+      Top = 52
+      ExplicitLeft = 0
+      ExplicitTop = 52
+    end
+    inherited FontName: TJvFontComboBox [9]
+      Left = 66
+      Top = 52
+      ExplicitLeft = 66
+      ExplicitTop = 52
+    end
+    inherited ToolButton7: TToolButton
+      Left = 211
+      Top = 52
+      Wrap = True
+      ExplicitLeft = 211
+      ExplicitTop = 52
+    end
+    inherited ToolButton11: TToolButton [11]
+      Left = 0
+      Top = 74
+      ExplicitLeft = 0
+      ExplicitTop = 74
+    end
+    inherited ToolButton12: TToolButton
+      Left = 141
+      Top = 74
+      ExplicitLeft = 141
+      ExplicitTop = 74
+    end
+    inherited FontSize: TEdit [13]
+      Left = 149
+      Top = 74
+      Width = 42
+      ExplicitLeft = 149
+      ExplicitTop = 74
+      ExplicitWidth = 42
+    end
+    inherited UpDown1: TUpDown [14]
+      Left = 191
+      Top = 74
+      Width = 17
+      ExplicitLeft = 191
+      ExplicitTop = 74
+      ExplicitWidth = 17
+    end
+    inherited ToolButton10: TToolButton [15]
+      Left = 208
+      Top = 74
+      ExplicitLeft = 208
+      ExplicitTop = 74
+    end
+  end
   inherited cxGrid: TcxGrid
+    Top = 121
+    Height = 183
+    ExplicitTop = 99
+    ExplicitHeight = 205
     inherited cxGridView: TcxGridDBTableView
-      OptionsSelection.HideFocusRectOnExit = False
-      OptionsView.ShowEditButtons = gsebForFocusedRecord
-      object cxGridViewID_ARTICULO: TcxGridDBColumn [3]
+      object cxGridViewID_ARTICULO: TcxGridDBColumn [4]
         DataBinding.FieldName = 'ID_ARTICULO'
         Visible = False
+        VisibleForCustomization = False
         Width = 31
       end
-      object cxGridViewREFERENCIA: TcxGridDBColumn [4]
+      object cxGridViewREFERENCIA: TcxGridDBColumn [5]
         Caption = 'Referencia'
         DataBinding.FieldName = 'REFERENCIA'
         PropertiesClassName = 'TcxButtonEditProperties'
@@ -22,7 +109,7 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
         Properties.OnButtonClick = cxGridViewREFERENCIAPropertiesButtonClick
         Width = 59
       end
-      object cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn [5]
+      object cxGridViewREFERENCIA_PROVEEDOR: TcxGridDBColumn [6]
         Caption = 'Ref. proveedor'
         DataBinding.FieldName = 'REFERENCIA_PROVEEDOR'
         PropertiesClassName = 'TcxTextEditProperties'
@@ -49,13 +136,16 @@ inherited frViewDetallesArticulos: TfrViewDetallesArticulos
         Width = 25
       end
       inherited cxGridViewIMPORTEPORTE: TcxGridDBColumn
-        Caption = 'Porte unidad'
       end
       inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn
         Width = 50
       end
     end
   end
+  inherited TBXDock1: TTBXDock
+    Top = 95
+    ExplicitTop = 68
+  end
   inherited ActionListContenido: TActionList
     object actAnadirArticulos: TAction [12]
       Category = 'Operaciones'
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj
index 3db193a2..f188c8db 100644
--- a/Source/Modulos/Contactos/Views/Contactos_view.dproj
+++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj
@@ -49,18 +49,18 @@
     <DelphiCompile Include="Contactos_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\ApplicationBase.dcp" />
-    <DCCReference Include="..\Base.dcp" />
-    <DCCReference Include="..\Contactos_controller.dcp" />
-    <DCCReference Include="..\Contactos_model.dcp" />
-    <DCCReference Include="..\FormasPago_controller.dcp" />
-    <DCCReference Include="..\FormasPago_model.dcp" />
-    <DCCReference Include="..\GUIBase.dcp" />
-    <DCCReference Include="..\JvGlobusD11R.dcp" />
-    <DCCReference Include="..\rtl.dcp" />
-    <DCCReference Include="..\TiposIVA_controller.dcp" />
-    <DCCReference Include="..\TiposIVA_model.dcp" />
-    <DCCReference Include="..\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\ApplicationBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\FormasPago_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvGlobusD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\TiposIVA_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
     <DCCReference Include="uContactosViewRegister.pas" />
     <DCCReference Include="uEditorCliente.pas">
       <Form>fEditorCliente</Form>
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.res b/Source/Modulos/Contactos/Views/Contactos_view.res
index 1641339fcc482e7e3492d1b45813a86619622c33..8b251f312bcccec5485024f6fe8d80e1cdf25746 100644
GIT binary patch
delta 11
ScmeBCZD5|Duvteife`=|>;pCc

literal 4748
zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg
zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?<w4U-ol;S2jC7
zx4(byej2@_#)0HWvg0i^wC4Xli+W*aXJ^(njceK|Kb@c3qFNX>p${kR>3GhM`oH*q
zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W
zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7
z{BT%G%irdMe*|oDJmgvJ<ltI;x5J<Oc>aA2`9B<Z5Toyra?r{a4$fnJHGXo6Pmcq8
z{JGCD500t1h4|yI?-f&xoj9;YT&Ch&JLO*X#NC3sCI0Xmc<f_vh`jn-1E!?th$%QM
znzGM|)$vl3f7;nE+9qR}|A?C$H3K&BFdq9?uxrIqHIne#5?8G@da2ybWLGKA686M2
z*LJMMMk4<U`dzFC9}HrSxLfOGll{P#??xir)$c2}C;ql+y-&Wa(LP{PgPk1E1@{uR
zIMCNz;u9;r(axhQvEx%?i#p<Vn=Z!SK%f10?4_`0@RY8lXRM3(t(nFSzJ$4kJr6&x
ze)~B%biu*TY$HDstHD=|UGxJceYiUQQa0Gu(p3og@%ZJ><6Xi*?M~Q;)@Sbfwf3uf
zVaWkbU<NjR3%=~AdoZbkXp`f@b0%GBT^$^V5e(n|#O(?P)hBbF)4n%2cw6U#adPM!
zz(!`V|Bfl{aH0)Y&w;SK7R4<z{p;Gwz1D%l86L3ZFZQ&=pB$<&esXT|OZ?=AGaWoe
z{>jU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv
zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N|
z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc
z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0
zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38=
zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W
zVvPDBKHh;i=RU4J_ta3E;)M<P+=2X7;VbzliQZ=IHV#+fr#{!(ukt%UJMS8=332qg
z7jD)rSbpCW+^j*cd6LUEe8#9n&v!NEJM(@?SHvB$=h@|)fjw|&qD?NQ5A&R>n>Y+L
zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m
z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJu<OVP
zzHjp+hnwo*3NQE$JTA(agu~silV5T`du+GJgWGi_7mAy`Nk8fLt~%GF$;XXcE-ri?
zyIglyyzA`K-);4Eem2MZm07RBza@W3UP)d`Rz=RFk-I);`s{$L%yyBNX0OTjo5Gk0
zs}g44uXg*l%xo^{`#0=kd*2?}Cz22Bv2;Gu?;3o~(D#gk1OKYQSCAb$(&vu@_pvWO
z>gbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T
z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC
zy(^m((;DnQmDQ<zX+PK(Lfu@ox#mOnbZjSDl}IBqv$qwK+2@))5$ba>Katmw!@c`|
G?EMQ&4NnpP

diff --git a/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm b/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm
index dee2f041..42793c6e 100644
--- a/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorEmpleados.dfm
@@ -127,6 +127,10 @@ inherited fEditorEmpleados: TfEditorEmpleados
           end
         end
       end
+      inherited PngImageList: TPngImageList
+        Left = 392
+        Top = 64
+      end
     end
     inherited pnlAgrupaciones: TTBXDockablePanel
       Top = 297
@@ -161,40 +165,8 @@ inherited fEditorEmpleados: TfEditorEmpleados
       end
     end
     inherited PngImageList: TPngImageList
-      PngImages = <
-        item
-          PngImage.Data = {
-            89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
-            61000000097048597300000AC400000AC401666D82D4000002B84944415478DA
-            7DD25B4814511807F06FD61DC79DBDB8177577D9B23B4B2E3D84F6500F3D2542
-            D20DE902F910FA105D84209F0C45A82048082A562C4DA3A4B21E7C0B12332168
-            438D7523D128D745DDCBAC7B9B9DD9B9CF342B289AAC7F989773BEEFC739F31D
-            445114C807411058CBCCDBA64600E9762A4D56C4E2197FE06FF46EE7C08C0F36
-            64BDEF7F60FAE5E56687C3F22C976335C954065692698827C8DC989F38DBF731
-            38B22DF0A6A546E7AEDE17C2755839C70B90CDD21026D2200A3C8457D8D9D61E
-            FF11B5942A0CB41FAB7539AC9F8A3445C0B0022C1234386C2630EA00E61608E5
-            DEE0AFBA60981A29088C3FAE6F4E64F95E4144C06A31817BA7191059049E6381
-            6618783838D5F4EAF3527F41C0E7AD6FD8E1B47FD0A2E8EA9A248A20A8C71738
-            0E588E55DA9F4F340FFB228581A1CEA3CE6AF7EE105A5CBC2AC8B2ACDE5F5845
-            489216CF748CD54653FC976DA730D973FA9DD9885F582DCA0352FE14027C9B5E
-            9EBDFAE4C7717539BE2DD0D752E33AE4B14F1A30D421AB7BF96B24D314DFDAEB
-            BF35F53BD35D708CF9E8DA5ED88CA4CB8BEF92CF77C9FD8811D4374023D026D5
-            294CE2800FA102D788D777A6373EA875C0D4D167290D5ABE32065755AECC0937
-            ABE6A1D16381813F08780336D027A250925ECE2AECF773E1F7F747B700FB2FF5
-            3E15A5F21B94D50E399B034AAC18347810E89F33813699528108E02A82318B8B
-            11DF83C3742C94D8041C3CE90D7158792563B3036D2A03CE640111D783866501
-            A349C05304E049F54BC5202E8F5E8C8F0D0D6D023C271ECD8BA8654FAE34DF6C
-            05DE6804495B0C1AF527A25416302A05783A01BA4C1C086EFC7A7462B87B13E0
-            3ED57E45614ABB6483DDCA636644D0E901B45A005E02AD40032690A0A5E33C9F
-            9909ACCC0D379189D8CF2D53309BCD658273AF1BAD705582466F4064492329AC
-            20F15C0E2882449716226A5930AD66ADE71FDF3497F05E932988000000004945
-            4E44AE426082}
-          Name = 'PngImage0'
-          Background = clWindow
-        end>
       Left = 224
       Top = 128
-      Bitmap = {}
     end
   end
   inherited EditorActionList: TActionList [4]
diff --git a/Source/Modulos/Contactos/Views/uViewClientes.dfm b/Source/Modulos/Contactos/Views/uViewClientes.dfm
index 7eeeabb0..c6167b59 100644
--- a/Source/Modulos/Contactos/Views/uViewClientes.dfm
+++ b/Source/Modulos/Contactos/Views/uViewClientes.dfm
@@ -67,14 +67,6 @@ inherited frViewClientes: TfrViewClientes
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 793
         ExplicitWidth = 793
-        inherited txtFiltroTodo: TcxTextEdit
-          ExplicitWidth = 273
-          Width = 273
-        end
-        inherited edtFechaIniFiltro: TcxDateEdit
-          ExplicitWidth = 121
-          Width = 121
-        end
         inherited edtFechaFinFiltro: TcxDateEdit
           Left = 335
           ExplicitLeft = 335
@@ -295,8 +287,8 @@ inherited frViewClientes: TfrViewClientes
         Name = 'PngImage2'
         Background = clWindow
       end>
-    Left = 64
-    Top = 48
+    Left = 104
+    Top = 168
     Bitmap = {}
   end
 end
diff --git a/Source/Modulos/Contactos/Views/uViewClientes.pas b/Source/Modulos/Contactos/Views/uViewClientes.pas
index ccc77b6b..66da7d4a 100644
--- a/Source/Modulos/Contactos/Views/uViewClientes.pas
+++ b/Source/Modulos/Contactos/Views/uViewClientes.pas
@@ -49,14 +49,14 @@ procedure TfrViewClientes.cxGridViewCODIGOCustomDrawCell(
 var
   R : TRect;
 begin
-  inherited;
+  //inherited; <- No llamamos al padre porque queremos hacer tratamiento especial
   R := AViewInfo.ContentBounds;
   ACanvas.FillRect(R);
   if (cxGridView.DataController.DisplayTexts[AViewInfo.GridRecord.RecordIndex,
     cxGridViewBLOQUEADO.Index] = '1') then
-    ACanvas.DrawImage(PngImageList, R.Left, R.Top, 1)
+    ACanvas.DrawImage(PngImageList, R.Left + 2, R.Top + 2, 1)
   else
-    ACanvas.DrawImage(PngImageList, R.Left, R.Top, 0);
+    ACanvas.DrawImage(PngImageList, R.Left + 2, R.Top + 2, 0);
   ADone := True;
 end;
 
diff --git a/Source/Modulos/Contactos/Views/uViewContactos.dfm b/Source/Modulos/Contactos/Views/uViewContactos.dfm
index 287269d8..e39a6edd 100644
--- a/Source/Modulos/Contactos/Views/uViewContactos.dfm
+++ b/Source/Modulos/Contactos/Views/uViewContactos.dfm
@@ -98,9 +98,17 @@ inherited frViewContactos: TfrViewContactos
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 557
         ExplicitWidth = 557
+        inherited txtFiltroTodo: TcxTextEdit
+          ExplicitWidth = 273
+          Width = 273
+        end
+        inherited edtFechaIniFiltro: TcxDateEdit
+          ExplicitWidth = 121
+          Width = 121
+        end
         inherited edtFechaFinFiltro: TcxDateEdit
-          ExplicitWidth = 307
-          Width = 307
+          ExplicitWidth = 322
+          Width = 322
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
diff --git a/Source/Modulos/Contactos/Views/uViewContactos.pas b/Source/Modulos/Contactos/Views/uViewContactos.pas
index 23c43097..46d8f8bb 100644
--- a/Source/Modulos/Contactos/Views/uViewContactos.pas
+++ b/Source/Modulos/Contactos/Views/uViewContactos.pas
@@ -83,7 +83,7 @@ begin
   inherited;
   R := AViewInfo.ContentBounds;
   ACanvas.FillRect(R);
-  ACanvas.DrawImage(PngImageList, R.Left, R.Top, 0);
+  ACanvas.DrawImage(PngImageList, R.Left + 2, R.Top + 2, 0);
   ADone := True;
 end;
 
diff --git a/Source/Modulos/Contactos/Views/uViewEmpleados.dfm b/Source/Modulos/Contactos/Views/uViewEmpleados.dfm
index d80002e7..90056c8b 100644
--- a/Source/Modulos/Contactos/Views/uViewEmpleados.dfm
+++ b/Source/Modulos/Contactos/Views/uViewEmpleados.dfm
@@ -12,6 +12,7 @@ inherited frViewEmpleados: TfrViewEmpleados
         BestFitMaxWidth = 22
         MinWidth = 22
         Options.HorzSizing = False
+        VisibleForCustomization = False
         Width = 22
       end
       inherited cxGridViewNIF_CIF: TcxGridDBColumn
@@ -36,15 +37,14 @@ inherited frViewEmpleados: TfrViewEmpleados
           Width = 239
         end
         inherited edtFechaFinFiltro: TcxDateEdit
-          ExplicitWidth = 207
-          Width = 207
+          Left = 342
+          ExplicitLeft = 342
+          ExplicitWidth = 205
+          Width = 205
         end
       end
     end
   end
-  inherited pnlAgrupaciones: TTBXDockablePanel
-    ExplicitWidth = 128
-  end
   inherited dxComponentPrinter: TdxComponentPrinter
     inherited dxComponentPrinterLink: TdxGridReportLink
       ReportDocument.CreationDate = 39211.791248726860000000
@@ -56,4 +56,40 @@ inherited frViewEmpleados: TfrViewEmpleados
       BuiltInStyle = True
     end
   end
+  inherited PngImageList: TPngImageList
+    PngImages = <
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          61000000097048597300000AC400000AC401666D82D4000002B84944415478DA
+          7DD25B4814511807F06FD61DC79DBDB8177577D9B23B4B2E3D84F6500F3D2542
+          D20DE902F910FA105D84209F0C45A82048082A562C4DA3A4B21E7C0B12332168
+          438D7523D128D745DDCBAC7B9B9DD9B9CF342B289AAC7F989773BEEFC739F31D
+          445114C807411058CBCCDBA64600E9762A4D56C4E2197FE06FF46EE7C08C0F36
+          64BDEF7F60FAE5E56687C3F22C976335C954065692698827C8DC989F38DBF731
+          38B22DF0A6A546E7AEDE17C2755839C70B90CDD21026D2200A3C8457D8D9D61E
+          FF11B5942A0CB41FAB7539AC9F8A3445C0B0022C1234386C2630EA00E61608E5
+          DEE0AFBA60981A29088C3FAE6F4E64F95E4144C06A31817BA7191059049E6381
+          6618783838D5F4EAF3527F41C0E7AD6FD8E1B47FD0A2E8EA9A248A20A8C71738
+          0E588E55DA9F4F340FFB228581A1CEA3CE6AF7EE105A5CBC2AC8B2ACDE5F5845
+          489216CF748CD54653FC976DA730D973FA9DD9885F582DCA0352FE14027C9B5E
+          9EBDFAE4C7717539BE2DD0D752E33AE4B14F1A30D421AB7BF96B24D314DFDAEB
+          BF35F53BD35D708CF9E8DA5ED88CA4CB8BEF92CF77C9FD8811D4374023D026D5
+          294CE2800FA102D788D777A6373EA875C0D4D167290D5ABE32065755AECC0937
+          ABE6A1D16381813F08780336D027A250925ECE2AECF773E1F7F747B700FB2FF5
+          3E15A5F21B94D50E399B034AAC18347810E89F33813699528108E02A82318B8B
+          11DF83C3742C94D8041C3CE90D7158792563B3036D2A03CE640111D783866501
+          A349C05304E049F54BC5202E8F5E8C8F0D0D6D023C271ECD8BA8654FAE34DF6C
+          05DE6804495B0C1AF527A25416302A05783A01BA4C1C086EFC7A7462B87B13E0
+          3ED57E45614ABB6483DDCA636644D0E901B45A005E02AD40032690A0A5E33C9F
+          9909ACCC0D379189D8CF2D53309BCD658273AF1BAD705582466F4064492329AC
+          20F15C0E2882449716226A5930AD66ADE71FDF3497F05E932988000000004945
+          4E44AE426082}
+        Name = 'PngImage0'
+        Background = clWindow
+      end>
+    Left = 296
+    Top = 168
+    Bitmap = {}
+  end
 end
diff --git a/Source/Modulos/Contactos/Views/uViewProveedores.dfm b/Source/Modulos/Contactos/Views/uViewProveedores.dfm
index 94ac1ea1..76f5d9b9 100644
--- a/Source/Modulos/Contactos/Views/uViewProveedores.dfm
+++ b/Source/Modulos/Contactos/Views/uViewProveedores.dfm
@@ -37,6 +37,7 @@ inherited frViewProveedores: TfrViewProveedores
             ImageIndex = 1
             Value = 1
           end>
+        Visible = False
         BestFitMaxWidth = 22
         MinWidth = 22
         Options.HorzSizing = False
@@ -58,14 +59,6 @@ inherited frViewProveedores: TfrViewProveedores
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 483
         ExplicitWidth = 483
-        inherited txtFiltroTodo: TcxTextEdit
-          ExplicitWidth = 273
-          Width = 273
-        end
-        inherited edtFechaIniFiltro: TcxDateEdit
-          ExplicitWidth = 121
-          Width = 121
-        end
         inherited edtFechaFinFiltro: TcxDateEdit
           Left = 234
           ExplicitLeft = 234
diff --git a/Source/Modulos/Contactos/Views/uViewProveedores.pas b/Source/Modulos/Contactos/Views/uViewProveedores.pas
index 89919c73..9b0c5b03 100644
--- a/Source/Modulos/Contactos/Views/uViewProveedores.pas
+++ b/Source/Modulos/Contactos/Views/uViewProveedores.pas
@@ -41,14 +41,14 @@ procedure TfrViewProveedores.cxGridViewCODIGOCustomDrawCell(
 var
   R : TRect;
 begin
-  inherited;
+  //inherited; <- No llamamos al padre porque queremos hacer tratamiento especial
   R := AViewInfo.ContentBounds;
   ACanvas.FillRect(R);
   if (cxGridView.DataController.DisplayTexts[AViewInfo.GridRecord.RecordIndex,
     cxGridViewHOMOLOGADO.Index] = '1') then
-    ACanvas.DrawImage(PngImageList, R.Left, R.Top, 2)
+    ACanvas.DrawImage(PngImageList, R.Left + 2, R.Top + 2, 2)
   else
-    ACanvas.DrawImage(PngImageList, R.Left, R.Top, 0);
+    ACanvas.DrawImage(PngImageList, R.Left + 2, R.Top + 2, 0);
   ADone := True;
 end;
 
@@ -60,7 +60,7 @@ procedure TfrViewProveedores.cxGridViewICONOGetCellHint(
 begin
   inherited;
   if (cxGridView.DataController.DisplayTexts[ARecord.Index, cxGridViewHOMOLOGADO.Index] = '1') then
-    AHintText := 'Proveedor homolado';
+    AHintText := 'Proveedor homologado';
 end;
 
 end.