diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj
index c7dd853..9e39f1f 100644
--- a/Source/Cliente/FactuGES.dproj
+++ b/Source/Cliente/FactuGES.dproj
@@ -53,7 +53,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">2</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.4.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.4.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">1</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">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">4.4.1.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">4.4.1.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>
diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res
index 7a42eec..6725688 100644
Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ
diff --git a/Source/Informes/6/en/InfAlbaranCliente.fr3 b/Source/Informes/6/en/InfAlbaranCliente.fr3
index 7ef75f3..3a8ac21 100644
--- a/Source/Informes/6/en/InfAlbaranCliente.fr3
+++ b/Source/Informes/6/en/InfAlbaranCliente.fr3
@@ -1,12 +1,12 @@
 <?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="41807,7520598611" ScriptLanguage="PascalScript" ScriptText.Text="var&#13;&#10;  Pagina: Variant;&#13;&#10;&#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;&#13;&#10;  ACadena := '';&#13;&#10;&#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;POBLACION&#34;&#62;;&#13;&#10;&#13;&#10;  if (ACadena &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(ACadena);&#13;&#10;&#13;&#10;  ACadena := '';                                                    &#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;       ACadena := &#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;;&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PAIS&#34;&#62; &#60;&#62; '') then&#13;&#10;       ACadena := ACadena + ' - ' + &#60;frxDBCabecera.&#34;PAIS&#34;&#62;;&#13;&#10;    &#13;&#10;  DireccionEnvio.Lines.Add(ACadena);                 &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo2OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Memo2.Lines.Clear;&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;) &#60; 0) then&#13;&#10;     Memo2.Lines.Add('RETURN ORDER')&#13;&#10;  else&#13;&#10;     Memo2.Lines.Add('DELIVERY NOTE')&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo5OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;) &#60; 0) then&#13;&#10;  begin&#13;&#10;     Memo5.Lines.Clear;&#13;&#10;     Memo5.Lines.Add('Order number:');&#13;&#10;  end;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo9OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;) &#60; 0) then&#13;&#10;  begin&#13;&#10;     Memo9.Lines.Clear;&#13;&#10;     Memo9.Lines.Add('Date order:');&#13;&#10;  end;&#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;end;&#13;&#10;&#13;&#10;procedure Memo26OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;VerObservaciones&#62; and (&#60;frxDBCabecera.&#34;OBSERVACIONES&#34;&#62; &#60;&#62; '') then&#13;&#10;     Memo26.Visible := True                                                    &#13;&#10;  else&#13;&#10;     Memo26.Visible := False              &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo27OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;VerIncidencias&#62; and (&#60;frxDBCabecera.&#34;INCIDENCIAS&#34;&#62; &#60;&#62; '') then&#13;&#10;     Memo27.Visible := True                                                    &#13;&#10;  else&#13;&#10;     Memo27.Visible := False              &#13;&#10;end;&#13;&#10;&#13;&#10;procedure eImporteUnidadOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;VerPrecios&#62; then&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := True;  &#13;&#10;     lImporteUnidad.Visible := True;&#13;&#10;     eDescuento.Visible := True;&#13;&#10;     lDescuento.Visible := True;                                                                    &#13;&#10;     eImporteTotal.Visible := True;  &#13;&#10;     lImporteTotal.Visible := True;  &#13;&#10;     ImporteUnidad.Visible := True;&#13;&#10;     Descuento.Visible := True;                                                             &#13;&#10;     ImporteTotal.Visible := True;           &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := False;  &#13;&#10;     lImporteUnidad.Visible := False;  &#13;&#10;     eImporteTotal.Visible := False;  &#13;&#10;     lImporteTotal.Visible := False;&#13;&#10;     eDescuento.Visible := False;&#13;&#10;     lDescuento.Visible := False;                                                                     &#13;&#10;     ImporteUnidad.Visible := False;  &#13;&#10;     ImporteTotal.Visible := False;&#13;&#10;     Descuento.Visible := False;                                                               &#13;&#10;     eConcepto.Width := eConcepto.Width + ImporteTotal.Width + eDescuento.Width + ImporteUnidad.Width + 10;&#13;&#10;     Concepto.Width := eConcepto.Width - 10;         &#13;&#10;  end  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;ShowLogotipo&#62; then&#13;&#10;  begin&#13;&#10;     Overlay1.Visible := True;                                       &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     Overlay1.Visible := False;   &#13;&#10;  end  &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C16000000204E616D653D222056697375616C697A6163696F6E2200010C13000000204E616D653D2253686F4C6F676F7469706F2200010C18000000204E616D653D225665724F62736572766163696F6E65732200010C16000000204E616D653D22566572496E636964656E636961732200010C12000000204E616D653D2256657250726563696F732200010C17000000204E616D653D2256657252656650726F766565646F72220000055374796C650100">
+<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="41915,6633513079" ScriptLanguage="PascalScript" ScriptText.Text="var&#13;&#10;  Pagina: Variant;&#13;&#10;&#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;&#13;&#10;  ACadena := '';&#13;&#10;&#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;POBLACION&#34;&#62;;&#13;&#10;&#13;&#10;  if (ACadena &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(ACadena);&#13;&#10;&#13;&#10;  ACadena := '';                                                    &#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;       ACadena := &#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;;&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PAIS&#34;&#62; &#60;&#62; '') then&#13;&#10;       ACadena := ACadena + ' - ' + &#60;frxDBCabecera.&#34;PAIS&#34;&#62;;&#13;&#10;    &#13;&#10;  DireccionEnvio.Lines.Add(ACadena);                 &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo2OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Memo2.Lines.Clear;&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;) &#60; 0) then&#13;&#10;     Memo2.Lines.Add('RETURN ORDER')&#13;&#10;  else&#13;&#10;     Memo2.Lines.Add('DELIVERY NOTE')&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo5OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;) &#60; 0) then&#13;&#10;  begin&#13;&#10;     Memo5.Lines.Clear;&#13;&#10;     Memo5.Lines.Add('Order number:');&#13;&#10;  end;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo9OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;IMPORTE_TOTAL&#34;&#62;) &#60; 0) then&#13;&#10;  begin&#13;&#10;     Memo9.Lines.Clear;&#13;&#10;     Memo9.Lines.Add('Date order:');&#13;&#10;  end;&#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;end;&#13;&#10;&#13;&#10;procedure Memo26OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;VerObservaciones&#62; and (&#60;frxDBCabecera.&#34;OBSERVACIONES&#34;&#62; &#60;&#62; '') then&#13;&#10;     Memo26.Visible := True                                                    &#13;&#10;  else&#13;&#10;     Memo26.Visible := False              &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo27OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;VerIncidencias&#62; and (&#60;frxDBCabecera.&#34;INCIDENCIAS&#34;&#62; &#60;&#62; '') then&#13;&#10;     Memo27.Visible := True                                                    &#13;&#10;  else&#13;&#10;     Memo27.Visible := False              &#13;&#10;end;&#13;&#10;&#13;&#10;procedure eImporteUnidadOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;VerPrecios&#62; then&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := True;  &#13;&#10;     lImporteUnidad.Visible := True;&#13;&#10;     eDescuento.Visible := True;&#13;&#10;     lDescuento.Visible := True;                                                                    &#13;&#10;     eImporteTotal.Visible := True;  &#13;&#10;     lImporteTotal.Visible := True;  &#13;&#10;     ImporteUnidad.Visible := True;&#13;&#10;     Descuento.Visible := True;                                                             &#13;&#10;     ImporteTotal.Visible := True;           &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := False;  &#13;&#10;     lImporteUnidad.Visible := False;  &#13;&#10;     eImporteTotal.Visible := False;  &#13;&#10;     lImporteTotal.Visible := False;&#13;&#10;     eDescuento.Visible := False;&#13;&#10;     lDescuento.Visible := False;                                                                     &#13;&#10;     ImporteUnidad.Visible := False;  &#13;&#10;     ImporteTotal.Visible := False;&#13;&#10;     Descuento.Visible := False;                                                               &#13;&#10;     eConcepto.Width := eConcepto.Width + ImporteTotal.Width + eDescuento.Width + ImporteUnidad.Width + 10;&#13;&#10;     Concepto.Width := eConcepto.Width - 10;         &#13;&#10;  end  &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;ShowLogotipo&#62; then&#13;&#10;  begin&#13;&#10;     Overlay1.Visible := True;                                       &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     Overlay1.Visible := False;   &#13;&#10;  end  &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C16000000204E616D653D222056697375616C697A6163696F6E2200010C13000000204E616D653D2253686F4C6F676F7469706F2200010C18000000204E616D653D225665724F62736572766163696F6E65732200010C16000000204E616D653D22566572496E636964656E636961732200010C12000000204E616D653D2256657250726563696F732200010C17000000204E616D653D2256657252656650726F766565646F72220000055374796C650100">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" PaperWidth="215,00041667" PaperHeight="297,00008333" PaperSize="256" LeftMargin="10,00125" RightMargin="10,00125" TopMargin="10,00125" BottomMargin="10,00125" ColumnWidth="0" ColumnPositions.Text="" LargeDesignHeight="True" HGuides.Text="" VGuides.Text="">
     <TfrxMasterData Name="MasterData1" Height="24" Left="0" Top="471" Width="737,000475991765" ColumnWidth="0" ColumnGap="0" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
       <TfrxMemoView Name="Memo14" Left="19" Top="1,5" Width="117" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#0 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;REFERENCIA&#34;] "/>
       <TfrxMemoView Name="MemoCampo2" Left="140" Top="1,5" Width="56,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%g" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;CANTIDAD&#34;]"/>
