Cambios Versión 2.1.6

git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1150 0c75b7a4-871f-7646-8a2f-f78d34cc349f

Source/Informes/3/InformeIVAClientes.fr3

@@ -7,7 +7,7 @@
       <TfrxShapeView Name="Shape5" Left="513" Top="4" Width="495" Height="129" ShowHint="False" Color="-16777211" Shape="skRoundRectangle"/>
       <TfrxMemoView Name="NombreCliente" Left="521,85807" Top="13" Width="478" Height="19" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="11763997" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="LISTADO DE IVA DE FACTURAS DE CLIENTE"/>
       <TfrxMemoView Name="Memo3" Left="521,85807" Top="34,89765" Width="478" Height="91" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Fecha del listado: [&#60;Date&#62;] - Página [Page#] de [TotalPages#]&#13;&#10;[TextoParametros]"/>
-      <TfrxMemoView Name="DatosEmpresa" Left="85" Top="37" Width="309" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICIOS PROFESIONALES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
+      <TfrxMemoView Name="DatosEmpresa" Left="85" Top="37" Width="309" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
     </TfrxPageHeader>
     <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="552" Width="1009,13451" PrintOnLastPage="False">
       <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>
@@ -32,9 +32,9 @@
       <TfrxMemoView Name="Memo31" Left="916,55" Top="0" Width="95" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;]"/>
     </TfrxMasterData>
     <TfrxGroupFooter Name="" Height="16" Left="0" Top="309" Width="1009,13451">
