diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj
index e2f96478..c079d2fd 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -57,20 +57,22 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="dbrtl.dcp" />
-    <DCCReference Include="dxBarD11.dcp" />
-    <DCCReference Include="dxBarExtItemsD11.dcp" />
-    <DCCReference Include="dxLayoutControlD11.dcp" />
-    <DCCReference Include="dxPScxCommonD11.dcp" />
-    <DCCReference Include="dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="dxPsPrVwAdvD11.dcp" />
-    <DCCReference Include="frx11.dcp" />
-    <DCCReference Include="frxe11.dcp" />
-    <DCCReference Include="fs11.dcp" />
-    <DCCReference Include="JvAppFrmD11R.dcp" />
-    <DCCReference Include="JvCtrlsD11R.dcp" />
-    <DCCReference Include="rtl.dcp" />
+    <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="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>
@@ -161,8 +163,6 @@
       <Form>frViewTotales</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
-    <DCCReference Include="vcl.dcp" />
-    <DCCReference Include="vcldb.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.res
index 8b251f31..1641339f 100644
Binary files a/Source/GUIBase/GUIBase.res and b/Source/GUIBase/GUIBase.res differ
diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm
index d24c6cfa..49917b1d 100644
--- a/Source/GUIBase/uViewDetallesBase.dfm
+++ b/Source/GUIBase/uViewDetallesBase.dfm
@@ -1,6 +1,6 @@
 inherited frViewDetallesBase: TfrViewDetallesBase
-  Width = 451
-  Height = 304
+  Width = 823
+  Height = 386
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -9,8 +9,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
   object ToolBar1: TToolBar
     Left = 0
     Top = 0
-    Width = 451
-    Height = 73
+    Width = 823
+    Height = 51
     AutoSize = True
     ButtonWidth = 141
     Caption = 'ToolBar1'
@@ -25,6 +25,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     TabOrder = 0
     Transparent = True
     Visible = False
+    ExplicitWidth = 451
+    ExplicitHeight = 73
     object ToolButton1: TToolButton
       Left = 0
       Top = 0
@@ -54,11 +56,10 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       Top = 0
       Action = FontEdit1
       AutoSize = True
-      Wrap = True
     end
     object FontName: TJvFontComboBox
-      Left = 0
-      Top = 22
+      Left = 305
+      Top = 0
       Width = 145
       Height = 22
       DroppedDownWidth = 145
@@ -73,8 +74,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       OnClick = FontNameChange
     end
     object FontSize: TEdit
-      Left = 145
-      Top = 22
+      Left = 450
+      Top = 0
       Width = 26
       Height = 22
       Hint = 'Font Size|Select font size'
@@ -84,8 +85,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       OnChange = FontSizeChange
     end
     object UpDown1: TUpDown
-      Left = 171
-      Top = 22
+      Left = 476
+      Top = 0
       Width = 16
       Height = 22
       Associate = FontSize
@@ -93,71 +94,75 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       Visible = False
     end
     object ToolButton13: TToolButton
-      Left = 187
-      Top = 22
+      Left = 0
+      Top = 0
       Width = 8
       Caption = 'ToolButton13'
       ImageIndex = 10
-      Style = tbsSeparator
-    end
-    object ToolButton6: TToolButton
-      Left = 195
-      Top = 22
-      Action = RichEditBold1
-      AutoSize = True
-    end
-    object ToolButton7: TToolButton
-      Left = 261
-      Top = 22
-      Action = RichEditItalic1
-      AutoSize = True
-    end
-    object ToolButton8: TToolButton
-      Left = 328
-      Top = 22
-      Action = RichEditUnderline1
-      AutoSize = True
-    end
-    object ToolButton12: TToolButton
-      Left = 0
-      Top = 22
-      Width = 8
-      Caption = 'ToolButton12'
-      ImageIndex = 10
       Wrap = True
       Style = tbsSeparator
     end
