diff --git a/Output/Debug/Servidor/FactuGES_Server.exe b/Output/Debug/Servidor/FactuGES_Server.exe
index fdc5af92..4f366dbd 100644
Binary files a/Output/Debug/Servidor/FactuGES_Server.exe and b/Output/Debug/Servidor/FactuGES_Server.exe differ
diff --git a/Output/Debug/Servidor/Informes/InfFacturaCliente.fr3 b/Output/Debug/Servidor/Informes/InfFacturaCliente.fr3
index d0dfa2ff..49dd0a20 100644
--- a/Output/Debug/Servidor/Informes/InfFacturaCliente.fr3
+++ b/Output/Debug/Servidor/Informes/InfFacturaCliente.fr3
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="3.23.7" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="" ReportOptions.LastChange="39248,4758345949" ReportOptions.VersionBuild="1" ReportOptions.VersionMajor="12" ReportOptions.VersionMinor="13" ReportOptions.VersionRelease="1" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);&#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;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;&#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;       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 DatosEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  Cadena: String;&#13;&#10;begin&#13;&#10;  DatosEmpresa.Lines.Clear;&#13;&#10;  DatosEmpresa.Lines.Add(&#60;frxDBCabecera.&#34;RAZON_SOCIAL&#34;&#62;);&#13;&#10;  DatosEmpresa.Lines.Add(&#60;frxDBCabecera.&#34;CALLE_EMPRESA&#34;&#62;);&#13;&#10;&#13;&#10;  Cadena := '';&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO_1&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := 'TLF: ' + &#60;frxDBCabecera.&#34;TELEFONO_1&#34;&#62;;&#13;&#10;  if (&#60;frxDBCabecera.&#34;FAX&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := Cadena + ' FAX: ' + &#60;frxDBCabecera.&#34;FAX&#34;&#62;;&#13;&#10;  DatosEmpresa.Lines.Add(Cadena);&#13;&#10;&#13;&#10;  Cadena := '';&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := &#60;frxDBCabecera.&#34;CODIGO_POSTAL_EMPRESA&#34;&#62;;&#13;&#10;  if (&#60;frxDBCabecera.&#34;POBLACION_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := Cadena + ' ' + &#60;frxDBCabecera.&#34;POBLACION_EMPRESA&#34;&#62;;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := Cadena + ' - ' + &#60;frxDBCabecera.&#34;PROVINCIA_EMPRESA&#34;&#62;;&#13;&#10;  DatosEmpresa.Lines.Add(Cadena);&#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('ABONO')&#13;&#10;  else&#13;&#10;     Memo15.Lines.Add('FACTURA')&#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;       Memo20.Lines.Clear;&#13;&#10;       Memo28.Lines.Clear;&#13;&#10;       Memo21.Lines.Clear;&#13;&#10;       Memo29.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;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C65730100055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C87000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
+<TfrxReport Version="3.23.7" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="" ReportOptions.LastChange="39248,5067467708" ReportOptions.VersionBuild="1" ReportOptions.VersionMajor="12" ReportOptions.VersionMinor="13" ReportOptions.VersionRelease="1" ScriptLanguage="PascalScript" ScriptText.Text="procedure DatosClienteOnBeforePrint(Sender: TfrxComponent);&#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;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;&#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;       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 DatosEmpresaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;var&#13;&#10;  Cadena: String;&#13;&#10;begin&#13;&#10;  DatosEmpresa.Lines.Clear;&#13;&#10;  DatosEmpresa.Lines.Add(&#60;frxDBCabecera.&#34;RAZON_SOCIAL&#34;&#62;);&#13;&#10;  DatosEmpresa.Lines.Add(&#60;frxDBCabecera.&#34;CALLE_EMPRESA&#34;&#62;);&#13;&#10;&#13;&#10;  Cadena := '';&#13;&#10;  if (&#60;frxDBCabecera.&#34;TELEFONO_1&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := 'TLF: ' + &#60;frxDBCabecera.&#34;TELEFONO_1&#34;&#62;;&#13;&#10;  if (&#60;frxDBCabecera.&#34;FAX&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := Cadena + ' FAX: ' + &#60;frxDBCabecera.&#34;FAX&#34;&#62;;&#13;&#10;  DatosEmpresa.Lines.Add(Cadena);&#13;&#10;&#13;&#10;  Cadena := '';&#13;&#10;  if (&#60;frxDBCabecera.&#34;CODIGO_POSTAL_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := &#60;frxDBCabecera.&#34;CODIGO_POSTAL_EMPRESA&#34;&#62;;&#13;&#10;  if (&#60;frxDBCabecera.&#34;POBLACION_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := Cadena + ' ' + &#60;frxDBCabecera.&#34;POBLACION_EMPRESA&#34;&#62;;&#13;&#10;  if (&#60;frxDBCabecera.&#34;PROVINCIA_EMPRESA&#34;&#62; &#60;&#62; '') then&#13;&#10;       Cadena := Cadena + ' - ' + &#60;frxDBCabecera.&#34;PROVINCIA_EMPRESA&#34;&#62;;&#13;&#10;  DatosEmpresa.Lines.Add(Cadena);&#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('ABONO')&#13;&#10;  else&#13;&#10;     Memo15.Lines.Add('FACTURA')&#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;       Memo20.Lines.Clear;&#13;&#10;       Memo28.Lines.Clear;&#13;&#10;       Memo21.Lines.Clear;&#13;&#10;       Memo29.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;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C65732200010C3800000020446174615365743D22667278444244617461736574312220446174615365744E616D653D22667278444256656E63696D69656E746F73220000095661726961626C65730100055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C87000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
   <TfrxReportPage Name="Page1" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10" RightMargin="10" TopMargin="10" BottomMargin="10" Columns="1" ColumnWidth="210" ColumnPositions.Text="0" PrintOnPreviousPage="True" HGuides.Text="" VGuides.Text="">
     <TfrxPageHeader Name="Band2" Height="254,92913142" Left="0" Top="16" Width="718,1107">
       <TfrxMemoView Name="Memo23" Left="3,77953" Top="228,5671" Width="402,14193" Height="26,45669291" Color="15790320" Font.Charset="0" Font.Color="-16777208" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haCenter" ParentFont="False" Style="Cabecera de columna" VAlign="vaCenter" Text="Concepto"/>
