diff --git a/Source/Base/Base.dpk b/Source/Base/Base.dpk
index f521b9bb..827fec8d 100644
--- a/Source/Base/Base.dpk
+++ b/Source/Base/Base.dpk
@@ -110,6 +110,7 @@ contains
   Ctltortf in 'Utiles\Ctltortf.pas',
   uRTFUtils in 'Utiles\uRTFUtils.pas',
   ClipboardUtils in 'Utiles\ClipboardUtils.pas',
-  uGridClipboardUtils in 'Utiles\uGridClipboardUtils.pas';
+  uGridClipboardUtils in 'Utiles\uGridClipboardUtils.pas',
+  uReferenciasUtils in 'Utiles\uReferenciasUtils.pas';
 
 end.
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index 92549687..2aae149b 100644
--- a/Source/Base/Base.dproj
+++ b/Source/Base/Base.dproj
@@ -44,6 +44,8 @@
     <Borland.ProjectType>Package</Borland.ProjectType>
     <BorlandProject>
 <BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="PackageDescription">Libreria base de FactuGES</Package_Options><Package_Options Name="ImplicitBuild">False</Package_Options><Package_Options Name="DesigntimeOnly">False</Package_Options><Package_Options Name="RuntimeOnly">False</Package_Options></Package_Options><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">0</VersionInfo><VersionInfo Name="Release">0</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+      
+      
       <Excluded_Packages Name="$(BDS)\bin\dcloffice2k100.bpl">Microsoft Office 2000 Sample Automation Server Wrapper Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclofficexp100.bpl">Microsoft Office XP Sample Automation Server Wrapper Components</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">Base.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
@@ -53,57 +55,6 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\adortl.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\cxDataD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\cxExportD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\cxGridD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\cxIntl6D11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\cxPageControlD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\dbrtl.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\dclIndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\designide.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\dsnap.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\dxThemeD11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\GUISDK_D11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\IndyCore.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\IndyProtocols.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\IndySystem.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\Jcl.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\JclVcl.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\JSDialog100.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\JvCmpD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\JvCoreD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\JvMMD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\JvNetD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\JvSystemD11R.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\pckMD5.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\PNG_D10.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\RemObjects_Indy_D11.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\rtl.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\TB2k_D10.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\tbx_d10.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\vcl.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\vclactnband.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\vcldb.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\vcljpg.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\VclSmp.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\vclx.dcp" />
-    <DCCReference Include="..\Modulos\Albaranes de proveedor\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
@@ -128,12 +79,56 @@
       <Form>dmBase</Form>
       <DesignClass>TDataModule</DesignClass>
     </DCCReference>
+    <DCCReference Include="Utiles\adortl.dcp" />
     <DCCReference Include="Utiles\ClassRegistry\uClassRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uEditorRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uInformeRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClassRegistry\uViewRegistryUtils.pas" />
     <DCCReference Include="Utiles\ClipboardUtils.pas" />
     <DCCReference Include="Utiles\Ctltortf.pas" />
+    <DCCReference Include="Utiles\cxDataD11.dcp" />
+    <DCCReference Include="Utiles\cxEditorsD11.dcp" />
+    <DCCReference Include="Utiles\cxExportD11.dcp" />
+    <DCCReference Include="Utiles\cxExtEditorsD11.dcp" />
+    <DCCReference Include="Utiles\cxGridD11.dcp" />
+    <DCCReference Include="Utiles\cxIntl6D11.dcp" />
+    <DCCReference Include="Utiles\cxIntlPrintSys3D11.dcp" />
+    <DCCReference Include="Utiles\cxLibraryD11.dcp" />
+    <DCCReference Include="Utiles\cxPageControlD11.dcp" />
+    <DCCReference Include="Utiles\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="Utiles\dbrtl.dcp" />
+    <DCCReference Include="Utiles\dclIndyCore.dcp" />
+    <DCCReference Include="Utiles\designide.dcp" />
+    <DCCReference Include="Utiles\dsnap.dcp" />
+    <DCCReference Include="Utiles\dxGDIPlusD11.dcp" />
+    <DCCReference Include="Utiles\dxPSCoreD11.dcp" />
+    <DCCReference Include="Utiles\dxThemeD11.dcp" />
+    <DCCReference Include="Utiles\GUISDK_D11.dcp" />
+    <DCCReference Include="Utiles\IndyCore.dcp" />
+    <DCCReference Include="Utiles\IndyProtocols.dcp" />
+    <DCCReference Include="Utiles\IndySystem.dcp" />
+    <DCCReference Include="Utiles\Jcl.dcp" />
+    <DCCReference Include="Utiles\JclVcl.dcp" />
+    <DCCReference Include="Utiles\JSDialog100.dcp" />
+    <DCCReference Include="Utiles\JvCmpD11R.dcp" />
+    <DCCReference Include="Utiles\JvCoreD11R.dcp" />
+    <DCCReference Include="Utiles\JvCtrlsD11R.dcp" />
+    <DCCReference Include="Utiles\JvDlgsD11R.dcp" />
+    <DCCReference Include="Utiles\JvMMD11R.dcp" />
+    <DCCReference Include="Utiles\JvNetD11R.dcp" />
+    <DCCReference Include="Utiles\JvPageCompsD11R.dcp" />
+    <DCCReference Include="Utiles\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="Utiles\JvSystemD11R.dcp" />
+    <DCCReference Include="Utiles\pckMD5.dcp" />
+    <DCCReference Include="Utiles\pckUCDataConnector.dcp" />
+    <DCCReference Include="Utiles\pckUserControl_RT.dcp" />
+    <DCCReference Include="Utiles\PngComponentsD10.dcp" />
+    <DCCReference Include="Utiles\PNG_D10.dcp" />
+    <DCCReference Include="Utiles\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="Utiles\RemObjects_Indy_D11.dcp" />
+    <DCCReference Include="Utiles\rtl.dcp" />
+    <DCCReference Include="Utiles\TB2k_D10.dcp" />
+    <DCCReference Include="Utiles\tbx_d10.dcp" />
     <DCCReference Include="Utiles\uAppInfoUtils.pas" />
     <DCCReference Include="Utiles\uCalculosUtils.pas" />
     <DCCReference Include="Utiles\uDataTableUtils.pas" />
@@ -147,9 +142,17 @@
     <DCCReference Include="Utiles\uMD5.pas" />
     <DCCReference Include="Utiles\uNumUtils.pas" />
     <DCCReference Include="Utiles\uPasswordUtils.pas" />
