diff --git a/Build/Build.fbpInf b/Build/Build.fbpInf
index 1a0b5bc5..5b7ef20b 100644
--- a/Build/Build.fbpInf
+++ b/Build/Build.fbpInf
@@ -6,7 +6,7 @@
   <propertysets/>
   <variables>
     <project_path>
-      <![CDATA[C:\Codigo Tecsitel]]>
+      <![CDATA[C:\Codigo tecsitel]]>
     </project_path>
   </variables>
   <properties>
diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc
index 83bfc2d9..eb303991 100644
--- a/Source/Cliente/FactuGES.rc
+++ b/Source/Cliente/FactuGES.rc
@@ -1,4 +1,4 @@
-MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico"
+MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
 FILEVERSION 1,9,5,0
 PRODUCTVERSION 1,9,5,0
diff --git a/Source/GUIBase/uEditorBase.dfm b/Source/GUIBase/uEditorBase.dfm
index 38771460..c5509d71 100644
--- a/Source/GUIBase/uEditorBase.dfm
+++ b/Source/GUIBase/uEditorBase.dfm
@@ -319,7 +319,6 @@ object fEditorBase: TfEditorBase
       Caption = 'Cortar'
       Hint = 'Cortar|Corta la selecci'#243'n y la coloca en el portapapeles'
       ImageIndex = 3
-      ShortCut = 16472
     end
     object actCerrar: TAction
       Category = 'Archivo'
@@ -338,7 +337,6 @@ object fEditorBase: TfEditorBase
       Caption = 'Pegar'
       Hint = 'Pegar|Inserta el contenido del portapapeles'
       ImageIndex = 5
-      ShortCut = 16470
     end
     object actSeleccionarTodo: TEditSelectAll
       Category = 'Edici'#243'n'
diff --git a/Source/GUIBase/uViewDetallesBase.dfm b/Source/GUIBase/uViewDetallesBase.dfm
index 162dc38f..bda06aa6 100644
--- a/Source/GUIBase/uViewDetallesBase.dfm
+++ b/Source/GUIBase/uViewDetallesBase.dfm
@@ -64,7 +64,7 @@ inherited frViewDetallesBase: TfrViewDetallesBase
       DroppedDownWidth = 145
       MaxMRUCount = 0
       FontName = 'Tahoma'
-      ItemIndex = 39
+      ItemIndex = 42
       Options = [foTrueTypeOnly, foNoOEMFonts, foScalableOnly, foWysiWyg]
       Sorted = True
       TabOrder = 2
@@ -542,21 +542,18 @@ inherited frViewDetallesBase: TfrViewDetallesBase
     object actDetallesCortar: TAction
       Category = 'Editar'
       Caption = 'Cortar'
-      ShortCut = 16472
       OnExecute = actDetallesCortarExecute
       OnUpdate = actDetallesCortarUpdate
     end
     object actDetallesCopiar: TAction
       Category = 'Editar'
       Caption = 'Copiar'
-      ShortCut = 16451
       OnExecute = actDetallesCopiarExecute
       OnUpdate = actDetallesCopiarUpdate
     end
     object actDetallesPegar: TAction
       Category = 'Editar'
       Caption = 'Pegar'
-      ShortCut = 16470
       OnExecute = actDetallesPegarExecute
       OnUpdate = actDetallesPegarUpdate
     end
diff --git a/Source/GUIBase/uViewRichEditor.dfm b/Source/GUIBase/uViewRichEditor.dfm
index f9b8d7c4..d690adb7 100644
--- a/Source/GUIBase/uViewRichEditor.dfm
+++ b/Source/GUIBase/uViewRichEditor.dfm
@@ -201,7 +201,6 @@ inherited frViewRichEditor: TfrViewRichEditor
       Caption = 'Cu&t'
       Hint = 'Delete selected item'
       ImageIndex = 3
-      ShortCut = 16472
       OnExecute = actEditCutExecute
     end
     object actEditCopy: TAction
@@ -209,7 +208,6 @@ inherited frViewRichEditor: TfrViewRichEditor
       Caption = '&Copy'
       Hint = 'Copy selected item to clipboard'
       ImageIndex = 4
