Version 2.6.6 Retenciones en facturas de cliente

git-svn-id: https://192.168.0.254/svn/Proyectos.AbetoDesign_FactuGES/trunk@109 93f398dd-4eb6-7a46-baf6-13f46f578da2

Source/Cliente/FactuGES.dproj

@@ -51,7 +51,7 @@
     <Borland.Personality>Delphi.Personality</Borland.Personality>
     <Borland.ProjectType>VCLApplication</Borland.ProjectType>
     <BorlandProject>
-<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">5</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.6.5.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><Language><Language Name="RootDir">C:\Archivos de programa\Borland\Delphi7\Bin\</Language></Language><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.6.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
       
       <Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
     </Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>

Source/GUIBase/uViewTotales.dfm

@@ -1,15 +1,15 @@
 inherited frViewTotales: TfrViewTotales
-  Width = 451
+  Width = 1029
-  Height = 404
+  Height = 310
   Align = alBottom
-  ExplicitWidth = 451
+  ExplicitWidth = 1029
-  ExplicitHeight = 404
+  ExplicitHeight = 310
   object dxLayoutControl1: TdxLayoutControl
     AlignWithMargins = True
     Left = 0
     Top = 0
-    Width = 451
+    Width = 1029
-    Height = 233
+    Height = 273
     Margins.Left = 0
     Margins.Top = 0
     Margins.Right = 0
@@ -19,23 +19,37 @@ inherited frViewTotales: TfrViewTotales
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth, acsHeight]
-    ExplicitWidth = 860
+    ExplicitWidth = 451
     object Bevel3: TBevel
-      Left = 278
+      Left = 481
       Top = 28
       Width = 3
       Height = 122
       Shape = bsRightLine
     end
     object Bevel4: TBevel
-      Left = 390
+      Left = 593
       Top = 70
       Width = 210
       Height = 9
       Shape = bsBottomLine
     end
+    object Bevel2: TBevel
+      Left = 22
+      Top = 213
+      Width = 333
+      Height = 9
+      Shape = bsBottomLine
+    end
+    object Bevel1: TBevel
+      Left = 500
+      Top = 213
+      Width = 332
+      Height = 9
+      Shape = bsBottomLine
+    end
     object ImporteDto: TcxDBCurrencyEdit
-      Left = 175
+      Left = 202
       Top = 55
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_DESCUENTO'
@@ -66,7 +80,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 93
     end
     object ImporteIVA: TcxDBCurrencyEdit
-      Left = 461
+      Left = 664
       Top = 105
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_IVA'
@@ -92,12 +106,12 @@ inherited frViewTotales: TfrViewTotales
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 9
+      TabOrder = 10
       Height = 21
       Width = 137
     end
     object ImporteTotal: TcxDBCurrencyEdit
-      Left = 391
+      Left = 594
       Top = 186
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_TOTAL'
@@ -124,12 +138,12 @@ inherited frViewTotales: TfrViewTotales
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 14
+      TabOrder = 15
       Height = 21
       Width = 137
     end
     object edtDescuento: TcxDBSpinEdit
-      Left = 104
+      Left = 131
       Top = 55
       AutoSize = False
       DataBinding.DataField = 'DESCUENTO'
@@ -159,7 +173,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 65
     end
     object edtIVA: TcxDBSpinEdit
-      Left = 390
+      Left = 593
       Top = 105
       AutoSize = False
       DataBinding.DataField = 'IVA'
@@ -191,12 +205,12 @@ inherited frViewTotales: TfrViewTotales
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 8
+      TabOrder = 9
       Height = 21
       Width = 65
     end
     object ImporteBase: TcxDBCurrencyEdit
-      Left = 390
+      Left = 593
       Top = 28
       AutoSize = False
       DataBinding.DataField = 'BASE_IMPONIBLE'
@@ -221,12 +235,12 @@ inherited frViewTotales: TfrViewTotales
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 7
+      TabOrder = 8
       Height = 21
       Width = 92
     end
     object edtRE: TcxDBSpinEdit
-      Left = 390
+      Left = 593
       Top = 159
       AutoSize = False
       DataBinding.DataField = 'RE'
@@ -258,12 +272,12 @@ inherited frViewTotales: TfrViewTotales
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 12
+      TabOrder = 13
       Height = 21
       Width = 65
     end
     object edtIRPF: TcxDBSpinEdit
-      Left = 390
+      Left = 593
       Top = 132
       AutoSize = False
       DataBinding.DataSource = DADataSource
@@ -294,12 +308,12 @@ inherited frViewTotales: TfrViewTotales
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 10
+      TabOrder = 11
       Height = 21
       Width = 65
     end
     object ImporteRE: TcxDBCurrencyEdit
-      Left = 461
+      Left = 664
       Top = 159
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_RE'
@@ -325,12 +339,12 @@ inherited frViewTotales: TfrViewTotales
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 13
+      TabOrder = 14
       Height = 21
       Width = 56
     end
     object ImporteIRPF: TcxDBCurrencyEdit
-      Left = 461
+      Left = 664
       Top = 132
       AutoSize = False
       DataBinding.DataSource = DADataSource
@@ -355,12 +369,12 @@ inherited frViewTotales: TfrViewTotales
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 11
+      TabOrder = 12
       Height = 21
       Width = 56
     end
     object eImporteNeto: TcxDBCurrencyEdit
-      Left = 104
+      Left = 131
       Top = 28
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_NETO'
@@ -391,7 +405,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 147
     end
     object ePorte: TcxDBCurrencyEdit
-      Left = 104
+      Left = 131
       Top = 82
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_PORTE'
@@ -421,7 +435,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 147
     end
     object eIVA: TcxDBLookupComboBox
-      Left = 104
+      Left = 131
       Top = 109
       DataBinding.DataField = 'ID_TIPO_IVA'
       DataBinding.DataSource = DADataSource
@@ -453,7 +467,7 @@ inherited frViewTotales: TfrViewTotales
       Width = 81
     end
     object bTiposIVA: TButton
-      Left = 130
+      Left = 333
       Top = 109
       Width = 132
       Height = 21
@@ -461,7 +475,7 @@ inherited frViewTotales: TfrViewTotales
       TabOrder = 5
     end
     object cbRecargoEquivalencia: TcxDBCheckBox
-      Left = 104
+      Left = 131
       Top = 136
       Caption = 'Aplicar recargo de equivalencia'
       DataBinding.DataField = 'RECARGO_EQUIVALENCIA'
@@ -486,6 +500,95 @@ inherited frViewTotales: TfrViewTotales
       TabOrder = 6
       Width = 219
     end
+    object edtRetencion: TcxDBSpinEdit
+      Left = 593
+      Top = 228
+      AutoSize = False
+      DataBinding.DataSource = DADataSource
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.AssignedValues.EditFormat = True
+      Properties.DisplayFormat = ',0.00 %;-,0.00 %'
+      Properties.ImmediatePost = True
+      Properties.MaxValue = 100.000000000000000000
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.TextColor = clWindowText
+      Style.ButtonStyle = bts3D
+      Style.IsFontAssigned = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.TextColor = clWindowText
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 16
+      Height = 21
+      Width = 65
+    end
+    object edtImporteRetencion: TcxDBCurrencyEdit
+      Left = 664
+      Top = 228
+      AutoSize = False
+      DataBinding.DataSource = DADataSource
+      Enabled = False
+      ParentFont = False
+      Properties.Alignment.Horz = taRightJustify
+      Properties.ReadOnly = True
+      Properties.UseLeftAlignmentOnEditing = False
+      Properties.UseThousandSeparator = True
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Font.Charset = DEFAULT_CHARSET
+      Style.Font.Color = clWindowText
+      Style.Font.Height = -11
+      Style.Font.Name = 'Tahoma'
+      Style.Font.Style = []
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.TextColor = clWindowText
+      Style.IsFontAssigned = True
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.TextColor = clWindowText
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 17
+      Height = 21
+      Width = 342
+    end
+    object edtFechaRetencion: TcxDBDateEdit
+      Left = 131
+      Top = 228
+      DataBinding.DataSource = DADataSource
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      Style.LookAndFeel.SkinName = ''
+      Style.ButtonStyle = bts3D
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 7
+      Width = 333
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -563,6 +666,21 @@ inherited frViewTotales: TfrViewTotales
             Control = cbRecargoEquivalencia
             ControlOptions.ShowBorder = False
           end
+          object dxLayoutControl1Item19: TdxLayoutItem
+            AutoAligns = [aaHorizontal]
+            AlignVert = avBottom
+            Visible = False
+            Control = Bevel2
+            ControlOptions.ShowBorder = False
+          end
+          object dxLayoutControl1Item18: TdxLayoutItem
+            AutoAligns = [aaHorizontal]
+            AlignVert = avBottom
+            Caption = 'Fecha vto. retenci'#243'n:'
+            Visible = False
+            Control = edtFechaRetencion
+            ControlOptions.ShowBorder = False
+          end
         end
         object dxLayoutControl1Group5: TdxLayoutGroup
           AutoAligns = [aaVertical]
@@ -680,6 +798,30 @@ inherited frViewTotales: TfrViewTotales
               Control = ImporteTotal
               ControlOptions.ShowBorder = False
             end
+            object dxLayoutControl1Item20: TdxLayoutItem
+              Visible = False
+              Control = Bevel1
+              ControlOptions.ShowBorder = False
+            end
+            object dxLayoutControl1Group12: TdxLayoutGroup
+              ShowCaption = False
+              Visible = False
+              Hidden = True
+              LayoutDirection = ldHorizontal
+              ShowBorder = False
+              object dxLayoutControl1Item10: TdxLayoutItem
+                Caption = 'Retenci'#243'n (%):'
+                CaptionOptions.AlignHorz = taRightJustify
+                Control = edtRetencion
+                ControlOptions.ShowBorder = False
+              end
+              object dxLayoutControl1Item17: TdxLayoutItem
+                AutoAligns = [aaVertical]
+                AlignHorz = ahClient
+                Control = edtImporteRetencion
+                ControlOptions.ShowBorder = False
+              end
+            end
           end
         end
       end

Source/GUIBase/uViewTotales.pas

@@ -8,7 +8,7 @@ uses
   cxTextEdit, cxMaskEdit, cxDropDownEdit, cxDBEdit, cxControls,
   cxContainer, cxEdit, cxLabel, cxDBLabel, cxCurrencyEdit, cxSpinEdit,
   ComCtrls, dxLayoutControl, dxLayoutLookAndFeels, cxLookupEdit, cxDBLookupEdit,
-  cxDBLookupComboBox, cxCheckBox, uDAInterfaces;
+  cxDBLookupComboBox, cxCheckBox, uDAInterfaces, cxCalendar;
 
 type
   TfrViewTotales = class(TfrViewBase)
@@ -64,6 +64,17 @@ type
     dxLayoutControl1Group10: TdxLayoutGroup;
     dxLayoutControl1Group11: TdxLayoutGroup;
     dxLayoutControl1Group1191: TdxLayoutGroup;
+    dxLayoutControl1Item10: TdxLayoutItem;
+    edtRetencion: TcxDBSpinEdit;
+    dxLayoutControl1Item17: TdxLayoutItem;
+    edtImporteRetencion: TcxDBCurrencyEdit;
+    dxLayoutControl1Group12: TdxLayoutGroup;
+    dxLayoutControl1Item18: TdxLayoutItem;
+    edtFechaRetencion: TcxDBDateEdit;
+    dxLayoutControl1Item19: TdxLayoutItem;
+    Bevel2: TBevel;
+    dxLayoutControl1Item20: TdxLayoutItem;
+    Bevel1: TBevel;
   public
     { Public declarations }
   end;