+    <DCCReference Include="Utiles\uReferenciasUtils.pas" />
     <DCCReference Include="Utiles\uRTFUtils.pas" />
     <DCCReference Include="Utiles\uSistemaFunc.pas" />
     <DCCReference Include="Utiles\uStringsUtils.pas" />
+    <DCCReference Include="Utiles\vcl.dcp" />
+    <DCCReference Include="Utiles\vclactnband.dcp" />
+    <DCCReference Include="Utiles\vcldb.dcp" />
+    <DCCReference Include="Utiles\vcljpg.dcp" />
+    <DCCReference Include="Utiles\VclSmp.dcp" />
+    <DCCReference Include="Utiles\vclx.dcp" />
+    <DCCReference Include="Utiles\xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj
index 0a198f1b..8404abed 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -58,52 +58,52 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Base\Utiles\Base.dcp" />
-    <DCCReference Include="..\Base\Utiles\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dbrtl.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxBarD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxBarExtItemsD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxComnD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxPScxCommonD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxPsPrVwAdvD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinBlackD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinBlueD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinCaramelD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinCoffeeD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinGlassOceansD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkiniMaginaryD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinLilianD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinLiquidSkyD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinLondonLiquidSkyD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinMcSkinD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinMoneyTwinsD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinOffice2007BlackD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinOffice2007BlueD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinOffice2007GreenD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinOffice2007PinkD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinOffice2007SilverD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinsCoreD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinscxPCPainterD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinsdxLCPainterD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinSilverD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinStardustD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinValentineD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxSkinXmas2008BlueD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\dxThemeD11.dcp" />
-    <DCCReference Include="..\Base\Utiles\frx11.dcp" />
-    <DCCReference Include="..\Base\Utiles\frxe11.dcp" />
-    <DCCReference Include="..\Base\Utiles\fs11.dcp" />
-    <DCCReference Include="..\Base\Utiles\JvAppFrmD11R.dcp" />
-    <DCCReference Include="..\Base\Utiles\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Base\Utiles\rtl.dcp" />
-    <DCCReference Include="..\Base\Utiles\vcl.dcp" />
-    <DCCReference Include="..\Base\Utiles\vcldb.dcp" />
-    <DCCReference Include="..\Base\Utiles\vcljpg.dcp" />
-    <DCCReference Include="..\Base\Utiles\vclx.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\Base.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\cxLibraryD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dbrtl.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxBarD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxBarExtItemsD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxComnD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxPSCoreD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxPScxCommonD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxPsPrVwAdvD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinBlackD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinBlueD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinCaramelD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinCoffeeD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinGlassOceansD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkiniMaginaryD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinLilianD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinLiquidSkyD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinLondonLiquidSkyD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinMcSkinD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinMoneyTwinsD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinOffice2007BlackD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinOffice2007BlueD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinOffice2007GreenD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinOffice2007PinkD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinOffice2007SilverD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinsCoreD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinscxPCPainterD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinsdxLCPainterD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinSilverD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinStardustD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinValentineD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxSkinXmas2008BlueD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\dxThemeD11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\frx11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\frxe11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\fs11.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\JvAppFrmD11R.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\rtl.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\vcl.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\vcldb.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\vcljpg.dcp" />
+    <DCCReference Include="..\Modulos\Relaciones\Albaranes de proveedor - Facturas de proveedor\vclx.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm
index 0c85f265..ac604a81 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm	
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.dfm	
@@ -35,6 +35,7 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
           Kind = skSum
           Column = cxGridViewIMPORTE_TOTAL
         end>
+      DataController.OnCompare = cxGridViewDataControllerCompare
       OptionsCustomize.ColumnHidingOnGrouping = False
       OptionsView.GroupFooters = gfAlwaysVisible
       object cxGridViewINCIDENCIAS_ACTIVAS: TcxGridDBColumn
@@ -199,27 +200,15 @@ inherited frViewAlbaranesCliente: TfrViewAlbaranesCliente
         Width = 802
         ExplicitWidth = 802
         inherited txtFiltroTodo: TcxTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 705
           Width = 705
         end
         inherited edtFechaIniFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 228
           Width = 228
         end
         inherited edtFechaFinFiltro: TcxDateEdit
           Left = 332
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 332
           ExplicitWidth = 460
           Width = 460
diff --git a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas
index 255a2e1b..9c9d020a 100644
--- a/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas	
+++ b/Source/Modulos/Albaranes de cliente/Views/uViewAlbaranesCliente.pas	
@@ -79,6 +79,9 @@ type
       ACellViewInfo: TcxGridTableDataCellViewInfo; const AMousePos: TPoint;
       var AHintText: TCaption; var AIsHintMultiLine: Boolean;
       var AHintTextRect: TRect);