-      <TfrxMemoView Name="Memo6" Left="916" Top="0,37774772" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo6" Left="916" Top="0,37774772" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
-      <TfrxMemoView Name="Memo14" Left="821" Top="0,37774772" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo14" Left="821" Top="0,37774772" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros1)]"/>
-      <TfrxMemoView Name="Memo15" Left="726" Top="0,37774772" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo15" Left="726" Top="0,37774772" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;&#62;,DatosMaestros1)]"/>
       <TfrxMemoView Name="Memo53" Left="0" Top="0,37774772" Width="726" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES [frxDBInformeListadoFacturas.&#34;TITULO&#34;]:"/>
     </TfrxGroupFooter>
     <TfrxHeader Name="Header1" Height="75" Left="0" Top="345" Width="1009,13451">

Source/Informes/3/InformeIVAClientesDesglosado.fr3

@@ -7,7 +7,7 @@
       <TfrxShapeView Name="Shape5" Left="512" Top="3" Width="495" Height="129" ShowHint="False" Color="-16777211" Shape="skRoundRectangle"/>
       <TfrxMemoView Name="NombreCliente" Left="520,85807" Top="12" Width="478" Height="19" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="LISTADO DE IVA DE FACTURAS DE CLIENTE"/>
       <TfrxMemoView Name="Memo3" Left="520,85807" Top="33,89765" Width="478" Height="91" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Fecha del listado: [&#60;Date&#62;] - Página [Page#] de [TotalPages#]&#13;&#10;[TextoParametros]"/>
-      <TfrxMemoView Name="DatosEmpresa" Left="84" Top="36" Width="331" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICIOS PROFESIONALES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
+      <TfrxMemoView Name="DatosEmpresa" Left="84" Top="36" Width="331" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
     </TfrxPageHeader>
     <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="635" Width="1009,13451" PrintOnLastPage="False">
       <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>
@@ -32,9 +32,9 @@
       <TfrxMemoView Name="Memo31" Left="916,55" Top="0" Width="95" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;]"/>
     </TfrxMasterData>
     <TfrxGroupFooter Name="" Height="16" Left="0" Top="352" Width="1009,13451">
-      <TfrxMemoView Name="Memo6" Left="916" Top="0,37774772" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo6" Left="916" Top="0,37774772" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
-      <TfrxMemoView Name="Memo14" Left="821" Top="0,37774772" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo14" Left="821" Top="0,37774772" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros1)]"/>
-      <TfrxMemoView Name="Memo15" Left="726" Top="0,37774772" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo15" Left="726" Top="0,37774772" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;&#62;,DatosMaestros1)]"/>
       <TfrxMemoView Name="Memo53" Left="0" Top="0,37774772" Width="726" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES [frxDBInformeListadoFacturas.&#34;TITULO&#34;]:"/>
     </TfrxGroupFooter>
     <TfrxHeader Name="Header1" Height="75" Left="0" Top="428" Width="1009,13451">

Source/Informes/3/InformeIVAComparativo.fr3

@@ -7,7 +7,7 @@
       <TfrxShapeView Name="Shape5" Left="513" Top="4" Width="495" Height="129" ShowHint="False" Color="-16777211" Shape="skRoundRectangle"/>
       <TfrxMemoView Name="NombreCliente" Left="521,85807" Top="13" Width="478" Height="19" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="11763997" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="LISTADO COMPARATIVO DE IVA REPERCUTIDO - SOPORTADO"/>
       <TfrxMemoView Name="Memo3" Left="521,85807" Top="34,89765" Width="478" Height="91" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Fecha del listado: [&#60;Date&#62;] - Página [Page#] de [TotalPages#]&#13;&#10;[TextoParametros]"/>
-      <TfrxMemoView Name="DatosEmpresa" Left="85" Top="37" Width="309" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICIOS PROFESIONALES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
+      <TfrxMemoView Name="DatosEmpresa" Left="85" Top="37" Width="309" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
     </TfrxPageHeader>
     <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="664" Width="1009,13451" PrintOnLastPage="False">
       <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>

Source/Informes/3/InformeIVAProveedores.fr3

@@ -7,7 +7,7 @@
       <TfrxShapeView Name="Shape5" Left="542" Top="9" Width="465" Height="122" ShowHint="False" Color="-16777211" Frame.Width="0,1" Shape="skRoundRectangle"/>
       <TfrxMemoView Name="NombreCliente" Left="545,85807" Top="14" Width="452" Height="16,88188" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="LISTADO DE IVA FACTURAS DE PROVEEDOR"/>
       <TfrxMemoView Name="Memo3" Left="545,85807" Top="34" Width="452" Height="91" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Fecha del listado: [&#60;Date&#62;] - Página [Page#] de [TotalPages#]&#13;&#10;[TextoParametros]"/>
-      <TfrxMemoView Name="DatosEmpresa" Left="84" Top="37" Width="285" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICIOS PROFESIONALES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
+      <TfrxMemoView Name="DatosEmpresa" Left="84" Top="37" Width="285" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
     </TfrxPageHeader>
     <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="558" Width="1009,13451" PrintOnLastPage="False">
       <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>
@@ -32,9 +32,9 @@
       <TfrxMemoView Name="Memo31" Left="913,86501" Top="0" Width="94,64276" Height="17,007874015748" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;]"/>
     </TfrxMasterData>
     <TfrxGroupFooter Name="" Height="20,78740402" Left="0" Top="309" Width="1009,13451">
-      <TfrxMemoView Name="Memo6" Left="914,11812" Top="0,37774772" Width="94,48818898" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo6" Left="914,11812" Top="0,37774772" Width="94,48818898" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
-      <TfrxMemoView Name="Memo14" Left="816,22936" Top="0,37774772" Width="97,88976378" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo14" Left="816,22936" Top="0,37774772" Width="97,88976378" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros1)]"/>
-      <TfrxMemoView Name="Memo15" Left="724,54" Top="0,37774772" Width="94,48818898" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo15" Left="724,54" Top="0,37774772" Width="94,48818898" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;&#62;,DatosMaestros1)]"/>
       <TfrxMemoView Name="Memo53" Left="0" Top="0,37774772" Width="723,57139" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES [frxDBInformeListadoFacturas.&#34;TITULO&#34;]:"/>
     </TfrxGroupFooter>
     <TfrxMemoView Name="Memo2" Align="baRight" Left="938,13451" Top="651" Width="71" Height="13" OnBeforePrint="Memo2OnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text=""/>

Source/Informes/3/InformeIVAProveedoresDesglosado.fr3

@@ -7,7 +7,7 @@
       <TfrxShapeView Name="Shape5" Left="541" Top="8" Width="465" Height="122" ShowHint="False" Color="-16777211" Frame.Width="0,1" Shape="skRoundRectangle"/>
       <TfrxMemoView Name="NombreCliente" Left="544,85807" Top="13" Width="452" Height="16,88188" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="LISTADO DE IVA FACTURAS DE PROVEEDOR"/>
       <TfrxMemoView Name="Memo3" Left="544,85807" Top="33" Width="452" Height="91" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Fecha del listado: [&#60;Date&#62;] - Página [Page#] de [TotalPages#]&#13;&#10;[TextoParametros]"/>
-      <TfrxMemoView Name="DatosEmpresa" Left="85" Top="37" Width="351" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICIOS PROFESIONALES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
+      <TfrxMemoView Name="DatosEmpresa" Left="85" Top="37" Width="351" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
     </TfrxPageHeader>
     <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="644" Width="1009,13451" PrintOnLastPage="False">
       <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>
@@ -33,9 +33,9 @@
       <TfrxMemoView Name="Memo31" Left="914,27" Top="0" Width="94,11" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;]"/>
     </TfrxMasterData>
     <TfrxGroupFooter Name="" Height="20,78740402" Left="0" Top="352" Width="1009,13451">
-      <TfrxMemoView Name="Memo6" Left="914,11812" Top="0,37774772" Width="94,48818898" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo6" Left="914,11812" Top="0,37774772" Width="94,48818898" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
-      <TfrxMemoView Name="Memo14" Left="816,22936" Top="0,37774772" Width="97,88976378" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo14" Left="816,22936" Top="0,37774772" Width="97,88976378" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros1)]"/>
-      <TfrxMemoView Name="Memo15" Left="724,35436" Top="0,37774772" Width="94,48818898" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo15" Left="724,35436" Top="0,37774772" Width="94,48818898" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;&#62;,DatosMaestros1)]"/>
       <TfrxMemoView Name="Memo53" Left="0" Top="0,37774772" Width="724,57139" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES [frxDBInformeListadoFacturas.&#34;TITULO&#34;]:"/>
     </TfrxGroupFooter>
     <TfrxMasterData Name="DatosMaestros2" Height="17,007874015748" Left="0" Top="532" Width="1009,13451" ColumnWidth="0" ColumnGap="0" DataSet="frxDBInformeListadoFacturasResumen" DataSetName="frxDBInformeListadoFacturasResumen" RowCount="0">

Source/Informes/3/InformeListadoFacturasClientePendientes.fr3

@@ -7,7 +7,7 @@
       <TfrxShapeView Name="Shape5" Left="513" Top="3" Width="495" Height="129" ShowHint="False" Color="-16777211" Shape="skRoundRectangle"/>
       <TfrxMemoView Name="NombreCliente" Left="521,85807" Top="12" Width="478" Height="19" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="LISTADO DE FACTURAS DE CLIENTE PENDIENTES"/>
       <TfrxMemoView Name="Memo3" Left="521,85807" Top="33,89765" Width="478" Height="91" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Fecha del listado: [&#60;Date&#62;] - Página [Page#] de [TotalPages#]&#13;&#10;[TextoParametros]"/>
-      <TfrxMemoView Name="DatosEmpresa" Left="84" Top="3" Width="331" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICIOS PROFESIONALES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
+      <TfrxMemoView Name="DatosEmpresa" Left="84" Top="3" Width="331" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
     </TfrxPageHeader>
     <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="394" Width="1009,13451" PrintOnLastPage="False">
       <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>
@@ -30,7 +30,7 @@
       <TfrxMemoView Name="Memo5" Left="220,21274" Top="0" Width="85,02" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HideZeros="True" ParentFont="False" Text=" [frxDBInformeListadoFacturasPendientes.&#34;FECHA_VENCIMIENTO&#34;]"/>
     </TfrxMasterData>
     <TfrxGroupFooter Name="" Height="20,78740402" Left="0" Top="313" Width="1009,13451">
-      <TfrxMemoView Name="Memo6" Left="717,73228346" Top="0,37774772" Width="155,14173228" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasPendientes.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)] "/>
+      <TfrxMemoView Name="Memo6" Left="717,73228346" Top="0,37774772" Width="155,14173228" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasPendientes.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)] "/>
       <TfrxMemoView Name="Memo14" Left="872,87401574" Top="0,37774772" Width="135,5" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text=""/>
       <TfrxMemoView Name="Memo53" Left="0" Top="0,37774772" Width="717,73228346" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES [frxDBInformeListadoFacturasPendientes.&#34;TITULO&#34;]:"/>
     </TfrxGroupFooter>

Source/Informes/3/InformeListadoFacturasClientePendientesDesglosado.fr3

@@ -7,7 +7,7 @@
       <TfrxShapeView Name="Shape5" Left="512" Top="6" Width="495" Height="129" ShowHint="False" Color="-16777211" Shape="skRoundRectangle"/>
       <TfrxMemoView Name="NombreCliente" Left="520,85807" Top="15" Width="478" Height="19" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="LISTADO DE FACTURAS DE CLIENTE PENDIENTES"/>
       <TfrxMemoView Name="Memo3" Left="520,85807" Top="36,89765" Width="478" Height="91" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Fecha del listado: [&#60;Date&#62;] - Página [Page#] de [TotalPages#]&#13;&#10;[TextoParametros]"/>
-      <TfrxMemoView Name="DatosEmpresa" Left="84" Top="3" Width="297" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICIOS PROFESIONALES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
+      <TfrxMemoView Name="DatosEmpresa" Left="84" Top="3" Width="297" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
     </TfrxPageHeader>
     <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="474" Width="1009,13451" PrintOnLastPage="False">
       <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>
@@ -30,7 +30,7 @@
       <TfrxMemoView Name="Memo5" Left="220,21274" Top="0" Width="85,02" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HideZeros="True" ParentFont="False" Text=" [frxDBInformeListadoFacturasPendientes.&#34;FECHA_VENCIMIENTO&#34;]"/>
     </TfrxMasterData>
     <TfrxGroupFooter Name="" Height="20,78740402" Left="0" Top="353" Width="1009,13451">
-      <TfrxMemoView Name="Memo6" Left="717,73228346" Top="0,37774772" Width="155,14173228" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasPendientes.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)] "/>
+      <TfrxMemoView Name="Memo6" Left="717,73228346" Top="0,37774772" Width="155,14173228" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasPendientes.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)] "/>
       <TfrxMemoView Name="Memo14" Left="872,87401574" Top="0,37774772" Width="135,5" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text=""/>
       <TfrxMemoView Name="Memo53" Left="0" Top="0,37774772" Width="717,73228346" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES [frxDBInformeListadoFacturasPendientes.&#34;TITULO&#34;]:"/>
     </TfrxGroupFooter>

Source/Informes/3/InformeListadoFacturasProveedor.fr3

@@ -7,7 +7,7 @@
       <TfrxShapeView Name="Shape5" Left="541" Top="8" Width="465" Height="122" ShowHint="False" Color="-16777211" Frame.Width="0,1" Shape="skRoundRectangle"/>
       <TfrxMemoView Name="NombreCliente" Left="544,85807" Top="13" Width="452" Height="16,88188" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="LISTADO DE FACTURAS DE PROVEEDOR"/>
       <TfrxMemoView Name="Memo3" Left="544,85807" Top="33" Width="452" Height="91" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Fecha del listado: [&#60;Date&#62;] - Página [Page#] de [TotalPages#]&#13;&#10;[TextoParametros]"/>
-      <TfrxMemoView Name="DatosEmpresa" Left="84" Top="37" Width="315" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICIOS PROFESIONALES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
+      <TfrxMemoView Name="DatosEmpresa" Left="84" Top="37" Width="315" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
     </TfrxPageHeader>
     <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="596" Width="1009,13451" PrintOnLastPage="False">
       <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>
@@ -35,9 +35,9 @@
     </TfrxMasterData>
     <TfrxGroupFooter Name="" Height="20,78740402" Left="0" Top="309" Width="1009,13451">
       <TfrxMemoView Name="Memo53" Left="0" Top="0,37774772" Width="723,77952756" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES [frxDBInformeListadoFacturas.&#34;TITULO&#34;]:"/>
-      <TfrxMemoView Name="Memo6" Left="913,51181102" Top="0,37774772" Width="94,48818898" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo6" Left="913,51181102" Top="0,37774772" Width="94,48818898" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
-      <TfrxMemoView Name="Memo14" Left="817,13385827" Top="0,37774772" Width="96,37795276" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo14" Left="817,13385827" Top="0,37774772" Width="96,37795276" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros1)]"/>
-      <TfrxMemoView Name="Memo15" Left="724,15748031" Top="0,37774772" Width="94,11023622" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;&#62;,DatosMaestros1)]"/>
+      <TfrxMemoView Name="Memo15" Left="724,15748031" Top="0,37774772" Width="94,11023622" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="-16777211" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;&#62;,DatosMaestros1)]"/>
     </TfrxGroupFooter>
     <TfrxMasterData Name="DatosMaestros2" Height="17,00787402" Left="0" Top="446" Width="1009,13451" ColumnWidth="0" ColumnGap="0" DataSet="frxDBInformeListadoFacturasResumen" DataSetName="frxDBInformeListadoFacturasResumen" RowCount="0">
       <TfrxMemoView Name="Memo9" Left="0" Top="0" Width="381,63" Height="17,00787402" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;TITULO&#34;]"/>

Source/Informes/3/InformeListadoFacturasProveedorDesglosado.fr3

@@ -7,7 +7,7 @@
       <TfrxShapeView Name="Shape5" Left="543" Top="9" Width="465" Height="122" ShowHint="False" Color="-16777211" Frame.Width="0,1" Shape="skRoundRectangle"/>
       <TfrxMemoView Name="NombreCliente" Left="546,85807" Top="14" Width="452" Height="16,88188" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="LISTADO DE FACTURAS DE PROVEEDOR"/>
       <TfrxMemoView Name="Memo3" Left="546,85807" Top="34" Width="452" Height="91" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Fecha del listado: [&#60;Date&#62;] - Página [Page#] de [TotalPages#]&#13;&#10;[TextoParametros]"/>
-      <TfrxMemoView Name="DatosEmpresa" Left="84" Top="37" Width="373" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICIOS PROFESIONALES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
+      <TfrxMemoView Name="DatosEmpresa" Left="84" Top="37" Width="373" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
     </TfrxPageHeader>
     <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="682" Width="1009,13451" PrintOnLastPage="False">
       <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>

Source/Informes/3/InformeListadoRecibosProvPendientes.fr3

@@ -7,7 +7,7 @@
       <TfrxShapeView Name="Shape5" Left="542" Top="9" Width="465" Height="122" ShowHint="False" Color="-16777211" Frame.Width="0,1" Shape="skRoundRectangle"/>
       <TfrxMemoView Name="NombreCliente" Left="545,85807" Top="14" Width="452" Height="16,88188" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="LISTADO DE RECIBOS A PROVEEDOR PENDIENTES"/>
       <TfrxMemoView Name="Memo3" Left="545,85807" Top="34" Width="452" Height="91" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Fecha del listado: [&#60;Date&#62;] - Página [Page#] de [TotalPages#]&#13;&#10;[TextoParametros]"/>
-      <TfrxMemoView Name="DatosEmpresa" Left="82" Top="37" Width="335" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICIOS PROFESIONALES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
+      <TfrxMemoView Name="DatosEmpresa" Left="82" Top="37" Width="335" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
     </TfrxPageHeader>
     <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="527" Width="1009,13451" PrintOnLastPage="False">
       <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953000000002" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>

Source/Informes/3/InformeListadoRecibosProvPendientesDesglosado.fr3

@@ -7,7 +7,7 @@
       <TfrxShapeView Name="Shape5" Left="542" Top="11" Width="465" Height="122" ShowHint="False" Color="-16777211" Frame.Width="0,1" Shape="skRoundRectangle"/>
       <TfrxMemoView Name="NombreCliente" Left="545,85807" Top="16" Width="452" Height="16,88188" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="LISTADO DE RECIBOS A PROVEEDOR PENDIENTES"/>
       <TfrxMemoView Name="Memo3" Left="545,85807" Top="36" Width="452" Height="91" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Fecha del listado: [&#60;Date&#62;] - Página [Page#] de [TotalPages#]&#13;&#10;[TextoParametros]"/>
-      <TfrxMemoView Name="DatosEmpresa" Left="81" Top="37" Width="323" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICIOS PROFESIONALES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
+      <TfrxMemoView Name="DatosEmpresa" Left="81" Top="37" Width="323" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
     </TfrxPageHeader>
     <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="607" Width="1009,13451" PrintOnLastPage="False">
       <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953000000002" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>

Source/Informes/3/InformeListadoRecibosProveedor.fr3

@@ -7,7 +7,7 @@
       <TfrxShapeView Name="Shape5" Left="543" Top="11" Width="465" Height="122" ShowHint="False" Color="-16777211" Frame.Width="0,1" Shape="skRoundRectangle"/>
       <TfrxMemoView Name="NombreCliente" Left="546,85807" Top="16" Width="452" Height="16,88188" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="LISTADO DE RECIBOS A PROVEEDOR"/>
       <TfrxMemoView Name="Memo3" Left="546,85807" Top="36" Width="452" Height="91" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Fecha del listado: [&#60;Date&#62;] - Página [Page#] de [TotalPages#]&#13;&#10;[TextoParametros]"/>
-      <TfrxMemoView Name="DatosEmpresa" Left="83" Top="37" Width="334" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICIOS PROFESIONALES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
+      <TfrxMemoView Name="DatosEmpresa" Left="83" Top="37" Width="334" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
     </TfrxPageHeader>
     <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="552" Width="1009,13451" PrintOnLastPage="False">
       <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953000000002" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>

Source/Informes/3/InformeListadoRecibosProveedorDesglosado.fr3

@@ -7,7 +7,7 @@
       <TfrxShapeView Name="Shape5" Left="543" Top="11" Width="465" Height="122" ShowHint="False" Color="-16777211" Frame.Width="0,1" Shape="skRoundRectangle"/>
       <TfrxMemoView Name="NombreCliente" Left="546,85807" Top="16" Width="452" Height="16,88188" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="LISTADO DE RECIBOS A PROVEEDOR"/>
       <TfrxMemoView Name="Memo3" Left="546,85807" Top="36" Width="452" Height="91" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Fecha del listado: [&#60;Date&#62;] - Página [Page#] de [TotalPages#]&#13;&#10;[TextoParametros]"/>
-      <TfrxMemoView Name="DatosEmpresa" Left="83" Top="38" Width="301" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICIOS PROFESIONALES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
+      <TfrxMemoView Name="DatosEmpresa" Left="83" Top="38" Width="301" Height="88" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="AZACAN FACILITIES SERVICES, S.L. &#13;&#10;CIF: B86610268&#13;&#10;C/ Hierro, 33 1ª Plta Oficina 10. 28045  Madrid"/>
     </TfrxPageHeader>
     <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="632" Width="1009,13451" PrintOnLastPage="False">
       <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>

Source/Modulos/Contactos/Data/uDataModuleClientes.dfm

@@ -422,6 +422,11 @@ inherited DataModuleClientes: TDataModuleClientes
       item
         Name = 'FECHA_INGRESO'
         DataType = datDateTime
+      end
+      item
+        Name = 'NOMBRE_DE_EMPRESA'
+        DataType = datString
+        Size = 255
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]

Source/Modulos/Contactos/Data/uDataModuleContactos.dfm

@@ -11,12 +11,12 @@ inherited DataModuleContactos: TDataModuleContactos
     Top = 16
   end
   object rda_Contactos: TDARemoteDataAdapter
+    DataStreamer = Bin2DataStreamer
     GetSchemaCall.RemoteService = RORemoteService
     GetDataCall.RemoteService = RORemoteService
     UpdateDataCall.RemoteService = RORemoteService
     GetScriptsCall.RemoteService = RORemoteService
     RemoteService = RORemoteService
-    DataStreamer = Bin2DataStreamer
     Left = 43
     Top = 143
   end
@@ -186,8 +186,6 @@ inherited DataModuleContactos: TDataModuleContactos
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteDataAdapter = rda_Contactos
     LocalDataStreamer = Bin2DataStreamer
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'Contactos'
     IndexDefs = <>
     Left = 176
@@ -313,8 +311,6 @@ inherited DataModuleContactos: TDataModuleContactos
     MasterSource = ds_Contactos
     MasterFields = 'ID'
     DetailFields = 'ID_CONTACTO'
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'DireccionesContacto'
     IndexDefs = <>
     Left = 320
@@ -384,6 +380,16 @@ inherited DataModuleContactos: TDataModuleContactos
       item
         Name = 'FECHA_MODIFICACION'
         DataType = datDateTime
+      end
+      item
+        Name = 'IBAN'
+        DataType = datString
+        Size = 255
+      end
+      item
+        Name = 'SWIFT'
+        DataType = datString
+        Size = 255
       end>
     Params = <>
     MasterMappingMode = mmWhere
@@ -393,8 +399,6 @@ inherited DataModuleContactos: TDataModuleContactos
     MasterSource = ds_Contactos
     MasterFields = 'ID'
     DetailFields = 'ID_CONTACTO'
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'DatosBancarios'
     IndexDefs = <>
     Left = 176
@@ -486,8 +490,6 @@ inherited DataModuleContactos: TDataModuleContactos
     MasterSource = ds_Contactos
     MasterFields = 'ID'
     DetailFields = 'ID_CONTACTO'
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'PersonalContacto'
     IndexDefs = <>
     Left = 456

Source/Modulos/Contactos/Model/schContactosClient_Intf.pas

@@ -9,20 +9,20 @@ const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_Contactos = '{C78BACC1-F2BB-473F-A884-0C99A35D12C5}';
+  RID_Contactos = '{A2E48AB4-3972-46FC-97D8-BD3E6F716786}';
-  RID_GruposCliente = '{1AF06554-3E62-440F-A3EA-98F6780C904D}';
+  RID_GruposCliente = '{AF9C9D2C-E3F8-49AC-A039-08C9B0118004}';
-  RID_DatosBancarios = '{0ABB73CA-0D88-45CA-8C6B-7DFB43186B29}';
+  RID_DatosBancarios = '{CF710CC3-76BB-4158-AEE3-CB5A5A0A28A9}';
-  RID_Clientes = '{72136A7F-7375-469E-BC58-189DBEBFE6E5}';
+  RID_Clientes = '{4E12DC24-48CB-4084-A5CC-76B63A129459}';
-  RID_Proveedores = '{A1937E85-EF1D-45DC-9BD2-61F434E4D923}';
+  RID_Proveedores = '{2F440357-B661-46FF-8E46-9F84C88B2E5E}';
-  RID_Empleados = '{DF352049-627F-45E4-ADAC-F275C35851E2}';
+  RID_Empleados = '{01031982-AF54-4758-A96C-94A1B4F1FCB7}';
-  RID_DireccionesContacto = '{DDFBBB18-107D-4841-B71D-CB49A83364A5}';
+  RID_DireccionesContacto = '{EB4DA8D1-039E-4638-A2A4-087BEF63BC1C}';
-  RID_ClientesDescuentos = '{367BEC69-5039-4C6A-BE86-30C5CDD10F30}';
+  RID_ClientesDescuentos = '{0E2C9BA6-2C06-457A-9392-BA6C22A19EE2}';
-  RID_GruposProveedor = '{4CBB39D3-9794-4CD6-9B4B-271AC297DEE6}';
+  RID_GruposProveedor = '{A46145D0-84F3-411D-AD9F-3CF34A9E9CAC}';
-  RID_GruposEmpleado = '{B94316A8-DB07-453D-B019-B9B7967C1003}';
+  RID_GruposEmpleado = '{BBD929AE-F828-495B-84A0-EA2F1F0465AA}';
-  RID_Contactos_Refresh = '{A80834D1-B3BD-41A9-AF85-7C523BA328D0}';
+  RID_Contactos_Refresh = '{936CE2D8-DED1-47A7-B40B-D0D41C8CAEC9}';
-  RID_ContratosEmpleados = '{2E4A61D9-2497-4300-AD40-9BBED3854C31}';
+  RID_ContratosEmpleados = '{35352806-E0CB-434C-B6B7-5304ABC9ECC8}';
-  RID_DescripcionesProveedores = '{086DFAF6-4C45-467E-96E2-174D8C397EDD}';
+  RID_DescripcionesProveedores = '{78D442CD-F8D8-4048-8D22-C568133E0A71}';
-  RID_PersonalContacto = '{C75E2066-5FB7-406A-BA2C-C34CB8396A6F}';
+  RID_PersonalContacto = '{18D64FD3-6B09-4B24-932A-46AEC306C656}';
 
   { Data table names }
   nme_Contactos = 'Contactos';
@@ -108,6 +108,8 @@ const
   fld_DatosBancariosCUENTA = 'CUENTA';
   fld_DatosBancariosFECHA_ALTA = 'FECHA_ALTA';
   fld_DatosBancariosFECHA_MODIFICACION = 'FECHA_MODIFICACION';
+  fld_DatosBancariosIBAN = 'IBAN';
+  fld_DatosBancariosSWIFT = 'SWIFT';
 
   { DatosBancarios field indexes }
   idx_DatosBancariosID = 0;
@@ -119,6 +121,8 @@ const
   idx_DatosBancariosCUENTA = 6;
   idx_DatosBancariosFECHA_ALTA = 7;
   idx_DatosBancariosFECHA_MODIFICACION = 8;
+  idx_DatosBancariosIBAN = 9;
+  idx_DatosBancariosSWIFT = 10;
 
   { Clientes fields }
   fld_ClientesID = 'ID';
@@ -160,6 +164,7 @@ const
   fld_ClientesDESCUENTO = 'DESCUENTO';
   fld_ClientesFELICITACION = 'FELICITACION';
   fld_ClientesFECHA_INGRESO = 'FECHA_INGRESO';
+  fld_ClientesNOMBRE_DE_EMPRESA = 'NOMBRE_DE_EMPRESA';
 
   { Clientes field indexes }
   idx_ClientesID = 0;
@@ -201,6 +206,7 @@ const
   idx_ClientesDESCUENTO = 36;
   idx_ClientesFELICITACION = 37;
   idx_ClientesFECHA_INGRESO = 38;
+  idx_ClientesNOMBRE_DE_EMPRESA = 39;
 
   { Proveedores fields }
   fld_ProveedoresID = 'ID';
@@ -507,7 +513,7 @@ const
 type
   { IContactos }
   IContactos = interface(IDAStronglyTypedDataTable)
-  ['{995253BD-DD00-467F-B013-9D7E899B0224}']
+  ['{16C69CE3-3F0B-4BAC-AC4C-D3793013DF97}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -806,7 +812,7 @@ type
 
   { IGruposCliente }
   IGruposCliente = interface(IDAStronglyTypedDataTable)
-  ['{69643734-5A5A-4716-B5AD-269D1190306C}']
+  ['{BDB72610-CDDE-4907-BA01-9809332DFB64}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -853,7 +859,7 @@ type
 
   { IDatosBancarios }
   IDatosBancarios = interface(IDAStronglyTypedDataTable)
-  ['{B8BB890C-F529-4164-8C9F-8DBD0C27D973}']
+  ['{A523741B-7F1F-4291-BD15-BEA35FABD07C}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -891,6 +897,14 @@ type
     procedure SetFECHA_MODIFICACIONValue(const aValue: DateTime);
     function GetFECHA_MODIFICACIONIsNull: Boolean;
     procedure SetFECHA_MODIFICACIONIsNull(const aValue: Boolean);
+    function GetIBANValue: String;
+    procedure SetIBANValue(const aValue: String);
+    function GetIBANIsNull: Boolean;
+    procedure SetIBANIsNull(const aValue: Boolean);
+    function GetSWIFTValue: String;
+    procedure SetSWIFTValue(const aValue: String);
+    function GetSWIFTIsNull: Boolean;
+    procedure SetSWIFTIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -912,6 +926,10 @@ type
     property FECHA_ALTAIsNull: Boolean read GetFECHA_ALTAIsNull write SetFECHA_ALTAIsNull;
     property FECHA_MODIFICACION: DateTime read GetFECHA_MODIFICACIONValue write SetFECHA_MODIFICACIONValue;
     property FECHA_MODIFICACIONIsNull: Boolean read GetFECHA_MODIFICACIONIsNull write SetFECHA_MODIFICACIONIsNull;
+    property IBAN: String read GetIBANValue write SetIBANValue;
+    property IBANIsNull: Boolean read GetIBANIsNull write SetIBANIsNull;
+    property SWIFT: String read GetSWIFTValue write SetSWIFTValue;
+    property SWIFTIsNull: Boolean read GetSWIFTIsNull write SetSWIFTIsNull;
   end;
 
   { TDatosBancariosDataTableRules }
@@ -955,6 +973,14 @@ type
     procedure SetFECHA_MODIFICACIONValue(const aValue: DateTime); virtual;
     function GetFECHA_MODIFICACIONIsNull: Boolean; virtual;
     procedure SetFECHA_MODIFICACIONIsNull(const aValue: Boolean); virtual;
+    function GetIBANValue: String; virtual;
+    procedure SetIBANValue(const aValue: String); virtual;
+    function GetIBANIsNull: Boolean; virtual;
+    procedure SetIBANIsNull(const aValue: Boolean); virtual;
+    function GetSWIFTValue: String; virtual;
+    procedure SetSWIFTValue(const aValue: String); virtual;
+    function GetSWIFTIsNull: Boolean; virtual;
+    procedure SetSWIFTIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -975,6 +1001,10 @@ type
     property FECHA_ALTAIsNull: Boolean read GetFECHA_ALTAIsNull write SetFECHA_ALTAIsNull;
     property FECHA_MODIFICACION: DateTime read GetFECHA_MODIFICACIONValue write SetFECHA_MODIFICACIONValue;
     property FECHA_MODIFICACIONIsNull: Boolean read GetFECHA_MODIFICACIONIsNull write SetFECHA_MODIFICACIONIsNull;
+    property IBAN: String read GetIBANValue write SetIBANValue;
+    property IBANIsNull: Boolean read GetIBANIsNull write SetIBANIsNull;
+    property SWIFT: String read GetSWIFTValue write SetSWIFTValue;
+    property SWIFTIsNull: Boolean read GetSWIFTIsNull write SetSWIFTIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -984,7 +1014,7 @@ type
 
   { IClientes }
   IClientes = interface(IDAStronglyTypedDataTable)
-  ['{B59AAFC5-4C46-43B8-ACB9-F4517154DF67}']
+  ['{29C12D4A-9AC6-4116-A9AA-9C09F61CADA4}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1141,6 +1171,10 @@ type
     procedure SetFECHA_INGRESOValue(const aValue: DateTime);
     function GetFECHA_INGRESOIsNull: Boolean;
     procedure SetFECHA_INGRESOIsNull(const aValue: Boolean);
+    function GetNOMBRE_DE_EMPRESAValue: String;
+    procedure SetNOMBRE_DE_EMPRESAValue(const aValue: String);
+    function GetNOMBRE_DE_EMPRESAIsNull: Boolean;
+    procedure SetNOMBRE_DE_EMPRESAIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -1222,6 +1256,8 @@ type
     property FELICITACIONIsNull: Boolean read GetFELICITACIONIsNull write SetFELICITACIONIsNull;
     property FECHA_INGRESO: DateTime read GetFECHA_INGRESOValue write SetFECHA_INGRESOValue;
     property FECHA_INGRESOIsNull: Boolean read GetFECHA_INGRESOIsNull write SetFECHA_INGRESOIsNull;
+    property NOMBRE_DE_EMPRESA: String read GetNOMBRE_DE_EMPRESAValue write SetNOMBRE_DE_EMPRESAValue;
+    property NOMBRE_DE_EMPRESAIsNull: Boolean read GetNOMBRE_DE_EMPRESAIsNull write SetNOMBRE_DE_EMPRESAIsNull;
   end;
 
   { TClientesDataTableRules }
@@ -1386,6 +1422,10 @@ type
     procedure SetFECHA_INGRESOValue(const aValue: DateTime); virtual;
     function GetFECHA_INGRESOIsNull: Boolean; virtual;
     procedure SetFECHA_INGRESOIsNull(const aValue: Boolean); virtual;
+    function GetNOMBRE_DE_EMPRESAValue: String; virtual;
+    procedure SetNOMBRE_DE_EMPRESAValue(const aValue: String); virtual;
+    function GetNOMBRE_DE_EMPRESAIsNull: Boolean; virtual;
+    procedure SetNOMBRE_DE_EMPRESAIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -1466,6 +1506,8 @@ type
     property FELICITACIONIsNull: Boolean read GetFELICITACIONIsNull write SetFELICITACIONIsNull;
     property FECHA_INGRESO: DateTime read GetFECHA_INGRESOValue write SetFECHA_INGRESOValue;
     property FECHA_INGRESOIsNull: Boolean read GetFECHA_INGRESOIsNull write SetFECHA_INGRESOIsNull;
+    property NOMBRE_DE_EMPRESA: String read GetNOMBRE_DE_EMPRESAValue write SetNOMBRE_DE_EMPRESAValue;
+    property NOMBRE_DE_EMPRESAIsNull: Boolean read GetNOMBRE_DE_EMPRESAIsNull write SetNOMBRE_DE_EMPRESAIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -1475,7 +1517,7 @@ type
 
   { IProveedores }
   IProveedores = interface(IDAStronglyTypedDataTable)
-  ['{BC9D4BA3-7046-4B52-B4B9-12059B87077E}']
+  ['{7A49FD89-1990-4E69-8ABB-B22D2CE6B42C}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1966,7 +2008,7 @@ type
 
   { IEmpleados }
   IEmpleados = interface(IDAStronglyTypedDataTable)
-  ['{3E168A28-126B-4618-AF2D-47AEFEC9E931}']
+  ['{FF1389D6-C1EB-49D1-8314-4BBC54269DE3}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2397,7 +2439,7 @@ type
 
   { IDireccionesContacto }
   IDireccionesContacto = interface(IDAStronglyTypedDataTable)
-  ['{B18EFEC9-A76C-45ED-B72B-35B71DE5AC74}']
+  ['{F45D29A6-AE4F-483C-87BA-93D7D2AAA3EF}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2612,7 +2654,7 @@ type
 
   { IClientesDescuentos }
   IClientesDescuentos = interface(IDAStronglyTypedDataTable)
-  ['{63059A24-808E-4593-8A3A-ACE892D9AAB8}']
+  ['{561327C0-BFEB-4FDF-9589-EDDFD9C8C02E}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2695,7 +2737,7 @@ type
 
   { IGruposProveedor }
   IGruposProveedor = interface(IDAStronglyTypedDataTable)
-  ['{A892C931-CECA-4710-A94D-9C781488453E}']
+  ['{A580083B-52F4-4752-9170-2C9B72CDD72F}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2742,7 +2784,7 @@ type
 
   { IGruposEmpleado }
   IGruposEmpleado = interface(IDAStronglyTypedDataTable)
-  ['{6294A7B2-BD27-4C76-8F3B-1B5EA3C297BD}']
+  ['{689D930A-27A7-49A4-B16E-EE0666170588}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2789,7 +2831,7 @@ type
 
   { IContactos_Refresh }
   IContactos_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{81A9A821-0477-4BC1-A3ED-8E03C07B1426}']
+  ['{8E878C46-26E5-469F-89EF-FA789837341C}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3064,7 +3106,7 @@ type
 
   { IContratosEmpleados }
   IContratosEmpleados = interface(IDAStronglyTypedDataTable)
-  ['{1932323D-FE8C-44B4-BDB7-0457AEE5F4D9}']
+  ['{80955834-81AA-4B97-AC77-C16619D1A6A1}']
     { Property getters and setters }
     function GetCONTRATOValue: String;
     procedure SetCONTRATOValue(const aValue: String);
@@ -3099,7 +3141,7 @@ type
 
   { IDescripcionesProveedores }
   IDescripcionesProveedores = interface(IDAStronglyTypedDataTable)
-  ['{2589FD0E-6E35-4162-8772-7E2631F3E71A}']
+  ['{B4597483-C117-4EF1-AD33-4CC1E2B95B2F}']
     { Property getters and setters }
     function GetDESCRIPCION_PROVEEDORValue: String;
     procedure SetDESCRIPCION_PROVEEDORValue(const aValue: String);
@@ -3134,7 +3176,7 @@ type
 
   { IPersonalContacto }
   IPersonalContacto = interface(IDAStronglyTypedDataTable)
-  ['{7F089E93-7F99-423C-A934-C4EE7D453A9B}']
+  ['{B5F339D4-2E79-438E-9B12-8B97083F5F91}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -4035,6 +4077,48 @@ begin
     DataTable.Fields[idx_DatosBancariosFECHA_MODIFICACION].AsVariant := Null;
 end;
 
+function TDatosBancariosDataTableRules.GetIBANValue: String;
+begin
+  result := DataTable.Fields[idx_DatosBancariosIBAN].AsString;
+end;
+
+procedure TDatosBancariosDataTableRules.SetIBANValue(const aValue: String);
+begin
+  DataTable.Fields[idx_DatosBancariosIBAN].AsString := aValue;
+end;
+
+function TDatosBancariosDataTableRules.GetIBANIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_DatosBancariosIBAN].IsNull;
+end;
+
+procedure TDatosBancariosDataTableRules.SetIBANIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_DatosBancariosIBAN].AsVariant := Null;
+end;
+
+function TDatosBancariosDataTableRules.GetSWIFTValue: String;
+begin
+  result := DataTable.Fields[idx_DatosBancariosSWIFT].AsString;
+end;
+
+procedure TDatosBancariosDataTableRules.SetSWIFTValue(const aValue: String);
+begin
+  DataTable.Fields[idx_DatosBancariosSWIFT].AsString := aValue;
+end;
+
+function TDatosBancariosDataTableRules.GetSWIFTIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_DatosBancariosSWIFT].IsNull;
+end;
+
+procedure TDatosBancariosDataTableRules.SetSWIFTIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_DatosBancariosSWIFT].AsVariant := Null;
+end;
+
 
 { TClientesDataTableRules }
 constructor TClientesDataTableRules.Create(aDataTable: TDADataTable);
@@ -4873,6 +4957,27 @@ begin
     DataTable.Fields[idx_ClientesFECHA_INGRESO].AsVariant := Null;
 end;
 
+function TClientesDataTableRules.GetNOMBRE_DE_EMPRESAValue: String;
+begin
+  result := DataTable.Fields[idx_ClientesNOMBRE_DE_EMPRESA].AsString;
+end;
+
+procedure TClientesDataTableRules.SetNOMBRE_DE_EMPRESAValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ClientesNOMBRE_DE_EMPRESA].AsString := aValue;
+end;
+
+function TClientesDataTableRules.GetNOMBRE_DE_EMPRESAIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ClientesNOMBRE_DE_EMPRESA].IsNull;
+end;
+
+procedure TClientesDataTableRules.SetNOMBRE_DE_EMPRESAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ClientesNOMBRE_DE_EMPRESA].AsVariant := Null;
+end;
+
 
 { TProveedoresDataTableRules }
 constructor TProveedoresDataTableRules.Create(aDataTable: TDADataTable);

Source/Modulos/Contactos/Model/schContactosServer_Intf.pas

@@ -9,25 +9,25 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_ContactosDelta = '{886E86A0-D4BF-4D1B-BD9D-44B85DF6DED6}';
+  RID_ContactosDelta = '{6B1BA107-8406-4C7C-B530-84A7D176674E}';
-  RID_GruposClienteDelta = '{822E5984-3550-48B6-96DF-464D42A68A54}';
+  RID_GruposClienteDelta = '{8E804E42-15E8-45AE-BAFD-D54151C32264}';
-  RID_DatosBancariosDelta = '{4656BA5E-4D68-49EE-9D4B-DF38FB57FBE7}';
+  RID_DatosBancariosDelta = '{6FEF7265-F082-4006-9972-0B37C50CC6F4}';
-  RID_ClientesDelta = '{8EC0A982-2CFE-4434-9CAB-12DBE4E8AE72}';
+  RID_ClientesDelta = '{AF484759-AF12-46E4-9DF9-88424C674B1A}';
-  RID_ProveedoresDelta = '{33EB3E3C-ECC8-442A-91BE-D9E401995049}';
+  RID_ProveedoresDelta = '{BCE4908B-3961-4A5B-917D-AC6901990D43}';
-  RID_EmpleadosDelta = '{B3390413-C227-499A-8298-D8B04E8D2E57}';
+  RID_EmpleadosDelta = '{E1E4BDAD-C26F-463D-8BC1-2B0CFF71FBCB}';
-  RID_DireccionesContactoDelta = '{950070DE-22F7-48F3-B280-479D36251736}';
+  RID_DireccionesContactoDelta = '{FE67BACA-2683-443C-9581-4B1F5C821A0A}';
-  RID_ClientesDescuentosDelta = '{CCD7FCFA-0A27-4E1D-8243-CAC24C626854}';
+  RID_ClientesDescuentosDelta = '{C03006BE-8743-4487-AD05-CB07D7D007F3}';
-  RID_GruposProveedorDelta = '{016C3DFC-7F72-4722-9DF0-ED2A60C22D7A}';
+  RID_GruposProveedorDelta = '{F170404D-3215-4690-95C5-0BE9F98501F0}';
-  RID_GruposEmpleadoDelta = '{B525392E-6148-4638-884F-16976E0C7F19}';
+  RID_GruposEmpleadoDelta = '{17A99DE6-BBFF-4DC0-A278-1B38FB856A3C}';
-  RID_Contactos_RefreshDelta = '{16A2B77E-BF46-4AF8-8D07-026A8BD18212}';
+  RID_Contactos_RefreshDelta = '{DDC7B2A5-DA86-49B9-AE48-0FD881F0AAD6}';
-  RID_ContratosEmpleadosDelta = '{E0E1F72C-1FBB-47BC-B7DB-452A87582646}';
+  RID_ContratosEmpleadosDelta = '{76014FBE-D878-4245-A7AE-478A32B5E017}';
-  RID_DescripcionesProveedoresDelta = '{BA1C3AFA-7305-44F0-A3A9-3CF71991DB93}';
+  RID_DescripcionesProveedoresDelta = '{1202BA88-1E33-423B-8493-5CB061B2310C}';
-  RID_PersonalContactoDelta = '{EE009FFC-8BA2-4A49-ACCE-4B7C0837427D}';
+  RID_PersonalContactoDelta = '{9CB6C3E6-A3AD-49EA-926C-35F18E990B8B}';
 
 type
   { IContactosDelta }
   IContactosDelta = interface(IContactos)
-  ['{886E86A0-D4BF-4D1B-BD9D-44B85DF6DED6}']
+  ['{6B1BA107-8406-4C7C-B530-84A7D176674E}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -326,7 +326,7 @@ type
 
   { IGruposClienteDelta }
   IGruposClienteDelta = interface(IGruposCliente)
-  ['{822E5984-3550-48B6-96DF-464D42A68A54}']
+  ['{8E804E42-15E8-45AE-BAFD-D54151C32264}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -372,7 +372,7 @@ type
 
   { IDatosBancariosDelta }
   IDatosBancariosDelta = interface(IDatosBancarios)
-  ['{4656BA5E-4D68-49EE-9D4B-DF38FB57FBE7}']
+  ['{6FEF7265-F082-4006-9972-0B37C50CC6F4}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -383,6 +383,8 @@ type
     function GetOldCUENTAValue : String;
     function GetOldFECHA_ALTAValue : DateTime;
     function GetOldFECHA_MODIFICACIONValue : DateTime;
+    function GetOldIBANValue : String;
+    function GetOldSWIFTValue : String;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -394,6 +396,8 @@ type
     property OldCUENTA : String read GetOldCUENTAValue;
     property OldFECHA_ALTA : DateTime read GetOldFECHA_ALTAValue;
     property OldFECHA_MODIFICACION : DateTime read GetOldFECHA_MODIFICACIONValue;
+    property OldIBAN : String read GetOldIBANValue;
+    property OldSWIFT : String read GetOldSWIFTValue;
   end;
 
   { TDatosBancariosBusinessProcessorRules }
@@ -455,6 +459,18 @@ type
     function GetOldFECHA_MODIFICACIONIsNull: Boolean; virtual;
     procedure SetFECHA_MODIFICACIONValue(const aValue: DateTime); virtual;
     procedure SetFECHA_MODIFICACIONIsNull(const aValue: Boolean); virtual;
+    function GetIBANValue: String; virtual;
+    function GetIBANIsNull: Boolean; virtual;
+    function GetOldIBANValue: String; virtual;
+    function GetOldIBANIsNull: Boolean; virtual;
+    procedure SetIBANValue(const aValue: String); virtual;
+    procedure SetIBANIsNull(const aValue: Boolean); virtual;
+    function GetSWIFTValue: String; virtual;
+    function GetSWIFTIsNull: Boolean; virtual;
+    function GetOldSWIFTValue: String; virtual;
+    function GetOldSWIFTIsNull: Boolean; virtual;
+    procedure SetSWIFTValue(const aValue: String); virtual;
+    procedure SetSWIFTIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -493,6 +509,14 @@ type
     property FECHA_MODIFICACIONIsNull : Boolean read GetFECHA_MODIFICACIONIsNull write SetFECHA_MODIFICACIONIsNull;
     property OldFECHA_MODIFICACION : DateTime read GetOldFECHA_MODIFICACIONValue;
     property OldFECHA_MODIFICACIONIsNull : Boolean read GetOldFECHA_MODIFICACIONIsNull;
+    property IBAN : String read GetIBANValue write SetIBANValue;
+    property IBANIsNull : Boolean read GetIBANIsNull write SetIBANIsNull;
+    property OldIBAN : String read GetOldIBANValue;
+    property OldIBANIsNull : Boolean read GetOldIBANIsNull;
+    property SWIFT : String read GetSWIFTValue write SetSWIFTValue;
+    property SWIFTIsNull : Boolean read GetSWIFTIsNull write SetSWIFTIsNull;
+    property OldSWIFT : String read GetOldSWIFTValue;
+    property OldSWIFTIsNull : Boolean read GetOldSWIFTIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -502,7 +526,7 @@ type
 
   { IClientesDelta }
   IClientesDelta = interface(IClientes)
-  ['{8EC0A982-2CFE-4434-9CAB-12DBE4E8AE72}']
+  ['{AF484759-AF12-46E4-9DF9-88424C674B1A}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -543,6 +567,7 @@ type
     function GetOldDESCUENTOValue : Currency;
     function GetOldFELICITACIONValue : SmallInt;
     function GetOldFECHA_INGRESOValue : DateTime;
+    function GetOldNOMBRE_DE_EMPRESAValue : String;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -584,6 +609,7 @@ type
     property OldDESCUENTO : Currency read GetOldDESCUENTOValue;
     property OldFELICITACION : SmallInt read GetOldFELICITACIONValue;
     property OldFECHA_INGRESO : DateTime read GetOldFECHA_INGRESOValue;
+    property OldNOMBRE_DE_EMPRESA : String read GetOldNOMBRE_DE_EMPRESAValue;
   end;
 
   { TClientesBusinessProcessorRules }
@@ -826,6 +852,12 @@ type
     function GetOldFECHA_INGRESOIsNull: Boolean; virtual;
     procedure SetFECHA_INGRESOValue(const aValue: DateTime); virtual;
     procedure SetFECHA_INGRESOIsNull(const aValue: Boolean); virtual;
+    function GetNOMBRE_DE_EMPRESAValue: String; virtual;
+    function GetNOMBRE_DE_EMPRESAIsNull: Boolean; virtual;
+    function GetOldNOMBRE_DE_EMPRESAValue: String; virtual;
+    function GetOldNOMBRE_DE_EMPRESAIsNull: Boolean; virtual;
+    procedure SetNOMBRE_DE_EMPRESAValue(const aValue: String); virtual;
+    procedure SetNOMBRE_DE_EMPRESAIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -984,6 +1016,10 @@ type
     property FECHA_INGRESOIsNull : Boolean read GetFECHA_INGRESOIsNull write SetFECHA_INGRESOIsNull;
     property OldFECHA_INGRESO : DateTime read GetOldFECHA_INGRESOValue;
     property OldFECHA_INGRESOIsNull : Boolean read GetOldFECHA_INGRESOIsNull;
+    property NOMBRE_DE_EMPRESA : String read GetNOMBRE_DE_EMPRESAValue write SetNOMBRE_DE_EMPRESAValue;
+    property NOMBRE_DE_EMPRESAIsNull : Boolean read GetNOMBRE_DE_EMPRESAIsNull write SetNOMBRE_DE_EMPRESAIsNull;
+    property OldNOMBRE_DE_EMPRESA : String read GetOldNOMBRE_DE_EMPRESAValue;
+    property OldNOMBRE_DE_EMPRESAIsNull : Boolean read GetOldNOMBRE_DE_EMPRESAIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -993,7 +1029,7 @@ type
 
   { IProveedoresDelta }
   IProveedoresDelta = interface(IProveedores)
-  ['{33EB3E3C-ECC8-442A-91BE-D9E401995049}']
+  ['{BCE4908B-3961-4A5B-917D-AC6901990D43}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -1484,7 +1520,7 @@ type
 
   { IEmpleadosDelta }
   IEmpleadosDelta = interface(IEmpleados)
-  ['{B3390413-C227-499A-8298-D8B04E8D2E57}']
+  ['{E1E4BDAD-C26F-463D-8BC1-2B0CFF71FBCB}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -1919,7 +1955,7 @@ type
 
   { IDireccionesContactoDelta }
   IDireccionesContactoDelta = interface(IDireccionesContacto)
-  ['{950070DE-22F7-48F3-B280-479D36251736}']
+  ['{FE67BACA-2683-443C-9581-4B1F5C821A0A}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -2134,7 +2170,7 @@ type
 
   { IClientesDescuentosDelta }
   IClientesDescuentosDelta = interface(IClientesDescuentos)
-  ['{CCD7FCFA-0A27-4E1D-8243-CAC24C626854}']
+  ['{C03006BE-8743-4487-AD05-CB07D7D007F3}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CLIENTEValue : Integer;
@@ -2216,7 +2252,7 @@ type
 
   { IGruposProveedorDelta }
   IGruposProveedorDelta = interface(IGruposProveedor)
-  ['{016C3DFC-7F72-4722-9DF0-ED2A60C22D7A}']
+  ['{F170404D-3215-4690-95C5-0BE9F98501F0}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -2262,7 +2298,7 @@ type
 
   { IGruposEmpleadoDelta }
   IGruposEmpleadoDelta = interface(IGruposEmpleado)
-  ['{B525392E-6148-4638-884F-16976E0C7F19}']
+  ['{17A99DE6-BBFF-4DC0-A278-1B38FB856A3C}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -2308,7 +2344,7 @@ type
 
   { IContactos_RefreshDelta }
   IContactos_RefreshDelta = interface(IContactos_Refresh)
-  ['{16A2B77E-BF46-4AF8-8D07-026A8BD18212}']
+  ['{DDC7B2A5-DA86-49B9-AE48-0FD881F0AAD6}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldNIF_CIFValue : String;
@@ -2583,7 +2619,7 @@ type
 
   { IContratosEmpleadosDelta }
   IContratosEmpleadosDelta = interface(IContratosEmpleados)
-  ['{E0E1F72C-1FBB-47BC-B7DB-452A87582646}']
+  ['{76014FBE-D878-4245-A7AE-478A32B5E017}']
     { Property getters and setters }
     function GetOldCONTRATOValue : String;
 
@@ -2617,7 +2653,7 @@ type
 
   { IDescripcionesProveedoresDelta }
   IDescripcionesProveedoresDelta = interface(IDescripcionesProveedores)
-  ['{BA1C3AFA-7305-44F0-A3A9-3CF71991DB93}']
+  ['{1202BA88-1E33-423B-8493-5CB061B2310C}']
     { Property getters and setters }
     function GetOldDESCRIPCION_PROVEEDORValue : String;
 
@@ -2651,7 +2687,7 @@ type
 
   { IPersonalContactoDelta }
   IPersonalContactoDelta = interface(IPersonalContacto)
-  ['{EE009FFC-8BA2-4A49-ACCE-4B7C0837427D}']
+  ['{9CB6C3E6-A3AD-49EA-926C-35F18E990B8B}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -3893,6 +3929,68 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_DatosBancariosFECHA_MODIFICACION] := Null;
 end;
 
+function TDatosBancariosBusinessProcessorRules.GetIBANValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_DatosBancariosIBAN];
+end;
+
+function TDatosBancariosBusinessProcessorRules.GetIBANIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DatosBancariosIBAN]);
+end;
+
+function TDatosBancariosBusinessProcessorRules.GetOldIBANValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_DatosBancariosIBAN];
+end;
+
+function TDatosBancariosBusinessProcessorRules.GetOldIBANIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DatosBancariosIBAN]);
+end;
+
+procedure TDatosBancariosBusinessProcessorRules.SetIBANValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_DatosBancariosIBAN] := aValue;
+end;
+
+procedure TDatosBancariosBusinessProcessorRules.SetIBANIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_DatosBancariosIBAN] := Null;
+end;
+
+function TDatosBancariosBusinessProcessorRules.GetSWIFTValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_DatosBancariosSWIFT];
+end;
+
+function TDatosBancariosBusinessProcessorRules.GetSWIFTIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_DatosBancariosSWIFT]);
+end;
+
+function TDatosBancariosBusinessProcessorRules.GetOldSWIFTValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_DatosBancariosSWIFT];
+end;
+
+function TDatosBancariosBusinessProcessorRules.GetOldSWIFTIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_DatosBancariosSWIFT]);
+end;
+
+procedure TDatosBancariosBusinessProcessorRules.SetSWIFTValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_DatosBancariosSWIFT] := aValue;
+end;
+
+procedure TDatosBancariosBusinessProcessorRules.SetSWIFTIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_DatosBancariosSWIFT] := Null;
+end;
+
 
 { TClientesBusinessProcessorRules }
 constructor TClientesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);
@@ -5122,6 +5220,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesFECHA_INGRESO] := Null;
 end;
 
+function TClientesBusinessProcessorRules.GetNOMBRE_DE_EMPRESAValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesNOMBRE_DE_EMPRESA];
+end;
+
+function TClientesBusinessProcessorRules.GetNOMBRE_DE_EMPRESAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesNOMBRE_DE_EMPRESA]);
+end;
+
+function TClientesBusinessProcessorRules.GetOldNOMBRE_DE_EMPRESAValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesNOMBRE_DE_EMPRESA];
+end;
+
+function TClientesBusinessProcessorRules.GetOldNOMBRE_DE_EMPRESAIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesNOMBRE_DE_EMPRESA]);
+end;
+
+procedure TClientesBusinessProcessorRules.SetNOMBRE_DE_EMPRESAValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesNOMBRE_DE_EMPRESA] := aValue;
+end;
+
+procedure TClientesBusinessProcessorRules.SetNOMBRE_DE_EMPRESAIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesNOMBRE_DE_EMPRESA] := Null;
+end;
+
 
 { TProveedoresBusinessProcessorRules }
 constructor TProveedoresBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