@@ -32,12 +32,12 @@
       <TfrxShapeView Name="Shape3" Left="8" Top="26,45671" Width="345" Height="98,26778" Color="16250871" Shape="skRoundRectangle"/>
       <TfrxMemoView Name="Memo26" Left="17,57483" Top="33,82684" Width="113,3859" Height="14,89765" Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="FORMA DE PAGO"/>
       <TfrxMemoView Name="Memo27" Left="17,57483" Top="48,50402" Width="328,59864" Height="17,82684" StretchMode="smActualHeight" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="[frxDBCabecera.&#34;FORMA_PAGO&#34;]"/>
-      <TfrxMemoView Name="Memo30" Left="379,7483" Top="33,82684" Width="113,3859" Height="14,89765" Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="OBSERVACIONES"/>
-      <TfrxMemoView Name="Memo31" Left="379,7483" Top="48,50402" Width="331,24428" Height="69,83" StretchMode="smActualHeight" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="[frxDBCabecera.&#34;OBSERVACIONES&#34;]"/>
+      <TfrxMemoView Name="Memo30" Left="379,7483" Top="33,82684" Width="113,3859" Height="14,89765" Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="VENCIMIENTOS"/>
       <TfrxMemoView Name="Memo34" Left="3,5906" Top="151,62214" Width="712,28386" Height="18,89765" Visible="False" StretchMode="smActualHeight" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Arial" Font.Style="1" HAlign="haCenter" ParentFont="False" Text="[frxDBCabecera.&#34;REGISTRO_MERCANTIL&#34;]"/>
       <TfrxLineView Name="Line6" Left="4" Top="0" Width="715" Height="0" Frame.Typ="4"/>
       <TfrxMemoView Name="Memo1" Left="17,57483" Top="72" Width="113,3859" Height="14,89765" Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="DATOS BANCARIOS"/>
       <TfrxMemoView Name="Memo11" Left="17,57483" Top="87,5" Width="328,59864" Height="25,82684" OnBeforePrint="Memo11OnBeforePrint" StretchMode="smActualHeight" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="[frxDBCabecera.&#34;ENTIDAD&#34;] [frxDBCabecera.&#34;SUCURSAL&#34;] [frxDBCabecera.&#34;DC&#34;] [frxDBCabecera.&#34;CUENTA&#34;]"/>
+      <TfrxSubreport Name="Subreport1" Left="380" Top="52" Width="332" Height="64" Page="Page2" PrintOnParent="True"/>
     </TfrxPageFooter>
     <TfrxMasterData Name="BandaDetalles" Height="19,11812" Left="0" Top="332" Width="718,1107" OnBeforePrint="BandaDetallesOnBeforePrint" AllowSplit="True" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBDetalles" DataSetName="frxDBDetalles" RowCount="0" Stretched="True">
       <TfrxMemoView Name="Memo39" Left="565,41732283" Top="0" Width="58,58267717" Height="19,11812" Highlight.Font.Charset="1" Highlight.Font.Color="255" Highlight.Font.Height="-13" Highlight.Font.Name="Arial" Highlight.Font.Style="0" Highlight.Color="15790320" Highlight.Condition="&#60;line#&#62; mod 2 = 0" Text=""/>
@@ -68,4 +68,9 @@
       <TfrxMemoView Name="Memo29" Left="459,93723" Top="33,7953" Width="116,75603" Height="22,89765" 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;]"/>
     </TfrxReportSummary>
   </TfrxReportPage>