Source/Informes/InformeListadoFacturasClientePendientes.fr3

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="40886,5335132176" ScriptLanguage="PascalScript" ScriptText.Text="procedure mContinuaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FinalPass then&#13;&#10;  begin&#13;&#10;    if (&#60;Page#&#62; = &#60;TotalPages#&#62;) then&#13;&#10;    begin                      &#13;&#10;       mContinua.Visible := False;&#13;&#10;    end                 &#13;&#10;    else&#13;&#10;    begin                &#13;&#10;       mContinua.Visible := True;&#13;&#10;    end               &#13;&#10;  end;               &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C5000000020446174615365743D226672784442496E666F726D654C69737461646F46616374757261732220446174615365744E616D653D226672784442496E666F726D654C69737461646F46616374757261732200010C5E00000020446174615365743D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E2220446174615365744E616D653D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E220000095661726961626C657301010C13000000204E616D653D2220506172616D6574726F732200010C17000000204E616D653D22546578746F506172616D6574726F73220000055374796C650100">
+<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="42380,7533945949" ScriptLanguage="PascalScript" ScriptText.Text="procedure mContinuaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FinalPass then&#13;&#10;  begin&#13;&#10;    if (&#60;Page#&#62; = &#60;TotalPages#&#62;) then&#13;&#10;    begin                      &#13;&#10;       mContinua.Visible := False;&#13;&#10;    end                 &#13;&#10;    else&#13;&#10;    begin                &#13;&#10;       mContinua.Visible := True;&#13;&#10;    end               &#13;&#10;  end;               &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C5000000020446174615365743D226672784442496E666F726D654C69737461646F46616374757261732220446174615365744E616D653D226672784442496E666F726D654C69737461646F46616374757261732200010C5E00000020446174615365743D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E2220446174615365744E616D653D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E220000095661726961626C657301010C13000000204E616D653D2220506172616D6574726F732200010C17000000204E616D653D22546578746F506172616D6574726F73220000055374796C650100">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" Orientation="poLandscape" PaperWidth="297" PaperHeight="210" PaperSize="9" LeftMargin="15" RightMargin="15" TopMargin="15" BottomMargin="20" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text="">
     <TfrxPageHeader Name="Band1" Height="136,10235" Left="0" Top="16" Width="1009,13451" OnBeforePrint="Band1OnBeforePrint">
@@ -15,17 +15,19 @@
     <TfrxGroupHeader Name="" Height="40" Left="0" Restrictions="2" Top="212" Width="1009,13451" Condition="frxDBInformeListadoFacturas.&#34;MES&#34;" ReprintOnNewPage="True">
       <TfrxMemoView Name="Memo52" Left="718,11023622" Top="25" Width="113,89765" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," 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="Importe total"/>
       <TfrxMemoView Name="Memo27" Left="0" Top="25" Width="135,69639" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Nº factura"/>
-      <TfrxMemoView Name="Memo28" Left="245,89765" Top="25" Width="472,06299213" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Cliente"/>
+      <TfrxMemoView Name="Memo28" Left="314,89765" Top="25" Width="403" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Cliente"/>
       <TfrxMemoView Name="Memo49" Left="832" Top="25" Width="176,50393701" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Situación"/>
-      <TfrxMemoView Name="Memo8" Left="135" Top="25" Width="111,11811024" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha"/>
+      <TfrxMemoView Name="Memo8" Left="135" Top="25" Width="90" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha"/>
       <TfrxMemoView Name="Memo7" Left="7,55906" Top="2,77953" Width="485,37013" Height="15,1181102362205" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;TITULO&#34;]"/>
+      <TfrxMemoView Name="Memo5" Align="baLeft" Left="225" Top="25" Width="90" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha vto."/>
     </TfrxGroupHeader>
-    <TfrxMasterData Name="DatosMaestros1" Height="17,007874015748" Left="0" Top="272" Width="1009,13451" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBInformeListadoFacturas" DataSetName="frxDBInformeListadoFacturas" RowCount="0">
+    <TfrxMasterData Name="DatosMaestros1" Height="17,00787402" Left="0" Top="272" Width="1009,13451" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBInformeListadoFacturas" DataSetName="frxDBInformeListadoFacturas" RowCount="0">
-      <TfrxMemoView Name="Memo31" Left="718,11023622" Top="0" Width="113,763779527559" 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;] "/>
+      <TfrxMemoView Name="Memo31" Left="718,11023622" Top="0" Width="113,76377953" 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;]  "/>
-      <TfrxMemoView Name="Memo4" Left="246,02122" Top="0" Width="472,06299213" 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" ParentFont="False" Text="  [frxDBInformeListadoFacturas.&#34;NOMBRE&#34;]"/>
+      <TfrxMemoView Name="Memo4" Align="baLeft" Left="314,92913386" Top="0" Width="403" 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" ParentFont="False" Text="  [frxDBInformeListadoFacturas.&#34;NOMBRE&#34;]"/>
-      <TfrxMemoView Name="Memo20" Left="831,70903" Top="0" Width="176,503937007874" 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" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;SITUACION&#34;]"/>
+      <TfrxMemoView Name="Memo20" Left="831,70903" Top="0" Width="176,50393701" 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" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;SITUACION&#34;]"/>
-      <TfrxMemoView Name="Memo21" Left="134,929133858268" Top="0" Width="111,04901" 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" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;FECHA_FACTURA&#34;]"/>
+      <TfrxMemoView Name="Memo21" Align="baLeft" Left="134,92913386" Top="0" Width="90" 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" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;FECHA_FACTURA&#34;]"/>
-      <TfrxMemoView Name="Memo18" Left="0" Top="0" Width="134,929133858268" 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" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;REFERENCIA&#34;]"/>
+      <TfrxMemoView Name="Memo18" Left="0" Top="0" Width="134,92913386" 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" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;REFERENCIA&#34;]"/>
+      <TfrxMemoView Name="Memo9" Align="baLeft" Left="224,92913386" Top="0" Width="90" 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=" [frxDBInformeListadoFacturas.&#34;FECHA_VENCIMIENTO&#34;]"/>
     </TfrxMasterData>
     <TfrxGroupFooter Name="" Height="20,78740402" Left="0" Top="309" Width="1009,13451">
       <TfrxMemoView Name="Memo6" Left="718,08687" Top="0,37774772" Width="114,14173228" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="13556733" 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)] "/>

Source/Informes/InformeListadoFacturasClientePendientesDesglosado.fr3

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="40886,5340845023" ScriptLanguage="PascalScript" ScriptText.Text="procedure mContinuaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FinalPass then&#13;&#10;  begin&#13;&#10;    if (&#60;Page#&#62; = &#60;TotalPages#&#62;) then&#13;&#10;    begin                      &#13;&#10;       mContinua.Visible := False;&#13;&#10;    end                 &#13;&#10;    else&#13;&#10;    begin                &#13;&#10;       mContinua.Visible := True;&#13;&#10;    end               &#13;&#10;  end;               &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C5000000020446174615365743D226672784442496E666F726D654C69737461646F46616374757261732220446174615365744E616D653D226672784442496E666F726D654C69737461646F46616374757261732200010C5E00000020446174615365743D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E2220446174615365744E616D653D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E220000095661726961626C657301010C13000000204E616D653D2220506172616D6574726F732200010C17000000204E616D653D22546578746F506172616D6574726F73220000055374796C650100">
+<TfrxReport Version="4.8.11" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Por defecto" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="37800,8077143519" ReportOptions.Description.Text="" ReportOptions.LastChange="42380,7547869213" ScriptLanguage="PascalScript" ScriptText.Text="procedure mContinuaOnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10; if Engine.FinalPass then&#13;&#10;  begin&#13;&#10;    if (&#60;Page#&#62; = &#60;TotalPages#&#62;) then&#13;&#10;    begin                      &#13;&#10;       mContinua.Visible := False;&#13;&#10;    end                 &#13;&#10;    else&#13;&#10;    begin                &#13;&#10;       mContinua.Visible := True;&#13;&#10;    end               &#13;&#10;  end;               &#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C5000000020446174615365743D226672784442496E666F726D654C69737461646F46616374757261732220446174615365744E616D653D226672784442496E666F726D654C69737461646F46616374757261732200010C5E00000020446174615365743D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E2220446174615365744E616D653D226672784442496E666F726D654C69737461646F4661637475726173526573756D656E220000095661726961626C657301010C13000000204E616D653D2220506172616D6574726F732200010C17000000204E616D653D22546578746F506172616D6574726F73220000055374796C650100">
   <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
   <TfrxReportPage Name="Page1" Orientation="poLandscape" PaperWidth="297" PaperHeight="210" PaperSize="9" LeftMargin="15" RightMargin="15" TopMargin="15" BottomMargin="20" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text="">
     <TfrxPageHeader Name="Band1" Height="136,10235" Left="0" Top="16" Width="1009,13451" OnBeforePrint="Band1OnBeforePrint">
@@ -15,17 +15,19 @@
     <TfrxGroupHeader Name="" Height="40" Left="0" Restrictions="2" Top="255" Width="1009,13451" Condition="frxDBInformeListadoFacturas.&#34;NOMBRE&#34;" ReprintOnNewPage="True">
       <TfrxMemoView Name="Memo52" Left="718,11023622" Top="25" Width="113,89765" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," 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="Importe total"/>
       <TfrxMemoView Name="Memo27" Left="0" Top="25" Width="135,69639" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Nº factura"/>
-      <TfrxMemoView Name="Memo28" Left="245,89765" Top="25" Width="472,06299213" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Cliente"/>
+      <TfrxMemoView Name="Memo28" Align="baLeft" Left="315" Top="25" Width="403" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Cliente"/>
       <TfrxMemoView Name="Memo49" Left="832" Top="25" Width="176,50393701" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Situación"/>
-      <TfrxMemoView Name="Memo8" Left="135" Top="25" Width="111,11811024" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha"/>
+      <TfrxMemoView Name="Memo8" Left="135" Top="25" Width="90" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha"/>
       <TfrxMemoView Name="Memo1" Left="11,33859" Top="3,77953" Width="485,37013" Height="15,11811024" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Color="8421504" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;NOMBRE&#34;]"/>
+      <TfrxMemoView Name="Memo9" Align="baLeft" Left="225" Top="25" Width="90" Height="15" ShowHint="False" Color="13556733" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha vto."/>
     </TfrxGroupHeader>