-      <TfrxMemoView Name="ImporteUnidad" Left="501" Top="1,5" Width="81,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
-      <TfrxMemoView Name="ImporteTotal" Left="651" Top="2" Width="83,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
+      <TfrxMemoView Name="ImporteUnidad" Left="501" Top="1,5" Width="81,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2n £" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;] "/>
+      <TfrxMemoView Name="ImporteTotal" Left="651" Top="2" Width="83,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2n £" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxMemoView Name="Descuento" Left="588" Top="2" Width="58" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 %" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;DESCUENTO&#34;]"/>
       <TfrxMemoView Name="Concepto" Left="200" Top="1,5" Width="296" Height="18" ShowHint="False" StretchMode="smMaxHeight" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="tahoma" Font.Style="0" ParentFont="False" Text="[frxDBDetalles.&#34;CONCEPTO&#34;]"/>
     </TfrxMasterData>
diff --git a/Source/Informes/6/en/InfFacturaCliente.fr3 b/Source/Informes/6/en/InfFacturaCliente.fr3
index 1393749..2007fe6 100644
--- a/Source/Informes/6/en/InfFacturaCliente.fr3
+++ b/Source/Informes/6/en/InfFacturaCliente.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.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="" ReportOptions.LastChange="41807,7595928704" ReportOptions.VersionBuild="1" ReportOptions.VersionMajor="12" ReportOptions.VersionMinor="13" ReportOptions.VersionRelease="1" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ACadena : String;                                        &#13;&#10;begin&#13;&#10;  DatosCliente.Lines.Clear;&#13;&#10;  DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '')&#13;&#10;  or (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; + '  ' + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;);&#13;&#10;&#13;&#10;  ACadena := '';&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;;&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PAIS&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + ' - ' + &#60;frxDBCabecera.&#34;PAIS&#34;&#62;;&#13;&#10;  &#13;&#10;  DatosCliente.Lines.Add(ACadena);                           &#13;&#10;end;&#13;&#10;&#13;&#10;procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  BandaDetalles.StartNewPage := False;&#13;&#10;  BandaDetalles.Visible := True;&#13;&#10;  MemPrecio.Style := 'Concepto normal';&#13;&#10;  MemCantidad.Style := 'Concepto normal';&#13;&#10;  MemImpTotal.Style := 'Concepto normal';&#13;&#10;  RichConcepto.Visible := True;&#13;&#10;  MemImpTotal.HideZeros := True;        &#13;&#10;&#13;&#10;  case &#60;frxDBDetalles.&#34;TIPO_DETALLE&#34;&#62; of&#13;&#10;  'Salto': begin&#13;&#10;        BandaDetalles.StartNewPage := True;&#13;&#10;        RichConcepto.Visible := False;&#13;&#10;       end;&#13;&#10;  'Titulo': begin&#13;&#10;       MemPrecio.Style := 'Concepto titulo';&#13;&#10;       MemCantidad.Style := 'Concepto titulo';&#13;&#10;       MemImpTotal.Style := 'Concepto titulo';&#13;&#10;       end;&#13;&#10;  'Concepto': begin&#13;&#10;       MemPrecio.Style := 'Concepto normal';&#13;&#10;       MemCantidad.Style := 'Concepto normal';&#13;&#10;       MemImpTotal.Style := 'Concepto normal';&#13;&#10;       end;&#13;&#10;  'Subtotal': begin&#13;&#10;       MemPrecio.Style := 'Concepto subtotal';&#13;&#10;       MemCantidad.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.HideZeros := False;           &#13;&#10;       end;&#13;&#10;  'Descuento': begin&#13;&#10;       BandaDetalles.Visible := False;&#13;&#10;       RichConcepto.Color := clNone;&#13;&#10;       end;&#13;&#10;  end;&#13;&#10;&#13;&#10;  RichConcepto.Color := MemImpTotal.Color;&#13;&#10;  RichConcepto.Frame := MemImpTotal.Frame;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;//  Engine.CurY := Engine.CurY + Engine.FreeSpace - ReportSummary1.Height - 1;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo15OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Memo15.Lines.Clear;&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;BASE_IMPONIBLE&#34;&#62;) &#60; 0) then&#13;&#10;       Memo15.Lines.Add('REFUND')&#13;&#10;  else&#13;&#10;     Memo15.Lines.Add('INVOICE')&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo20OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;RE&#34;&#62;) = 0) then&#13;&#10;  begin&#13;&#10;       eRE.Lines.Clear;&#13;&#10;       RE.Lines.Clear;&#13;&#10;  end;&#13;&#10;&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;DESCUENTO&#34;&#62;) = 0) then&#13;&#10;  begin&#13;&#10;       eDescuento.Lines.Clear;&#13;&#10;       Descuento.Lines.Clear;&#13;&#10;  end;&#13;&#10;      &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo11OnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  Cadena : String;&#13;&#10;begin&#13;&#10;  if (&#60;frxDBCabecera.&#34;TITULAR&#34;&#62; &#60;&#62; '') then&#13;&#10;  begin&#13;&#10;    Cadena := Memo11.Lines.Text;&#13;&#10;    Memo11.Lines.Clear;&#13;&#10;    Memo11.Lines.Add(&#60;frxDBCabecera.&#34;TITULAR&#34;&#62;);&#13;&#10;    Memo11.Lines.Add(Cadena);&#13;&#10;  end&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band2OnBeforePrint(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;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;ShowLogotipo&#62; then&#13;&#10;  begin&#13;&#10;     Overlay1.Visible := True;                                       &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     Overlay1.Visible := False;   &#13;&#10;  end                                &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band3OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (&#60;pagina&#62; &#60;&#62; &#60;TotalPaginas&#62;) then&#13;&#10;  begin&#13;&#10;    Shape5.Visible := False;&#13;&#10;    eBaseImponible.Visible := False;&#13;&#10;    BaseImponible.Visible := False;&#13;&#10;    eDescuento.Visible := False;&#13;&#10;    Descuento.Visible := False;&#13;&#10;    eIVA.Visible := False;&#13;&#10;    IVA.Visible := False;&#13;&#10;    eRE.Visible := False;&#13;&#10;    RE.Visible := False;&#13;&#10;    eTotalFactura.Visible := False;&#13;&#10;    TotalFactura.Visible := False;&#13;&#10;  end&#13;&#10;  else                                            &#13;&#10;  begin&#13;&#10;    Shape5.Visible := True;                                                                               &#13;&#10;    eBaseImponible.Visible := True;&#13;&#10;    BaseImponible.Visible := True;&#13;&#10;    eDescuento.Visible := True;&#13;&#10;    Descuento.Visible := True;&#13;&#10;    eIVA.Visible := True;&#13;&#10;    IVA.Visible := True;&#13;&#10;    eRE.Visible := True;&#13;&#10;    RE.Visible := True;&#13;&#10;    eTotalFactura.Visible := True;&#13;&#10;    TotalFactura.Visible := True;                                  &#13;&#10;&#13;&#10;//    eVencimientos.top := eVencimientos.top + shape5.height;                                                                 &#13;&#10;//    Subreport1.top := Subreport1.top + shape5.height;&#13;&#10;//    eFormaPago.top := eFormaPago.top + shape5.height;&#13;&#10;//    FormaPago.top := eFormaPago.top + shape5.height;                                                                             &#13;&#10;    &#13;&#10;  end          &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C65732200010C3C00000020446174615365743D22667278444256656E63696D69656E746F732220446174615365744E616D653D22667278444256656E63696D69656E746F73220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C16000000204E616D653D222056697375616C697A6163696F6E2200010C14000000204E616D653D2253686F774C6F676F7469706F220000055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C87000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
+<TfrxReport Version="4.7.71" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="" ReportOptions.LastChange="41915,6647675579" ReportOptions.VersionBuild="1" ReportOptions.VersionMajor="12" ReportOptions.VersionMinor="13" ReportOptions.VersionRelease="1" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ACadena : String;                                        &#13;&#10;begin&#13;&#10;  DatosCliente.Lines.Clear;&#13;&#10;  DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '')&#13;&#10;  or (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; + '  ' + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;);&#13;&#10;&#13;&#10;  ACadena := '';&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;;&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PAIS&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + ' - ' + &#60;frxDBCabecera.&#34;PAIS&#34;&#62;;&#13;&#10;  &#13;&#10;  DatosCliente.Lines.Add(ACadena);                           &#13;&#10;end;&#13;&#10;&#13;&#10;procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  BandaDetalles.StartNewPage := False;&#13;&#10;  BandaDetalles.Visible := True;&#13;&#10;  MemPrecio.Style := 'Concepto normal';&#13;&#10;  MemCantidad.Style := 'Concepto normal';&#13;&#10;  MemImpTotal.Style := 'Concepto normal';&#13;&#10;  RichConcepto.Visible := True;&#13;&#10;  MemImpTotal.HideZeros := True;        &#13;&#10;&#13;&#10;  case &#60;frxDBDetalles.&#34;TIPO_DETALLE&#34;&#62; of&#13;&#10;  'Salto': begin&#13;&#10;        BandaDetalles.StartNewPage := True;&#13;&#10;        RichConcepto.Visible := False;&#13;&#10;       end;&#13;&#10;  'Titulo': begin&#13;&#10;       MemPrecio.Style := 'Concepto titulo';&#13;&#10;       MemCantidad.Style := 'Concepto titulo';&#13;&#10;       MemImpTotal.Style := 'Concepto titulo';&#13;&#10;       end;&#13;&#10;  'Concepto': begin&#13;&#10;       MemPrecio.Style := 'Concepto normal';&#13;&#10;       MemCantidad.Style := 'Concepto normal';&#13;&#10;       MemImpTotal.Style := 'Concepto normal';&#13;&#10;       end;&#13;&#10;  'Subtotal': begin&#13;&#10;       MemPrecio.Style := 'Concepto subtotal';&#13;&#10;       MemCantidad.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.HideZeros := False;           &#13;&#10;       end;&#13;&#10;  'Descuento': begin&#13;&#10;       BandaDetalles.Visible := False;&#13;&#10;       RichConcepto.Color := clNone;&#13;&#10;       end;&#13;&#10;  end;&#13;&#10;&#13;&#10;  RichConcepto.Color := MemImpTotal.Color;&#13;&#10;  RichConcepto.Frame := MemImpTotal.Frame;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;//  Engine.CurY := Engine.CurY + Engine.FreeSpace - ReportSummary1.Height - 1;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo15OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Memo15.Lines.Clear;&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;BASE_IMPONIBLE&#34;&#62;) &#60; 0) then&#13;&#10;       Memo15.Lines.Add('REFUND')&#13;&#10;  else&#13;&#10;     Memo15.Lines.Add('INVOICE')&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo20OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;RE&#34;&#62;) = 0) then&#13;&#10;  begin&#13;&#10;       eRE.Lines.Clear;&#13;&#10;       RE.Lines.Clear;&#13;&#10;  end;&#13;&#10;&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;DESCUENTO&#34;&#62;) = 0) then&#13;&#10;  begin&#13;&#10;       eDescuento.Lines.Clear;&#13;&#10;       Descuento.Lines.Clear;&#13;&#10;  end;&#13;&#10;      &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo11OnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  Cadena : String;&#13;&#10;begin&#13;&#10;  if (&#60;frxDBCabecera.&#34;TITULAR&#34;&#62; &#60;&#62; '') then&#13;&#10;  begin&#13;&#10;    Cadena := Memo11.Lines.Text;&#13;&#10;    Memo11.Lines.Clear;&#13;&#10;    Memo11.Lines.Add(&#60;frxDBCabecera.&#34;TITULAR&#34;&#62;);&#13;&#10;    Memo11.Lines.Add(Cadena);&#13;&#10;  end&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band2OnBeforePrint(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;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;ShowLogotipo&#62; then&#13;&#10;  begin&#13;&#10;     Overlay1.Visible := True;                                       &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     Overlay1.Visible := False;   &#13;&#10;  end                                &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band3OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (&#60;pagina&#62; &#60;&#62; &#60;TotalPaginas&#62;) then&#13;&#10;  begin&#13;&#10;    Shape5.Visible := False;&#13;&#10;    eBaseImponible.Visible := False;&#13;&#10;    BaseImponible.Visible := False;&#13;&#10;    eDescuento.Visible := False;&#13;&#10;    Descuento.Visible := False;&#13;&#10;    eIVA.Visible := False;&#13;&#10;    IVA.Visible := False;&#13;&#10;    eRE.Visible := False;&#13;&#10;    RE.Visible := False;&#13;&#10;    eTotalFactura.Visible := False;&#13;&#10;    TotalFactura.Visible := False;&#13;&#10;  end&#13;&#10;  else                                            &#13;&#10;  begin&#13;&#10;    Shape5.Visible := True;                                                                               &#13;&#10;    eBaseImponible.Visible := True;&#13;&#10;    BaseImponible.Visible := True;&#13;&#10;    eDescuento.Visible := True;&#13;&#10;    Descuento.Visible := True;&#13;&#10;    eIVA.Visible := True;&#13;&#10;    IVA.Visible := True;&#13;&#10;    eRE.Visible := True;&#13;&#10;    RE.Visible := True;&#13;&#10;    eTotalFactura.Visible := True;&#13;&#10;    TotalFactura.Visible := True;                                  &#13;&#10;&#13;&#10;//    eVencimientos.top := eVencimientos.top + shape5.height;                                                                 &#13;&#10;//    Subreport1.top := Subreport1.top + shape5.height;&#13;&#10;//    eFormaPago.top := eFormaPago.top + shape5.height;&#13;&#10;//    FormaPago.top := eFormaPago.top + shape5.height;                                                                             &#13;&#10;    &#13;&#10;  end          &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C65732200010C3C00000020446174615365743D22667278444256656E63696D69656E746F732220446174615365744E616D653D22667278444256656E63696D69656E746F73220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C16000000204E616D653D222056697375616C697A6163696F6E2200010C14000000204E616D653D2253686F774C6F676F7469706F220000055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C87000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" Font.Charset="1" Font.Color="522396771" Font.Height="-13" Font.Name="Arial" Font.Style="1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10,00125" RightMargin="10,00125" TopMargin="10,00125" BottomMargin="10,00125" Columns="1" ColumnWidth="209,999791666667" ColumnPositions.Text="0" LargeDesignHeight="True" HGuides.Text="" VGuides.Text="">
     <TfrxOverlay Name="Overlay1" Height="1122" Left="0" Top="398" Width="718,101251175" OnBeforePrint="Overlay1OnBeforePrint">