+  <TfrxReportPage Name="Page2" PaperWidth="209,973333333333" PaperHeight="296,926" PaperSize="9" LeftMargin="10" RightMargin="10" TopMargin="10" BottomMargin="10" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text="">
+    <TfrxMasterData Name="MasterData1" Height="13,82684" Left="0" Top="16" Width="718,009912533333" ColumnWidth="0" ColumnGap="0" DataSet="frxDBDataset1" DataSetName="frxDBVencimientos" RowCount="0">
+      <TfrxMemoView Name="Memo31" Left="0" Top="0" Width="136,59864" Height="13,82684" StretchMode="smActualHeight" DataSet="frxDBCabecera" DataSetName="frxDBCabecera" Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="[frxDBVencimientos.&#34;FECHA_VENCIMIENTO&#34;]"/>
+    </TfrxMasterData>
+  </TfrxReportPage>
 </TfrxReport>
diff --git a/Source/Base/GUIBase/uEditorPreview.dfm b/Source/Base/GUIBase/uEditorPreview.dfm
index 342544fb..8f9ea13c 100644
--- a/Source/Base/GUIBase/uEditorPreview.dfm
+++ b/Source/Base/GUIBase/uEditorPreview.dfm
@@ -16,6 +16,7 @@ inherited fEditorPreview: TfEditorPreview
     ExplicitWidth = 650
     inherited Image1: TImage
       Left = 623
+      ExplicitLeft = 623
     end
   end
   inherited TBXDock: TTBXDock
@@ -169,7 +170,7 @@ inherited fEditorPreview: TfEditorPreview
   inherited StatusBar: TJvStatusBar
     Panels = <
       item
-        Width = 50
+        Width = 150
       end
       item
         Width = 50
diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm
index ac84b32e..5ed74c24 100644
--- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm	
+++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm	
@@ -894,6 +894,45 @@ object RptFacturasCliente: TRptFacturasCliente
           end>
         BusinessRulesClient.ScriptLanguage = rslPascalScript
         BusinessRulesServer.ScriptLanguage = rslPascalScript