-    <TfrxMasterData Name="DatosMaestros1" Height="17,007874015748" Left="0" Top="315" Width="1009,13451" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBInformeListadoFacturas" DataSetName="frxDBInformeListadoFacturas" RowCount="0">
+    <TfrxMasterData Name="DatosMaestros1" Height="17,00787402" Left="0" Top="315" Width="1009,13451" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBInformeListadoFacturas" DataSetName="frxDBInformeListadoFacturas" RowCount="0">
-      <TfrxMemoView Name="Memo31" Left="718,11023622" Top="0" Width="113,763779527559" 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;] "/>
+      <TfrxMemoView Name="Memo31" Left="718,11023622" Top="0" Width="113,76377953" 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;]  "/>
-      <TfrxMemoView Name="Memo4" Left="246,02122" Top="0" Width="472,06299213" 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" ParentFont="False" Text="  [frxDBInformeListadoFacturas.&#34;NOMBRE&#34;]"/>
+      <TfrxMemoView Name="Memo4" Align="baLeft" Left="314,92913386" Top="0" Width="403" 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" ParentFont="False" Text="  [frxDBInformeListadoFacturas.&#34;NOMBRE&#34;]"/>
-      <TfrxMemoView Name="Memo20" Left="831,70903" Top="0" Width="176,503937007874" 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" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;SITUACION&#34;]"/>
+      <TfrxMemoView Name="Memo20" Left="831,70903" Top="0" Width="176,50393701" 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" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;SITUACION&#34;]"/>
-      <TfrxMemoView Name="Memo21" Left="134,929133858268" Top="0" Width="111,04901" 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" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;FECHA_FACTURA&#34;]"/>
+      <TfrxMemoView Name="Memo21" Left="134,92913386" Top="0" Width="90" 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" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;FECHA_FACTURA&#34;]"/>
       <TfrxMemoView Name="Memo18" Left="0" Top="0" Width="134,929133858268" 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" ParentFont="False" Text=" [frxDBInformeListadoFacturas.&#34;REFERENCIA&#34;]"/>
+      <TfrxMemoView Name="Memo15" Align="baLeft" Left="224,92913386" Top="0" Width="90" 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=" [frxDBInformeListadoFacturas.&#34;FECHA_VENCIMIENTO&#34;]"/>
     </TfrxMasterData>
     <TfrxGroupFooter Name="" Height="20,78740402" Left="0" Top="352" Width="1009,13451">
       <TfrxMemoView Name="Memo6" Left="718,08687" Top="0,37774772" Width="114,14173228" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="13556733" 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)] "/>

Source/Modulos/Facturas de cliente/Controller/uFacturasClienteController.pas

@@ -694,6 +694,12 @@ begin
   if (EsFechaVacia(AFactura.FECHA_FACTURA)) then
     raise Exception.Create('Debe indicar la fecha de esta factura');
 
+  //En el caso de asignar una retención a la factura será obligatorio meter la fecha de retención.
+  if (AFactura.IMPORTE_RETENCION > 0) then
+     if (EsFechaVacia(AFactura.FECHA_RETENCION)) then
+        raise Exception.Create('Debe indicar la fecha de vencimiento de la retención, para poder asociarla al recibo que contendrá el importe de la retención.');
+
+
   if (AFactura.Detalles.DataTable.RecordCount = 0) then
     raise Exception.Create('La factura debe tener al menos un concepto en su contenido');
 
@@ -1285,6 +1291,7 @@ var
   ADiasMas: Integer;
   BSemaforo: Boolean;
   AImporteAcumulado : Double;
+  AImporteTotal: Double;
 
 begin
   if not Assigned(AFactura) then
@@ -1301,6 +1308,11 @@ begin
   ARecibos := ARecibosClienteController.BuscarRecibosFactura(AFactura.ID);
   ARecibosClienteController.EliminarTodo(ARecibos);
 
+  //Si hay retención, se generará un recibo por ese importe, y el resto se generarán recibos
+  //según forma de pago
+  AImporteTotal := AFactura.IMPORTE_TOTAL - AFactura.IMPORTE_RETENCION;
+
+
   //Se cambia la lógica a peticion de acana, en el caso de meter una fecha de vencimiento,
   //los plazos de la forma de pago no tendrán efecto, se generará un recibo con el 100% y fecha de vencimiento
   //de la factura. (Se permitirá para acana poder dar de alta facturas sin recibos asociados)
@@ -1332,7 +1344,7 @@ begin
         if AFormaPago.Plazos.RecordCount < 1 then
         begin
           ARecibos.FECHA_VENCIMIENTO := AFactura.FECHA_VENCIMIENTO;
-          ARecibos.IMPORTE := AFactura.IMPORTE_TOTAL;
+          ARecibos.IMPORTE := AImporteTotal;
           AImporteAcumulado := AImporteAcumulado + ARecibos.IMPORTE;
         end
         else
@@ -1375,15 +1387,15 @@ begin
           ARecibos.FECHA_VENCIMIENTO := AFechaVencimiento;
 
 
-          ARecibos.IMPORTE := RoundCurrency(RoundCurrency(AFactura.IMPORTE_TOTAL) * (AFormaPago.Plazos.PORCENTAJE / 100));
+          ARecibos.IMPORTE := RoundCurrency(RoundCurrency(AImporteTotal) * (AFormaPago.Plazos.PORCENTAJE / 100));
           AImporteAcumulado := AImporteAcumulado + ARecibos.IMPORTE;
 
           if (i = AFormaPago.Plazos.RecordCount) then
           begin
-             if (AImporteAcumulado < RoundCurrency(AFactura.IMPORTE_TOTAL)) then
+             if (AImporteAcumulado < RoundCurrency(AImporteTotal)) then
-                ARecibos.IMPORTE := ARecibos.IMPORTE + (RoundCurrency(AFactura.IMPORTE_TOTAL) - AImporteAcumulado)
+                ARecibos.IMPORTE := ARecibos.IMPORTE + (RoundCurrency(AImporteTotal) - AImporteAcumulado)
-             else if (AImporteAcumulado > RoundCurrency(AFactura.IMPORTE_TOTAL)) then
+             else if (AImporteAcumulado > RoundCurrency(AImporteTotal)) then
-                ARecibos.IMPORTE := ARecibos.IMPORTE - (AImporteAcumulado - RoundCurrency(AFactura.IMPORTE_TOTAL));
+                ARecibos.IMPORTE := ARecibos.IMPORTE - (AImporteAcumulado - RoundCurrency(AImporteTotal));
 
           end;
         end;
@@ -1397,6 +1409,20 @@ begin
     until (eof);
   end;
 
+  //Si hay retención generaremos un recibo para dicha retención
+  if AFactura.IMPORTE_RETENCION > 0 then
+  begin
+    ARecibos := ARecibosClienteController.Nuevo;
+    ARecibos.Edit;
+    ARecibos.ID_FACTURA := AFactura.ID;
+    ARecibos.REFERENCIA := AFactura.REFERENCIA + ' - ' + IntToStr(i);
+    ARecibos.FECHA_EMISION := AFactura.FECHA_FACTURA;
+    ARecibos.FECHA_VENCIMIENTO := AFactura.FECHA_RETENCION;
+    ARecibos.IMPORTE := AFactura.IMPORTE_RETENCION;
+    ARecibos.DESCRIPCION := 'Pago de factura de retención ' + AFactura.REFERENCIA + ': son ' + CifraToLetras(ARecibos.IMPORTE);
+    ARecibosClienteController.Guardar(ARecibos);
+  end;
+
   //Liberamos
   AFormasPagoController := Nil;
   AFormaPago := Nil;

Source/Modulos/Facturas de cliente/Data/uDataModuleFacturasCliente.dfm

@@ -346,6 +346,18 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
         DataType = datSmallInt
         DisplayLabel = 'FacturasCliente_SIN_COMISION'
         DictionaryEntry = 'FacturasCliente_SIN_COMISION'
+      end
+      item
+        Name = 'RETENCION'
+        DataType = datFloat
+      end
+      item
+        Name = 'IMPORTE_RETENCION'
+        DataType = datCurrency
+      end
+      item
+        Name = 'FECHA_RETENCION'
+        DataType = datDateTime
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]

Source/Modulos/Facturas de cliente/FacturasCliente_Group.groupproj

@@ -201,6 +201,15 @@
   <Target Name="Contabilidad_view:Make">
     <MSBuild Projects="..\Contabilidad\Views\Contabilidad_view.dproj" Targets="Make" />
   </Target>
+  <Target Name="AlbCli_FacCli_relation">
+    <MSBuild Projects="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" Targets="" />
+  </Target>
+  <Target Name="AlbCli_FacCli_relation:Clean">
+    <MSBuild Projects="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" Targets="Clean" />
+  </Target>
+  <Target Name="AlbCli_FacCli_relation:Make">
+    <MSBuild Projects="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" Targets="Make" />
+  </Target>
   <Target Name="FacturasCliente_view">
     <MSBuild Projects="Views\FacturasCliente_view.dproj" Targets="" />
   </Target>
@@ -255,15 +264,6 @@
   <Target Name="PresupuestosCliente_view:Make">
     <MSBuild Projects="..\Presupuestos de cliente\Views\PresupuestosCliente_view.dproj" Targets="Make" />
   </Target>
-  <Target Name="AlbCli_FacCli_relation">
-    <MSBuild Projects="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" Targets="" />
-  </Target>
-  <Target Name="AlbCli_FacCli_relation:Clean">
-    <MSBuild Projects="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" Targets="Clean" />
-  </Target>
-  <Target Name="AlbCli_FacCli_relation:Make">
-    <MSBuild Projects="..\Relaciones\Albaranes de cliente - Facturas de cliente\AlbCli_FacCli_relation.dproj" Targets="Make" />
-  </Target>
   <Target Name="ConCli_FacCli_relation">
     <MSBuild Projects="..\Relaciones\Contratos de cliente - Facturas de cliente\ConCli_FacCli_relation.dproj" Targets="" />
   </Target>
@@ -292,13 +292,13 @@
     <MSBuild Projects="..\Presupuestos de cliente\Controller\PresupuestosCliente_controller.dproj" Targets="Make" />
   </Target>
   <Target Name="Build">
-    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_controller;Articulos_view;GestorInformes_model;GestorInformes_data;GestorInformes_controller;GestorInformes_view;GestorInformes_plugin;FacturasCliente_model;FacturasCliente_data;FacturasCliente_controller;Contabilidad_view;FacturasCliente_view;FacturasCliente_plugin;FactuGES;FactuGES_Server;ContratosCliente_view;PresupuestosCliente_view;AlbCli_FacCli_relation;ConCli_FacCli_relation;AlbaranesCliente_view;PresupuestosCliente_controller" />
+    <CallTarget Targets="Base;GUIBase;ApplicationBase;Contactos_model;Contactos_data;Contactos_controller;Contactos_view;Articulos_controller;Articulos_view;GestorInformes_model;GestorInformes_data;GestorInformes_controller;GestorInformes_view;GestorInformes_plugin;FacturasCliente_model;FacturasCliente_data;FacturasCliente_controller;Contabilidad_view;AlbCli_FacCli_relation;FacturasCliente_view;FacturasCliente_plugin;FactuGES;FactuGES_Server;ContratosCliente_view;PresupuestosCliente_view;ConCli_FacCli_relation;AlbaranesCliente_view;PresupuestosCliente_controller" />
   </Target>
   <Target Name="Clean">
-    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;GestorInformes_model:Clean;GestorInformes_data:Clean;GestorInformes_controller:Clean;GestorInformes_view:Clean;GestorInformes_plugin:Clean;FacturasCliente_model:Clean;FacturasCliente_data:Clean;FacturasCliente_controller:Clean;Contabilidad_view:Clean;FacturasCliente_view:Clean;FacturasCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;ContratosCliente_view:Clean;PresupuestosCliente_view:Clean;AlbCli_FacCli_relation:Clean;ConCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean;PresupuestosCliente_controller:Clean" />
+    <CallTarget Targets="Base:Clean;GUIBase:Clean;ApplicationBase:Clean;Contactos_model:Clean;Contactos_data:Clean;Contactos_controller:Clean;Contactos_view:Clean;Articulos_controller:Clean;Articulos_view:Clean;GestorInformes_model:Clean;GestorInformes_data:Clean;GestorInformes_controller:Clean;GestorInformes_view:Clean;GestorInformes_plugin:Clean;FacturasCliente_model:Clean;FacturasCliente_data:Clean;FacturasCliente_controller:Clean;Contabilidad_view:Clean;AlbCli_FacCli_relation:Clean;FacturasCliente_view:Clean;FacturasCliente_plugin:Clean;FactuGES:Clean;FactuGES_Server:Clean;ContratosCliente_view:Clean;PresupuestosCliente_view:Clean;ConCli_FacCli_relation:Clean;AlbaranesCliente_view:Clean;PresupuestosCliente_controller:Clean" />
   </Target>
   <Target Name="Make">