Source/Modulos/Contactos/Model/uBizClientesServer.pas

@@ -98,6 +98,7 @@ begin
       ParamByName('VENCIMIENTO_FACTURAS_3').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_3];
       ParamByName('FELICITACION').Value := aChange.NewValueByName[fld_ClientesFELICITACION];
       ParamByName('FECHA_INGRESO').Value := aChange.NewValueByName[fld_ClientesFECHA_INGRESO];
+      ParamByName('NOMBRE_DE_EMPRESA').Value := aChange.NewValueByName[fld_ClientesNOMBRE_DE_EMPRESA];      
       Execute;
     end;
   finally
@@ -139,7 +140,8 @@ begin
       ParamByName('VENCIMIENTO_FACTURAS_2').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_2];
       ParamByName('VENCIMIENTO_FACTURAS_3').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_3];
       ParamByName('FELICITACION').Value := aChange.NewValueByName[fld_ClientesFELICITACION];
-      ParamByName('FECHA_INGRESO').Value := aChange.NewValueByName[fld_ClientesFECHA_INGRESO];           
+      ParamByName('FECHA_INGRESO').Value := aChange.NewValueByName[fld_ClientesFECHA_INGRESO];
+      ParamByName('NOMBRE_DE_EMPRESA').Value := aChange.NewValueByName[fld_ClientesNOMBRE_DE_EMPRESA];                 
 
       Execute;
     end;