-    object ToolButton9: TToolButton
+    object ToolButton6: TToolButton
       Left = 0
-      Top = 52
+      Top = 30
+      Action = RichEditBold1
+      AutoSize = True
+    end
+    object ToolButton7: TToolButton
+      Left = 66
+      Top = 30
+      Action = RichEditItalic1
+      AutoSize = True
+    end
+    object ToolButton8: TToolButton
+      Left = 133
+      Top = 30
+      Action = RichEditUnderline1
+      AutoSize = True
+    end
+    object ToolButton12: TToolButton
+      Left = 216
+      Top = 30
+      Width = 8
+      Caption = 'ToolButton12'
+      ImageIndex = 10
+      Style = tbsSeparator
+    end
+    object ToolButton9: TToolButton
+      Left = 224
+      Top = 30
       Action = RichEditAlignLeft1
       AutoSize = True
     end
     object ToolButton10: TToolButton
-      Left = 145
-      Top = 52
+      Left = 369
+      Top = 30
       Action = RichEditAlignCenter1
       AutoSize = True
     end
     object ToolButton11: TToolButton
-      Left = 270
-      Top = 52
+      Left = 494
+      Top = 30
       Action = RichEditAlignRight1
       AutoSize = True
     end
   end
   object cxGrid: TcxGrid
     Left = 0
-    Top = 99
-    Width = 451
-    Height = 205
+    Top = 77
+    Width = 823
+    Height = 309
     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
+      OnCustomDrawCell = cxGridViewCustomDrawCell
       OnEditing = cxGridViewEditing
       OnEditKeyDown = cxGridViewEditKeyDown
       OnEditValueChanged = cxGridViewEditValueChanged
@@ -193,65 +198,29 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       OptionsView.CellAutoHeight = True
       OptionsView.ColumnAutoWidth = True
       OptionsView.GridLineColor = cl3DLight
+      OptionsView.GridLines = glVertical
       OptionsView.GroupByBox = False
       OptionsView.HeaderEndEllipsis = True
       OptionsView.Indicator = True
+      OptionsView.RowSeparatorColor = clGradientInactiveCaption
+      OptionsView.RowSeparatorWidth = 1
       Styles.OnGetContentStyle = cxGridViewStylesGetContentStyle
       object cxGridViewID: TcxGridDBColumn
         DataBinding.FieldName = 'ID'
         Visible = False
+        BestFitMaxWidth = 25
+        VisibleForCustomization = False
         Width = 25
       end
       object cxGridViewPOSICION: TcxGridDBColumn
         DataBinding.FieldName = 'POSICION'
         Visible = False
+        BestFitMaxWidth = 25
+        MinWidth = 50
         SortIndex = 0
         SortOrder = soAscending
-        Width = 25
-      end
-      object cxGridViewTIPO: TcxGridDBColumn
-        Caption = 'Tipo'
-        DataBinding.FieldName = 'TIPO_DETALLE'
-        PropertiesClassName = 'TcxImageComboBoxProperties'
-        Properties.ImmediatePost = True
-        Properties.Items = <>
-        BestFitMaxWidth = 64
-        Width = 35
-      end
-      object cxGridViewDESCRIPCION: TcxGridDBColumn
-        Caption = 'Concepto'
-        DataBinding.FieldName = 'CONCEPTO'
-        PropertiesClassName = 'TcxRichEditProperties'
-        Width = 317
-      end
-      object cxGridViewCANTIDAD: TcxGridDBColumn
-        Caption = 'Cantidad'
-        DataBinding.FieldName = 'CANTIDAD'
-        PropertiesClassName = 'TcxMaskEditProperties'
-        Properties.Alignment.Horz = taRightJustify
-        BestFitMaxWidth = 64
-        HeaderAlignmentHorz = taRightJustify
-        Width = 30
-      end
-      object cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
-        Caption = 'Importe unidad'
-        DataBinding.FieldName = 'IMPORTE_UNIDAD'
-        PropertiesClassName = 'TcxCurrencyEditProperties'
-        Properties.Alignment.Horz = taRightJustify
-        BestFitMaxWidth = 120
-        FooterAlignmentHorz = taRightJustify
-        HeaderAlignmentHorz = taRightJustify
-        Width = 60
-      end
-      object cxGridViewIMPORTETOTAL: TcxGridDBColumn
-        Caption = 'Importe total'
-        DataBinding.FieldName = 'IMPORTE_TOTAL'
-        PropertiesClassName = 'TcxCurrencyEditProperties'
-        Properties.Alignment.Horz = taRightJustify
-        BestFitMaxWidth = 120
-        HeaderAlignmentHorz = taRightJustify
-        Options.Editing = False
-        Width = 60
+        VisibleForCustomization = False
+        Width = 50
       end
       object cxGridViewVISIBLE: TcxGridDBColumn
         Caption = #191'Visible?'