-    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;GestorInformes_model:Make;GestorInformes_data:Make;GestorInformes_controller:Make;GestorInformes_view:Make;GestorInformes_plugin:Make;FacturasCliente_model:Make;FacturasCliente_data:Make;FacturasCliente_controller:Make;Contabilidad_view:Make;FacturasCliente_view:Make;FacturasCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;ContratosCliente_view:Make;PresupuestosCliente_view:Make;AlbCli_FacCli_relation:Make;ConCli_FacCli_relation:Make;AlbaranesCliente_view:Make;PresupuestosCliente_controller:Make" />
+    <CallTarget Targets="Base:Make;GUIBase:Make;ApplicationBase:Make;Contactos_model:Make;Contactos_data:Make;Contactos_controller:Make;Contactos_view:Make;Articulos_controller:Make;Articulos_view:Make;GestorInformes_model:Make;GestorInformes_data:Make;GestorInformes_controller:Make;GestorInformes_view:Make;GestorInformes_plugin:Make;FacturasCliente_model:Make;FacturasCliente_data:Make;FacturasCliente_controller:Make;Contabilidad_view:Make;AlbCli_FacCli_relation:Make;FacturasCliente_view:Make;FacturasCliente_plugin:Make;FactuGES:Make;FactuGES_Server:Make;ContratosCliente_view:Make;PresupuestosCliente_view:Make;ConCli_FacCli_relation:Make;AlbaranesCliente_view:Make;PresupuestosCliente_controller:Make" />
   </Target>
   <Import Condition="Exists('$(MSBuildBinPath)\Borland.Group.Targets')" Project="$(MSBuildBinPath)\Borland.Group.Targets" />
 </Project>

Source/Modulos/Facturas de cliente/Model/schFacturasClienteClient_Intf.pas

@@ -9,9 +9,9 @@ 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_ListaAnosFacturas = '{C9E93D4F-3A5E-4C8E-8305-B2AAB8E41C83}';
+  RID_ListaAnosFacturas = '{7D65E46A-1501-412C-A702-00A1827BA01E}';
-  RID_FacturasCliente = '{240D687B-A424-48A6-87C4-B55E1910A62F}';
+  RID_FacturasCliente = '{7CBEA816-E87B-47DF-AF37-8A26F50A8F89}';
-  RID_FacturasCliente_Detalles = '{103A3F35-8D1F-4517-AFFF-023722C59B2A}';
+  RID_FacturasCliente_Detalles = '{01274CC5-0F80-420B-9D15-D762FD8FAACA}';
 
   { Data table names }
   nme_ListaAnosFacturas = 'ListaAnosFacturas';
@@ -75,6 +75,9 @@ const
   fld_FacturasClienteREF_CONTRATO = 'REF_CONTRATO';
   fld_FacturasClienteREF_CLI_CONTRATO = 'REF_CLI_CONTRATO';
   fld_FacturasClienteSIN_COMISION = 'SIN_COMISION';
+  fld_FacturasClienteRETENCION = 'RETENCION';
+  fld_FacturasClienteIMPORTE_RETENCION = 'IMPORTE_RETENCION';
+  fld_FacturasClienteFECHA_RETENCION = 'FECHA_RETENCION';
 
   { FacturasCliente field indexes }
   idx_FacturasClienteID = 0;
@@ -127,6 +130,9 @@ const
   idx_FacturasClienteREF_CONTRATO = 47;
   idx_FacturasClienteREF_CLI_CONTRATO = 48;
   idx_FacturasClienteSIN_COMISION = 49;
+  idx_FacturasClienteRETENCION = 50;
+  idx_FacturasClienteIMPORTE_RETENCION = 51;
+  idx_FacturasClienteFECHA_RETENCION = 52;
 
   { FacturasCliente_Detalles fields }
   fld_FacturasCliente_DetallesID = 'ID';
@@ -165,7 +171,7 @@ const
 type
   { IListaAnosFacturas }
   IListaAnosFacturas = interface(IDAStronglyTypedDataTable)
-  ['{05716F30-A380-4511-8D1C-1CB66CE89B74}']
+  ['{C550D0F5-A742-4987-B656-2D1B8536B137}']
     { Property getters and setters }
     function GetANOValue: String;
     procedure SetANOValue(const aValue: String);
@@ -200,7 +206,7 @@ type
 
   { IFacturasCliente }
   IFacturasCliente = interface(IDAStronglyTypedDataTable)
-  ['{FFCE2216-A516-4FFC-B701-559E5CA69879}']
+  ['{5952F24E-C317-4659-B13F-23500E1555FF}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -401,6 +407,18 @@ type
     procedure SetSIN_COMISIONValue(const aValue: SmallInt);
     function GetSIN_COMISIONIsNull: Boolean;
     procedure SetSIN_COMISIONIsNull(const aValue: Boolean);
+    function GetRETENCIONValue: Float;
+    procedure SetRETENCIONValue(const aValue: Float);
+    function GetRETENCIONIsNull: Boolean;
+    procedure SetRETENCIONIsNull(const aValue: Boolean);
+    function GetIMPORTE_RETENCIONValue: Currency;
+    procedure SetIMPORTE_RETENCIONValue(const aValue: Currency);
+    function GetIMPORTE_RETENCIONIsNull: Boolean;
+    procedure SetIMPORTE_RETENCIONIsNull(const aValue: Boolean);
+    function GetFECHA_RETENCIONValue: DateTime;
+    procedure SetFECHA_RETENCIONValue(const aValue: DateTime);
+    function GetFECHA_RETENCIONIsNull: Boolean;
+    procedure SetFECHA_RETENCIONIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -504,6 +522,12 @@ type
     property REF_CLI_CONTRATOIsNull: Boolean read GetREF_CLI_CONTRATOIsNull write SetREF_CLI_CONTRATOIsNull;
     property SIN_COMISION: SmallInt read GetSIN_COMISIONValue write SetSIN_COMISIONValue;
     property SIN_COMISIONIsNull: Boolean read GetSIN_COMISIONIsNull write SetSIN_COMISIONIsNull;
+    property RETENCION: Float read GetRETENCIONValue write SetRETENCIONValue;
+    property RETENCIONIsNull: Boolean read GetRETENCIONIsNull write SetRETENCIONIsNull;
+    property IMPORTE_RETENCION: Currency read GetIMPORTE_RETENCIONValue write SetIMPORTE_RETENCIONValue;
+    property IMPORTE_RETENCIONIsNull: Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull;
+    property FECHA_RETENCION: DateTime read GetFECHA_RETENCIONValue write SetFECHA_RETENCIONValue;
+    property FECHA_RETENCIONIsNull: Boolean read GetFECHA_RETENCIONIsNull write SetFECHA_RETENCIONIsNull;
   end;
 
   { TFacturasClienteDataTableRules }
@@ -712,6 +736,18 @@ type
     procedure SetSIN_COMISIONValue(const aValue: SmallInt); virtual;
     function GetSIN_COMISIONIsNull: Boolean; virtual;
     procedure SetSIN_COMISIONIsNull(const aValue: Boolean); virtual;
+    function GetRETENCIONValue: Float; virtual;
+    procedure SetRETENCIONValue(const aValue: Float); virtual;
+    function GetRETENCIONIsNull: Boolean; virtual;
+    procedure SetRETENCIONIsNull(const aValue: Boolean); virtual;
+    function GetIMPORTE_RETENCIONValue: Currency; virtual;
+    procedure SetIMPORTE_RETENCIONValue(const aValue: Currency); virtual;
+    function GetIMPORTE_RETENCIONIsNull: Boolean; virtual;
+    procedure SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); virtual;
+    function GetFECHA_RETENCIONValue: DateTime; virtual;
+    procedure SetFECHA_RETENCIONValue(const aValue: DateTime); virtual;
+    function GetFECHA_RETENCIONIsNull: Boolean; virtual;
+    procedure SetFECHA_RETENCIONIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -814,6 +850,12 @@ type
     property REF_CLI_CONTRATOIsNull: Boolean read GetREF_CLI_CONTRATOIsNull write SetREF_CLI_CONTRATOIsNull;
     property SIN_COMISION: SmallInt read GetSIN_COMISIONValue write SetSIN_COMISIONValue;
     property SIN_COMISIONIsNull: Boolean read GetSIN_COMISIONIsNull write SetSIN_COMISIONIsNull;
+    property RETENCION: Float read GetRETENCIONValue write SetRETENCIONValue;
+    property RETENCIONIsNull: Boolean read GetRETENCIONIsNull write SetRETENCIONIsNull;
+    property IMPORTE_RETENCION: Currency read GetIMPORTE_RETENCIONValue write SetIMPORTE_RETENCIONValue;
+    property IMPORTE_RETENCIONIsNull: Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull;
+    property FECHA_RETENCION: DateTime read GetFECHA_RETENCIONValue write SetFECHA_RETENCIONValue;
+    property FECHA_RETENCIONIsNull: Boolean read GetFECHA_RETENCIONIsNull write SetFECHA_RETENCIONIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -823,7 +865,7 @@ type
 
   { IFacturasCliente_Detalles }
   IFacturasCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{2B6FCA91-CF89-45F3-B606-258098698EBE}']
+  ['{75045275-7B22-4D9A-A1BF-D5169B86855C}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2129,6 +2171,69 @@ begin
     DataTable.Fields[idx_FacturasClienteSIN_COMISION].AsVariant := Null;
 end;
 
+function TFacturasClienteDataTableRules.GetRETENCIONValue: Float;
+begin
+  result := DataTable.Fields[idx_FacturasClienteRETENCION].AsFloat;
+end;
+
+procedure TFacturasClienteDataTableRules.SetRETENCIONValue(const aValue: Float);
+begin
+  DataTable.Fields[idx_FacturasClienteRETENCION].AsFloat := aValue;
+end;
+
+function TFacturasClienteDataTableRules.GetRETENCIONIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasClienteRETENCION].IsNull;
+end;
+
+procedure TFacturasClienteDataTableRules.SetRETENCIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasClienteRETENCION].AsVariant := Null;
+end;
+
+function TFacturasClienteDataTableRules.GetIMPORTE_RETENCIONValue: Currency;
+begin
+  result := DataTable.Fields[idx_FacturasClienteIMPORTE_RETENCION].AsCurrency;
+end;
+
+procedure TFacturasClienteDataTableRules.SetIMPORTE_RETENCIONValue(const aValue: Currency);
+begin
+  DataTable.Fields[idx_FacturasClienteIMPORTE_RETENCION].AsCurrency := aValue;
+end;
+
+function TFacturasClienteDataTableRules.GetIMPORTE_RETENCIONIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasClienteIMPORTE_RETENCION].IsNull;
+end;
+
+procedure TFacturasClienteDataTableRules.SetIMPORTE_RETENCIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasClienteIMPORTE_RETENCION].AsVariant := Null;
+end;
+
+function TFacturasClienteDataTableRules.GetFECHA_RETENCIONValue: DateTime;
+begin
+  result := DataTable.Fields[idx_FacturasClienteFECHA_RETENCION].AsDateTime;
+end;
+
+procedure TFacturasClienteDataTableRules.SetFECHA_RETENCIONValue(const aValue: DateTime);
+begin
+  DataTable.Fields[idx_FacturasClienteFECHA_RETENCION].AsDateTime := aValue;
+end;
+
+function TFacturasClienteDataTableRules.GetFECHA_RETENCIONIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasClienteFECHA_RETENCION].IsNull;
+end;
+
+procedure TFacturasClienteDataTableRules.SetFECHA_RETENCIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasClienteFECHA_RETENCION].AsVariant := Null;
+end;
+
 
 { TFacturasCliente_DetallesDataTableRules }
 constructor TFacturasCliente_DetallesDataTableRules.Create(aDataTable: TDADataTable);