+      end
+      item
+        Params = <
+          item
+            Name = 'ID_FACTURA'
+            BlobType = dabtUnknown
+            Value = ''
+            ParamType = daptInput
+          end>
+        Statements = <
+          item
+            Connection = 'IBX'
+            TargetTable = 'FACTURAS_CLIENTE'
+            SQL = 
+              'SELECT'#10'    V_RECIBOS_CLIENTE.FECHA_VENCIMIENTO'#10'FROM V_RECIBOS_CL' +
+              'IENTE'#10'WHERE V_RECIBOS_CLIENTE.ID_FACTURA = :ID_FACTURA'#10'ORDER BY ' +
+              'V_RECIBOS_CLIENTE.FECHA_VENCIMIENTO'
+            StatementType = stSQL
+            ColumnMappings = <
+              item
+                DatasetField = 'FECHA_VENCIMIENTO'
+                TableField = 'FECHA_VENCIMIENTO'
+              end>
+          end>
+        Name = 'InformeFacturasCliente_Vencimientos'
+        Fields = <
+          item
+            Name = 'FECHA_VENCIMIENTO'
+            DataType = datDateTime
+            BlobType = dabtUnknown
+            DisplayWidth = 0
+            Alignment = taLeftJustify
+            InPrimaryKey = False
+            Calculated = False
+            Lookup = False
+            LookupCache = False
+          end>
+        BusinessRulesClient.ScriptLanguage = rslPascalScript
+        BusinessRulesServer.ScriptLanguage = rslPascalScript
       end>
     Commands = <>
     RelationShips = <>
@@ -1201,7 +1240,7 @@ object RptFacturasCliente: TRptFacturasCliente
     PreviewOptions.Zoom = 1.000000000000000000
     PrintOptions.Printer = 'Default'
     ReportOptions.CreateDate = 37871.995398692100000000
-    ReportOptions.LastChange = 39164.767996053240000000
+    ReportOptions.LastChange = 39248.500509259260000000
     ReportOptions.VersionBuild = '1'
     ReportOptions.VersionMajor = '12'
     ReportOptions.VersionMinor = '13'
@@ -1240,7 +1279,9 @@ object RptFacturasCliente: TRptFacturasCliente
       '       MemImpTotal.Style := '#39'Concepto titulo'#39';'
       '       end;'
       '  '#39'Concepto'#39': begin'
-      '               //'
+      '       MemPrecio.Style := '#39'Concepto normal'#39';'
+      '       MemCantidad.Style := '#39'Concepto normal'#39';'
+      '       MemImpTotal.Style := '#39'Concepto normal'#39';'
       '       end;'
       '  '#39'Subtotal'#39': begin'
       '       MemPrecio.Style := '#39'Concepto subtotal'#39';'
@@ -1314,6 +1355,19 @@ object RptFacturasCliente: TRptFacturasCliente
       ''
       'end;'
       ''
+      'procedure Memo11OnBeforePrint(Sender: TfrxComponent);'
+      'var'
+      '  Cadena : String;'
+      'begin'
+      '  if (<frxDBCabecera."TITULAR"> <> '#39#39') then'
+      '  begin'
+      '    Cadena := Memo11.Lines.Text;'
+      '    Memo11.Lines.Clear;'
+      '    Memo11.Lines.Add(<frxDBCabecera."TITULAR">);'
+      '    Memo11.Lines.Add(Cadena);'
+      '  end'
+      'end;'
+      ''
       'begin'
       ''
       'end.')
@@ -1329,6 +1383,10 @@ object RptFacturasCliente: TRptFacturasCliente
       item
         DataSet = frxDBDetalles
         DataSetName = 'frxDBDetalles'
+      end
+      item
+        DataSet = frxDBDataset1
+        DataSetName = 'frxDBVencimientos'
       end>
     Variables = <>
     Style = <
@@ -1372,7 +1430,7 @@ object RptFacturasCliente: TRptFacturasCliente
   end
   object frxDBCabecera: TfrxDBDataset
     UserName = 'frxDBCabecera'
-    CloseDataSource = False
+    CloseDataSource = True
     DataSource = DADataCabecera
     Left = 264
     Top = 16
