From 8d090e5693e75cad2eff7ea91a4f0fa69cedee80 Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Thu, 9 Jul 2009 11:21:22 +0000
Subject: [PATCH] Se deja de usar JvWizardHeader

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@963 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 Source/Base/Base.res                          | Bin 4748 -> 384 bytes
 .../Views/AlbaranesCliente_view.dproj         |  40 +-
 .../Views/uEditorElegirAlbaranesCliente.dfm   |  89 ++-
 .../Views/uEditorElegirAlbaranesCliente.pas   |   9 +-
 .../uEditorElegirArticulosAlbaranCliente.dfm  |   1 -
 .../uEditorElegirArticulosAlbaranCliente.pas  |   4 +-
 .../Views/uEditorElegirAlbaranesProveedor.dfm |  77 +-
 .../Views/uEditorElegirAlbaranesProveedor.pas |   9 +-
 ...uEditorElegirArticulosAlbaranProveedor.dfm |   9 +
 ...uEditorElegirArticulosAlbaranProveedor.pas |   4 +-
 .../Views/uEditorElegirArticulos.dfm          |  86 ++-
 .../Views/uEditorElegirArticulos.pas          |   9 +-
 .../Views/uEditorExportacionNorma19.dfm       |  75 +-
 .../Views/uEditorExportacionNorma19.pas       |   5 +-
 .../Contactos/Views/uEditorElegirClientes.dfm | 155 ++--
 .../Contactos/Views/uEditorElegirClientes.pas |   9 +-
 .../Views/uEditorElegirDireccionEntrega.dfm   |  79 ++-
 .../Views/uEditorElegirDireccionEntrega.pas   |  15 +-
 .../Views/uEditorElegirPersonaContacto.dfm    |  79 ++-
 .../Views/uEditorElegirPersonaContacto.pas    |   9 +-
 .../Views/uEditorElegirProveedores.dfm        | 151 ++--
 .../Views/uEditorElegirProveedores.pas        |   9 +-
 .../Views/FacturasCliente_view.dproj          |  24 +-
 .../uEditorElegirArticulosFacturaCliente.pas  |   2 +-
 .../Views/uEditorElegirFacturasCliente.dfm    | 135 ++--
 .../Views/uEditorElegirFacturasCliente.pas    |   9 +-
 ...uEditorElegirArticulosFacturaProveedor.pas |   2 +-
 .../Views/uEditorElegirDomiciliacion.dfm      |   2 +-
 .../Model/schInventarioClient_Intf.pas        |   6 +-
 .../Views/uEditorElegirArticulosAlmacen.dfm   | 147 ++--
 .../Views/uEditorElegirArticulosAlmacen.pas   |   9 +-
 .../Views/uEditorElegirArticulosCatalogo.dfm  |  49 +-
 .../Views/uEditorElegirArticulosCatalogo.pas  |   2 +-
 .../uEditorElegirArticulosPedidoProveedor.pas |   2 +-
 .../Views/uEditorElegirPedidosProveedor.dfm   | 128 ++--
 .../Views/uEditorElegirPedidosProveedor.pas   |   9 +-
 .../uEditorElegirPersonaContactoPedido.dfm    |  12 +-
 .../Views/uEditorSituacionPedidoProveedor.dfm |  77 +-
 .../Views/uEditorSituacionPedidoProveedor.pas |   5 +-
 .../Views/PresupuestosCliente_view.dproj      |  48 +-
 ...ditorElegirArticulosPresupuestoCliente.pas |   2 +-
 .../uEditorElegirPresupuestosCliente.dfm      |  88 ++-
 .../uEditorElegirPresupuestosCliente.pas      |   9 +-
 .../Views/RecibosCliente_view.dproj           |  10 +-
 .../Views/uEditorElegirRecibosCliente.dfm     | 119 ++--
 .../Views/uEditorElegirRecibosCliente.pas     |   9 +-
 .../Views/uEditorElegirRecibosProveedor.dfm   |  75 +-
 .../Views/uEditorElegirRecibosProveedor.pas   |   9 +-
 Source/Servidor/FactuGES_Server.RES           | Bin 23208 -> 23200 bytes
 Source/Servidor/FactuGES_Server.dproj         | 664 +++++++++---------
 Source/Servidor/FactuGES_Server.rc            |   2 +-
 51 files changed, 1484 insertions(+), 1094 deletions(-)

diff --git a/Source/Base/Base.res b/Source/Base/Base.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/Albaranes de cliente/Views/AlbaranesCliente_view.dproj b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj
index 2c359702..04632836 100644
--- a/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj	
+++ b/Source/Modulos/Albaranes de cliente/Views/AlbaranesCliente_view.dproj	
@@ -43,30 +43,6 @@
     <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="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 Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
       <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl">File c:\archivos de programa\borland\delphi10\Bin\dclIntraweb_80_100.bpl not found</Excluded_Packages>
       <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclnet100.bpl">File c:\archivos de programa\borland\delphi10\Bin\dclnet100.bpl not found</Excluded_Packages>
       <Excluded_Packages Name="c:\archivos de programa\borland\delphi10\Bin\dclsoap100.bpl">File c:\archivos de programa\borland\delphi10\Bin\dclsoap100.bpl not found</Excluded_Packages>
@@ -78,14 +54,14 @@
     <DelphiCompile Include="AlbaranesCliente_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="AlbaranesCliente_controller.dcp" />
-    <DCCReference Include="AlbaranesCliente_model.dcp" />
-    <DCCReference Include="AlbCli_FacCli_relation.dcp" />
-    <DCCReference Include="Almacenes_controller.dcp" />
-    <DCCReference Include="ApplicationBase.dcp" />
-    <DCCReference Include="Articulos_view.dcp" />
-    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="GUIBase.dcp" />
+    <DCCReference Include="..\..\Albaranes de proveedor\AlbaranesCliente_controller.dcp" />
+    <DCCReference Include="..\..\Albaranes de proveedor\AlbaranesCliente_model.dcp" />
+    <DCCReference Include="..\..\Albaranes de proveedor\AlbCli_FacCli_relation.dcp" />
+    <DCCReference Include="..\..\Albaranes de proveedor\Almacenes_controller.dcp" />
+    <DCCReference Include="..\..\Albaranes de proveedor\ApplicationBase.dcp" />
+    <DCCReference Include="..\..\Albaranes de proveedor\Articulos_view.dcp" />
+    <DCCReference Include="..\..\Albaranes de proveedor\Base.dcp" />
+    <DCCReference Include="..\..\Albaranes de proveedor\GUIBase.dcp" />
     <DCCReference Include="uAlbaranesClienteViewRegister.pas" />
     <DCCReference Include="uEditorAlbaranCliente.pas">
       <Form>fEditorAlbaranCliente</Form>
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.dfm
index 74a439c0..aa60e0c6 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.dfm	
@@ -5,42 +5,12 @@ inherited fEditorElegirAlbaranesCliente: TfEditorElegirAlbaranesCliente
   ExplicitHeight = 538
   PixelsPerInch = 96
   TextHeight = 13