Source/Modulos/Facturas de cliente/Model/schFacturasClienteServer_Intf.pas

@@ -9,14 +9,14 @@ 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_ListaAnosFacturasDelta = '{42E63B9E-C30F-4EC7-94CA-5E04DD371267}';
+  RID_ListaAnosFacturasDelta = '{491A2F25-2666-44F0-9840-E59A6F5FE91C}';
-  RID_FacturasClienteDelta = '{5001B597-C42F-43E3-8F12-76971C88F8E8}';
+  RID_FacturasClienteDelta = '{E71F6BB9-24D4-45DC-872F-63B1B6081CEA}';
-  RID_FacturasCliente_DetallesDelta = '{E16AF380-A076-4EDB-9CB4-5446DBF8C9AE}';
+  RID_FacturasCliente_DetallesDelta = '{1AA87512-9077-40A2-80E2-62DEBD690640}';
 
 type
   { IListaAnosFacturasDelta }
   IListaAnosFacturasDelta = interface(IListaAnosFacturas)
-  ['{42E63B9E-C30F-4EC7-94CA-5E04DD371267}']
+  ['{491A2F25-2666-44F0-9840-E59A6F5FE91C}']
     { Property getters and setters }
     function GetOldANOValue : String;
 
@@ -50,7 +50,7 @@ type
 
   { IFacturasClienteDelta }
   IFacturasClienteDelta = interface(IFacturasCliente)
-  ['{5001B597-C42F-43E3-8F12-76971C88F8E8}']
+  ['{E71F6BB9-24D4-45DC-872F-63B1B6081CEA}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -102,6 +102,9 @@ type
     function GetOldREF_CONTRATOValue : String;
     function GetOldREF_CLI_CONTRATOValue : String;
     function GetOldSIN_COMISIONValue : SmallInt;
+    function GetOldRETENCIONValue : Float;
+    function GetOldIMPORTE_RETENCIONValue : Currency;
+    function GetOldFECHA_RETENCIONValue : DateTime;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -154,6 +157,9 @@ type
     property OldREF_CONTRATO : String read GetOldREF_CONTRATOValue;
     property OldREF_CLI_CONTRATO : String read GetOldREF_CLI_CONTRATOValue;
     property OldSIN_COMISION : SmallInt read GetOldSIN_COMISIONValue;
+    property OldRETENCION : Float read GetOldRETENCIONValue;
+    property OldIMPORTE_RETENCION : Currency read GetOldIMPORTE_RETENCIONValue;
+    property OldFECHA_RETENCION : DateTime read GetOldFECHA_RETENCIONValue;
   end;
 
   { TFacturasClienteBusinessProcessorRules }
@@ -462,6 +468,24 @@ type
     function GetOldSIN_COMISIONIsNull: Boolean; virtual;
     procedure SetSIN_COMISIONValue(const aValue: SmallInt); virtual;
     procedure SetSIN_COMISIONIsNull(const aValue: Boolean); virtual;
+    function GetRETENCIONValue: Float; virtual;
+    function GetRETENCIONIsNull: Boolean; virtual;
+    function GetOldRETENCIONValue: Float; virtual;
+    function GetOldRETENCIONIsNull: Boolean; virtual;
+    procedure SetRETENCIONValue(const aValue: Float); virtual;
+    procedure SetRETENCIONIsNull(const aValue: Boolean); virtual;
+    function GetIMPORTE_RETENCIONValue: Currency; virtual;
+    function GetIMPORTE_RETENCIONIsNull: Boolean; virtual;
+    function GetOldIMPORTE_RETENCIONValue: Currency; virtual;
+    function GetOldIMPORTE_RETENCIONIsNull: Boolean; virtual;
+    procedure SetIMPORTE_RETENCIONValue(const aValue: Currency); virtual;
+    procedure SetIMPORTE_RETENCIONIsNull(const aValue: Boolean); virtual;
+    function GetFECHA_RETENCIONValue: DateTime; virtual;
+    function GetFECHA_RETENCIONIsNull: Boolean; virtual;
+    function GetOldFECHA_RETENCIONValue: DateTime; virtual;
+    function GetOldFECHA_RETENCIONIsNull: Boolean; virtual;
+    procedure SetFECHA_RETENCIONValue(const aValue: DateTime); virtual;
+    procedure SetFECHA_RETENCIONIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -664,6 +688,18 @@ type
     property SIN_COMISIONIsNull : Boolean read GetSIN_COMISIONIsNull write SetSIN_COMISIONIsNull;
     property OldSIN_COMISION : SmallInt read GetOldSIN_COMISIONValue;
     property OldSIN_COMISIONIsNull : Boolean read GetOldSIN_COMISIONIsNull;
+    property RETENCION : Float read GetRETENCIONValue write SetRETENCIONValue;
+    property RETENCIONIsNull : Boolean read GetRETENCIONIsNull write SetRETENCIONIsNull;
+    property OldRETENCION : Float read GetOldRETENCIONValue;
+    property OldRETENCIONIsNull : Boolean read GetOldRETENCIONIsNull;
+    property IMPORTE_RETENCION : Currency read GetIMPORTE_RETENCIONValue write SetIMPORTE_RETENCIONValue;
+    property IMPORTE_RETENCIONIsNull : Boolean read GetIMPORTE_RETENCIONIsNull write SetIMPORTE_RETENCIONIsNull;
+    property OldIMPORTE_RETENCION : Currency read GetOldIMPORTE_RETENCIONValue;
+    property OldIMPORTE_RETENCIONIsNull : Boolean read GetOldIMPORTE_RETENCIONIsNull;
+    property FECHA_RETENCION : DateTime read GetFECHA_RETENCIONValue write SetFECHA_RETENCIONValue;
+    property FECHA_RETENCIONIsNull : Boolean read GetFECHA_RETENCIONIsNull write SetFECHA_RETENCIONIsNull;
+    property OldFECHA_RETENCION : DateTime read GetOldFECHA_RETENCIONValue;
+    property OldFECHA_RETENCIONIsNull : Boolean read GetOldFECHA_RETENCIONIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -673,7 +709,7 @@ type
 
   { IFacturasCliente_DetallesDelta }
   IFacturasCliente_DetallesDelta = interface(IFacturasCliente_Detalles)
-  ['{E16AF380-A076-4EDB-9CB4-5446DBF8C9AE}']
+  ['{1AA87512-9077-40A2-80E2-62DEBD690640}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;
@@ -2490,6 +2526,99 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteSIN_COMISION] := Null;
 end;
 
+function TFacturasClienteBusinessProcessorRules.GetRETENCIONValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteRETENCION];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetRETENCIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteRETENCION]);
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldRETENCIONValue: Float;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteRETENCION];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldRETENCIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteRETENCION]);
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetRETENCIONValue(const aValue: Float);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteRETENCION] := aValue;
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetRETENCIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteRETENCION] := Null;
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetIMPORTE_RETENCIONValue: Currency;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteIMPORTE_RETENCION];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetIMPORTE_RETENCIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteIMPORTE_RETENCION]);
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldIMPORTE_RETENCIONValue: Currency;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteIMPORTE_RETENCION];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldIMPORTE_RETENCIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteIMPORTE_RETENCION]);
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetIMPORTE_RETENCIONValue(const aValue: Currency);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteIMPORTE_RETENCION] := aValue;
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetIMPORTE_RETENCIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteIMPORTE_RETENCION] := Null;
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetFECHA_RETENCIONValue: DateTime;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteFECHA_RETENCION];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetFECHA_RETENCIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteFECHA_RETENCION]);
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldFECHA_RETENCIONValue: DateTime;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteFECHA_RETENCION];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldFECHA_RETENCIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteFECHA_RETENCION]);
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetFECHA_RETENCIONValue(const aValue: DateTime);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteFECHA_RETENCION] := aValue;
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetFECHA_RETENCIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteFECHA_RETENCION] := Null;
+end;
+
 
 { TFacturasCliente_DetallesBusinessProcessorRules }
 constructor TFacturasCliente_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

Source/Modulos/Facturas de cliente/Model/uBizFacturasCliente.pas

@@ -44,6 +44,7 @@ type
     procedure CalcularDescuento;
     procedure CalcularIVA;
     procedure CalcularRE;
+    procedure CalcularRetencion;
     procedure CalcularBaseImponible;
     procedure AsignarTipoIVA (IDTipoIVA : Integer);
 
@@ -69,6 +70,7 @@ type
     procedure DESCUENTOOnChange(Sender: TDACustomField);
     procedure IVAOnChange(Sender: TDACustomField);
     procedure REOnChange(Sender: TDACustomField);
+    procedure RetencionOnChange(Sender: TDACustomField);
 		procedure SetID_TIENDAValue(const aValue: Integer);
 		procedure SetID_SUBCUENTAValue(const aValue: Integer);
 
@@ -157,7 +159,8 @@ begin
     CalcularBaseImponible;
     CalcularIVA;
     CalcularRE;
-
+    CalcularRetencion;
+    
     if not Self.DataTable.Editing then
       Edit;
     IMPORTE_TOTAL := BASE_IMPONIBLE + IMPORTE_IVA + IMPORTE_RE;
@@ -181,6 +184,13 @@ begin
   IMPORTE_RE := (RE / 100) * BASE_IMPONIBLE;
 end;
 
+procedure TBizFacturaCliente.CalcularRetencion;
+begin
+  if not Self.DataTable.Editing then
+    Edit;
+  IMPORTE_RETENCION := (RETENCION / 100) * BASE_IMPONIBLE;
+end;
+
 constructor TBizFacturaCliente.Create(aDataTable: TDADataTable);
 begin
   inherited;
@@ -196,6 +206,7 @@ begin
     FieldByName(fld_FacturasClienteDESCUENTO).OnChange := DESCUENTOOnChange;
     FieldByName(fld_FacturasClienteIVA).OnChange := IVAOnChange;
     FieldByName(fld_FacturasClienteRE).OnChange := REOnChange;
+    FieldByName(fld_FacturasClienteRetencion).OnChange := RetencionOnChange;
   end;
 
   FDetallesLink := TDADataSource.Create(NIL);
@@ -316,6 +327,11 @@ begin
   CalcularImporteTotal;
 end;
 
+procedure TBizFacturaCliente.RetencionOnChange(Sender: TDACustomField);
+begin
+  CalcularImporteTotal;
+end;
+
 procedure TBizFacturaCliente.SetCliente(AValue: IBizCliente);
 var
   bEnEdicion : Boolean;

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

