From fcfac52f0901997aa3d9267107b4e6f4101d55ea Mon Sep 17 00:00:00 2001
From: david <darranz@rodax-software.com>
Date: Tue, 15 Jan 2008 09:45:24 +0000
Subject: [PATCH] Detalles: deshabilitados los conceptos 'descuento' y repaso
 general.

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@220 0c75b7a4-871f-7646-8a2f-f78d34cc349f
---
 Source/ApplicationBase/ApplicationBase.dproj  |  70 ++-----
 Source/Base/Base.dproj                        | 102 ++++-----
 .../Controladores/uControllerDetallesBase.pas |   4 +-
 Source/Base_Group.groupproj                   |  16 +-
 Source/GUIBase/GUIBase.dproj                  |  32 +--
 Source/GUIBase/GUIBase.res                    | Bin 4748 -> 384 bytes
 Source/GUIBase/uViewDetallesBase.dfm          | 198 +++++++++++++++++-
 Source/GUIBase/uViewDetallesBase.pas          | 160 +++++++++++++-
 Source/GUIBase/uViewGridBase.pas              |  23 ++
 9 files changed, 473 insertions(+), 132 deletions(-)

diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj
index 830c2f0f..6e583161 100644
--- a/Source/ApplicationBase/ApplicationBase.dproj
+++ b/Source/ApplicationBase/ApplicationBase.dproj
@@ -53,34 +53,6 @@
       
       
       
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
-      
       <Excluded_Packages Name="$(BDS)\Bin\dclintraweb_90_100.bpl">VCL for the Web Design Package for CodeGear RAD Studio</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclwebsnap100.bpl">CodeGear WebSnap Components</Excluded_Packages>
       <Excluded_Packages Name="$(BDS)\bin\dclsoap100.bpl">CodeGear SOAP Components</Excluded_Packages>
@@ -95,6 +67,27 @@
     <DelphiCompile Include="ApplicationBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
+    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvJansD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PLuginSDK_D10R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
     <DCCReference Include="Empresas\Controller\uDatosBancariosEmpresaController.pas" />
     <DCCReference Include="Empresas\Controller\uEmpresasController.pas" />
     <DCCReference Include="Empresas\Controller\View\uIEditorDatosBancarioEmpresa.pas" />
@@ -128,20 +121,6 @@
     <DCCReference Include="Usuarios\Model\schUsuariosClient_Intf.pas" />
     <DCCReference Include="Usuarios\Model\schUsuariosServer_Intf.pas" />
     <DCCReference Include="Usuarios\Model\uBizUsuarios.pas" />
-    <DCCReference Include="Usuarios\Views\Base.dcp" />
-    <DCCReference Include="Usuarios\Views\dbrtl.dcp" />
-    <DCCReference Include="Usuarios\Views\dclIndyCore.dcp" />
-    <DCCReference Include="Usuarios\Views\designide.dcp" />
-    <DCCReference Include="Usuarios\Views\GUIBase.dcp" />
-    <DCCReference Include="Usuarios\Views\IndyCore.dcp" />
-    <DCCReference Include="Usuarios\Views\IndyProtocols.dcp" />
-    <DCCReference Include="Usuarios\Views\IndySystem.dcp" />
-    <DCCReference Include="Usuarios\Views\JvJansD11R.dcp" />
-    <DCCReference Include="Usuarios\Views\pckMD5.dcp" />
-    <DCCReference Include="Usuarios\Views\pckUCDataConnector.dcp" />
-    <DCCReference Include="Usuarios\Views\pckUserControl_RT.dcp" />
-    <DCCReference Include="Usuarios\Views\PLuginSDK_D10R.dcp" />
-    <DCCReference Include="Usuarios\Views\rtl.dcp" />
     <DCCReference Include="Usuarios\Views\uEditorCambiarPassword.pas">
       <Form>fEditorCambiarPassword</Form>
     </DCCReference>
@@ -178,13 +157,6 @@
       <Form>frViewUsuarios</Form>
       <DesignClass>TFrame</DesignClass>
     </DCCReference>
-    <DCCReference Include="Usuarios\Views\vcl.dcp" />
-    <DCCReference Include="Usuarios\Views\vclactnband.dcp" />
-    <DCCReference Include="Usuarios\Views\vcldb.dcp" />
-    <DCCReference Include="Usuarios\Views\vcljpg.dcp" />
-    <DCCReference Include="Usuarios\Views\VclSmp.dcp" />
-    <DCCReference Include="Usuarios\Views\vclx.dcp" />
-    <DCCReference Include="Usuarios\Views\xmlrtl.dcp" />
   </ItemGroup>
 </Project>
 <!-- EurekaLog First Line
diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj
index a95011ce..8cd78f35 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">True</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,57 @@
     <DelphiCompile Include="Base.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\GUIBase\adortl.dcp" />
-    <DCCReference Include="..\GUIBase\cxDataD11.dcp" />
-    <DCCReference Include="..\GUIBase\cxEditorsD11.dcp" />
-    <DCCReference Include="..\GUIBase\cxExportD11.dcp" />
-    <DCCReference Include="..\GUIBase\cxExtEditorsD11.dcp" />
-    <DCCReference Include="..\GUIBase\cxGridD11.dcp" />
-    <DCCReference Include="..\GUIBase\cxIntl6D11.dcp" />
-    <DCCReference Include="..\GUIBase\cxIntlPrintSys3D11.dcp" />
-    <DCCReference Include="..\GUIBase\cxLibraryD11.dcp" />
-    <DCCReference Include="..\GUIBase\cxPageControlD11.dcp" />
-    <DCCReference Include="..\GUIBase\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\GUIBase\dbrtl.dcp" />
-    <DCCReference Include="..\GUIBase\dclIndyCore.dcp" />
-    <DCCReference Include="..\GUIBase\designide.dcp" />
-    <DCCReference Include="..\GUIBase\dsnap.dcp" />
-    <DCCReference Include="..\GUIBase\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\GUIBase\dxPSCoreD11.dcp" />
-    <DCCReference Include="..\GUIBase\dxThemeD11.dcp" />
-    <DCCReference Include="..\GUIBase\GUISDK_D11.dcp" />
-    <DCCReference Include="..\GUIBase\IndyCore.dcp" />
-    <DCCReference Include="..\GUIBase\IndyProtocols.dcp" />
-    <DCCReference Include="..\GUIBase\IndySystem.dcp" />
-    <DCCReference Include="..\GUIBase\Jcl.dcp" />
-    <DCCReference Include="..\GUIBase\JclVcl.dcp" />
-    <DCCReference Include="..\GUIBase\JSDialog100.dcp" />
-    <DCCReference Include="..\GUIBase\JvCmpD11R.dcp" />
-    <DCCReference Include="..\GUIBase\JvCoreD11R.dcp" />
-    <DCCReference Include="..\GUIBase\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\GUIBase\JvDlgsD11R.dcp" />
-    <DCCReference Include="..\GUIBase\JvMMD11R.dcp" />
-    <DCCReference Include="..\GUIBase\JvNetD11R.dcp" />
-    <DCCReference Include="..\GUIBase\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\GUIBase\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\GUIBase\JvSystemD11R.dcp" />
-    <DCCReference Include="..\GUIBase\pckMD5.dcp" />
-    <DCCReference Include="..\GUIBase\pckUCDataConnector.dcp" />
-    <DCCReference Include="..\GUIBase\pckUserControl_RT.dcp" />
-    <DCCReference Include="..\GUIBase\PngComponentsD10.dcp" />
-    <DCCReference Include="..\GUIBase\PNG_D10.dcp" />
-    <DCCReference Include="..\GUIBase\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\GUIBase\rtl.dcp" />
-    <DCCReference Include="..\GUIBase\TB2k_D10.dcp" />
-    <DCCReference Include="..\GUIBase\tbx_d10.dcp" />
-    <DCCReference Include="..\GUIBase\vcl.dcp" />
-    <DCCReference Include="..\GUIBase\vclactnband.dcp" />
-    <DCCReference Include="..\GUIBase\vcldb.dcp" />
-    <DCCReference Include="..\GUIBase\vcljpg.dcp" />
-    <DCCReference Include="..\GUIBase\VclSmp.dcp" />
-    <DCCReference Include="..\GUIBase\vclx.dcp" />
-    <DCCReference Include="..\GUIBase\xmlrtl.dcp" />
     <DCCReference Include="..\Servicios\FactuGES_Intf.pas" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxExportD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxExtEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxGridD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxIntl6D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxIntlPrintSys3D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxPageControlD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dclIndyCore.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\designide.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPSCoreD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GUISDK_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\IndyCore.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\IndyProtocols.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\IndySystem.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JSDialog100.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCmpD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvDlgsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvMMD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvNetD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\pckMD5.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\pckUCDataConnector.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\pckUserControl_RT.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\TB2k_D10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\VclSmp.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\xmlrtl.dcp" />
     <DCCReference Include="Conexion\uConfigurarConexion.pas">
       <Form>fConfigurarConexion</Form>
       <DesignClass>TForm</DesignClass>