Source/Modulos/Contactos/Model/uBizContactos.pas

@@ -96,6 +96,9 @@ type
     function GetFELICITACIONValue: Integer;
     procedure SetFELICITACIONValue(const aValue: Integer);
 
+    function GetNOMBRE_DE_EMPRESAValue: String;
+    procedure SetNOMBRE_DE_EMPRESAValue(const aValue: String);
+
     property GRUPO_CLIENTE: String read GetGRUPO_CLIENTEValue write SetGRUPO_CLIENTEValue;
     property NOMBRE_COMERCIAL: String read GetNOMBRE_COMERCIALValue write SetNOMBRE_COMERCIALValue;
     property VENCIMIENTO_FACTURAS_1: Smallint read GetVENCIMIENTO_FACTURAS_1Value write SetVENCIMIENTO_FACTURAS_1Value;
@@ -110,6 +113,7 @@ type
     property TIENDA_WEB: Integer read GetTIENDA_WEBValue write SetTIENDA_WEBValue;
     property DESCUENTO: Double read GetDESCUENTOValue write SetDESCUENTOValue;
     property FELICITACION: Integer read GetFELICITACIONValue write SetFELICITACIONValue;
+    property NOMBRE_DE_EMPRESAL: String read GetNOMBRE_DE_EMPRESAValue write SetNOMBRE_DE_EMPRESAValue;
   end;
 
   IBizProveedor = interface (IBizContacto)
