From c82fc72fbd407938d010a71ece2b0e3e3167742f Mon Sep 17 00:00:00 2001
From: roberto <rblanco@rodax-software.com>
Date: Wed, 26 Sep 2012 11:15:00 +0000
Subject: [PATCH] Se cambia el IVA al 21 y se arregla informe de
 facturadeclietne que el porcentaje de iva no salia

git-svn-id: https://192.168.0.254/svn/Proyectos.EstudioCarnicero_ProGestion/trunk@17 1b8572a8-2d6b-b84e-8c90-20ed86fa4eca
---
 Modulos/Facturas de cliente/Reglas/uBizFacturasCliente.pas | 4 ++--
 Output/Servidor/Informes/InfFacturaCliente.fr3             | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Modulos/Facturas de cliente/Reglas/uBizFacturasCliente.pas b/Modulos/Facturas de cliente/Reglas/uBizFacturasCliente.pas
index d1f811f..ae958b1 100644
--- a/Modulos/Facturas de cliente/Reglas/uBizFacturasCliente.pas	
+++ b/Modulos/Facturas de cliente/Reglas/uBizFacturasCliente.pas	
@@ -18,8 +18,8 @@ const
   CTE_ABONO = 'A';
   CTE_PROFORMA = 'P';
 
-  CTE_IVA1 = 16;
-  CTE_IVA2 = 1.16;
+  CTE_IVA1 = 21;
+  CTE_IVA2 = 1.21;
 
 type
   IBizDetallesFacturasCliente = interface(IDetallesFacturasCliente)