@@ -149,6 +149,18 @@ object RptFacturasCliente: TRptFacturasCliente
         DataType = datString
         Size = 255
       end
+      item
+        Name = 'RETENCION'
+        DataType = datFloat
+      end
+      item
+        Name = 'IMPORTE_RETENCION'
+        DataType = datCurrency
+      end
+      item
+        Name = 'FECHA_RETENCION'
+        DataType = datDateTime
+      end
       item
         Name = 'TITULAR'
         DataType = datString
@@ -488,9 +500,10 @@ object RptFacturasCliente: TRptFacturasCliente
               #39' || extract (year from fecha_factura)'#10'when extract (month from ' +
               'fecha_factura) = 12 then '#39'DICIEMBRE - '#39' || extract (year from fe' +
               'cha_factura)'#10'end as TITULO,'#10'REFERENCIA,  ID_CLIENTE, NOMBRE, SIT' +
-              'UACION, NIF_CIF, REFERENCIA_CLIENTE, FECHA_FACTURA, BASE_IMPONIB' +
+              'UACION, NIF_CIF, REFERENCIA_CLIENTE, FECHA_FACTURA, FECHA_VENCIM' +
-              'LE, IVA, IMPORTE_IVA, IMPORTE_TOTAL'#10#10'from V_facturas_cliente'#10'whe' +
+              'IENTO, BASE_IMPONIBLE, IVA, IMPORTE_IVA, IMPORTE_TOTAL'#10#10'from V_f' +
-              're {where}'#10'order by ANO, MES, FECHA_FACTURA, NOMBRE'#10#10
+              'acturas_cliente'#10'where {where}'#10'order by ANO, MES, FECHA_FACTURA, ' +
+              'NOMBRE'#10#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -552,6 +565,10 @@ object RptFacturasCliente: TRptFacturasCliente
               item
                 DatasetField = 'IVA'
                 TableField = 'IVA'
+              end
+              item
+                DatasetField = 'FECHA_VENCIMIENTO'
+                TableField = 'FECHA_VENCIMIENTO'
               end>
           end>
         Name = 'ListadoFacturas'
@@ -606,6 +623,10 @@ object RptFacturasCliente: TRptFacturasCliente
             Name = 'FECHA_FACTURA'
             DataType = datDateTime
           end
+          item
+            Name = 'FECHA_VENCIMIENTO'
+            DataType = datDateTime
+          end
           item
             Name = 'BASE_IMPONIBLE'
             DataType = datCurrency
@@ -648,21 +669,22 @@ object RptFacturasCliente: TRptFacturasCliente
               'CTURAS_CLIENTE.REFERENCIA_CLIENTE, V_FACTURAS_CLIENTE.NIF_CIF, V' +
               '_FACTURAS_CLIENTE.NOMBRE, V_FACTURAS_CLIENTE.CALLE,'#10'    V_FACTUR' +
               'AS_CLIENTE.PROVINCIA, V_FACTURAS_CLIENTE.CODIGO_POSTAL, V_FACTUR' +
-              'AS_CLIENTE.POBLACION,'#10'    V_FACTURAS_CLIENTE.REF_CLI_CONTRATO,'#10' ' +
+              'AS_CLIENTE.POBLACION,'#10'    V_FACTURAS_CLIENTE.REF_CLI_CONTRATO, V' +
-              '   CONTACTOS_DATOS_BANCO.TITULAR,'#10'    CONTACTOS_DATOS_BANCO.ENTI' +
+              '_FACTURAS_CLIENTE.RETENCION, V_FACTURAS_CLIENTE.IMPORTE_RETENCIO' +
-              'DAD,'#10'    CONTACTOS_DATOS_BANCO.SUCURSAL,'#10'    CONTACTOS_DATOS_BAN' +
+              'N, V_FACTURAS_CLIENTE.FECHA_RETENCION,'#10'    CONTACTOS_DATOS_BANCO' +
-              'CO.DC,'#10'    CONTACTOS_DATOS_BANCO.CUENTA,'#10'    ID_EMPRESA, EMPRESA' +
+              '.TITULAR,'#10'    CONTACTOS_DATOS_BANCO.ENTIDAD,'#10'    CONTACTOS_DATOS' +
-              'S.NIF_CIF as NIF_CIF_EMPRESA, EMPRESAS.RAZON_SOCIAL,'#10'    EMPRESA' +
+              '_BANCO.SUCURSAL,'#10'    CONTACTOS_DATOS_BANCO.DC,'#10'    CONTACTOS_DAT' +
-              'S.CALLE as CALLE_EMPRESA, EMPRESAS.POBLACION as POBLACION_EMPRES' +
+              'OS_BANCO.CUENTA,'#10'    ID_EMPRESA, EMPRESAS.NIF_CIF as NIF_CIF_EMP' +
-              'A,'#10'    EMPRESAS.PROVINCIA as PROVINCIA_EMPRESA, EMPRESAS.CODIGO_' +
+              'RESA, EMPRESAS.RAZON_SOCIAL,'#10'    EMPRESAS.CALLE as CALLE_EMPRESA' +
-              'POSTAL as CODIGO_POSTAL_EMPRESA,'#10'    EMPRESAS.TELEFONO_1, EMPRES' +
+              ', EMPRESAS.POBLACION as POBLACION_EMPRESA,'#10'    EMPRESAS.PROVINCI' +
-              'AS.FAX, EMPRESAS.MOVIL_1, EMPRESAS.EMAIL_1,'#10'    EMPRESAS.PAGINA_' +
+              'A as PROVINCIA_EMPRESA, EMPRESAS.CODIGO_POSTAL as CODIGO_POSTAL_' +
-              'WEB, EMPRESAS.REGISTRO_MERCANTIL, EMPRESAS.LOGOTIPO'#10'FROM V_FACTU' +
+              'EMPRESA,'#10'    EMPRESAS.TELEFONO_1, EMPRESAS.FAX, EMPRESAS.MOVIL_1' +
-              'RAS_CLIENTE'#10'LEFT JOIN EMPRESAS ON EMPRESAS.ID = ID_EMPRESA'#10'LEFT ' +
+              ', EMPRESAS.EMAIL_1,'#10'    EMPRESAS.PAGINA_WEB, EMPRESAS.REGISTRO_M' +
-              'JOIN FORMAS_PAGO ON (FORMAS_PAGO.ID = V_FACTURAS_CLIENTE.ID_FORM' +
+              'ERCANTIL, EMPRESAS.LOGOTIPO'#10'FROM V_FACTURAS_CLIENTE'#10'LEFT JOIN EM' +
-              'A_PAGO)'#10'LEFT JOIN CONTACTOS_DATOS_BANCO ON (CONTACTOS_DATOS_BANC' +
+              'PRESAS ON EMPRESAS.ID = ID_EMPRESA'#10'LEFT JOIN FORMAS_PAGO ON (FOR' +
-              'O.ID_CONTACTO = V_FACTURAS_CLIENTE.ID_CLIENTE)'#10'WHERE V_FACTURAS_' +
+              'MAS_PAGO.ID = V_FACTURAS_CLIENTE.ID_FORMA_PAGO)'#10'LEFT JOIN CONTAC' +
-              'CLIENTE.ID = :ID'#10
+              'TOS_DATOS_BANCO ON (CONTACTOS_DATOS_BANCO.ID_CONTACTO = V_FACTUR' +
+              'AS_CLIENTE.ID_CLIENTE)'#10'WHERE V_FACTURAS_CLIENTE.ID = :ID'#10
             StatementType = stSQL
             ColumnMappings = <
               item
@@ -862,6 +884,18 @@ object RptFacturasCliente: TRptFacturasCliente
                 DatasetField = 'REF_CLI_CONTRATO'
                 TableField = '<unknown>'
                 SQLOrigin = 'REF_CLI_CONTRATO'
+              end
+              item
+                DatasetField = 'RETENCION'
+                TableField = 'RETENCION'
+              end
+              item
+                DatasetField = 'IMPORTE_RETENCION'
+                TableField = 'IMPORTE_RETENCION'
+              end
+              item
+                DatasetField = 'FECHA_RETENCION'
+                TableField = 'FECHA_RETENCION'
               end>
           end>
         Name = 'InformeFacturasCliente'
@@ -996,6 +1030,18 @@ object RptFacturasCliente: TRptFacturasCliente
             DataType = datString
             Size = 255
           end
+          item
+            Name = 'RETENCION'
+            DataType = datFloat
+          end
+          item
+            Name = 'IMPORTE_RETENCION'
+            DataType = datCurrency
+          end
+          item
+            Name = 'FECHA_RETENCION'
+            DataType = datDateTime
+          end
           item
             Name = 'TITULAR'
             DataType = datString
@@ -1565,7 +1611,7 @@ object RptFacturasCliente: TRptFacturasCliente
     PrintOptions.Printer = 'Por defecto'
     PrintOptions.PrintOnSheet = 0
     ReportOptions.CreateDate = 37800.807714351900000000
-    ReportOptions.LastChange = 40959.582460520830000000
+    ReportOptions.LastChange = 42380.750037025460000000
     ScriptLanguage = 'PascalScript'
     ShowProgress = False
     StoreInDFM = False

Source/Modulos/Facturas de cliente/Servidor/srvFacturasCliente_Impl.dfm

@@ -247,6 +247,18 @@ object srvFacturasCliente: TsrvFacturasCliente
               item
                 DatasetField = 'REF_CLI_CONTRATO'
                 TableField = 'REF_CLI_CONTRATO'
+              end
+              item
+                DatasetField = 'RETENCION'
+                TableField = 'RETENCION'
+              end
+              item
+                DatasetField = 'IMPORTE_RETENCION'
+                TableField = 'IMPORTE_RETENCION'
+              end
+              item
+                DatasetField = 'FECHA_RETENCION'
+                TableField = 'FECHA_RETENCION'
               end>
           end>
         Name = 'FacturasCliente'
@@ -524,6 +536,18 @@ object srvFacturasCliente: TsrvFacturasCliente
             Name = 'SIN_COMISION'
             DataType = datSmallInt
             DictionaryEntry = 'FacturasCliente_SIN_COMISION'
+          end
+          item
+            Name = 'RETENCION'
+            DataType = datFloat
+          end
+          item
+            Name = 'IMPORTE_RETENCION'
+            DataType = datCurrency
+          end
+          item
+            Name = 'FECHA_RETENCION'
+            DataType = datDateTime
           end>
       end
       item
@@ -1126,6 +1150,21 @@ object srvFacturasCliente: TsrvFacturasCliente
             DataType = datString
             Size = 255
             Value = ''
+          end
+          item
+            Name = 'RETENCION'
+            DataType = datFloat
+            Value = ''
+          end
+          item
+            Name = 'IMPORTE_RETENCION'
+            DataType = datCurrency
+            Value = ''
+          end
+          item
+            Name = 'FECHA_RETENCION'
+            DataType = datDateTime
+            Value = ''
           end>
         Statements = <
           item
@@ -1142,16 +1181,18 @@ object srvFacturasCliente: TsrvFacturasCliente
               'RIO,'#10'    ID_FORMA_PAGO,'#10'    RECARGO_EQUIVALENCIA,'#10'    ID_TIPO_IV' +
               'A,'#10'    IMPORTE_NETO,'#10'    IMPORTE_PORTE,'#10'    IGNORAR_CONTABILIDAD' +
               ','#10'    ID_TIENDA,'#10'    ID_CONTRATO,'#10'    SIN_COMISION,'#10'    SITUACIO' +