@@ -320,6 +324,10 @@ type
 
     function GetFELICITACIONValue: Integer;
     procedure SetFELICITACIONValue(const aValue: Integer);
+
+    function GetNOMBRE_DE_EMPRESAValue: String;
+    procedure SetNOMBRE_DE_EMPRESAValue(const aValue: String);
+
   public
     procedure IniciarValoresContactoNuevo; override;
     constructor Create(aDataTable: TDADataTable); override;
@@ -339,6 +347,7 @@ type
     property TIENDA_WEB: Integer read GetTIENDA_WEBValue write SetTIENDA_WEBValue;
     property DESCUENTO: Double read GetDESCUENTOValue write SetDESCUENTOValue;
     property FELICITACION: Integer read GetFELICITACIONValue write SetFELICITACIONValue;
+    property NOMBRE_DE_EMPRESA: String read GetNOMBRE_DE_EMPRESAValue write SetNOMBRE_DE_EMPRESAValue;    
   end;
 
 
@@ -617,6 +626,11 @@ begin
   result := DataTable.Fields[idx_ClientesNOMBRE_COMERCIAL].AsString;
 end;
 
+function TBizCliente.GetNOMBRE_DE_EMPRESAValue: String;
+begin
+  result := DataTable.Fields[idx_ClientesNOMBRE_DE_EMPRESA].AsString;
+end;
+
 procedure TBizCliente.SetBLOQUEADOValue(const aValue: Integer);
 begin
   DataTable.Fields[idx_ClientesBLOQUEADO].AsInteger := aValue;
@@ -663,6 +677,11 @@ begin
   DataTable.Fields[idx_ClientesNOMBRE_COMERCIAL].AsString := aValue;
 end;
 
+procedure TBizCliente.SetNOMBRE_DE_EMPRESAValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ClientesNOMBRE_DE_EMPRESA].AsString := aValue;
+end;
+
 function TBizCliente.GetRECARGO_EQUIVALENCIAValue: Integer;
 begin
   Result := DataTable.Fields[idx_ClientesRECARGO_EQUIVALENCIA].AsInteger;
@@ -734,6 +753,7 @@ begin
   REGIMEN_IVA := CLIENTE_REGIMEN_IVA;
   ID_FORMA_PAGO := AppFactuGES.EmpresaActiva.ID_FORMA_PAGO;
   ID_TIPO_IVA := AppFactuGES.EmpresaActiva.ID_TIPO_IVA;
+  NOMBRE_DE_EMPRESA := AppFactuGES.EmpresaActiva.NOMBRE;
 end;
 
 { TBizProveedor }

Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm

@@ -328,6 +328,14 @@ object srvContactos: TsrvContactos
               item
                 DatasetField = 'FECHA_MODIFICACION'
                 TableField = 'FECHA_MODIFICACION'
+              end
+              item
+                DatasetField = 'IBAN'
+                TableField = 'IBAN'
+              end
+              item
+                DatasetField = 'SWIFT'
+                TableField = 'SWIFT'
               end>
           end>
         Name = 'DatosBancarios'
@@ -382,6 +390,16 @@ object srvContactos: TsrvContactos
           item
             Name = 'FECHA_MODIFICACION'
             DataType = datDateTime
+          end
+          item
+            Name = 'IBAN'
+            DataType = datString
+            Size = 255
+          end
+          item
+            Name = 'SWIFT'
+            DataType = datString
+            Size = 255
           end>
       end
       item
@@ -547,6 +565,10 @@ object srvContactos: TsrvContactos
               item
                 DatasetField = 'FECHA_INGRESO'
                 TableField = 'FECHA_INGRESO'
+              end
+              item
+                DatasetField = 'NOMBRE_DE_EMPRESA'
+                TableField = 'NOMBRE_DE_EMPRESA'
               end>
           end>
         Name = 'Clientes'
@@ -764,6 +786,11 @@ object srvContactos: TsrvContactos
           item
             Name = 'FECHA_INGRESO'
             DataType = datDateTime
+          end
+          item
+            Name = 'NOMBRE_DE_EMPRESA'
+            DataType = datString
+            Size = 255
           end>
       end
       item
@@ -2508,48 +2535,53 @@ object srvContactos: TsrvContactos
             DataType = datAutoInc
             GeneratorName = 'GEN_CONTACTOS_DATOS_BANCO_ID'
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'ID_CONTACTO'
             DataType = datInteger
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'TITULAR'
             DataType = datString
             Size = 255
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'ENTIDAD'
             DataType = datString
             Size = 15
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'SUCURSAL'
             DataType = datString
             Size = 15
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'DC'
             DataType = datString
             Size = 15
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'CUENTA'
             DataType = datString
             Size = 15
             Value = ''
-            ParamType = daptInput
+          end
+          item
+            Name = 'IBAN'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'SWIFT'
+            DataType = datString
+            Size = 255
+            Value = ''
           end>
         Statements = <
           item
@@ -2557,8 +2589,9 @@ object srvContactos: TsrvContactos
             TargetTable = 'CONTACTOS_DATOS_BANCO'
             SQL = 
               'INSERT'#10'  INTO CONTACTOS_DATOS_BANCO'#10'    (ID, ID_CONTACTO, TITULA' +
-              'R, ENTIDAD, SUCURSAL, DC, CUENTA)'#10'  VALUES'#10'    (:ID, :ID_CONTACT' +
+              'R, ENTIDAD, SUCURSAL, DC, CUENTA, IBAN, SWIFT)'#10'  VALUES'#10'    (:ID' +
-              'O, :TITULAR, :ENTIDAD, :SUCURSAL, :DC, :CUENTA)'
+              ', :ID_CONTACTO, :TITULAR, :ENTIDAD, :SUCURSAL, :DC, :CUENTA, :IB' +
+              'AN, :SWIFT)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -2590,48 +2623,52 @@ object srvContactos: TsrvContactos
             Name = 'ID_CONTACTO'
             DataType = datInteger
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'TITULAR'
             DataType = datString
             Size = 255
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'ENTIDAD'
             DataType = datString
             Size = 15
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'SUCURSAL'
             DataType = datString
             Size = 15
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'DC'
             DataType = datString
             Size = 15
             Value = ''
-            ParamType = daptInput
           end
           item
             Name = 'CUENTA'
             DataType = datString
             Size = 15
             Value = ''
-            ParamType = daptInput
+          end
+          item
+            Name = 'IBAN'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
+          item
+            Name = 'SWIFT'
+            DataType = datString
+            Size = 255
+            Value = ''
           end
           item
             Name = 'OLD_ID'
-            DataType = datInteger
             Value = ''
-            ParamType = daptInput
           end>
         Statements = <
           item
@@ -2640,8 +2677,8 @@ object srvContactos: TsrvContactos
             SQL = 
               'UPDATE CONTACTOS_DATOS_BANCO'#10'  SET '#10'    ID_CONTACTO = :ID_CONTAC' +
               'TO, '#10'    TITULAR = :TITULAR, '#10'    ENTIDAD = :ENTIDAD, '#10'    SUCUR' +
-              'SAL = :SUCURSAL, '#10'    DC = :DC, '#10'    CUENTA = :CUENTA'#10'  WHERE'#10'  ' +
+              'SAL = :SUCURSAL, '#10'    DC = :DC, '#10'    CUENTA = :CUENTA,'#10'    IBAN ' +
-              '  (ID = :OLD_ID)'
+              '= :IBAN,'#10'    SWIFT = :SWIFT'#10'  WHERE'#10'    (ID = :OLD_ID)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -2868,6 +2905,12 @@ object srvContactos: TsrvContactos
             Name = 'FECHA_INGRESO'
             DataType = datDateTime
             Value = ''
+          end
+          item
+            Name = 'NOMBRE_DE_EMPRESA'
+            DataType = datString
+            Size = 255
+            Value = ''
           end>
         Statements = <
           item
@@ -2879,12 +2922,12 @@ object srvContactos: TsrvContactos
               'UEO, REGIMEN_IVA, ID_TIPO_IVA, ID_FORMA_PAGO,'#10'     TIENDA_WEB, C' +
               'ODIGO_ASIGNADO, DESCUENTO,'#10'     VENCIMIENTO_FACTURAS_1, VENCIMIE' +
               'NTO_FACTURAS_2, VENCIMIENTO_FACTURAS_3,'#10'     FELICITACION, FECHA' +
-              '_INGRESO)'#10'  VALUES'#10'    (:ID_CLIENTE, :GRUPO_CLIENTE, :RECARGO_EQ' +
+              '_INGRESO, NOMBRE_DE_EMPRESA)'#10'  VALUES'#10'    (:ID_CLIENTE, :GRUPO_C' +
-              'UIVALENCIA, :NOMBRE_COMERCIAL,'#10'     :BLOQUEADO, :MOTIVO_BLOQUEO,' +
+              'LIENTE, :RECARGO_EQUIVALENCIA, :NOMBRE_COMERCIAL,'#10'     :BLOQUEAD' +
-              ' :REGIMEN_IVA, :ID_TIPO_IVA, :ID_FORMA_PAGO,'#10'     :TIENDA_WEB, :' +
+              'O, :MOTIVO_BLOQUEO, :REGIMEN_IVA, :ID_TIPO_IVA, :ID_FORMA_PAGO,'#10 +
-              'CODIGO_ASIGNADO, :DESCUENTO,'#10'     :VENCIMIENTO_FACTURAS_1, :VENC' +
+              '     :TIENDA_WEB, :CODIGO_ASIGNADO, :DESCUENTO,'#10'     :VENCIMIENT' +
-              'IMIENTO_FACTURAS_2, :VENCIMIENTO_FACTURAS_3,'#10'     :FELICITACION,' +
+              'O_FACTURAS_1, :VENCIMIENTO_FACTURAS_2, :VENCIMIENTO_FACTURAS_3,'#10 +
-              ' :FECHA_INGRESO)'#10
+              '     :FELICITACION, :FECHA_INGRESO, :NOMBRE_DE_EMPRESA)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -3002,6 +3045,12 @@ object srvContactos: TsrvContactos
             DataType = datDateTime
             Value = ''
           end
+          item
+            Name = 'NOMBRE_DE_EMPRESA'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
           item
             Name = 'OLD_ID_CLIENTE'
             Value = ''
@@ -3021,8 +3070,9 @@ object srvContactos: TsrvContactos
               'TO,'#10'    VENCIMIENTO_FACTURAS_1 = :VENCIMIENTO_FACTURAS_1,'#10'    VE' +
               'NCIMIENTO_FACTURAS_2 = :VENCIMIENTO_FACTURAS_2,'#10'    VENCIMIENTO_' +
               'FACTURAS_3 = :VENCIMIENTO_FACTURAS_3,'#10'    FELICITACION = :FELICI' +
-              'TACION,'#10'    FECHA_INGRESO = :FECHA_INGRESO'#10'  WHERE'#10'    (ID_CLIEN' +
+              'TACION,'#10'    FECHA_INGRESO = :FECHA_INGRESO,'#10'    NOMBRE_DE_EMPRES' +
-              'TE = :OLD_ID_CLIENTE)'#10
+              'A = :NOMBRE_DE_EMPRESA'#10'  WHERE'#10'    (ID_CLIENTE = :OLD_ID_CLIENTE' +
+              ')'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

Source/Modulos/Contactos/Views/uEditorDatoBancario.dfm

@@ -4,24 +4,25 @@ object fEditorDatoBancario: TfEditorDatoBancario
   ActiveControl = eTitular
   BorderStyle = bsDialog
   Caption = 'Cambiar datos bancarios'
-  ClientHeight = 193
+  ClientHeight = 264
-  ClientWidth = 426
+  ClientWidth = 435
   Color = clBtnFace
   ParentFont = True
   OldCreateOrder = True
   Position = poOwnerFormCenter
   DesignSize = (
-    426
+    435
-    193)
+    264)
   PixelsPerInch = 96
   TextHeight = 13
   object Bevel1: TBevel
     Left = 8
     Top = 8
-    Width = 329
+    Width = 338
-    Height = 177
+    Height = 249
     Anchors = [akLeft, akTop, akRight]
     Shape = bsFrame