diff --git a/Output/Servidor/Informes/InfFacturaCliente.fr3 b/Output/Servidor/Informes/InfFacturaCliente.fr3
index de0397e..ee82fbb 100644
--- a/Output/Servidor/Informes/InfFacturaCliente.fr3
+++ b/Output/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="2047" PreviewOptions.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="Demonstrates how to create simple list report." ReportOptions.LastChange="39014,6532295255" 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;CODIGOPOSTAL&#34;&#62; &#60;&#62; '')&#13;&#10;  or (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CODIGOPOSTAL&#34;&#62; + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  case &#60;frxDBDetalles.&#34;TIPO&#34;&#62; of&#13;&#10;  'C': begin&#13;&#10;       MemoCampo12.Style := 'Concepto normal';&#13;&#10;       MemoCampo4.Style := 'Concepto normal';&#13;&#10;       end;&#13;&#10;  'S': begin&#13;&#10;       MemoCampo12.Style := 'Concepto subtotal';&#13;&#10;       MemoCampo4.Style := 'Concepto subtotal';&#13;&#10;       end;&#13;&#10;  'T': begin&#13;&#10;       MemoCampo12.Style := 'Concepto titulo';&#13;&#10;       MemoCampo4.Style := 'Concepto titulo';&#13;&#10;       end;&#13;&#10;  end;&#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 mTextoOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;       mTexto.Lines.Clear;&#13;&#10;&#13;&#10;       if (&#60;frxDBCabecera.&#34;CLASEFACTURA&#34;&#62; = 'N') then&#13;&#10;          mTexto.Lines.Add('FACTURA');&#13;&#10;&#13;&#10;       if (&#60;frxDBCabecera.&#34;CLASEFACTURA&#34;&#62; = 'A') then&#13;&#10;          mTexto.Lines.Add('ABONO');&#13;&#10;&#13;&#10;       if (&#60;frxDBCabecera.&#34;CLASEFACTURA&#34;&#62; = 'P') then&#13;&#10;          mTexto.Lines.Add('PROFORMA');&#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." StoreInDFM="False" PropData="044C656674022803546F7003800008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C65730100055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C86000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
+<TfrxReport Version="3.23.7" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="2047" PreviewOptions.OutlineWidth="180" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" ReportOptions.CreateDate="37871,9953986921" ReportOptions.Description.Text="Demonstrates how to create simple list report." ReportOptions.LastChange="41178,549317338" 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;CODIGOPOSTAL&#34;&#62; &#60;&#62; '')&#13;&#10;  or (&#60;frxDBCabecera.&#34;POBLACION&#34;&#62; &#60;&#62; '') then&#13;&#10;     DatosCliente.Lines.Add(&#60;frxDBCabecera.&#34;CODIGOPOSTAL&#34;&#62; + &#60;frxDBCabecera.&#34;POBLACION&#34;&#62;);&#13;&#10;end;&#13;&#10;&#13;&#10;procedure BandaDetallesOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  case &#60;frxDBDetalles.&#34;TIPO&#34;&#62; of&#13;&#10;  'C': begin&#13;&#10;       MemoCampo12.Style := 'Concepto normal';&#13;&#10;       MemoCampo4.Style := 'Concepto normal';&#13;&#10;       end;&#13;&#10;  'S': begin&#13;&#10;       MemoCampo12.Style := 'Concepto subtotal';&#13;&#10;       MemoCampo4.Style := 'Concepto subtotal';&#13;&#10;       end;&#13;&#10;  'T': begin&#13;&#10;       MemoCampo12.Style := 'Concepto titulo';&#13;&#10;       MemoCampo4.Style := 'Concepto titulo';&#13;&#10;       end;&#13;&#10;  end;&#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 mTextoOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;       mTexto.Lines.Clear;&#13;&#10;&#13;&#10;       if (&#60;frxDBCabecera.&#34;CLASEFACTURA&#34;&#62; = 'N') then&#13;&#10;          mTexto.Lines.Add('FACTURA');&#13;&#10;&#13;&#10;       if (&#60;frxDBCabecera.&#34;CLASEFACTURA&#34;&#62; = 'A') then&#13;&#10;          mTexto.Lines.Add('ABONO');&#13;&#10;&#13;&#10;       if (&#60;frxDBCabecera.&#34;CLASEFACTURA&#34;&#62; = 'P') then&#13;&#10;          mTexto.Lines.Add('PROFORMA');&#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." StoreInDFM="False" PropData="044C656674022803546F7003800008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3400000020446174615365743D226672784442446574616C6C65732220446174615365744E616D653D226672784442446574616C6C6573220000095661726961626C65730100055374796C6501010C85000000204E616D653D22436F6E636570746F206E6F726D616C2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22302200010C86000000204E616D653D22436F6E636570746F20737562746F74616C2220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D22312200010C97000000204E616D653D22436162656365726120646520636F6C756D6E612220436F6C6F723D2231353739303332302220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31322220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D223122204672616D652E5479703D2231352200010C85000000204E616D653D22436F6E636570746F20746974756C6F2220436F6C6F723D223533363837303931312220466F6E742E436861727365743D22302220466F6E742E436F6C6F723D222D31363737373230382220466F6E742E4865696768743D222D31332220466F6E742E4E616D653D225461686F6D612220466F6E742E5374796C653D2231220000">
   <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="258,70866142" Left="0" Top="18,89765" Width="718,1107">
       <TfrxMemoView Name="Memo23" Left="3,77953" Top="228,5671" Width="621,35467" 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"/>
@@ -46,7 +46,7 @@
       <TfrxMemoView Name="Memo13" Left="234,55133" Top="12" Width="116" Height="16" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Base imponible"/>
       <TfrxMemoView Name="Memo22" Left="352" Top="12" Width="116" Height="16" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="IVA"/>
       <TfrxMemoView Name="Memo25" Left="468" Top="12" Width="116" Height="16" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Total IVA"/>
-      <TfrxMemoView Name="Memo32" Left="352" Top="28" 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;IVA&#34;]"/>
+      <TfrxMemoView Name="Memo32" Left="352" Top="28" 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;IVA&#34;]"/>
       <TfrxMemoView Name="Memo33" Left="468" Top="28" 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;IMPORTEIVA&#34;]"/>
       <TfrxLineView Name="Line7" Align="baWidth" Left="0" Top="4" Width="718,1107" Height="0" Frame.Color="16777215" Frame.Typ="4" Frame.Width="8"/>
       <TfrxLineView Name="Line8" Left="5" Top="0" Width="714,1107" Height="0" Frame.Typ="4"/>