diff --git a/Source/Base/Controladores/uControllerDetallesBase.pas b/Source/Base/Controladores/uControllerDetallesBase.pas
index 45e5df75..371f0ac9 100644
--- a/Source/Base/Controladores/uControllerDetallesBase.pas
+++ b/Source/Base/Controladores/uControllerDetallesBase.pas
@@ -290,8 +290,8 @@ begin
   Result.Values[TIPO_DETALLE_CONCEPTO] := TIPO_DETALLE_CONCEPTO;
   Result.Values[TIPO_DETALLE_TITULO] := TIPO_DETALLE_TITULO;
   Result.Values[TIPO_DETALLE_SUBTOTAL] := TIPO_DETALLE_SUBTOTAL;
-  Result.Values[TIPO_DETALLE_DESCUENTO] := TIPO_DETALLE_DESCUENTO;
-  Result.Values[TIPO_DETALLE_SALTO] := TIPO_DETALLE_SALTO;
+  //Result.Values[TIPO_DETALLE_DESCUENTO] := TIPO_DETALLE_DESCUENTO;
+  //Result.Values[TIPO_DETALLE_SALTO] := TIPO_DETALLE_SALTO;
 end;
 
 function TControllerDetallesBase.DarTotalImporteTotal(ADataTable: IDAStronglyTypedDataTable): Double;
diff --git a/Source/Base_Group.groupproj b/Source/Base_Group.groupproj
index f28fcdfa..37e96bcf 100644
--- a/Source/Base_Group.groupproj
+++ b/Source/Base_Group.groupproj
@@ -8,6 +8,7 @@
     <Projects Include="Base\Base.dproj" />
     <Projects Include="Cliente\FactuGES.dproj" />
     <Projects Include="GUIBase\GUIBase.dproj" />
+    <Projects Include="Servidor\FactuGES_Server.dproj" />
   </ItemGroup>
   <ProjectExtensions>
     <Borland.Personality>Default.Personality</Borland.Personality>
@@ -51,14 +52,23 @@
   <Target Name="FactuGES:Make">
     <MSBuild Projects="Cliente\FactuGES.dproj" Targets="Make" />
   </Target>
+  <Target Name="FactuGES_Server">
+    <MSBuild Projects="Servidor\FactuGES_Server.dproj" Targets="" />
+  </Target>
+  <Target Name="FactuGES_Server:Clean">
+    <MSBuild Projects="Servidor\FactuGES_Server.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="FactuGES_Server:Make">
+    <MSBuild Projects="Servidor\FactuGES_Server.dproj" Targets="Make" />
+  </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;FactuGES" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;FactuGES;FactuGES_Server" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;FactuGES:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;FactuGES:Clean;FactuGES_Server:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;FactuGES:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;FactuGES:Make;FactuGES_Server:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>
\ No newline at end of file
diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj
index 8243ffa4..37767160 100644
--- a/Source/GUIBase/GUIBase.dproj
+++ b/Source/GUIBase/GUIBase.dproj
@@ -58,22 +58,22 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\ApplicationBase\Usuarios\Views\Base.dcp" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Views\dbrtl.dcp" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Views\dxBarD11.dcp" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Views\dxBarExtItemsD11.dcp" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Views\dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Views\dxPScxCommonD11.dcp" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Views\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Views\dxPsPrVwAdvD11.dcp" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Views\frx11.dcp" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Views\frxe11.dcp" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Views\fs11.dcp" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Views\JvAppFrmD11R.dcp" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Views\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Views\rtl.dcp" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Views\vcl.dcp" />
-    <DCCReference Include="..\ApplicationBase\Usuarios\Views\vcldb.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Base.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxBarD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxBarExtItemsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxCommonD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxPsPrVwAdvD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\frx11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\frxe11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\fs11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvAppFrmD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>
diff --git a/Source/GUIBase/GUIBase.res b/Source/GUIBase/GUIBase.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/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm
index bea732a3..79d744ff 100644
--- a/Source/GUIBase/uViewDetallesBase.dfm
+++ b/Source/GUIBase/uViewDetallesBase.dfm
@@ -155,8 +155,6 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     TabOrder = 1
     LookAndFeel.Kind = lfStandard
     LookAndFeel.NativeStyle = True
-    ExplicitTop = 94
-    ExplicitHeight = 210
     object cxGridView: TcxGridDBTableView
       NavigatorButtons.ConfirmDelete = False
       FilterBox.Visible = fvNever
@@ -195,7 +193,8 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       OptionsView.CellEndEllipsis = True
       OptionsView.CellAutoHeight = True
       OptionsView.ColumnAutoWidth = True