-              'N)'#10'  VALUES ('#10'    :ID,'#10'    :ID_EMPRESA,'#10'    :REFERENCIA,'#10'    :FE' +
+              'N,'#10'    RETENCION,'#10'    IMPORTE_RETENCION,'#10'    FECHA_RETENCION)'#10'  ' +
-              'CHA_FACTURA,'#10'    :FECHA_VENCIMIENTO,'#10'    :BASE_IMPONIBLE,'#10'    :D' +
+              'VALUES ('#10'    :ID,'#10'    :ID_EMPRESA,'#10'    :REFERENCIA,'#10'    :FECHA_F' +
-              'ESCUENTO,'#10'    :IMPORTE_DESCUENTO,'#10'    :IVA,'#10'    :IMPORTE_IVA,'#10'  ' +
+              'ACTURA,'#10'    :FECHA_VENCIMIENTO,'#10'    :BASE_IMPONIBLE,'#10'    :DESCUE' +
-              '  :RE,'#10'    :IMPORTE_RE,'#10'    :IMPORTE_TOTAL,'#10'    :OBSERVACIONES,'#10 +
+              'NTO,'#10'    :IMPORTE_DESCUENTO,'#10'    :IVA,'#10'    :IMPORTE_IVA,'#10'    :RE' +
-              '    :ID_CLIENTE,'#10'    :NIF_CIF,'#10'    :NOMBRE,'#10'    :CALLE,'#10'    :POB' +
+              ','#10'    :IMPORTE_RE,'#10'    :IMPORTE_TOTAL,'#10'    :OBSERVACIONES,'#10'    :' +
-              'LACION,'#10'    :PROVINCIA,'#10'    :CODIGO_POSTAL,'#10'    CURRENT_TIMESTAM' +
+              'ID_CLIENTE,'#10'    :NIF_CIF,'#10'    :NOMBRE,'#10'    :CALLE,'#10'    :POBLACIO' +
-              'P,'#10'    :USUARIO,'#10'    :ID_FORMA_PAGO,'#10'    :RECARGO_EQUIVALENCIA,'#10 +
+              'N,'#10'    :PROVINCIA,'#10'    :CODIGO_POSTAL,'#10'    CURRENT_TIMESTAMP,'#10'  ' +
-              '    :ID_TIPO_IVA,'#10'    :IMPORTE_NETO,'#10'    :IMPORTE_PORTE,'#10'    :IG' +
+              '  :USUARIO,'#10'    :ID_FORMA_PAGO,'#10'    :RECARGO_EQUIVALENCIA,'#10'    :' +
-              'NORAR_CONTABILIDAD,'#10'    :ID_TIENDA,'#10'    :ID_CONTRATO,'#10'    :SIN_C' +
+              'ID_TIPO_IVA,'#10'    :IMPORTE_NETO,'#10'    :IMPORTE_PORTE,'#10'    :IGNORAR' +
-              'OMISION,'#10'    :SITUACION);'#10
+              '_CONTABILIDAD,'#10'    :ID_TIENDA,'#10'    :ID_CONTRATO,'#10'    :SIN_COMISI' +
+              'ON,'#10'    :SITUACION,'#10'    :RETENCION,'#10'    :IMPORTE_RETENCION,'#10'    ' +
+              ':FECHA_RETENCION);'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1323,6 +1364,21 @@ object srvFacturasCliente: TsrvFacturasCliente
             Size = 255
             Value = ''
           end
+          item
+            Name = 'RETENCION'
+            DataType = datFloat
+            Value = ''
+          end
+          item
+            Name = 'IMPORTE_RETENCION'
+            DataType = datCurrency
+            Value = ''
+          end
+          item
+            Name = 'FECHA_RETENCION'
+            DataType = datDateTime
+            Value = ''
+          end
           item
             Name = 'OLD_ID'
             Value = ''
@@ -1348,7 +1404,9 @@ object srvFacturasCliente: TsrvFacturasCliente
               'TO = :IMPORTE_NETO,'#10'    IMPORTE_PORTE = :IMPORTE_PORTE,'#10'    IGNO' +
               'RAR_CONTABILIDAD = :IGNORAR_CONTABILIDAD,'#10'    ID_TIENDA = :ID_TI' +
               'ENDA,'#10'    ID_CONTRATO = :ID_CONTRATO,'#10'    SIN_COMISION = :SIN_CO' +
-              'MISION,'#10'    SITUACION = :SITUACION'#10'  WHERE'#10'  (ID = :OLD_ID);'#10
+              'MISION,'#10'    SITUACION = :SITUACION,'#10'    RETENCION = :RETENCION,'#10 +
+              '    IMPORTE_RETENCION = :IMPORTE_RETENCION,'#10'    FECHA_RETENCION ' +
+              '= :FECHA_RETENCION'#10'  WHERE'#10'  (ID = :OLD_ID);'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

Source/Modulos/Facturas de cliente/Views/FacturasCliente_view.dproj

@@ -49,48 +49,48 @@
     <DelphiCompile Include="FacturasCliente_view.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\..\..\Servidor\adortl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\adortl.dcp" />
-    <DCCReference Include="..\..\..\Servidor\AlbCli_FacCli_relation.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\AlbCli_FacCli_relation.dcp" />
-    <DCCReference Include="..\..\..\Servidor\Articulos_view.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Articulos_view.dcp" />
-    <DCCReference Include="..\..\..\Servidor\bdertl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\bdertl.dcp" />
-    <DCCReference Include="..\..\..\Servidor\Contabilidad_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Contabilidad_controller.dcp" />
-    <DCCReference Include="..\..\..\Servidor\Contabilidad_view.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Contabilidad_view.dcp" />
-    <DCCReference Include="..\..\..\Servidor\Contactos_view.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Contactos_view.dcp" />
-    <DCCReference Include="..\..\..\Servidor\cxDataD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxDataD11.dcp" />
-    <DCCReference Include="..\..\..\Servidor\cxEditorsD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxEditorsD11.dcp" />
-    <DCCReference Include="..\..\..\Servidor\cxLibraryD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\cxLibraryD11.dcp" />
-    <DCCReference Include="..\..\..\Servidor\DataAbstract_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\DataAbstract_Core_D11.dcp" />
-    <DCCReference Include="..\..\..\Servidor\dbrtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dbrtl.dcp" />
-    <DCCReference Include="..\..\..\Servidor\dsnap.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dsnap.dcp" />
-    <DCCReference Include="..\..\..\Servidor\dxComnD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxComnD11.dcp" />
-    <DCCReference Include="..\..\..\Servidor\dxGDIPlusD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\..\..\Servidor\dxLayoutControlD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\..\..\Servidor\dxThemeD11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\dxThemeD11.dcp" />
-    <DCCReference Include="..\..\..\Servidor\FacturasCliente_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\FacturasCliente_controller.dcp" />
-    <DCCReference Include="..\..\..\Servidor\FacturasCliente_model.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\FacturasCliente_model.dcp" />
-    <DCCReference Include="..\..\..\Servidor\fqb110.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\fqb110.dcp" />
-    <DCCReference Include="..\..\..\Servidor\frx11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\frx11.dcp" />
-    <DCCReference Include="..\..\..\Servidor\frxe11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\frxe11.dcp" />
-    <DCCReference Include="..\..\..\Servidor\fs11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\fs11.dcp" />
-    <DCCReference Include="..\..\..\Servidor\GestorInformes_controller.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GestorInformes_controller.dcp" />
-    <DCCReference Include="..\..\..\Servidor\GUIBase.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\GUIBase.dcp" />
-    <DCCReference Include="..\..\..\Servidor\Jcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\Jcl.dcp" />
-    <DCCReference Include="..\..\..\Servidor\JclVcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JclVcl.dcp" />
-    <DCCReference Include="..\..\..\Servidor\JvCoreD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvCoreD11R.dcp" />
-    <DCCReference Include="..\..\..\Servidor\JvPageCompsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvPageCompsD11R.dcp" />
-    <DCCReference Include="..\..\..\Servidor\JvStdCtrlsD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvStdCtrlsD11R.dcp" />
-    <DCCReference Include="..\..\..\Servidor\JvSystemD11R.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\JvSystemD11R.dcp" />
-    <DCCReference Include="..\..\..\Servidor\PngComponentsD10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PngComponentsD10.dcp" />
-    <DCCReference Include="..\..\..\Servidor\PNG_D10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\PNG_D10.dcp" />
-    <DCCReference Include="..\..\..\Servidor\RemObjects_Core_D11.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\RemObjects_Core_D11.dcp" />
-    <DCCReference Include="..\..\..\Servidor\rtl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\rtl.dcp" />
-    <DCCReference Include="..\..\..\Servidor\tb2k_d10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\tb2k_d10.dcp" />
-    <DCCReference Include="..\..\..\Servidor\tbx_d10.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\tbx_d10.dcp" />
-    <DCCReference Include="..\..\..\Servidor\vcl.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcl.dcp" />
-    <DCCReference Include="..\..\..\Servidor\vclactnband.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclactnband.dcp" />
-    <DCCReference Include="..\..\..\Servidor\vcldb.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcldb.dcp" />
-    <DCCReference Include="..\..\..\Servidor\vcljpg.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vcljpg.dcp" />
-    <DCCReference Include="..\..\..\Servidor\vclx.dcp" />
+    <DCCReference Include="C:\Documents and Settings\Usuario\vclx.dcp" />
     <DCCReference Include="uEditorElegirArticulosFacturaCliente.pas">
       <Form>fEditorElegirArticulosFacturaCliente</Form>
       <DesignClass>TForm</DesignClass>

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

@@ -70,32 +70,32 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
     end
   end
   inherited StatusBar: TJvStatusBar
-    Top = 643
+    Top = 423
     Width = 860
     Panels = <
       item
         Width = 200
       end>
-    ExplicitTop = 643
+    ExplicitTop = 423
     ExplicitWidth = 860
   end
   inherited pgPaginas: TPageControl
     Width = 854
-    Height = 365
+    Height = 308
     OnChanging = pgPaginasChanging
     ExplicitTop = 112
     ExplicitWidth = 854
-    ExplicitHeight = 365
+    ExplicitHeight = 308
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
       ExplicitWidth = 846
-      ExplicitHeight = 337
+      ExplicitHeight = 280
       inline frViewFacturaCliente1: TfrViewFacturaCliente
         Left = 0
         Top = 0
         Width = 846
-        Height = 337
+        Height = 280
         Align = alClient
         Font.Charset = DEFAULT_CHARSET
         Font.Color = clWindowText
@@ -106,12 +106,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 846
-        ExplicitHeight = 337
+        ExplicitHeight = 280
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 846
-          Height = 337
+          Height = 280
           ExplicitWidth = 846
-          ExplicitHeight = 337
+          ExplicitHeight = 280
           inherited eReferencia: TcxDBTextEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
@@ -270,7 +270,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         Left = 0
         Top = 0
         Width = 846
-        Height = 337
+        Height = 280
         Align = alClient
         BiDiMode = bdLeftToRight
         Font.Charset = DEFAULT_CHARSET
@@ -283,7 +283,7 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         TabOrder = 0
         ReadOnly = False
         ExplicitWidth = 846
-        ExplicitHeight = 337
+        ExplicitHeight = 280
         inherited ToolBar1: TToolBar
           Width = 846
           Height = 24
@@ -313,67 +313,67 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
             ExplicitWidth = 57
           end
           inherited UpDown1: TUpDown