+    ExplicitWidth = 352
   end
   object Label2: TLabel
     Left = 20
@@ -63,8 +64,24 @@ object fEditorDatoBancario: TfEditorDatoBancario
     AutoSize = False
     Caption = 'C'#243'digo de cuenta:'
   end
+  object Iban: TLabel
+    Left = 20
+    Top = 191
+    Width = 110
+    Height = 13
+    AutoSize = False
+    Caption = 'IBAN:'
+  end
+  object Label1: TLabel
+    Left = 20
+    Top = 218
+    Width = 110
+    Height = 13
+    AutoSize = False
+    Caption = 'SWIFT:'
+  end
   object OKBtn: TButton
-    Left = 343
+    Left = 352
     Top = 7
     Width = 75
     Height = 25
@@ -72,9 +89,10 @@ object fEditorDatoBancario: TfEditorDatoBancario
     Caption = '&Aceptar'
     ModalResult = 1
     TabOrder = 0
+    ExplicitLeft = 343
   end
   object CancelBtn: TButton
-    Left = 343
+    Left = 352
     Top = 38
     Width = 75
     Height = 25
@@ -83,6 +101,7 @@ object fEditorDatoBancario: TfEditorDatoBancario
     Caption = '&Cancelar'
     ModalResult = 2
     TabOrder = 1
+    ExplicitLeft = 343
   end
   object eEntidad: TDBEdit
     Left = 136
@@ -121,7 +140,7 @@ object fEditorDatoBancario: TfEditorDatoBancario
     TabOrder = 2
   end
   object eCuenta: TDBEdit
-    Left = 136
+    Left = 135
     Top = 148
     Width = 191
     Height = 21
@@ -129,6 +148,24 @@ object fEditorDatoBancario: TfEditorDatoBancario
     DataSource = dsDatosBancarios
     TabOrder = 6
   end
+  object eIBAN: TDBEdit
+    Left = 135
+    Top = 188
+    Width = 191
+    Height = 21
+    DataField = 'IBAN'
+    DataSource = dsDatosBancarios
+    TabOrder = 7
+  end
+  object eSWIFT: TDBEdit
+    Left = 135
+    Top = 215
+    Width = 191
+    Height = 21
+    DataField = 'SWIFT'
+    DataSource = dsDatosBancarios
+    TabOrder = 8
+  end
   object dsDatosBancarios: TDADataSource
     Left = 352
     Top = 72

Source/Modulos/Contactos/Views/uEditorDatoBancario.pas

@@ -23,6 +23,10 @@ type
     eTitular: TDBEdit;
     Label6: TLabel;
     eCuenta: TDBEdit;
+    eIBAN: TDBEdit;
+    Iban: TLabel;
+    Label1: TLabel;
+    eSWIFT: TDBEdit;
   protected
     FController : IDatosBancariosContactoController;
     FDatosBanco : IBizContactosDatosBancarios;

Source/Modulos/Contactos/Views/uViewCliente.dfm

@@ -11,31 +11,18 @@ inherited frViewCliente: TfrViewCliente
     ExplicitWidth = 777
     ExplicitHeight = 506
     inherited PngSpeedButton1: TPngSpeedButton
-      Left = 732
+      Left = 715
-      ExplicitLeft = 732
+      ExplicitLeft = 715
     end
     inherited PngSpeedButton2: TPngSpeedButton
-      Left = 732
+      Left = 715
-      ExplicitLeft = 732
+      ExplicitLeft = 715
     end
     inherited PngSpeedButton3: TPngSpeedButton
-      Left = 732
+      Left = 715
-      ExplicitLeft = 732
+      ExplicitLeft = 715
     end
     inherited eCalle: TcxDBTextEdit
-      Left = 132
-      Top = 277
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 9
-      ExplicitLeft = 132
-      ExplicitTop = 277
-      ExplicitWidth = 260
-      Width = 260
-    end
-    inherited cbProvincia: TcxDBComboBox
       Left = 132
       Top = 304
       Style.LookAndFeel.SkinName = ''
@@ -45,41 +32,54 @@ inherited frViewCliente: TfrViewCliente
       TabOrder = 10
       ExplicitLeft = 132
       ExplicitTop = 304
-      ExplicitWidth = 159
+      ExplicitWidth = 260
-      Width = 159
+      Width = 260
     end
-    inherited cbPoblacion: TcxDBComboBox
+    inherited cbProvincia: TcxDBComboBox
       Left = 132
       Top = 331
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 12
+      TabOrder = 11
       ExplicitLeft = 132
       ExplicitTop = 331
+      ExplicitWidth = 159
+      Width = 159
+    end
+    inherited cbPoblacion: TcxDBComboBox
+      Left = 132
+      Top = 358
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 13
+      ExplicitLeft = 132
+      ExplicitTop = 358
       ExplicitWidth = 260
       Width = 260
     end
     inherited eCodigoPostal: TcxDBTextEdit
-      Left = 384
+      Left = 374
-      Top = 304
+      Top = 331
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 11
+      TabOrder = 12
-      ExplicitLeft = 384
+      ExplicitLeft = 374
-      ExplicitTop = 304
+      ExplicitTop = 331
     end
     inherited eObservaciones: TcxDBMemo
-      Top = 415
+      Top = 442
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 22
+      TabOrder = 23
-      ExplicitTop = 415
+      ExplicitTop = 442
       ExplicitWidth = 733
       ExplicitHeight = 69
       Height = 69
@@ -107,7 +107,7 @@ inherited frViewCliente: TfrViewCliente
     end
     object cbClienteBloqueado: TcxDBCheckBox [9]
       Left = 22
-      Top = 193
+      Top = 220
       Action = actBloqueoCliente
       DataBinding.DataField = 'BLOQUEADO'
       DataBinding.DataSource = dsContacto
@@ -126,7 +126,7 @@ inherited frViewCliente: TfrViewCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 7
+      TabOrder = 8
       Width = 370
     end
     object cbGrupoCliente: TcxDBComboBox [10]
@@ -155,7 +155,7 @@ inherited frViewCliente: TfrViewCliente
     end
     object eBloqueo: TcxDBTextEdit [11]
       Left = 132
-      Top = 220
+      Top = 247
       DataBinding.DataField = 'MOTIVO_BLOQUEO'
       DataBinding.DataSource = dsContacto
       Style.BorderColor = clWindowFrame
@@ -169,7 +169,7 @@ inherited frViewCliente: TfrViewCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 8
+      TabOrder = 9
       Width = 260
     end
     object eCodigoAsignado: TcxDBTextEdit [12]
@@ -193,46 +193,46 @@ inherited frViewCliente: TfrViewCliente
       Width = 260
     end
     inherited eTlfParticular: TcxDBTextEdit
-      Left = 574
+      Left = 564
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 15
-      ExplicitLeft = 574
-      ExplicitWidth = 238
-      Width = 238
-    end
-    inherited eTlfTrabajo: TcxDBTextEdit
-      Left = 574
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 14
-      ExplicitLeft = 574
-      ExplicitWidth = 238
-      Width = 238
-    end
-    inherited eTlfMovil: TcxDBTextEdit
-      Left = 574
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 16
-      ExplicitLeft = 574
+      ExplicitLeft = 564
       ExplicitWidth = 238
       Width = 238
     end
-    inherited eFax: TcxDBTextEdit
+    inherited eTlfTrabajo: TcxDBTextEdit
-      Left = 574
+      Left = 564
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 15
+      ExplicitLeft = 564
+      ExplicitWidth = 238
+      Width = 238
+    end
+    inherited eTlfMovil: TcxDBTextEdit
+      Left = 564
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 17
-      ExplicitLeft = 574
+      ExplicitLeft = 564
+      ExplicitWidth = 238
+      Width = 238
+    end
+    inherited eFax: TcxDBTextEdit
+      Left = 564
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 18
+      ExplicitLeft = 564
       ExplicitWidth = 238
       Width = 238
     end
@@ -246,42 +246,8 @@ inherited frViewCliente: TfrViewCliente
       ExplicitWidth = 260
       Width = 260
     end
-    inherited eNIFCIF: TcxDBTextEdit
+    object cbFelicitacion: TcxDBCheckBox [18]
-      Left = 329
+      Left = 469
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      ExplicitLeft = 329
-      ExplicitWidth = 91
-      Width = 91
-    end
-    inherited eMailTrabajo: TcxDBHyperLinkEdit
-      Left = 574
-      Properties.Prefix = 'mailto:'
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 18
-      ExplicitLeft = 574
-      ExplicitWidth = 209
-      Width = 209
-    end
-    inherited eMailParticular: TcxDBHyperLinkEdit
-      Left = 574
-      Properties.Prefix = 'mailto:'
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 19
-      ExplicitLeft = 574
-      ExplicitWidth = 209
-      Width = 209
-    end
-    object cbFelicitacion: TcxDBCheckBox [21]
-      Left = 479
       Top = 280
       Caption = 'Mandar felicitaci'#243'n navide'#241'a a este cliente'
       DataBinding.DataField = 'FELICITACION'
@@ -301,43 +267,45 @@ inherited frViewCliente: TfrViewCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 21
+      TabOrder = 22
       Width = 370
     end
-    inherited ePaginaWeb: TcxDBHyperLinkEdit
+    inherited eNIFCIF: TcxDBTextEdit
-      Left = 574
+      Left = 323
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 323
+      ExplicitWidth = 91
+      Width = 91
+    end
+    inherited eMailTrabajo: TcxDBHyperLinkEdit
+      Left = 564
+      Properties.Prefix = 'mailto:'
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 19
+      ExplicitLeft = 564
+      ExplicitWidth = 209
+      Width = 209
+    end
+    inherited eMailParticular: TcxDBHyperLinkEdit
+      Left = 564
+      Properties.Prefix = 'mailto:'
       Style.LookAndFeel.SkinName = ''
       StyleDisabled.LookAndFeel.SkinName = ''
       StyleFocused.LookAndFeel.SkinName = ''
       StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 20
-      ExplicitLeft = 574
+      ExplicitLeft = 564
       ExplicitWidth = 209
       Width = 209
     end
-    inherited eReferencia: TcxDBTextEdit
+    object eFechaIngreso: TcxDBDateEdit [22]
-      Left = 132
+      Left = 320
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      ExplicitLeft = 132
-    end
-    inherited ePersonaContacto: TcxDBTextEdit
-      Left = 132
-      Top = 358
-      Style.LookAndFeel.SkinName = ''
-      StyleDisabled.LookAndFeel.SkinName = ''
-      StyleFocused.LookAndFeel.SkinName = ''
-      StyleHot.LookAndFeel.SkinName = ''
-      TabOrder = 13
-      ExplicitLeft = 132
-      ExplicitTop = 358
-      ExplicitWidth = 260
-      Width = 260
-    end
-    object eFechaIngreso: TcxDBDateEdit [25]
-      Left = 330
       Top = 109
       DataBinding.DataField = 'FECHA_INGRESO'
       DataBinding.DataSource = dsContacto
@@ -353,6 +321,62 @@ inherited frViewCliente: TfrViewCliente
       TabOrder = 5
       Width = 119
     end
+    inherited ePaginaWeb: TcxDBHyperLinkEdit
+      Left = 564
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 21
+      ExplicitLeft = 564
+      ExplicitWidth = 209
+      Width = 209
+    end
+    inherited eReferencia: TcxDBTextEdit
+      Left = 132
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 132
+    end
+    inherited ePersonaContacto: TcxDBTextEdit
+      Left = 132
+      Top = 385
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 14
+      ExplicitLeft = 132
+      ExplicitTop = 385
+      ExplicitWidth = 260
+      Width = 260
+    end
+    object cbEmpresa: TcxDBComboBox [26]
+      Left = 132
+      Top = 163
+      DataBinding.DataField = 'NOMBRE_DE_EMPRESA'
+      DataBinding.DataSource = dsContacto
+      Properties.DropDownListStyle = lsFixedList
+      Properties.ImmediatePost = True
+      Properties.OnInitPopup = cbEmpresaPropertiesInitPopup
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 7
+      Width = 317
+    end
     inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
       AutoAligns = [aaHorizontal]
       AlignVert = avBottom
@@ -389,6 +413,11 @@ inherited frViewCliente: TfrViewCliente
               Control = cbGrupoCliente
               ControlOptions.ShowBorder = False
             end
+            object dxLayoutControlContactoItem23: TdxLayoutItem
+              Caption = 'Empresa'
+              Control = cbEmpresa
+              ControlOptions.ShowBorder = False
+            end
           end
           object dxLayoutControlContactoGroup18: TdxLayoutGroup [1]
             Caption = 'Bloqueo'

Source/Modulos/Contactos/Views/uViewCliente.pas

@@ -37,12 +37,15 @@ type
     dxLayoutControlContactoItem21: TdxLayoutItem;
     eFechaIngreso: TcxDBDateEdit;
     dxLayoutControlContactoGroup14: TdxLayoutGroup;
+    dxLayoutControlContactoItem23: TdxLayoutItem;
+    cbEmpresa: TcxDBComboBox;
     procedure cbGrupoClientePropertiesInitPopup(Sender: TObject);
     procedure cbGrupoClientePropertiesValidate(Sender: TObject;
       var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean);
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure actBloqueoClienteExecute(Sender: TObject);
+    procedure cbEmpresaPropertiesInitPopup(Sender: TObject);
   protected
     FGrupoController: IGruposClienteController;
     procedure SetContacto(const Value: IBizContacto); override;
@@ -53,7 +56,7 @@ implementation
 {$R *.dfm}
 
 uses
-  uBizGruposCliente;
+  uBizGruposCliente, uFactuGES_App, uBizEmpresas;
 
 { TfrViewCliente }
 
@@ -63,6 +66,33 @@ begin
   eBloqueo.Enabled := cbClienteBloqueado.Checked;
 end;
 
+procedure TfrViewCliente.cbEmpresaPropertiesInitPopup(Sender: TObject);
+var
+  AEmpresas: IBizEmpresa;
+begin
+  inherited;
+
+  AEmpresas := AppFactuGES.EmpresasController.BuscarTodos;
+  AEmpresas.DataTable.Active := True;
+
+  with cbEmpresa.Properties.Items do
+  begin
+    BeginUpdate;
+    try
+      Clear;
+      while not AEmpresas.Datatable.eof do
+      begin
+        Add(AEmpresas.NOMBRE);
+        AEmpresas.DataTable.Next;
+      end;
+      AEmpresas.DataTable.First;
+    finally
+      AEmpresas := NIL;
+      EndUpdate;
+    end;
+  end;
+end;
+
 procedure TfrViewCliente.cbGrupoClientePropertiesInitPopup(Sender: TObject);
 begin
   inherited;
@@ -109,6 +139,7 @@ procedure TfrViewCliente.CustomViewCreate(Sender: TObject);
 begin
   inherited;
   FGrupoController := TGruposClienteController.Create;