@@ -295,10 +264,65 @@ inherited frViewDetallesBase: TfrViewDetallesBase
         Properties.NullStyle = nssUnchecked
         Properties.ValueChecked = 1
         Properties.ValueUnchecked = 0
-        Visible = False
+        BestFitMaxWidth = 25
         FooterAlignmentHorz = taCenter
         HeaderAlignmentHorz = taCenter
-        Width = 25
+        MinWidth = 50
+        Styles.Content = cxStyleColumnaTIPO
+        Width = 50
+      end
+      object cxGridViewTIPO: TcxGridDBColumn
+        Caption = 'Tipo'
+        DataBinding.FieldName = 'TIPO_DETALLE'
+        PropertiesClassName = 'TcxImageComboBoxProperties'
+        Properties.ImmediatePost = True
+        Properties.Items = <>
+        BestFitMaxWidth = 64
+        MinWidth = 50
+        Styles.Content = cxStyleColumnaTIPO
+        Width = 119
+      end
+      object cxGridViewDESCRIPCION: TcxGridDBColumn
+        Caption = 'Concepto'
+        DataBinding.FieldName = 'CONCEPTO'
+        PropertiesClassName = 'TcxRichEditProperties'
+        Options.CellMerging = True
+        Width = 237
+      end
+      object cxGridViewCANTIDAD: TcxGridDBColumn
+        Tag = 1
+        Caption = 'Cantidad'
+        DataBinding.FieldName = 'CANTIDAD'
+        PropertiesClassName = 'TcxMaskEditProperties'
+        Properties.Alignment.Horz = taRightJustify
+        BestFitMaxWidth = 64
+        HeaderAlignmentHorz = taRightJustify
+        MinWidth = 50
+        Width = 119
+      end
+      object cxGridViewIMPORTEUNIDAD: TcxGridDBColumn
+        Tag = 1
+        Caption = 'Importe unidad'
+        DataBinding.FieldName = 'IMPORTE_UNIDAD'
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.Alignment.Horz = taRightJustify
+        BestFitMaxWidth = 120
+        FooterAlignmentHorz = taRightJustify
+        HeaderAlignmentHorz = taRightJustify
+        MinWidth = 50
+        Width = 142
+      end
+      object cxGridViewIMPORTETOTAL: TcxGridDBColumn
+        Tag = 1
+        Caption = 'Importe total'
+        DataBinding.FieldName = 'IMPORTE_TOTAL'
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.Alignment.Horz = taRightJustify
+        BestFitMaxWidth = 120
+        HeaderAlignmentHorz = taRightJustify
+        MinWidth = 50
+        Options.Editing = False
+        Width = 142
       end
     end
     object cxGridLevel: TcxGridLevel
@@ -307,11 +331,13 @@ inherited frViewDetallesBase: TfrViewDetallesBase
   end
   object TBXDock1: TTBXDock
     Left = 0
-    Top = 73
-    Width = 451
+    Top = 51
+    Width = 823
     Height = 26
     BackgroundOnToolbars = False
     UseParentBackground = True