-      OptionsView.GridLines = glNone
+      OptionsView.GridLineColor = cl3DLight
+      OptionsView.GridLines = glHorizontal
       OptionsView.GroupByBox = False
       OptionsView.HeaderEndEllipsis = True
       Styles.OnGetContentStyle = cxGridViewStylesGetContentStyle
@@ -337,6 +336,31 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       DragHandleStyle = dhNone
       Images = ContenidoImageList
       TabOrder = 0
+      object TBXSubmenuItem1: TTBXSubmenuItem
+        Caption = 'A'#241'adir...'
+        DisplayMode = nbdmImageAndText
+        ImageIndex = 12
+        object TBXItem16: TTBXItem
+          Action = actAnadirCapitulo
+          Images = ContenidoImageList
+        end
+        object TBXSeparatorItem7: TTBXSeparatorItem
+        end
+        object TBXItem15: TTBXItem
+          Action = actAnadirTitulo
+          Images = ContenidoImageList
+        end
+        object TBXItem14: TTBXItem
+          Action = actAnadirSubtotal
+          Images = ContenidoImageList
+        end
+        object TBXItem12: TTBXItem
+          Action = actAnadirDescuento
+          Images = ContenidoImageList
+        end
+      end
+      object TBXSeparatorItem6: TTBXSeparatorItem
+      end
       object TBXItem1: TTBXItem
         Action = actAnadir
         DisplayMode = nbdmImageAndText
@@ -395,7 +419,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
   object ActionListContenido: TActionList
     Images = ContenidoImageList
     Left = 40
-    Top = 136
+    Top = 168
     object actAnadir: TAction
       Category = 'Operaciones'
       Caption = 'A'#241'adir'
@@ -503,6 +527,34 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       Category = 'Editar'
       Caption = 'Pegar'
     end
+    object actAnadirCapitulo: TAction
+      Category = 'Operaciones'
+      Caption = 'Un cap'#237'tulo'
+      ImageIndex = 12
+      OnExecute = actAnadirCapituloExecute
+      OnUpdate = actAnadirCapituloUpdate
+    end
+    object actAnadirTitulo: TAction
+      Category = 'Operaciones'
+      Caption = 'T'#237'tulo de cap'#237'tulo'
+      ImageIndex = 13
+      OnExecute = actAnadirTituloExecute
+      OnUpdate = actAnadirTituloUpdate
+    end
+    object actAnadirSubtotal: TAction
+      Category = 'Operaciones'
+      Caption = 'Subtotal de cap'#237'tulo'
+      ImageIndex = 15
+      OnExecute = actAnadirSubtotalExecute
+      OnUpdate = actAnadirSubtotalUpdate
+    end
+    object actAnadirDescuento: TAction
+      Category = 'Operaciones'
+      Caption = 'L'#237'nea de descuento'
+      ImageIndex = 17
+      OnExecute = actAnadirDescuentoExecute
+      OnUpdate = actAnadirDescuentoUpdate
+    end
   end
   object DADataSource: TDADataSource
     Left = 8
@@ -711,9 +763,129 @@ inherited frViewDetallesBase: TfrViewDetallesBase
           601587A78381CF4C941A00005C20FBD97F751C0A0000000049454E44AE426082}
         Name = 'PngImage11'
         Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          61000000097048597300000B3A00000B3A01647F570D000002604944415478DA