+
 end;
 
 procedure TfrViewCliente.CustomViewDestroy(Sender: TObject);

Source/Modulos/Contactos/Views/uViewClientes.dfm

@@ -69,16 +69,30 @@ inherited frViewClientes: TfrViewClientes
         VisibleForCustomization = False
         Width = 22
       end
-      object cxGridViewFECHA_INGRESO: TcxGridDBColumn [6]
+      object cxGridViewNOMBRE_DE_EMPRESA: TcxGridDBColumn [4]
+        Caption = 'Empresa'
+        DataBinding.FieldName = 'NOMBRE_DE_EMPRESA'
+      end
+      object cxGridViewFECHA_INGRESO: TcxGridDBColumn [7]
         Caption = 'Fecha de alta'
         DataBinding.FieldName = 'FECHA_INGRESO'
         PropertiesClassName = 'TcxDateEditProperties'
       end
-      object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn [8]
+      object cxGridViewGRUPO_CLIENTE: TcxGridDBColumn [8]
+        Caption = 'Grupo cliente'
+        DataBinding.FieldName = 'GRUPO_CLIENTE'
+      end
+      object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn [10]
         DataBinding.FieldName = 'NOMBRE_COMERCIAL'
         BestFitMaxWidth = 90
         Width = 164
       end
+      inherited cxGridViewTELEFONO_2: TcxGridDBColumn
+        VisibleForCustomization = False
+      end
+      inherited cxGridViewEMAIL_2: TcxGridDBColumn
+        VisibleForCustomization = False
+      end
     end
   end
   inherited frViewFiltroBase1: TfrViewFiltroBase

Source/Modulos/Contactos/Views/uViewClientes.pas

@@ -27,6 +27,8 @@ type
     cxGridViewTiendaWeb: TcxGridDBColumn;
     cxGridViewFELICITACION: TcxGridDBColumn;
     cxGridViewFECHA_INGRESO: TcxGridDBColumn;