@@ -1384,4 +1442,35 @@ object RptFacturasCliente: TRptFacturasCliente
     Left = 344
     Top = 16
   end
+  object DADataVencimientos: TDADataSource
+    DataTable = tbl_Vencimientos
+    Left = 264
+    Top = 184
+  end
+  object tbl_Vencimientos: TDACDSDataTable
+    RemoteUpdatesOptions = []
+    Fields = <>
+    Params = <>
+    MasterMappingMode = mmDataRequest
+    LogChanges = False
+    StreamingOptions = [soDisableEventsWhileStreaming]
+    RemoteFetchEnabled = False
+    SchemaCall.Params = <>
+    DataRequestCall.Params = <>
+    DataUpdateCall.Params = <>
+    ScriptCall.Params = <>
+    ReadOnly = False
+    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
+    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
+    IndexDefs = <>
+    Left = 264
+    Top = 240
+  end
+  object frxDBDataset1: TfrxDBDataset
+    UserName = 'frxDBVencimientos'
+    CloseDataSource = True
+    DataSource = DADataVencimientos
+    Left = 344
+    Top = 184
+  end
 end
diff --git a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas
index c7aab7ae..e655b308 100644
--- a/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas	
+++ b/Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas	
@@ -25,9 +25,12 @@ type
     frxChartObject1: TfrxChartObject;
     frxDBCabecera: TfrxDBDataset;
     frxDBDetalles: TfrxDBDataset;
+    DADataVencimientos: TDADataSource;
+    tbl_Vencimientos: TDACDSDataTable;
     schReport: TDASchema;
     DataDictionary: TDADataDictionary;
     frxReport: TfrxReport;
+    frxDBDataset1: TfrxDBDataset;
     procedure DataModuleCreate(Sender: TObject);
   private
     FConnection: IDAConnection;
@@ -48,6 +51,7 @@ const
   { Dataset names for schReport }
   ds_InformeFacturasCliente = 'InformeFacturasCliente';
   ds_InformeFacturasCliente_Detalles = 'InformeFacturasCliente_Detalles';
+  ds_InformeFacturasCliente_Vencimientos = 'InformeFacturasCliente_Vencimientos';  
 
 
 { TRptFacturasCliente }
@@ -64,6 +68,7 @@ function TRptFacturasCliente.GenerarFactura(const AFacturaID: Integer): Binary;
 var
   dsMaster: IDADataset;
   dsDetail: IDADataset;
+  dsVencimientos : IDADataset;
   AStream: TMemoryStream;
 begin
   AStream := TMemoryStream.Create;
@@ -72,7 +77,8 @@ begin
   try
     dsMaster := schReport.NewDataset(FConnection, ds_InformeFacturasCliente, ['ID'], [AFacturaID]);
     dsDetail := schReport.NewDataset(FConnection, ds_InformeFacturasCliente_Detalles, ['ID_FACTURA'], [AFacturaID], False);
-
+    dsVencimientos := schReport.NewDataset(FConnection, ds_InformeFacturasCliente_Vencimientos, ['ID_FACTURA'], [AFacturaID], False);
+    
     AStream.Clear;
     DABINAdapter.WriteDataset(AStream, dsMaster, [woRows, woSchema], -1);
     DABINAdapter.ReadDataset(AStream, tbl_FacturaCliente, TRUE, '', TRUE, TRUE);
@@ -81,6 +87,10 @@ begin
     DABINAdapter.WriteDataset(AStream, dsDetail, [woRows, woSchema], -1);
     DABINAdapter.ReadDataset(AStream, tbl_DetallesFacturaCliente, TRUE, '', TRUE, TRUE);
 
+    AStream.Clear;
+    DABINAdapter.WriteDataset(AStream, dsVencimientos, [woRows, woSchema], -1);
+    DABINAdapter.ReadDataset(AStream, tbl_Vencimientos, TRUE, '', TRUE, TRUE);
+
     frxReport.LoadFromFile(DarRutaInformes + rptFacturaCliente, True);
     frxReport.PrepareReport;
     frxReport.PreviewPages.SaveToStream(Result);