@@ -41,21 +41,21 @@
       <TfrxMemoView Name="Memo11" Left="126,50402" Top="66,82684" Width="56,78757" Height="14,48825" Visible="False" OnBeforePrint="Memo11OnBeforePrint" ShowHint="False" StretchMode="smActualHeight" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" ParentFont="False" WordBreak="True" Text="[frxDBCabecera.&#34;ENTIDAD&#34;]"/>
       <TfrxMemoView Name="Memo14" Left="189,70872" Top="66,82684" Width="74,00804" Height="14,48825" Visible="False" OnBeforePrint="Memo11OnBeforePrint" ShowHint="False" StretchMode="smActualHeight" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" ParentFont="False" WordBreak="True" Text="[frxDBCabecera.&#34;SUCURSAL&#34;]"/>
       <TfrxShapeView Name="Shape5" Left="23" Top="2" Width="694" Height="44" ShowHint="False" Color="16777215" Frame.Color="8421504"/>
-      <TfrxMemoView Name="TotalFactura" Left="581" Top="22" Width="132,75603" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_TOTAL&#34;]"/>
+      <TfrxMemoView Name="TotalFactura" Left="581" Top="22" Width="132,75603" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 £" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxMemoView Name="eTotalFactura" Left="581" Top="6" Width="132" Height="16" ShowHint="False" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Invoice total"/>
-      <TfrxMemoView Name="BaseImponible" Left="26,77953" Top="22" Width="116,75603" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HAlign="haCenter" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;BASE_IMPONIBLE&#34;]"/>
+      <TfrxMemoView Name="BaseImponible" Left="26,77953" Top="22" Width="116,75603" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 £" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HAlign="haCenter" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;BASE_IMPONIBLE&#34;]"/>
       <TfrxMemoView Name="eBaseImponible" Left="26,77953" Top="6" Width="116" Height="16" ShowHint="False" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Taxable base"/>
       <TfrxMemoView Name="eDescuento" Left="144,2282" Top="6" Width="247,1812" Height="16" Visible="False" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Discount [frxDBCabecera.&#34;DESCUENTO&#34;] %"/>
       <TfrxMemoView Name="eIVA" Left="392,44867" Top="6" Width="93,32282" Height="16" ShowHint="False" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0 %" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="TAX [frxDBCabecera.&#34;IVA&#34;]"/>
-      <TfrxMemoView Name="IVA" Left="392,44867" Top="22" Width="94,07885" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HAlign="haCenter" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_IVA&#34;]"/>
+      <TfrxMemoView Name="IVA" Left="392,44867" Top="22" Width="94,07885" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 £" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HAlign="haCenter" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_IVA&#34;]"/>
       <TfrxMemoView Name="eRE" Left="485,93723" Top="6" Width="93,32282" Height="16" OnBeforePrint="Memo20OnBeforePrint" ShowHint="False" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 %" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="RE [frxDBCabecera.&#34;RE&#34;]"/>
-      <TfrxMemoView Name="RE" Left="485,93723" Top="22" Width="94,07885" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HAlign="haCenter" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_RE&#34;]"/>
-      <TfrxMemoView Name="Descuento" Left="245,7718" Top="22,22047" Width="94,07885" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_DESCUENTO&#34;]"/>
+      <TfrxMemoView Name="RE" Left="485,93723" Top="22" Width="94,07885" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 £" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HAlign="haCenter" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_RE&#34;]"/>
+      <TfrxMemoView Name="Descuento" Left="245,7718" Top="22,22047" Width="94,07885" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 £" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_DESCUENTO&#34;]"/>
     </TfrxPageFooter>
     <TfrxMasterData Name="BandaDetalles" Height="24" Left="0" Top="354" Width="718,101251175" OnBeforePrint="BandaDetallesOnBeforePrint" AllowSplit="True" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
       <TfrxMemoView Name="Memo38" Left="566,59616667" Top="2" Width="57,82674724" Height="20" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 %" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;DESCUENTO&#34;]"/>
-      <TfrxMemoView Name="MemPrecio" Left="471,96059087" Top="2" Width="91,84251724" Height="20" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 € " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
-      <TfrxMemoView Name="MemImpTotal" Left="628,05511811" Top="2" Width="89,16535189" Height="20" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 € " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
+      <TfrxMemoView Name="MemPrecio" Left="471,96059087" Top="2" Width="91,84251724" Height="20" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 £" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
+      <TfrxMemoView Name="MemImpTotal" Left="628,05511811" Top="2" Width="89,16535189" Height="20" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 £" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxRichView Name="RichConcepto" ShiftMode="smWhenOverlapped" Left="30,33859" Top="2" Width="371,85065" Height="20" Visible="False" ShowHint="False" StretchMode="smMaxHeight" DataField="CONCEPTO" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" GapX="3" GapY="3" Wysiwyg="False" PropData="0852696368456469740A6C0000007B5C727466315C616E73695C616E7369637067313235325C64656666305C6465666C616E67333038327B5C666F6E7474626C7B5C66305C666E696C205461686F6D613B7D7D0D0A5C766965776B696E64345C7563315C706172645C66305C667331365C7061720D0A7D0D0A00"/>
       <TfrxMemoView Name="MemCantidad" Left="408,81098457" Top="2" Width="59,37007874" Height="20" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%g" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;CANTIDAD&#34;]"/>
       <TfrxMemoView Name="Memo2" Left="227" Top="3" Width="161,48825" Height="15,11812" Visible="False" ShowHint="False" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" Font.Charset="1" Font.Color="522396771" Font.Height="-13" Font.Name="Arial" Font.Style="1" ParentFont="False" Text="[frxDBDetalles.&#34;TIPO_DETALLE&#34;]"/>
diff --git a/Source/Informes/6/en/InfFacturaProforma.fr3 b/Source/Informes/6/en/InfFacturaProforma.fr3
index bd0e87f..88d2863 100644
--- a/Source/Informes/6/en/InfFacturaProforma.fr3
+++ b/Source/Informes/6/en/InfFacturaProforma.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.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="" ReportOptions.LastChange="41807,7607515278" ReportOptions.VersionBuild="1" ReportOptions.VersionMajor="12" ReportOptions.VersionMinor="13" ReportOptions.VersionRelease="1" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ACadena : String;                                             &#13;&#10;begin&#13;&#10;  DatosCliente.Lines.Clear;&#13;&#10;  DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '')&#13;&#10;  or (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; + '  ' + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;);&#13;&#10;&#13;&#10;  ACadena := '';&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;;&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PAIS&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + ' - ' + &#60;frxDBCabecera.&#34;PAIS&#34;&#62;;&#13;&#10;  &#13;&#10;  DatosCliente.Lines.Add(ACadena);                           &#13;&#10;end;&#13;&#10;&#13;&#10;procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  BandaDetalles.StartNewPage := False;&#13;&#10;  BandaDetalles.Visible := True;&#13;&#10;  MemPrecio.Style := 'Concepto normal';&#13;&#10;  MemCantidad.Style := 'Concepto normal';&#13;&#10;  MemImpTotal.Style := 'Concepto normal';&#13;&#10;  RichConcepto.Visible := True;&#13;&#10;  MemImpTotal.HideZeros := True;        &#13;&#10;&#13;&#10;  case &#60;frxDBDetalles.&#34;TIPO_DETALLE&#34;&#62; of&#13;&#10;  'Salto': begin&#13;&#10;        BandaDetalles.StartNewPage := True;&#13;&#10;        RichConcepto.Visible := False;&#13;&#10;       end;&#13;&#10;  'Titulo': begin&#13;&#10;       MemPrecio.Style := 'Concepto titulo';&#13;&#10;       MemCantidad.Style := 'Concepto titulo';&#13;&#10;       MemImpTotal.Style := 'Concepto titulo';&#13;&#10;       end;&#13;&#10;  'Concepto': begin&#13;&#10;       MemPrecio.Style := 'Concepto normal';&#13;&#10;       MemCantidad.Style := 'Concepto normal';&#13;&#10;       MemImpTotal.Style := 'Concepto normal';&#13;&#10;       end;&#13;&#10;  'Subtotal': begin&#13;&#10;       MemPrecio.Style := 'Concepto subtotal';&#13;&#10;       MemCantidad.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.HideZeros := False;           &#13;&#10;       end;&#13;&#10;  'Descuento': begin&#13;&#10;       BandaDetalles.Visible := False;&#13;&#10;       RichConcepto.Color := clNone;&#13;&#10;       end;&#13;&#10;  end;&#13;&#10;&#13;&#10;  RichConcepto.Color := MemImpTotal.Color;&#13;&#10;  RichConcepto.Frame := MemImpTotal.Frame;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Engine.CurY := Engine.CurY + Engine.FreeSpace - ReportSummary1.Height - 1;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo20OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;RE&#34;&#62;) = 0) then&#13;&#10;  begin&#13;&#10;       Memo21.Lines.Clear;&#13;&#10;       Memo29.Lines.Clear;&#13;&#10;  end;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band2OnBeforePrint(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;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;ShowLogotipo&#62; then&#13;&#10;  begin&#13;&#10;     Overlay1.Visible := True;                                       &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     Overlay1.Visible := False;   &#13;&#10;  end  &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C16000000204E616D653D222056697375616C697A6163696F6E2200010C14000000204E616D653D2253686F774C6F676F7469706F220000055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C87000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
+<TfrxReport Version="4.7.71" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="" ReportOptions.LastChange="41915,6683871528" ReportOptions.VersionBuild="1" ReportOptions.VersionMajor="12" ReportOptions.VersionMinor="13" ReportOptions.VersionRelease="1" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  ACadena : String;                                             &#13;&#10;begin&#13;&#10;  DatosCliente.Lines.Clear;&#13;&#10;  DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CALLE&#34;&#62;);&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; &#60;&#62; '')&#13;&#10;  or (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CODIGO_POSTAL&#34;&#62; + '  ' + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;);&#13;&#10;&#13;&#10;  ACadena := '';&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := &#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;;&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PAIS&#34;&#62; &#60;&#62; '') then&#13;&#10;     ACadena := ACadena + ' - ' + &#60;frxDBCabecera.&#34;PAIS&#34;&#62;;&#13;&#10;  &#13;&#10;  DatosCliente.Lines.Add(ACadena);                           &#13;&#10;end;&#13;&#10;&#13;&#10;procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  BandaDetalles.StartNewPage := False;&#13;&#10;  BandaDetalles.Visible := True;&#13;&#10;  MemPrecio.Style := 'Concepto normal';&#13;&#10;  MemCantidad.Style := 'Concepto normal';&#13;&#10;  MemImpTotal.Style := 'Concepto normal';&#13;&#10;  RichConcepto.Visible := True;&#13;&#10;  MemImpTotal.HideZeros := True;        &#13;&#10;&#13;&#10;  case &#60;frxDBDetalles.&#34;TIPO_DETALLE&#34;&#62; of&#13;&#10;  'Salto': begin&#13;&#10;        BandaDetalles.StartNewPage := True;&#13;&#10;        RichConcepto.Visible := False;&#13;&#10;       end;&#13;&#10;  'Titulo': begin&#13;&#10;       MemPrecio.Style := 'Concepto titulo';&#13;&#10;       MemCantidad.Style := 'Concepto titulo';&#13;&#10;       MemImpTotal.Style := 'Concepto titulo';&#13;&#10;       end;&#13;&#10;  'Concepto': begin&#13;&#10;       MemPrecio.Style := 'Concepto normal';&#13;&#10;       MemCantidad.Style := 'Concepto normal';&#13;&#10;       MemImpTotal.Style := 'Concepto normal';&#13;&#10;       end;&#13;&#10;  'Subtotal': begin&#13;&#10;       MemPrecio.Style := 'Concepto subtotal';&#13;&#10;       MemCantidad.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.Style := 'Concepto subtotal';&#13;&#10;       MemImpTotal.HideZeros := False;           &#13;&#10;       end;&#13;&#10;  'Descuento': begin&#13;&#10;       BandaDetalles.Visible := False;&#13;&#10;       RichConcepto.Color := clNone;&#13;&#10;       end;&#13;&#10;  end;&#13;&#10;&#13;&#10;  RichConcepto.Color := MemImpTotal.Color;&#13;&#10;  RichConcepto.Frame := MemImpTotal.Frame;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure ReportSummary1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Engine.CurY := Engine.CurY + Engine.FreeSpace - ReportSummary1.Height - 1;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Memo20OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if (StrToFloat(&#60;frxDBCabecera.&#34;RE&#34;&#62;) = 0) then&#13;&#10;  begin&#13;&#10;       Memo21.Lines.Clear;&#13;&#10;       Memo29.Lines.Clear;&#13;&#10;  end;&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Band2OnBeforePrint(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;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;ShowLogotipo&#62; then&#13;&#10;  begin&#13;&#10;     Overlay1.Visible := True;                                       &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     Overlay1.Visible := False;   &#13;&#10;  end  &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C16000000204E616D653D222056697375616C697A6163696F6E2200010C14000000204E616D653D2253686F774C6F676F7469706F220000055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C87000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" Font.Charset="1" Font.Color="522396771" Font.Height="-13" Font.Name="Arial" Font.Style="1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10,00125" RightMargin="10,00125" TopMargin="10,00125" BottomMargin="10,00125" Columns="1" ColumnWidth="209,999791666667" ColumnPositions.Text="0" LargeDesignHeight="True" PrintOnPreviousPage="True" HGuides.Text="" VGuides.Text="">
     <TfrxOverlay Name="Overlay1" Height="1122" Left="0" Top="394" Width="718,101251175" OnBeforePrint="Overlay1OnBeforePrint">
@@ -42,25 +42,25 @@
     </TfrxPageFooter>
     <TfrxMasterData Name="BandaDetalles" Height="20" Left="0" Top="354" Width="718,101251175" OnBeforePrint="BandaDetallesOnBeforePrint" AllowSplit="True" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
       <TfrxMemoView Name="Memo38" Left="566,59616667" Top="0" Width="57,82674724" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 %" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;DESCUENTO&#34;]"/>
-      <TfrxMemoView Name="MemPrecio" Left="471,96059087" Top="0" Width="91,84251724" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 € " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
-      <TfrxMemoView Name="MemImpTotal" Left="628,05511811" Top="0" Width="89,16535189" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 € " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
+      <TfrxMemoView Name="MemPrecio" Left="471,96059087" Top="0" Width="91,84251724" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 £" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
+      <TfrxMemoView Name="MemImpTotal" Left="628,05511811" Top="0" Width="89,16535189" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 £" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxRichView Name="RichConcepto" ShiftMode="smWhenOverlapped" Left="30,33859" Top="1" Width="371,85065" Height="18" ShowHint="False" StretchMode="smActualHeight" DataField="CONCEPTO" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" GapX="3" GapY="3" Wysiwyg="False" PropData="0852696368456469740A6C0000007B5C727466315C616E73695C616E7369637067313235325C64656666305C6465666C616E67333038327B5C666F6E7474626C7B5C66305C666E696C205461686F6D613B7D7D0D0A5C766965776B696E64345C7563315C706172645C66305C667331365C7061720D0A7D0D0A00"/>
       <TfrxMemoView Name="MemCantidad" Left="408,81098457" Top="0" Width="59,37007874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%g" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapX="3" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;CANTIDAD&#34;]"/>
       <TfrxMemoView Name="Memo2" Left="227" Top="1" Width="161,48825" Height="15,11812" Visible="False" ShowHint="False" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" Font.Charset="1" Font.Color="522396771" Font.Height="-13" Font.Name="Arial" Font.Style="1" ParentFont="False" Text="[frxDBDetalles.&#34;TIPO_DETALLE&#34;]"/>
     </TfrxMasterData>
     <TfrxReportSummary Name="ReportSummary1" Height="57,7953" Left="0" Top="1576" Width="718,101251175" OnBeforePrint="ReportSummary1OnBeforePrint" Stretched="True">
       <TfrxShapeView Name="Shape5" Left="23" Top="13,7953" Width="694" Height="44" ShowHint="False" Color="16777215" Frame.Color="8421504"/>
-      <TfrxMemoView Name="Memo9" Left="581" Top="33,7953" Width="132,75603" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_TOTAL&#34;]"/>
+      <TfrxMemoView Name="Memo9" Left="581" Top="33,7953" Width="132,75603" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 £" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxMemoView Name="Memo10" Left="581" Top="17,7953" Width="132" Height="16" ShowHint="False" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Invoice total"/>
-      <TfrxMemoView Name="Memo8" Left="26,77953" Top="33,7953" Width="116,75603" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HAlign="haCenter" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;BASE_IMPONIBLE&#34;]"/>
+      <TfrxMemoView Name="Memo8" Left="26,77953" Top="33,7953" Width="116,75603" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 £" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HAlign="haCenter" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;BASE_IMPONIBLE&#34;]"/>
       <TfrxMemoView Name="Memo13" Left="26,77953" Top="17,7953" Width="116" Height="16" ShowHint="False" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Taxable base"/>
       <TfrxMemoView Name="Memo22" Left="144,2282" Top="17,7953" Width="247,1812" Height="16" Visible="False" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Discount [frxDBCabecera.&#34;DESCUENTO&#34;] %"/>
       <TfrxMemoView Name="Memo25" Left="392,44867" Top="17,7953" Width="93,32282" Height="16" ShowHint="False" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0 %" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="TAX [frxDBCabecera.&#34;IVA&#34;]"/>
       <TfrxMemoView Name="Memo32" Left="193,46444" Top="33,7953" Width="48,72449" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0 %" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;DESCUENTO&#34;]"/>
-      <TfrxMemoView Name="Memo33" Left="392,44867" Top="33,7953" Width="94,07885" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HAlign="haCenter" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_IVA&#34;]"/>
+      <TfrxMemoView Name="Memo33" Left="392,44867" Top="33,7953" Width="94,07885" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 £" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HAlign="haCenter" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_IVA&#34;]"/>
       <TfrxMemoView Name="Memo21" Left="485,93723" Top="17,7953" Width="93,32282" Height="16" OnBeforePrint="Memo20OnBeforePrint" ShowHint="False" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 %" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="RE [frxDBCabecera.&#34;RE&#34;]"/>
-      <TfrxMemoView Name="Memo29" Left="485,93723" Top="33,7953" Width="94,07885" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HAlign="haCenter" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_RE&#34;]"/>
-      <TfrxMemoView Name="Memo20" Left="245,7718" Top="34,01577" Width="94,07885" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_DESCUENTO&#34;]"/>
+      <TfrxMemoView Name="Memo29" Left="485,93723" Top="33,7953" Width="94,07885" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 £" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HAlign="haCenter" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_RE&#34;]"/>
+      <TfrxMemoView Name="Memo20" Left="245,7718" Top="34,01577" Width="94,07885" Height="22,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 £" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;IMPORTE_DESCUENTO&#34;]"/>
     </TfrxReportSummary>
   </TfrxReportPage>
 </TfrxReport>
diff --git a/Source/Informes/6/en/InfPedidoCliente.fr3 b/Source/Informes/6/en/InfPedidoCliente.fr3
index 34d163f..c2a70ad 100644
--- a/Source/Informes/6/en/InfPedidoCliente.fr3
+++ b/Source/Informes/6/en/InfPedidoCliente.fr3
@@ -1,17 +1,17 @@
 <?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="41807,7233673148" ScriptLanguage="PascalScript" ScriptText.Text="&#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;POBLACION&#34;&#62;;&#13;&#10;&#13;&#10;  if (ACadena &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(ACadena);&#13;&#10;         &#13;&#10;  ACadena := '';                  &#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;       ACadena := &#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;;&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PAIS&#34;&#62; &#60;&#62; '') then&#13;&#10;       ACadena := Acadena + ' - ' + &#60;frxDBCabecera.&#34;PAIS&#34;&#62;;&#13;&#10;&#13;&#10;  DireccionEnvio.Lines.Add(ACadena);                 &#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;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;end;&#13;&#10;&#13;&#10;procedure eImporteUnidadOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;ImprimirPrecio&#62; then&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := True;  &#13;&#10;     lImporteUnidad.Visible := True;  &#13;&#10;     eImporteTotal.Visible := True;  &#13;&#10;     lImporteTotal.Visible := True;  &#13;&#10;     ImporteUnidad.Visible := True;  &#13;&#10;     ImporteTotal.Visible := True;           &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := False;  &#13;&#10;     lImporteUnidad.Visible := False;  &#13;&#10;     eImporteTotal.Visible := False;  &#13;&#10;     lImporteTotal.Visible := False;  &#13;&#10;     ImporteUnidad.Visible := False;  &#13;&#10;     ImporteTotal.Visible := False;&#13;&#10;     eConcepto.Width := eConcepto.Width + ImporteTotal.Width + ImporteUnidad.Width;&#13;&#10;     Concepto.Width :=eConcepto.Width - 10;         &#13;&#10;  end&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;ShowLogotipo&#62; then&#13;&#10;  begin&#13;&#10;     Overlay1.Visible := True;                                       &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     Overlay1.Visible := False;   &#13;&#10;  end  &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403890003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C10000000204E616D653D2220496E666F726D652200010C16000000204E616D653D22496D7072696D697250726563696F2200010C1C000000204E616D653D22496D7072696D697252656650726F766565646F722200010C14000000204E616D653D2253686F774C6F676F7469706F220000055374796C650100">
+<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="41915,6652408102" ScriptLanguage="PascalScript" ScriptText.Text="&#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;POBLACION&#34;&#62;;&#13;&#10;&#13;&#10;  if (ACadena &#60;&#62; '') then&#13;&#10;       DireccionEnvio.Lines.Add(ACadena);&#13;&#10;         &#13;&#10;  ACadena := '';                  &#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62; &#60;&#62; '') then&#13;&#10;       ACadena := &#60;frxDBCabecera.&#34;PROVINCIA&#34;&#62;;&#13;&#10;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PAIS&#34;&#62; &#60;&#62; '') then&#13;&#10;       ACadena := Acadena + ' - ' + &#60;frxDBCabecera.&#34;PAIS&#34;&#62;;&#13;&#10;&#13;&#10;  DireccionEnvio.Lines.Add(ACadena);                 &#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;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;end;&#13;&#10;&#13;&#10;procedure eImporteUnidadOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;ImprimirPrecio&#62; then&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := True;  &#13;&#10;     lImporteUnidad.Visible := True;  &#13;&#10;     eImporteTotal.Visible := True;  &#13;&#10;     lImporteTotal.Visible := True;  &#13;&#10;     ImporteUnidad.Visible := True;  &#13;&#10;     ImporteTotal.Visible := True;           &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := False;  &#13;&#10;     lImporteUnidad.Visible := False;  &#13;&#10;     eImporteTotal.Visible := False;  &#13;&#10;     lImporteTotal.Visible := False;  &#13;&#10;     ImporteUnidad.Visible := False;  &#13;&#10;     ImporteTotal.Visible := False;&#13;&#10;     eConcepto.Width := eConcepto.Width + ImporteTotal.Width + ImporteUnidad.Width;&#13;&#10;     Concepto.Width :=eConcepto.Width - 10;         &#13;&#10;  end&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if &#60;ShowLogotipo&#62; then&#13;&#10;  begin&#13;&#10;     Overlay1.Visible := True;                                       &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     Overlay1.Visible := False;   &#13;&#10;  end  &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C10000000204E616D653D2220496E666F726D652200010C16000000204E616D653D22496D7072696D697250726563696F2200010C1C000000204E616D653D22496D7072696D697252656650726F766565646F722200010C14000000204E616D653D2253686F774C6F676F7469706F220000055374796C650100">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" PaperWidth="215,00041667" PaperHeight="297,00008333" PaperSize="256" LeftMargin="10,00125" RightMargin="10,00125" TopMargin="10,00125" BottomMargin="10,00125" ColumnWidth="0" ColumnPositions.Text="" LargeDesignHeight="True" HGuides.Text="" VGuides.Text="">
     <TfrxMasterData Name="MasterData1" Height="21" Left="0" Top="326" Width="737,000475991765" ColumnWidth="0" ColumnGap="0" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
       <TfrxMemoView Name="Memo14" Left="19" Top="1,5" Width="117" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#0 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;REFERENCIA&#34;] "/>
       <TfrxMemoView Name="MemoCampo2" Left="139" Top="1,5" Width="56,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%g" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;CANTIDAD&#34;]"/>
-      <TfrxMemoView Name="ImporteUnidad" Left="534" Top="1,5" Width="97,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
-      <TfrxMemoView Name="ImporteTotal" Left="634" Top="1,5" Width="97,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
+      <TfrxMemoView Name="ImporteUnidad" Left="534" Top="1,5" Width="97,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2n £" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
+      <TfrxMemoView Name="ImporteTotal" Left="634" Top="1,5" Width="97,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2n £" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxMemoView Name="Concepto" Left="198" Top="1,5" Width="334" Height="18" ShowHint="False" StretchMode="smMaxHeight" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="tahoma" Font.Style="0" ParentFont="False" Text="[frxDBDetalles.&#34;CONCEPTO&#34;]"/>
     </TfrxMasterData>
     <TfrxPageFooter Name="PageFooter1" Font.Charset="1" Font.Color="0" Font.Height="-7" Font.Name="Arial" Font.Style="0" Height="88" Left="0" ParentFont="False" Top="1549" Width="737,000475991765">
       <TfrxLineView Name="Line4" Align="baRight" Left="17,0004759917651" Top="0" Width="720" Height="0" ShowHint="False" Frame.Typ="4"/>
-      <TfrxMemoView Name="Memo9" Left="638" Top="1" Width="97,03148874" Height="27" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBCabecera.&#34;BASE_IMPONIBLE&#34;]"/>
+      <TfrxMemoView Name="Memo9" Left="638" Top="1" Width="97,03148874" Height="27" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2n £" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Style="Concepto normal" Text="[frxDBCabecera.&#34;BASE_IMPONIBLE&#34;]"/>
       <TfrxMemoView Name="Memo15" Left="539" Top="1" Width="95" Height="35,45669291" ShowHint="False" Color="16777215" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" HAlign="haCenter" ParentFont="False" Text="Taxable base:"/>
       <TfrxMemoView Name="Memo24" Left="237" Top="31" Width="497" Height="16" ShowHint="False" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Net prices, prices without tax"/>
     </TfrxPageFooter>
diff --git a/Source/Informes/6/en/InfPresupuestoCliente.fr3 b/Source/Informes/6/en/InfPresupuestoCliente.fr3
index 23de16e..cefe385 100644
--- a/Source/Informes/6/en/InfPresupuestoCliente.fr3
+++ b/Source/Informes/6/en/InfPresupuestoCliente.fr3
@@ -1,20 +1,20 @@
 <?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="41807,4841593981" ScriptLanguage="PascalScript" ScriptText.Text="&#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;POBLACION&#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;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;end;&#13;&#10;&#13;&#10;procedure eImporteUnidadOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;{    &#13;&#10;  if &#60;ImprimirPrecio&#62; then&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := True;  &#13;&#10;     lImporteUnidad.Visible := True;  &#13;&#10;     eImporteTotal.Visible := True;  &#13;&#10;     lImporteTotal.Visible := True;  &#13;&#10;     ImporteUnidad.Visible := True;  &#13;&#10;     ImporteTotal.Visible := True;           &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := False;  &#13;&#10;     lImporteUnidad.Visible := False;  &#13;&#10;     eImporteTotal.Visible := False;  &#13;&#10;     lImporteTotal.Visible := False;  &#13;&#10;     ImporteUnidad.Visible := False;  &#13;&#10;     ImporteTotal.Visible := False;&#13;&#10;     eConcepto.Width := eConcepto.Width + ImporteTotal.Width + ImporteUnidad.Width;&#13;&#10;     Concepto.Width :=eConcepto.Width - 10;         &#13;&#10;  end&#13;&#10;}      &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;{  &#13;&#10;  if &#60;ShowLogotipo&#62; then&#13;&#10;  begin&#13;&#10;     Overlay1.Visible := True;                                       &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     Overlay1.Visible := False;   &#13;&#10;  end&#13;&#10;  }      &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C10000000204E616D653D2220496E666F726D652200010C16000000204E616D653D22496D7072696D697250726563696F2200010C1C000000204E616D653D22496D7072696D697252656650726F766565646F722200010C14000000204E616D653D2253686F774C6F676F7469706F220000055374796C650100">
+<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="41915,6662979861" ScriptLanguage="PascalScript" ScriptText.Text="&#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;POBLACION&#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;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;end;&#13;&#10;&#13;&#10;procedure eImporteUnidadOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;{    &#13;&#10;  if &#60;ImprimirPrecio&#62; then&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := True;  &#13;&#10;     lImporteUnidad.Visible := True;  &#13;&#10;     eImporteTotal.Visible := True;  &#13;&#10;     lImporteTotal.Visible := True;  &#13;&#10;     ImporteUnidad.Visible := True;  &#13;&#10;     ImporteTotal.Visible := True;           &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     eImporteUnidad.Visible := False;  &#13;&#10;     lImporteUnidad.Visible := False;  &#13;&#10;     eImporteTotal.Visible := False;  &#13;&#10;     lImporteTotal.Visible := False;  &#13;&#10;     ImporteUnidad.Visible := False;  &#13;&#10;     ImporteTotal.Visible := False;&#13;&#10;     eConcepto.Width := eConcepto.Width + ImporteTotal.Width + ImporteUnidad.Width;&#13;&#10;     Concepto.Width :=eConcepto.Width - 10;         &#13;&#10;  end&#13;&#10;}      &#13;&#10;end;&#13;&#10;&#13;&#10;procedure Overlay1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;{  &#13;&#10;  if &#60;ShowLogotipo&#62; then&#13;&#10;  begin&#13;&#10;     Overlay1.Visible := True;                                       &#13;&#10;  end&#13;&#10;  else&#13;&#10;  begin              &#13;&#10;     Overlay1.Visible := False;   &#13;&#10;  end&#13;&#10;  }      &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403910003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E61732200010C10000000204E616D653D2220496E666F726D652200010C16000000204E616D653D22496D7072696D697250726563696F2200010C1C000000204E616D653D22496D7072696D697252656650726F766565646F722200010C14000000204E616D653D2253686F774C6F676F7469706F220000055374796C650100">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" PaperWidth="215,00041667" PaperHeight="297,00008333" PaperSize="256" LeftMargin="10,00125" RightMargin="10,00125" TopMargin="10,00125" BottomMargin="10,00125" ColumnWidth="0" ColumnPositions.Text="" LargeDesignHeight="True" HGuides.Text="" VGuides.Text="">
     <TfrxMasterData Name="MasterData1" Height="21" Left="0" Top="376" Width="737,000475991765" ColumnWidth="0" ColumnGap="0" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
       <TfrxMemoView Name="Memo14" Left="19" Top="1,5" Width="86" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#0 " DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" GapY="3" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;REFERENCIA&#34;] "/>
       <TfrxMemoView Name="MemoCampo2" Left="390" Top="1,5" Width="54,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%g" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;CANTIDAD&#34;]"/>
-      <TfrxMemoView Name="ImporteUnidad" Left="579" Top="1,5" Width="67,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_NETO&#34;]"/>
-      <TfrxMemoView Name="ImporteTotal" Left="651" Top="1,5" Width="83,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
+      <TfrxMemoView Name="ImporteUnidad" Left="579" Top="1,5" Width="67,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2n £" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_NETO&#34;]"/>
+      <TfrxMemoView Name="ImporteTotal" Left="651" Top="1,5" Width="83,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2n £" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_TOTAL&#34;]"/>
       <TfrxMemoView Name="Concepto" Left="110" Top="1,5" Width="275" Height="18" ShowHint="False" StretchMode="smMaxHeight" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="[frxDBDetalles.&#34;CONCEPTO&#34;]"/>
-      <TfrxMemoView Name="Memo6" Left="449" Top="1" Width="67,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
+      <TfrxMemoView Name="Memo6" Left="449" Top="1" Width="67,03148874" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2n £" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;IMPORTE_UNIDAD&#34;]"/>
       <TfrxMemoView Name="Memo17" Left="524" Top="1" Width="44" Height="18" ShowHint="False" StretchMode="smMaxHeight" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 %" DisplayFormat.Kind="fkNumeric" Font.Charset="0" Font.Color="-16777208" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" GapY="3" HAlign="haRight" HideZeros="True" LineSpacing="4" ParentFont="False" Text="[frxDBDetalles.&#34;DESCUENTO&#34;]"/>
     </TfrxMasterData>
     <TfrxPageFooter Name="PageFooter1" Font.Charset="1" Font.Color="0" Font.Height="-7" Font.Name="Arial" Font.Style="0" Height="140" Left="0" ParentFont="False" Top="1599" Width="737,000475991765">
       <TfrxMemoView Name="Memo24" Left="239" Top="24" Width="497" Height="16" ShowHint="False" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Prices without tax"/>
       <TfrxLineView Name="Line4" Align="baRight" Left="17,0004759917651" Top="0" Width="720" Height="0" ShowHint="False" Frame.Typ="4"/>
-      <TfrxMemoView Name="Memo18" Left="646" Top="4" Width="90,75603" Height="15,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;BASE_IMPONIBLE&#34;]"/>
+      <TfrxMemoView Name="Memo18" Left="646" Top="4" Width="90,75603" Height="15,89765" ShowHint="False" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 £" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" HideZeros="True" ParentFont="False" VAlign="vaCenter" Text="[frxDBCabecera.&#34;BASE_IMPONIBLE&#34;]"/>
       <TfrxMemoView Name="Memo19" Left="519" Top="4" Width="126" Height="16" ShowHint="False" Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Net prices:"/>
     </TfrxPageFooter>
     <TfrxPageHeader Name="PageHeader1" Height="300" Left="0" Top="16" Width="737,000475991765" OnBeforePrint="PageHeader1OnBeforePrint">
diff --git a/Source/Modulos/Articulos/Views/Articulos_view.res b/Source/Modulos/Articulos/Views/Articulos_view.res
index 1641339..8b251f3 100644
Binary files a/Source/Modulos/Articulos/Views/Articulos_view.res and b/Source/Modulos/Articulos/Views/Articulos_view.res differ
diff --git a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm
index c501fc3..4b80054 100644
--- a/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm	
+++ b/Source/Modulos/Presupuestos de cliente/Views/uViewPresupuestosCliente.dfm	
@@ -273,11 +273,11 @@ inherited frViewPresupuestosCliente: TfrViewPresupuestosCliente
     Top = 160
     object cxStylePENDIENTES: TcxStyle
       AssignedValues = [svTextColor]
-      TextColor = clWindowText
+      TextColor = clGreen
     end
     object cxStyleACEPTADO: TcxStyle
       AssignedValues = [svTextColor]
-      TextColor = clGreen
+      TextColor = clWindowText
     end
     object cxStyleRECHAZADO: TcxStyle
       AssignedValues = [svTextColor]
diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES
index b5f1e13..ce9526b 100644
Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ
diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj
index e78fd14..7f23695 100644
--- a/Source/Servidor/FactuGES_Server.dproj
+++ b/Source/Servidor/FactuGES_Server.dproj
@@ -35,7 +35,7 @@
 		<Borland.Personality>Delphi.Personality</Borland.Personality>
 		<Borland.ProjectType/>
 		<BorlandProject>
-			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">4</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">4.4.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">4.4.0.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">jueves, 12 de junio de 2014 17:42</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">4</VersionInfo><VersionInfo Name="MinorVer">4</VersionInfo><VersionInfo Name="Release">1</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">4.4.1.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">4.4.1.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">martes, 17 de junio de 2014 19:48</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
 						<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
 					</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
 	</ProjectExtensions>
diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc
index 5ef7332..2cf8d1c 100644
--- a/Source/Servidor/FactuGES_Server.rc
+++ b/Source/Servidor/FactuGES_Server.rc
@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 4,4,0,0
-PRODUCTVERSION 4,4,0,0
+FILEVERSION 4,4,1,0
+PRODUCTVERSION 4,4,1,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -12,9 +12,9 @@ BEGIN
     BEGIN
          BLOCK "0C0A04E4"
          BEGIN
-              VALUE "FileVersion", "4.4.0.0\0"
-              VALUE "ProductVersion", "4.4.0.0\0"
-              VALUE "CompileDate", "viernes, 08 de agosto de 2014 17:54\0"
+              VALUE "FileVersion", "4.4.1.0\0"
+              VALUE "ProductVersion", "4.4.1.0\0"
+              VALUE "CompileDate", "viernes, 03 de octubre de 2014 16:38\0"
          END
     END
     BLOCK "VarFileInfo"