+    cxGridViewGRUPO_CLIENTE: TcxGridDBColumn;
+    cxGridViewNOMBRE_DE_EMPRESA: TcxGridDBColumn;
     procedure cxGridViewICONOGetCellHint(Sender: TcxCustomGridTableItem;
       ARecord: TcxCustomGridRecord; ACellViewInfo: TcxGridTableDataCellViewInfo;
       const AMousePos: TPoint; var AHintText: TCaption;

Source/Modulos/Contactos/Views/uViewContactoListaDatosBancarios.dfm

@@ -12,19 +12,32 @@ inherited frViewListaDatosBancarios: TfrViewListaDatosBancarios
       object cxGridViewTITULAR: TcxGridDBColumn
         DataBinding.FieldName = 'TITULAR'
         PropertiesClassName = 'TcxTextEditProperties'
-        Width = 80
+        MinWidth = 100
+        Width = 200
+      end
+      object cxGridViewSWIFT: TcxGridDBColumn
+        DataBinding.FieldName = 'SWIFT'
+        MinWidth = 100
+        Width = 100
+      end
+      object cxGridViewIBAN: TcxGridDBColumn
+        DataBinding.FieldName = 'IBAN'
+        MinWidth = 200
+        Width = 200
       end
       object cxGridViewENTIDAD: TcxGridDBColumn
         DataBinding.FieldName = 'ENTIDAD'
         PropertiesClassName = 'TcxTextEditProperties'
         BestFitMaxWidth = 45
-        Width = 45
+        MinWidth = 50
+        Width = 50
       end
       object cxGridViewSUCURSAL: TcxGridDBColumn
         DataBinding.FieldName = 'SUCURSAL'
         PropertiesClassName = 'TcxTextEditProperties'
         BestFitMaxWidth = 45
-        Width = 45
+        MinWidth = 50
+        Width = 50
       end
       object cxGridViewDC: TcxGridDBColumn
         DataBinding.FieldName = 'DC'
@@ -35,7 +48,8 @@ inherited frViewListaDatosBancarios: TfrViewListaDatosBancarios
       object cxGridViewCUENTA: TcxGridDBColumn
         DataBinding.FieldName = 'CUENTA'
         PropertiesClassName = 'TcxTextEditProperties'
-        Width = 80
+        MinWidth = 80
+        Width = 100
       end
     end
   end

Source/Modulos/Contactos/Views/uViewContactoListaDatosBancarios.pas

@@ -21,6 +21,8 @@ type
     cxGridViewSUCURSAL: TcxGridDBColumn;
     cxGridViewDC: TcxGridDBColumn;
     cxGridViewCUENTA: TcxGridDBColumn;
+    cxGridViewIBAN: TcxGridDBColumn;
+    cxGridViewSWIFT: TcxGridDBColumn;
     procedure cxGridViewCellDblClick(Sender: TcxCustomGridTableView;
       ACellViewInfo: TcxGridTableDataCellViewInfo; AButton: TMouseButton;
       AShift: TShiftState; var AHandled: Boolean);

Source/Modulos/Contactos/Views/uViewProveedores.dfm

@@ -68,6 +68,10 @@ inherited frViewProveedores: TfrViewProveedores
         PropertiesClassName = 'TcxDateEditProperties'
         Width = 50
       end
+      object cxGridViewGRUPO_PROVEEDOR: TcxGridDBColumn
+        Caption = 'Grupo proveedor'
+        DataBinding.FieldName = 'GRUPO_PROVEEDOR'
+      end
     end
   end
   inherited frViewFiltroBase1: TfrViewFiltroBase

Source/Modulos/Contactos/Views/uViewProveedores.pas

@@ -24,6 +24,7 @@ type
     cxGridViewHOMOLOGADO: TcxGridDBColumn;
     cxGridViewFELICITACION: TcxGridDBColumn;
     cxGridViewFECHA_INGRESO: TcxGridDBColumn;
+    cxGridViewGRUPO_PROVEEDOR: TcxGridDBColumn;
     procedure cxGridViewICONOGetCellHint(Sender: TcxCustomGridTableItem;
       ARecord: TcxCustomGridRecord; ACellViewInfo: TcxGridTableDataCellViewInfo;
       const AMousePos: TPoint; var AHintText: TCaption;

Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.dfm

@@ -3164,23 +3164,182 @@ object RptFacturasCliente: TRptFacturasCliente
     PreviewOptions.Zoom = 1.000000000000000000
     PrintOptions.Printer = 'Por defecto'
     PrintOptions.PrintOnSheet = 0
-    ReportOptions.CreateDate = 37800.807714351900000000
+    ReportOptions.CreateDate = 39065.872423495400000000
-    ReportOptions.LastChange = 41332.550662326390000000
+    ReportOptions.LastChange = 42758.773392268520000000
     ScriptLanguage = 'PascalScript'
     ScriptText.Strings = (
-      'procedure mContinuaOnBeforePrint(Sender: TfrxComponent);'
+      ''
+      'procedure DatosEmpresaOnBeforePrint(Sender: TfrxComponent);'
+      'var'
+      '  Cadena: String;'
       'begin'
-      ' if Engine.FinalPass then'
+      '{  DatosEmpresa.Lines.Clear;'
-      '  begin'
+      '  if (<frxDBCabecera."TELEFONO_1_EMPRESA"> <> '#39#39') then'
-      '    if (<Page#> = <TotalPages#>) then'
+      '       Cadena := '#39'TLF: '#39' + <frxDBCabecera."TELEFONO_1_EMPRESA">;'
-      '    begin                      '
+      '  if (<frxDBCabecera."FAX_EMPRESA"> <> '#39#39') then'
-      '       mContinua.Visible := False;'
+      
-      '    end                 '
+        '       Cadena := Cadena + '#39' FAX: '#39' + <frxDBCabecera."FAX_EMPRESA' +
-      '    else'
+        '">;'
-      '    begin                '
+      '  DatosEmpresa.Lines.Add(Cadena);'
-      '       mContinua.Visible := True;'
+      '}'
-      '    end               '
+      'end;'
-      '  end;               '
+      ''
+      'procedure NombreEmpresaOnBeforePrint(Sender: TfrxComponent);'
+      'begin'
+      '{  NombreEmpresa.Lines.Clear;'
+      '  NombreEmpresa.Lines.Add(<frxDBCabecera."NOMBRE_EMPRESA">);'
+      '}'
+      'end;'
+      ''
+      'procedure DireccionEnvioOnBeforePrint(Sender: TfrxComponent);'
+      'var'
+      '  ACadena : String;'
+      'begin'
+      '{  ACadena := '#39#39';'
+      '  DireccionEnvio.Lines.Clear;'
+      '  if (<frxDBCabecera."REFERENCIA_CLIENTE"> <> '#39#39') then'
+      '     ACadena := <frxDBCabecera."REFERENCIA_CLIENTE">;'
+      ''
+      '  if (<frxDBCabecera."PERSONA_CONTACTO"> <> '#39#39') then'
+      
+        '     ACadena := ACadena + '#39'  '#39' + <frxDBCabecera."PERSONA_CONTACT' +
+        'O">;'
+      ''
+      '  DireccionEnvio.Lines.Add(ACadena);'
+      '  ACadena := '#39#39';'
+      '  DireccionEnvio.Lines.Add(<frxDBCabecera."CALLE">);'
+      '  if (<frxDBCabecera."CODIGO_POSTAL"> <> '#39#39') then'
+      '     ACadena := <frxDBCabecera."CODIGO_POSTAL"> + '#39' '#39';'
+      '  if (<frxDBCabecera."POBLACION"> <> '#39#39') then'
+      '     ACadena := ACadena + <frxDBCabecera."CODIGO_POSTAL">;'
+      ''
+      '  if (ACadena <> '#39#39') then'
+      '       DireccionEnvio.Lines.Add(ACadena);'
+      ''
+      '  if (<frxDBCabecera."PROVINCIA"> <> '#39#39') then'
+      '       DireccionEnvio.Lines.Add(<frxDBCabecera."PROVINCIA">);'
+      ''
+      '  if (<frxDBCabecera."TELEFONO"> <> '#39#39') then'
+      '       DireccionEnvio.Lines.Add(<frxDBCabecera."TELEFONO">);'
+      '}'
+      'end;'
+      ''
+      'procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);'
+      'begin'
+      '  if not Engine.FinalPass then'
+      '     Set('#39'TotalPaginas'#39', (<TotalPaginas> + 1));'
+      ''
+      '  if Engine.FinalPass then'
+      '     Set('#39'Pagina'#39', (<Pagina> + 1));  '
+      'end;'
+      ''
+      'procedure frxReportOnStartReport(Sender: TfrxComponent);'
+      'begin'
+      '  Set('#39'Pagina'#39', 0);'
+      '  Set('#39'TotalPaginas'#39', 0);'
+      '  Set('#39'Capitulo'#39', 0);'
+      '  Set('#39'NumCapitulos'#39', 0);      '
+      'end;'
+      ''
+      'procedure Memo4OnBeforePrint(Sender: TfrxComponent);'
+      'begin'
+      '  if (Length(<frxDBCabecera."OBSERVACIONES">) = 0) then'
+      '        Memo4.Visible := False;  '
+      'end;'
+      ''
+      'procedure Memo39OnBeforePrint(Sender: TfrxComponent);'
+      'begin'
+      '  Memo22.Clear;              '
+      '  if (<frxDBCabecera."TIPO"> = '#39'F'#39') then'
+      
+        '     Memo22.Text := '#39'FACTURA'#39'                                   ' +
+        '     '
+      '  else'
+      '     Memo22.Text := '#39'ABONO'#39';        '
+      'end;'
+      ''
+      'procedure Picture4OnBeforePrint(Sender: TfrxComponent);'
+      'begin'
+      '  if (<VerSello> = 1) then'
+      '     Picture4.Visible := True'
+      '  else'
+      '     Picture4.Visible := False;  '
+      'end;'
+      ''
+      'procedure Memo17OnBeforePrint(Sender: TfrxComponent);'
+      'begin'
+      '  if (<frxDBCabecera."DESCUENTO"> = 0) then'
+      '  begin              '
+      '     Memo17.Visible := False;'
+      '     ImpSubTotal.Visible := False;         '
+      '     Memo18.Visible := False;'
+      '     Descuento.Visible := False;         '
+      '     Memo20.Visible := False;'
+      '     ImpDescuento.Visible := False;         '
+      '    '
+      '     if (<frxDBCabecera."IMPORTE_RETENCION"> > 0) then'
+      '     begin                        '
+      '       Memo13.Text := '#39'Total certificaci'#243'n'#39';'
+      '       Retencion.Visible := True;'
+      '       ImpRetencion.Visible := True;'
+      '       TotalFacturaRet.Visible := True;'
+      '       ImpTotalFacturaRet.Visible := True;'
+      '     end;  '
+      '  end'
+      '  else'
+      '  begin              '
+      '    if (<frxDBCabecera."IMPORTE_RETENCION"> > 0) then'
+      '    begin'
+      '       Memo13.Text := '#39'Total certificaci'#243'n:'#39';        '
+      '       Retencion.Visible := True;'
+      '       ImpRetencion.Visible := True;'
+      '       TotalFacturaRet.Visible := True;'
+      '       ImpTotalFacturaRet.Visible := True;'
+      '    end'
+      '  end'
+      'end;'
+      ''
+      'procedure eCopiaOnBeforePrint(Sender: TfrxComponent);'
+      'begin'
+      '  if (<VerCopia> = 1) then'
+      '     eCopia.Visible := True'
+      '  else'
+      '     eCopia.Visible := False;  '
+      'end;'
+      ''
+      
+        'procedure frxDBDetallesCANTIDADOnBeforePrint(Sender: TfrxCompone' +
+        'nt);'
+      'var    '
+      '  ACantidad: String;  '
+      '  AIndice: Integer;'
+      '  AText : String;                                    '
+      'begin'
+      '  frxDBDetallesCANTIDAD.Memo.Clear;  '
+      '  ACantidad := FloatToStr(<frxDBDetalles."CANTIDAD">);  '
+      '  if ACantidad = '#39'0'#39' then'
+      '       AText := '#39#39
+      '  else begin  '
+      '       AIndice := Pos('#39','#39', ACantidad);'
+      
+        '       if AIndice > 0 then                                      ' +
+        '     '
+      
+        '               AText := '#39'[FormatFloat('#39#39'#,##0.00'#39#39',<frxDBDetalle' +
+        's."CANTIDAD">)] [frxDBDetalles."UNIDAD_MEDIDA"]'#39
+      '       else                     '
+      
+        '               AText := '#39'[FormatFloat('#39#39'#,##0.##'#39#39',<frxDBDetalle' +
+        's."CANTIDAD">)] [frxDBDetalles."UNIDAD_MEDIDA"]'#39';  '
+      '  end;                              '
+      '  frxDBDetallesCANTIDAD.Memo.Add(AText);'
+      'end;'
+      'procedure Memo54OnBeforePrint(Sender: TfrxComponent);'
+      'begin'
+      ' if (Length(<frxDBCabecera."FORMA_PAGO">) = 0) then'
+      '        Memo54.Visible := False'
+      ' else'
+      '        Memo54.Visible := True;     '
       'end;'
       ''
       'begin'

Source/Modulos/Facturas de cliente/Reports/uRptFacturasCliente_Server.pas

@@ -876,15 +876,15 @@ begin
     else
        frxReport.Variables.Variables['VerSello'] := 0;
 
-    //La primera impresion siempre es sin la etiqueta copia
-    frxReport.Variables.Variables['VerCopia'] := 0;
-    frxReport.PrepareReport(False);
     if VerCopia then
     begin
        frxReport.Variables.Variables['VerCopia'] := 1;
-       frxReport.Variables.Variables['VerSello'] := 0; //El sello nunca saldrá en la copia       
+       frxReport.Variables.Variables['VerSello'] := 0; //El sello nunca saldrá en la copia
-       frxReport.PrepareReport(False);
+    end
-    end;
+    else
+      frxReport.Variables.Variables['VerCopia'] := 0;
+
+    frxReport.PrepareReport(False);
 
   finally
     FConnection.RollbackTransaction; //<--- Creo que no va a hacer falta. "PUES SI ES NECESARIO"

Source/Modulos/Facturas de cliente/Views/uDialogOpcionesImpresionFacturasCliente.dfm

@@ -1,54 +1,54 @@
 inherited fDialogOpcionesImpresionFacturasCliente: TfDialogOpcionesImpresionFacturasCliente
   Caption = 'Opciones para facturas de cliente'
   ClientHeight = 240
-  ClientWidth = 418
+  ClientWidth = 452
-  ExplicitWidth = 424
+  ExplicitWidth = 458
   ExplicitHeight = 272
   PixelsPerInch = 96
   TextHeight = 13
   inherited Bevel2: TBevel
-    Width = 418
+    Width = 452
     ExplicitWidth = 418
   end
   inherited Bevel3: TBevel
     Top = 196
-    Width = 418
+    Width = 452
     ExplicitTop = 196
     ExplicitWidth = 418
   end
   inherited pnlBotones: TPanel
     Top = 198
-    Width = 418
+    Width = 452
     ExplicitTop = 198
     ExplicitWidth = 418
     inherited btnAceptar: TButton
-      Left = 254
+      Left = 279
-      ExplicitLeft = 254
+      ExplicitLeft = 279
     end
     inherited btnCancelar: TButton
-      Left = 333
+      Left = 358
-      ExplicitLeft = 333
+      ExplicitLeft = 358
     end
   end
   inherited pnlHeader: TPanel
-    Width = 418
+    Width = 452
     ExplicitWidth = 418
     inherited lblInstruccion: TLabel
-      Width = 368
+      Width = 402
       Margins.Bottom = 10
       Caption = 'Indique las siguiente opciones para la factura de cliente:'
       ExplicitWidth = 317
     end
     inherited Label2: TLabel
       Top = 31
-      Width = 343
+      Width = 377
       Height = 25
       Visible = False
       ExplicitTop = 31
     end
   end
   inherited pnlCuerpo: TPanel
-    Width = 418
+    Width = 452
     Height = 130
     ExplicitWidth = 418
     ExplicitHeight = 130
@@ -56,11 +56,11 @@ inherited fDialogOpcionesImpresionFacturasCliente: TfDialogOpcionesImpresionFact
       AlignWithMargins = True
       Left = 50
       Top = 51
-      Width = 279
+      Width = 391
-      Height = 17
+      Height = 22
-      Caption = 'Indicar '#39'COPIA'#39' en la cabecera'
+      Caption = 
-      Checked = True
+        'Imprimir '#39'COPIA'#39' de la factura (El sello de la empresa no saldr'#225 +
-      State = cbChecked
+        ' por ser copia)'
       TabOrder = 0
     end
     object cbVerSello: TCheckBox

Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.dfm

@@ -13,7 +13,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
   inherited JvNavPanelHeader: TJvNavPanelHeader
     Width = 823
     Caption = 'Nueva factura de cliente'
-    ExplicitWidth = 812
+    ExplicitWidth = 823
     inherited Image1: TImage
       Left = 796
       Picture.Data = {
@@ -39,7 +39,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
     end
     inherited lblDesbloquear: TcxLabel
       Left = 698
-      ExplicitLeft = 687
+      ExplicitLeft = 698
       AnchorX = 743
       AnchorY = 14
     end
@@ -122,9 +122,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             809
             287)
           inherited Label1: TLabel
-            Left = 383
+            Left = 389
             Width = 311
-            ExplicitLeft = 383
+            ExplicitLeft = 389
             ExplicitWidth = 311
           end
           inherited eReferencia: TcxDBTextEdit
@@ -162,8 +162,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             Width = 111
           end
           inherited bFormasPago: TButton
-            Left = 201
+            Left = 207
-            ExplicitLeft = 201
+            ExplicitLeft = 207
           end
           inherited cbCuentaBancaria: TcxDBComboBox
             Style.LookAndFeel.SkinName = ''
@@ -174,12 +174,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             Width = 249
           end
           inherited cbClienteFinal: TcxDBTextEdit
-            Left = 383
+            Left = 389
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 383
+            ExplicitLeft = 389
             ExplicitWidth = 339
             Width = 339
           end
@@ -188,9 +188,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             ExplicitLeft = 736
           end
           inherited frViewDatosYSeleccionClienteFacturaCliente1: TfrViewDatosYSeleccionClienteFacturaCliente
-            Left = 372
+            Left = 378
             Width = 505
-            ExplicitLeft = 372
+            ExplicitLeft = 378
             ExplicitWidth = 505
             inherited dxLayoutControl1: TdxLayoutControl
               Width = 505
@@ -203,16 +203,16 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
                 Width = 224
               end
               inherited edtNIFCIF: TcxDBTextEdit
-                Left = 285
+                Left = 279
                 Style.LookAndFeel.SkinName = ''
                 StyleDisabled.LookAndFeel.SkinName = ''
                 StyleFocused.LookAndFeel.SkinName = ''
                 StyleHot.LookAndFeel.SkinName = ''
-                ExplicitLeft = 285
+                ExplicitLeft = 279
               end
               inherited Button3: TBitBtn
-                Left = 196
+                Left = 190
-                ExplicitLeft = 196
+                ExplicitLeft = 190
               end
               inherited edtDireccion: TcxTextEdit
                 Style.LookAndFeel.SkinName = ''
@@ -223,8 +223,8 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
                 Width = 121
               end
               inherited Button4: TButton
-                Left = 365
+                Left = 359
-                ExplicitLeft = 365
+                ExplicitLeft = 359
               end
             end
           end
@@ -236,12 +236,18 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             ExplicitWidth = 275
             Width = 275
           end
+          inherited eFacturaWeb: TcxDBCheckBox
+            ExplicitWidth = 293
+            Width = 293
+          end
         end
       end
     end
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
+      ExplicitLeft = 0
+      ExplicitTop = 0
       ExplicitWidth = 798
       ExplicitHeight = 284
       inline frViewDetallesFacturaCliente1: TfrViewDetallesFacturaCliente
@@ -264,108 +270,103 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         ExplicitHeight = 284
         inherited ToolBar1: TToolBar
           Width = 809
-          Height = 78
+          Height = 46
           ExplicitWidth = 809
-          ExplicitHeight = 78
+          ExplicitHeight = 46
           inherited ToolButton3: TToolButton
             Wrap = False
           end
           inherited ToolButton4: TToolButton
             Left = 278
             Top = 0
+            Wrap = True
             ExplicitLeft = 278
             ExplicitTop = 0
           end
           inherited ToolButton14: TToolButton
-            Left = 334
+            Left = 0
-            Top = 0
             Wrap = False
-            ExplicitLeft = 334
+            ExplicitLeft = 0
-            ExplicitTop = 0
           end
           inherited FontName: TJvFontComboBox
-            Left = 399
+            Left = 65
-            Top = 0
+            Top = 22
-            ExplicitLeft = 399
+            ExplicitLeft = 65
-            ExplicitTop = 0
+            ExplicitTop = 22
           end
-          inherited ToolButton13: TToolButton [6]
+          inherited FontSize: TEdit
-            Left = 0
+            Left = 210
-            Top = 0
+            Top = 22
-            Wrap = True
-            ExplicitLeft = 0
-            ExplicitTop = 0
-            ExplicitHeight = 27
-          end
-          inherited FontSize: TEdit [7]
-            Left = 0
-            Top = 27
             Width = 264
-            ExplicitLeft = 0
+            ExplicitLeft = 210
-            ExplicitTop = 27
+            ExplicitTop = 22
             ExplicitWidth = 264
           end
-          inherited UpDown1: TUpDown [8]
+          inherited UpDown1: TUpDown
-            Left = 264
+            Left = 474
-            Top = 27
+            Top = 22
-            ExplicitLeft = 264
+            ExplicitLeft = 474
-            ExplicitTop = 27
+            ExplicitTop = 22
+          end
+          inherited ToolButton13: TToolButton
+            Left = 491
+            Top = 22
+            ExplicitLeft = 491
+            ExplicitTop = 22
           end
           inherited ToolButton6: TToolButton
-            Left = 281
+            Left = 499
-            Top = 27
+            Top = 22
-            ExplicitLeft = 281
+            ExplicitLeft = 499
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton7: TToolButton
-            Left = 347
+            Left = 565
-            Top = 27
+            Top = 22
-            ExplicitLeft = 347
+            ExplicitLeft = 565
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton8: TToolButton
-            Left = 414
+            Left = 632
-            Top = 27
+            Top = 22
-            ExplicitLeft = 414
+            ExplicitLeft = 632
-            ExplicitTop = 27
+            ExplicitTop = 22
           end
           inherited ToolButton12: TToolButton
-            Left = 0
+            Left = 715
-            Top = 27
+            Top = 22
-            Wrap = True
+            ExplicitLeft = 715
-            ExplicitLeft = 0
+            ExplicitTop = 22
-            ExplicitTop = 27
-            ExplicitHeight = 27
           end
           inherited ToolButton9: TToolButton
-            Left = 0
+            Left = 723
-            Top = 54
+            Top = 22
-            ExplicitLeft = 0
+            ExplicitLeft = 723
-            ExplicitTop = 54
+            ExplicitTop = 22
           end
           inherited ToolButton10: TToolButton
-            Left = 145
+            Left = 868
-            Top = 54
+            Top = 22
-            ExplicitLeft = 145
+            ExplicitLeft = 868
-            ExplicitTop = 54
+            ExplicitTop = 22
           end
           inherited ToolButton11: TToolButton
-            Left = 270
+            Left = 993
-            Top = 54
+            Top = 22
-            ExplicitLeft = 270
+            ExplicitLeft = 993
-            ExplicitTop = 54
+            ExplicitTop = 22
           end
         end
         inherited cxGrid: TcxGrid
-          Top = 104
+          Top = 72
           Width = 809
-          Height = 183
+          Height = 215
           ExplicitTop = 104
           ExplicitWidth = 809
           ExplicitHeight = 183
         end
         inherited TBXDock1: TTBXDock
-          Top = 78
+          Top = 46
           Width = 809
           ExplicitTop = 78
           ExplicitWidth = 809

Source/Modulos/Facturas de cliente/Views/uEditorFacturaCliente.pas

@@ -337,7 +337,7 @@ begin
   inherited;
   AllItems := False;
   AVerSello := True;
-  AVerCopia := True;
+  AVerCopia := False;
 
   //Preguntamos si desea que en las facturas se vea el Sello
   if ElegirOpcionesImpresionFacturaCliente(AVerSello, AVerCopia) then
@@ -427,7 +427,7 @@ begin
   inherited;
   AllItems := False;
   AVerSello := True;
-  AVerCopia := True;
+  AVerCopia := False;
 
   //Preguntamos si desea que en las facturas se vea el Sello
   if ElegirOpcionesImpresionFacturaCliente(AVerSello, AVerCopia) then

Source/Modulos/Facturas de cliente/Views/uEditorFacturasCliente.pas

@@ -330,7 +330,7 @@ begin
   AFacturas := Nil;
   AllItems := False;
   AVerSello := True;
-  AVerCopia := True;
+  AVerCopia := False;
 
   if MultiSelect and Assigned(ViewGrid) then
      AllItems :=  (ViewGrid.NumSeleccionados > 1);
@@ -425,7 +425,7 @@ begin
   AFacturas := Nil;
   AllItems := False;
   AVerSello := True;
-  AVerCopia := True;
+  AVerCopia := False;
 
   if MultiSelect and Assigned(ViewGrid) then
      AllItems :=  (ViewGrid.NumSeleccionados > 1);

Source/Modulos/Presupuestos de cliente/Views/uDialogOpcionesImpresionPresupuestosCliente.pas

@@ -10,6 +10,8 @@ type
   TfDialogOpcionesImpresionPresupuestosCliente = class(TfDialogBase)
     Image1: TImage;
     Image2: TImage;
+    Label1: TLabel;
+    Label3: TLabel;
     procedure actAceptarExecute(Sender: TObject);
     procedure actCancelarExecute(Sender: TObject);
     procedure Image1DblClick(Sender: TObject);

Source/Modulos/Presupuestos de cliente/Views/uDialogOpcionesImpresionPresupuestosClienteMusaeda.pas

@@ -10,6 +10,8 @@ type
   TfDialogOpcionesImpresionPresupuestosClienteMusaeda = class(TfDialogBase)
     Image1: TImage;
     Image2: TImage;
+    Label1: TLabel;
+    Label3: TLabel;
     procedure actAceptarExecute(Sender: TObject);
     procedure actCancelarExecute(Sender: TObject);
     procedure Image1DblClick(Sender: TObject);

Source/Servidor/FactuGES_Server.dpr

@@ -126,8 +126,6 @@ uses
   schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas',
   schRecibosProveedorClient_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas',
   schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas',
-  schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
-  schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas',
   schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas',
   schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas',
   schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas',
@@ -136,7 +134,9 @@ uses
   schPedidosProveedorServer_Intf in '..\Modulos\Pedidos a proveedor\Model\schPedidosProveedorServer_Intf.pas',
   schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas',
   schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas',
-  uRTFUtils in '..\Base\Utiles\uRTFUtils.pas';
+  uRTFUtils in '..\Base\Utiles\uRTFUtils.pas',
+  schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
+  schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}

Source/Servidor/FactuGES_Server.rc

@@ -16,7 +16,7 @@ BEGIN
               VALUE "FileVersion", "2.1.6.0\0"
               VALUE "ProductName", "FactuGES Servidor\0"
               VALUE "ProductVersion", "2.1.6.0\0"
-              VALUE "CompileDate", "martes, 14 de junio de 2016 18:08\0"
+              VALUE "CompileDate", "lunes, 23 de enero de 2017 16:53\0"
          END
     END
     BLOCK "VarFileInfo"