-            Left = 570
+            Left = 588
             Top = 0
-            ExplicitLeft = 570
+            ExplicitLeft = 588
             ExplicitTop = 0
           end
           inherited ToolButton13: TToolButton
-            Left = 587
+            Left = 605
             Top = 0
-            ExplicitLeft = 587
+            ExplicitLeft = 605
             ExplicitTop = 0
           end
           inherited ToolButton6: TToolButton
-            Left = 595
+            Left = 613
             Top = 0
-            ExplicitLeft = 595
+            ExplicitLeft = 613
             ExplicitTop = 0
           end
           inherited ToolButton7: TToolButton
-            Left = 629
+            Left = 647
             Top = 0
-            ExplicitLeft = 629
+            ExplicitLeft = 647
             ExplicitTop = 0
           end
           inherited ToolButton8: TToolButton
-            Left = 663
+            Left = 681
             Top = 0
-            ExplicitLeft = 663
+            ExplicitLeft = 681
             ExplicitTop = 0
           end
           inherited ToolButton12: TToolButton
-            Left = 697
+            Left = 715
             Top = 0
-            ExplicitLeft = 697
+            ExplicitLeft = 715
             ExplicitTop = 0
           end
           inherited ToolButton9: TToolButton
-            Left = 705
+            Left = 723
             Top = 0
-            ExplicitLeft = 705
+            ExplicitLeft = 723
             ExplicitTop = 0
           end
           inherited ToolButton10: TToolButton
-            Left = 739
+            Left = 757
             Top = 0
-            ExplicitLeft = 739
+            ExplicitLeft = 757
             ExplicitTop = 0
           end
           inherited ToolButton11: TToolButton
-            Left = 773
+            Left = 791
             Top = 0
-            ExplicitLeft = 773
+            ExplicitLeft = 791
             ExplicitTop = 0
           end
         end
         inherited cxGrid: TcxGrid
           Top = 50
           Width = 846
-          Height = 287
+          Height = 230
           ExplicitTop = 50
           ExplicitWidth = 846
-          ExplicitHeight = 287
+          ExplicitHeight = 230
         end
         inherited TBXDock1: TTBXDock
           Top = 24
@@ -453,9 +453,9 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
   end
   inline frViewTotales1: TfrViewTotales [5]
     Left = 0
-    Top = 480
+    Top = 442
     Width = 860
-    Height = 163
+    Height = 220
     Align = alBottom
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -465,29 +465,43 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
     ParentFont = False
     TabOrder = 4
     ReadOnly = False
-    ExplicitTop = 480
+    ExplicitTop = 442
     ExplicitWidth = 860
-    ExplicitHeight = 163
+    ExplicitHeight = 220
     inherited dxLayoutControl1: TdxLayoutControl
       Width = 860
       LookAndFeel = frViewFacturaCliente1.dxLayoutOfficeLookAndFeel1
       ExplicitWidth = 860
       inherited Bevel3: TBevel
-        Left = 457
+        Left = 404
         Top = 30
         Height = 122
-        ExplicitLeft = 457
+        ExplicitLeft = 404
         ExplicitTop = 30
         ExplicitHeight = 122
       end
       inherited Bevel4: TBevel
-        Left = 569
+        Left = 516
         Top = 57
         Width = 186
-        ExplicitLeft = 569
+        ExplicitLeft = 516
         ExplicitTop = 57
         ExplicitWidth = 186
       end
+      inherited Bevel2: TBevel
+        Top = 185
+        Width = 333
+        ExplicitTop = 185
+        ExplicitWidth = 333
+      end
+      inherited Bevel1: TBevel
+        Left = 423
+        Top = 185
+        Width = 332
+        ExplicitLeft = 423
+        ExplicitTop = 185
+        ExplicitWidth = 332
+      end
       inherited ImporteDto: TcxDBCurrencyEdit
         Top = 57
         Style.LookAndFeel.SkinName = ''
@@ -500,27 +514,27 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         Width = 220
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 640
+        Left = 587
         Top = 77
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 640
+        ExplicitLeft = 587
         ExplicitTop = 77
         ExplicitWidth = 155
         Width = 155
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 570
+        Left = 517
         Top = 158
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 570
+        ExplicitLeft = 517
         ExplicitTop = 158
         ExplicitWidth = 225
         Width = 225
@@ -536,31 +550,31 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         ExplicitTop = 57
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 569
+        Left = 516
         Top = 77
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 569
+        ExplicitLeft = 516
         ExplicitTop = 77
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 569
+        Left = 516
         Top = 30
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 569
+        ExplicitLeft = 516
         ExplicitTop = 30
         ExplicitWidth = 226
         Width = 226
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 569
+        Left = 516
         Top = 131
         Properties.AssignedValues.MinValue = True
         Style.LookAndFeel.SkinName = ''
@@ -568,34 +582,34 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 569
+        ExplicitLeft = 516
         ExplicitTop = 131
       end
       inherited edtIRPF: TcxDBSpinEdit
-        Left = 569
+        Left = 516
         Top = 104
         Style.IsFontAssigned = True
-        ExplicitLeft = 569
+        ExplicitLeft = 516
         ExplicitTop = 104
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 640
+        Left = 587
         Top = 131
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 640
+        ExplicitLeft = 587
         ExplicitTop = 131
         ExplicitWidth = 155
         Width = 155
       end
       inherited ImporteIRPF: TcxDBCurrencyEdit
-        Left = 640
+        Left = 587
         Top = 104
         Style.IsFontAssigned = True
-        ExplicitLeft = 640
+        ExplicitLeft = 587
         ExplicitTop = 104
         ExplicitWidth = 56
         Width = 56
@@ -638,10 +652,10 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         Width = 153
       end
       inherited bTiposIVA: TButton
-        Left = 309
+        Left = 256
         Top = 111
         OnClick = frViewTotales1bTiposIVAClick
-        ExplicitLeft = 309
+        ExplicitLeft = 256
         ExplicitTop = 111
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
@@ -654,6 +668,35 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
         ExplicitWidth = 291
         Width = 291
       end
+      inherited edtRetencion: TcxDBSpinEdit
+        Left = 516
+        Top = 200
+        DataBinding.DataField = 'RETENCION'
+        Style.IsFontAssigned = True
+        ExplicitLeft = 516
+        ExplicitTop = 200
+      end
+      inherited edtImporteRetencion: TcxDBCurrencyEdit
+        Left = 587
+        Top = 200
+        DataBinding.DataField = 'IMPORTE_RETENCION'
+        Style.IsFontAssigned = True
+        ExplicitLeft = 587
+        ExplicitTop = 200
+        ExplicitWidth = 342
+        Width = 342
+      end
+      inherited edtFechaRetencion: TcxDBDateEdit
+        Top = 200
+        DataBinding.DataField = 'FECHA_RETENCION'
+        Style.LookAndFeel.SkinName = ''
+        StyleDisabled.LookAndFeel.SkinName = ''
+        StyleFocused.LookAndFeel.SkinName = ''
+        StyleHot.LookAndFeel.SkinName = ''
+        ExplicitTop = 200
+        ExplicitWidth = 333
+        Width = 333
+      end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup
         inherited dxLayoutControl1Group1: TdxLayoutGroup
           inherited dxLayoutControl1Group2: TdxLayoutGroup
@@ -662,6 +705,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
                 Visible = False
               end
             end
+            inherited dxLayoutControl1Item19: TdxLayoutItem
+              Visible = True
+            end
+            inherited dxLayoutControl1Item18: TdxLayoutItem
+              Visible = True
+            end
           end
           inherited dxLayoutControl1Group5: TdxLayoutGroup
             inherited dxLayoutControl1Group3: TdxLayoutGroup
@@ -672,6 +721,12 @@ inherited fEditorFacturaCliente: TfEditorFacturaCliente
                   Visible = False
                 end
               end
+              inherited dxLayoutControl1Item20: TdxLayoutItem
+                Visible = True
+              end
+              inherited dxLayoutControl1Group12: TdxLayoutGroup
+                Visible = True
+              end
             end
           end
         end

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

@@ -162,8 +162,18 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
         DataBinding.FieldName = 'REF_CLI_CONTRATO'
       end
       object cxGridViewFECHA_VENCIMIENTO: TcxGridDBColumn
+        Caption = 'Fecha vencimiento'
         DataBinding.FieldName = 'FECHA_VENCIMIENTO'
       end
+      object cxGridViewIMPORTE_RETENIDO: TcxGridDBColumn
+        Caption = 'Imp. Retenci'#243'n'
+        DataBinding.FieldName = 'IMPORTE_RETENCION'
+        PropertiesClassName = 'TcxCurrencyEditProperties'
+        Properties.Alignment.Horz = taRightJustify
+        FooterAlignmentHorz = taRightJustify
+        GroupSummaryAlignment = taRightJustify
+        HeaderAlignmentHorz = taRightJustify
+      end
     end
     inherited cxGridLevel: TcxGridLevel
       Caption = 'Todas'

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

@@ -63,6 +63,7 @@ type
     cxGridViewREF_CONTRATO: TcxGridDBColumn;
     cxGridViewFECHA_VENCIMIENTO: TcxGridDBColumn;
     cxGridViewREF_CLI_CONTRATO: TcxGridDBColumn;
+    cxGridViewIMPORTE_RETENIDO: TcxGridDBColumn;
     procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
       ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
       out AStyle: TcxStyle);

Source/Servidor/FactuGES_Server.dpr

@@ -134,15 +134,15 @@ uses
   schFormasPagoServer_Intf in '..\Modulos\Formas de pago\Model\schFormasPagoServer_Intf.pas',
   schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
   schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
-  schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas',
-  schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas',
   schAlbaranesClienteClient_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteClient_Intf.pas',
   schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas',
   schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas',
   schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas',
   schContratosClienteClient_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteClient_Intf.pas',
   schContratosClienteServer_Intf in '..\Modulos\Contratos de cliente\Model\schContratosClienteServer_Intf.pas',
-  uNumUtils in '..\Base\Utiles\uNumUtils.pas';
+  uNumUtils in '..\Base\Utiles\uNumUtils.pas',
+  schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas',
+  schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}

Source/Servidor/FactuGES_Server.dproj

@@ -28,7 +28,7 @@
 		<Borland.Personality>Delphi.Personality</Borland.Personality>
 		<Borland.ProjectType/>
 		<BorlandProject>
-			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">5</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.6.5.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.5.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 07 de mayo de 2014 12:33</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">2</VersionInfo><VersionInfo Name="MinorVer">6</VersionInfo><VersionInfo Name="Release">6</VersionInfo><VersionInfo Name="Build">0</VersionInfo><VersionInfo Name="Debug">False</VersionInfo><VersionInfo Name="PreRelease">False</VersionInfo><VersionInfo Name="Special">False</VersionInfo><VersionInfo Name="Private">False</VersionInfo><VersionInfo Name="DLL">False</VersionInfo><VersionInfo Name="Locale">3082</VersionInfo><VersionInfo Name="CodePage">1252</VersionInfo></VersionInfo><VersionInfoKeys><VersionInfoKeys Name="CompanyName">Rodax Software S.L.</VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">2.6.6.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES (Servidor)</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">2.6.6.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">lunes, 11 de enero de 2016 13:39</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
 						<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl">File C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPScxScheduler2LnkD11.bpl not found</Excluded_Packages>
 					</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
 	</ProjectExtensions>