-  object JvgWizardHeader1: TJvgWizardHeader [0]
-    Left = 0
-    Top = 27
-    Width = 790
-    Height = 60
-    CaptionFont.Charset = DEFAULT_CHARSET
-    CaptionFont.Color = clWindowText
-    CaptionFont.Height = -11
-    CaptionFont.Name = 'Tahoma'
-    CaptionFont.Style = [fsBold]
-    CommentFont.Charset = DEFAULT_CHARSET
-    CommentFont.Color = clWindowText
-    CommentFont.Height = -11
-    CommentFont.Name = 'Tahoma'
-    CommentFont.Style = []
-    SymbolFont.Charset = DEFAULT_CHARSET
-    SymbolFont.Color = clHighlightText
-    SymbolFont.Height = -35
-    SymbolFont.Name = 'Wingdings'
-    SymbolFont.Style = [fsBold]
-    Captions.Strings = (
-      'Seleccione el albar'#225'n de cliente')
-    Comments.Strings = (
-      ' ')
-    Gradient.FromColor = clHighlight
-    Gradient.ToColor = clWindow
-    Gradient.Active = False
-    Gradient.Orientation = fgdVertical
-    BufferedDraw = False
-    ExplicitLeft = -8
-    ExplicitTop = 8
-    ExplicitWidth = 656
-  end
   inherited JvNavPanelHeader: TJvNavPanelHeader
+    Top = 139
     Width = 790
     Visible = False
+    ExplicitLeft = -8
+    ExplicitTop = 280
     ExplicitWidth = 790
     inherited Image1: TImage
       Left = 763
@@ -48,9 +18,9 @@ inherited fEditorElegirAlbaranesCliente: TfEditorElegirAlbaranesCliente
     end
   end
   inherited TBXDock: TTBXDock
-    Top = 87
+    Top = 64
     Width = 790
-    ExplicitTop = 87
+    ExplicitTop = 91
     ExplicitWidth = 790
     inherited tbxMain: TTBXToolbar
       Left = 359
@@ -125,6 +95,55 @@ inherited fEditorElegirAlbaranesCliente: TfEditorElegirAlbaranesCliente
     Width = 790
     ExplicitWidth = 790
   end
+  object pnlHeader: TPanel [3]
+    Left = 0
+    Top = 0
+    Width = 790
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
+    TabOrder = 4
+    ExplicitTop = 27
+    object lblTitle: TLabel
+      AlignWithMargins = True
+      Left = 25
+      Top = 8
+      Width = 740
+      Height = 13
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 8
+      Align = alTop
+      Caption = 'Seleccione el albar'#225'n de cliente'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      ExplicitWidth = 177
+    end
+    object lblComments: TLabel
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 715
+      Height = 24
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
+    end
+  end
   inline frViewBarraSeleccion1: TfrViewBarraSeleccion [4]
     Left = 0
     Top = 449
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.pas
index 2a10b6a0..979854e8 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirAlbaranesCliente.pas	
@@ -9,14 +9,15 @@ uses
   ActnList, uCustomView, uViewBase, uViewGridBase, uViewGrid,
   uViewAlbaranesCliente, ComCtrls, TB2ExtItems, TBXExtItems, TBX,
   TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent,
-  JvNavigationPane, uViewBarraSeleccion, JvgWizardHeader, StdCtrls,
+  JvNavigationPane, uViewBarraSeleccion, StdCtrls,
   uEditorAlbaranesCliente, uBizAlbaranesCliente, uIEditorElegirAlbaranesCliente,
   JvExComCtrls, JvStatusBar, JSDialog, uDAInterfaces;
 
 type
   TfEditorElegirAlbaranesCliente = class(TfEditorAlbaranesCliente, IEditorElegirAlbaranesCliente)
     frViewBarraSeleccion1: TfrViewBarraSeleccion;
-    JvgWizardHeader1: TJvgWizardHeader;
+    lblTitle: TLabel;
+    lblComments: TLabel;
     EditorSeleccionActionList: TActionList;
     actBuscar2: TAction;
     actQuitarFiltro2: TAction;
@@ -97,12 +98,12 @@ end;
 
 function TfEditorElegirAlbaranesCliente.GetMensaje: String;
 begin
-  Result := JvgWizardHeader1.Comments.Text;
+  Result := lblComments.Caption;
 end;
 
 procedure TfEditorElegirAlbaranesCliente.SetMensaje(const AValue: String);
 begin
-  JvgWizardHeader1.Comments.Text := AValue;
+  lblComments.Caption := AValue;
 end;
 
 procedure TfEditorElegirAlbaranesCliente.SetViewGrid(const Value: IViewGridBase);
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirArticulosAlbaranCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirArticulosAlbaranCliente.dfm
index cd358ae6..b42d7312 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirArticulosAlbaranCliente.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirArticulosAlbaranCliente.dfm	
@@ -1,6 +1,5 @@
 inherited fEditorElegirArticulosAlbaranCliente: TfEditorElegirArticulosAlbaranCliente
   Caption = 'fEditorElegirArticulosAlbaranCliente'
-  ExplicitHeight = 478
   PixelsPerInch = 96
   TextHeight = 13
 end
diff --git a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirArticulosAlbaranCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirArticulosAlbaranCliente.pas
index 562c8edb..cec09f78 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uEditorElegirArticulosAlbaranCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Views/uEditorElegirArticulosAlbaranCliente.pas	
@@ -9,8 +9,8 @@ uses
   StdActns, ActnList, uCustomView, uViewBase, uViewBarraSeleccion, ComCtrls,
   JvExComCtrls, JvStatusBar, TBX, TB2ExtItems, TBXExtItems, TB2Item, TB2Dock,
   TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane,
-  JvgWizardHeader, uIEditorElegirArticulosAlbaranesCliente, uDAInterfaces,
-  uViewGridBase, uViewGrid, uViewArticulos;
+  uIEditorElegirArticulosAlbaranesCliente, uDAInterfaces,
+  uViewGridBase, uViewGrid, uViewArticulos, StdCtrls;
 
 type
   TfEditorElegirArticulosAlbaranCliente = class(TfEditorElegirArticulos, IEditorElegirArticulosAlbaranesCliente)
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.dfm
index f4509925..8bf378da 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.dfm	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.dfm	
@@ -5,38 +5,53 @@ inherited fEditorElegirAlbaranesProveedor: TfEditorElegirAlbaranesProveedor
   ExplicitHeight = 538
   PixelsPerInch = 96
   TextHeight = 13
-  object JvgWizardHeader1: TJvgWizardHeader [0]
+  object pnlHeader: TPanel
     Left = 0
-    Top = 27
-    Width = 790
-    Height = 60
-    CaptionFont.Charset = DEFAULT_CHARSET
-    CaptionFont.Color = clWindowText
-    CaptionFont.Height = -11
-    CaptionFont.Name = 'Tahoma'
-    CaptionFont.Style = [fsBold]
-    CommentFont.Charset = DEFAULT_CHARSET
-    CommentFont.Color = clWindowText
-    CommentFont.Height = -11
-    CommentFont.Name = 'Tahoma'
-    CommentFont.Style = []
-    SymbolFont.Charset = DEFAULT_CHARSET
-    SymbolFont.Color = clHighlightText
-    SymbolFont.Height = -35
-    SymbolFont.Name = 'Wingdings'
-    SymbolFont.Style = [fsBold]
-    Captions.Strings = (
-      'Seleccione el albar'#225'n de proveedor')
-    Comments.Strings = (
-      ' ')
-    Gradient.FromColor = clHighlight
-    Gradient.ToColor = clWindow
-    Gradient.Active = False
-    Gradient.Orientation = fgdVertical
-    BufferedDraw = False
-    ExplicitLeft = -8
-    ExplicitTop = 8
-    ExplicitWidth = 656
+    Top = 0
+    Width = 656
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
+    TabOrder = 5
+    object lblTitle: TLabel
+      AlignWithMargins = True
+      Left = 25
+      Top = 8
+      Width = 606
+      Height = 13
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 8
+      Align = alTop
+      Caption = 'Seleccione el albar'#225'n de proveedor'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      ExplicitWidth = 135
+    end
+    object lblComments: TLabel
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 581
+      Height = 27
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
+    end
   end
   inherited JvNavPanelHeader: TJvNavPanelHeader
     Width = 790
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.pas
index b257bbcc..e13e0267 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.pas	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirAlbaranesProveedor.pas	
@@ -9,14 +9,15 @@ uses
   ActnList, uCustomView, uViewBase, uViewGridBase, uViewGrid,
   uViewAlbaranesProveedor, ComCtrls, TB2ExtItems, TBXExtItems, TBX,
   TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent,
-  JvNavigationPane, uViewBarraSeleccion, JvgWizardHeader, StdCtrls,
+  JvNavigationPane, uViewBarraSeleccion, StdCtrls,
   uEditorAlbaranesProveedor, uBizAlbaranesProveedor, uIEditorElegirAlbaranesProveedor,
   JvExComCtrls, JvStatusBar, JSDialog, uDAInterfaces;
 
 type
   TfEditorElegirAlbaranesProveedor = class(TfEditorAlbaranesProveedor, IEditorElegirAlbaranesProveedor)
     frViewBarraSeleccion1: TfrViewBarraSeleccion;
-    JvgWizardHeader1: TJvgWizardHeader;
+    lblTitle: TLabel;
+    lblComments: TLabel;
     EditorSeleccionActionList: TActionList;
     actBuscar2: TAction;
     actQuitarFiltro2: TAction;
@@ -98,7 +99,7 @@ end;
 
 function TfEditorElegirAlbaranesProveedor.GetMensaje: String;
 begin
-  Result := JvgWizardHeader1.Comments.Text;
+  Result := lblComments.Caption;
 end;
 
 function TfEditorElegirAlbaranesProveedor.GetMultiSelect: Boolean;
@@ -108,7 +109,7 @@ end;
 
 procedure TfEditorElegirAlbaranesProveedor.SetMensaje(const AValue: String);
 begin
-  JvgWizardHeader1.Comments.Text := AValue;
+  lblComments.Caption := AValue;
 end;
 
 procedure TfEditorElegirAlbaranesProveedor.SetMultiSelect(AValue: Boolean);
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirArticulosAlbaranProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirArticulosAlbaranProveedor.dfm
index e34b8b62..a4c6ca56 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirArticulosAlbaranProveedor.dfm	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirArticulosAlbaranProveedor.dfm	
@@ -2,4 +2,13 @@ inherited fEditorElegirArticulosAlbaranProveedor: TfEditorElegirArticulosAlbaran
   Caption = 'fEditorElegirArticulosAlbaranProveedor'
   PixelsPerInch = 96
   TextHeight = 13
+  inherited pnlHeader: TPanel
+    inherited lblTitle: TLabel
+      Width = 606
+    end
+    inherited lblComments: TLabel
+      Width = 581
+      Height = 24
+    end
+  end
 end
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirArticulosAlbaranProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirArticulosAlbaranProveedor.pas
index 7533f94b..3dbb7191 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirArticulosAlbaranProveedor.pas	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uEditorElegirArticulosAlbaranProveedor.pas	
@@ -9,8 +9,8 @@ uses
   StdActns, ActnList, uCustomView, uViewBase, uViewBarraSeleccion, ComCtrls,
   JvExComCtrls, JvStatusBar, TBX, TB2ExtItems, TBXExtItems, TB2Item, TB2Dock,
   TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane,
-  JvgWizardHeader, uIEditorElegirArticulosAlbaranesProveedor, uBizContactos,
-  uDAInterfaces, uViewGridBase, uViewGrid, uViewArticulos;
+  uIEditorElegirArticulosAlbaranesProveedor, uBizContactos,
+  uDAInterfaces, uViewGridBase, uViewGrid, uViewArticulos, StdCtrls;
 
 type
   TfEditorElegirArticulosAlbaranProveedor = class(TfEditorElegirArticulos, IEditorElegirArticulosAlbaranesProveedor)
diff --git a/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm
index 400ecd9d..31b7b72a 100644
--- a/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.dfm
@@ -4,41 +4,12 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos
   ExplicitWidth = 664
   PixelsPerInch = 96
   TextHeight = 13
-  object JvgWizardHeader1: TJvgWizardHeader [0]
-    Left = 0
-    Top = 27
-    Width = 656
-    Height = 60
-    CaptionFont.Charset = DEFAULT_CHARSET
-    CaptionFont.Color = clWindowText
-    CaptionFont.Height = -11
-    CaptionFont.Name = 'Tahoma'
-    CaptionFont.Style = [fsBold]
-    CommentFont.Charset = DEFAULT_CHARSET
-    CommentFont.Color = clWindowText
-    CommentFont.Height = -11
-    CommentFont.Name = 'Tahoma'
-    CommentFont.Style = []
-    SymbolFont.Charset = DEFAULT_CHARSET
-    SymbolFont.Color = clHighlightText
-    SymbolFont.Height = -35
-    SymbolFont.Name = 'Wingdings'
-    SymbolFont.Style = [fsBold]
-    Captions.Strings = (
-      'Seleccione los art'#237'culos')
-    Comments.Strings = (
-      ' ')
-    Gradient.FromColor = clHighlight
-    Gradient.ToColor = clWindow
-    Gradient.Active = False
-    Gradient.Orientation = fgdVertical
-    BufferedDraw = False
-    ExplicitTop = 87
-  end
   inherited JvNavPanelHeader: TJvNavPanelHeader
+    Top = 113
     Width = 656
     Caption = 'Lista de art'#237'culos'
     Visible = False
+    ExplicitTop = 168
     ExplicitWidth = 656
     inherited Image1: TImage
       Left = 629
@@ -46,10 +17,10 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos
     end
   end
   inherited TBXDock: TTBXDock
-    Top = 87
+    Top = 64
     Width = 656
     Height = 49
-    ExplicitTop = 87
+    ExplicitTop = 91
     ExplicitWidth = 656
     ExplicitHeight = 49
     inherited tbxMain: TTBXToolbar
@@ -92,6 +63,55 @@ inherited fEditorElegirArticulos: TfEditorElegirArticulos
     Visible = False
     ExplicitWidth = 656
   end
+  object pnlHeader: TPanel [3]
+    Left = 0
+    Top = 0
+    Width = 656
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
+    TabOrder = 4
+    ExplicitTop = 27
+    object lblTitle: TLabel
+      AlignWithMargins = True
+      Left = 25
+      Top = 8
+      Width = 606
+      Height = 13
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 8
+      Align = alTop
+      Caption = 'Seleccione los art'#237'culos'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      ExplicitWidth = 131
+    end
+    object lblComments: TLabel
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 581
+      Height = 24
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
+    end
+  end
   inline frViewBarraSeleccion1: TfrViewBarraSeleccion [4]
     Left = 0
     Top = 436
diff --git a/Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas
index 8d6a6f34..65b860b8 100644
--- a/Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas
+++ b/Source/Modulos/Articulos/Views/uEditorElegirArticulos.pas
@@ -9,14 +9,15 @@ uses
   ActnList, uCustomView, uViewBase, uViewGridBase, uViewGrid,
   uViewArticulos, ComCtrls, TB2ExtItems, TBXExtItems, TBX,
   TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent,
-  JvNavigationPane, uViewBarraSeleccion, JvgWizardHeader, StdCtrls,
+  JvNavigationPane, uViewBarraSeleccion, StdCtrls,
   uEditorArticulos, uBizArticulos, uIEditorElegirArticulos,
   JvExComCtrls, JvStatusBar, uDAInterfaces, uEditorGridBase, uArticulosController;
 
 type
   TfEditorElegirArticulos = class(TfEditorGridBase, IEditorElegirArticulos)
     frViewBarraSeleccion1: TfrViewBarraSeleccion;
-    JvgWizardHeader1: TJvgWizardHeader;
+    lblTitle: TLabel;
+    lblComments: TLabel;
     EditorSeleccionActionList: TActionList;
     actBuscar2: TAction;
     actQuitarFiltro2: TAction;
@@ -146,7 +147,7 @@ end;
 
 function TfEditorElegirArticulos.GetMensaje: String;
 begin
-  Result := JvgWizardHeader1.Comments.Text;
+  Result := lblComments.Caption;
 end;
 
 function TfEditorElegirArticulos.GetMultiSelect: Boolean;
@@ -196,7 +197,7 @@ end;
 
 procedure TfEditorElegirArticulos.SetMensaje(const AValue: String);
 begin
-  JvgWizardHeader1.Comments.Text := AValue;
+  lblComments.Caption := AValue;
 end;
 
 procedure TfEditorElegirArticulos.SetMultiSelect(AValue: Boolean);
diff --git a/Source/Modulos/Banca electronica/Views/uEditorExportacionNorma19.dfm b/Source/Modulos/Banca electronica/Views/uEditorExportacionNorma19.dfm
index 1cd2b439..b1a0ec14 100644
--- a/Source/Modulos/Banca electronica/Views/uEditorExportacionNorma19.dfm	
+++ b/Source/Modulos/Banca electronica/Views/uEditorExportacionNorma19.dfm	
@@ -41,37 +41,54 @@ object fEditorExportacionNorma19: TfEditorExportacionNorma19
     Height = 13
     Caption = 'Fecha de cargo:'
   end
-  object JvgWizardHeader1: TJvgWizardHeader
+  object pnlHeader: TPanel
     Left = 0
     Top = 0
-    Width = 389
-    Height = 60
-    CaptionFont.Charset = DEFAULT_CHARSET
-    CaptionFont.Color = clWindowText
-    CaptionFont.Height = -11
-    CaptionFont.Name = 'Tahoma'
-    CaptionFont.Style = [fsBold]
-    CommentFont.Charset = DEFAULT_CHARSET
-    CommentFont.Color = clWindowText
-    CommentFont.Height = -11
-    CommentFont.Name = 'Tahoma'
-    CommentFont.Style = []
-    SymbolFont.Charset = DEFAULT_CHARSET
-    SymbolFont.Color = clHighlightText
-    SymbolFont.Height = -35
-    SymbolFont.Name = 'Wingdings'
-    SymbolFont.Style = [fsBold]
-    Captions.Strings = (
-      'Volcado de remesas a disco')
-    Comments.Strings = (
-      'Introduzca los siguientes datos para realizar el volcado')
-    Gradient.FromColor = clHighlight
-    Gradient.ToColor = clWindow
-    Gradient.Active = False
-    Gradient.Orientation = fgdVertical
-    BufferedDraw = False
-    ExplicitLeft = -8
-    ExplicitTop = 76
+    Width = 656
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
+    TabOrder = 5
+    object lblTitle: TLabel
+      AlignWithMargins = True
+      Left = 25
+      Top = 8
+      Width = 606
+      Height = 13
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 8
+      Align = alTop
+      Caption = 'Volcado de remesas a disco'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      ExplicitWidth = 135
+    end
+    object lblComments: TLabel
+      AlignWithMargins = True
+      Caption = 'Introduzca los siguientes datos para realizar el volcado'
+      Left = 50
+      Top = 29
+      Width = 581
+      Height = 27
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
+    end
   end
   object Image1: TImage
     Left = 345
diff --git a/Source/Modulos/Banca electronica/Views/uEditorExportacionNorma19.pas b/Source/Modulos/Banca electronica/Views/uEditorExportacionNorma19.pas
index bd720887..1fa62d0d 100644
--- a/Source/Modulos/Banca electronica/Views/uEditorExportacionNorma19.pas	
+++ b/Source/Modulos/Banca electronica/Views/uEditorExportacionNorma19.pas	
@@ -6,7 +6,7 @@ uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, ExtCtrls, StdCtrls, pngimage, cxControls, cxContainer, cxEdit,
   cxTextEdit, cxMaskEdit, cxDropDownEdit, cxCalendar,
-  uIEditorExportacionNorma19, JvExControls, JvComponent, JvgWizardHeader,
+  uIEditorExportacionNorma19, JvExControls, JvComponent,
   JvAppStorage, JvAppRegistryStorage, JvComponentBase, JvFormPlacement,
   JvDialogs, Mask, JvExMask, JvToolEdit, ActnList;
 
@@ -21,7 +21,8 @@ type
     Label4: TLabel;
     edtCodEntidad: TcxMaskEdit;
     edtCodAgencia: TcxMaskEdit;
-    JvgWizardHeader1: TJvgWizardHeader;
+    lblTitle: TLabel;
+    lblComments: TLabel;
     Bevel1: TBevel;
     JvFormStorage: TJvFormStorage;
     JvAppRegistryStorage: TJvAppRegistryStorage;
diff --git a/Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm b/Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm
index 9855102b..e6ab037d 100644
--- a/Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm
@@ -4,41 +4,12 @@ inherited fEditorElegirClientes: TfEditorElegirClientes
   ExplicitWidth = 691
   PixelsPerInch = 96
   TextHeight = 13
-  object JvgWizardHeader1: TJvgWizardHeader [0]
-    Left = 0
-    Top = 27
-    Width = 683
-    Height = 60
-    CaptionFont.Charset = DEFAULT_CHARSET
-    CaptionFont.Color = clWindowText
-    CaptionFont.Height = -11
-    CaptionFont.Name = 'Tahoma'
-    CaptionFont.Style = [fsBold]
-    CommentFont.Charset = DEFAULT_CHARSET
-    CommentFont.Color = clWindowText
-    CommentFont.Height = -11
-    CommentFont.Name = 'Tahoma'
-    CommentFont.Style = []
-    SymbolFont.Charset = DEFAULT_CHARSET
-    SymbolFont.Color = clHighlightText
-    SymbolFont.Height = -35
-    SymbolFont.Name = 'Wingdings'
-    SymbolFont.Style = [fsBold]
-    Captions.Strings = (
-      'Seleccione el cliente')
-    Comments.Strings = (
-      ' ')
-    Gradient.FromColor = clHighlight
-    Gradient.ToColor = clWindow
-    Gradient.Active = False
-    Gradient.Orientation = fgdVertical
-    BufferedDraw = True
-    ExplicitLeft = 16
-    ExplicitTop = 8
-  end
   inherited JvNavPanelHeader: TJvNavPanelHeader
+    Top = 113
     Width = 683
     Visible = False
+    ExplicitLeft = -8
+    ExplicitTop = 133
     ExplicitWidth = 683
     inherited Image1: TImage
       Left = 656
@@ -46,22 +17,24 @@ inherited fEditorElegirClientes: TfEditorElegirClientes
     end
   end
   inherited TBXDock: TTBXDock
-    Top = 87
+    Top = 64
     Width = 683
-    ExplicitTop = 87
+    Height = 49
+    ExplicitTop = 64
     ExplicitWidth = 683
+    ExplicitHeight = 49
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 284
+      ExplicitWidth = 378
       inherited TBXItem36: TTBXItem
         Action = actAnchoAuto2
       end
     end
     inherited tbxFiltro: TTBXToolbar
-      Left = 284
+      Left = 378
       Top = 23
       DockPos = 96
       DockRow = 1
-      ExplicitLeft = 284
+      ExplicitLeft = 378
       ExplicitTop = 23
       inherited TBXItem34: TTBXItem
         Action = actQuitarFiltro2
@@ -70,13 +43,21 @@ inherited fEditorElegirClientes: TfEditorElegirClientes
     inherited tbxMenu: TTBXToolbar
       ExplicitWidth = 683
     end
+    inherited TBXTMain2: TTBXToolbar
+      Left = 647
+      Top = 23
+      DockPos = 656
+      DockRow = 1
+      ExplicitLeft = 647
+      ExplicitTop = 23
+    end
   end
   inherited StatusBar: TJvStatusBar
     Width = 683
     Visible = False
     ExplicitWidth = 683
   end
-  inline frViewBarraSeleccion1: TfrViewBarraSeleccion [4]
+  inline frViewBarraSeleccion1: TfrViewBarraSeleccion [3]
     Left = 0
     Top = 464
     Width = 683
@@ -122,27 +103,76 @@ inherited fEditorElegirClientes: TfEditorElegirClientes
       end
     end
   end
-  inherited frViewClientes1: TfrViewClientes [5]
-    Top = 162
+  object pnlHeader: TPanel [4]
+    Left = 0
+    Top = 0
     Width = 683
-    Height = 302
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
+    TabOrder = 5
+    ExplicitTop = 27
+    object lblTitle: TLabel
+      AlignWithMargins = True
+      Left = 25
+      Top = 8
+      Width = 633
+      Height = 13
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 8
+      Align = alTop
+      Caption = 'Seleccione el cliente'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      ExplicitWidth = 114
+    end
+    object lblComments: TLabel
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 608
+      Height = 24
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
+    end
+  end
+  inherited frViewClientes1: TfrViewClientes [5]
+    Top = 140
+    Width = 683
+    Height = 324
     Padding.Left = 10
     Padding.Top = 10
     Padding.Right = 10
     Padding.Bottom = 5
     TabOrder = 4
-    ExplicitTop = 162
+    ExplicitTop = 166
     ExplicitWidth = 683
-    ExplicitHeight = 302
+    ExplicitHeight = 298
     inherited cxGrid: TcxGrid
       Left = 10
       Top = 112
       Width = 663
-      Height = 159
+      Height = 181
       ExplicitLeft = 10
       ExplicitTop = 112
       ExplicitWidth = 663
-      ExplicitHeight = 159
+      ExplicitHeight = 155
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.FooterSummaryItems = <
           item
@@ -170,21 +200,37 @@ inherited fEditorElegirClientes: TfEditorElegirClientes
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 689
+            Width = 689
           end
           inherited edtFechaIniFiltro: TcxDateEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 460
+            Width = 460
           end
           inherited edtFechaFinFiltro: TcxDateEdit
+            Left = 397
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 397
             ExplicitWidth = 123
             Width = 123
           end
+          inherited eLista: TcxComboBox
+            Left = 515
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 515
+            ExplicitWidth = 215
+            Width = 215
+          end
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
           Width = 663
@@ -198,15 +244,16 @@ inherited fEditorElegirClientes: TfEditorElegirClientes
     end
     inherited pnlAgrupaciones: TTBXDockablePanel
       Left = 10
-      Top = 271
+      Top = 293
       ExplicitLeft = 10
-      ExplicitTop = 271
+      ExplicitTop = 267
       ExplicitWidth = 663
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 663
         ExplicitWidth = 663
         inherited TBXToolbar1: TTBXToolbar
           Width = 653
+          ExplicitWidth = 653
         end
       end
     end
@@ -219,6 +266,14 @@ inherited fEditorElegirClientes: TfEditorElegirClientes
         BuiltInReportLink = True
       end
     end
+    inherited cxViewGridPopupMenu: TcxGridPopupMenu
+      PopupMenus = <
+        item
+          GridView = frViewClientes1.cxGridView
+          HitTypes = [gvhtCell]
+          Index = 0
+        end>
+    end
   end
   inherited EditorActionList: TActionList [6]
     Left = 112
@@ -226,6 +281,9 @@ inherited fEditorElegirClientes: TfEditorElegirClientes
     inherited actNuevo: TAction
       Visible = False
     end
+    inherited actGruposCliente: TAction
+      Visible = False
+    end
     inherited actModificar: TAction
       Visible = False
     end
@@ -283,9 +341,6 @@ inherited fEditorElegirClientes: TfEditorElegirClientes
     inherited actDuplicar: TAction
       Visible = False
     end
-    inherited actGruposCliente: TAction
-      Visible = False
-    end
   end
   inherited SmallImages: TPngImageList [7]
   end
diff --git a/Source/Modulos/Contactos/Views/uEditorElegirClientes.pas b/Source/Modulos/Contactos/Views/uEditorElegirClientes.pas
index cb468650..ba04445e 100644
--- a/Source/Modulos/Contactos/Views/uEditorElegirClientes.pas
+++ b/Source/Modulos/Contactos/Views/uEditorElegirClientes.pas
@@ -9,14 +9,15 @@ uses
   StdActns, ActnList, uCustomView, uViewBase, uViewGridBase, uViewGrid,
   uViewContactos, uViewClientes, ComCtrls, TB2ExtItems, TBXExtItems, TBX,
   TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent,
-  JvNavigationPane, uIEditorElegirClientes, uViewBarraSeleccion, JvgWizardHeader,
+  JvNavigationPane, uIEditorElegirClientes, uViewBarraSeleccion,
   StdCtrls, uBizContactos, TBXStatusBars, JvExComCtrls, JvStatusBar, JSDialog,
   uDAInterfaces;
 
 type
   TfEditorElegirClientes = class(TfEditorClientes, IEditorElegirClientes)
     frViewBarraSeleccion1: TfrViewBarraSeleccion;
-    JvgWizardHeader1: TJvgWizardHeader;
+    lblTitle: TLabel;
+    lblComments: TLabel;
     JsClienteBloqueadoDialog: TJSDialog;
     EditorSeleccionActionList: TActionList;
     actBuscar2: TAction;
@@ -128,7 +129,7 @@ end;
 
 function TfEditorElegirClientes.GetMensaje: String;
 begin
-  Result := JvgWizardHeader1.Comments.Text;
+  Result := lblComments.Caption;
 end;
 
 function TfEditorElegirClientes.GetMultiSelect: Boolean;
@@ -138,7 +139,7 @@ end;
 
 procedure TfEditorElegirClientes.SetMensaje(const AValue: String);
 begin
-  JvgWizardHeader1.Comments.Text := AValue;
+  lblComments.Caption := AValue;
 end;
 
 procedure TfEditorElegirClientes.SetMultiSelect(AValue: Boolean);
diff --git a/Source/Modulos/Contactos/Views/uEditorElegirDireccionEntrega.dfm b/Source/Modulos/Contactos/Views/uEditorElegirDireccionEntrega.dfm
index b06c1576..d1a129d3 100644
--- a/Source/Modulos/Contactos/Views/uEditorElegirDireccionEntrega.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorElegirDireccionEntrega.dfm
@@ -14,40 +14,55 @@ object fEditorElegirDireccionEntrega: TfEditorElegirDireccionEntrega
   OnShow = FormShow
   PixelsPerInch = 96
   TextHeight = 13
-  object JvgWizardHeader1: TJvgWizardHeader
+  object pnlHeader: TPanel
     Left = 0
     Top = 0
-    Width = 599
-    Height = 60
-    CaptionFont.Charset = DEFAULT_CHARSET
-    CaptionFont.Color = clWindowText
-    CaptionFont.Height = -11
-    CaptionFont.Name = 'Tahoma'
-    CaptionFont.Style = [fsBold]
-    CommentFont.Charset = DEFAULT_CHARSET
-    CommentFont.Color = clWindowText
-    CommentFont.Height = -11
-    CommentFont.Name = 'Tahoma'
-    CommentFont.Style = []
-    SymbolFont.Charset = DEFAULT_CHARSET
-    SymbolFont.Color = clHighlightText
-    SymbolFont.Height = -35
-    SymbolFont.Name = 'Wingdings'
-    SymbolFont.Style = [fsBold]
-    Captions.Strings = (
-      'Seleccione una direcci'#243'n del cliente')
-    Comments.Strings = (
-      
-        'El cliente dispone de varias direcciones dadas de alta en su fic' +
-        'ha. Seleccione la direcci'#243'n del cliente que quiere utilizar.')
-    Gradient.FromColor = clHighlight
-    Gradient.ToColor = clWindow
-    Gradient.Active = False
-    Gradient.Orientation = fgdVertical
-    BufferedDraw = False
-    ExplicitLeft = -57
-    ExplicitTop = 27
-    ExplicitWidth = 656
+    Width = 656
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
+    TabOrder = 5
+    object lblTitle: TLabel
+      AlignWithMargins = True
+      Left = 25
+      Top = 8
+      Width = 606
+      Height = 13
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 8
+      Align = alTop
+      Caption = 'Seleccione una direcci'#243'n del cliente'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      ExplicitWidth = 135
+    end
+    object lblComments: TLabel
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 581
+      Height = 27
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
+      Caption = 'El cliente dispone de varias direcciones dadas de alta en su fic' +
+        'ha. Seleccione la direcci'#243'n del cliente que quiere utilizar.'
+    end
   end
   inline frViewBarraSeleccion1: TfrViewBarraSeleccion
     Left = 0
diff --git a/Source/Modulos/Contactos/Views/uEditorElegirDireccionEntrega.pas b/Source/Modulos/Contactos/Views/uEditorElegirDireccionEntrega.pas
index 43fcffb3..5c00a20f 100644
--- a/Source/Modulos/Contactos/Views/uEditorElegirDireccionEntrega.pas
+++ b/Source/Modulos/Contactos/Views/uEditorElegirDireccionEntrega.pas
@@ -6,7 +6,7 @@ uses Windows, SysUtils, Classes, Graphics, Forms, Controls, StdCtrls,
   Buttons, ExtCtrls, Mask, DBCtrls, DB, uDADataTable,
   cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit,
   uIEditorElegirDireccionEntrega, uCustomView, uBizContactos,
-  uViewBase, uViewBarraSeleccion, JvExControls, JvComponent, JvgWizardHeader,
+  uViewBase, uViewBarraSeleccion, JvExControls, JvComponent,
   DBCGrids, uBizDireccionesContacto, uDAInterfaces, ActnList,
   uDireccionesContactoController;
 
@@ -14,7 +14,8 @@ type
   TfEditorElegirDireccionEntrega = class(TForm, IEditorElegirDireccionEntrega)
     dsDirecciones: TDADataSource;
     frViewBarraSeleccion1: TfrViewBarraSeleccion;
-    JvgWizardHeader1: TJvgWizardHeader;
+    lblTitle: TLabel;
+    lblComments: TLabel;
     DBCtrlGrid1: TDBCtrlGrid;
     eCalle: TDBText;
     ePoblacion: TDBText;
@@ -106,12 +107,12 @@ begin
     if Supports(FContacto, IBizCliente) then
     begin
       Caption := 'Elegir una dirección de cliente';
-      JvgWizardHeader1.Captions.Text := 'Seleccione una dirección de cliente';
+  		lblTitle.Caption := 'Seleccione una dirección de cliente';
     end;
     if Supports(FContacto, IBizProveedor) then
     begin
       Caption := 'Elegir una dirección de proveedor';
-      JvgWizardHeader1.Captions.Text := 'Seleccione una dirección de proveedor';
+      lblTitle.Caption := 'Seleccione una dirección de proveedor';
     end;
   end;
 
@@ -198,7 +199,7 @@ end;
 
 function TfEditorElegirDireccionEntrega.GetMensaje: String;
 begin
-  Result := JvgWizardHeader1.Comments.Text;
+  Result := lblComments.Caption;
 end;
 
 procedure TfEditorElegirDireccionEntrega.RefrescarEstado;
@@ -267,9 +268,9 @@ end;
 procedure TfEditorElegirDireccionEntrega.SetMensaje(const AValue: String);
 begin
   if not EsCadenaVacia(AValue) then
-    JvgWizardHeader1.Comments.Text := AValue
+  	lblComments.Caption := AValue
   else
-    JvgWizardHeader1.Comments.Text := ' ';
+    lblComments.Caption := ' ';
 end;
 
 end.
diff --git a/Source/Modulos/Contactos/Views/uEditorElegirPersonaContacto.dfm b/Source/Modulos/Contactos/Views/uEditorElegirPersonaContacto.dfm
index 99bccecd..294bb846 100644
--- a/Source/Modulos/Contactos/Views/uEditorElegirPersonaContacto.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorElegirPersonaContacto.dfm
@@ -11,40 +11,55 @@ object fEditorElegirPersonaContacto: TfEditorElegirPersonaContacto
   Position = poOwnerFormCenter
   PixelsPerInch = 96
   TextHeight = 13
-  object JvgWizardHeader1: TJvgWizardHeader
+  object pnlHeader: TPanel
     Left = 0
     Top = 0
-    Width = 599
-    Height = 60
-    CaptionFont.Charset = DEFAULT_CHARSET
-    CaptionFont.Color = clWindowText
-    CaptionFont.Height = -11
-    CaptionFont.Name = 'Tahoma'
-    CaptionFont.Style = [fsBold]
-    CommentFont.Charset = DEFAULT_CHARSET
-    CommentFont.Color = clWindowText
-    CommentFont.Height = -11
-    CommentFont.Name = 'Tahoma'
-    CommentFont.Style = []
-    SymbolFont.Charset = DEFAULT_CHARSET
-    SymbolFont.Color = clHighlightText
-    SymbolFont.Height = -35
-    SymbolFont.Name = 'Wingdings'
-    SymbolFont.Style = [fsBold]
-    Captions.Strings = (
-      'Seleccione una persona de contacto')
-    Comments.Strings = (
-      
-        'El cliente dispone de personas de contacto dadas de alta en su f' +
-        'icha. Seleccione la que quiere utilizar.')
-    Gradient.FromColor = clHighlight
-    Gradient.ToColor = clWindow
-    Gradient.Active = False
-    Gradient.Orientation = fgdVertical
-    BufferedDraw = False
-    ExplicitLeft = -57
-    ExplicitTop = 27
-    ExplicitWidth = 656
+    Width = 656
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
+    TabOrder = 5
+    object lblTitle: TLabel
+      AlignWithMargins = True
+      Left = 25
+      Top = 8
+      Width = 606
+      Height = 13
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 8
+      Align = alTop
+      Caption = 'Seleccione una persona de contacto'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      ExplicitWidth = 135
+    end
+    object lblComments: TLabel
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 581
+      Height = 27
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
+      Caption = 'El cliente dispone de personas de contacto dadas de alta en su f' +
+        'icha. Seleccione la que quiere utilizar.'
+    end
   end
   inline frViewBarraSeleccion1: TfrViewBarraSeleccion
     Left = 0
diff --git a/Source/Modulos/Contactos/Views/uEditorElegirPersonaContacto.pas b/Source/Modulos/Contactos/Views/uEditorElegirPersonaContacto.pas
index 1e60f465..8f55ccab 100644
--- a/Source/Modulos/Contactos/Views/uEditorElegirPersonaContacto.pas
+++ b/Source/Modulos/Contactos/Views/uEditorElegirPersonaContacto.pas
@@ -6,14 +6,15 @@ uses Windows, SysUtils, Classes, Graphics, Forms, Controls, StdCtrls,
   Buttons, ExtCtrls, Mask, DBCtrls, DB, uDADataTable,
   cxControls, cxContainer, cxEdit, cxTextEdit, cxDBEdit,
   uIEditorElegirPersonaContacto, uCustomView,
-  uViewBase, uViewBarraSeleccion, JvExControls, JvComponent, JvgWizardHeader,
+  uViewBase, uViewBarraSeleccion, JvExControls, JvComponent,
   DBCGrids, uBizContactosPersonal, uDAInterfaces;
 
 type
   TfEditorElegirPersonaContacto = class(TForm, IEditorElegirPersonaContacto)
     dsPersonas: TDADataSource;
     frViewBarraSeleccion1: TfrViewBarraSeleccion;
-    JvgWizardHeader1: TJvgWizardHeader;
+    lblTitle: TLabel;
+    lblComments: TLabel;
     DBCtrlGrid1: TDBCtrlGrid;
     ePuesto: TDBText;
     eTelefono: TDBText;
@@ -90,7 +91,7 @@ end;
 
 function TfEditorElegirPersonaContacto.GetMensaje: String;
 begin
-  Result := JvgWizardHeader1.Comments.Text;
+  Result := lblComments.Caption;
 end;
 
 procedure TfEditorElegirPersonaContacto.SetPersonas(const Value: IBizContactoPersonal);
@@ -104,7 +105,7 @@ end;
 
 procedure TfEditorElegirPersonaContacto.SetMensaje(const AValue: String);
 begin
-  JvgWizardHeader1.Comments.Text := AValue;
+  lblComments.Caption := AValue;
 end;
 
 end.
diff --git a/Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm b/Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm
index dfa03d34..d163ee17 100644
--- a/Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm
+++ b/Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm
@@ -6,41 +6,12 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
   ExplicitHeight = 514
   PixelsPerInch = 96
   TextHeight = 13
-  object JvgWizardHeader1: TJvgWizardHeader [0]
-    Left = 0
-    Top = 27
-    Width = 656
-    Height = 60
-    CaptionFont.Charset = DEFAULT_CHARSET
-    CaptionFont.Color = clWindowText
-    CaptionFont.Height = -11
-    CaptionFont.Name = 'Tahoma'
-    CaptionFont.Style = [fsBold]
-    CommentFont.Charset = DEFAULT_CHARSET
-    CommentFont.Color = clWindowText
-    CommentFont.Height = -11
-    CommentFont.Name = 'Tahoma'
-    CommentFont.Style = []
-    SymbolFont.Charset = DEFAULT_CHARSET
-    SymbolFont.Color = clHighlightText
-    SymbolFont.Height = -35
-    SymbolFont.Name = 'Wingdings'
-    SymbolFont.Style = [fsBold]
-    Captions.Strings = (
-      'Seleccione el proveedor')
-    Comments.Strings = (
-      ' ')
-    Gradient.FromColor = clHighlight
-    Gradient.ToColor = clWindow
-    Gradient.Active = False
-    Gradient.BufferedDraw = True
-    Gradient.Orientation = fgdVertical
-    BufferedDraw = True
-    ExplicitTop = -10
-  end
   inherited JvNavPanelHeader: TJvNavPanelHeader
+    Top = 113
     Width = 656
     Visible = False
+    ExplicitLeft = 8
+    ExplicitTop = 166
     ExplicitWidth = 656
     inherited Image1: TImage
       Left = 629
@@ -48,22 +19,24 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
     end
   end
   inherited TBXDock: TTBXDock
-    Top = 87
+    Top = 64
     Width = 656
-    ExplicitTop = 87
+    Height = 49
+    ExplicitTop = 64
     ExplicitWidth = 656
+    ExplicitHeight = 49
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 284
+      ExplicitWidth = 351
       inherited TBXItem36: TTBXItem
         Action = actAnchoAuto2
       end
     end
     inherited tbxFiltro: TTBXToolbar
-      Left = 284
+      Left = 351
       Top = 23
       DockPos = 108
       DockRow = 1
-      ExplicitLeft = 284
+      ExplicitLeft = 351
       ExplicitTop = 23
       inherited TBXItem34: TTBXItem
         Action = actQuitarFiltro2
@@ -72,6 +45,14 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
     inherited tbxMenu: TTBXToolbar
       ExplicitWidth = 656
     end
+    inherited TBXTMain2: TTBXToolbar
+      Left = 620
+      Top = 23
+      DockPos = 629
+      DockRow = 1
+      ExplicitLeft = 620
+      ExplicitTop = 23
+    end
   end
   inherited StatusBar: TJvStatusBar
     Top = 461
@@ -80,7 +61,7 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
     ExplicitTop = 461
     ExplicitWidth = 656
   end
-  inline frViewBarraSeleccion1: TfrViewBarraSeleccion [4]
+  inline frViewBarraSeleccion1: TfrViewBarraSeleccion [3]
     Left = 0
     Top = 425
     Width = 656
@@ -125,27 +106,76 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
       end
     end
   end
-  inherited frViewProveedores1: TfrViewProveedores [5]
-    Top = 162
+  object pnlHeader: TPanel [4]
+    Left = 0
+    Top = 0
     Width = 656
-    Height = 263
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
+    TabOrder = 5
+    ExplicitTop = 27
+    object lblTitle: TLabel
+      AlignWithMargins = True
+      Left = 25
+      Top = 8
+      Width = 606
+      Height = 13
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 8
+      Align = alTop
+      Caption = 'Seleccione el proveedor'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      ExplicitWidth = 135
+    end
+    object lblComments: TLabel
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 581
+      Height = 24
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
+    end
+  end
+  inherited frViewProveedores1: TfrViewProveedores [5]
+    Top = 140
+    Width = 656
+    Height = 285
     Padding.Left = 10
     Padding.Top = 10
     Padding.Right = 10
     Padding.Bottom = 5
     TabOrder = 4
-    ExplicitTop = 162
+    ExplicitTop = 166
     ExplicitWidth = 656
-    ExplicitHeight = 263
+    ExplicitHeight = 259
     inherited cxGrid: TcxGrid
       Left = 10
       Top = 112
       Width = 636
-      Height = 120
+      Height = 142
       ExplicitLeft = 10
       ExplicitTop = 112
       ExplicitWidth = 636
-      ExplicitHeight = 120
+      ExplicitHeight = 116
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.FooterSummaryItems = <
           item
@@ -174,18 +204,36 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 446
+            Width = 446
           end
           inherited edtFechaIniFiltro: TcxDateEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 219
+            Width = 219
           end
           inherited edtFechaFinFiltro: TcxDateEdit
+            Left = 261
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 261
+            ExplicitWidth = 210
+            Width = 210
+          end
+          inherited eLista: TcxComboBox
+            Left = 462
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 462
+            ExplicitWidth = 215
+            Width = 215
           end
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
@@ -200,9 +248,10 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
     end
     inherited pnlAgrupaciones: TTBXDockablePanel
       Left = 10
-      Top = 232
+      Top = 254
       ExplicitLeft = 10
-      ExplicitTop = 232
+      ExplicitTop = 228
+      ExplicitWidth = 636
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 636
         ExplicitWidth = 636
@@ -221,6 +270,14 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
         BuiltInReportLink = True
       end
     end
+    inherited cxViewGridPopupMenu: TcxGridPopupMenu
+      PopupMenus = <
+        item
+          GridView = frViewProveedores1.cxGridView
+          HitTypes = [gvhtCell]
+          Index = 0
+        end>
+    end
   end
   inherited EditorActionList: TActionList [6]
     Left = 112
diff --git a/Source/Modulos/Contactos/Views/uEditorElegirProveedores.pas b/Source/Modulos/Contactos/Views/uEditorElegirProveedores.pas
index 7b3d16b9..80bdff79 100644
--- a/Source/Modulos/Contactos/Views/uEditorElegirProveedores.pas
+++ b/Source/Modulos/Contactos/Views/uEditorElegirProveedores.pas
@@ -9,14 +9,15 @@ uses
   StdActns, ActnList, uCustomView, uViewBase, uViewGridBase, uViewGrid,
   uViewContactos, uViewProveedores, ComCtrls, TB2ExtItems, TBXExtItems, TBX,
   TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent,
-  JvNavigationPane, uIEditorElegirProveedores, uViewBarraSeleccion, JvgWizardHeader,
+  JvNavigationPane, uIEditorElegirProveedores, uViewBarraSeleccion,
   StdCtrls, uBizContactos, TBXStatusBars, JvExComCtrls, JvStatusBar, JSDialog,
   uDAInterfaces;
 
 type
   TfEditorElegirProveedores = class(TfEditorProveedores, IEditorElegirProveedores)
     frViewBarraSeleccion1: TfrViewBarraSeleccion;
-    JvgWizardHeader1: TJvgWizardHeader;
+    lblTitle: TLabel;
+    lblComments: TLabel;
     EditorSeleccionActionList: TActionList;
     actBuscar2: TAction;
     actQuitarFiltro2: TAction;
@@ -104,7 +105,7 @@ end;
 
 function TfEditorElegirProveedores.GetMensaje: String;
 begin
-  Result := JvgWizardHeader1.Comments.Text;
+  Result := lblComments.Caption;
 end;
 
 function TfEditorElegirProveedores.GetMultiSelect: Boolean;
@@ -114,7 +115,7 @@ end;
 
 procedure TfEditorElegirProveedores.SetMensaje(const AValue: String);
 begin
-  JvgWizardHeader1.Comments.Text := AValue;
+  lblComments.Caption := AValue;
 end;
 
 procedure TfEditorElegirProveedores.SetMultiSelect(AValue: Boolean);
diff --git a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj
index 84e8d35d..4cf71f8c 100644
--- a/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj	
+++ b/Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj	
@@ -49,17 +49,18 @@
     <DelphiCompile Include="FacturasCliente_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="AlbCli_FacCli_relation.dcp" />
-    <DCCReference Include="ApplicationBase.dcp" />
-    <DCCReference Include="Articulos_view.dcp" />
-    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="Contactos_view.dcp" />
-    <DCCReference Include="FacturasCliente_controller.dcp" />
-    <DCCReference Include="FacturasCliente_model.dcp" />
-    <DCCReference Include="GestorInformes_controller.dcp" />
-    <DCCReference Include="GUIBase.dcp" />
-    <DCCReference Include="PreCli_FacCli_relation.dcp" />
-    <DCCReference Include="rtl.dcp" />
+    <DCCReference Include="..\AlbCli_FacCli_relation.dcp" />
+    <DCCReference Include="..\ApplicationBase.dcp" />
+    <DCCReference Include="..\Articulos_view.dcp" />
+    <DCCReference Include="..\Base.dcp" />
+    <DCCReference Include="..\Contactos_view.dcp" />
+    <DCCReference Include="..\FacturasCliente_controller.dcp" />
+    <DCCReference Include="..\FacturasCliente_model.dcp" />
+    <DCCReference Include="..\GestorInformes_controller.dcp" />
+    <DCCReference Include="..\GUIBase.dcp" />
+    <DCCReference Include="..\PreCli_FacCli_relation.dcp" />
+    <DCCReference Include="..\rtl.dcp" />
+    <DCCReference Include="..\vcl.dcp" />
     <DCCReference Include="uDialogOpcionesImpresionFacturasCliente.pas">
       <Form>fDialogOpcionesImpresionFacturasCliente</Form>
       <DesignClass>TfEditorElegirFacturasCliente</DesignClass>
@@ -104,7 +105,6 @@
       <Form>frViewFacturasCliente</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
-    <DCCReference Include="vcl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorElegirArticulosFacturaCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorElegirArticulosFacturaCliente.pas
index 922fa4c5..8c06ecea 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorElegirArticulosFacturaCliente.pas	
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorElegirArticulosFacturaCliente.pas	
@@ -9,7 +9,7 @@ uses
   StdActns, ActnList, uCustomView, uViewBase, uViewBarraSeleccion, ComCtrls,
   JvExComCtrls, JvStatusBar, TBX, TB2ExtItems, TBXExtItems, TB2Item, TB2Dock,
   TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane,
-  JvgWizardHeader, uIEditorElegirArticulosFacturasCliente, uDAInterfaces,
+  uIEditorElegirArticulosFacturasCliente, uDAInterfaces,
   uViewGridBase, uViewGrid, uViewArticulos;
 
 type
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.dfm
index a983f442..a6981c8f 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.dfm	
@@ -4,47 +4,13 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente
   ExplicitWidth = 662
   PixelsPerInch = 96
   TextHeight = 13
-  object JvgWizardHeader1: TJvgWizardHeader [0]
-    Left = 0
-    Top = 0
-    Width = 654
-    Height = 60
-    CaptionFont.Charset = DEFAULT_CHARSET
-    CaptionFont.Color = clWindowText
-    CaptionFont.Height = -11
-    CaptionFont.Name = 'Tahoma'
-    CaptionFont.Style = [fsBold]
-    CommentFont.Charset = DEFAULT_CHARSET
-    CommentFont.Color = clWindowText
-    CommentFont.Height = -11
-    CommentFont.Name = 'Tahoma'
-    CommentFont.Style = []
-    SymbolFont.Charset = DEFAULT_CHARSET
-    SymbolFont.Color = clHighlightText
-    SymbolFont.Height = -35
-    SymbolFont.Name = 'Wingdings'
-    SymbolFont.Style = [fsBold]
-    Captions.Strings = (
-      
-        'Seleccione las facturas de cliente, que desea liquidar su comisi' +
-        #243'n')
-    Comments.Strings = (
-      ' ')
-    Gradient.FromColor = clHighlight
-    Gradient.ToColor = clWindow
-    Gradient.Active = False
-    Gradient.Orientation = fgdVertical
-    BufferedDraw = False
-    ExplicitLeft = -8
-    ExplicitTop = -21
-    ExplicitWidth = 656
-  end
   inherited JvNavPanelHeader: TJvNavPanelHeader
-    Top = 60
+    Top = 113
     Width = 654
     Caption = 'Lista de facturas de cliente para liquidar su comisi'#243'n'
     Visible = False
-    ExplicitTop = 60
+    ExplicitLeft = -8
+    ExplicitTop = 169
     ExplicitWidth = 654
     inherited Image1: TImage
       Left = 627
@@ -52,12 +18,12 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente
     end
   end
   inherited TBXDock: TTBXDock
-    Top = 87
+    Top = 64
     Width = 654
-    Height = 72
-    ExplicitTop = 87
+    Height = 49
+    ExplicitTop = 64
     ExplicitWidth = 654
-    ExplicitHeight = 72
+    ExplicitHeight = 49
     inherited tbxMain: TTBXToolbar
       Left = 97
       ExplicitLeft = 97
@@ -101,16 +67,19 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente
       ExplicitWidth = 654
     end
     inherited TBXTMain2: TTBXToolbar
-      Left = 318
-      ExplicitLeft = 318
-      ExplicitHeight = 23
+      Left = 468
+      Top = 23
+      DockPos = 462
+      DockRow = 1
+      ExplicitLeft = 468
+      ExplicitTop = 23
     end
   end
   inherited StatusBar: TJvStatusBar
     Width = 654
     ExplicitWidth = 654
   end
-  inline frViewBarraSeleccion1: TfrViewBarraSeleccion [4]
+  inline frViewBarraSeleccion1: TfrViewBarraSeleccion [3]
     Left = 0
     Top = 611
     Width = 654
@@ -155,19 +124,69 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente
       end
     end
   end
-  inherited frViewFacturasCliente1: TfrViewFacturasCliente [5]
-    Top = 159
+  object pnlHeader: TPanel [4]
+    Left = 0
+    Top = 0
     Width = 654
-    Height = 452
-    ExplicitTop = 159
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
+    TabOrder = 5
+    object lblTitle: TLabel
+      AlignWithMargins = True
+      Left = 25
+      Top = 8
+      Width = 604
+      Height = 13
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 8
+      Align = alTop
+      Caption = 
+        'Seleccione las facturas de cliente, que desea liquidar su comisi' +
+        #243'n'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      ExplicitWidth = 365
+    end
+    object lblComments: TLabel
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 579
+      Height = 24
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
+    end
+  end
+  inherited frViewFacturasCliente1: TfrViewFacturasCliente [5]
+    Top = 140
+    Width = 654
+    Height = 471
+    ExplicitTop = 163
     ExplicitWidth = 654
-    ExplicitHeight = 452
+    ExplicitHeight = 448
     inherited cxGrid: TcxGrid
       Width = 654
-      Height = 324
+      Height = 343
       RootLevelOptions.DetailTabsPosition = dtpNone
       ExplicitWidth = 654
-      ExplicitHeight = 324
+      ExplicitHeight = 320
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.DefaultGroupSummaryItems = <
           item
@@ -215,22 +234,22 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente
             Width = 121
           end
           inherited edtFechaFinFiltro: TcxDateEdit
-            Left = 225
+            Left = 208
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 225
+            ExplicitLeft = 208
             ExplicitWidth = 416
             Width = 416
           end
           inherited eLista: TcxComboBox
-            Left = 678
+            Left = 624
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 678
+            ExplicitLeft = 624
             ExplicitWidth = 20
             Width = 20
           end
@@ -246,8 +265,8 @@ inherited fEditorElegirFacturasCliente: TfEditorElegirFacturasCliente
       end
     end
     inherited pnlAgrupaciones: TTBXDockablePanel
-      Top = 426
-      ExplicitTop = 426
+      Top = 445
+      ExplicitTop = 422
       ExplicitWidth = 654
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 654
diff --git a/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.pas
index a85b6f1c..f85160ee 100644
--- a/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.pas	
+++ b/Source/Modulos/Facturas de cliente/Views/uEditorElegirFacturasCliente.pas	
@@ -33,7 +33,7 @@ uses
   JvExComCtrls, JvStatusBar,
   ComCtrls, TB2ExtItems, TBXExtItems, TBX,
   TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent,
-  JvNavigationPane, uViewBarraSeleccion, JvgWizardHeader, StdCtrls,
+  JvNavigationPane, uViewBarraSeleccion, StdCtrls,
 
   uViewFacturasCliente, uEditorFacturasCliente, uBizFacturasCliente, uIEditorElegirFacturasCliente,
   Buttons, cxRadioGroup, cxMaskEdit, cxDropDownEdit, cxCalendar, cxControls,
@@ -43,7 +43,8 @@ uses
 type
   TfEditorElegirFacturasCliente = class(TfEditorFacturasCliente, IEditorElegirFacturasCliente)
     frViewBarraSeleccion1: TfrViewBarraSeleccion;
-    JvgWizardHeader1: TJvgWizardHeader;
+    lblTitle: TLabel;
+    lblComments: TLabel;
     EditorSeleccionActionList: TActionList;
     actBuscar2: TAction;
     actQuitarFiltro2: TAction;
@@ -121,7 +122,7 @@ end;
 
 function TfEditorElegirFacturasCliente.GetMensaje: String;
 begin
-  Result := JvgWizardHeader1.Comments.Text;
+  Result := lblComments.Caption;
 end;
 
 function TfEditorElegirFacturasCliente.GetMultiSelect: Boolean;
@@ -131,7 +132,7 @@ end;
 
 procedure TfEditorElegirFacturasCliente.SetMensaje(const AValue: String);
 begin
-  JvgWizardHeader1.Comments.Text := AValue;
+  lblComments.Caption := AValue;
 end;
 
 procedure TfEditorElegirFacturasCliente.SetMultiSelect(AValue: Boolean);
diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorElegirArticulosFacturaProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uEditorElegirArticulosFacturaProveedor.pas
index d115359e..de9b84bd 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uEditorElegirArticulosFacturaProveedor.pas	
+++ b/Source/Modulos/Facturas de proveedor/Views/uEditorElegirArticulosFacturaProveedor.pas	
@@ -9,7 +9,7 @@ uses
   StdActns, ActnList, uCustomView, uViewBase, uViewBarraSeleccion, ComCtrls,
   JvExComCtrls, JvStatusBar, TBX, TB2ExtItems, TBXExtItems, TB2Item, TB2Dock,
   TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane,
-  JvgWizardHeader, uIEditorElegirArticulosFacturasProveedor, uBizContactos,
+  uIEditorElegirArticulosFacturasProveedor, uBizContactos,
   uDAInterfaces, uViewGridBase, uViewGrid, uViewArticulos;
 
 type
diff --git a/Source/Modulos/Facturas de proveedor/Views/uEditorElegirDomiciliacion.dfm b/Source/Modulos/Facturas de proveedor/Views/uEditorElegirDomiciliacion.dfm
index 2f7e33ee..f21c9ca9 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uEditorElegirDomiciliacion.dfm	
+++ b/Source/Modulos/Facturas de proveedor/Views/uEditorElegirDomiciliacion.dfm	
@@ -82,6 +82,6 @@ object fEditorElegirDomiciliacion: TfEditorElegirDomiciliacion
     StyleFocused.LookAndFeel.SkinName = ''
     StyleHot.LookAndFeel.SkinName = ''
     TabOrder = 1
-    Width = 378
+    Width = 297
   end
 end
diff --git a/Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas b/Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas
index 53adb3ff..7f39ee65 100644
--- a/Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas
+++ b/Source/Modulos/Inventario/Model/schInventarioClient_Intf.pas
@@ -3,7 +3,7 @@ unit schInventarioClient_Intf;
 interface
 
 uses
-  Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
 
 const
   { Data table rules ids
@@ -221,7 +221,7 @@ type
   end;
 
   { TInventarioDataTableRules }
-  TInventarioDataTableRules = class(TDADataTableRules, IInventario)
+  TInventarioDataTableRules = class(TIntfObjectDADataTableRules, IInventario)
   private
   protected
     { Property getters and setters }
@@ -460,7 +460,7 @@ type
   end;
 
   { TDetalleReservasDataTableRules }
-  TDetalleReservasDataTableRules = class(TDADataTableRules, IDetalleReservas)
+  TDetalleReservasDataTableRules = class(TIntfObjectDADataTableRules, IDetalleReservas)
   private
   protected
     { Property getters and setters }
diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm
index a23b00f0..1886b079 100644
--- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm
+++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.dfm
@@ -4,43 +4,14 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen
   ExplicitWidth = 840
   PixelsPerInch = 96
   TextHeight = 13
-  object JvgWizardHeader1: TJvgWizardHeader [0]
-    Left = 0
-    Top = 27
-    Width = 832
-    Height = 60
-    CaptionFont.Charset = DEFAULT_CHARSET
-    CaptionFont.Color = clWindowText
-    CaptionFont.Height = -11
-    CaptionFont.Name = 'Tahoma'
-    CaptionFont.Style = [fsBold]
-    CommentFont.Charset = DEFAULT_CHARSET
-    CommentFont.Color = clWindowText
-    CommentFont.Height = -11
-    CommentFont.Name = 'Tahoma'
-    CommentFont.Style = []
-    SymbolFont.Charset = DEFAULT_CHARSET
-    SymbolFont.Color = clHighlightText
-    SymbolFont.Height = -35
-    SymbolFont.Name = 'Wingdings'
-    SymbolFont.Style = [fsBold]
-    Captions.Strings = (
-      'Seleccione los art'#237'culos')
-    Comments.Strings = (
-      ' ')
-    Gradient.FromColor = clHighlight
-    Gradient.ToColor = clWindow
-    Gradient.Active = False
-    Gradient.Orientation = fgdVertical
-    BufferedDraw = False
-    ExplicitTop = 87
-    ExplicitWidth = 656
-  end
   inherited JvNavPanelHeader: TJvNavPanelHeader
+    Top = 113
     Width = 832
     Caption = 'Lista de art'#237'culos'
     Visible = False
-    ExplicitWidth = 656
+    ExplicitLeft = 8
+    ExplicitTop = 146
+    ExplicitWidth = 832
     inherited Image1: TImage
       Left = 805
       ExplicitLeft = 629
@@ -51,11 +22,11 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen
     end
   end
   inherited TBXDock: TTBXDock
-    Top = 87
+    Top = 64
     Width = 832
     Height = 49
-    ExplicitTop = 87
-    ExplicitWidth = 656
+    ExplicitTop = 91
+    ExplicitWidth = 832
     ExplicitHeight = 49
     inherited tbxMain: TTBXToolbar
       Align = alLeft
@@ -106,9 +77,9 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen
   inherited StatusBar: TJvStatusBar
     Width = 832
     Visible = False
-    ExplicitWidth = 656
+    ExplicitWidth = 832
   end
-  inline frViewBarraSeleccion1: TfrViewBarraSeleccion [4]
+  inline frViewBarraSeleccion1: TfrViewBarraSeleccion [3]
     Left = 0
     Top = 472
     Width = 832
@@ -123,10 +94,10 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen
     TabOrder = 0
     ReadOnly = False
     ExplicitTop = 472
-    ExplicitWidth = 656
+    ExplicitWidth = 832
     inherited JvFooter1: TJvFooter
       Width = 832
-      ExplicitWidth = 656
+      ExplicitWidth = 832
       DesignSize = (
         832
         49)
@@ -151,18 +122,67 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen
       end
     end
   end
-  inherited frViewInventario1: TfrViewInventario [5]
-    Top = 136
+  object pnlHeader: TPanel [4]
+    Left = 0
+    Top = 0
     Width = 832
-    Height = 336
-    ExplicitTop = 136
-    ExplicitWidth = 656
-    ExplicitHeight = 336
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
+    TabOrder = 5
+    ExplicitTop = 27
+    object lblTitle: TLabel
+      AlignWithMargins = True
+      Left = 25
+      Top = 8
+      Width = 782
+      Height = 13
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 8
+      Align = alTop
+      Caption = 'Seleccione los art'#237'culos'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      ExplicitWidth = 131
+    end
+    object lblComments: TLabel
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 757
+      Height = 24
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
+    end
+  end
+  inherited frViewInventario1: TfrViewInventario [5]
+    Top = 140
+    Width = 832
+    Height = 332
+    ExplicitTop = 140
+    ExplicitWidth = 832
+    ExplicitHeight = 332
     inherited cxGrid: TcxGrid
       Width = 832
-      Height = 167
-      ExplicitWidth = 656
-      ExplicitHeight = 167
+      Height = 163
+      ExplicitWidth = 832
+      ExplicitHeight = 163
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.DefaultGroupSummaryItems = <
           item
@@ -185,12 +205,12 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase
       Width = 832
-      ExplicitWidth = 656
+      ExplicitWidth = 832
       inherited TBXDockablePanel1: TTBXDockablePanel
-        ExplicitWidth = 656
+        ExplicitWidth = 832
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 832
-          ExplicitWidth = 656
+          ExplicitWidth = 832
           inherited txtFiltroTodo: TcxTextEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
@@ -206,52 +226,55 @@ inherited fEditorElegirArticulosAlmacen: TfEditorElegirArticulosAlmacen
             StyleHot.LookAndFeel.SkinName = ''
           end
           inherited edtFechaFinFiltro: TcxDateEdit
+            Left = 440
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 440
             ExplicitWidth = 241
             Width = 241
           end
           inherited eLista: TcxComboBox
-            Left = 628
+            Left = 788
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 628
+            ExplicitLeft = 788
             ExplicitWidth = 20
             Width = 20
           end
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
           Width = 832
-          ExplicitWidth = 656
+          ExplicitWidth = 832
           inherited tbxBotones: TTBXToolbar
             Width = 822
-            ExplicitWidth = 646
+            ExplicitWidth = 822
           end
         end
       end
     end
     inherited pnlAgrupaciones: TTBXDockablePanel
-      Top = 310
-      ExplicitTop = 310
-      ExplicitWidth = 656
+      Top = 306
+      ExplicitTop = 306
+      ExplicitWidth = 832
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 832
-        ExplicitWidth = 656
+        ExplicitWidth = 832
         inherited TBXToolbar1: TTBXToolbar
           Width = 822
-          ExplicitWidth = 646
+          ExplicitWidth = 822
         end
       end
     end
     inherited pnlAlmacenes: TPanel
       Width = 832
-      ExplicitWidth = 656
+      ExplicitWidth = 832
       inherited cxListaAlmacenesObras: TcxComboBox
         Properties.OnEditValueChanged = nil
+        ExplicitWidth = 757
         Width = 757
       end
     end
diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas
index a4c878b6..ff2071f2 100644
--- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas
+++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosAlmacen.pas
@@ -9,7 +9,7 @@ uses
   ActnList, uCustomView, uViewBase, uViewGridBase, uViewGrid,
   uViewArticulos, ComCtrls, TB2ExtItems, TBXExtItems, TBX,
   TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent,
-  JvNavigationPane, uViewBarraSeleccion, JvgWizardHeader, StdCtrls,
+  JvNavigationPane, uViewBarraSeleccion, StdCtrls,
   uEditorArticulos, uBizArticulos, uIEditorElegirArticulosAlmacen,
   JvExComCtrls, JvStatusBar, uEditorInventario, uViewInventario, uBizInventario,
   JSDialog, uDAInterfaces, dxGDIPlusClasses;
@@ -17,7 +17,8 @@ uses
 type
   TfEditorElegirArticulosAlmacen = class(TfEditorInventario, IEditorElegirArticulosAlmacen)
     frViewBarraSeleccion1: TfrViewBarraSeleccion;
-    JvgWizardHeader1: TJvgWizardHeader;
+    lblTitle: TLabel;
+    lblComments: TLabel;
     EditorSeleccionActionList: TActionList;
     actBuscar2: TAction;
     actQuitarFiltro2: TAction;
@@ -99,7 +100,7 @@ end;
 
 function TfEditorElegirArticulosAlmacen.GetMensaje: String;
 begin
-  Result := JvgWizardHeader1.Comments.Text;
+  Result := lblComments.Caption;
 end;
 
 function TfEditorElegirArticulosAlmacen.GetMultiSelect: Boolean;
@@ -109,7 +110,7 @@ end;
 
 procedure TfEditorElegirArticulosAlmacen.SetMensaje(const AValue: String);
 begin
-  JvgWizardHeader1.Comments.Text := AValue;
+  lblComments.Caption := AValue;
 end;
 
 procedure TfEditorElegirArticulosAlmacen.SetMultiSelect(AValue: Boolean);
diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm b/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm
index e1d23824..0fa873fd 100644
--- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm
+++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.dfm
@@ -6,8 +6,53 @@ inherited fEditorElegirArticulosCatalogo: TfEditorElegirArticulosCatalogo
   ExplicitHeight = 611
   PixelsPerInch = 96
   TextHeight = 13
-  inherited JvgWizardHeader1: TJvgWizardHeader
-    Width = 697
+  object pnlHeader: TPanel
+    Left = 0
+    Top = 0
+    Width = 656
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
+    TabOrder = 5
+    object lblTitle: TLabel
+      AlignWithMargins = True
+      Left = 25
+      Top = 8
+      Width = 606
+      Height = 13
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 8
+      Align = alTop
+      Caption = ''
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      ExplicitWidth = 135
+    end
+    object lblComments: TLabel
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 581
+      Height = 27
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
+    end
   end
   inherited JvNavPanelHeader: TJvNavPanelHeader
     Width = 697
diff --git a/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas b/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas
index f3ebf038..712af720 100644
--- a/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas
+++ b/Source/Modulos/Inventario/Views/uEditorElegirArticulosCatalogo.pas
@@ -9,7 +9,7 @@ uses
   StdActns, ActnList, uCustomView, uViewBase, uViewBarraSeleccion, ComCtrls,
   JvExComCtrls, JvStatusBar, TBX, TB2ExtItems, TBXExtItems, TB2Item, TB2Dock,
   TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane,
-  JvgWizardHeader, uIEditorElegirArticulosCatalogo, uDAInterfaces,
+  uIEditorElegirArticulosCatalogo, uDAInterfaces,
   uViewGridBase, uViewGrid, uViewArticulos, uViewElegirArticulosCatalogo;
 
 type
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirArticulosPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirArticulosPedidoProveedor.pas
index 25d6c8b7..41ffbc96 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirArticulosPedidoProveedor.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirArticulosPedidoProveedor.pas	
@@ -9,7 +9,7 @@ uses
   StdActns, ActnList, uCustomView, uViewBase, uViewBarraSeleccion, ComCtrls,
   JvExComCtrls, JvStatusBar, TBX, TB2ExtItems, TBXExtItems, TB2Item, TB2Dock,
   TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane,
-  JvgWizardHeader, uIEditorElegirArticulosPedidosProveedor, uBizContactos,
+  uIEditorElegirArticulosPedidosProveedor, uBizContactos,
   uDAInterfaces, uViewGridBase, uViewGrid, uViewArticulos, uBizArticulos,
   uViewArticulosPorProveedor, uEditorElegirArticulos;
 
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.dfm
index f1f41325..d5f5d47f 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.dfm	
@@ -5,41 +5,13 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor
   ExplicitHeight = 538
   PixelsPerInch = 96
   TextHeight = 13
-  object JvgWizardHeader1: TJvgWizardHeader [0]
-    Left = 0
-    Top = 27
-    Width = 656
-    Height = 60
-    CaptionFont.Charset = DEFAULT_CHARSET
-    CaptionFont.Color = clWindowText
-    CaptionFont.Height = -11
-    CaptionFont.Name = 'Tahoma'
-    CaptionFont.Style = [fsBold]
-    CommentFont.Charset = DEFAULT_CHARSET
-    CommentFont.Color = clWindowText
-    CommentFont.Height = -11
-    CommentFont.Name = 'Tahoma'
-    CommentFont.Style = []
-    SymbolFont.Charset = DEFAULT_CHARSET
-    SymbolFont.Color = clHighlightText
-    SymbolFont.Height = -35
-    SymbolFont.Name = 'Wingdings'
-    SymbolFont.Style = [fsBold]
-    Captions.Strings = (
-      'Seleccione el pedido de proveedor')
-    Comments.Strings = (
-      ' ')
-    Gradient.FromColor = clHighlight
-    Gradient.ToColor = clWindow
-    Gradient.Active = False
-    Gradient.Orientation = fgdVertical
-    BufferedDraw = False
-    ExplicitTop = 16
-  end
   inherited JvNavPanelHeader: TJvNavPanelHeader
+    Top = 113
     Width = 656
     Caption = 'Lista de pedidos de proveedor'
     Visible = False
+    ExplicitLeft = 8
+    ExplicitTop = 169
     ExplicitWidth = 656
     inherited Image1: TImage
       Left = 629
@@ -47,12 +19,12 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor
     end
   end
   inherited TBXDock: TTBXDock
-    Top = 87
+    Top = 64
     Width = 656
-    Height = 72
-    ExplicitTop = 87
+    Height = 49
+    ExplicitTop = 64
     ExplicitWidth = 656
-    ExplicitHeight = 72
+    ExplicitHeight = 49
     inherited tbxMain: TTBXToolbar
       Left = 427
       Align = alRight
@@ -86,11 +58,14 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor
       ExplicitWidth = 656
     end
     inherited TBXTMain2: TTBXToolbar
-      Left = 318
+      Left = 559
+      Top = 23
+      DockPos = 559
+      DockRow = 1
       Visible = False
-      ExplicitLeft = 318
+      ExplicitLeft = 559
+      ExplicitTop = 23
       ExplicitWidth = 66
-      ExplicitHeight = 23
     end
   end
   inherited StatusBar: TJvStatusBar
@@ -98,7 +73,7 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor
     Visible = False
     ExplicitWidth = 656
   end
-  inline frViewBarraSeleccion1: TfrViewBarraSeleccion [4]
+  inline frViewBarraSeleccion1: TfrViewBarraSeleccion [3]
     Left = 0
     Top = 436
     Width = 656
@@ -136,19 +111,68 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor
       end
     end
   end
-  inherited frViewPedidosProveedor1: TfrViewPedidosProveedor [5]
-    Top = 159
+  object pnlHeader: TPanel [4]
+    Left = 0
+    Top = 0
     Width = 656
-    Height = 277
-    ExplicitTop = 159
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
+    TabOrder = 5
+    ExplicitTop = 27
+    object lblTitle: TLabel
+      AlignWithMargins = True
+      Left = 25
+      Top = 8
+      Width = 606
+      Height = 13
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 8
+      Align = alTop
+      Caption = 'Seleccione el pedido de proveedor'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      ExplicitWidth = 193
+    end
+    object lblComments: TLabel
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 581
+      Height = 24
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
+    end
+  end
+  inherited frViewPedidosProveedor1: TfrViewPedidosProveedor [5]
+    Top = 140
+    Width = 656
+    Height = 296
+    ExplicitTop = 163
     ExplicitWidth = 656
-    ExplicitHeight = 277
+    ExplicitHeight = 273
     inherited cxGrid: TcxGrid
       Width = 656
-      Height = 149
+      Height = 168
       RootLevelOptions.DetailTabsPosition = dtpNone
       ExplicitWidth = 656
-      ExplicitHeight = 149
+      ExplicitHeight = 145
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.DefaultGroupSummaryItems = <
           item
@@ -186,22 +210,26 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 267
+            Width = 267
           end
           inherited edtFechaFinFiltro: TcxDateEdit
+            Left = 271
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 271
             ExplicitWidth = 277
             Width = 277
           end
           inherited eLista: TcxComboBox
-            Left = 685
+            Left = 502
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 685
+            ExplicitLeft = 502
             ExplicitWidth = 215
             Width = 215
           end
@@ -217,8 +245,8 @@ inherited fEditorElegirPedidosProveedor: TfEditorElegirPedidosProveedor
       end
     end
     inherited pnlAgrupaciones: TTBXDockablePanel
-      Top = 251
-      ExplicitTop = 251
+      Top = 270
+      ExplicitTop = 247
       ExplicitWidth = 656
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 656
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.pas
index a506bfab..576c6796 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPedidosProveedor.pas	
@@ -9,7 +9,7 @@ uses
   ActnList, uCustomView, uViewBase, uViewGridBase, uViewGrid,
   ComCtrls, TB2ExtItems, TBXExtItems, TBX, TB2Item, TB2Dock, TB2Toolbar,
   pngimage, ExtCtrls, JvExControls, JvComponent,
-  JvNavigationPane, uViewBarraSeleccion, JvgWizardHeader, StdCtrls,
+  JvNavigationPane, uViewBarraSeleccion, StdCtrls,
   uBizPedidosProveedor, uIEditorElegirPedidosProveedor,
   JvExComCtrls, JvStatusBar, uEditorPedidosProveedor, uViewPedidosProveedor,
   JSDialog, uDAInterfaces;
@@ -17,7 +17,8 @@ uses
 type
   TfEditorElegirPedidosProveedor = class(TfEditorPedidosProveedor, IEditorElegirPedidosProveedor)
     frViewBarraSeleccion1: TfrViewBarraSeleccion;
-    JvgWizardHeader1: TJvgWizardHeader;
+    lblTitle: TLabel;
+    lblComments: TLabel;
     EditorSeleccionActionList: TActionList;
     actBuscar2: TAction;
     actQuitarFiltro2: TAction;
@@ -99,7 +100,7 @@ end;
 
 function TfEditorElegirPedidosProveedor.GetMensaje: String;
 begin
-  Result := JvgWizardHeader1.Comments.Text;
+  Result := lblComments.Caption;
 end;
 
 function TfEditorElegirPedidosProveedor.GetMultiSelect: Boolean;
@@ -109,7 +110,7 @@ end;
 
 procedure TfEditorElegirPedidosProveedor.SetMensaje(const AValue: String);
 begin
-  JvgWizardHeader1.Comments.Text := AValue;
+  lblComments.Caption := AValue;
 end;
 
 procedure TfEditorElegirPedidosProveedor.SetMultiSelect(AValue: Boolean);
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPersonaContactoPedido.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPersonaContactoPedido.dfm
index 72c191eb..870c5d0c 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPersonaContactoPedido.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorElegirPersonaContactoPedido.dfm	
@@ -2,11 +2,11 @@ inherited fEditorElegirPersonaContactoPedido: TfEditorElegirPersonaContactoPedid
   BorderStyle = bsDialog
   Caption = 'Entrega del material del pedido'
   ClientHeight = 269
-  ClientWidth = 410
+  ClientWidth = 435
   Position = poScreenCenter
   OnCreate = CustomEditorCreate
   OnShow = CustomEditorShow
-  ExplicitWidth = 416
+  ExplicitWidth = 441
   ExplicitHeight = 301
   PixelsPerInch = 96
   TextHeight = 13
@@ -21,15 +21,15 @@ inherited fEditorElegirPersonaContactoPedido: TfEditorElegirPersonaContactoPedid
   object Panel1: TPanel
     Left = 0
     Top = 228
-    Width = 410
+    Width = 435
     Height = 41
     Align = alBottom
     TabOrder = 0
     DesignSize = (
-      410
+      435
       41)
     object bAceptar: TButton
-      Left = 246
+      Left = 271
       Top = 8
       Width = 75
       Height = 25
@@ -39,7 +39,7 @@ inherited fEditorElegirPersonaContactoPedido: TfEditorElegirPersonaContactoPedid
       TabOrder = 0
     end
     object bCancelar: TButton
-      Left = 327
+      Left = 352
       Top = 8
       Width = 75
       Height = 25
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorSituacionPedidoProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uEditorSituacionPedidoProveedor.dfm
index bd79ad52..9eb522a2 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorSituacionPedidoProveedor.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorSituacionPedidoProveedor.dfm	
@@ -15,38 +15,55 @@ object fEditorSituacionPedidoProveedor: TfEditorSituacionPedidoProveedor
   Position = poMainFormCenter
   PixelsPerInch = 96
   TextHeight = 13
-  object JvgWizardHeader1: TJvgWizardHeader
+  object pnlHeader: TPanel
     Left = 0
     Top = 0
-    Width = 434
-    Height = 73
-    CaptionFont.Charset = DEFAULT_CHARSET
-    CaptionFont.Color = clWindowText
-    CaptionFont.Height = -11
-    CaptionFont.Name = 'Tahoma'
-    CaptionFont.Style = [fsBold]
-    CommentFont.Charset = DEFAULT_CHARSET
-    CommentFont.Color = clWindowText
-    CommentFont.Height = -11
-    CommentFont.Name = 'Tahoma'
-    CommentFont.Style = []
-    SymbolFont.Charset = DEFAULT_CHARSET
-    SymbolFont.Color = clHighlightText
-    SymbolFont.Height = -35
-    SymbolFont.Name = 'Wingdings'
-    SymbolFont.Style = [fsBold]
-    Captions.Strings = (
-      'Cambiar la situaci'#243'n del pedido')
-    Comments.Strings = (
-      
-        'Indique la nueva situaci'#243'n del pedido o pulse en '#39'Cancelar'#39' para' +
-        ' no hacer ning'#250'n cambio.')
-    Gradient.FromColor = clHighlight
-    Gradient.ToColor = clWindow
-    Gradient.Active = True
-    Gradient.Orientation = fgdVertical
-    BufferedDraw = False
-    ExplicitWidth = 491
+    Width = 656
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
+    TabOrder = 5
+    object lblTitle: TLabel
+      AlignWithMargins = True
+      Left = 25
+      Top = 8
+      Width = 606
+      Height = 13
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 8
+      Align = alTop
+      Caption = 'Cambiar la situaci'#243'n del pedido'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      ExplicitWidth = 135
+    end
+    object lblComments: TLabel
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 581
+      Height = 27
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
+      Caption = 'Indique la nueva situaci'#243'n del pedido o pulse en '#39'Cancelar'#39' para' +
+        ' no hacer ning'#250'n cambio.'
+    end
   end
   object Label4: TLabel
     Left = 56
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uEditorSituacionPedidoProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uEditorSituacionPedidoProveedor.pas
index e1b7946f..d1ae08f9 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uEditorSituacionPedidoProveedor.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uEditorSituacionPedidoProveedor.pas	
@@ -6,7 +6,7 @@ uses
   Windows, Messages, SysUtils, Variants, Classes, Graphics, Controls, Forms,
   Dialogs, StdCtrls, ExtCtrls,
   uIEditorSituacionPedidoProveedor, uPedidosProveedorController, uBizPedidosProveedor,
-  JvExControls, JvComponent, JvgWizardHeader, cxControls, cxContainer, cxEdit,
+  JvExControls, JvComponent, cxControls, cxContainer, cxEdit,
   cxTextEdit, cxMaskEdit, cxDropDownEdit, cxCalendar, cxDBEdit, ActnList;
 
 type
@@ -14,7 +14,8 @@ type
     pnlSeleccion: TPanel;
     bAceptar: TButton;
     bCancelar: TButton;
-    JvgWizardHeader1: TJvgWizardHeader;
+    lblTitle: TLabel;
+    lblComments: TLabel;
     rbPendiente: TRadioButton;
     rbParcial: TRadioButton;
     ActionList1: TActionList;
diff --git a/Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.dproj b/Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.dproj
index e93c8f8b..96ac612e 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.dproj	
+++ b/Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.dproj	
@@ -49,27 +49,30 @@
     <DelphiCompile Include="PresupuestosCliente_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="adortl.dcp" />
-    <DCCReference Include="Articulos_view.dcp" />
-    <DCCReference Include="Base.dcp" />
-    <DCCReference Include="cxDataD11.dcp" />
-    <DCCReference Include="cxEditorsD11.dcp" />
-    <DCCReference Include="cxLibraryD11.dcp" />
-    <DCCReference Include="DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="dbrtl.dcp" />
-    <DCCReference Include="dsnap.dcp" />
-    <DCCReference Include="dxComnD11.dcp" />
-    <DCCReference Include="dxGDIPlusD11.dcp" />
-    <DCCReference Include="dxLayoutControlD11.dcp" />
-    <DCCReference Include="dxThemeD11.dcp" />
-    <DCCReference Include="GestorInformes_controller.dcp" />
-    <DCCReference Include="GUIBase.dcp" />
-    <DCCReference Include="PreCli_AlbCli_relation.dcp" />
-    <DCCReference Include="PreCli_FacCli_relation.dcp" />
-    <DCCReference Include="PresupuestosCliente_controller.dcp" />
-    <DCCReference Include="PresupuestosCliente_model.dcp" />
-    <DCCReference Include="RemObjects_Core_D11.dcp" />
-    <DCCReference Include="rtl.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\adortl.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\Articulos_view.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\Base.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\cxDataD11.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\cxEditorsD11.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\cxLibraryD11.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\dbrtl.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\dsnap.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\dxComnD11.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\dxThemeD11.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\GestorInformes_controller.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\GUIBase.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\PreCli_AlbCli_relation.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\PreCli_FacCli_relation.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\PresupuestosCliente_controller.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\PresupuestosCliente_model.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\rtl.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\vcl.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\vcldb.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\vcljpg.dcp" />
     <DCCReference Include="uEditorAsignarDescuento.pas">
       <Form>fEditorAsignarDescuento</Form>
     </DCCReference>
@@ -130,9 +133,6 @@
       <Form>frViewTotalesPresupuesto</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
-    <DCCReference Include="vcl.dcp" />
-    <DCCReference Include="vcldb.dcp" />
-    <DCCReference Include="vcljpg.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirArticulosPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirArticulosPresupuestoCliente.pas
index a3e0b960..4baa73f3 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirArticulosPresupuestoCliente.pas	
+++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirArticulosPresupuestoCliente.pas	
@@ -9,7 +9,7 @@ uses
   StdActns, ActnList, uCustomView, uViewBase, uViewBarraSeleccion, ComCtrls,
   JvExComCtrls, JvStatusBar, TBX, TB2ExtItems, TBXExtItems, TB2Item, TB2Dock,
   TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent, JvNavigationPane,
-  JvgWizardHeader, uIEditorElegirArticulosPresupuestosCliente, uDAInterfaces,
+  uIEditorElegirArticulosPresupuestosCliente, uDAInterfaces,
   uViewGridBase, uViewGrid, uViewArticulos;
 
 type
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirPresupuestosCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirPresupuestosCliente.dfm
index ca21ce77..18a67f8a 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirPresupuestosCliente.dfm	
+++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirPresupuestosCliente.dfm	
@@ -5,41 +5,12 @@ inherited fEditorElegirPresupuestosCliente: TfEditorElegirPresupuestosCliente
   ExplicitHeight = 538
   PixelsPerInch = 96
   TextHeight = 13
-  object JvgWizardHeader1: TJvgWizardHeader [0]
-    Left = 0
-    Top = 27
-    Width = 656
-    Height = 60
-    CaptionFont.Charset = DEFAULT_CHARSET
-    CaptionFont.Color = clWindowText
-    CaptionFont.Height = -11
-    CaptionFont.Name = 'Tahoma'
-    CaptionFont.Style = [fsBold]
-    CommentFont.Charset = DEFAULT_CHARSET
-    CommentFont.Color = clWindowText
-    CommentFont.Height = -11
-    CommentFont.Name = 'Tahoma'
-    CommentFont.Style = []
-    SymbolFont.Charset = DEFAULT_CHARSET
-    SymbolFont.Color = clHighlightText
-    SymbolFont.Height = -35
-    SymbolFont.Name = 'Wingdings'
-    SymbolFont.Style = [fsBold]
-    Captions.Strings = (
-      'Seleccione el pedido de cliente')
-    Comments.Strings = (
-      ' ')
-    Gradient.FromColor = clHighlight
-    Gradient.ToColor = clWindow
-    Gradient.Active = False
-    Gradient.Orientation = fgdVertical
-    BufferedDraw = False
-    ExplicitLeft = -8
-    ExplicitTop = 8
-  end
   inherited JvNavPanelHeader: TJvNavPanelHeader
+    Top = 139
     Width = 656
     Visible = False
+    ExplicitLeft = 8
+    ExplicitTop = 232
     ExplicitWidth = 656
     inherited Image1: TImage
       Left = 629
@@ -47,9 +18,9 @@ inherited fEditorElegirPresupuestosCliente: TfEditorElegirPresupuestosCliente
     end
   end
   inherited TBXDock: TTBXDock
-    Top = 87
+    Top = 64
     Width = 656
-    ExplicitTop = 87
+    ExplicitTop = 91
     ExplicitWidth = 656
     inherited tbxMain: TTBXToolbar
       Left = 427
@@ -97,6 +68,55 @@ inherited fEditorElegirPresupuestosCliente: TfEditorElegirPresupuestosCliente
     Width = 656
     ExplicitWidth = 656
   end
+  object pnlHeader: TPanel [3]
+    Left = 0
+    Top = 0
+    Width = 656
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
+    TabOrder = 4
+    ExplicitTop = 27
+    object lblTitle: TLabel
+      AlignWithMargins = True
+      Left = 25
+      Top = 8
+      Width = 606
+      Height = 13
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 8
+      Align = alTop
+      Caption = 'Seleccione el pedido de cliente'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      ExplicitWidth = 172
+    end
+    object lblComments: TLabel
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 581
+      Height = 24
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
+    end
+  end
   inline frViewBarraSeleccion1: TfrViewBarraSeleccion [4]
     Left = 0
     Top = 449
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirPresupuestosCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirPresupuestosCliente.pas
index 7c8d5e7f..b2a0a130 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirPresupuestosCliente.pas	
+++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorElegirPresupuestosCliente.pas	
@@ -9,14 +9,15 @@ uses
   ActnList, uCustomView, uViewBase, uViewGridBase, uViewGrid,
   uViewPresupuestosCliente, ComCtrls, TB2ExtItems, TBXExtItems, TBX,
   TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent,
-  JvNavigationPane, uViewBarraSeleccion, JvgWizardHeader, StdCtrls,
+  JvNavigationPane, uViewBarraSeleccion, StdCtrls,
   uEditorPresupuestosCliente, uBizPresupuestosCliente, uIEditorElegirPresupuestosCliente,
   JvExComCtrls, JvStatusBar, JSDialog, uDAInterfaces;
 
 type
   TfEditorElegirPresupuestosCliente = class(TfEditorPresupuestosCliente, IEditorElegirPresupuestosCliente)
     frViewBarraSeleccion1: TfrViewBarraSeleccion;
-    JvgWizardHeader1: TJvgWizardHeader;
+    lblTitle: TLabel;
+    lblComments: TLabel;
     EditorSeleccionActionList: TActionList;
     actBuscar2: TAction;
     actQuitarFiltro2: TAction;
@@ -99,7 +100,7 @@ end;
 
 function TfEditorElegirPresupuestosCliente.GetMensaje: String;
 begin
-  Result := JvgWizardHeader1.Comments.Text;
+  Result := lblComments.Caption;
 end;
 
 function TfEditorElegirPresupuestosCliente.GetMultiSelect: Boolean;
@@ -109,7 +110,7 @@ end;
 
 procedure TfEditorElegirPresupuestosCliente.SetMensaje(const AValue: String);
 begin
-  JvgWizardHeader1.Comments.Text := AValue;
+  lblComments.Caption := AValue;
 end;
 
 procedure TfEditorElegirPresupuestosCliente.SetMultiSelect(AValue: Boolean);
diff --git a/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.dproj b/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.dproj
index 03f3aec7..a06b8fa8 100644
--- a/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.dproj	
+++ b/Source/Modulos/Recibos de cliente/Views/RecibosCliente_view.dproj	
@@ -47,11 +47,11 @@
     <DelphiCompile Include="RecibosCliente_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Lib\GestorInformes_controller.dcp" />
-    <DCCReference Include="..\..\Lib\GUIBase.dcp" />
-    <DCCReference Include="..\..\Lib\JvGlobusD11R.dcp" />
-    <DCCReference Include="..\..\Lib\RecibosCliente_controller.dcp" />
-    <DCCReference Include="..\..\Lib\RecibosCliente_model.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\GestorInformes_controller.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\GUIBase.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\JvGlobusD11R.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\RecibosCliente_controller.dcp" />
+    <DCCReference Include="..\..\Albaranes de cliente\RecibosCliente_model.dcp" />
     <DCCReference Include="uEditorElegirRecibosCliente.pas">
       <Form>fEditorElegirRecibosCliente</Form>
       <DesignClass>TfEditorElegirRecibosCliente</DesignClass>
diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm
index 117dfe02..165f670e 100644
--- a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm	
+++ b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.dfm	
@@ -4,44 +4,11 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
   ExplicitWidth = 678
   PixelsPerInch = 96
   TextHeight = 13
-  object JvgWizardHeader1: TJvgWizardHeader [0]
-    Left = 0
-    Top = 0
-    Width = 670
-    Height = 60
-    CaptionFont.Charset = DEFAULT_CHARSET
-    CaptionFont.Color = clWindowText
-    CaptionFont.Height = -11
-    CaptionFont.Name = 'Tahoma'
-    CaptionFont.Style = [fsBold]
-    CommentFont.Charset = DEFAULT_CHARSET
-    CommentFont.Color = clWindowText
-    CommentFont.Height = -11
-    CommentFont.Name = 'Tahoma'
-    CommentFont.Style = []
-    SymbolFont.Charset = DEFAULT_CHARSET
-    SymbolFont.Color = clHighlightText
-    SymbolFont.Height = -35
-    SymbolFont.Name = 'Wingdings'
-    SymbolFont.Style = [fsBold]
-    Captions.Strings = (
-      'Seleccione recibos de cliente')
-    Comments.Strings = (
-      ' ')
-    Gradient.FromColor = clHighlight
-    Gradient.ToColor = clWindow
-    Gradient.Active = False
-    Gradient.Orientation = fgdVertical
-    BufferedDraw = False
-    ExplicitLeft = -8
-    ExplicitTop = -21
-    ExplicitWidth = 656
-  end
   inherited JvNavPanelHeader: TJvNavPanelHeader
-    Top = 144
+    Top = 220
     Width = 670
     Visible = False
-    ExplicitTop = 144
+    ExplicitTop = 214
     ExplicitWidth = 670
     inherited Image1: TImage
       Left = 643
@@ -49,10 +16,10 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
     end
   end
   inherited TBXDock: TTBXDock
-    Top = 171
+    Top = 148
     Width = 670
     Height = 72
-    ExplicitTop = 171
+    ExplicitTop = 175
     ExplicitWidth = 670
     ExplicitHeight = 72
     inherited tbxMain: TTBXToolbar
@@ -108,7 +75,7 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
     ExplicitTop = 506
     ExplicitWidth = 670
   end
-  inline frViewBarraSeleccion1: TfrViewBarraSeleccion [4]
+  inline frViewBarraSeleccion1: TfrViewBarraSeleccion [3]
     Left = 0
     Top = 525
     Width = 670
@@ -153,19 +120,67 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
       end
     end
   end
-  inherited frViewRecibosCliente1: TfrViewRecibosCliente [5]
-    Top = 243
+  object pnlHeader: TPanel [4]
+    Left = 0
+    Top = 0
     Width = 670
-    Height = 263
-    ExplicitTop = 243
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
+    TabOrder = 6
+    object lblTitle: TLabel
+      AlignWithMargins = True
+      Left = 25
+      Top = 8
+      Width = 620
+      Height = 13
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 8
+      Align = alTop
+      Caption = 'Seleccione recibos de cliente'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      ExplicitWidth = 162
+    end
+    object lblComments: TLabel
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 595
+      Height = 24
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
+    end
+  end
+  inherited frViewRecibosCliente1: TfrViewRecibosCliente [5]
+    Top = 247
+    Width = 670
+    Height = 259
+    ExplicitTop = 247
     ExplicitWidth = 670
-    ExplicitHeight = 263
+    ExplicitHeight = 259
     inherited cxGrid: TcxGrid
       Width = 670
-      Height = 135
+      Height = 131
       RootLevelOptions.DetailTabsPosition = dtpNone
       ExplicitWidth = 670
-      ExplicitHeight = 135
+      ExplicitHeight = 131
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.DefaultGroupSummaryItems = <
           item
@@ -211,22 +226,22 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
             Width = 205
           end
           inherited edtFechaFinFiltro: TcxDateEdit
-            Left = 309
+            Left = 229
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 309
+            ExplicitLeft = 229
             ExplicitWidth = 351
             Width = 351
           end
           inherited eLista: TcxComboBox
-            Left = 697
+            Left = 515
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 697
+            ExplicitLeft = 515
             ExplicitWidth = 215
             Width = 215
           end
@@ -242,8 +257,8 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
       end
     end
     inherited pnlAgrupaciones: TTBXDockablePanel
-      Top = 237
-      ExplicitTop = 237
+      Top = 233
+      ExplicitTop = 233
       ExplicitWidth = 670
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 670
@@ -270,7 +285,7 @@ inherited fEditorElegirRecibosCliente: TfEditorElegirRecibosCliente
   end
   object pnlFiltrar: TTBXDockablePanel [6]
     Left = 0
-    Top = 60
+    Top = 64
     Align = alTop
     Caption = 'Filtrar'
     CaptionRotation = dpcrAlwaysVert
diff --git a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas
index 4e89be46..b77fb663 100644
--- a/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas	
+++ b/Source/Modulos/Recibos de cliente/Views/uEditorElegirRecibosCliente.pas	
@@ -33,7 +33,7 @@ uses
   JvExComCtrls, JvStatusBar,
   ComCtrls, TB2ExtItems, TBXExtItems, TBX,
   TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent,
-  JvNavigationPane, uViewBarraSeleccion, JvgWizardHeader, StdCtrls,
+  JvNavigationPane, uViewBarraSeleccion, StdCtrls,
 
   uViewRecibosCliente, uEditorRecibosCliente, uBizRecibosCliente, uIEditorElegirRecibosCliente,
   Buttons, cxRadioGroup, cxMaskEdit, cxDropDownEdit, cxCalendar, cxControls,
@@ -44,7 +44,8 @@ uses
 type
   TfEditorElegirRecibosCliente = class(TfEditorRecibosCliente, IEditorElegirRecibosCliente)
     frViewBarraSeleccion1: TfrViewBarraSeleccion;
-    JvgWizardHeader1: TJvgWizardHeader;
+    lblTitle: TLabel;
+    lblComments: TLabel;
     EditorSeleccionActionList: TActionList;
     actBuscar2: TAction;
     actQuitarFiltro2: TAction;
@@ -179,7 +180,7 @@ end;
 
 function TfEditorElegirRecibosCliente.GetMensaje: String;
 begin
-  Result := JvgWizardHeader1.Comments.Text;
+  Result := lblComments.Caption;
 end;
 
 function TfEditorElegirRecibosCliente.GetMultiSelect: Boolean;
@@ -189,7 +190,7 @@ end;
 
 procedure TfEditorElegirRecibosCliente.SetMensaje(const AValue: String);
 begin
-  JvgWizardHeader1.Comments.Text := AValue;
+  lblComments.Caption := AValue;
 end;
 
 procedure TfEditorElegirRecibosCliente.SetMultiSelect(AValue: Boolean);
diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm
index 34cb45e2..84af4c39 100644
--- a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm	
+++ b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.dfm	
@@ -4,38 +4,53 @@ inherited fEditorElegirRecibosProveedor: TfEditorElegirRecibosProveedor
   ExplicitWidth = 662
   PixelsPerInch = 96
   TextHeight = 13
-  object JvgWizardHeader1: TJvgWizardHeader [0]
+  object pnlHeader: TPanel
     Left = 0
     Top = 0
-    Width = 654
-    Height = 60
-    CaptionFont.Charset = DEFAULT_CHARSET
-    CaptionFont.Color = clWindowText
-    CaptionFont.Height = -11
-    CaptionFont.Name = 'Tahoma'
-    CaptionFont.Style = [fsBold]
-    CommentFont.Charset = DEFAULT_CHARSET
-    CommentFont.Color = clWindowText
-    CommentFont.Height = -11
-    CommentFont.Name = 'Tahoma'
-    CommentFont.Style = []
-    SymbolFont.Charset = DEFAULT_CHARSET
-    SymbolFont.Color = clHighlightText
-    SymbolFont.Height = -35
-    SymbolFont.Name = 'Wingdings'
-    SymbolFont.Style = [fsBold]
-    Captions.Strings = (
-      'Seleccione recibos de cliente')
-    Comments.Strings = (
-      ' ')
-    Gradient.FromColor = clHighlight
-    Gradient.ToColor = clWindow
-    Gradient.Active = False
-    Gradient.Orientation = fgdVertical
-    BufferedDraw = False
-    ExplicitLeft = -8
-    ExplicitTop = -21
-    ExplicitWidth = 656
+    Width = 656
+    Height = 64
+    Align = alTop
+    BevelOuter = bvNone
+    Color = clWhite
+    Padding.Left = 25
+    Padding.Top = 8
+    Padding.Right = 25
+    Padding.Bottom = 8
+    ParentBackground = False
+    TabOrder = 5
+    object lblTitle: TLabel
+      AlignWithMargins = True
+      Left = 25
+      Top = 8
+      Width = 606
+      Height = 13
+      Margins.Left = 0
+      Margins.Top = 0
+      Margins.Right = 0
+      Margins.Bottom = 8
+      Align = alTop
+      Caption = 'Seleccione recibos de cliente'
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
+      ParentFont = False
+      ExplicitWidth = 135
+    end
+    object lblComments: TLabel
+      AlignWithMargins = True
+      Left = 50
+      Top = 29
+      Width = 581
+      Height = 27
+      Margins.Left = 25
+      Margins.Top = 0
+      Margins.Right = 0
+      Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
+    end
   end
   inherited JvNavPanelHeader: TJvNavPanelHeader
     Top = 144
diff --git a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas
index 1541b659..9109fd49 100644
--- a/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas	
+++ b/Source/Modulos/Recibos de proveedor/Views/uEditorElegirRecibosProveedor.pas	
@@ -33,7 +33,7 @@ uses
   JvExComCtrls, JvStatusBar,
   ComCtrls, TB2ExtItems, TBXExtItems, TBX,
   TB2Item, TB2Dock, TB2Toolbar, pngimage, ExtCtrls, JvExControls, JvComponent,
-  JvNavigationPane, uViewBarraSeleccion, JvgWizardHeader, StdCtrls,
+  JvNavigationPane, uViewBarraSeleccion, StdCtrls,
 
   uViewRecibosProveedor, uEditorRecibosProveedor, uBizRecibosProveedor, uIEditorElegirRecibosProveedor,
   Buttons, cxRadioGroup, cxMaskEdit, cxDropDownEdit, cxCalendar, cxControls,
@@ -43,7 +43,8 @@ uses
 type
   TfEditorElegirRecibosProveedor = class(TfEditorRecibosProveedor, IEditorElegirRecibosProveedor)
     frViewBarraSeleccion1: TfrViewBarraSeleccion;
-    JvgWizardHeader1: TJvgWizardHeader;
+    lblTitle: TLabel;
+    lblComments: TLabel;
     EditorSeleccionActionList: TActionList;
     actBuscar2: TAction;
     actQuitarFiltro2: TAction;
@@ -178,7 +179,7 @@ end;
 
 function TfEditorElegirRecibosProveedor.GetMensaje: String;
 begin
-  Result := JvgWizardHeader1.Comments.Text;
+  Result := lblComments.Caption;
 end;
 
 function TfEditorElegirRecibosProveedor.GetMultiSelect: Boolean;
@@ -188,7 +189,7 @@ end;
 
 procedure TfEditorElegirRecibosProveedor.SetMensaje(const AValue: String);
 begin
-  JvgWizardHeader1.Comments.Text := AValue;
+  lblComments.Caption := AValue;
 end;
 
 procedure TfEditorElegirRecibosProveedor.SetMultiSelect(AValue: Boolean);
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 30f6afb64de829870e45c0c469b6257ba54d533e..ba5deda52a8a3aaca41e7fb3108ab282bc8b221f 100644
GIT binary patch
delta 77
zcmZ3nm2tsV#tnBO7?(`G8zB!Q|3*YJvP_PQRAziIxi+$zIfX%K^6yAl;VgzyhE#?!
cATDOmVNhT&V6dEQ7^Ti`%wPp(Cq}sg08=a%-2eap

delta 85
zcmZ3mm2t&Z#tnBO7}rd`8zB!Q|3*YJa!rnmRAziOxi+$zIg3Gc^6yAl$y|m^hL;RQ
p49N`n3^@#`48;sO3<?Ye3>K5MqtrPK8LSu#87vqWCPzlO0{}DP8Lj{T

diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index 80060c14..9ee76245 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -1,338 +1,334 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
-    <MainSource>FactuGES_Server.dpr</MainSource>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-    <DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
-    <DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <Version>7.0</Version>
-    <DCC_DebugInformation>False</DCC_DebugInformation>
-    <DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
-    <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-    <DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
-    <DCC_Define>RELEASE</DCC_Define>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <Version>7.0</Version>
-    <DCC_MapFile>3</DCC_MapFile>
-    <DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
-    <DCC_Define>DEBUG;</DCC_Define>
-    <DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
-    <DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
-    <DCC_DebugVN>True</DCC_DebugVN>
-    <DCC_UnitSearchPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
-    <DCC_ResourcePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
-    <DCC_ObjPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
-    <DCC_IncludePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_IncludePath>
-  </PropertyGroup>
-  <ProjectExtensions>
-    <Borland.Personality>Delphi.Personality</Borland.Personality>
-    <Borland.ProjectType />
-    <BorlandProject>
-<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">1</VersionInfo><VersionInfo Name="MinorVer">7</VersionInfo><VersionInfo Name="Release">6</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.7.6.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.7.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 05 de mayo de 2009 16:47</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>
-  <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
-  <ItemGroup>
-    <DelphiCompile Include="FactuGES_Server.dpr">
-      <MainSource>MainSource</MainSource>
-    </DelphiCompile>
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas" />
-    <DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
-      <Form>srvEmpresas</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
-      <Form>srvProvinciasPoblaciones_Impl</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
-      <Form>srvUsuarios</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Base\schBase_Intf.pas" />
-    <DCCReference Include="..\Base\Utiles\uSistemaFunc.pas" />
-    <DCCReference Include="..\Base\Utiles\uStringsUtils.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
-      <Form>RptAlbaranesCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas">
-      <Form>RptWordAlbaranCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
-      <Form>srvAlbaranesCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptAlbaranesProveedor_Server.pas">
-      <Form>RptAlbaranesProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptWordAlbaranProveedor.pas">
-      <Form>RptWordAlbaranProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
-      <Form>srvAlbaranesProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
-      <Form>srvAlmacenes</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Articulos\Model\uBizArticulosServer.pas" />
-    <DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas">
-      <Form>srvArticulos</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas" />
-    <DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
-      <Form>RptEtiquetasContacto</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.pas">
-      <Form>RptFichasEmpleado</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
-      <Form>srvContactos</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas">
-      <Form>srvFabricantes</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
-      <Form>RptFacturasCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptWordFacturaCliente.pas">
-      <Form>RptWordFacturaCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
-      <Form>srvFacturasCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas" />
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
-      <Form>RptFacturasProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
-      <Form>srvFacturasProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas">
-      <Form>srvFamilias</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas">
-      <Form>srvFormasPago</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
-      <Form>srvGestorDocumentos</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
-      <Form>srvGestorInformes</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
-      <Form>srvHistoricoMovimientos</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
-      <Form>srvInventario</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Obras\Model\schObrasClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Obras\Model\schObrasServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Obras\Model\uBizObrasServer.pas" />
-    <DCCReference Include="..\Modulos\Obras\Servidor\srvObras_Impl.pas">
-      <Form>srvObras</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas" />
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
-      <Form>RptPedidosProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas">
-      <Form>RptWordPedidoProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
-      <Form>srvPedidosProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
-      <Form>RptPresupuestosCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordCertificadoTrabajo_Server.pas">
-      <Form>RptWordCertificadoTrabajo</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas">
-      <Form>RptWordPresupuestoCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
-      <Form>srvPresupuestosCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
-      <Form>RptRecibosCliente</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
-      <Form>srvRecibosCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
-      <Form>RptRecibosProveedor</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
-      <Form>srvRecibosProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
-      <Form>srvReferencias</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas" />
-    <DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
-      <Form>srvRemesasCliente</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas" />
-    <DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
-      <Form>srvRemesasProveedor</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas">
-      <Form>srvTiposIVA</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas" />
-    <DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas" />
-    <DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
-      <Form>srvUnidadesMedida</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
-    <DCCReference Include="..\Servicios\FactuGES_Invk.pas" />
-    <DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
-      <Form>srvConfiguracion</Form>
-      <DesignClass>TDataAbstractService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConexionBD.pas">
-      <Form>frConexionBD</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConfGeneral.pas">
-      <Form>frConfGeneral</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uConfiguracion.pas">
-      <Form>fConfiguracion</Form>
-      <DesignClass>TForm</DesignClass>
-    </DCCReference>
-    <DCCReference Include="Configuracion\uFrameConfiguracion.pas">
-      <Form>FrameConfiguracion</Form>
-      <DesignClass>TFrame</DesignClass>
-    </DCCReference>
-    <DCCReference Include="srvLogin_Impl.pas">
-      <Form>srvLogin</Form>
-      <DesignClass>TDARemoteService</DesignClass>
-    </DCCReference>
-    <DCCReference Include="uAcercaDe.pas">
-      <Form>fAcercaDe</Form>
-    </DCCReference>
-    <DCCReference Include="uDataModuleServer.pas">
-      <Form>dmServer</Form>
-      <DesignClass>TDataModule</DesignClass>
-    </DCCReference>
-    <DCCReference Include="uServerMainForm.pas">
-      <Form>fServerForm</Form>
-    </DCCReference>
-    <DCCReference Include="Utiles\AHWord97.pas" />
-    <DCCReference Include="Utiles\MidasSpeedFix.pas" />
-    <DCCReference Include="Utiles\RegExpr.pas" />
-    <DCCReference Include="Utiles\uBusinessUtils.pas" />
-    <DCCReference Include="Utiles\uDatabaseUtils.pas" />
-    <DCCReference Include="Utiles\uReferenciasUtils.pas" />
-    <DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas" />
-    <DCCReference Include="Utiles\uSchemaUtilsServer.pas" />
-    <DCCReference Include="Utiles\uServerAppUtils.pas" />
-    <DCCReference Include="Utiles\uSesionesUtils.pas" />
-  </ItemGroup>
+	<PropertyGroup>
+		<ProjectGuid>{ebdcd25d-40d7-4146-91ec-a0ea4aa1dcd1}</ProjectGuid>
+		<MainSource>FactuGES_Server.dpr</MainSource>
+		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+		<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
+		<DCC_DependencyCheckOutputName>..\..\Output\Debug\Servidor\FactuGES_Server.exe</DCC_DependencyCheckOutputName>
+		<DCC_UsePackage>vcl;rtl;vclx;vclactnband;dbrtl;vcldb;vcldbx;bdertl;dsnap;dsnapcon;teeUI;teedb;tee;adortl;vclib;ibxpress;dbxcds;dbexpress;DbxCommonDriver;IndyCore;IndySystem;IndyProtocols;VclSmp;vclie;webdsnap;xmlrtl;inet;inetdbbde;inetdbxpress;RemObjects_BPDX_D11;RemObjects_RODX_D11;RemObjects_Indy_D11;RemObjects_Synapse_D11;RemObjects_WebBroker_D11;DataAbstract_Core_D11;DataAbstract_DBXDriver_D11;DataAbstract_IDE_D11;DataAbstract_Scripting_D11;DataAbstract_SDACDriver_D11;sdac105;dac105;DataAbstract_SQLiteDriver_D11;cxEditorsD10;cxLibraryD10;dxThemeD10;cxDataD10;cxExtEditorsD10;cxGridD10;cxPageControlD10;cxSchedulerD10;cxTreeListD10;cxVerticalGridD10;dxBarD10;dxComnD10;dxBarDBNavD10;dxBarExtDBItemsD10;dxBarExtItemsD10;dxDockingD10;dxLayoutControlD10;dxNavBarD10;dxPSCoreD10;dxsbD10;dxPScxCommonD10;dxPSLnksD10;vclshlctrls;dxPScxExtCommonD10;dxPScxGridLnkD10;dxPScxPCProdD10;dxPScxScheduler2LnkD10;dxPScxTLLnkD10;dxPSdxLCLnkD10;dxPsPrVwAdvD10;pckMD5;pckUCDataConnector;pckUserControl_RT;PluginSDK_D10R;PNG_D10;PngComponentsD10;tb2k_d10;tbx_d10;JclVcl;Jcl;JvXPCtrlsD11R;JvCoreD11R;JvSystemD11R;JvStdCtrlsD11R;JvAppFrmD11R;JvBandsD11R;JvDBD11R;JvDlgsD11R;JvBDED11R;JvCmpD11R;JvCryptD11R;JvCtrlsD11R;JvCustomD11R;JvDockingD11R;JvDotNetCtrlsD11R;JvEDID11R;JvGlobusD11R;JvHMID11R;JvInterpreterD11R;JvJansD11R;JvManagedThreadsD11R;JvMMD11R;JvNetD11R;JvPageCompsD11R;JvPluginD11R;JvPrintPreviewD11R;JvRuntimeDesignD11R;JvTimeFrameworkD11R;JvUIBD11R;JvValidatorsD11R;JvWizardD11R;pckUCADOConn;pckUCBDEConn;pckUCIBXConn;pckUCMidasConn;cxIntlPrintSys3D10;cxExportD10;cxIntl5D10;GUISDK_D11R;ccpackD11;JSDialog100;fsTee11;fs11;frx11;frxADO11;frxBDE11;frxDB11;frxDBX11;frxe11;frxIBX11;frxTee11;fsADO11;fsBDE11;fsDB11;fsIBX11;websnap;soaprtl;IntrawebDB_90_100;Intraweb_90_100</DCC_UsePackage>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+		<Version>7.0</Version>
+		<DCC_DebugInformation>False</DCC_DebugInformation>
+		<DCC_LocalDebugSymbols>False</DCC_LocalDebugSymbols>
+		<DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
+		<DCC_MapFile>3</DCC_MapFile>
+		<DCC_ExeOutput>..\..\Output\Release\Servidor</DCC_ExeOutput>
+		<DCC_Define>RELEASE</DCC_Define>
+	</PropertyGroup>
+	<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+		<Version>7.0</Version>
+		<DCC_MapFile>3</DCC_MapFile>
+		<DCC_ExeOutput>..\..\Output\Debug\Servidor</DCC_ExeOutput>
+		<DCC_Define>DEBUG;</DCC_Define>
+		<DCC_GenerateStackFrames>True</DCC_GenerateStackFrames>
+		<DCC_DebugInfoInExe>True</DCC_DebugInfoInExe>
+		<DCC_DebugVN>True</DCC_DebugVN>
+		<DCC_UnitSearchPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_UnitSearchPath>
+		<DCC_ResourcePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ResourcePath>
+		<DCC_ObjPath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_ObjPath>
+		<DCC_IncludePath>C:\jcl\lib\d11\debug;C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10</DCC_IncludePath>
+	</PropertyGroup>
+	<ProjectExtensions>
+		<Borland.Personality>Delphi.Personality</Borland.Personality>
+		<Borland.ProjectType/>
+		<BorlandProject>
+			<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">1</VersionInfo><VersionInfo Name="MinorVer">7</VersionInfo><VersionInfo Name="Release">6</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.7.6.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.7.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 05 de mayo de 2009 16:47</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>
+	<Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets"/>
+	<ItemGroup>
+		<DelphiCompile Include="FactuGES_Server.dpr">
+			<MainSource>MainSource</MainSource>
+		</DelphiCompile>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Empresas\Model\uBizEmpresasServer.pas"/>
+		<DCCReference Include="..\ApplicationBase\Empresas\Servidor\srvEmpresas_Impl.pas">
+			<Form>srvEmpresas</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\ApplicationBase\ProvinciasPoblaciones\Servidor\srvProvinciasPoblaciones_Impl.pas">
+			<Form>srvProvinciasPoblaciones_Impl</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas"/>
+		<DCCReference Include="..\ApplicationBase\Usuarios\Servidor\srvUsuarios_Impl.pas">
+			<Form>srvUsuarios</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Base\schBase_Intf.pas"/>
+		<DCCReference Include="..\Base\Utiles\uSistemaFunc.pas"/>
+		<DCCReference Include="..\Base\Utiles\uStringsUtils.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Model\uBizAlbaranClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptAlbaranesCliente_Server.pas">
+			<Form>RptAlbaranesCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Reports\uRptWordAlbaranCliente.pas">
+			<Form>RptWordAlbaranCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de cliente\Servidor\srvAlbaranesCliente_Impl.pas">
+			<Form>srvAlbaranesCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Model\uBizAlbaranProveedorServer.PAS"/>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptAlbaranesProveedor_Server.pas">
+			<Form>RptAlbaranesProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Reports\uRptWordAlbaranProveedor.pas">
+			<Form>RptWordAlbaranProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Albaranes de proveedor\Servidor\srvAlbaranesProveedor_Impl.pas">
+			<Form>srvAlbaranesProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Almacenes\Model\schAlmacenesServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Almacenes\Servidor\srvAlmacenes_Impl.pas">
+			<Form>srvAlmacenes</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Articulos\Model\schArticulosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Articulos\Model\uBizArticulosServer.pas"/>
+		<DCCReference Include="..\Modulos\Articulos\Servidor\srvArticulos_Impl.pas">
+			<Form>srvArticulos</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\schContactosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizClientesServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizContactosServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizEmpleadosServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Model\uBizProveedoresServer.pas"/>
+		<DCCReference Include="..\Modulos\Contactos\Reports\uRptEtiquetasContacto_Server.pas">
+			<Form>RptEtiquetasContacto</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Reports\uRptFichasEmpleado_Server.pas">
+			<Form>RptFichasEmpleado</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Contactos\Servidor\srvContactos_Impl.pas">
+			<Form>srvContactos</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Fabricantes\Model\schFabricantesServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Fabricantes\Servidor\srvFabricantes_Impl.pas">
+			<Form>srvFabricantes</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Model\uBizFacturasClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptFacturasCliente_Server.pas">
+			<Form>RptFacturasCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Reports\uRptWordFacturaCliente.pas">
+			<Form>RptWordFacturaCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de cliente\Servidor\srvFacturasCliente_Impl.pas">
+			<Form>srvFacturasCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Model\uBizFacturasProveedorServer.pas"/>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Reports\uRptFacturasProveedor_Server.pas">
+			<Form>RptFacturasProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Facturas de proveedor\Servidor\srvFacturasProveedor_Impl.pas">
+			<Form>srvFacturasProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Familias\Model\schFamiliasServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Familias\Servidor\srvFamilias_Impl.pas">
+			<Form>srvFamilias</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Formas de pago\Servidor\srvFormasPago_Impl.pas">
+			<Form>srvFormasPago</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Gestion de documentos\Servidor\srvGestorDocumentos_Impl.pas">
+			<Form>srvGestorDocumentos</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas">
+			<Form>srvGestorInformes</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Model\schHistoricoMovimientosServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Historico de movimientos\Servidor\srvHistoricoMovimientos_Impl.pas">
+			<Form>srvHistoricoMovimientos</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Inventario\Model\schInventarioServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Inventario\Servidor\srvInventario_Impl.pas">
+			<Form>srvInventario</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Obras\Model\schObrasClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Obras\Model\schObrasServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Obras\Model\uBizObrasServer.pas"/>
+		<DCCReference Include="..\Modulos\Obras\Servidor\srvObras_Impl.pas">
+			<Form>srvObras</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Model\uBizPedidosProveedorServer.pas"/>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptPedidosProveedor_Server.pas">
+			<Form>RptPedidosProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Reports\uRptWordPedidoProveedor.pas">
+			<Form>RptWordPedidoProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Pedidos a proveedor\Servidor\srvPedidosProveedor_Impl.pas">
+			<Form>srvPedidosProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Model\uBizPresupuestosClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptPresupuestosCliente_Server.pas">
+			<Form>RptPresupuestosCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordCertificadoTrabajo_Server.pas">
+			<Form>RptWordCertificadoTrabajo</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Reports\uRptWordPresupuestoCliente.pas">
+			<Form>RptWordPresupuestoCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Presupuestos de cliente\Servidor\srvPresupuestosCliente_Impl.pas">
+			<Form>srvPresupuestosCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Model\schRecibosClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Reports\uRptRecibosCliente_Server.pas">
+			<Form>RptRecibosCliente</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de cliente\Servidor\srvRecibosCliente_Impl.pas">
+			<Form>srvRecibosCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Reports\uRptRecibosProveedor_Server.pas">
+			<Form>RptRecibosProveedor</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Recibos de proveedor\Servidor\srvRecibosProveedor_Impl.pas">
+			<Form>srvRecibosProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Referencias\Model\schReferenciasServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Referencias\Servidor\srvReferencias_Impl.pas">
+			<Form>srvReferencias</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\schRemesasClienteServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Model\uBizRemesasClienteServer.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de cliente\Servidor\srvRemesasCliente_Impl.pas">
+			<Form>srvRemesasCliente</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\schRemesasProveedorServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Model\uBizRemesasProveedorServer.pas"/>
+		<DCCReference Include="..\Modulos\Remesas de proveedor\Servidor\srvRemesasProveedor_Impl.pas">
+			<Form>srvRemesasProveedor</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Tipos de IVA\Model\schTiposIVAServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Tipos de IVA\Servidor\srvTiposIVA_Impl.pas">
+			<Form>srvTiposIVA</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaClient_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Unidades de medida\Model\schUnidadesMedidaServer_Intf.pas"/>
+		<DCCReference Include="..\Modulos\Unidades de medida\Servidor\srvUnidadesMedida_Impl.pas">
+			<Form>srvUnidadesMedida</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="..\Servicios\FactuGES_Intf.pas"/>
+		<DCCReference Include="..\Servicios\FactuGES_Invk.pas"/>
+		<DCCReference Include="Configuracion\srvConfiguracion_Impl.pas">
+			<Form>srvConfiguracion</Form>
+			<DesignClass>TDataAbstractService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConexionBD.pas">
+			<Form>frConexionBD</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConfGeneral.pas">
+			<Form>frConfGeneral</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uConfiguracion.pas">
+			<Form>fConfiguracion</Form>
+			<DesignClass>TForm</DesignClass>
+		</DCCReference>
+		<DCCReference Include="Configuracion\uFrameConfiguracion.pas">
+			<Form>FrameConfiguracion</Form>
+			<DesignClass>TFrame</DesignClass>
+		</DCCReference>
+		<DCCReference Include="srvLogin_Impl.pas">
+			<Form>srvLogin</Form>
+			<DesignClass>TDARemoteService</DesignClass>
+		</DCCReference>
+		<DCCReference Include="uAcercaDe.pas">
+			<Form>fAcercaDe</Form>
+		</DCCReference>
+		<DCCReference Include="uDataModuleServer.pas">
+			<Form>dmServer</Form>
+			<DesignClass>TDataModule</DesignClass>
+		</DCCReference>
+		<DCCReference Include="uServerMainForm.pas">
+			<Form>fServerForm</Form>
+		</DCCReference>
+		<DCCReference Include="Utiles\AHWord97.pas"/>
+		<DCCReference Include="Utiles\MidasSpeedFix.pas"/>
+		<DCCReference Include="Utiles\RegExpr.pas"/>
+		<DCCReference Include="Utiles\uBusinessUtils.pas"/>
+		<DCCReference Include="Utiles\uDatabaseUtils.pas"/>
+		<DCCReference Include="Utiles\uReferenciasUtils.pas"/>
+		<DCCReference Include="Utiles\uRestriccionesUsuarioUtils.pas"/>
+		<DCCReference Include="Utiles\uSchemaUtilsServer.pas"/>
+		<DCCReference Include="Utiles\uServerAppUtils.pas"/>
+		<DCCReference Include="Utiles\uSesionesUtils.pas"/>
+	</ItemGroup>
 </Project>
 <!-- EurekaLog First Line
 [Exception Log]
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 5751943d..4049114a 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.7.6.0\0"
               VALUE "ProductVersion", "1.7.6.0\0"
-              VALUE "CompileDate", "miércoles, 08 de julio de 2009 11:18\0"
+              VALUE "CompileDate", "jueves, 09 de julio de 2009 13:09\0"
          END
     END
     BLOCK "VarFileInfo"