+          8DD25B48D35100C7F1EF7FEA9C96A60F4A362DF141C399E59BD05D4ABA5A60D9
+          5BF8522F4119F4926610425A4F121145CFF5605E085C299A5D347AE8E2D0E5C8
+          B55AA5CD69CD369DEEF2DFFFF4DFC4E122B3DFDBE19CF3F9712E5273C3C54AA0
+          95D81CABA96F6C638508219054409C3AAE8D99B8FB20F05FC8B2C012E4AF5161
+          694560B984E16501CFAC60D01262D4AE44C69FA46FB46418C94A4DC3139C637C
+          7C9AD3C12AF2A49CC8FCB94B57A518E0F96B1969D645D906071AB5A3F797933B
+          B93E2E975660F40F535FDFCEC3555964DA1DF45931D70E884D5120DC6EECD772
+          247788345D00110A31ECF9495DF60C17B697D3E3B270ADE9112F9232E97F3269
+          56FB8EAA802D0A2CB627660C1394154420C0E0948BC7C5095CD953418773901B
+          75BD9C55774ECCD2D5524813A98422C089FD09D1F6FCA94E761615E09355D02F
+          919F9749B13E078BEB3B03031F09089960928C46A3C1FACEB97089F9B99A85B3
+          677FA174CEC4CDAA6AFC0409A1F0557131EA74122F24925312F1CCFBF0FB64AC
+          D34E7A6E9BDD1160F35A1729B66E821376CE1FD273A6F2006F9D766495D0092D
+          89229E49B70787D78D1C2F501405BBFB07A3AD130B80B7AB31FACEB7AAD359E3
+          D331627380174AF7E671785F09AFAC363ABB4DC44D6B407DB4046D1C81B11052
+          F8332C8D542B6DE30D71E822C32D2527D73797EF3030E418A7FBBE19C5A4D4B0
+          1A13E16D49EA25FE09C4600D52A1A144FF7E97A1800F2E27CF3A2CC816C520DA
+          C44874CD3F81266977D1467DDFBAEC743ECF4C31D6EF62DE142C13EDE2E9FF01
+          D7A5ADC9695A63C02623BB15348A06C5AB1C14F7C4CBC535BF015419481881D7
+          D75A0000000049454E44AE426082}
+        Name = 'PngImage12'
+        Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          61000000097048597300000B3A00000B3A01647F570D000001A24944415478DA
+          9D923B2C43511CC6BFEB158B129341A283342241448C44D46222418C2261A0F1
+          58BD26A193C482A18B8DC463D284A5212D121D3CDB26A452214A5295287A1FBD
+          F738E75EBDE90DD5C6B7DC9C73CFF7FBFEFFFF39DCE2EC4417804D18D53D3E63
+          DF42061142C0510019EC2930FC706C885941D2025220BF8A82B98C807462E0B4
+          80B77782D3808CEB9092156C6C7A9E33000EBC0970EF51B4568491C3B104058A
+          2000220F598883C822129F3104BC41B86E7035E921353A80A53BDD05E8305FA0
+          A450A4876528A20042CD8A48CD920459E221BCBEC1B1F37845F33A2920A80392
+          E96DE6B096CCF3DF66FA9544D55CBC3482E3061B4B5F9D3A44BF3E83DEF67C3D
+          DD94F70992A01508C664066B3977E2EC641F73265B2505047580C59CA3F55E7E
+          A7F54C01321F87427B6E3E5A330CCE6A2DC5827D1BB8B4713AA0AE2C8AA2E01E
+          A4A7D08F490FE5FA30DA6731ECADAC7BE075FB412E86B55BF8D8B5A7BDAA8D2A
+          0DE07B88E039164724A63DB097DBB00A51CBF84BF5037EC200AEC0FD0FB35A41
+          360036B8A41A9BAA75335B6704A48AAB5D560F27CDFF02A49A99BE008A302DB4
+          AC93694C0000000049454E44AE426082}
+        Name = 'PngImage16'
+        Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          610000000970485973000017120000171201679FD252000002354944415478DA
+          9D93DF4B936114C73FEF9CDB9C947A23A546E185062E4308122AB5488942A18B
+          A2A228229088EEBA0B83EECCCBCAEA1FA8ABD29B0CACB0FC1176538ACA963FA6
+          A2AEF9966E6E367CF7EEDDF3F4CEB5B4B640FAC281E7E19CF339E73987479152
+          92D2A34BCAC6650B9A8FD4A0A40089E42BCDE941D128E85AD212E7A896B48F83
+          9B00FF939CB703C6BC26A0FD22D25AB0F5B68DE0467242EB804CD535B352DF32
+          DC5C75B2737B1E617D8D79DF0ACD53605FAEA1B6AA8FDEA15F1D24DE9249B3B9
+          2B6837B2B853DD4457749496960ECE8D5772F9C0C8BAFF3720530709B97F404B
+          EE3E6E1D69E04DC0C3BDD6573CC986DD0EFE0DE80F43DC489E8716E175693977
+          8F37D1A90E71FFF65BAE9AF32ACB379D0246A7F7A7034A3C4E6A5DE568868112
+          55282B2DA4B278179EC0570606A6D0A5412CC7C062B130F9594D071CF617F2F0
+          CC35A2C4889B65E644800955C52A159CDBEC84D734739506934195DEC75FD201
+          F5C162AE379EE4933A8B61221CD2865D5AF9160AE38F8430AC122104B3A12526
+          9E2F86FE00E83AB8A60BC8D31CB8BD7E8840757D298D27AA189CF4F2B27B98AC
+          A0056C906DCB425F886F74D0FEC0BE0E99710884397DCC389F90F8CE17D15053
+          C188DF47F7B331EADC7BE8B14DD791F80139C495B6B3F68E40ECE0E94C6B5C72
+          4418BCB0485D4539E30195F79D1E0C8FA8902FA43B15A36CFE8D7F4B69558EBA
+          F616F714951430B3FA9D85FE006BC3B163B243BEDB1AA04D39E4CCB775E95E03
+          2324B0080B22224EC9A7F2432AE627BA3D288D657888700000000049454E44AE
+          426082}
+        Name = 'PngImage13'
+        Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          61000000097048597300000B3A00000B3A01647F570D000001784944415478DA
+          8DD1BF4BC3401407F0EFF9B38BC5D141B10E1637FF02A988205550C15FB3829B
+          A06EFE9C0A767170712A82B33FA0A08576A92D220EA2C5522D562B75B175A918
+          AA4DDA26E725DAC38049F38684E4EE7DDEBD7764C7B33A01E008FA985CDAF41E
+          A346504A411840E7A79A740BBEC39225C410F883FC1B0C263501A35061434028
+          50C492325219C512B6B8B1457440F4AA0252C863A0338BE661BF2584036AF5C0
+          7913C61C71B4DA4A08C7DE30B476A96D0AACF4C0D56D835C1621BD0BF09DBE26
+          D8EFF1F50B3C71A05A7DD09165BD29504411670C717B6E35E464B9037D5DF548
+          DE64107EC43E4B9EE533987137F2EAF6862FD04A095412A1948A88C4F318D94E
+          6B887FCE8EBB07A15A3DCD01A7A3EEA7F7F6172892043040168B506406B19344
+          EF058CEEE63464DA89E0410A6EDD2DF4B6E5D1920EA19CCB180EEB3A0B2C84F8
+          67BF3A730E7C06BDA6937EFE00F612FA647E02F5617A4D84B8D82B524D66FBA3
+          BA7533A056B229602999106A0698F7F61BDF228CEAE9FA9FA3C1000000004945
+          4E44AE426082}
+        Name = 'PngImage15'
+        Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          61000000097048597300000E9C00000E9C01079453DD000000534944415478DA
+          63FCFFFF3F03258071F018C0C8C848944940F58CB80CB0075207A0E20E407C10
+          BB7EDC0680288286A07B19DD0082861063005E43883500A72174710145614051
+          2C509C0E284B89E4028A0D0000DBA366E1865C514F0000000049454E44AE4260
+          82}
+        Name = 'PngImage14'
+        Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          61000000097048597300004E2000004E2001167D99DE000000D34944415478DA
+          63FCFFFF3F03258091AA063032329A00A9F940AC03C45780381188CF20A94F01
+          6263A09E4C5C065C06523381780A10E700713A10EB42A56D80B81E883D817AFE
+          E03200C46144B211C69701E2D540EC0BC46F50F410E1024B20DE0EC499506F31
+          E033005B189403F15220DE0077161E03D003B9018D26C98000208E06E24E7457
+          01F59C21640048F174508803F171F47001EAD1C5678008106F06E250207E8214
+          13483EF8CF88CB001668883702F111A8302866A602F10C625C0072F659209E83
+          642346CCE00C0372C0C01B000040D57DE18A8F9E290000000049454E44AE4260
+          82}
+        Name = 'PngImage17'
+        Background = clWindow
       end>
     Left = 40