-      ShortCut = 16451
       OnExecute = actEditCopyExecute
     end
     object actEditPaste: TAction
@@ -217,7 +215,6 @@ inherited frViewRichEditor: TfrViewRichEditor
       Caption = '&Paste'
       Hint = 'Paste contents of clipboard'
       ImageIndex = 5
-      ShortCut = 16470
       OnExecute = actEditPasteExecute
     end
     object actEditFont: TAction
diff --git a/Source/Informes/1/InfPresupuestoCliente.fr3 b/Source/Informes/1/InfPresupuestoCliente.fr3
index b4d54403..de6ae0bf 100644
--- a/Source/Informes/1/InfPresupuestoCliente.fr3
+++ b/Source/Informes/1/InfPresupuestoCliente.fr3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.7.71" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="39065,8724234954" ReportOptions.Description.Text="" ReportOptions.LastChange="40955,730046875" ScriptLanguage="PascalScript" ScriptText.Text="&#13;&#10;procedure DatosEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  Cadena: String;&#13;&#10;begin&#13;&#10;{  DatosEmpresa.Lines.Clear;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO_1_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := 'TLF: ' + &#60;frxDBCabecera.&#34;TELEFONO_1_EMPRESA&#34;&#62;;&#13;&#10;  if (&#60;frxDBCabecera.&#34;FAX_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := Cadena + ' FAX: ' + &#60;frxDBCabecera.&#34;FAX_EMPRESA&#34;&#62;;&#13;&#10;  DatosEmpresa.Lines.Add(Cadena);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;{  NombreEmpresa.Lines.Clear;&#13;&#10;  NombreEmpresa.Lines.Add(&#60;frxDBCabecera.&#34;NOMBRE_EMPRESA&#34;&#62;);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ACadena : String;&#13;&#10;begin&#13;&#10;{  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Clear;&#13;&#10;  if (&#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + '  ' + &#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62;;&#13;&#10;&#13;&#10;  DireccionEnvio.Lines.Add(ACadena);&#13;&#10;  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; + ' ';&#13;&#10;  if (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;&#13;&#10;  if (ACadena &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(ACadena);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;  Set('Capitulo', '0');&#13;&#10;  Set('NumCapitulos', 0);&#13;&#10;  Set('TextoNumCapitulo', ''' ''');      &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Rich3OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if Engine.FinalPass then&#13;&#10;  begin              &#13;&#10;     Set('Capitulo', (&#60;Capitulo&#62; + 1));&#13;&#10;     if (&#60;NumCapitulos&#62; = 1) then&#13;&#10;       MasterData1.Visible := False;                                                                   &#13;&#10;  end&#13;&#10;  else&#13;&#10;     Set('NumCapitulos', (&#60;NumCapitulos&#62; + 1));               &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Page2OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (Length(&#60;frxDBCabecera.&#34;MEMORIA&#34;&#62;) = 0) then&#13;&#10;       Page2.Visible := False;                                                 &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo45OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if Engine.FinalPass then&#13;&#10;  begin&#13;&#10;     if (&#60;frxDBCapitulos.&#34;TIPO_DETALLE&#34;&#62; &#60;&#62; 'Titulo opcional') then                        &#13;&#10;        Set('Capitulo', (&#60;Capitulo&#62; + 1));&#13;&#10;&#13;&#10;     Set('TextoNumCapitulo', &#60;Capitulo&#62;);&#13;&#10;&#13;&#10;     if ((&#60;NumCapitulos&#62; = 1) and (&#60;frxDBCapitulos.&#34;CONCEPTO&#34;&#62; = 'General')) then&#13;&#10;       MasterData1.Visible := False&#13;&#10;     else begin                                     &#13;&#10;       if (&#60;frxDBCapitulos.&#34;TIPO_DETALLE&#34;&#62; = 'Titulo opcional') then&#13;&#10;       begin&#13;&#10;         Set('TextoNumCapitulo', '''OPCIONAL''');&#13;&#10;       end&#13;&#10;     end                      &#13;&#10;  end&#13;&#10;  else             &#13;&#10;     Set('NumCapitulos', (&#60;NumCapitulos&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo47OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;    if (Length(&#60;frxDBCabecera.&#34;OBSERVACIONES&#34;&#62;) = 0) then&#13;&#10;    begin&#13;&#10;       Memo11.Visible := False;                                                                                      &#13;&#10;       Memo47.Visible := False;&#13;&#10;    end                               &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Footer2OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not ((&#60;frxDBCabecera.&#34;IMPORTE_BONIFICACION&#34;&#62;) &#62; 0) then&#13;&#10;  begin&#13;&#10;    mBonificacion.Visible := False;&#13;&#10;    mImporteFinal.Visible := False;                                                                      &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin&#13;&#10;    mBonificacion.Visible := True;&#13;&#10;    mImporteFinal.Visible := True;                                                                      &#13;&#10;  end;&#13;&#10;end;&#13;&#10;&#13;&#10;&#13;&#10;procedure frxDBDetallesCANTIDADOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var    &#13;&#10;  ACantidad: String;  &#13;&#10;  AIndice: Integer;&#13;&#10;  AText : String;                                    &#13;&#10;begin&#13;&#10;  if (&#60;frxDBDetalles.&#34;CANTIDAD&#34;&#62; &#60;&#62; 0) then&#13;&#10;  begin              &#13;&#10;    frxDBDetallesCANTIDAD.Memo.Clear;  &#13;&#10;    ACantidad := FloatToStr(&#60;frxDBDetalles.&#34;CANTIDAD&#34;&#62;);  &#13;&#10;    AIndice := Pos(',', ACantidad);&#13;&#10;    if AIndice &#62; 0 then                                           &#13;&#10;       AText := '[FormatFloat(''#,##0.00'',&#60;frxDBDetalles.&#34;CANTIDAD&#34;&#62;)] [frxDBDetalles.&#34;UNIDAD_MEDIDA&#34;]'&#13;&#10;    else                     &#13;&#10;       AText := '[FormatFloat(''#,##0.##'',&#60;frxDBDetalles.&#34;CANTIDAD&#34;&#62;)] [frxDBDetalles.&#34;UNIDAD_MEDIDA&#34;]';  &#13;&#10;         &#13;&#10;    frxDBDetallesCANTIDAD.Memo.Add(AText);&#13;&#10;  end;            &#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (&#60;VerSello&#62; = 1) then&#13;&#10;  begin&#13;&#10;    Firma1.Visible := True;&#13;&#10;    Firma2.Visible := False;        &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin&#13;&#10;    Firma1.Visible := False;&#13;&#10;    Firma2.Visible := True;        &#13;&#10;  end;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnAfterCalcHeight(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  ReportSummary1.Height := Engine.FreeSpace - 20;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure MasterData4OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (MasterData4.DataSet.RecordCount &#62; 1) then&#13;&#10;  begin              &#13;&#10;     Header2.Visible := True;                                               &#13;&#10;     MasterData4.Visible := True;&#13;&#10;     Memo38.Visible := True;&#13;&#10;  end                 &#13;&#10;  else&#13;&#10;  begin&#13;&#10;     Header2.Visible := False;      &#13;&#10;     MasterData4.Visible := False;&#13;&#10;     Memo38.Visible := False;&#13;&#10;   end;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Picture4OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (&#60;VerISO&#62; = 0) then&#13;&#10;  begin              &#13;&#10;     Picture4.Visible := False;  &#13;&#10;     Picture7.Visible := False;  &#13;&#10;     Picture9.Visible := False;           &#13;&#10;  end                 &#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     Picture4.Visible := True;&#13;&#10;     Picture7.Visible := True;&#13;&#10;     Picture9.Visible := True;         &#13;&#10;  end;                   &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3600000020446174615365743D2266727844424361706974756C6F732220446174615365744E616D653D2266727844424361706974756C6F732200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C65732200010C3200000020446174615365743D226672784442526573756D656E2220446174615365744E616D653D226672784442526573756D656E220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C10000000204E616D653D2220496E666F726D652200010C10000000204E616D653D224361706974756C6F2200010C14000000204E616D653D224E756D4361706974756C6F732200010C18000000204E616D653D22546578746F4E756D4361706974756C6F2200010C10000000204E616D653D2256657253656C6C6F2200010C0E000000204E616D653D2256657249534F220000055374796C650100">
+<TfrxReport Version="4.7.71" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="39065,8724234954" ReportOptions.Description.Text="" ReportOptions.LastChange="41088,5631452778" ScriptLanguage="PascalScript" ScriptText.Text="&#13;&#10;procedure DatosEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  Cadena: String;&#13;&#10;begin&#13;&#10;{  DatosEmpresa.Lines.Clear;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO_1_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := 'TLF: ' + &#60;frxDBCabecera.&#34;TELEFONO_1_EMPRESA&#34;&#62;;&#13;&#10;  if (&#60;frxDBCabecera.&#34;FAX_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := Cadena + ' FAX: ' + &#60;frxDBCabecera.&#34;FAX_EMPRESA&#34;&#62;;&#13;&#10;  DatosEmpresa.Lines.Add(Cadena);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;{  NombreEmpresa.Lines.Clear;&#13;&#10;  NombreEmpresa.Lines.Add(&#60;frxDBCabecera.&#34;NOMBRE_EMPRESA&#34;&#62;);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ACadena : String;&#13;&#10;begin&#13;&#10;{  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Clear;&#13;&#10;  if (&#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;REFERENCIA_CLIENTE&#34;&#62;;&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + '  ' + &#60;frxDBCabecera.&#34;PERSONA_CONTACTO&#34;&#62;;&#13;&#10;&#13;&#10;  DireccionEnvio.Lines.Add(ACadena);&#13;&#10;  ACadena := '';&#13;&#10;  DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; + ' ';&#13;&#10;  if (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + &#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62;;&#13;&#10;&#13;&#10;  if (ACadena &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(ACadena);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62; &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(&#60;frxDBCabecera.&#34;TELEFONO&#34;&#62;);&#13;&#10;}&#13;&#10;end;&#13;&#10;&#13;&#10;procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;  Set('Capitulo', '0');&#13;&#10;  Set('NumCapitulos', 0);&#13;&#10;  Set('TextoNumCapitulo', ''' ''');      &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Rich3OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if Engine.FinalPass then&#13;&#10;  begin              &#13;&#10;     Set('Capitulo', (&#60;Capitulo&#62; + 1));&#13;&#10;     if (&#60;NumCapitulos&#62; = 1) then&#13;&#10;       MasterData1.Visible := False;                                                                   &#13;&#10;  end&#13;&#10;  else&#13;&#10;     Set('NumCapitulos', (&#60;NumCapitulos&#62; + 1));               &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Page2OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (Length(&#60;frxDBCabecera.&#34;MEMORIA&#34;&#62;) = 0) then&#13;&#10;       Page2.Visible := False;                                                 &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo45OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if Engine.FinalPass then&#13;&#10;  begin&#13;&#10;     if (&#60;frxDBCapitulos.&#34;TIPO_DETALLE&#34;&#62; &#60;&#62; 'Titulo opcional') then                        &#13;&#10;        Set('Capitulo', (&#60;Capitulo&#62; + 1));&#13;&#10;&#13;&#10;     Set('TextoNumCapitulo', &#60;Capitulo&#62;);&#13;&#10;&#13;&#10;     if ((&#60;NumCapitulos&#62; = 1) and (&#60;frxDBCapitulos.&#34;CONCEPTO&#34;&#62; = 'General')) then&#13;&#10;       MasterData1.Visible := False&#13;&#10;     else begin                                     &#13;&#10;       if (&#60;frxDBCapitulos.&#34;TIPO_DETALLE&#34;&#62; = 'Titulo opcional') then&#13;&#10;       begin&#13;&#10;         Set('TextoNumCapitulo', '''OPCIONAL''');&#13;&#10;       end&#13;&#10;     end                      &#13;&#10;  end&#13;&#10;  else             &#13;&#10;     Set('NumCapitulos', (&#60;NumCapitulos&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo47OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;    if (Length(&#60;frxDBCabecera.&#34;OBSERVACIONES&#34;&#62;) = 0) then&#13;&#10;    begin&#13;&#10;       Memo11.Visible := False;                                                                                      &#13;&#10;       Memo47.Visible := False;&#13;&#10;    end                               &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Footer2OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not ((&#60;frxDBCabecera.&#34;IMPORTE_BONIFICACION&#34;&#62;) &#62; 0) then&#13;&#10;  begin&#13;&#10;    mBonificacion.Visible := False;&#13;&#10;    mImporteFinal.Visible := False;                                                                      &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin&#13;&#10;    mBonificacion.Visible := True;&#13;&#10;    mImporteFinal.Visible := True;                                                                      &#13;&#10;  end;&#13;&#10;end;&#13;&#10;&#13;&#10;&#13;&#10;procedure frxDBDetallesCANTIDADOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var    &#13;&#10;  ACantidad: String;  &#13;&#10;  AIndice: Integer;&#13;&#10;  AText : String;                                    &#13;&#10;begin&#13;&#10;  if (&#60;frxDBDetalles.&#34;CANTIDAD&#34;&#62; &#60;&#62; 0) then&#13;&#10;  begin              &#13;&#10;    frxDBDetallesCANTIDAD.Memo.Clear;  &#13;&#10;    ACantidad := FloatToStr(&#60;frxDBDetalles.&#34;CANTIDAD&#34;&#62;);  &#13;&#10;    AIndice := Pos(',', ACantidad);&#13;&#10;    if AIndice &#62; 0 then                                           &#13;&#10;       AText := '[FormatFloat(''#,##0.00'',&#60;frxDBDetalles.&#34;CANTIDAD&#34;&#62;)] [frxDBDetalles.&#34;UNIDAD_MEDIDA&#34;]'&#13;&#10;    else                     &#13;&#10;       AText := '[FormatFloat(''#,##0.##'',&#60;frxDBDetalles.&#34;CANTIDAD&#34;&#62;)] [frxDBDetalles.&#34;UNIDAD_MEDIDA&#34;]';  &#13;&#10;         &#13;&#10;    frxDBDetallesCANTIDAD.Memo.Add(AText);&#13;&#10;  end;            &#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (&#60;VerSello&#62; = 1) then&#13;&#10;  begin&#13;&#10;    Firma1.Visible := True;&#13;&#10;    Firma2.Visible := False;        &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin&#13;&#10;    Firma1.Visible := False;&#13;&#10;    Firma2.Visible := True;        &#13;&#10;  end;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnAfterCalcHeight(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  ReportSummary1.Height := Engine.FreeSpace - 20;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure MasterData4OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (MasterData4.DataSet.RecordCount &#62; 1) then&#13;&#10;  begin              &#13;&#10;     Header2.Visible := True;                                               &#13;&#10;     MasterData4.Visible := True;&#13;&#10;     Memo38.Visible := True;&#13;&#10;  end                 &#13;&#10;  else&#13;&#10;  begin&#13;&#10;     Header2.Visible := False;      &#13;&#10;     MasterData4.Visible := False;&#13;&#10;     Memo38.Visible := False;&#13;&#10;   end;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Picture4OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (&#60;VerISO&#62; = 0) then&#13;&#10;  begin              &#13;&#10;     Picture4.Visible := False;  &#13;&#10;     Picture7.Visible := False;  &#13;&#10;     Picture9.Visible := False;           &#13;&#10;  end                 &#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     Picture4.Visible := True;&#13;&#10;     Picture7.Visible := True;&#13;&#10;     Picture9.Visible := True;         &#13;&#10;  end;                   &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3600000020446174615365743D2266727844424361706974756C6F732220446174615365744E616D653D2266727844424361706974756C6F732200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C65732200010C3200000020446174615365743D226672784442526573756D656E2220446174615365744E616D653D226672784442526573756D656E220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C10000000204E616D653D2220496E666F726D652200010C10000000204E616D653D224361706974756C6F2200010C14000000204E616D653D224E756D4361706974756C6F732200010C18000000204E616D653D22546578746F4E756D4361706974756C6F2200010C10000000204E616D653D2256657253656C6C6F2200010C0E000000204E616D653D2256657249534F220000055374796C650100">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" PaperWidth="209,99979167" PaperHeight="297,00008333" PaperSize="256" LeftMargin="19,9998541666667" RightMargin="19,9998541666667" TopMargin="19,9998541666667" BottomMargin="19,9998541666667" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text="">
     <TfrxMasterData Name="MasterData2" Height="370,39394" Left="0" Top="567" Width="642,520414973432" ColumnWidth="0" ColumnGap="0" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" RowCount="0" Stretched="True">