+    ExplicitTop = 73
+    ExplicitWidth = 451
     object TBXToolbar1: TTBXToolbar
       Left = 0
       Top = 0
@@ -376,8 +402,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
   end
   object ActionListContenido: TActionList
     Images = ContenidoImageList
-    Left = 8
-    Top = 104
+    Left = 40
+    Top = 136
     object actAnadir: TAction
       Category = 'Operaciones'
       Caption = 'A'#241'adir'
@@ -701,26 +727,16 @@ inherited frViewDetallesBase: TfrViewDetallesBase
   object cxStyleRepository: TcxStyleRepository
     Left = 8
     Top = 168
-    object cxStyle_IMPORTETOTAL: TcxStyle
-      AssignedValues = [svColor]
-      Color = clInactiveCaptionText
-    end
+    PixelsPerInch = 96
     object cxStyle_SUBTOTAL: TcxStyle
+    end
+    object cxStyle_TITULO: TcxStyle
+    end
+    object cxStyle_DESCUENTO: TcxStyle
+    end
+    object cxStyleColumnaTIPO: TcxStyle
       AssignedValues = [svColor]
       Color = cl3DLight
     end
-    object cxStyle_TITULO: TcxStyle
-      AssignedValues = [svColor, svFont]
-      Color = 7977877
-      Font.Charset = DEFAULT_CHARSET
-      Font.Color = clWindowText
-      Font.Height = -15
-      Font.Name = 'Tahoma'
-      Font.Style = [fsBold]
-    end
-    object cxStyle_DESCUENTO: TcxStyle
-      AssignedValues = [svTextColor]
-      TextColor = 7977877
-    end
   end
 end
diff --git a/Source/GUIBase/uViewDetallesBase.pas b/Source/GUIBase/uViewDetallesBase.pas
index b408651e..9c2ac63f 100644
--- a/Source/GUIBase/uViewDetallesBase.pas
+++ b/Source/GUIBase/uViewDetallesBase.pas
@@ -96,7 +96,6 @@ type
     TBXItem9: TTBXItem;
     TBXItem10: TTBXItem;
     TBXItem11: TTBXItem;
-    cxStyle_IMPORTETOTAL: TcxStyle;
     cxStyle_SUBTOTAL: TcxStyle;
     cxStyle_TITULO: TcxStyle;
     actAnchoAutomatico: TAction;
@@ -106,6 +105,7 @@ type
     actDetallesCortar: TAction;
     actDetallesCopiar: TAction;
     actDetallesPegar: TAction;
+    cxStyleColumnaTIPO: TcxStyle;
 
     procedure actAnadirExecute(Sender: TObject);
     procedure actEliminarExecute(Sender: TObject);
@@ -139,6 +139,9 @@ type
     procedure TBXItem13Click(Sender: TObject);
     procedure actAnchoAutomaticoExecute(Sender: TObject);
     procedure actAnchoAutomaticoUpdate(Sender: TObject);
+    procedure cxGridViewCustomDrawCell(Sender: TcxCustomGridTableView;
+      ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
+      var ADone: Boolean);
 
   private
     FController : IControllerDetallesBase;
@@ -187,7 +190,7 @@ implementation
 {$R *.dfm}
 
 uses
-  uCalculosUtils;
+  uDMBase, uCalculosUtils;
 
 function EnumFontsProc(var LogFont: TLogFont; var TextMetric: TTextMetric;
   FontType: Integer; Data: Pointer): Integer; stdcall;
@@ -330,6 +333,8 @@ begin
   inherited;
   CurEdit := Nil;
   FUpdating := False;
+//  cxGridView.OptionsView.RowSeparatorColor := dmBase.StyleManager.Colors.ButtonSeparatorColor;
+  
 end;
 
 procedure TfrViewDetallesBase.CustomViewDestroy(Sender: TObject);
@@ -338,6 +343,31 @@ begin
   CurEdit := Nil;
 end;
 