-    Top = 112
+    Top = 136
     Bitmap = {}
   end
   object cxStyleRepository: TcxStyleRepository
@@ -721,12 +893,22 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     Top = 168
     PixelsPerInch = 96
     object cxStyle_SUBTOTAL: TcxStyle
-      AssignedValues = [svColor]
-      Color = 552722127
+      AssignedValues = [svColor, svFont]
+      Color = 13298687
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -11
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
     end
     object cxStyle_TITULO: TcxStyle
-      AssignedValues = [svColor]
+      AssignedValues = [svColor, svFont]
       Color = 546166271
+      Font.Charset = DEFAULT_CHARSET
+      Font.Color = clWindowText
+      Font.Height = -12
+      Font.Name = 'Tahoma'
+      Font.Style = [fsBold]
     end
     object cxStyle_DESCUENTO: TcxStyle
       AssignedValues = [svColor]
diff --git a/Source/GUIBase/uViewDetallesBase.pas b/Source/GUIBase/uViewDetallesBase.pas
index 8f1c0874..b147544f 100644
--- a/Source/GUIBase/uViewDetallesBase.pas
+++ b/Source/GUIBase/uViewDetallesBase.pas
@@ -109,6 +109,17 @@ type
     cxStyle_ESPECIALES: TcxStyle;
     cxStyle_NORMAL_PAR: TcxStyle;
     cxStyle_NORMAL_IMPAR: TcxStyle;