@@ -11,7 +11,7 @@
       <TfrxMemoView Name="Memo2" Left="143,10358667" Top="87,5478695199999" Width="85" Height="27" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="13056" Font.Height="-16" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Número"/>
       <TfrxMemoView Name="Memo3" Left="143,10358667" Top="114,48265476" Width="85" Height="27" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="13056" Font.Height="-16" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Fecha"/>
       <TfrxMemoView Name="Memo4" Left="143,10358667" Top="141,41744" Width="85" Height="27" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="13056" Font.Height="-16" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Cliente"/>
-      <TfrxRichView Name="Rich2" Left="132,80040167" Top="241,78757" Width="415,52783" Height="111,26778" ShowHint="False" StretchMode="smMaxHeight" GapX="2" GapY="1" PropData="0852696368456469740ACC0000007B5C727466315C616E73695C616E7369637067313235325C64656666305C6465666C616E67333038327B5C666F6E7474626C7B5C66305C666E696C5C666368617273657430205461686F6D613B7D7B5C66315C666E696C205461686F6D613B7D7D0D0A5C766965776B696E64345C7563315C706172645C716A5C66305C66733232205B504F4E45524A555354494649434143494F4E434F4D504C455441283C667278444243616265636572612E22504F5254414441223E295D5C66315C7061720D0A5C7061720D0A7D0D0A00"/>
+      <TfrxRichView Name="Rich2" Left="132,80040167" Top="241,78757" Width="415,52783" Height="111,26778" ShowHint="False" StretchMode="smActualHeight" GapX="2" GapY="1" PropData="0852696368456469740ACC0000007B5C727466315C616E73695C616E7369637067313235325C64656666305C6465666C616E67333038327B5C666F6E7474626C7B5C66305C666E696C5C666368617273657430205461686F6D613B7D7B5C66315C666E696C205461686F6D613B7D7D0D0A5C766965776B696E64345C7563315C706172645C716A5C66305C66733232205B504F4E45524A555354494649434143494F4E434F4D504C455441283C667278444243616265636572612E22504F5254414441223E295D5C66315C7061720D0A5C7061720D0A7D0D0A00"/>
       <TfrxMemoView Name="Memo5" Left="227,72959167" Top="114,48265476" Width="316,37817" Height="27" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-16" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[frxDBCabecera.&#34;FECHA_PRESUPUESTO&#34;]"/>
       <TfrxMemoView Name="Memo6" Left="227,72959167" Top="141,41744" Width="316,37817" Height="37" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-16" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="[frxDBCabecera.&#34;NOMBRE&#34;]"/>
       <TfrxMemoView Name="Memo7" Left="227,72959167" Top="181,07575667" Width="316,37817" Height="57" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-15" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="A la atención de:&#13;&#10;[frxDBCabecera.&#34;PERSONA_CONTACTO&#34;]"/>
diff --git a/Source/Modulos/Contactos/Views/Contactos_view.res b/Source/Modulos/Contactos/Views/Contactos_view.res
index 1641339f..8b251f31 100644
Binary files a/Source/Modulos/Contactos/Views/Contactos_view.res and b/Source/Modulos/Contactos/Views/Contactos_view.res differ
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm
index 0b93a199..0c65a737 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm	
+++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.dfm	
@@ -177,16 +177,14 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     ExplicitWidth = 758
     ExplicitHeight = 366
     inherited pagGeneral: TTabSheet
+      ExplicitLeft = 4
+      ExplicitTop = 24
       ExplicitWidth = 750
       ExplicitHeight = 338
     end
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       inline frViewDetallesPresupuestoCliente1: TfrViewDetallesPresupuestoCliente
         Left = 0
         Top = 0
@@ -207,105 +205,100 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         ExplicitHeight = 338
         inherited ToolBar1: TToolBar
           Width = 750
-          Height = 46
+          Height = 51
           ExplicitWidth = 750
-          ExplicitHeight = 46
+          ExplicitHeight = 51
           inherited ToolButton3: TToolButton
             Wrap = False
           end
           inherited ToolButton4: TToolButton
             Left = 278
             Top = 0
-            Wrap = True
             ExplicitLeft = 278
             ExplicitTop = 0
           end
           inherited ToolButton14: TToolButton
-            Left = 0
-            Wrap = False
-            ExplicitLeft = 0
-          end
-          inherited FontName: TJvFontComboBox
-            Left = 65
-            Top = 22
-            ExplicitLeft = 65
-            ExplicitTop = 22
-          end
-          inherited FontSize: TEdit
-            Left = 210
-            Top = 22
-            Width = 200
-            ExplicitLeft = 210
-            ExplicitTop = 22
-            ExplicitWidth = 200
-          end
-          inherited UpDown1: TUpDown
-            Left = 410
-            Top = 22
-            ExplicitLeft = 410
-            ExplicitTop = 22
-          end
-          inherited ToolButton13: TToolButton
-            Left = 427
-            Top = 22
-            ExplicitLeft = 427
-            ExplicitTop = 22
-          end
-          inherited ToolButton6: TToolButton
-            Left = 435
-            Top = 22
-            ExplicitLeft = 435
-            ExplicitTop = 22
-          end
-          inherited ToolButton7: TToolButton
-            Left = 501
-            Top = 22
-            ExplicitLeft = 501
-            ExplicitTop = 22
-          end
-          inherited ToolButton8: TToolButton
-            Left = 568
-            Top = 22
-            ExplicitLeft = 568
-            ExplicitTop = 22
-          end
-          inherited ToolButton12: TToolButton
-            Left = 651
-            Top = 22
-            ExplicitLeft = 651
-            ExplicitTop = 22
+            Left = 334
+            Top = 0
+            ExplicitLeft = 334
+            ExplicitTop = 0
           end
           inherited ToolButton9: TToolButton
-            Left = 659
-            Top = 22
-            ExplicitLeft = 659
-            ExplicitTop = 22
+            Left = 399
+            Top = 0
+            ExplicitLeft = 399
+            ExplicitTop = 0
           end
-          inherited ToolButton10: TToolButton
-            Left = 804
-            Top = 22
-            ExplicitLeft = 804
-            ExplicitTop = 22
+          inherited FontName: TJvFontComboBox
+            Left = 544
+            Top = 0
+            ExplicitLeft = 544
+            ExplicitTop = 0
+          end
+          inherited UpDown1: TUpDown
+            Left = 689
+            Top = 0
+            ExplicitLeft = 689
+            ExplicitTop = 0
+          end
+          inherited ToolButton13: TToolButton
+            Top = 0
+            ExplicitTop = 0
+          end
+          inherited ToolButton6: TToolButton
+            Top = 27
+            ExplicitTop = 27
+          end
+          inherited FontSize: TEdit
+            Top = 27
+            Width = 200
+            ExplicitTop = 27
+            ExplicitWidth = 200
+          end
+          inherited ToolButton7: TToolButton
+            Left = 266
+            Top = 27
+            ExplicitLeft = 266
+            ExplicitTop = 27
           end
           inherited ToolButton11: TToolButton
-            Left = 929
-            Top = 22
-            ExplicitLeft = 929
-            ExplicitTop = 22
+            Left = 333
+            Top = 27
+            ExplicitLeft = 333
+            ExplicitTop = 27
+          end
+          inherited ToolButton12: TToolButton
+            Left = 474
+            Top = 27
+            Wrap = False
+            ExplicitLeft = 474
+            ExplicitTop = 27
+            ExplicitHeight = 22
+          end
+          inherited ToolButton10: TToolButton
+            Left = 482
+            Top = 27
+            ExplicitLeft = 482
+            ExplicitTop = 27
+          end
+          inherited ToolButton8: TToolButton
+            Left = 607
+            Top = 27
+            ExplicitLeft = 607
+            ExplicitTop = 27
           end
         end
         inherited cxGrid: TcxGrid
-          Top = 72
+          Top = 77
           Width = 750
-          Height = 266
-          ExplicitTop = 104
+          Height = 261
           ExplicitWidth = 750
-          ExplicitHeight = 234
+          ExplicitHeight = 239
         end
         inherited TBXDock1: TTBXDock
-          Top = 46
+          Top = 51
           Width = 750
-          ExplicitTop = 78
+          ExplicitTop = 73
           ExplicitWidth = 750
           inherited TBXToolbar1: TTBXToolbar
             ExplicitWidth = 750
@@ -325,10 +318,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     object pagPortada: TTabSheet
       Caption = 'Portada'
       ImageIndex = 3
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
+      OnShow = pagPortadaShow
       object Panel1: TPanel
         Left = 0
         Top = 0
@@ -336,7 +326,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         Height = 338
         Align = alLeft
         TabOrder = 0
-        ExplicitHeight = 398
         object Image2: TImage
           Left = 16
           Top = 16
@@ -461,10 +450,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     object pagMemoria: TTabSheet
       Caption = 'Memoria'
       ImageIndex = 4
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
+      OnShow = pagMemoriaShow
       object Panel2: TPanel
         Left = 0
         Top = 0
@@ -472,7 +458,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         Height = 338
         Align = alLeft
         TabOrder = 0
-        ExplicitHeight = 398
         object Image3: TImage
           Left = 16
           Top = 16
@@ -768,10 +753,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
     object pagInicidencias: TTabSheet
       Caption = 'Incidencias'
       ImageIndex = 2
-      ExplicitLeft = 0
-      ExplicitTop = 0
-      ExplicitWidth = 0
-      ExplicitHeight = 0
       inline frViewIncidenciasCli: TfrViewIncidencias
         Left = 0
         Top = 0
@@ -836,7 +817,7 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
           Width = 750
           Height = 315
           ExplicitWidth = 750
-          ExplicitHeight = 375
+          ExplicitHeight = 315
         end
       end
     end
@@ -1106,7 +1087,6 @@ inherited fEditorPresupuestoCliente: TfEditorPresupuestoCliente
         ExplicitLeft = 21
         ExplicitTop = 29
         ExplicitWidth = 277
-        ExplicitHeight = 0
         Width = 277
       end
       inherited eDescripcionBonificacion: TcxDBTextEdit
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas
index bbf4a03a..5d7b3056 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas	
+++ b/Source/Modulos/Presupuestos de cliente/Views/uEditorPresupuestoCliente.pas	
@@ -59,6 +59,8 @@ type
     procedure actEnviarPorEMailExecute(Sender: TObject);
     procedure actEnviarPorEMailUpdate(Sender: TObject);
     procedure actEliminarUpdate(Sender: TObject);
+    procedure pagPortadaShow(Sender: TObject);
+    procedure pagMemoriaShow(Sender: TObject);
   private
     procedure RecalcularPortePorUnidad;
 
@@ -327,6 +329,18 @@ begin
   end;
 end;
 
+procedure TfEditorPresupuestoCliente.pagMemoriaShow(Sender: TObject);
+begin
+  inherited;
+  frViewRichEditor2.RichEdit.SetFocus;
+end;
+
+procedure TfEditorPresupuestoCliente.pagPortadaShow(Sender: TObject);
+begin
+  inherited;
+  frViewRichEditor1.RichEdit.SetFocus;
+end;
+
 procedure TfEditorPresupuestoCliente.pgPaginasChanging(Sender: TObject;
   var AllowChange: Boolean);
 var
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index 42bad7f8..2a23419c 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 8dfa79a4..6be438d4 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,4 +1,4 @@
-MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Servidor.ico"
+MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
 FILEVERSION 1,9,4,0
 PRODUCTVERSION 1,9,4,0
@@ -14,7 +14,7 @@ BEGIN
          BEGIN
               VALUE "FileVersion", "1.9.4.0\0"
               VALUE "ProductVersion", "1.9.4.0\0"
-              VALUE "CompileDate", "martes, 12 de junio de 2012 10:58\0"
+              VALUE "CompileDate", "jueves, 28 de junio de 2012 13:19\0"
          END
     END
     BLOCK "VarFileInfo"