+    procedure cxGridViewDataControllerCompare(
+      ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+      AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
 
   private
     //Filtros relativos a la vista
@@ -96,8 +99,9 @@ type
 
 implementation
 
-uses SysUtils, DateUtils, variants, windows, uDataModuleAlbaranesCliente, schAlbaranesClienteClient_Intf,
-  uViewGridBase;
+uses
+  SysUtils, DateUtils, variants, windows, uDataModuleAlbaranesCliente, schAlbaranesClienteClient_Intf,
+  uViewGridBase, uReferenciasUtils, cxVariants;
 
 {$R *.dfm}
 
@@ -206,6 +210,20 @@ begin
   RefrescarFiltro;
 end;
 
+procedure TfrViewAlbaranesCliente.cxGridViewDataControllerCompare(
+  ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+  AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
+begin
+  inherited;
+  if ((AItemIndex = cxGridViewREFERENCIA.Index) or
+      (AItemIndex = cxGridViewREF_FACTURA.Index) or
+      (AItemIndex = cxGridViewREF_PEDIDO.Index)) and
+     (VarType(V1) = VarType(V2)) and (VarType(V1) = varString) then
+    Compare := CompararReferencias(V1, V2)
+  else
+    Compare := VarCompare(V1, V2);
+end;
+
 procedure TfrViewAlbaranesCliente.cxGridViewINCIDENCIAS_ACTIVASGetCellHint(
   Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
   ACellViewInfo: TcxGridTableDataCellViewInfo; const AMousePos: TPoint;
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm
index 1f7ef0b3..763373b5 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.dfm	
@@ -7,7 +7,6 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor
     Width = 596
     Height = 351
     OnActiveTabChanged = cxGridActiveTabChanged
-    ExplicitTop = 102
     ExplicitWidth = 596
     ExplicitHeight = 351
     inherited cxGridView: TcxGridDBTableView
@@ -35,6 +34,7 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor
           Kind = skSum
           Column = cxGridViewIMPORTE_TOTAL
         end>
+      DataController.OnCompare = cxGridViewDataControllerCompare
       OptionsView.GroupFooters = gfAlwaysVisible
       object cxGridViewINCIDENCIAS_ACTIVAS: TcxGridDBColumn
         Caption = 'Incidencias'
@@ -151,27 +151,15 @@ inherited frViewAlbaranesProveedor: TfrViewAlbaranesProveedor
         Width = 596
         ExplicitWidth = 596
         inherited txtFiltroTodo: TcxTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 499
           Width = 499
         end
         inherited edtFechaIniFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 188
           Width = 188
         end
         inherited edtFechaFinFiltro: TcxDateEdit
           Left = 292
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 292
           ExplicitWidth = 294
           Width = 294
diff --git a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas
index d43fdaf3..08e43881 100644
--- a/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas	
+++ b/Source/Modulos/Albaranes de proveedor/Views/uViewAlbaranesProveedor.pas	
@@ -66,6 +66,9 @@ type
       ACellViewInfo: TcxGridTableDataCellViewInfo; const AMousePos: TPoint;
       var AHintText: TCaption; var AIsHintMultiLine: Boolean;
       var AHintTextRect: TRect);
+    procedure cxGridViewDataControllerCompare(
+      ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+      AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
 
   private
     //Filtros relativos a la vista
@@ -84,7 +87,8 @@ implementation
 
 uses
   SysUtils, variants, windows, uDataModuleAlbaranesProveedor,
-  schAlbaranesProveedorClient_Intf, uViewGridBase, cxGridDBDataDefinitions;
+  schAlbaranesProveedorClient_Intf, uViewGridBase, cxGridDBDataDefinitions,
+  uReferenciasUtils, cxVariants;
 
 {$R *.dfm}
 
@@ -167,6 +171,21 @@ begin
   RefrescarFiltro;
 end;
 
+procedure TfrViewAlbaranesProveedor.cxGridViewDataControllerCompare(
+  ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+  AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
+begin
+  inherited;
+  if ((AItemIndex = cxGridViewREFERENCIA.Index) or
+      (AItemIndex = cxGridViewREF_PED_PROVEEDOR.Index) or
+      (AItemIndex = cxGridViewREF_FACTURA_PROV.Index) or
+      (AItemIndex = cxGridViewREFERENCIA_PROVEEDOR.Index)) and
+     (VarType(V1) = VarType(V2)) and (VarType(V1) = varString) then
+    Compare := CompararReferencias(V1, V2)
+  else
+    Compare := VarCompare(V1, V2);
+end;
+
 procedure TfrViewAlbaranesProveedor.cxGridViewINCIDENCIAS_ACTIVASGetCellHint(
   Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
   ACellViewInfo: TcxGridTableDataCellViewInfo; const AMousePos: TPoint;
diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.dfm b/Source/Modulos/Articulos/Views/uViewArticulos.dfm
index 2e723ba9..563edaa7 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulos.dfm
+++ b/Source/Modulos/Articulos/Views/uViewArticulos.dfm
@@ -21,6 +21,7 @@ inherited frViewArticulos: TfrViewArticulos
           Kind = skCount
           Column = cxGridViewDESCRIPCION
         end>
+      DataController.OnCompare = cxGridViewDataControllerCompare
       OptionsBehavior.PullFocusing = True
       OptionsCustomize.ColumnHidingOnGrouping = False
       OptionsView.GroupFooters = gfAlwaysVisible
@@ -165,45 +166,33 @@ inherited frViewArticulos: TfrViewArticulos
   end
   inherited frViewFiltroBase1: TfrViewFiltroBase
     Width = 924
-    ExplicitWidth = 738
+    ExplicitWidth = 924
     inherited TBXDockablePanel1: TTBXDockablePanel
-      ExplicitWidth = 738
+      ExplicitWidth = 924
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 924
-        ExplicitWidth = 738
+        ExplicitWidth = 924
         inherited txtFiltroTodo: TcxTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 641
-          Width = 641
+          ExplicitWidth = 827
+          Width = 827
         end
         inherited edtFechaIniFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitWidth = 350
-          Width = 350
+          ExplicitWidth = 462
+          Width = 462
         end
         inherited edtFechaFinFiltro: TcxDateEdit
           Left = 566
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 566
-          ExplicitWidth = 274
-          Width = 274
+          ExplicitWidth = 348
+          Width = 348
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 924
-        ExplicitWidth = 738
+        ExplicitWidth = 924
         inherited tbxBotones: TTBXToolbar
           Width = 914
-          ExplicitWidth = 728
+          ExplicitWidth = 914
         end
       end
     end
@@ -211,14 +200,14 @@ inherited frViewArticulos: TfrViewArticulos
   inherited pnlAgrupaciones: TTBXDockablePanel
     Top = 436
     Visible = True
-    ExplicitTop = 484
-    ExplicitWidth = 738
+    ExplicitTop = 436
+    ExplicitWidth = 924
     inherited TBXAlignmentPanel1: TTBXAlignmentPanel
       Width = 924
-      ExplicitWidth = 738
+      ExplicitWidth = 924
       inherited TBXToolbar1: TTBXToolbar
         Width = 914
-        ExplicitWidth = 728
+        ExplicitWidth = 914
         object TBXSeparatorItem1: TTBXSeparatorItem
         end
         object TBXItem3: TTBXItem
diff --git a/Source/Modulos/Articulos/Views/uViewArticulos.pas b/Source/Modulos/Articulos/Views/uViewArticulos.pas
index a57e7088..74caa26f 100644
--- a/Source/Modulos/Articulos/Views/uViewArticulos.pas
+++ b/Source/Modulos/Articulos/Views/uViewArticulos.pas
@@ -54,6 +54,9 @@ type
     procedure actFamiliaUpdate(Sender: TObject);
     procedure actFabricanteExecute(Sender: TObject);
     procedure actFabricanteUpdate(Sender: TObject);
+    procedure cxGridViewDataControllerCompare(
+      ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+      AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
   protected
     FArticulos: IBizArticulo;
     function GetArticulos: IBizArticulo; virtual;
@@ -65,9 +68,8 @@ type
 implementation
 {$R *.dfm}
 
-uses //uDataModuleArticulos,
-
-schArticulosClient_Intf;
+uses
+  schArticulosClient_Intf, uReferenciasUtils, cxVariants;
 
 
 { TfrViewArticulos }
@@ -149,4 +151,16 @@ begin
   (Sender as TAction).Checked := not (cxGridViewNOMBRE_PROVEEDOR.GroupIndex < 0);
 end;
 
+procedure TfrViewArticulos.cxGridViewDataControllerCompare(
+  ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+  AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
+begin
+  inherited;
+  if ((AItemIndex = cxGridViewREFERENCIA.Index)) and
+     (VarType(V1) = VarType(V2)) and (VarType(V1) = varString) then
+    Compare := CompararReferencias(V1, V2)
+  else
+    Compare := VarCompare(V1, V2);
+end;
+
 end.
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.dproj b/Source/Modulos/Contactos/Views/Contactos_view.dproj
index 7a52583f..cadc3d06 100644
--- a/Source/Modulos/Contactos/Views/Contactos_view.dproj
+++ b/Source/Modulos/Contactos/Views/Contactos_view.dproj
@@ -49,38 +49,38 @@
     <DelphiCompile Include="Contactos_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Albaranes de cliente\adortl.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\ApplicationBase.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\Base.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\Contactos_controller.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\Contactos_model.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\cxDataD11.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\cxEditorsD11.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\cxExportD11.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\cxGridD11.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\cxLibraryD11.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\cxPageControlD11.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\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\dxThemeD11.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\FormasPago_controller.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\FormasPago_model.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\GUIBase.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\JvGlobusD11R.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\PngComponentsD10.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\PNG_D10.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\rtl.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\TiposIVA_controller.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\TiposIVA_model.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\vcl.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\vclactnband.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\vcldb.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\vcljpg.dcp" />
-    <DCCReference Include="..\..\Albaranes de cliente\vclx.dcp" />
+    <DCCReference Include="..\adortl.dcp" />
+    <DCCReference Include="..\ApplicationBase.dcp" />
+    <DCCReference Include="..\Base.dcp" />
+    <DCCReference Include="..\Contactos_controller.dcp" />
+    <DCCReference Include="..\Contactos_model.dcp" />
+    <DCCReference Include="..\cxDataD11.dcp" />
+    <DCCReference Include="..\cxEditorsD11.dcp" />
+    <DCCReference Include="..\cxExportD11.dcp" />
+    <DCCReference Include="..\cxExtEditorsD11.dcp" />
+    <DCCReference Include="..\cxGridD11.dcp" />
+    <DCCReference Include="..\cxLibraryD11.dcp" />
+    <DCCReference Include="..\cxPageControlD11.dcp" />
+    <DCCReference Include="..\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="..\dbrtl.dcp" />
+    <DCCReference Include="..\dsnap.dcp" />
+    <DCCReference Include="..\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\dxThemeD11.dcp" />
+    <DCCReference Include="..\FormasPago_controller.dcp" />
+    <DCCReference Include="..\FormasPago_model.dcp" />
+    <DCCReference Include="..\GUIBase.dcp" />
+    <DCCReference Include="..\JvGlobusD11R.dcp" />
+    <DCCReference Include="..\PngComponentsD10.dcp" />
+    <DCCReference Include="..\PNG_D10.dcp" />
+    <DCCReference Include="..\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="..\rtl.dcp" />
+    <DCCReference Include="..\TiposIVA_controller.dcp" />
+    <DCCReference Include="..\TiposIVA_model.dcp" />
+    <DCCReference Include="..\vcl.dcp" />
+    <DCCReference Include="..\vclactnband.dcp" />
+    <DCCReference Include="..\vcldb.dcp" />
+    <DCCReference Include="..\vcljpg.dcp" />
+    <DCCReference Include="..\vclx.dcp" />
     <DCCReference Include="uContactosViewRegister.pas" />
     <DCCReference Include="uEditorCliente.pas">
       <Form>fEditorCliente</Form>
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm
index ad555ab1..6a74f058 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm	
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.dfm	
@@ -1,11 +1,11 @@
 inherited frViewFacturasCliente: TfrViewFacturasCliente
-  Width = 531
-  Height = 397
-  ExplicitWidth = 531
-  ExplicitHeight = 397
+  Width = 665
+  Height = 418
+  ExplicitWidth = 665
+  ExplicitHeight = 418
   inherited cxGrid: TcxGrid
-    Width = 531
-    Height = 269
+    Width = 665
+    Height = 290
     RootLevelOptions.DetailTabsPosition = dtpTop
     OnActiveTabChanged = cxGridActiveTabChanged
     ExplicitWidth = 531
@@ -19,6 +19,7 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
           Kind = skCount
           Column = cxGridViewREFERENCIA
         end>
+      DataController.OnCompare = cxGridViewDataControllerCompare
       OptionsCustomize.ColumnHidingOnGrouping = False
       OptionsView.GroupFooters = gfAlwaysVisible
       object cxGridViewTIPO: TcxGridDBColumn
@@ -142,60 +143,48 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
     end
   end
   inherited frViewFiltroBase1: TfrViewFiltroBase
-    Width = 531
+    Width = 665
     ExplicitWidth = 531
     inherited TBXDockablePanel1: TTBXDockablePanel
       ExplicitWidth = 531
       inherited dxLayoutControl1: TdxLayoutControl
-        Width = 531
+        Width = 665
         ExplicitWidth = 531
         inherited txtFiltroTodo: TcxTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 434
           Width = 434
         end
         inherited edtFechaIniFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 144
           Width = 144
         end
         inherited edtFechaFinFiltro: TcxDateEdit
-          Left = 248
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 248
+          Left = 307
+          ExplicitLeft = 307
           ExplicitWidth = 273
           Width = 273
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-        Width = 531
+        Width = 665
         ExplicitWidth = 531
         inherited tbxBotones: TTBXToolbar
-          Width = 521
+          Width = 655
           ExplicitWidth = 521
         end
       end
     end
   end
   inherited pnlAgrupaciones: TTBXDockablePanel
-    Top = 371
+    Top = 392
     Visible = True
     ExplicitTop = 371
     ExplicitWidth = 531
     inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-      Width = 531
+      Width = 665
       ExplicitWidth = 531
       inherited TBXToolbar1: TTBXToolbar
-        Width = 521
+        Width = 655
         ExplicitWidth = 521
         object TBXSeparatorItem2: TTBXSeparatorItem
         end
diff --git a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas
index cb62b414..b3ad7d37 100644
--- a/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas	
+++ b/Source/Modulos/Facturas de cliente/Views/uViewFacturasCliente.pas	
@@ -69,6 +69,9 @@ type
     procedure actProvinciaExecute(Sender: TObject);
     procedure actProvinciaUpdate(Sender: TObject);
     procedure actClienteUpdate(Sender: TObject);
+    procedure cxGridViewDataControllerCompare(
+      ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+      AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
 
   private
     //Filtros relativos a la vista
@@ -89,7 +92,8 @@ type
 implementation
 
 uses
-  uDataModuleFacturasCliente, DateUtils, uViewGridBase;
+  uDataModuleFacturasCliente, DateUtils, uViewGridBase, uReferenciasUtils,
+  cxVariants;
 
 {$R *.dfm}
 
@@ -189,6 +193,19 @@ begin
   RefrescarFiltro;
 end;
 
+procedure TfrViewFacturasCliente.cxGridViewDataControllerCompare(
+  ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+  AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
+begin
+  inherited;
+  if ((AItemIndex = cxGridViewREFERENCIA.Index) or
+      (AItemIndex = cxGridViewREFERENCIA_COMISION.Index)) and
+     (VarType(V1) = VarType(V2)) and (VarType(V1) = varString) then
+    Compare := CompararReferencias(V1, V2)
+  else
+    Compare := VarCompare(V1, V2);
+end;
+
 procedure TfrViewFacturasCliente.cxGridViewStylesGetContentStyle(
   Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
   AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm
index 145e86b1..9be8fc9b 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm	
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.dfm	
@@ -31,6 +31,7 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor
           Kind = skCount
           Column = cxGridViewREFERENCIA
         end>
+      DataController.OnCompare = cxGridViewDataControllerCompare
       OptionsCustomize.ColumnHidingOnGrouping = False
       OptionsView.GroupFooters = gfAlwaysVisible
       object cxGridViewTIPO: TcxGridDBColumn
@@ -164,26 +165,18 @@ inherited frViewFacturasProveedor: TfrViewFacturasProveedor
         Width = 531
         ExplicitWidth = 531
         inherited txtFiltroTodo: TcxTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitWidth = 434
+          Width = 434
         end
         inherited edtFechaIniFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitWidth = 229
+          Width = 229
         end
         inherited edtFechaFinFiltro: TcxDateEdit
           Left = 333
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 333
-          ExplicitWidth = 216
-          Width = 216
+          ExplicitWidth = 188
+          Width = 188
         end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
diff --git a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas
index 12526cd1..7392c429 100644
--- a/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas	
+++ b/Source/Modulos/Facturas de proveedor/Views/uViewFacturasProveedor.pas	
@@ -69,6 +69,9 @@ type
     procedure actProveedorUpdate(Sender: TObject);
     procedure actProvinciaExecute(Sender: TObject);
     procedure actProvinciaUpdate(Sender: TObject);
+    procedure cxGridViewDataControllerCompare(
+      ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+      AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
 
   private
     //Filtros relativos a la vista
@@ -88,7 +91,8 @@ type
 implementation
 
 uses
-  uDataModuleFacturasProveedor, DateUtils, uViewGridBase;
+  uDataModuleFacturasProveedor, DateUtils, uViewGridBase, uReferenciasUtils,
+  cxVariants;
 
 {$R *.dfm}
 
@@ -188,6 +192,20 @@ begin
   RefrescarFiltro;
 end;
 
+procedure TfrViewFacturasProveedor.cxGridViewDataControllerCompare(
+  ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+  AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
+begin
+  inherited;
+  if ((AItemIndex = cxGridViewREFERENCIA.Index) or
+      (AItemIndex = cxGridViewREFERENCIA_COMISION.Index) or
+      (AItemIndex = cxGridViewREFERENCIA_PROVEEDOR.Index)) and
+     (VarType(V1) = VarType(V2)) and (VarType(V1) = varString) then
+    Compare := CompararReferencias(V1, V2)
+  else
+    Compare := VarCompare(V1, V2);
+end;
+
 procedure TfrViewFacturasProveedor.cxGridViewStylesGetContentStyle(
   Sender: TcxCustomGridTableView; ARecord: TcxCustomGridRecord;
   AItem: TcxCustomGridTableItem; out AStyle: TcxStyle);
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm
index a2cc0929..097eaab5 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.dfm	
@@ -8,7 +8,6 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor
     Height = 361
     RootLevelOptions.DetailTabsPosition = dtpTop
     OnActiveTabChanged = cxGridActiveTabChanged
-    ExplicitTop = 102
     ExplicitWidth = 839
     ExplicitHeight = 361
     inherited cxGridView: TcxGridDBTableView
@@ -32,6 +31,7 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor
           Kind = skSum
           Column = cxGridViewIMPORTE_TOTAL
         end>
+      DataController.OnCompare = cxGridViewDataControllerCompare
       OptionsView.GroupFooters = gfAlwaysVisible
       object cxGridViewINCIDENCIASACTIVAS: TcxGridDBColumn
         Caption = 'Incidencias'
@@ -179,27 +179,15 @@ inherited frViewPedidosProveedor: TfrViewPedidosProveedor
         Width = 839
         ExplicitWidth = 839
         inherited txtFiltroTodo: TcxTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 742
           Width = 742
         end
         inherited edtFechaIniFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 243
           Width = 243
         end
         inherited edtFechaFinFiltro: TcxDateEdit
           Left = 347
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 347
           ExplicitWidth = 482
           Width = 482
diff --git a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas
index 5b67bed0..ededcad7 100644
--- a/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas	
+++ b/Source/Modulos/Pedidos a proveedor/Views/uViewPedidosProveedor.pas	
@@ -74,6 +74,9 @@ type
       ACellViewInfo: TcxGridTableDataCellViewInfo; const AMousePos: TPoint;
       var AHintText: TCaption; var AIsHintMultiLine: Boolean;
       var AHintTextRect: TRect);
+    procedure cxGridViewDataControllerCompare(
+      ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+      AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
 
   private
     //Filtros relativos a la vista
@@ -91,7 +94,10 @@ type
 
 implementation
 
-uses SysUtils, variants, windows, uDataModulePedidosProveedor, schPedidosProveedorClient_Intf;
+uses
+  SysUtils, Variants, Windows,
+  uDataModulePedidosProveedor, schPedidosProveedorClient_Intf,
+  uReferenciasUtils, cxVariants;
 
 {$R *.dfm}
 
@@ -188,6 +194,19 @@ begin
   RefrescarFiltro;
 end;
 
+procedure TfrViewPedidosProveedor.cxGridViewDataControllerCompare(
+  ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+  AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
+begin
+  inherited;
+  if ((AItemIndex = cxGridViewREFERENCIA.Index) or
+      (AItemIndex = cxGridViewREF_PED_CLIENTE.Index)) and
+     (VarType(V1) = VarType(V2)) and (VarType(V1) = varString) then
+    Compare := CompararReferencias(V1, V2)
+  else
+    Compare := VarCompare(V1, V2);
+end;
+
 procedure TfrViewPedidosProveedor.cxGridViewINCIDENCIASACTIVASGetCellHint(
   Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
   ACellViewInfo: TcxGridTableDataCellViewInfo; const AMousePos: TPoint;
diff --git a/Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.dproj b/Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.dproj
index 11122028..5deea728 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.dproj	
+++ b/Source/Modulos/Presupuestos de cliente/Views/PresupuestosCliente_view.dproj	
@@ -42,23 +42,20 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <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">Intraweb 8.0 Design Package for Borland Development Studio 2006</Excluded_Packages>
-    </Excluded_Packages><Source><Source Name="MainSource">PresupuestosCliente_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Package_Options><Package_Options Name="ImplicitBuild">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 /><Source><Source Name="MainSource">PresupuestosCliente_view.dpk</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
     <DelphiCompile Include="PresupuestosCliente_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\Lib\Articulos_view.dcp" />
-    <DCCReference Include="..\..\Lib\Base.dcp" />
-    <DCCReference Include="..\..\Lib\GUIBase.dcp" />
-    <DCCReference Include="..\..\Lib\PreCli_AlbCli_relation.dcp" />
-    <DCCReference Include="..\..\Lib\PreCli_FacCli_relation.dcp" />
-    <DCCReference Include="..\..\Lib\PresupuestosCliente_controller.dcp" />
-    <DCCReference Include="..\..\Lib\PresupuestosCliente_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\Articulos_view.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\Base.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\GUIBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\PreCli_AlbCli_relation.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\PreCli_FacCli_relation.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\PresupuestosCliente_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\PresupuestosCliente_model.dcp" />
     <DCCReference Include="uEditorElegirArticulosPresupuestoCliente.pas">
       <Form>fEditorElegirArticulosPresupuestoCliente</Form>
       <DesignClass>TfEditorElegirArticulosPedidoCliente</DesignClass>
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm
index 974f2988..cd71eac7 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm	
+++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm	
@@ -31,6 +31,7 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
           Kind = skSum
           Column = cxGridViewIMPORTE_TOTAL
         end>
+      DataController.OnCompare = cxGridViewDataControllerCompare
       OptionsCustomize.ColumnHidingOnGrouping = False
       OptionsView.GroupFooters = gfAlwaysVisible
       object cxGridViewINCIDENCIASACTIVAS: TcxGridDBColumn
@@ -151,27 +152,15 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
         Width = 903
         ExplicitWidth = 903
         inherited txtFiltroTodo: TcxTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 806
           Width = 806
         end
         inherited edtFechaIniFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 285
           Width = 285
         end
         inherited edtFechaFinFiltro: TcxDateEdit
           Left = 389
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 389
           ExplicitWidth = 504
           Width = 504
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas
index fd7966e3..2ddbf519 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas	
+++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.pas	
@@ -70,6 +70,9 @@ type
       ACellViewInfo: TcxGridTableDataCellViewInfo; const AMousePos: TPoint;
       var AHintText: TCaption; var AIsHintMultiLine: Boolean;
       var AHintTextRect: TRect);
+    procedure cxGridViewDataControllerCompare(
+      ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+      AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
 
   private
     //Filtros relativos a la vista
@@ -89,7 +92,7 @@ implementation
 
 uses
   SysUtils, variants, uDataModulePresupuestosCliente, schPresupuestosClienteClient_Intf,
-  uViewGridBase;
+  uViewGridBase, uReferenciasUtils, cxVariants;
 
 {$R *.dfm}
 
@@ -191,6 +194,18 @@ begin
   RefrescarFiltro;
 end;
 
+procedure TfrViewPresupuestosCliente.cxGridViewDataControllerCompare(
+  ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+  AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
+begin
+  inherited;
+  if (AItemIndex = cxGridViewREFERENCIA.Index) and
+     (VarType(V1) = VarType(V2)) and (VarType(V1) = varString) then
+    Compare := CompararReferencias(V1, V2)
+  else
+    Compare := VarCompare(V1, V2);
+end;
+
 procedure TfrViewPresupuestosCliente.cxGridViewICONOCustomDrawCell(
   Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
   AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm
index 3b2732c7..4418a283 100644
--- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm	
+++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.dfm	
@@ -8,7 +8,6 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
     Height = 259
     RootLevelOptions.DetailTabsPosition = dtpTop
     OnActiveTabChanged = cxGridActiveTabChanged
-    ExplicitTop = 102
     ExplicitWidth = 531
     ExplicitHeight = 259
     inherited cxGridView: TcxGridDBTableView
@@ -42,6 +41,7 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
           Kind = skSum
           Column = cxGridViewOTROS_GASTOS
         end>
+      DataController.OnCompare = cxGridViewDataControllerCompare
       OptionsCustomize.ColumnHidingOnGrouping = False
       OptionsView.GroupFooters = gfAlwaysVisible
       object cxGridViewREFERENCIA: TcxGridDBColumn
@@ -158,27 +158,15 @@ inherited frViewRecibosCliente: TfrViewRecibosCliente
         Width = 531
         ExplicitWidth = 531
         inherited txtFiltroTodo: TcxTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 434
           Width = 434
         end
         inherited edtFechaIniFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 195
           Width = 195
         end
         inherited edtFechaFinFiltro: TcxDateEdit
           Left = 299
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 299
           ExplicitWidth = 222
           Width = 222
diff --git a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas
index 344815ee..7aae3b3a 100644
--- a/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas	
+++ b/Source/Modulos/Recibos de cliente/Views/uViewRecibosCliente.pas	
@@ -68,6 +68,9 @@ type
     procedure cxGridViewID_RECIBO_COMPENSADOCustomDrawCell(
       Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
       AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+    procedure cxGridViewDataControllerCompare(
+      ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+      AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
 
   private
     //Filtros relativos a la vista
@@ -90,7 +93,8 @@ type
 implementation
 
 uses
-  schRecibosClienteClient_Intf, uDataModuleRecibosCliente, DateUtils;
+  schRecibosClienteClient_Intf, uDataModuleRecibosCliente, DateUtils,
+  uReferenciasUtils, cxVariants;
 
 {$R *.dfm}
 
@@ -170,6 +174,20 @@ begin
   RefrescarFiltro;
 end;
 
+procedure TfrViewRecibosCliente.cxGridViewDataControllerCompare(
+  ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+  AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
+begin
+  inherited;
+  if ((AItemIndex = cxGridViewREFERENCIA.Index) or
+      (AItemIndex = cxGridViewREFERENCIA_REMESA.Index) or
+      (AItemIndex = cxGridViewREFERENCIA_REC_COMPENSADO.Index)) and
+     (VarType(V1) = VarType(V2)) and (VarType(V1) = varString) then
+    Compare := CompararReferencias(V1, V2)
+  else
+    Compare := VarCompare(V1, V2);
+end;
+
 procedure TfrViewRecibosCliente.cxGridViewICONOCustomDrawCell(
   Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
   AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
diff --git a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm
index aa12671e..9181b458 100644
--- a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm	
+++ b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.dfm	
@@ -8,7 +8,6 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor
     Height = 287
     RootLevelOptions.DetailTabsPosition = dtpTop
     OnActiveTabChanged = cxGridActiveTabChanged
-    ExplicitTop = 102
     ExplicitWidth = 531
     ExplicitHeight = 287
     inherited cxGridView: TcxGridDBTableView
@@ -42,6 +41,7 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor
           Kind = skSum
           Column = cxGridViewOTROS_GASTOS
         end>
+      DataController.OnCompare = cxGridViewDataControllerCompare
       OptionsCustomize.ColumnHidingOnGrouping = False
       OptionsView.GroupFooters = gfAlwaysVisible
       object cxGridViewREFERENCIA: TcxGridDBColumn
@@ -161,27 +161,15 @@ inherited frViewRecibosProveedor: TfrViewRecibosProveedor
         Width = 531
         ExplicitWidth = 531
         inherited txtFiltroTodo: TcxTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 434
           Width = 434
         end
         inherited edtFechaIniFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitWidth = 201
           Width = 201
         end
         inherited edtFechaFinFiltro: TcxDateEdit
           Left = 305
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
           ExplicitLeft = 305
           ExplicitWidth = 216
           Width = 216
diff --git a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas
index d58c550f..51d2346f 100644
--- a/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas	
+++ b/Source/Modulos/Recibos de proveedor/Views/uViewRecibosProveedor.pas	
@@ -69,6 +69,9 @@ type
     procedure cxGridViewID_RECIBO_COMPENSADOCustomDrawCell(
       Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
       AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
+    procedure cxGridViewDataControllerCompare(
+      ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+      AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
 
   private
     //Filtros relativos a la vista
@@ -89,7 +92,8 @@ type
 implementation
 
 uses
-  schRecibosProveedorClient_Intf, uDataModuleRecibosProveedor, DateUtils, uViewGridBase;
+  schRecibosProveedorClient_Intf, uDataModuleRecibosProveedor,
+  DateUtils, uViewGridBase, uReferenciasUtils, cxVariants;
 
 {$R *.dfm}
 
@@ -171,6 +175,21 @@ begin
   RefrescarFiltro;
 end;
 
+procedure TfrViewRecibosProveedor.cxGridViewDataControllerCompare(
+  ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+  AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
+begin
+  inherited;
+  if ((AItemIndex = cxGridViewREFERENCIA.Index) or
+      (AItemIndex = cxGridViewREFERENCIA_REMESA.Index) or
+      (AItemIndex = cxGridViewREFERENCIA_REC_COMPENSADO.Index) or      
+      (AItemIndex = cxGridViewREFERENCIA_FACTURA_PROV.Index)) and
+     (VarType(V1) = VarType(V2)) and (VarType(V1) = varString) then
+    Compare := CompararReferencias(V1, V2)
+  else
+    Compare := VarCompare(V1, V2);
+end;
+
 procedure TfrViewRecibosProveedor.cxGridViewICONOCustomDrawCell(
   Sender: TcxCustomGridTableView; ACanvas: TcxCanvas;
   AViewInfo: TcxGridTableDataCellViewInfo; var ADone: Boolean);
diff --git a/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.dfm b/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.dfm
index 830f6820..2adc3590 100644
--- a/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.dfm	
+++ b/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.dfm	
@@ -3,7 +3,6 @@ inherited frViewRemesasCliente: TfrViewRemesasCliente
   ExplicitHeight = 420
   inherited cxGrid: TcxGrid
     Height = 292
-    ExplicitTop = 102
     ExplicitHeight = 292
     inherited cxGridView: TcxGridDBTableView
       DataController.KeyFieldNames = 'RecID'
@@ -33,6 +32,7 @@ inherited frViewRemesasCliente: TfrViewRemesasCliente
           Kind = skSum
           Column = cxGridViewIMPORTE_TOTAL
         end>
+      DataController.OnCompare = cxGridViewDataControllerCompare
       OptionsBehavior.PullFocusing = True
       object cxGridViewREFERENCIA: TcxGridDBColumn
         Caption = 'Referencia'
@@ -82,34 +82,9 @@ inherited frViewRemesasCliente: TfrViewRemesasCliente
       end
     end
   end
-  inherited frViewFiltroBase1: TfrViewFiltroBase
-    inherited TBXDockablePanel1: TTBXDockablePanel
-      inherited dxLayoutControl1: TdxLayoutControl
-        inherited txtFiltroTodo: TcxTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-        end
-        inherited edtFechaIniFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-        end
-        inherited edtFechaFinFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-        end
-      end
-    end
-  end
   inherited pnlAgrupaciones: TTBXDockablePanel
     Top = 394
     ExplicitTop = 394
-    ExplicitWidth = 607
   end
   inherited dxComponentPrinter: TdxComponentPrinter
     inherited dxComponentPrinterLink: TdxGridReportLink
diff --git a/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.pas b/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.pas
index aacbdbcb..13e19c9f 100644
--- a/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.pas	
+++ b/Source/Modulos/Remesas de cliente/Views/uViewRemesasCliente.pas	
@@ -41,6 +41,9 @@ type
     cxGridViewDC: TcxGridDBColumn;
     cxGridViewCUENTA: TcxGridDBColumn;
     cxGridViewTIPO: TcxGridDBColumn;
+    procedure cxGridViewDataControllerCompare(
+      ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+      AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
   protected
     FRemesasCliente: IBizRemesaCliente;
     function GetRemesasCliente: IBizRemesaCliente; virtual;
@@ -51,7 +54,8 @@ type
 
 implementation
 
-uses uDataModuleRemesasCliente;
+uses
+  uDataModuleRemesasCliente, uReferenciasUtils, cxVariants;
 
 
 {$R *.dfm}
@@ -61,6 +65,18 @@ uses uDataModuleRemesasCliente;
 {
 ******************************* TfrViewRemesasCliente *******************************
 }
+procedure TfrViewRemesasCliente.cxGridViewDataControllerCompare(
+  ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+  AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
+begin
+  inherited;
+  if ((AItemIndex = cxGridViewREFERENCIA.Index)) and
+     (VarType(V1) = VarType(V2)) and (VarType(V1) = varString) then
+    Compare := CompararReferencias(V1, V2)
+  else
+    Compare := VarCompare(V1, V2);
+end;
+
 function TfrViewRemesasCliente.GetRemesasCliente: IBizRemesaCliente;
 begin
   Result := FRemesasCliente;
diff --git a/Source/Modulos/Remesas de proveedor/Views/uViewRemesasProveedor.dfm b/Source/Modulos/Remesas de proveedor/Views/uViewRemesasProveedor.dfm
index c534a25d..c4d7748a 100644
--- a/Source/Modulos/Remesas de proveedor/Views/uViewRemesasProveedor.dfm	
+++ b/Source/Modulos/Remesas de proveedor/Views/uViewRemesasProveedor.dfm	
@@ -3,7 +3,6 @@ inherited frViewRemesasProveedor: TfrViewRemesasProveedor
   ExplicitHeight = 397
   inherited cxGrid: TcxGrid
     Height = 269
-    ExplicitTop = 102
     ExplicitHeight = 269
     inherited cxGridView: TcxGridDBTableView
       DataController.KeyFieldNames = 'RecID'
@@ -33,6 +32,7 @@ inherited frViewRemesasProveedor: TfrViewRemesasProveedor
           Kind = skSum
           Column = cxGridViewIMPORTE_TOTAL
         end>
+      DataController.OnCompare = cxGridViewDataControllerCompare
       OptionsBehavior.PullFocusing = True
       object cxGridViewREFERENCIA: TcxGridDBColumn
         Caption = 'Referencia'
@@ -83,34 +83,9 @@ inherited frViewRemesasProveedor: TfrViewRemesasProveedor
       end
     end
   end
-  inherited frViewFiltroBase1: TfrViewFiltroBase
-    inherited TBXDockablePanel1: TTBXDockablePanel
-      inherited dxLayoutControl1: TdxLayoutControl
-        inherited txtFiltroTodo: TcxTextEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-        end
-        inherited edtFechaIniFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-        end
-        inherited edtFechaFinFiltro: TcxDateEdit
-          Style.LookAndFeel.SkinName = ''
-          StyleDisabled.LookAndFeel.SkinName = ''
-          StyleFocused.LookAndFeel.SkinName = ''
-          StyleHot.LookAndFeel.SkinName = ''
-        end
-      end
-    end
-  end
   inherited pnlAgrupaciones: TTBXDockablePanel
     Top = 371
     ExplicitTop = 371
-    ExplicitWidth = 607
   end
   inherited dxComponentPrinter: TdxComponentPrinter
     inherited dxComponentPrinterLink: TdxGridReportLink
diff --git a/Source/Modulos/Remesas de proveedor/Views/uViewRemesasProveedor.pas b/Source/Modulos/Remesas de proveedor/Views/uViewRemesasProveedor.pas
index 25b82949..3fa8dd0e 100644
--- a/Source/Modulos/Remesas de proveedor/Views/uViewRemesasProveedor.pas	
+++ b/Source/Modulos/Remesas de proveedor/Views/uViewRemesasProveedor.pas	
@@ -41,6 +41,9 @@ type
     cxGridViewDC: TcxGridDBColumn;
     cxGridViewCUENTA: TcxGridDBColumn;
     cxGridViewTIPO: TcxGridDBColumn;
+    procedure cxGridViewDataControllerCompare(
+      ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+      AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
   protected
     FRemesasProveedor: IBizRemesaProveedor;
     function GetRemesasProveedor: IBizRemesaProveedor; virtual;
@@ -51,7 +54,8 @@ type
 
 implementation
 
-uses uDataModuleRemesasProveedor;
+uses
+  uDataModuleRemesasProveedor, uReferenciasUtils, cxVariants;
 
 
 {$R *.dfm}
@@ -61,6 +65,18 @@ uses uDataModuleRemesasProveedor;
 {
 ******************************* TfrViewRemesasProveedor *******************************
 }
+procedure TfrViewRemesasProveedor.cxGridViewDataControllerCompare(
+  ADataController: TcxCustomDataController; ARecordIndex1, ARecordIndex2,
+  AItemIndex: Integer; const V1, V2: Variant; var Compare: Integer);
+begin
+  inherited;
+  if ((AItemIndex = cxGridViewREFERENCIA.Index)) and
+     (VarType(V1) = VarType(V2)) and (VarType(V1) = varString) then
+    Compare := CompararReferencias(V1, V2)
+  else
+    Compare := VarCompare(V1, V2);
+end;
+
 function TfrViewRemesasProveedor.GetRemesasProveedor: IBizRemesaProveedor;
 begin
   Result := FRemesasProveedor;
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 60968f57..3e6ccaf4 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index fb6a2375..314d2e9a 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.0.4.0\0"
               VALUE "ProductVersion", "1.0.4.0\0"
-              VALUE "CompileDate", "lunes, 02 de junio de 2008 20:48\0"
+              VALUE "CompileDate", "martes, 03 de junio de 2008 12:49\0"
          END
     END
     BLOCK "VarFileInfo"