+    TBXSubmenuItem1: TTBXSubmenuItem;
+    TBXSeparatorItem6: TTBXSeparatorItem;
+    actAnadirCapitulo: TAction;
+    actAnadirTitulo: TAction;
+    actAnadirSubtotal: TAction;
+    actAnadirDescuento: TAction;
+    TBXItem12: TTBXItem;
+    TBXItem14: TTBXItem;
+    TBXItem15: TTBXItem;
+    TBXItem16: TTBXItem;
+    TBXSeparatorItem7: TTBXSeparatorItem;
     procedure actAnadirExecute(Sender: TObject);
     procedure actEliminarExecute(Sender: TObject);
     procedure actSubirExecute(Sender: TObject);
@@ -144,6 +155,14 @@ type
     procedure cxGridViewCustomDrawCell(Sender: TcxCustomGridTableView;
       ACanvas: TcxCanvas; AViewInfo: TcxGridTableDataCellViewInfo;
       var ADone: Boolean);
+    procedure actAnadirCapituloUpdate(Sender: TObject);
+    procedure actAnadirTituloUpdate(Sender: TObject);
+    procedure actAnadirSubtotalUpdate(Sender: TObject);
+    procedure actAnadirDescuentoUpdate(Sender: TObject);
+    procedure actAnadirCapituloExecute(Sender: TObject);
+    procedure actAnadirTituloExecute(Sender: TObject);
+    procedure actAnadirSubtotalExecute(Sender: TObject);
+    procedure actAnadirDescuentoExecute(Sender: TObject);
 
   private
     FController : IControllerDetallesBase;
@@ -202,6 +221,77 @@ begin
 end;
 
 
+procedure TfrViewDetallesBase.actAnadirCapituloExecute(Sender: TObject);
+var
+  bEsMultiSelect : Boolean;
+begin
+  // Debo quitar el multiselect porque provoca que se quede seleccionado
+  // el registro actual y no el nuevo registro que voy a aņadir
+  bEsMultiSelect := cxGridView.OptionsSelection.MultiSelect;
+  if bEsMultiSelect then
+    cxGridView.OptionsSelection.MultiSelect := False;
+
+  cxGridView.BeginUpdate;
+  try
+    if cxGridView.Controller.EditingController.IsEditing then
+       cxGridView.Controller.EditingController.Edit.PostEditValue;
+
+    if Assigned(Controller) and Assigned(FDetalles) then
+    begin
+        Controller.add(FDetalles, TIPO_DETALLE_TITULO);
+        Controller.add(FDetalles, TIPO_DETALLE_CONCEPTO);
+        Controller.add(FDetalles, TIPO_DETALLE_CONCEPTO);
+        Controller.add(FDetalles, TIPO_DETALLE_SUBTOTAL);
+//        Controller.add(FDetalles, TIPO_DETALLE_DESCUENTO);
+    end;
+  finally
+    cxGridView.EndUpdate;
+
+    // Dejo la propiedad MultiSelect como estaba
+    if bEsMultiSelect then
+       cxGridView.OptionsSelection.MultiSelect := bEsMultiSelect;
+  end;
+end;
+
+procedure TfrViewDetallesBase.actAnadirCapituloUpdate(Sender: TObject);
+begin
+  inherited;
+  (Sender as TAction).Enabled := not ReadOnly;
+end;
+
+procedure TfrViewDetallesBase.actAnadirDescuentoExecute(Sender: TObject);
+var
+  bEsMultiSelect : Boolean;
+begin
+  // Debo quitar el multiselect porque provoca que se quede seleccionado
+  // el registro actual y no el nuevo registro que voy a aņadir
+  bEsMultiSelect := cxGridView.OptionsSelection.MultiSelect;
+  if bEsMultiSelect then
+    cxGridView.OptionsSelection.MultiSelect := False;
+
+  cxGridView.BeginUpdate;
+  try
+    if cxGridView.Controller.EditingController.IsEditing then
+       cxGridView.Controller.EditingController.Edit.PostEditValue;
+
+    if Assigned(Controller)
+    and Assigned(FDetalles) then
+        Controller.add(FDetalles, TIPO_DETALLE_DESCUENTO);
+  finally
+    cxGridView.EndUpdate;
+
+    // Dejo la propiedad MultiSelect como estaba
+    if bEsMultiSelect then
+       cxGridView.OptionsSelection.MultiSelect := bEsMultiSelect;
+  end;
+end;
+
+procedure TfrViewDetallesBase.actAnadirDescuentoUpdate(Sender: TObject);
+begin
+  inherited;
+  (Sender as TAction).Enabled := not ReadOnly;
+end;
+
 procedure TfrViewDetallesBase.actAnadirExecute(Sender: TObject);
 var
   bEsMultiSelect : Boolean;
@@ -229,6 +319,70 @@ begin
   end;
 end;
 