+procedure TfrViewDetallesBase.cxGridViewCustomDrawCell(
+  Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
+  AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+var
+  ATipo : String;
+begin
+  inherited;
+
+  ATipo := DarTipoConcepto(AViewInfo.GridRecord);
+  if (ATipo = TIPO_DETALLE_SUBTOTAL) and (AViewInfo.Item.Index <> cxGridViewTIPO.Index) then
+  begin
+      AViewInfo.EditViewInfo.Paint(ACanvas);
+      ACanvas.DrawComplexFrame(AViewInfo.Bounds, clBlack, clBlack, [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}
+  end;
+end;
+
 procedure TfrViewDetallesBase.cxGridViewEditing(Sender: TcxCustomGridTableView;
   AItem: TcxCustomGridTableItem; var AAllow: Boolean);
 begin
@@ -485,7 +515,7 @@ begin
   begin
     Result.Name := 'Tahoma';
     Result.Size := 9;
-    Result.Style := [];    
+    Result.Style := [];
   end;
 
   if ATipo = TIPO_DETALLE_TITULO then
diff --git a/Source/GUIBase/uViewDetallesDTO.dfm b/Source/GUIBase/uViewDetallesDTO.dfm
index 6d17930d..6df51d38 100644
--- a/Source/GUIBase/uViewDetallesDTO.dfm
+++ b/Source/GUIBase/uViewDetallesDTO.dfm
@@ -1,5 +1,9 @@
 inherited frViewDetallesDTO: TfrViewDetallesDTO
+  Width = 451
+  Height = 304
   inherited ToolBar1: TToolBar
+    Width = 451
+    Height = 73
     inherited ToolButton1: TToolButton
       ExplicitWidth = 109
     end
@@ -18,10 +22,82 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
     end
     inherited ToolButton14: TToolButton
       Left = 334
+      Wrap = True
       ExplicitLeft = 334
     end
+    inherited FontName: TJvFontComboBox
+      Left = 0
+      Top = 22
+      ExplicitLeft = 0
+      ExplicitTop = 22
+    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
+      Wrap = False
+      ExplicitLeft = 187
+      ExplicitTop = 22
+      ExplicitHeight = 22
+    end
+    inherited ToolButton6: TToolButton
+      Left = 195
+      Top = 22
+      ExplicitLeft = 195
+      ExplicitTop = 22
+    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
+      Left = 0
+      Top = 22
+      ExplicitLeft = 0
+      ExplicitTop = 22
+    end
+    inherited ToolButton9: TToolButton
+      Left = 0
+      Top = 52
+      ExplicitLeft = 0
+      ExplicitTop = 52
+    end
+    inherited ToolButton10: TToolButton
+      Left = 145
+      Top = 52
+      ExplicitLeft = 145
+      ExplicitTop = 52
+    end
+    inherited ToolButton11: TToolButton
+      Left = 270
+      Top = 52
+      ExplicitLeft = 270
+      ExplicitTop = 52
+    end
   end
   inherited cxGrid: TcxGrid
+    Top = 99
+    Width = 451
+    Height = 205
     inherited cxGridView: TcxGridDBTableView
       object cxGridViewDESCUENTO: TcxGridDBColumn [6]
         Caption = 'Dto'
@@ -51,10 +127,18 @@ inherited frViewDetallesDTO: TfrViewDetallesDTO
         PropertiesClassName = 'TcxCurrencyEditProperties'
         Properties.Alignment.Horz = taRightJustify
         Properties.EditFormat = ',0.00 '#8364';-,0.00 '#8364
+        Visible = False
         HeaderAlignmentHorz = taRightJustify
       end
     end
   end
+  inherited TBXDock1: TTBXDock
+    Top = 73
+    Width = 451
+    inherited TBXToolbar1: TTBXToolbar
+      ExplicitWidth = 451
+    end
+  end
   inherited ActionListContenido: TActionList
     inherited actAnadir: TAction
       Caption = 'A'#241'adir concepto'