+procedure TfrViewDetallesBase.actAnadirSubtotalExecute(Sender: TObject);
+var
+  bEsMultiSelect : Boolean;
+begin
+  // Debo quitar el multiselect porque provoca que se quede seleccionado
+  // el registro actual y no el nuevo registro que voy a aņadir
+  bEsMultiSelect := cxGridView.OptionsSelection.MultiSelect;
+  if bEsMultiSelect then
+    cxGridView.OptionsSelection.MultiSelect := False;
+
+  cxGridView.BeginUpdate;
+  try
+    if cxGridView.Controller.EditingController.IsEditing then
+       cxGridView.Controller.EditingController.Edit.PostEditValue;
+
+    if Assigned(Controller) and Assigned(FDetalles) then
+        Controller.add(FDetalles, TIPO_DETALLE_SUBTOTAL);
+  finally
+    cxGridView.EndUpdate;
+
+    // Dejo la propiedad MultiSelect como estaba
+    if bEsMultiSelect then
+       cxGridView.OptionsSelection.MultiSelect := bEsMultiSelect;
+  end;
+end;
+
+procedure TfrViewDetallesBase.actAnadirSubtotalUpdate(Sender: TObject);
+begin
+  inherited;
+  (Sender as TAction).Enabled := not ReadOnly;
+end;
+
+procedure TfrViewDetallesBase.actAnadirTituloExecute(Sender: TObject);
+var
+  bEsMultiSelect : Boolean;
+begin
+  // Debo quitar el multiselect porque provoca que se quede seleccionado
+  // el registro actual y no el nuevo registro que voy a aņadir
+  bEsMultiSelect := cxGridView.OptionsSelection.MultiSelect;
+  if bEsMultiSelect then
+    cxGridView.OptionsSelection.MultiSelect := False;
+
+  cxGridView.BeginUpdate;
+  try
+    if cxGridView.Controller.EditingController.IsEditing then
+       cxGridView.Controller.EditingController.Edit.PostEditValue;
+
+    if Assigned(Controller) and Assigned(FDetalles) then
+        Controller.add(FDetalles, TIPO_DETALLE_TITULO);
+  finally
+    cxGridView.EndUpdate;
+
+    // Dejo la propiedad MultiSelect como estaba
+    if bEsMultiSelect then
+       cxGridView.OptionsSelection.MultiSelect := bEsMultiSelect;
+  end;
+end;
+
+procedure TfrViewDetallesBase.actAnadirTituloUpdate(Sender: TObject);
+begin
+  inherited;
+  (Sender as TAction).Enabled := not ReadOnly;
+end;
+
 procedure TfrViewDetallesBase.actEliminarExecute(Sender: TObject);
 var
   AuxTop, AuxRow:Integer;
@@ -533,9 +687,7 @@ begin
       AStyle := cxStyle_NORMAL_IMPAR;
   end;
 
-
-
-{  AStyle := NIL;
+  AStyle := NIL;
   if Assigned(ARecord) then
   begin
     ATipo := DarTipoConcepto(ARecord);
@@ -548,7 +700,7 @@ begin
 
     if ATipo = TIPO_DETALLE_DESCUENTO then
       AStyle := cxStyle_DESCUENTO;
-  end;}
+  end;
 end;
 
 function TfrViewDetallesBase.DarFuentePorDefecto(const ATipo: String): TFont;
diff --git a/Source/GUIBase/uViewGridBase.pas b/Source/GUIBase/uViewGridBase.pas
index b5a022fa..2a668189 100644
--- a/Source/GUIBase/uViewGridBase.pas
+++ b/Source/GUIBase/uViewGridBase.pas
@@ -166,12 +166,35 @@ begin
   RegisterCustomContainer(TfrViewGridBase);
 end;
 
+procedure BestFitAllColumns (TheView:TcxGridDBTableView; ALimit:Integer = 0);
+var
+  i : Integer ;
+begin
+   try
+      TheView.BeginUpdate;
+      for i :=  0 to TheView.VisibleColumnCount-1 do
+      begin
+        //TheView.VisibleColumns[i].BestFitMaxWidth := 0;
+        TheView.VisibleColumns[i].ApplyBestFit;
+        if (ALimit > 0) then
+        begin
+          if (TheView.VisibleColumns[i].Width > ALimit) then
+            TheView.VisibleColumns[i].Width := ALimit;
+        end;
+      end;
+   finally
+      TheView.EndUpdate;
+   end;
+End;
+
 { TfrViewGrid }
 
 procedure TfrViewGridBase.AjustarAncho;
 begin
   if Assigned(_FocusedView) then
+  begin
     _FocusedView.ApplyBestFit;
+  end;
 end;
 
 procedure TfrViewGridBase.AnadirOtrosFiltros;