Subida a produccion

git-svn-id: https://192.168.0.254/svn/Proyectos.AlonsoYSal_FactuGES2/trunk@19 40301925-124e-1c4e-b97d-170ad7a8785b

Source/ApplicationBase/Ejercicios/Plugin/uPluginEjercicios.dfm

@@ -66,7 +66,9 @@ object PluginEjercicios: TPluginEjercicios
     object actEjercicios: TAction
       Category = 'Ejercicios'
       Caption = 'Ejercicios'
+      Enabled = False
       ImageIndex = 0
+      Visible = False
       OnExecute = actEjerciciosExecute
     end
   end

Source/Cliente/uPantallaPrincipal.dfm

@@ -701,8 +701,6 @@ object fPantallaPrincipal: TfPantallaPrincipal
     object Contabilidad1: TMenuItem
       Tag = 6000
       Action = actMenuContabilidad
-      Enabled = False
-      Visible = False
     end
     object Informes1: TMenuItem
       Tag = 7000

Source/Cliente/uPantallaPrincipal.pas

@@ -196,12 +196,14 @@ end;
 procedure TfPantallaPrincipal.FormShow(Sender: TObject);
 begin
   //El usuario vendedor y logistica será restringido
-  if ((AppFactuGES.UsuarioActivo.ID_PERFIL = 5) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = 4)) then
+  if ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_LOGISTICA) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR)) then
   begin
     Informes1.Enabled := False;
     Informes1.Visible := False;
     Contabilidad1.Enabled := False;
     Contabilidad1.Visible := False;
+    Compras1.Enabled := False;
+    Compras1.Visible := False;
     Informacindeempresa1.Visible := False;
   end;
 

Source/GUIBase/GUIBase.dproj

@@ -58,34 +58,34 @@
     <DelphiCompile Include="GUIBase.dpk">
       <MainSource>MainSource</MainSource>
     </DelphiCompile>
-    <DCCReference Include="..\Servidor\Base.dcp" />
+    <DCCReference Include="..\..\Resources\Base.dcp" />
-    <DCCReference Include="..\Servidor\ccpackD11.dcp" />
+    <DCCReference Include="..\..\Resources\ccpackD11.dcp" />
-    <DCCReference Include="..\Servidor\cxDataD11.dcp" />
+    <DCCReference Include="..\..\Resources\cxDataD11.dcp" />
-    <DCCReference Include="..\Servidor\cxEditorsD11.dcp" />
+    <DCCReference Include="..\..\Resources\cxEditorsD11.dcp" />
-    <DCCReference Include="..\Servidor\cxExportD11.dcp" />
+    <DCCReference Include="..\..\Resources\cxExportD11.dcp" />
-    <DCCReference Include="..\Servidor\cxLibraryD11.dcp" />
+    <DCCReference Include="..\..\Resources\cxLibraryD11.dcp" />
-    <DCCReference Include="..\Servidor\dbrtl.dcp" />
+    <DCCReference Include="..\..\Resources\dbrtl.dcp" />
-    <DCCReference Include="..\Servidor\dxGDIPlusD11.dcp" />
+    <DCCReference Include="..\..\Resources\dxGDIPlusD11.dcp" />
-    <DCCReference Include="..\Servidor\dxLayoutControlD11.dcp" />
+    <DCCReference Include="..\..\Resources\dxLayoutControlD11.dcp" />
-    <DCCReference Include="..\Servidor\dxPScxCommonD11.dcp" />
+    <DCCReference Include="..\..\Resources\dxPScxCommonD11.dcp" />
-    <DCCReference Include="..\Servidor\dxPScxGrid6LnkD11.dcp" />
+    <DCCReference Include="..\..\Resources\dxPScxGrid6LnkD11.dcp" />
-    <DCCReference Include="..\Servidor\dxThemeD11.dcp" />
+    <DCCReference Include="..\..\Resources\dxThemeD11.dcp" />
-    <DCCReference Include="..\Servidor\frx11.dcp" />
+    <DCCReference Include="..\..\Resources\frx11.dcp" />
-    <DCCReference Include="..\Servidor\frxe11.dcp" />
+    <DCCReference Include="..\..\Resources\frxe11.dcp" />
-    <DCCReference Include="..\Servidor\fs11.dcp" />
+    <DCCReference Include="..\..\Resources\fs11.dcp" />
-    <DCCReference Include="..\Servidor\JvAppFrmD11R.dcp" />
+    <DCCReference Include="..\..\Resources\JvAppFrmD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvCtrlsD11R.dcp" />
+    <DCCReference Include="..\..\Resources\JvCtrlsD11R.dcp" />
-    <DCCReference Include="..\Servidor\JvGlobusD11R.dcp" />
+    <DCCReference Include="..\..\Resources\JvGlobusD11R.dcp" />
-    <DCCReference Include="..\Servidor\PngComponentsD10.dcp" />
+    <DCCReference Include="..\..\Resources\PngComponentsD10.dcp" />
-    <DCCReference Include="..\Servidor\PNG_D10.dcp" />
+    <DCCReference Include="..\..\Resources\PNG_D10.dcp" />
-    <DCCReference Include="..\Servidor\rtl.dcp" />
+    <DCCReference Include="..\..\Resources\rtl.dcp" />
-    <DCCReference Include="..\Servidor\tb2k_d10.dcp" />
+    <DCCReference Include="..\..\Resources\tb2k_d10.dcp" />
-    <DCCReference Include="..\Servidor\tbx_d10.dcp" />
+    <DCCReference Include="..\..\Resources\tbx_d10.dcp" />
-    <DCCReference Include="..\Servidor\vcl.dcp" />
+    <DCCReference Include="..\..\Resources\vcl.dcp" />
-    <DCCReference Include="..\Servidor\vclactnband.dcp" />
+    <DCCReference Include="..\..\Resources\vclactnband.dcp" />
-    <DCCReference Include="..\Servidor\vcldb.dcp" />
+    <DCCReference Include="..\..\Resources\vcldb.dcp" />
-    <DCCReference Include="..\Servidor\vcljpg.dcp" />
+    <DCCReference Include="..\..\Resources\vcljpg.dcp" />
-    <DCCReference Include="..\Servidor\vclx.dcp" />
+    <DCCReference Include="..\..\Resources\vclx.dcp" />
     <DCCReference Include="uDialogBase.pas">
       <Form>fDialogBase</Form>
     </DCCReference>

Source/GUIBase/uViewTotales.dfm

@@ -1,14 +1,14 @@
 inherited frViewTotales: TfrViewTotales
-  Width = 935
+  Width = 1064
-  Height = 266
+  Height = 206
   Align = alBottom
-  ExplicitWidth = 935
+  ExplicitWidth = 1063
-  ExplicitHeight = 266
+  ExplicitHeight = 206
   object dxLayoutControl1: TdxLayoutControl
     AlignWithMargins = True
     Left = 0
     Top = 0
-    Width = 935
+    Width = 1064
     Height = 217
     Margins.Left = 0
     Margins.Top = 0
@@ -21,14 +21,14 @@ inherited frViewTotales: TfrViewTotales
     AutoContentSizes = [acsWidth, acsHeight]
     ExplicitWidth = 451
     object Bevel3: TBevel
-      Left = 534
+      Left = 520
       Top = 28
       Width = 3
       Height = 122
       Shape = bsRightLine
     end
     object Bevel4: TBevel
-      Left = 646
+      Left = 632
       Top = 70
       Width = 210
       Height = 9
@@ -36,7 +36,7 @@ inherited frViewTotales: TfrViewTotales
     end
     object ImporteDto: TcxDBCurrencyEdit
       Left = 175
-      Top = 82
+      Top = 55
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_DESCUENTO'
       DataBinding.DataSource = DADataSource
@@ -61,12 +61,12 @@ inherited frViewTotales: TfrViewTotales
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 3
+      TabOrder = 2
       Height = 21
       Width = 93
     end
     object ImporteIVA: TcxDBCurrencyEdit
-      Left = 717
+      Left = 703
       Top = 105
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_IVA'
@@ -92,12 +92,12 @@ inherited frViewTotales: TfrViewTotales
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 10
+      TabOrder = 9
       Height = 21
       Width = 137
     end
     object ImporteTotal: TcxDBCurrencyEdit
-      Left = 647
+      Left = 633
       Top = 159
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_TOTAL'
@@ -124,13 +124,13 @@ inherited frViewTotales: TfrViewTotales
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 13
+      TabOrder = 12
       Height = 21
       Width = 137
     end
     object edtDescuento: TcxDBSpinEdit
       Left = 104
-      Top = 82
+      Top = 55
       AutoSize = False
       DataBinding.DataField = 'DESCUENTO'
       DataBinding.DataSource = DADataSource
@@ -154,12 +154,12 @@ inherited frViewTotales: TfrViewTotales
       StyleDisabled.LookAndFeel.NativeStyle = True
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 2
+      TabOrder = 1
       Height = 21
       Width = 65
     end
     object edtIVA: TcxDBSpinEdit
-      Left = 646
+      Left = 632
       Top = 105
       AutoSize = False
       DataBinding.DataField = 'IVA'
@@ -191,12 +191,12 @@ inherited frViewTotales: TfrViewTotales
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 9
+      TabOrder = 8
       Height = 21
       Width = 65
     end
     object ImporteBase: TcxDBCurrencyEdit
-      Left = 646
+      Left = 632
       Top = 28
       AutoSize = False
       DataBinding.DataField = 'BASE_IMPONIBLE'
@@ -221,12 +221,12 @@ inherited frViewTotales: TfrViewTotales
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 8
+      TabOrder = 7
       Height = 21
       Width = 92
     end
     object edtRE: TcxDBSpinEdit
-      Left = 646
+      Left = 632
       Top = 132
       AutoSize = False
       DataBinding.DataField = 'RE'
@@ -258,12 +258,12 @@ inherited frViewTotales: TfrViewTotales
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 11
+      TabOrder = 10
       Height = 21
       Width = 65
     end
     object ImporteRE: TcxDBCurrencyEdit
-      Left = 717
+      Left = 703
       Top = 132
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_RE'
@@ -289,13 +289,13 @@ inherited frViewTotales: TfrViewTotales
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 12
+      TabOrder = 11
       Height = 21
       Width = 56
     end
     object eImporteNeto: TcxDBCurrencyEdit
       Left = 104
-      Top = 55
+      Top = 28
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_NETO'
       DataBinding.DataSource = DADataSource
@@ -320,13 +320,13 @@ inherited frViewTotales: TfrViewTotales
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 1
+      TabOrder = 0
       Height = 21
       Width = 147
     end
     object ePorte: TcxDBCurrencyEdit
       Left = 104
-      Top = 109
+      Top = 82
       AutoSize = False
       DataBinding.DataField = 'IMPORTE_PORTE'
       DataBinding.DataSource = DADataSource
@@ -350,13 +350,13 @@ inherited frViewTotales: TfrViewTotales
       StyleDisabled.TextColor = clWindowText
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 4
+      TabOrder = 3
       Height = 21
       Width = 147
     end
     object eIVA: TcxDBLookupComboBox
       Left = 104
-      Top = 136
+      Top = 109
       DataBinding.DataField = 'ID_TIPO_IVA'
       DataBinding.DataSource = DADataSource
       Properties.DropDownListStyle = lsFixedList
@@ -383,20 +383,20 @@ inherited frViewTotales: TfrViewTotales
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 5
+      TabOrder = 4
       Width = 81
     end
     object bTiposIVA: TButton
-      Left = 386
+      Left = 372
-      Top = 136
+      Top = 109
       Width = 132
       Height = 21
       Caption = 'Ver los tipos de IVA...'
-      TabOrder = 6
+      TabOrder = 5
     end
     object cbRecargoEquivalencia: TcxDBCheckBox
       Left = 104
-      Top = 163
+      Top = 136
       Caption = 'Aplicar recargo de equivalencia'
       DataBinding.DataField = 'RECARGO_EQUIVALENCIA'
       DataBinding.DataSource = DADataSource
@@ -417,37 +417,9 @@ inherited frViewTotales: TfrViewTotales
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 7
+      TabOrder = 6
       Width = 219
     end
-    object eImporteDetalleResumen: TcxDBCurrencyEdit
-      Left = 104
-      Top = 28
-      AutoSize = 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 = [fsBold]
-      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 = 0
-      Height = 21
-      Width = 342
-    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -461,12 +433,6 @@ inherited frViewTotales: TfrViewTotales
           ShowCaption = False
           Hidden = True
           ShowBorder = False
-          object dxLayoutControl1Item10: TdxLayoutItem
-            Caption = 'ImporteNeto:'
-            Visible = False
-            Control = eImporteDetalleResumen
-            ControlOptions.ShowBorder = False
-          end
           object dxLayoutControl1Item8: TdxLayoutItem
             AutoAligns = [aaVertical]
             AlignHorz = ahClient

Source/GUIBase/uViewTotales.pas

@@ -59,8 +59,6 @@ type
     cbRecargoEquivalencia: TcxDBCheckBox;
     dxLayoutControl1Group10: TdxLayoutGroup;
     dxLayoutControl1Group11: TdxLayoutGroup;
-    dxLayoutControl1Item10: TdxLayoutItem;
-    eImporteDetalleResumen: TcxDBCurrencyEdit;
   public
     { Public declarations }
   end;

Source/Informes/1/InfComision.fr3

@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TfrxReport Version="4.3" DotMatrixReport="False" EngineOptions.DoublePass="True" IniFile="\Software\Fast Reports" PreviewOptions.Buttons="4095" PreviewOptions.Zoom="1" PrintOptions.Printer="Default" PrintOptions.PrintOnSheet="0" ReportOptions.CreateDate="39589,7948251157" ReportOptions.Description.Text="" ReportOptions.LastChange="39590,5636514352" ScriptLanguage="PascalScript" ScriptText.Text="procedure frxReportOnStartReport(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  Set('Pagina', 0);&#13;&#10;  Set('TotalPaginas', 0);&#13;&#10;end;&#13;&#10;  &#13;&#10;procedure PageHeader1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if not Engine.FinalPass then&#13;&#10;     Set('TotalPaginas', (&#60;TotalPaginas&#62; + 1));&#13;&#10;&#13;&#10;  if Engine.FinalPass then&#13;&#10;     Set('Pagina', (&#60;Pagina&#62; + 1));&#13;&#10;end;&#13;&#10;&#13;&#10;procedure Header1OnBeforePrint(Sender: TfrxComponent);&#13;&#10;begin&#13;&#10;  if Engine.FinalPass then&#13;&#10;     ColumnHeader1.Visible := False;&#13;&#10;end;&#13;&#10;&#13;&#10;begin&#13;&#10;&#13;&#10;end." ShowProgress="False" StoreInDFM="False" OnStartReport="frxReportOnStartReport" PropData="044C65667403A90003546F70021008446174617365747301010C3400000020446174615365743D22667278444243616265636572612220446174615365744E616D653D22667278444243616265636572612200010C3600000020446174615365743D226672784442446574616C6C6573312220446174615365744E616D653D226672784442446574616C6C6573312200010C3600000020446174615365743D226672784442446574616C6C6573322220446174615365744E616D653D226672784442446574616C6C657332220000095661726961626C657301010C13000000204E616D653D2220506167696E6163696F6E2200010C0E000000204E616D653D22506167696E612200010C14000000204E616D653D22546F74616C506167696E6173220000055374796C650100">
-  <TfrxDataPage Name="Data" Height="1000" Left="0" Top="0" Width="1000"/>
-  <TfrxReportPage Name="Page1" PaperWidth="210" PaperHeight="297" PaperSize="9" LeftMargin="10" RightMargin="10" TopMargin="10" BottomMargin="10" ColumnWidth="0" ColumnPositions.Text="" HGuides.Text="" VGuides.Text="">
-    <TfrxMasterData Name="MasterData1" Height="28" Left="0" Top="312" Width="718,1107" ColumnWidth="0" ColumnGap="0" DataSet="frxDBDetalles1" DataSetName="frxDBDetalles1" RowCount="0" Stretched="True">
-      <TfrxMemoView Name="Memo14" Left="0" Top="0" Width="718,15" Height="26,45669291" DisplayFormat.DecimalSeparator="," Font.Charset="0" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text=""/>
-      <TfrxMemoView Name="Memo29" Left="4" Top="3" Width="104" Height="16" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="0" ParentFont="False" Text="[frxDBDetalles1.&#34;REFERENCIA&#34;]"/>
-      <TfrxMemoView Name="Memo30" Left="615" Top="3" Width="100" Height="16" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 € " DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="0" HAlign="haRight" ParentFont="False" Text="[frxDBDetalles1.&#34;BASE_IMPONIBLE&#34;]"/>
-      <TfrxMemoView Name="Memo2" Left="117" Top="3" Width="84" Height="16" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="0" ParentFont="False" Text="[frxDBDetalles1.&#34;FECHA_FACTURA&#34;]"/>
-      <TfrxMemoView Name="Memo3" Left="213" Top="3" Width="388" Height="16" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="0" ParentFont="False" Text="[frxDBDetalles1.&#34;NOMBRE&#34;]"/>
-      <TfrxLineView Name="LineaCorta0" Left="110" Top="0" Width="0" Height="26" Frame.Typ="1"/>
-      <TfrxLineView Name="Line1" Left="204" Top="0" Width="0" Height="26" Frame.Typ="1"/>
-      <TfrxLineView Name="Line2" Left="610" Top="0" Width="0" Height="26" Frame.Typ="1"/>
-    </TfrxMasterData>
-    <TfrxPageFooter Name="PageFooter1" Height="20" Left="0" Top="688" Width="718,1107">
-      <TfrxMemoView Name="Memo1" Left="642,5201" Top="0" Width="75,5906" Height="18,89765" HAlign="haRight" Text="[Page#]"/>
-    </TfrxPageFooter>
-    <TfrxPageHeader Name="PageHeader1" Height="176" Left="0" Top="16" Width="718,1107" OnBeforePrint="PageHeader1OnBeforePrint">
-      <TfrxMemoView Name="Memo15" Left="348" Top="4" Width="366,39394" Height="28,25201" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="11053757" Font.Height="-27" Font.Name="Tahoma" Font.Style="1" Frame.Color="14211288" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Comisiones de vendedores"/>
-      <TfrxMemoView Name="Memo5" Left="88" Top="46" Width="200" Height="20" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="[frxDBCabecera.&#34;REFERENCIA&#34;]"/>
-      <TfrxMemoView Name="Memo18" Left="14" Top="11" Width="68,47248" Height="18,89765" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="Empresa:"/>
-      <TfrxMemoView Name="Memo7" Left="81,25201" Top="11" Width="253,63791" Height="18,89765" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" ParentFont="False" Text="Empresa"/>
-      <TfrxMemoView Name="Memo6" Left="12" Top="46" Width="76,47248" Height="18,89765" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="Referencia:"/>
-      <TfrxMemoView Name="Memo9" Left="12" Top="104" Width="76,47248" Height="18,89765" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="Página nº:"/>
-      <TfrxMemoView Name="Memo10" Left="88,25201" Top="104" Width="181,63791" Height="18,89765" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="[&#60;Pagina&#62;] / [&#60;TotalPaginas&#62;]"/>
-      <TfrxMemoView Name="Memo8" Left="88" Top="66" Width="200" Height="20" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="[frxDBCabecera.&#34;FECHA&#34;]"/>
-      <TfrxMemoView Name="Memo11" Left="12" Top="66" Width="76,47248" Height="18,89765" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="Fecha:"/>
-      <TfrxMemoView Name="Memo12" Left="88" Top="84" Width="628" Height="20" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="[frxDBCabecera.&#34;DESCRIPCION&#34;]"/>
-      <TfrxMemoView Name="Memo13" Left="12" Top="84" Width="76,47248" Height="18,89765" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Tahoma" Font.Style="0" ParentFont="False" Text="Descripción:"/>
-      <TfrxMemoView Name="Memo27" Left="0" Top="138,92981" Width="714,15" Height="32" DisplayFormat.DecimalSeparator="," Font.Charset="0" Font.Color="1310975" Font.Height="-15" Font.Name="Tahoma" Font.Style="1" ParentFont="False" VAlign="vaCenter" Text="Facturas asociadas a la liquidación                                                                                                          "/>
-    </TfrxPageHeader>
-    <TfrxGroupHeader Name="GroupHeader2" Height="0" Left="0" Top="292" Width="718,1107" Condition="frxDBDetalles1.&#34;ID_COMISION_LIQUIDADA&#34;"/>
-    <TfrxGroupFooter Name="GroupFooter2" Height="26,45669291" Left="0" Top="360" Width="718,1107">
-      <TfrxMemoView Name="Memo19" Left="0" Top="0" Width="719" Height="26,45669291" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="0" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text=""/>
-      <TfrxMemoView Name="Memo20" Left="140" Top="3" Width="576" Height="16" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 € " DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="Importe total de facturas: [SUM(&#60;frxDBDetalles1.&#34;BASE_IMPONIBLE&#34;&#62;,MasterData1)]"/>
-    </TfrxGroupFooter>
-    <TfrxMasterData Name="MasterData2" Height="26,47" Left="0" Top="532" Width="718,1107" ColumnWidth="0" ColumnGap="0" DataSet="frxDBDetalles2" DataSetName="frxDBDetalles2" RowCount="0">
-      <TfrxMemoView Name="Memo34" Left="0" Top="0" Width="718,15" Height="26,45669291" DisplayFormat.DecimalSeparator="," Font.Charset="0" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text=""/>
-      <TfrxMemoView Name="Memo4" Left="4" Top="5" Width="476" Height="16" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="0" ParentFont="False" Text="[frxDBDetalles2.&#34;NOMBRE&#34;]"/>
-      <TfrxMemoView Name="Memo24" Left="505" Top="4" Width="60" Height="16" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 %" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="0" HAlign="haRight" ParentFont="False" Text="[frxDBDetalles2.&#34;COMISION&#34;]"/>
-      <TfrxMemoView Name="Memo25" Left="588" Top="4" Width="128" Height="16" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 € " DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="0" Font.Height="-13" Font.Name="Arial" Font.Style="0" HAlign="haRight" ParentFont="False" Text="[frxDBDetalles2.&#34;IMPORTE_TOTAL&#34;]"/>
-      <TfrxLineView Name="Line3" Left="486" Top="0" Width="0" Height="26" Frame.Typ="1"/>
-      <TfrxLineView Name="Line4" Left="580" Top="0" Width="0" Height="26" Frame.Typ="1"/>
-    </TfrxMasterData>
-    <TfrxGroupHeader Name="GroupHeader3" Height="0" Left="0" Top="512" Width="718,1107" Condition="frxDBDetalles2.&#34;ID_COMISION&#34;"/>
-    <TfrxGroupFooter Name="GroupFooter3" Height="48" Left="0" Top="580" Width="718,1107">
-      <TfrxMemoView Name="Memo26" Left="0" Top="0" Width="719" Height="26,45669291" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="0" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text=""/>
-      <TfrxMemoView Name="Memo31" Left="140" Top="4" Width="576" Height="16" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 € " DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="Importe total de comisiones: [SUM(&#60;frxDBDetalles2.&#34;IMPORTE_TOTAL&#34;&#62;,MasterData2)]"/>
-    </TfrxGroupFooter>
-    <TfrxColumnHeader Name="ColumnHeader1" Height="20" Left="0" Top="212" Width="718,1107">
-      <TfrxMemoView Name="Memo28" Align="baBottom" Left="0" Top="0" Width="110,15" Height="20" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="0" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Ref. factura"/>
-      <TfrxMemoView Name="Memo17" Align="baBottom" Left="610" Top="0" Width="108" Height="20" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="0" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Base imponible"/>
-      <TfrxMemoView Name="Memo16" Align="baBottom" Left="110" Top="0" Width="94,15" Height="20" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="0" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Fecha"/>
-      <TfrxMemoView Name="Memo33" Align="baBottom" Left="204" Top="0" Width="406,15" Height="20" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="0" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Razón social"/>
-    </TfrxColumnHeader>
-    <TfrxHeader Name="Header1" Height="84" Left="0" Top="408" Width="718,1107" OnBeforePrint="Header1OnBeforePrint">
-      <TfrxMemoView Name="Memo21" Align="baBottom" Left="0" Top="64" Width="486,15" Height="20" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="0" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Vendedor"/>
-      <TfrxMemoView Name="Memo22" Align="baBottom" Left="486" Top="64" Width="94,15" Height="20" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="0" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haCenter" ParentFont="False" VAlign="vaCenter" Text="Comisión"/>
-      <TfrxMemoView Name="Memo23" Align="baBottom" Left="580" Top="64" Width="138,15" Height="20" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="0" Font.Color="1310975" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
-      <TfrxMemoView Name="Memo32" Left="0" Top="30" Width="714,15" Height="32" DisplayFormat.DecimalSeparator="," Font.Charset="0" Font.Color="1310975" Font.Height="-15" Font.Name="Tahoma" Font.Style="1" ParentFont="False" VAlign="vaCenter" Text="Vendedores asociados a la liquidación                                                                                                          "/>
-    </TfrxHeader>
-  </TfrxReportPage>
-</TfrxReport>

Source/Informes/1/InformeIVAProveedoresDesglosado.fr3

@@ -1,73 +0,0 @@
-<?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="42143,6524281134" 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="14,9992291666667" RightMargin="14,9992291666667" TopMargin="14,9992291666667" BottomMargin="19,9998541666667" ColumnWidth="0" ColumnPositions.Text="" LargeDesignHeight="True" HGuides.Text="" VGuides.Text="">
-    <TfrxPageHeader Name="Band1" Height="136,10235" Left="0" Top="16" Width="1009,14033677542" OnBeforePrint="Band1OnBeforePrint">
-      <TfrxShapeView Name="Shape5" Left="464,24428" Top="37,10235" Width="544" Height="99" ShowHint="False" Shape="skRoundRectangle"/>
-      <TfrxMemoView Name="NombreCliente" Left="468,54329" Top="44,10235" Width="532,45671" Height="23" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-13" Font.Name="Tahoma" Font.Style="1" HAlign="haRight" ParentFont="False" Text="LISTADO DE IVA DE FACTURAS DE PROVEEDOR"/>
-      <TfrxMemoView Name="Memo3" Left="469" Top="69,10235" Width="531" Height="61" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Fecha del listado: [&#60;Date&#62;] - Página [Page#] de [TotalPages#]&#13;&#10;[TextoParametros]"/>
-      <TfrxMemoView Name="Memo22" Left="12" Top="71" Width="265" Height="63" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" ParentFont="False" VAlign="vaBottom" Text="Aliso Design S.L. B86913910&#13;&#10;C/ La Fundición, 27. Pol. Santa Ana&#13;&#10;Rivas Vaciamadrid 28522 Madrid&#13;&#10;tel. 91 301 65 57 / fax. 91 301 65 58&#13;&#10;info@acanainteriorismo.com - www.acanainteriorismo.com"/>
-      <TfrxPictureView Name="Picture1" Left="12" Top="0" Width="264" Height="67" ShowHint="False" HightQuality="False"/>
-    </TfrxPageHeader>
-    <TfrxPageFooter Name="" Height="23,77953" Left="0" Top="668" Width="1009,14033677542" PrintOnLastPage="False">
-      <TfrxMemoView Name="mContinua" Left="925,98485" Top="4,77953" Width="81,08714" Height="16,77953" OnBeforePrint="mContinuaOnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" Text="Continúa ..."/>
-    </TfrxPageFooter>
-    <TfrxGroupHeader Name="" Height="40" Left="0" Restrictions="2" Top="256" Width="1009,14033677542" Condition="frxDBInformeListadoFacturas.&#34;NOMBRE&#34;" ReprintOnNewPage="True">
-      <TfrxMemoView Name="Memo1" Left="7,55906" Top="3,77953" Width="485,37013" Height="18,89764024" 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="Memo27" Left="0" Top="25" Width="115,23624" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Nº factura"/>
-      <TfrxMemoView Name="Memo28" Left="113,45671" Top="25" Width="417" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Proveedor"/>
-      <TfrxMemoView Name="Memo49" Left="530,67716535" Top="25" Width="101,33859" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="NIF/CIF"/>
-      <TfrxMemoView Name="Memo50" Left="724" Top="25" Width="95" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Base imponible"/>
-      <TfrxMemoView Name="Memo51" Left="818,57483" Top="25" Width="95,24409449" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe IVA"/>
-      <TfrxMemoView Name="Memo52" Left="913,88976378" Top="25" Width="94,48818898" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
-      <TfrxMemoView Name="Memo8" Left="632" Top="25" Width="92,67718" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Fecha"/>
-    </TfrxGroupHeader>
-    <TfrxMasterData Name="DatosMaestros1" Height="17,007874015748" Left="0" Top="316" Width="1009,14033677542" Columns="1" ColumnWidth="200" ColumnGap="20" DataSet="frxDBInformeListadoFacturas" DataSetName="frxDBInformeListadoFacturas" RowCount="0">
-      <TfrxMemoView Name="Memo18" Left="0" Top="0" Width="113,41369" 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_PROVEEDOR&#34;]"/>
-      <TfrxMemoView Name="Memo4" Left="113,46" Top="0" Width="417" 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="530,68" Top="0" Width="101,25984252" 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;NIF_CIF&#34;]"/>
-      <TfrxMemoView Name="Memo21" Left="631,93700787" Top="0" Width="92,5984252" Height="17,007874015748" 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="Memo29" Left="724,53543307" Top="0" Width="94,48818898" Height="17,007874015748" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;]"/>
-      <TfrxMemoView Name="Memo30" Left="818,64566929" Top="0" Width="95,24409449" Height="17,007874015748" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;]"/>
-      <TfrxMemoView Name="Memo31" Left="913,86501" Top="0" Width="94,64276" Height="17,007874015748" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;]"/>
-    </TfrxMasterData>
-    <TfrxGroupFooter Name="" Height="20,78740402" Left="0" Top="352" Width="1009,14033677542">
-      <TfrxMemoView Name="Memo6" Left="914,11812" Top="0,37774772" Width="94,48818898" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros1)]"/>
-      <TfrxMemoView Name="Memo14" Left="816,22936" Top="0,37774772" Width="97,51181102" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros1)]"/>
-      <TfrxMemoView Name="Memo15" Left="724,35436" Top="0,37774772" Width="94,48818898" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturas.&#34;BASE_IMPONIBLE&#34;&#62;,DatosMaestros1)]"/>
-      <TfrxMemoView Name="Memo53" Left="0" Top="0,37774772" Width="724,57139" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES [frxDBInformeListadoFacturas.&#34;TITULO&#34;]:"/>
-    </TfrxGroupFooter>
-    <TfrxMemoView Name="Memo2" Align="baRight" Left="938,140336775416" Top="651" Width="71" Height="13" OnBeforePrint="Memo2OnBeforePrint" ShowHint="False" StretchMode="smMaxHeight" Font.Charset="1" Font.Color="0" Font.Height="-9" Font.Name="Tahoma" Font.Style="0" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text=""/>
-    <TfrxGroupHeader Name="GroupHeader1" Height="22,67718" Left="0" Top="212" Width="1009,14033677542" Condition="frxDBInformeListadoFacturas.&#34;MES&#34;">
-      <TfrxMemoView Name="Memo7" Left="1,77953" 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;]"/>
-    </TfrxGroupHeader>
-    <TfrxGroupFooter Name="GroupFooter1" Height="22,67718" Left="0" Top="392" Width="1009,14033677542"/>
-    <TfrxHeader Name="Header1" Height="50" Left="0" Top="436" Width="1009,14033677542">
-      <TfrxMemoView Name="Memo23" Left="0" Top="31" 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="Resumen por proveedor"/>
-    </TfrxHeader>
-    <TfrxMasterData Name="DAtosMaestros2" Height="17" Left="0" Top="548" Width="1009,14033677542" ColumnWidth="0" ColumnGap="0" DataSet="frxDBInformeListadoFacturasResumen" DataSetName="frxDBInformeListadoFacturasResumen" RowCount="0">
-      <TfrxMemoView Name="Memo24" Left="190" Top="0" Width="250" Height="17,00787402" ShowHint="False" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;NOMBRE&#34;]"/>
-      <TfrxMemoView Name="Memo37" Left="0" Top="0" Width="100" 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" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;REFERENCIA&#34;]"/>
-      <TfrxMemoView Name="Memo38" Left="100" Top="0" Width="90" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;NIF_CIF&#34;]"/>
-      <TfrxMemoView Name="Memo25" Left="640" Top="0" Width="95" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;BASE_IMPONIBLE&#34;]"/>
-      <TfrxMemoView Name="Memo26" Left="735" Top="0" Width="95" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;IMPORTE_IVA&#34;]"/>
-      <TfrxMemoView Name="Memo32" Left="830" Top="0" Width="95" Height="17,00787402" ShowHint="False" StretchMode="smMaxHeight" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="%2.2m" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="16384" Font.Height="-12" Font.Name="Tahoma" Font.Style="0" Frame.Typ="15" HAlign="haRight" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;IMPORTE_TOTAL&#34;]"/>
-      <TfrxMemoView Name="Memo39" Left="440" Top="0" Width="200" 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" ParentFont="False" Text="[frxDBInformeListadoFacturasResumen.&#34;POBLACION&#34;]"/>
-    </TfrxMasterData>
-    <TfrxGroupHeader Name="GroupHeader2" Height="25" Left="0" Top="504" Width="1009,14033677542" Condition="frxDBInformeListadoFacturasResumen.&#34;ID_EMPRESA&#34;" ReprintOnNewPage="True">
-      <TfrxMemoView Name="Memo13" Left="190" Top="10" Width="250" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Proveedor"/>
-      <TfrxMemoView Name="Memo16" Left="640" Top="10" Width="95" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Base imponible"/>
-      <TfrxMemoView Name="Memo17" Left="735" Top="10" Width="95" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe IVA"/>
-      <TfrxMemoView Name="Memo19" Left="830" Top="10" Width="95" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="Importe total"/>
-      <TfrxMemoView Name="Memo34" Left="0" Top="10" Width="100" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Referencia prov."/>
-      <TfrxMemoView Name="Memo35" Left="100" Top="10" Width="90" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="CIF"/>
-      <TfrxMemoView Name="Memo36" Left="440" Top="10" Width="200" Height="15" ShowHint="False" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" ParentFont="False" VAlign="vaCenter" Text="Población"/>
-    </TfrxGroupHeader>
-    <TfrxGroupFooter Name="GroupFooter2" Height="25" Left="0" Top="584" Width="1009,14033677542">
-      <TfrxMemoView Name="Memo10" Align="baLeft" Left="0" Top="0" Width="639,63" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="13" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="TOTALES:"/>
-      <TfrxMemoView Name="Memo11" Left="829,63" Top="0" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasResumen.&#34;IMPORTE_TOTAL&#34;&#62;,DatosMaestros2)]"/>
-      <TfrxMemoView Name="Memo12" Left="734,63" Top="0" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasResumen.&#34;IMPORTE_IVA&#34;&#62;,DatosMaestros2)]"/>
-      <TfrxMemoView Name="Memo33" Left="639,63" Top="0" Width="95" Height="16" ShowHint="False" StretchMode="smMaxHeight" Color="14672103" DisplayFormat.DecimalSeparator="," DisplayFormat.FormatStr="#,0.00 €" DisplayFormat.Kind="fkNumeric" Font.Charset="1" Font.Color="1310975" Font.Height="-11" Font.Name="Tahoma" Font.Style="1" Frame.Typ="15" HAlign="haRight" ParentFont="False" VAlign="vaCenter" Text="[SUM(&#60;frxDBInformeListadoFacturasResumen.&#34;BASE_IMPONIBLE&#34;&#62;,DatosMaestros2)]"/>
-    </TfrxGroupFooter>
-  </TfrxReportPage>
-</TfrxReport>

Source/Modulos/Articulos/Views/uViewArticulo.dfm

@@ -1,6 +1,6 @@
 inherited frViewArticulo: TfrViewArticulo
-  Width = 451
+  Width = 1010
-  Height = 304
+  Height = 444
   Align = alClient
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
@@ -10,18 +10,19 @@ inherited frViewArticulo: TfrViewArticulo
   object dxLayoutControlArticulo: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 451
+    Width = 1010
     Height = 393
     Align = alTop
     ParentBackground = True
     TabOrder = 0
     TabStop = False
     AutoContentSizes = [acsWidth]
+    ExplicitWidth = 451
     DesignSize = (
-      451
+      1010
       393)
     object PngSpeedButton2: TPngSpeedButton
-      Left = 546
+      Left = 965
       Top = 28
       Width = 23
       Height = 22
@@ -48,7 +49,7 @@ inherited frViewArticulo: TfrViewArticulo
       PngOptions = [pngBlendOnDisabled, pngGrayscaleOnDisabled]
     end
     object PngSpeedButton1: TPngSpeedButton
-      Left = 546
+      Left = 965
       Top = 56
       Width = 23
       Height = 22
@@ -121,7 +122,7 @@ inherited frViewArticulo: TfrViewArticulo
       Width = 144
     end
     object eImagen: TcxImage
-      Left = 409
+      Left = 691
       Top = 28
       Properties.GraphicClassName = 'TJPEGImage'
       Properties.PopupMenuLayout.MenuItems = []
@@ -167,7 +168,7 @@ inherited frViewArticulo: TfrViewArticulo
       Width = 70
     end
     inline frViewDatosYSeleccionProveedor1: TfrViewDatosYSeleccionProveedor
-      Left = 219
+      Left = 638
       Top = 166
       Width = 350
       Height = 202
@@ -179,7 +180,7 @@ inherited frViewArticulo: TfrViewArticulo
       ParentFont = False
       TabOrder = 12
       ReadOnly = False
-      ExplicitLeft = 219
+      ExplicitLeft = 638
       ExplicitTop = 166
       inherited dxLayoutControl1: TdxLayoutControl
         inherited edtNIFCIF: TcxDBTextEdit
@@ -206,6 +207,7 @@ inherited frViewArticulo: TfrViewArticulo
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'REFERENCIA_PROV'
       DataBinding.DataSource = dsViewArticulo
+      Enabled = False
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
       Style.Color = 14745599
@@ -222,6 +224,7 @@ inherited frViewArticulo: TfrViewArticulo
       Top = 193
       DataBinding.DataField = 'PRECIO_COSTE'
       DataBinding.DataSource = dsViewArticulo
+      Enabled = False
       Properties.Alignment.Horz = taRightJustify
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
@@ -242,6 +245,7 @@ inherited frViewArticulo: TfrViewArticulo
       Top = 220
       DataBinding.DataField = 'DESCUENTO'
       DataBinding.DataSource = dsViewArticulo
+      Enabled = False
       Properties.Alignment.Horz = taRightJustify
       Properties.ImmediatePost = True
       Properties.MaxValue = 100.000000000000000000
@@ -290,6 +294,7 @@ inherited frViewArticulo: TfrViewArticulo
       Top = 274
       DataBinding.DataField = 'PRECIO_PORTE'
       DataBinding.DataSource = dsViewArticulo
+      Enabled = False
       Properties.Alignment.Horz = taRightJustify
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
@@ -306,7 +311,7 @@ inherited frViewArticulo: TfrViewArticulo
       Width = 86
     end
     object cbNoInventariable: TcxDBCheckBox
-      Left = 242
+      Left = 414
       Top = 109
       Caption = 'Art'#237'culo no inventariable'
       DataBinding.DataField = 'INVENTARIABLE'
@@ -334,6 +339,7 @@ inherited frViewArticulo: TfrViewArticulo
       Top = 301
       DataBinding.DataField = 'PRECIO_PVP'
       DataBinding.DataSource = dsViewArticulo
+      Enabled = False
       Properties.Alignment.Horz = taRightJustify
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
@@ -459,6 +465,8 @@ inherited frViewArticulo: TfrViewArticulo
           AutoAligns = [aaVertical]
           AlignHorz = ahClient
           Caption = 'Datos del proveedor para el art'#237'culo'
+          Enabled = False
+          Visible = False
           object dxLayoutControlArticuloItem15: TdxLayoutItem
             Caption = 'Ref. del prov:'
             Visible = False

Source/Modulos/Comisiones/Plugin/uPluginComisiones.pas

@@ -64,7 +64,7 @@ begin
   uComisionesViewRegister.RegisterViews;
 
   //El usuario vendedor y logistica será restringido  
-  if ((AppFactuGES.UsuarioActivo.ID_PERFIL = 5) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = 4)) then
+  if ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_LOGISTICA) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR)) then
      actComisiones.Visible := False;
 
 end;

Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.dfm

@@ -613,7 +613,9 @@ object PluginContabilidad: TPluginContabilidad
     object actEpigrafes: TAction
       Category = 'Contabilidad'
       Caption = 'Epigrafes'
+      Enabled = False
       ImageIndex = 3
+      Visible = False
       OnExecute = actEpigrafesExecute
       OnUpdate = actEpigrafesUpdate
     end
@@ -652,7 +654,9 @@ object PluginContabilidad: TPluginContabilidad
     object actDiario: TAction
       Category = 'Contabilidad'
       Caption = 'Libro de diario'
+      Enabled = False
       ImageIndex = 0
+      Visible = False
       OnExecute = actDiarioExecute
       OnUpdate = actDiarioUpdate
     end

Source/Modulos/Contabilidad/Plugin/uPluginContabilidad.pas

@@ -184,11 +184,18 @@ begin
   inherited;
   uContabilidadViewRegister.RegisterViews;
 
-  //El usuario vendedor y logistica será restringido  
+  //Solo lo verá el perfil Administrador
-  if ((AppFactuGES.UsuarioActivo.ID_PERFIL = 5) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = 4)) then
+  if (AppFactuGES.UsuarioActivo.ID_PERFIL <> CTE_PERFIL_ADMINISTRADOR) then
+  begin
+     actSubCuentas.Visible := False;
+     actCuentas.Visible := False;
+  end;
+
+  //El usuario vendedor y logistica será restringido
+  if ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_LOGISTICA) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR)) then
   begin
      actCuentasEspeciales.Visible := False;
-     actBalances.Visible := False;     
+     actBalances.Visible := False;
   end;
 
 end;

Source/Modulos/Contabilidad/Views/uEditorApunte.dfm

@@ -94,6 +94,14 @@ inherited fEditorApunte: TfEditorApunte
       end
     end
   end
+  inherited StatusBar: TJvStatusBar
+    Width = 632
+    Panels = <
+      item
+        Width = 200
+      end>
+    ExplicitWidth = 632
+  end
   inherited pgPaginas: TPageControl
     Width = 626
     ExplicitWidth = 626
@@ -103,28 +111,25 @@ inherited fEditorApunte: TfEditorApunte
       ExplicitWidth = 618
     end
   end
-  inherited StatusBar: TJvStatusBar
+  inherited PnlComentario: TPanel
     Width = 632
-    Panels = <
+    inherited lbComentario: TLabel
-      item
+      Width = 622
-        Width = 200
+      Height = 25
-      end>
+    end
-    ExplicitWidth = 632
   end
   inherited EditorActionList: TActionList
     Top = 128
   end
-  inherited SmallImages: TPngImageList
-    Top = 112
-  end
   inherited dsDataTable: TDADataSource [6]
     Left = 168
     Top = 120
   end
-  inherited LargeImages: TPngImageList [7]
+  inherited LargeImages: TPngImageList
     Top = 112
   end
-  inherited JvFormStorage: TJvFormStorage [8]
+  inherited SmallImages: TPngImageList [9]
+    Top = 112
   end
   object dxLayoutLookAndFeelList1: TdxLayoutLookAndFeelList
     Left = 320

Source/Modulos/Contabilidad/Views/uEditorAsiento.dfm

@@ -97,30 +97,39 @@ inherited fEditorAsiento: TfEditorAsiento
       end
     end
   end
+  inherited StatusBar: TJvStatusBar
+    Top = 576
+    Width = 869
+    Panels = <
+      item
+        Width = 200
+      end>
+    ExplicitTop = 576
+    ExplicitWidth = 869
+  end
   inherited pgPaginas: TPageControl
     Width = 863
-    Height = 494
+    Height = 464
-    ExplicitLeft = 3
+    ExplicitTop = 109
-    ExplicitTop = 79
     ExplicitWidth = 863
-    ExplicitHeight = 494
+    ExplicitHeight = 464
     inherited pagGeneral: TTabSheet
       ExplicitLeft = 4
       ExplicitTop = 24
       ExplicitWidth = 855
-      ExplicitHeight = 466
+      ExplicitHeight = 436
       object dxLayoutControl1: TdxLayoutControl
         Left = 0
         Top = 0
         Width = 855
-        Height = 466
+        Height = 436
         Align = alClient
         TabOrder = 0
         TabStop = False
         AutoContentSizes = [acsWidth, acsHeight]
         DesignSize = (
           855
-          466)
+          436)
         object edtOrden: TcxDBSpinEdit
           Left = 293
           Top = 10
@@ -224,20 +233,6 @@ inherited fEditorAsiento: TfEditorAsiento
                 end>
             end
           end
-          inherited ToolBar1: TToolBar
-            inherited ToolButton1: TToolButton
-              ExplicitWidth = 113
-            end
-            inherited ToolButton4: TToolButton
-              ExplicitWidth = 113
-            end
-            inherited ToolButton2: TToolButton
-              ExplicitWidth = 113
-            end
-            inherited ToolButton7: TToolButton
-              ExplicitWidth = 113
-            end
-          end
         end
         object dxLayoutControl1Group_Root: TdxLayoutGroup
           ShowCaption = False
@@ -277,30 +272,25 @@ inherited fEditorAsiento: TfEditorAsiento
       end
     end
   end
-  inherited StatusBar: TJvStatusBar
+  inherited PnlComentario: TPanel
-    Top = 576
     Width = 869
-    Panels = <
+    inherited lbComentario: TLabel
-      item
+      Width = 859
-        Width = 200
+      Height = 25
-      end>
+    end
-    ExplicitTop = 576
-    ExplicitWidth = 869
   end
   inherited EditorActionList: TActionList
     Top = 128
   end
-  inherited SmallImages: TPngImageList
-    Top = 112
-  end
   inherited dsDataTable: TDADataSource [6]
     Left = 16
     Top = 168
   end
-  inherited LargeImages: TPngImageList [7]
+  inherited LargeImages: TPngImageList
     Top = 112
   end
-  inherited JvFormStorage: TJvFormStorage [8]
+  inherited SmallImages: TPngImageList [9]
+    Top = 112
   end
   inherited StatusBarImages: TPngImageList
     Left = 24

Source/Modulos/Contabilidad/Views/uEditorDiario.dfm

@@ -2,13 +2,15 @@ inherited fEditorDiario: TfEditorDiario
   Left = 489
   Top = 325
   Caption = 'Libro de diario'
-  ExplicitWidth = 320
+  ClientWidth = 572
-  ExplicitHeight = 240
+  ExplicitWidth = 580
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
+    Width = 572
     Caption = 'Libro de diario'
     inherited Image1: TImage
+      Left = 545
       Picture.Data = {
         0B546478504E47496D61676589504E470D0A1A0A0000000D4948445200000018
         000000180806000000E0773DF8000000017352474200AECE1CE9000000046741
@@ -33,6 +35,10 @@ inherited fEditorDiario: TfEditorDiario
     end
   end
   inherited TBXDock: TTBXDock
+    Width = 572
+    inherited tbxMain: TTBXToolbar
+      ExplicitWidth = 572
+    end
     inherited tbxFiltro: TTBXToolbar
       ExplicitWidth = 269
       inherited tbxEditFiltro: TTBXEditItem
@@ -42,22 +48,27 @@ inherited fEditorDiario: TfEditorDiario
         Visible = False
       end
     end
+    inherited tbxMenu: TTBXToolbar
+      ExplicitWidth = 572
+    end
     inherited TBXTMain2: TTBXToolbar
       Left = 275
       DockPos = 275
       Visible = True
       ExplicitLeft = 275
-      ExplicitWidth = 176
       object TBXItem38: TTBXItem
         Action = actPuntear
         DisplayMode = nbdmImageAndText
       end
     end
   end
+  inherited StatusBar: TJvStatusBar
+    Width = 572
+  end
   inline frViewDiario1: TfrViewDiario [3]
     Left = 0
     Top = 102
-    Width = 543
+    Width = 572
     Height = 323
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
@@ -72,7 +83,7 @@ inherited fEditorDiario: TfEditorDiario
     ExplicitWidth = 543
     ExplicitHeight = 323
     inherited cxGrid: TcxGrid
-      Width = 543
+      Width = 572
       Height = 195
       ExplicitWidth = 543
       ExplicitHeight = 195
@@ -102,12 +113,12 @@ inherited fEditorDiario: TfEditorDiario
       end
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase
-      Width = 543
+      Width = 572
       ExplicitWidth = 543
       inherited TBXDockablePanel1: TTBXDockablePanel
         ExplicitWidth = 543
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 543
+          Width = 572
           ExplicitWidth = 543
           inherited txtFiltroTodo: TcxTextEdit
             Style.LookAndFeel.SkinName = ''
@@ -126,21 +137,21 @@ inherited fEditorDiario: TfEditorDiario
             Width = 121
           end
           inherited edtFechaFinFiltro: TcxDateEdit
-            Left = 337
+            Left = 355
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 337
+            ExplicitLeft = 355
             ExplicitWidth = 121
             Width = 121
           end
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-          Width = 543
+          Width = 572
           ExplicitWidth = 543
           inherited tbxBotones: TTBXToolbar
-            Width = 533
+            Width = 562
             ExplicitWidth = 533
           end
         end
@@ -151,10 +162,10 @@ inherited fEditorDiario: TfEditorDiario
       ExplicitTop = 297
       ExplicitWidth = 543
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-        Width = 543
+        Width = 572
         ExplicitWidth = 543
         inherited TBXToolbar1: TTBXToolbar
-          Width = 533
+          Width = 562
           ExplicitWidth = 533
         end
       end
@@ -191,7 +202,9 @@ inherited fEditorDiario: TfEditorDiario
     object actPuntear: TAction
       Category = 'OperacionesEspeciales'
       Caption = 'Puntear/Despuntear asiento'
+      Enabled = False
       ImageIndex = 24
+      Visible = False
       OnExecute = actPuntearExecute
       OnUpdate = actPuntearUpdate
     end

Source/Modulos/Contabilidad/Views/uEditorElegirSubCuentas.dfm

@@ -10,8 +10,7 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas
     Width = 851
     Caption = 'Lista de subcuentas'
     Visible = False
-    ExplicitLeft = -8
+    ExplicitTop = 64
-    ExplicitTop = -10
     ExplicitWidth = 851
     inherited Image1: TImage
       Left = 824
@@ -22,6 +21,7 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas
     Top = 91
     Width = 851
     Height = 49
+    ExplicitTop = 91
     ExplicitWidth = 851
     ExplicitHeight = 49
     inherited tbxMain: TTBXToolbar
@@ -113,13 +113,14 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas
     Top = 140
     Width = 851
     Height = 236
+    ExplicitTop = 140
     ExplicitWidth = 851
-    ExplicitHeight = 274
+    ExplicitHeight = 236
     inherited cxGrid: TcxGrid
       Width = 851
       Height = 108
       ExplicitWidth = 851
-      ExplicitHeight = 146
+      ExplicitHeight = 108
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.DefaultGroupSummaryItems = <
           item
@@ -146,16 +147,24 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas
           Width = 851
           ExplicitWidth = 851
           inherited txtFiltroTodo: TcxTextEdit
-            ExplicitWidth = 273
+            Style.LookAndFeel.SkinName = ''
-            Width = 273
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
           end
           inherited edtFechaIniFiltro: TcxDateEdit
-            ExplicitWidth = 121
+            Style.LookAndFeel.SkinName = ''
-            Width = 121
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
           end
           inherited edtFechaFinFiltro: TcxDateEdit
-            Left = 286
+            Left = 372
-            ExplicitLeft = 286
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 372
             ExplicitWidth = 421
             Width = 421
           end
@@ -172,7 +181,7 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas
     end
     inherited pnlAgrupaciones: TTBXDockablePanel
       Top = 210
-      ExplicitTop = 248
+      ExplicitTop = 210
       ExplicitWidth = 851
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 851
@@ -211,8 +220,6 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas
     Padding.Bottom = 8
     ParentBackground = False
     TabOrder = 5
-    ExplicitLeft = -8
-    ExplicitTop = -21
     object lblTitle: TLabel
       AlignWithMargins = True
       Left = 25
@@ -251,7 +258,13 @@ inherited fEditorElegirSubCuentas: TfEditorElegirSubCuentas
     Left = 112
     Top = 192
   end
-  inherited dsDataTable: TDADataSource
+  inherited JvFormStorage: TJvFormStorage [9]
+  end
+  inherited JvAppRegistryStorage: TJvAppRegistryStorage [10]
+  end
+  inherited StatusBarImages: TPngImageList [11]
+  end
+  inherited dsDataTable: TDADataSource [12]
     Left = 8
     Top = 192
   end

Source/Modulos/Contabilidad/Views/uViewCuentas.pas

@@ -14,7 +14,7 @@ uses
   dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk,
   cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, TB2Item, TBX,
   TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, cxCalendar,
-  cxImageComboBox, cxTextEdit;
+  cxImageComboBox, cxTextEdit, uCustomView, uViewBase;
 
 type
   IViewCuentas = interface(IViewGrid)

Source/Modulos/Contabilidad/Views/uViewDiario.pas

@@ -14,7 +14,7 @@ uses
   dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk,
   cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, TB2Item, TBX,
   TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, cxCalendar,
-  cxImageComboBox, cxTextEdit, cxCurrencyEdit;
+  cxImageComboBox, cxTextEdit, cxCurrencyEdit, uCustomView, uViewBase;
 
 type
   IViewDiario = interface(IViewGrid)

Source/Modulos/Contabilidad/Views/uViewExtractoMovimientos.dfm

@@ -1,7 +1,13 @@
 inherited frViewExtractoMovimientos: TfrViewExtractoMovimientos
+  Width = 950
+  Height = 639
   OnDestroy = CustomViewDestroy
   OnShow = CustomViewShow
+  ExplicitWidth = 950
+  ExplicitHeight = 639
   inherited cxGrid: TcxGrid
+    Width = 950
+    Height = 511
     RootLevelOptions.DetailTabsPosition = dtpTop
     OnActiveTabChanged = cxGridActiveTabChanged
     inherited cxGridView: TcxGridDBTableView
@@ -76,18 +82,24 @@ inherited frViewExtractoMovimientos: TfrViewExtractoMovimientos
       object cxGridViewORDEN: TcxGridDBColumn
         Caption = 'Orden asiento'
         DataBinding.FieldName = 'ORDEN_ASIENTO'
+        Visible = False
         SortIndex = 1
         SortOrder = soDescending
+        VisibleForCustomization = False
       end
       object cxGridViewREF_SUBCUENTA: TcxGridDBColumn
         Caption = 'Ref. subcuenta'
         DataBinding.FieldName = 'REF_SUBCUENTA'
         PropertiesClassName = 'TcxTextEditProperties'
+        Visible = False
+        VisibleForCustomization = False
         Width = 304
       end
       object cxGridViewSUBCUENTA: TcxGridDBColumn
         Caption = 'Subcuenta'
         DataBinding.FieldName = 'SUBCUENTA'
+        Visible = False
+        VisibleForCustomization = False
       end
       object cxGridViewCONCEPTO: TcxGridDBColumn
         Caption = 'Concepto'
@@ -98,6 +110,8 @@ inherited frViewExtractoMovimientos: TfrViewExtractoMovimientos
       object cxGridViewDOCUMENTO: TcxGridDBColumn
         Caption = 'Documento'
         DataBinding.FieldName = 'DOCUMENTO'
+        Visible = False
+        VisibleForCustomization = False
       end
       object cxGridViewDEBE: TcxGridDBColumn
         Caption = 'Debe'
@@ -124,8 +138,10 @@ inherited frViewExtractoMovimientos: TfrViewExtractoMovimientos
     end
   end
   inherited frViewFiltroBase1: TfrViewFiltroBase
+    Width = 950
     inherited TBXDockablePanel1: TTBXDockablePanel
       inherited dxLayoutControl1: TdxLayoutControl
+        Width = 950
         inherited txtFiltroTodo: TcxTextEdit
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
@@ -143,20 +159,32 @@ inherited frViewExtractoMovimientos: TfrViewExtractoMovimientos
           Width = 242
         end
         inherited edtFechaFinFiltro: TcxDateEdit
-          Left = 346
+          Left = 585
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 346
+          ExplicitLeft = 585
           ExplicitWidth = 198
           Width = 198
         end
       end
+      inherited TBXAlignmentPanel1: TTBXAlignmentPanel
+        Width = 950
+        inherited tbxBotones: TTBXToolbar
+          Width = 940
+        end
+      end
     end
   end
   inherited pnlAgrupaciones: TTBXDockablePanel
-    ExplicitWidth = 554
+    Top = 613
+    inherited TBXAlignmentPanel1: TTBXAlignmentPanel
+      Width = 950
+      inherited TBXToolbar1: TTBXToolbar
+        Width = 940
+      end
+    end
   end
   inherited dxComponentPrinter: TdxComponentPrinter
     inherited dxComponentPrinterLink: TdxGridReportLink

Source/Modulos/Contabilidad/Views/uViewSubCuentas.pas

@@ -14,7 +14,7 @@ uses
   dxPSEdgePatterns, dxPSCore, dxPScxCommon, dxPScxGrid6Lnk,
   cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, TB2Item, TBX,
   TB2Toolbar, TBXDkPanels, TB2Dock, dxPgsDlg, uDAInterfaces, cxCalendar,
-  cxImageComboBox, cxTextEdit, cxCurrencyEdit;
+  cxImageComboBox, cxTextEdit, cxCurrencyEdit, uCustomView, uViewBase;
 
 type
   IViewSubCuentas = interface(IViewGrid)

Source/Modulos/Contactos/Plugin/uPluginContactos.pas

@@ -145,7 +145,7 @@ begin
   uContactosViewRegister.RegisterViews;
 
   //El usuario vendedor y logistica será restringido  
-  if ((AppFactuGES.UsuarioActivo.ID_PERFIL = 5) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = 4)) then
+  if ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_LOGISTICA) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_VENDEDOR)) then
      actVendedores.Visible := False;
 end;
 

Source/Modulos/Contactos/Views/uEditorClientes.dfm

@@ -1931,12 +1931,6 @@ inherited fEditorClientes: TfEditorClientes
       item
         Caption = 'Previsualizar la lista de clientes actual'
         Value = 200
-      end
-      item
-        Caption = 
-          'Previsulalizar lista de clientes seleccionados (SOLO DATOS CONTA' +
-          'CTO)'
-        Value = 300
       end>
     ButtonBar.Buttons = [cbCancel]
     MainIcon = tdiCustom

Source/Modulos/Contactos/Views/uEditorClientes.pas

@@ -199,6 +199,7 @@ begin
                   if Assigned(AClientes) then
                      (FController as IClientesController).PreviewInformeEtiquetas(AClientes, AllItems);
                 end;
+{
         300   : begin   // Elemento Seleccionado
                   if AllItems then
                   begin
@@ -211,7 +212,7 @@ begin
                   if Assigned(AClientes) then
                      (FController as IClientesController).PreviewInformeListaDatosContacto(AClientes, AllItems);
                 end;
-
+}
       end;
     end;
   end;

Source/Modulos/Contactos/Views/uEditorContactos.dfm

@@ -2,8 +2,6 @@ inherited fEditorContactos: TfEditorContactos
   Left = 285
   Top = 448
   Caption = 'Lista de contactos'
-  ExplicitWidth = 320
-  ExplicitHeight = 240
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader

Source/Modulos/Contactos/Views/uEditorElegirClientes.dfm

@@ -23,17 +23,17 @@ inherited fEditorElegirClientes: TfEditorElegirClientes
     ExplicitWidth = 683
     ExplicitHeight = 49
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 378
+      ExplicitWidth = 266
       inherited TBXItem36: TTBXItem
         Action = actAnchoAuto2
       end
     end
     inherited tbxFiltro: TTBXToolbar
-      Left = 378
+      Left = 266
       Top = 23
       DockPos = 96
       DockRow = 1
-      ExplicitLeft = 378
+      ExplicitLeft = 266
       ExplicitTop = 23
       inherited TBXItem34: TTBXItem
         Action = actQuitarFiltro2
@@ -145,9 +145,25 @@ inherited fEditorElegirClientes: TfEditorElegirClientes
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 663
           ExplicitWidth = 663
+          inherited txtFiltroTodo: TcxTextEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+          end
+          inherited edtFechaIniFiltro: TcxDateEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+          end
           inherited edtFechaFinFiltro: TcxDateEdit
-            Left = 388
+            Left = 466
-            ExplicitLeft = 388
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitLeft = 466
             ExplicitWidth = 232
             Width = 232
           end
@@ -250,12 +266,6 @@ inherited fEditorElegirClientes: TfEditorElegirClientes
   inherited EditorActionList: TActionList [6]
     Left = 112
     Top = 192
-    inherited actNuevo: TAction
-      Visible = False
-    end
-    inherited actModificar: TAction
-      Visible = False
-    end
     inherited actGuardarCerrar: TAction
       Visible = False
     end
@@ -268,6 +278,14 @@ inherited fEditorElegirClientes: TfEditorElegirClientes
     inherited actConfPagina: TAction
       Visible = False
     end
+    inherited actPrevisualizar: TAction
+      Enabled = False
+      Visible = False
+    end
+    inherited actImprimir: TAction
+      Enabled = False
+      Visible = False
+    end
     inherited actDeshacer: TEditUndo
       Visible = False
     end
@@ -310,6 +328,10 @@ inherited fEditorElegirClientes: TfEditorElegirClientes
     inherited actDuplicar: TAction
       Visible = False
     end
+    inherited actExportarExcel: TAction
+      Enabled = False
+      Visible = False
+    end
     inherited actGruposCliente: TAction
       Visible = False
     end

Source/Modulos/Contactos/Views/uEditorElegirClientes.pas

@@ -69,7 +69,7 @@ end;
 procedure TfEditorElegirClientes.FormShow(Sender: TObject);
 begin
   inherited;
-  EditorActionList.State := asSuspended;
+//  EditorActionList.State := asSuspended;
   frViewClientes1.cxViewGridPopupMenu.PopupMenus.Items[0].HitTypes := [];
 end;
 

Source/Modulos/Contactos/Views/uEditorElegirProveedores.dfm

@@ -23,7 +23,7 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
     ExplicitTop = 91
     ExplicitWidth = 656
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 387
+      ExplicitWidth = 266
       inherited TBXItem2: TTBXItem
         Images = frViewProveedores1.PngImageList
       end
@@ -32,11 +32,11 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
       end
     end
     inherited tbxFiltro: TTBXToolbar
-      Left = 387
+      Left = 266
       Top = 23
       DockPos = 108
       DockRow = 1
-      ExplicitLeft = 387
+      ExplicitLeft = 266
       ExplicitTop = 23
       inherited TBXItem34: TTBXItem
         Action = actQuitarFiltro2
@@ -118,7 +118,7 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
       ExplicitLeft = 10
       ExplicitTop = 112
       ExplicitWidth = 636
-      ExplicitHeight = 180
+      ExplicitHeight = 116
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.FooterSummaryItems = <
           item
@@ -142,9 +142,31 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
         inherited dxLayoutControl1: TdxLayoutControl
           Width = 636
           ExplicitWidth = 636
+          inherited txtFiltroTodo: TcxTextEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 460
+            Width = 460
+          end
+          inherited edtFechaIniFiltro: TcxDateEdit
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
+            ExplicitWidth = 207
+            Width = 207
+          end
           inherited edtFechaFinFiltro: TcxDateEdit
             Left = 376
+            Style.LookAndFeel.SkinName = ''
+            StyleDisabled.LookAndFeel.SkinName = ''
+            StyleFocused.LookAndFeel.SkinName = ''
+            StyleHot.LookAndFeel.SkinName = ''
             ExplicitLeft = 376
+            ExplicitWidth = 201
+            Width = 201
           end
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
@@ -161,7 +183,7 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
       Left = 10
       Top = 228
       ExplicitLeft = 10
-      ExplicitTop = 292
+      ExplicitTop = 228
       ExplicitWidth = 636
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 636
@@ -204,13 +226,11 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
     Padding.Bottom = 8
     ParentBackground = False
     TabOrder = 5
-    ExplicitLeft = -8
-    ExplicitTop = -37
     object lblTitle: TLabel
       AlignWithMargins = True
       Left = 25
       Top = 8
-      Width = 135
+      Width = 606
       Height = 13
       Margins.Left = 0
       Margins.Top = 0
@@ -224,28 +244,25 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
       Font.Name = 'Tahoma'
       Font.Style = [fsBold]
       ParentFont = False
+      ExplicitWidth = 135
     end
     object lblComments: TLabel
       AlignWithMargins = True
       Left = 50
       Top = 29
-      Width = 3
+      Width = 581
-      Height = 13
+      Height = 27
       Margins.Left = 25
       Margins.Top = 0
       Margins.Right = 0
       Align = alClient
+      ExplicitWidth = 3
+      ExplicitHeight = 13
     end
   end
   inherited EditorActionList: TActionList [6]
     Left = 112
     Top = 192
-    inherited actNuevo: TAction
-      Visible = False
-    end
-    inherited actModificar: TAction
-      Visible = False
-    end
     inherited actGuardarCerrar: TAction
       Visible = False
     end
@@ -258,6 +275,14 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
     inherited actConfPagina: TAction
       Visible = False
     end
+    inherited actPrevisualizar: TAction
+      Enabled = False
+      Visible = False
+    end
+    inherited actImprimir: TAction
+      Enabled = False
+      Visible = False
+    end
     inherited actDeshacer: TEditUndo
       Visible = False
     end
@@ -300,6 +325,10 @@ inherited fEditorElegirProveedores: TfEditorElegirProveedores
     inherited actDuplicar: TAction
       Visible = False
     end
+    inherited actExportarExcel: TAction
+      Enabled = False
+      Visible = False
+    end
   end
   inherited SmallImages: TPngImageList [7]
   end

Source/Modulos/Contactos/Views/uViewContacto.dfm

@@ -268,6 +268,7 @@ inherited frViewContacto: TfrViewContacto
       Top = 109
       DataBinding.DataField = 'FAX'
       DataBinding.DataSource = dsContacto
+      Enabled = False
       Style.BorderColor = clWindowFrame
       Style.BorderStyle = ebs3D
       Style.LookAndFeel.Kind = lfStandard
@@ -603,23 +604,25 @@ inherited frViewContacto: TfrViewContacto
           object dxLayoutControlContactoGroup2: TdxLayoutGroup
             Caption = 'Tel'#233'fonos'
             object dxLayoutControlContactoItem10: TdxLayoutItem
-              Caption = 'Tlf. trabajo:'
+              Caption = 'Tlf.1:'
               Control = eTlfTrabajo
               ControlOptions.ShowBorder = False
             end
             object dxLayoutControlContactoItem9: TdxLayoutItem
-              Caption = 'Tlf. particular:'
+              Caption = 'Tlf.2:'
               Visible = False
               Control = eTlfParticular
               ControlOptions.ShowBorder = False
             end
             object dxLayoutControlContactoItem11: TdxLayoutItem
-              Caption = 'M'#243'vil:'
+              Caption = 'Tlf.3:'
               Control = eTlfMovil
               ControlOptions.ShowBorder = False
             end
             object dxLayoutControlContactoItem12: TdxLayoutItem
               Caption = 'Fax:'
+              Enabled = False
+              Visible = False
               Control = eFax
               ControlOptions.ShowBorder = False
             end

Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm

@@ -355,6 +355,15 @@ inherited DataModuleContratosCliente: TDataModuleContratosCliente
         Name = 'FACTURA_ASOCIADA'
         DataType = datString
         Size = 255
+      end
+      item
+        Name = 'FECHA_PREVISTA_MONTAJE'
+        DataType = datDateTime
+      end
+      item
+        Name = 'CAMPO_LIBRE'
+        DataType = datString
+        Size = 255
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]

Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas

@@ -3,19 +3,19 @@ unit schContratosClienteClient_Intf;
 interface
 
 uses
-  Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
+  Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf;
 
 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_Valores = '{FF170B3B-0B30-4A6E-B36F-AED5E8250AC5}';
+  RID_Valores = '{15E11A92-F4CF-4E0E-B5D8-6184059DD8CE}';
-  RID_Propiedades = '{2CA5D47F-7A40-4C99-8D82-62D14C8611F9}';
+  RID_Propiedades = '{B429EF7C-4158-41C1-BE6D-922C169CF14E}';
-  RID_ListaAnosContratos = '{CB4AC0C2-A13B-4E20-B34C-FA4B4B7AAAB7}';
+  RID_ListaAnosContratos = '{30057A80-16CD-42BE-8D5D-EDAFE97E8C5A}';
-  RID_ContratosClienteBeneficios = '{C8F49F14-3BD4-4EDC-B535-1084245828BA}';
+  RID_ContratosClienteBeneficios = '{2A70B854-D3DC-4787-87AD-051A0184E82C}';
-  RID_ContratosCliente = '{84BF7884-DAEC-4F6F-82D1-6F65B0955416}';
+  RID_ContratosCliente = '{0DB07217-A4E5-4685-BE8F-F2170E3AB1CA}';
-  RID_TiposCapitulos = '{B2D051D8-4424-4B02-AD1F-C5BAE040894B}';
+  RID_TiposCapitulos = '{3C034371-9C2C-46CB-A282-6F62EFA16CB7}';
-  RID_ContratosCliente_Detalles = '{9DBF2D50-49C9-4CE5-BFBD-D0DBFCE0EA8E}';
+  RID_ContratosCliente_Detalles = '{AC6A2500-FFA3-4A5B-A26B-AA952998F27F}';
 
   { Data table names }
   nme_Valores = 'Valores';
@@ -138,6 +138,8 @@ const
   fld_ContratosClienteLISTA_NOMBRES = 'LISTA_NOMBRES';
   fld_ContratosClienteFECHA_DECISION = 'FECHA_DECISION';
   fld_ContratosClienteFACTURA_ASOCIADA = 'FACTURA_ASOCIADA';
+  fld_ContratosClienteFECHA_PREVISTA_MONTAJE = 'FECHA_PREVISTA_MONTAJE';
+  fld_ContratosClienteCAMPO_LIBRE = 'CAMPO_LIBRE';
 
   { ContratosCliente field indexes }
   idx_ContratosClienteID = 0;
@@ -191,6 +193,8 @@ const
   idx_ContratosClienteLISTA_NOMBRES = 48;
   idx_ContratosClienteFECHA_DECISION = 49;
   idx_ContratosClienteFACTURA_ASOCIADA = 50;
+  idx_ContratosClienteFECHA_PREVISTA_MONTAJE = 51;
+  idx_ContratosClienteCAMPO_LIBRE = 52;
 
   { TiposCapitulos fields }
   fld_TiposCapitulosID = 'ID';
@@ -249,7 +253,7 @@ const
 type
   { IValores }
   IValores = interface(IDAStronglyTypedDataTable)
-  ['{37D9C952-11C7-44D0-8A56-023852645B0F}']
+  ['{9648EEF6-67C0-48F2-98D0-3F28225AE35F}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -275,7 +279,7 @@ type
   end;
 
   { TValoresDataTableRules }
-  TValoresDataTableRules = class(TIntfObjectDADataTableRules, IValores)
+  TValoresDataTableRules = class(TDADataTableRules, IValores)
   private
   protected
     { Property getters and setters }
@@ -308,7 +312,7 @@ type
 
   { IPropiedades }
   IPropiedades = interface(IDAStronglyTypedDataTable)
-  ['{5252B717-197E-41E3-A902-78CD6A804EBD}']
+  ['{DAB78C0C-ABB8-4638-A964-D66FCE695D0B}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -334,7 +338,7 @@ type
   end;
 
   { TPropiedadesDataTableRules }
-  TPropiedadesDataTableRules = class(TIntfObjectDADataTableRules, IPropiedades)
+  TPropiedadesDataTableRules = class(TDADataTableRules, IPropiedades)
   private
   protected
     { Property getters and setters }
@@ -367,7 +371,7 @@ type
 
   { IListaAnosContratos }
   IListaAnosContratos = interface(IDAStronglyTypedDataTable)
-  ['{C59F0AC9-2FA9-46DB-B506-352CCE2AAA5E}']
+  ['{803D3DE4-AE98-4631-A877-1D0F20987BC1}']
     { Property getters and setters }
     function GetANOValue: String;
     procedure SetANOValue(const aValue: String);
@@ -381,7 +385,7 @@ type
   end;
 
   { TListaAnosContratosDataTableRules }
-  TListaAnosContratosDataTableRules = class(TIntfObjectDADataTableRules, IListaAnosContratos)
+  TListaAnosContratosDataTableRules = class(TDADataTableRules, IListaAnosContratos)
   private
   protected
     { Property getters and setters }
@@ -402,7 +406,7 @@ type
 
   { IContratosClienteBeneficios }
   IContratosClienteBeneficios = interface(IDAStronglyTypedDataTable)
-  ['{6EFAD955-7B1E-45EF-9DA1-D7596933323F}']
+  ['{80E97C0A-AA60-4FA0-9AE7-25932450F7FA}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -500,7 +504,7 @@ type
   end;
 
   { TContratosClienteBeneficiosDataTableRules }
-  TContratosClienteBeneficiosDataTableRules = class(TIntfObjectDADataTableRules, IContratosClienteBeneficios)
+  TContratosClienteBeneficiosDataTableRules = class(TDADataTableRules, IContratosClienteBeneficios)
   private
   protected
     { Property getters and setters }
@@ -605,7 +609,7 @@ type
 
   { IContratosCliente }
   IContratosCliente = interface(IDAStronglyTypedDataTable)
-  ['{C292C53E-7CE7-4DAC-8FED-D5984431BAF6}']
+  ['{C90AFE40-BB27-4460-A9A5-3EF0A0DD8972}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -805,6 +809,14 @@ type
     procedure SetFACTURA_ASOCIADAValue(const aValue: String);
     function GetFACTURA_ASOCIADAIsNull: Boolean;
     procedure SetFACTURA_ASOCIADAIsNull(const aValue: Boolean);
+    function GetFECHA_PREVISTA_MONTAJEValue: DateTime;
+    procedure SetFECHA_PREVISTA_MONTAJEValue(const aValue: DateTime);
+    function GetFECHA_PREVISTA_MONTAJEIsNull: Boolean;
+    procedure SetFECHA_PREVISTA_MONTAJEIsNull(const aValue: Boolean);
+    function GetCAMPO_LIBREValue: String;
+    procedure SetCAMPO_LIBREValue(const aValue: String);
+    function GetCAMPO_LIBREIsNull: Boolean;
+    procedure SetCAMPO_LIBREIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -910,10 +922,14 @@ type
     property FECHA_DECISIONIsNull: Boolean read GetFECHA_DECISIONIsNull write SetFECHA_DECISIONIsNull;
     property FACTURA_ASOCIADA: String read GetFACTURA_ASOCIADAValue write SetFACTURA_ASOCIADAValue;
     property FACTURA_ASOCIADAIsNull: Boolean read GetFACTURA_ASOCIADAIsNull write SetFACTURA_ASOCIADAIsNull;
+    property FECHA_PREVISTA_MONTAJE: DateTime read GetFECHA_PREVISTA_MONTAJEValue write SetFECHA_PREVISTA_MONTAJEValue;
+    property FECHA_PREVISTA_MONTAJEIsNull: Boolean read GetFECHA_PREVISTA_MONTAJEIsNull write SetFECHA_PREVISTA_MONTAJEIsNull;
+    property CAMPO_LIBRE: String read GetCAMPO_LIBREValue write SetCAMPO_LIBREValue;
+    property CAMPO_LIBREIsNull: Boolean read GetCAMPO_LIBREIsNull write SetCAMPO_LIBREIsNull;
   end;
 
   { TContratosClienteDataTableRules }
-  TContratosClienteDataTableRules = class(TIntfObjectDADataTableRules, IContratosCliente)
+  TContratosClienteDataTableRules = class(TDADataTableRules, IContratosCliente)
   private
     f_FORMA_PAGO: IROStrings;
     f_PLAZO_ENTREGA: IROStrings;
@@ -1127,6 +1143,14 @@ type
     procedure SetFACTURA_ASOCIADAValue(const aValue: String); virtual;
     function GetFACTURA_ASOCIADAIsNull: Boolean; virtual;
     procedure SetFACTURA_ASOCIADAIsNull(const aValue: Boolean); virtual;
+    function GetFECHA_PREVISTA_MONTAJEValue: DateTime; virtual;
+    procedure SetFECHA_PREVISTA_MONTAJEValue(const aValue: DateTime); virtual;
+    function GetFECHA_PREVISTA_MONTAJEIsNull: Boolean; virtual;
+    procedure SetFECHA_PREVISTA_MONTAJEIsNull(const aValue: Boolean); virtual;
+    function GetCAMPO_LIBREValue: String; virtual;
+    procedure SetCAMPO_LIBREValue(const aValue: String); virtual;
+    function GetCAMPO_LIBREIsNull: Boolean; virtual;
+    procedure SetCAMPO_LIBREIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -1231,6 +1255,10 @@ type
     property FECHA_DECISIONIsNull: Boolean read GetFECHA_DECISIONIsNull write SetFECHA_DECISIONIsNull;
     property FACTURA_ASOCIADA: String read GetFACTURA_ASOCIADAValue write SetFACTURA_ASOCIADAValue;
     property FACTURA_ASOCIADAIsNull: Boolean read GetFACTURA_ASOCIADAIsNull write SetFACTURA_ASOCIADAIsNull;
+    property FECHA_PREVISTA_MONTAJE: DateTime read GetFECHA_PREVISTA_MONTAJEValue write SetFECHA_PREVISTA_MONTAJEValue;
+    property FECHA_PREVISTA_MONTAJEIsNull: Boolean read GetFECHA_PREVISTA_MONTAJEIsNull write SetFECHA_PREVISTA_MONTAJEIsNull;
+    property CAMPO_LIBRE: String read GetCAMPO_LIBREValue write SetCAMPO_LIBREValue;
+    property CAMPO_LIBREIsNull: Boolean read GetCAMPO_LIBREIsNull write SetCAMPO_LIBREIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -1243,7 +1271,7 @@ type
   }
   { ITiposCapitulos }
   ITiposCapitulos = interface(IDAStronglyTypedDataTable)
-  ['{6FD186D4-E64F-45A9-88A6-163E72D11671}']
+  ['{1EAC55ED-FD74-4C09-BA7C-01071428BF24}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1287,7 +1315,7 @@ type
   end;
 
   { TTiposCapitulosDataTableRules }
-  TTiposCapitulosDataTableRules = class(TIntfObjectDADataTableRules, ITiposCapitulos)
+  TTiposCapitulosDataTableRules = class(TDADataTableRules, ITiposCapitulos)
   private
   protected
     { Property getters and setters }
@@ -1338,7 +1366,7 @@ type
 
   { IContratosCliente_Detalles }
   IContratosCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{43B88BE1-14BC-4332-889D-8091C7420325}']
+  ['{0C09878D-60CA-4203-BC67-10838C9E8EAA}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1448,7 +1476,7 @@ type
   end;
 
   { TContratosCliente_DetallesDataTableRules }
-  TContratosCliente_DetallesDataTableRules = class(TIntfObjectDADataTableRules, IContratosCliente_Detalles)
+  TContratosCliente_DetallesDataTableRules = class(TDADataTableRules, IContratosCliente_Detalles)
   private
   protected
     { Property getters and setters }
@@ -3191,6 +3219,48 @@ begin
     DataTable.Fields[idx_ContratosClienteFACTURA_ASOCIADA].AsVariant := Null;
 end;
 
+function TContratosClienteDataTableRules.GetFECHA_PREVISTA_MONTAJEValue: DateTime;
+begin
+  result := DataTable.Fields[idx_ContratosClienteFECHA_PREVISTA_MONTAJE].AsDateTime;
+end;
+
+procedure TContratosClienteDataTableRules.SetFECHA_PREVISTA_MONTAJEValue(const aValue: DateTime);
+begin
+  DataTable.Fields[idx_ContratosClienteFECHA_PREVISTA_MONTAJE].AsDateTime := aValue;
+end;
+
+function TContratosClienteDataTableRules.GetFECHA_PREVISTA_MONTAJEIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ContratosClienteFECHA_PREVISTA_MONTAJE].IsNull;
+end;
+
+procedure TContratosClienteDataTableRules.SetFECHA_PREVISTA_MONTAJEIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ContratosClienteFECHA_PREVISTA_MONTAJE].AsVariant := Null;
+end;
+
+function TContratosClienteDataTableRules.GetCAMPO_LIBREValue: String;
+begin
+  result := DataTable.Fields[idx_ContratosClienteCAMPO_LIBRE].AsString;
+end;
+
+procedure TContratosClienteDataTableRules.SetCAMPO_LIBREValue(const aValue: String);
+begin
+  DataTable.Fields[idx_ContratosClienteCAMPO_LIBRE].AsString := aValue;
+end;
+
+function TContratosClienteDataTableRules.GetCAMPO_LIBREIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ContratosClienteCAMPO_LIBRE].IsNull;
+end;
+
+procedure TContratosClienteDataTableRules.SetCAMPO_LIBREIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ContratosClienteCAMPO_LIBRE].AsVariant := Null;
+end;
+
 
 { TTiposCapitulosDataTableRules }
 constructor TTiposCapitulosDataTableRules.Create(aDataTable: TDADataTable);

Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas

@@ -9,18 +9,18 @@ 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_ValoresDelta = '{8D6C76F9-F425-4A12-A6DA-CDADFCB371D5}';
+  RID_ValoresDelta = '{3B063834-C8A8-4844-ACC8-234467330330}';
-  RID_PropiedadesDelta = '{785FA853-7F7C-4D4B-A3F1-F605B64D365A}';
+  RID_PropiedadesDelta = '{619FA028-3343-49AB-9A72-A6DF0667FC32}';
-  RID_ListaAnosContratosDelta = '{9AED0858-AA56-4911-97AE-7FA8F5BA1BDF}';
+  RID_ListaAnosContratosDelta = '{7F13079B-DB22-4617-A28C-01007AF43172}';
-  RID_ContratosClienteBeneficiosDelta = '{0A6BE4D0-4128-48DD-8E05-87DB06C0181F}';
+  RID_ContratosClienteBeneficiosDelta = '{28BA457E-2509-4B11-9724-10E60AFB2BA9}';
-  RID_ContratosClienteDelta = '{13EC691D-B231-48FE-BE2D-E8EC546D4FDA}';
+  RID_ContratosClienteDelta = '{DFEAF2D7-9D59-40C6-8205-677DCCD6C526}';
-  RID_TiposCapitulosDelta = '{ABCB3BD5-D32A-405C-9799-900FAB730F45}';
+  RID_TiposCapitulosDelta = '{74EAAE1F-DEB6-49BD-BF6C-FAE257428A2D}';
-  RID_ContratosCliente_DetallesDelta = '{09923382-3A40-4992-9F2C-903B5B6CA290}';
+  RID_ContratosCliente_DetallesDelta = '{72FC35AB-AC55-43FB-B58A-152274E2A1CC}';
 
 type
   { IValoresDelta }
   IValoresDelta = interface(IValores)
-  ['{8D6C76F9-F425-4A12-A6DA-CDADFCB371D5}']
+  ['{3B063834-C8A8-4844-ACC8-234467330330}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_PROPIEDADValue : Integer;
@@ -78,7 +78,7 @@ type
 
   { IPropiedadesDelta }
   IPropiedadesDelta = interface(IPropiedades)
-  ['{785FA853-7F7C-4D4B-A3F1-F605B64D365A}']
+  ['{619FA028-3343-49AB-9A72-A6DF0667FC32}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -136,7 +136,7 @@ type
 
   { IListaAnosContratosDelta }
   IListaAnosContratosDelta = interface(IListaAnosContratos)
-  ['{9AED0858-AA56-4911-97AE-7FA8F5BA1BDF}']
+  ['{7F13079B-DB22-4617-A28C-01007AF43172}']
     { Property getters and setters }
     function GetOldANOValue : String;
 
@@ -170,7 +170,7 @@ type
 
   { IContratosClienteBeneficiosDelta }
   IContratosClienteBeneficiosDelta = interface(IContratosClienteBeneficios)
-  ['{0A6BE4D0-4128-48DD-8E05-87DB06C0181F}']
+  ['{28BA457E-2509-4B11-9724-10E60AFB2BA9}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldREFERENCIAValue : String;
@@ -372,7 +372,7 @@ type
 
   { IContratosClienteDelta }
   IContratosClienteDelta = interface(IContratosCliente)
-  ['{13EC691D-B231-48FE-BE2D-E8EC546D4FDA}']
+  ['{DFEAF2D7-9D59-40C6-8205-677DCCD6C526}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -425,6 +425,8 @@ type
     function GetOldLISTA_NOMBRESValue : String;
     function GetOldFECHA_DECISIONValue : DateTime;
     function GetOldFACTURA_ASOCIADAValue : String;
+    function GetOldFECHA_PREVISTA_MONTAJEValue : DateTime;
+    function GetOldCAMPO_LIBREValue : String;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -478,6 +480,8 @@ type
     property OldLISTA_NOMBRES : String read GetOldLISTA_NOMBRESValue;
     property OldFECHA_DECISION : DateTime read GetOldFECHA_DECISIONValue;
     property OldFACTURA_ASOCIADA : String read GetOldFACTURA_ASOCIADAValue;
+    property OldFECHA_PREVISTA_MONTAJE : DateTime read GetOldFECHA_PREVISTA_MONTAJEValue;
+    property OldCAMPO_LIBRE : String read GetOldCAMPO_LIBREValue;
   end;
 
   { TContratosClienteBusinessProcessorRules }
@@ -797,6 +801,18 @@ type
     function GetOldFACTURA_ASOCIADAIsNull: Boolean; virtual;
     procedure SetFACTURA_ASOCIADAValue(const aValue: String); virtual;
     procedure SetFACTURA_ASOCIADAIsNull(const aValue: Boolean); virtual;
+    function GetFECHA_PREVISTA_MONTAJEValue: DateTime; virtual;
+    function GetFECHA_PREVISTA_MONTAJEIsNull: Boolean; virtual;
+    function GetOldFECHA_PREVISTA_MONTAJEValue: DateTime; virtual;
+    function GetOldFECHA_PREVISTA_MONTAJEIsNull: Boolean; virtual;
+    procedure SetFECHA_PREVISTA_MONTAJEValue(const aValue: DateTime); virtual;
+    procedure SetFECHA_PREVISTA_MONTAJEIsNull(const aValue: Boolean); virtual;
+    function GetCAMPO_LIBREValue: String; virtual;
+    function GetCAMPO_LIBREIsNull: Boolean; virtual;
+    function GetOldCAMPO_LIBREValue: String; virtual;
+    function GetOldCAMPO_LIBREIsNull: Boolean; virtual;
+    procedure SetCAMPO_LIBREValue(const aValue: String); virtual;
+    procedure SetCAMPO_LIBREIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -1003,6 +1019,14 @@ type
     property FACTURA_ASOCIADAIsNull : Boolean read GetFACTURA_ASOCIADAIsNull write SetFACTURA_ASOCIADAIsNull;
     property OldFACTURA_ASOCIADA : String read GetOldFACTURA_ASOCIADAValue;
     property OldFACTURA_ASOCIADAIsNull : Boolean read GetOldFACTURA_ASOCIADAIsNull;
+    property FECHA_PREVISTA_MONTAJE : DateTime read GetFECHA_PREVISTA_MONTAJEValue write SetFECHA_PREVISTA_MONTAJEValue;
+    property FECHA_PREVISTA_MONTAJEIsNull : Boolean read GetFECHA_PREVISTA_MONTAJEIsNull write SetFECHA_PREVISTA_MONTAJEIsNull;
+    property OldFECHA_PREVISTA_MONTAJE : DateTime read GetOldFECHA_PREVISTA_MONTAJEValue;
+    property OldFECHA_PREVISTA_MONTAJEIsNull : Boolean read GetOldFECHA_PREVISTA_MONTAJEIsNull;
+    property CAMPO_LIBRE : String read GetCAMPO_LIBREValue write SetCAMPO_LIBREValue;
+    property CAMPO_LIBREIsNull : Boolean read GetCAMPO_LIBREIsNull write SetCAMPO_LIBREIsNull;
+    property OldCAMPO_LIBRE : String read GetOldCAMPO_LIBREValue;
+    property OldCAMPO_LIBREIsNull : Boolean read GetOldCAMPO_LIBREIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -1012,7 +1036,7 @@ type
 
   { ITiposCapitulosDelta }
   ITiposCapitulosDelta = interface(ITiposCapitulos)
-  ['{ABCB3BD5-D32A-405C-9799-900FAB730F45}']
+  ['{74EAAE1F-DEB6-49BD-BF6C-FAE257428A2D}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldPOSICIONValue : Integer;
@@ -1106,7 +1130,7 @@ type
 
   { IContratosCliente_DetallesDelta }
   IContratosCliente_DetallesDelta = interface(IContratosCliente_Detalles)
-  ['{09923382-3A40-4992-9F2C-903B5B6CA290}']
+  ['{72FC35AB-AC55-43FB-B58A-152274E2A1CC}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTRATOValue : Integer;
@@ -3695,6 +3719,68 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFACTURA_ASOCIADA] := Null;
 end;
 
+function TContratosClienteBusinessProcessorRules.GetFECHA_PREVISTA_MONTAJEValue: DateTime;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_PREVISTA_MONTAJE];
+end;
+
+function TContratosClienteBusinessProcessorRules.GetFECHA_PREVISTA_MONTAJEIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_PREVISTA_MONTAJE]);
+end;
+
+function TContratosClienteBusinessProcessorRules.GetOldFECHA_PREVISTA_MONTAJEValue: DateTime;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteFECHA_PREVISTA_MONTAJE];
+end;
+
+function TContratosClienteBusinessProcessorRules.GetOldFECHA_PREVISTA_MONTAJEIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteFECHA_PREVISTA_MONTAJE]);
+end;
+
+procedure TContratosClienteBusinessProcessorRules.SetFECHA_PREVISTA_MONTAJEValue(const aValue: DateTime);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_PREVISTA_MONTAJE] := aValue;
+end;
+
+procedure TContratosClienteBusinessProcessorRules.SetFECHA_PREVISTA_MONTAJEIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_PREVISTA_MONTAJE] := Null;
+end;
+
+function TContratosClienteBusinessProcessorRules.GetCAMPO_LIBREValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteCAMPO_LIBRE];
+end;
+
+function TContratosClienteBusinessProcessorRules.GetCAMPO_LIBREIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteCAMPO_LIBRE]);
+end;
+
+function TContratosClienteBusinessProcessorRules.GetOldCAMPO_LIBREValue: String;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteCAMPO_LIBRE];
+end;
+
+function TContratosClienteBusinessProcessorRules.GetOldCAMPO_LIBREIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteCAMPO_LIBRE]);
+end;
+
+procedure TContratosClienteBusinessProcessorRules.SetCAMPO_LIBREValue(const aValue: String);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteCAMPO_LIBRE] := aValue;
+end;
+
+procedure TContratosClienteBusinessProcessorRules.SetCAMPO_LIBREIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteCAMPO_LIBRE] := Null;
+end;
+
 
 { TTiposCapitulosBusinessProcessorRules }
 constructor TTiposCapitulosBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm

@@ -486,6 +486,14 @@ object srvContratosCliente: TsrvContratosCliente
               item
                 DatasetField = 'FACTURA_ASOCIADA'
                 TableField = 'FACTURA_ASOCIADA'
+              end
+              item
+                DatasetField = 'FECHA_PREVISTA_MONTAJE'
+                TableField = 'FECHA_PREVISTA_MONTAJE'
+              end
+              item
+                DatasetField = 'CAMPO_LIBRE'
+                TableField = 'CAMPO_LIBRE'
               end>
           end>
         Name = 'ContratosCliente'
@@ -769,6 +777,15 @@ object srvContratosCliente: TsrvContratosCliente
             Name = 'FACTURA_ASOCIADA'
             DataType = datString
             Size = 255
+          end
+          item
+            Name = 'FECHA_PREVISTA_MONTAJE'
+            DataType = datDateTime
+          end
+          item
+            Name = 'CAMPO_LIBRE'
+            DataType = datString
+            Size = 255
           end>
       end
       item
@@ -1238,6 +1255,17 @@ object srvContratosCliente: TsrvContratosCliente
             Name = 'FECHA_DECISION'
             DataType = datDateTime
             Value = ''
+          end
+          item
+            Name = 'FECHA_PREVISTA_MONTAJE'
+            DataType = datDateTime
+            Value = ''
+          end
+          item
+            Name = 'CAMPO_LIBRE'
+            DataType = datString
+            Size = 255
+            Value = ''
           end>
         Statements = <
           item
@@ -1254,17 +1282,18 @@ object srvContratosCliente: TsrvContratosCliente
               '_IVA,'#10'     IMPORTE_TOTAL, ID_FORMA_PAGO, ID_TIENDA, ID_VENDEDOR,' +
               ' PERSONA_CONTACTO,'#10'     RE, IMPORTE_RE, RECARGO_EQUIVALENCIA, TE' +
               'LEFONO, MOVIL, TIPO_CONTRATO, CONDICIONES,'#10'     CALIDADES, REFER' +
-              'ENCIA_CLIENTE, FECHA_DECISION)'#10'  VALUES'#10'    (:ID, :ID_CLIENTE, :' +
+              'ENCIA_CLIENTE, FECHA_DECISION, FECHA_PREVISTA_MONTAJE, CAMPO_LIB' +
-              'NIF_CIF, :NOMBRE, :ID_DIRECCION, :CALLE, :POBLACION, :PROVINCIA,' +
+              'RE)'#10'  VALUES'#10'    (:ID, :ID_CLIENTE, :NIF_CIF, :NOMBRE, :ID_DIREC' +
-              #10'     :CODIGO_POSTAL, :REFERENCIA, :FECHA_CONTRATO, :SITUACION, ' +
+              'CION, :CALLE, :POBLACION, :PROVINCIA,'#10'     :CODIGO_POSTAL, :REFE' +
-              ':FORMA_PAGO,'#10'     :PLAZO_ENTREGA, :OBSERVACIONES, :INCIDENCIAS, ' +
+              'RENCIA, :FECHA_CONTRATO, :SITUACION, :FORMA_PAGO,'#10'     :PLAZO_EN' +
-              ':INCIDENCIAS_ACTIVAS, CURRENT_TIMESTAMP,'#10'     :USUARIO, :IMPORTE' +
+              'TREGA, :OBSERVACIONES, :INCIDENCIAS, :INCIDENCIAS_ACTIVAS, CURRE' +
-              '_NETO, :IMPORTE_PORTE, :DESCUENTO, :IMPORTE_DESCUENTO,'#10'     :BAS' +
+              'NT_TIMESTAMP,'#10'     :USUARIO, :IMPORTE_NETO, :IMPORTE_PORTE, :DES' +
-              'E_IMPONIBLE, :ID_TIPO_IVA, :IVA, :IMPORTE_IVA, :IMPORTE_TOTAL, :' +
+              'CUENTO, :IMPORTE_DESCUENTO,'#10'     :BASE_IMPONIBLE, :ID_TIPO_IVA, ' +
-              'ID_FORMA_PAGO,'#10'     :ID_TIENDA, :ID_VENDEDOR, :PERSONA_CONTACTO,' +
+              ':IVA, :IMPORTE_IVA, :IMPORTE_TOTAL, :ID_FORMA_PAGO,'#10'     :ID_TIE' +
-              ' :RE, :IMPORTE_RE, :RECARGO_EQUIVALENCIA,'#10'     :TELEFONO, :MOVIL' +
+              'NDA, :ID_VENDEDOR, :PERSONA_CONTACTO, :RE, :IMPORTE_RE, :RECARGO' +
-              ', :TIPO_CONTRATO, :CONDICIONES, :CALIDADES, :REFERENCIA_CLIENTE,' +
+              '_EQUIVALENCIA,'#10'     :TELEFONO, :MOVIL, :TIPO_CONTRATO, :CONDICIO' +
-              #10'     :FECHA_DECISION)'#10#10
+              'NES, :CALIDADES, :REFERENCIA_CLIENTE,'#10'     :FECHA_DECISION, :FEC' +
+              'HA_PREVISTA_MONTAJE, :CAMPO_LIBRE)'#10#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1509,6 +1538,17 @@ object srvContratosCliente: TsrvContratosCliente
             DataType = datDateTime
             Value = ''
           end
+          item
+            Name = 'FECHA_PREVISTA_MONTAJE'
+            DataType = datDateTime
+            Value = ''
+          end
+          item
+            Name = 'CAMPO_LIBRE'
+            DataType = datString
+            Size = 255
+            Value = ''
+          end
           item
             Name = 'OLD_ID'
             Value = ''
@@ -1539,7 +1579,9 @@ object srvContratosCliente: TsrvContratosCliente
               'NO = :TELEFONO,'#10'    MOVIL = :MOVIL,'#10'    TIPO_CONTRATO = :TIPO_CO' +
               'NTRATO,'#10'    CONDICIONES = :CONDICIONES,'#10'    CALIDADES = :CALIDAD' +
               'ES,'#10'    REFERENCIA_CLIENTE = :REFERENCIA_CLIENTE,'#10'    FECHA_DECI' +
-              'SION = :FECHA_DECISION'#10'  WHERE'#10'    (ID = :OLD_ID)'#10#10
+              'SION = :FECHA_DECISION,'#10'    FECHA_PREVISTA_MONTAJE = :FECHA_PREV' +
+              'ISTA_MONTAJE,'#10'    CAMPO_LIBRE = :CAMPO_LIBRE'#10'  WHERE'#10'    (ID = :' +
+              'OLD_ID)'#10#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm

@@ -175,6 +175,7 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
   inherited pgPaginas: TPageControl
     Width = 866
     Height = 473
+    ActivePage = pagInicidencias
     TabOrder = 1
     OnChanging = pgPaginasChanging
     ExplicitTop = 109
@@ -202,17 +203,15 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
           ExplicitWidth = 858
           ExplicitHeight = 445
           inherited edtFechaContrato: TcxDBDateEdit
-            Left = 103
             Top = 84
-            ExplicitLeft = 103
             ExplicitTop = 84
             ExplicitWidth = 129
             Width = 129
           end
           inherited memObservaciones: TcxDBMemo
-            Left = 451
+            Left = 464
             Top = 330
-            ExplicitLeft = 451
+            ExplicitLeft = 464
             ExplicitTop = 330
             ExplicitWidth = 404
             ExplicitHeight = 139
@@ -220,29 +219,24 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
             Width = 404
           end
           inherited eReferencia: TcxDBTextEdit
-            Left = 103
             Top = 30
-            ExplicitLeft = 103
             ExplicitTop = 30
             ExplicitWidth = 122
             Width = 122
           end
           inherited cbFormaPago: TcxDBLookupComboBox
-            Left = 103
+            Top = 192
-            Top = 165
+            ExplicitTop = 192
-            ExplicitLeft = 103
-            ExplicitTop = 165
             ExplicitWidth = 122
             Width = 122
           end
           inherited bFormasPago: TButton
-            Left = 291
+            Left = 304
-            Top = 165
+            Top = 192
-            ExplicitLeft = 291
+            ExplicitLeft = 304
-            ExplicitTop = 165
+            ExplicitTop = 192
           end
           inherited cbSituacion: TcxDBImageComboBox
-            Left = 103
             Top = 138
             Properties.Items = <
               item
@@ -258,57 +252,52 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
                 Description = 'RECHAZADO'
                 Value = 'RECHAZADO'
               end>
-            ExplicitLeft = 103
             ExplicitTop = 138
             ExplicitWidth = 260
             Width = 260
           end
           inherited memFormaPago: TcxDBMemo
-            Top = 243
+            Top = 270
-            ExplicitTop = 243
+            ExplicitTop = 270
             ExplicitWidth = 396
             ExplicitHeight = 100
             Height = 100
             Width = 396
           end
           inherited memPlazoEntrega: TcxDBMemo
-            Top = 351
+            Top = 365
-            ExplicitTop = 351
+            ExplicitTop = 365
             ExplicitWidth = 396
             ExplicitHeight = 100
             Height = 100
             Width = 396
           end
           inherited cbVendedor: TcxDBLookupComboBox
-            Left = 103
+            Top = 219
-            Top = 192
+            ExplicitTop = 219
-            ExplicitLeft = 103
-            ExplicitTop = 192
             ExplicitWidth = 27
             Width = 27
           end
           inherited cbTipoContrato: TcxDBComboBox
-            Left = 320
+            Left = 339
             Top = 84
-            ExplicitLeft = 320
+            ExplicitLeft = 339
             ExplicitTop = 84
             ExplicitWidth = 113
             Width = 113
           end
           inherited edtlREF_CLIENTE: TcxDBTextEdit
-            Left = 103
             Top = 57
             Enabled = False
-            ExplicitLeft = 103
             ExplicitTop = 57
             ExplicitWidth = 335
             Width = 335
           end
           inherited frViewClienteContrato1: TfrViewClienteContrato
-            Left = 451
+            Left = 464
             Top = 30
             Width = 357
-            ExplicitLeft = 451
+            ExplicitLeft = 464
             ExplicitTop = 30
             ExplicitWidth = 357
             inherited dxLayoutControl1: TdxLayoutControl
@@ -371,10 +360,10 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
                 Width = 707
               end
               inherited edtCodigoPostal: TcxDBTextEdit
-                Left = 292
+                Left = 279
                 Top = 176
                 DataBinding.DataSource = dsDataTable
-                ExplicitLeft = 292
+                ExplicitLeft = 279
                 ExplicitTop = 176
               end
               inherited Button1: TBitBtn
@@ -390,9 +379,9 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
                 ExplicitTop = 11
               end
               inherited Button3: TBitBtn
-                Left = 182
+                Left = 169
                 Top = 230
-                ExplicitLeft = 182
+                ExplicitLeft = 169
                 ExplicitTop = 230
               end
               inherited cxDBTextEdit1: TcxDBTextEdit
@@ -406,13 +395,17 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
             end
           end
           inherited edtFechaDecision: TcxDBDateEdit
-            Left = 103
             Top = 111
-            ExplicitLeft = 103
             ExplicitTop = 111
             ExplicitWidth = 115
             Width = 115
           end
+          inherited edtFechaPrevMontaje: TcxDBDateEdit
+            Top = 165
+            ExplicitTop = 165
+            ExplicitWidth = 295
+            Width = 295
+          end
           inherited dxLayoutControl1Group_Root: TdxLayoutGroup
             inherited dxLayoutControl1Group8: TdxLayoutGroup
               inherited dxLayoutControl1Group1: TdxLayoutGroup
@@ -468,57 +461,56 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
             ExplicitLeft = 334
             ExplicitTop = 0
           end
-          inherited FontSize: TEdit [5]
+          inherited FontName: TJvFontComboBox
             Left = 0
-            Width = 110
             ExplicitLeft = 0
+          end
+          inherited FontSize: TEdit
+            Left = 145
+            Width = 110
+            ExplicitLeft = 145
             ExplicitWidth = 110
           end
-          inherited UpDown1: TUpDown [6]
+          inherited UpDown1: TUpDown
-            Left = 110
+            Left = 271
-            ExplicitLeft = 110
+            ExplicitLeft = 271
-          end
-          inherited FontName: TJvFontComboBox [7]
-            Left = 127
-            ExplicitLeft = 127
           end
           inherited ToolButton13: TToolButton
-            Left = 272
+            Left = 288
-            ExplicitLeft = 272
+            ExplicitLeft = 288
           end
           inherited ToolButton6: TToolButton
-            Left = 280
+            Left = 296
-            ExplicitLeft = 280
+            ExplicitLeft = 296
           end
           inherited ToolButton7: TToolButton
-            Left = 314
+            Left = 330
-            ExplicitLeft = 314
+            ExplicitLeft = 330
           end
           inherited ToolButton8: TToolButton
-            Left = 348
+            Left = 364
-            ExplicitLeft = 348
+            ExplicitLeft = 364
           end
           inherited ToolButton12: TToolButton
-            Left = 382
+            Left = 398
-            ExplicitLeft = 382
+            ExplicitLeft = 398
           end
           inherited ToolButton9: TToolButton
-            Left = 390
+            Left = 406
-            ExplicitLeft = 390
+            ExplicitLeft = 406
           end
           inherited ToolButton10: TToolButton
-            Left = 424
+            Left = 440
-            ExplicitLeft = 424
+            ExplicitLeft = 440
           end
           inherited ToolButton11: TToolButton
-            Left = 458
+            Left = 474
-            ExplicitLeft = 458
+            ExplicitLeft = 474
           end
         end
         inherited cxGrid: TcxGrid
           Width = 858
           Height = 373
-          ExplicitTop = 72
           ExplicitWidth = 858
           ExplicitHeight = 373
         end
@@ -641,6 +633,9 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
     object pagInicidencias: TTabSheet
       Caption = 'Incidencias'
       ImageIndex = 2
+      DesignSize = (
+        858
+        445)
       inline frViewIncidenciasCli: TfrViewIncidencias
         Left = 0
         Top = 0
@@ -661,7 +656,9 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
           Width = 858
           ExplicitWidth = 858
           inherited eIncidenciaActiva: TcxDBCheckBox
+            ExplicitWidth = 173
             ExplicitHeight = 21
+            Width = 173
           end
         end
         inherited GroupBox1: TGroupBox
@@ -677,6 +674,31 @@ inherited fEditorContratoCliente: TfEditorContratoCliente
           end
         end
       end
+      object eCampoLibre: TcxDBTextEdit
+        Left = 176
+        Top = 4
+        Anchors = [akLeft, akTop, akRight]
+        DataBinding.DataField = 'CAMPO_LIBRE'
+        DataBinding.DataSource = frViewIncidenciasCli.DADataSource
+        Properties.ReadOnly = False
+        Properties.ValidateOnEnter = True
+        Style.BorderColor = clWindowFrame
+        Style.BorderStyle = ebs3D
+        Style.Color = clInfoBk
+        Style.HotTrack = False
+        Style.LookAndFeel.Kind = lfStandard
+        Style.LookAndFeel.NativeStyle = True
+        StyleDisabled.Color = clMenuBar
+        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 = 1
+        Width = 305
+      end
     end
     object pagDocumentos: TTabSheet
       Caption = 'Documentos'

Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas

@@ -48,6 +48,7 @@ type
     dxLayoutGroup1: TdxLayoutGroup;
     dxLayoutItem1: TdxLayoutItem;
     frViewContratoCliente1: TfrViewContratoCliente;
+    eCampoLibre: TcxDBTextEdit;
 
     procedure FormShow(Sender: TObject);
     procedure CustomEditorClose(Sender: TObject; var Action: TCloseAction);

Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.dfm

@@ -132,27 +132,19 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
         DisplayMode = nbdmImageAndText
         ImageIndex = 22
         object bCocina: TTBXItem
-          Caption = 'Contrato de cocina'
+          Caption = 'Presupuesto de cocina'
           OnClick = bCocinaClick
         end
-        object bArmario: TTBXItem
-          Caption = 'Contrato de armario'
-          OnClick = bArmarioClick
-        end
         object bBano: TTBXItem
-          Caption = 'Contrato de ba'#241'o'
+          Caption = 'Presupuesto de ba'#241'o'
           OnClick = bBanoClick
         end
         object bElectrodomestico: TTBXItem
-          Caption = 'Contrato de electrodom'#233'stico'
+          Caption = 'Presupuesto de electrodom'#233'stico'
           OnClick = bElectrodomesticoClick
         end
-        object bObra: TTBXItem
-          Caption = 'Contrato de obra'
-          OnClick = bObraClick
-        end
         object bVarios: TTBXItem
-          Caption = 'Contrato de varios'
+          Caption = 'Presupuesto de varios'
           OnClick = bVariosClick
         end
       end

Source/Modulos/Contratos de cliente/Views/uEditorContratosCliente.pas

@@ -43,7 +43,6 @@ type
     actListadoBeneficios: TAction;
     TBXItem42: TTBXItem;
     TBXSubmenuItem3: TTBXSubmenuItem;
-    bObra: TTBXItem;
     TBXItem43: TTBXItem;
     Generaralbarndecliente1: TMenuItem;
     actGenerarPedidoProv: TAction;

Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm

@@ -19,7 +19,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       817
       491)
     object edtFechaContrato: TcxDBDateEdit
-      Left = 104
+      Left = 131
       Top = 82
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_CONTRATO'
@@ -42,7 +42,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       Width = 129
     end
     object memObservaciones: TcxDBMemo
-      Left = 429
+      Left = 441
       Top = 334
       Align = alClient
       DataBinding.DataField = 'OBSERVACIONES'
@@ -59,12 +59,12 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 12
+      TabOrder = 13
       Height = 139
       Width = 404
     end
     object eReferencia: TcxDBTextEdit
-      Left = 104
+      Left = 131
       Top = 28
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'REFERENCIA'
@@ -89,8 +89,8 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       Width = 122
     end
     object cbFormaPago: TcxDBLookupComboBox
-      Left = 104
+      Left = 131
-      Top = 163
+      Top = 190
       DataBinding.DataField = 'ID_FORMA_PAGO'
       DataBinding.DataSource = DADataSource
       Properties.KeyFieldNames = 'ID'
@@ -115,20 +115,20 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 6
+      TabOrder = 7
       Width = 122
     end
     object bFormasPago: TButton
-      Left = 267
+      Left = 279
-      Top = 163
+      Top = 190
       Width = 132
       Height = 21
       Caption = 'Ver las formas de pago...'
-      TabOrder = 7
+      TabOrder = 8
       OnClick = bFormasPagoClick
     end
     object cbSituacion: TcxDBImageComboBox
-      Left = 104
+      Left = 131
       Top = 136
       DataBinding.DataField = 'SITUACION'
       DataBinding.DataSource = DADataSource
@@ -159,7 +159,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
     end
     object memFormaPago: TcxDBMemo
       Left = 22
-      Top = 247
+      Top = 274
       Anchors = [akLeft, akTop, akRight, akBottom]
       DataBinding.DataField = 'FORMA_PAGO'
       DataBinding.DataSource = DADataSource
@@ -175,35 +175,35 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 9
-      Height = 100
-      Width = 396
-    end
-    object memPlazoEntrega: TcxDBMemo
-      Left = 22
-      Top = 376
-      Anchors = [akLeft, akTop, akRight, akBottom]
-      DataBinding.DataField = 'PLAZO_ENTREGA'
-      DataBinding.DataSource = DADataSource
-      Properties.ScrollBars = ssVertical
-      Style.BorderColor = clWindowFrame
-      Style.BorderStyle = ebs3D
-      Style.HotTrack = False
-      Style.LookAndFeel.Kind = lfStandard
-      Style.LookAndFeel.NativeStyle = True
-      StyleDisabled.LookAndFeel.Kind = lfStandard
-      StyleDisabled.LookAndFeel.NativeStyle = True
-      StyleFocused.LookAndFeel.Kind = lfStandard
-      StyleFocused.LookAndFeel.NativeStyle = True
-      StyleHot.LookAndFeel.Kind = lfStandard
-      StyleHot.LookAndFeel.NativeStyle = True
       TabOrder = 10
       Height = 100
       Width = 396
     end
+    object memPlazoEntrega: TcxDBMemo
+      Left = 22
+      Top = 390
+      Anchors = [akLeft, akTop, akRight, akBottom]
+      DataBinding.DataField = 'PLAZO_ENTREGA'
+      DataBinding.DataSource = DADataSource
+      Properties.ScrollBars = ssVertical
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.HotTrack = False
+      Style.LookAndFeel.Kind = lfStandard
+      Style.LookAndFeel.NativeStyle = True
+      StyleDisabled.LookAndFeel.Kind = lfStandard
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.Kind = lfStandard
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.Kind = lfStandard
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 11
+      Height = 100
+      Width = 396
+    end
     object cbVendedor: TcxDBLookupComboBox
-      Left = 104
+      Left = 131
-      Top = 190
+      Top = 217
       DataBinding.DataField = 'ID_VENDEDOR'
       DataBinding.DataSource = DADataSource
       Properties.KeyFieldNames = 'ID'
@@ -228,11 +228,11 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 8
+      TabOrder = 9
       Width = 27
     end
     object cbTipoContrato: TcxDBComboBox
-      Left = 298
+      Left = 316
       Top = 82
       DataBinding.DataField = 'TIPO_CONTRATO'
       DataBinding.DataSource = DADataSource
@@ -258,7 +258,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       Width = 113
     end
     object edtlREF_CLIENTE: TcxDBTextEdit
-      Left = 104
+      Left = 131
       Top = 55
       Anchors = [akLeft, akTop, akRight]
       AutoSize = False
@@ -280,13 +280,13 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       Width = 335
     end
     inline frViewClienteContrato1: TfrViewClienteContrato
-      Left = 429
+      Left = 441
       Top = 28
       Width = 366
       Height = 270
-      TabOrder = 11
+      TabOrder = 12
       ReadOnly = False
-      ExplicitLeft = 429
+      ExplicitLeft = 441
       ExplicitTop = 28
       ExplicitWidth = 366
       ExplicitHeight = 270
@@ -316,12 +316,16 @@ inherited frViewContratoCliente: TfrViewContratoCliente
           Width = 707
         end
         inherited edtCodigoPostal: TcxDBTextEdit
-          Left = 274
+          Left = 262
-          ExplicitLeft = 274
+          ExplicitLeft = 262
         end
         inherited Button3: TBitBtn
-          Left = 164
+          Left = 152
-          ExplicitLeft = 164
+          ExplicitLeft = 152
+        end
+        inherited cxDBTextEdit1: TcxDBTextEdit
+          ExplicitWidth = 283
+          Width = 283
         end
         inherited dxLayoutControl1Group_Root: TdxLayoutGroup
           inherited dxLayoutControl1Item10: TdxLayoutItem
@@ -332,7 +336,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       end
     end
     object edtFechaDecision: TcxDBDateEdit
-      Left = 104
+      Left = 131
       Top = 109
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_DECISION'
@@ -354,6 +358,29 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       TabOrder = 4
       Width = 115
     end
+    object edtFechaPrevMontaje: TcxDBDateEdit
+      Left = 131
+      Top = 163
+      Anchors = [akLeft, akTop, akRight]
+      DataBinding.DataField = 'FECHA_PREVISTA_MONTAJE'
+      DataBinding.DataSource = DADataSource
+      Properties.DateButtons = [btnToday]
+      Properties.ImmediatePost = True
+      Style.BorderColor = clWindowFrame
+      Style.BorderStyle = ebs3D
+      Style.Color = clInfoBk
+      Style.HotTrack = False
+      Style.LookAndFeel.NativeStyle = True
+      Style.Shadow = False
+      Style.ButtonStyle = bts3D
+      Style.ButtonTransparency = ebtNone
+      Style.PopupBorderStyle = epbsFrame3D
+      StyleDisabled.LookAndFeel.NativeStyle = True
+      StyleFocused.LookAndFeel.NativeStyle = True
+      StyleHot.LookAndFeel.NativeStyle = True
+      TabOrder = 6
+      Width = 295
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -413,6 +440,11 @@ inherited frViewContratoCliente: TfrViewContratoCliente
             Control = cbSituacion
             ControlOptions.ShowBorder = False
           end
+          object dxLayoutControl1Item14: TdxLayoutItem
+            Caption = 'Fecha prev. montaje:'
+            Control = edtFechaPrevMontaje
+            ControlOptions.ShowBorder = False
+          end
           object dxLayoutControl1Group5: TdxLayoutGroup
             ShowCaption = False
             Hidden = True

Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas

@@ -69,6 +69,8 @@ type
     frViewClienteContrato1: TfrViewClienteContrato;
     dxLayoutControl1Item13: TdxLayoutItem;
     edtFechaDecision: TcxDBDateEdit;
+    dxLayoutControl1Item14: TdxLayoutItem;
+    edtFechaPrevMontaje: TcxDBDateEdit;
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure bFormasPagoClick(Sender: TObject);

Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm

@@ -31,6 +31,10 @@ inherited frViewContratosCliente: TfrViewContratosCliente
           Kind = skSum
           Column = cxGridViewIMPORTE_TOTAL
         end>
+      object cxGridViewCAMPO_LIBRE: TcxGridDBColumn
+        Caption = '-'
+        DataBinding.FieldName = 'CAMPO_LIBRE'
+      end
       object cxGridViewINCIDENCIASACTIVAS: TcxGridDBColumn
         Caption = 'Incidencias'
         DataBinding.FieldName = 'INCIDENCIAS_ACTIVAS'
@@ -77,6 +81,10 @@ inherited frViewContratosCliente: TfrViewContratosCliente
         Caption = 'Fecha decisi'#243'n'
         DataBinding.FieldName = 'FECHA_DECISION'
       end
+      object cxGridViewFECHA_PREVISTA_MONTAJE: TcxGridDBColumn
+        Caption = 'Fecha prev. montaje'
+        DataBinding.FieldName = 'FECHA_PREVISTA_MONTAJE'
+      end
       object cxGridViewTIPO_CONTRATO: TcxGridDBColumn
         DataBinding.FieldName = 'TIPO_CONTRATO'
         BestFitMaxWidth = 25
@@ -118,6 +126,7 @@ inherited frViewContratosCliente: TfrViewContratosCliente
         Visible = False
       end
       object cxGridViewPROVINCIA: TcxGridDBColumn
+        Caption = 'Provincia'
         DataBinding.FieldName = 'PROVINCIA'
         Visible = False
       end

Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas

@@ -50,6 +50,8 @@ type
     cxGridLevelRechazados: TcxGridLevel;
     cxGridViewFECHA_DECISION: TcxGridDBColumn;
     cxGridViewFACTURA_ASOCIADA: TcxGridDBColumn;
+    cxGridViewFECHA_PREVISTA_MONTAJE: TcxGridDBColumn;
+    cxGridViewCAMPO_LIBRE: TcxGridDBColumn;
     procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel:
             TcxGridLevel);
     procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;

Source/Modulos/Contratos de cliente/Views/uViewDetallesContratoCliente.dfm

@@ -1,89 +1,5 @@
 inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
-  Width = 855
-  Height = 510
-  inherited ToolBar1: TToolBar
-    Width = 855
-    Height = 24
-    inherited ToolButton4: TToolButton
-      Wrap = False
-    end
-    inherited ToolButton14: TToolButton
-      Left = 334
-      Top = 0
-      ExplicitLeft = 334
-      ExplicitTop = 0
-    end
-    inherited FontName: TJvFontComboBox
-      Left = 368
-      Top = 0
-      ExplicitLeft = 368
-      ExplicitTop = 0
-    end
-    inherited FontSize: TEdit
-      Left = 513
-      Top = 0
-      ExplicitLeft = 513
-      ExplicitTop = 0
-    end
-    inherited UpDown1: TUpDown
-      Left = 555
-      Top = 0
-      ExplicitLeft = 555
-      ExplicitTop = 0
-    end
-    inherited ToolButton13: TToolButton
-      Left = 572
-      Top = 0
-      ExplicitLeft = 572
-      ExplicitTop = 0
-    end
-    inherited ToolButton6: TToolButton
-      Left = 580
-      Top = 0
-      ExplicitLeft = 580
-      ExplicitTop = 0
-    end
-    inherited ToolButton7: TToolButton
-      Left = 614
-      Top = 0
-      ExplicitLeft = 614
-      ExplicitTop = 0
-    end
-    inherited ToolButton8: TToolButton
-      Left = 648
-      Top = 0
-      ExplicitLeft = 648
-      ExplicitTop = 0
-    end
-    inherited ToolButton12: TToolButton
-      Left = 682
-      Top = 0
-      ExplicitLeft = 682
-      ExplicitTop = 0
-    end
-    inherited ToolButton9: TToolButton
-      Left = 690
-      Top = 0
-      ExplicitLeft = 690
-      ExplicitTop = 0
-    end
-    inherited ToolButton10: TToolButton
-      Left = 724
-      Top = 0
-      ExplicitLeft = 724
-      ExplicitTop = 0
-    end
-    inherited ToolButton11: TToolButton
-      Left = 758
-      Top = 0
-      ExplicitLeft = 758
-      ExplicitTop = 0
-    end
-  end
   inherited cxGrid: TcxGrid
-    Top = 50
-    Width = 855
-    Height = 460
     inherited cxGridView: TcxGridDBTableView
       inherited cxGridViewID_ARTICULO: TcxGridDBColumn
         Width = 57
@@ -110,6 +26,7 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
         Width = 186
       end
       inherited cxGridViewCANTIDAD: TcxGridDBColumn
+        Properties.Alignment.Horz = taRightJustify
         VisibleForCustomization = False
         Width = 20
       end
@@ -118,6 +35,10 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
         Width = 26
       end
       inherited cxGridViewDESCUENTO: TcxGridDBColumn
+        Properties.Alignment.Horz = taCenter
+        FooterAlignmentHorz = taCenter
+        HeaderAlignmentHorz = taCenter
+        HeaderGlyphAlignmentHorz = taCenter
         VisibleForCustomization = False
         Width = 20
       end
@@ -126,25 +47,20 @@ inherited frViewDetallesContratoCliente: TfrViewDetallesContratoCliente
         VisibleForCustomization = False
         Width = 29
       end
-      inherited cxGridViewVISIBLE: TcxGridDBColumn [13]
+      inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn
-        Visible = True
-      end
-      inherited cxGridViewIMPORTEPORTE: TcxGridDBColumn [14]
-      end
-      inherited cxGridViewVISIBLE2: TcxGridDBColumn [15]
-        Visible = True
-      end
-      inherited cxGridViewIMPORTETOTAL: TcxGridDBColumn [16]
         VisibleForCustomization = False
         Width = 22
       end
+      inherited cxGridViewVISIBLE: TcxGridDBColumn
+        Visible = True
+      end
+      inherited cxGridViewVISIBLE2: TcxGridDBColumn
+        Visible = True
+      end
     end
   end
   inherited TBXDock1: TTBXDock
-    Top = 24
-    Width = 855
     inherited TBXToolbar1: TTBXToolbar
-      ExplicitWidth = 665
       object TBXSubmenuItem1: TTBXSubmenuItem [0]
         Caption = 'A'#241'adir cap'#237'tulo'
         DisplayMode = nbdmImageAndText

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

@@ -1,6 +1,16 @@
 inherited frViewDetallesFacturaCliente: TfrViewDetallesFacturaCliente
   inherited cxGrid: TcxGrid
     inherited cxGridView: TcxGridDBTableView
+      inherited cxGridViewCANTIDAD: TcxGridDBColumn
+        Properties.Alignment.Horz = taRightJustify
+      end
+      inherited cxGridViewDESCUENTO: TcxGridDBColumn
+        Properties.Alignment.Horz = taCenter
+        FooterAlignmentHorz = taCenter
+        GroupSummaryAlignment = taCenter
+        HeaderAlignmentHorz = taCenter
+        HeaderGlyphAlignmentHorz = taCenter
+      end
       inherited cxGridViewIMPORTENETO: TcxGridDBColumn
         Visible = False
         VisibleForCustomization = False

Source/Modulos/Facturas de proveedor/Controller/uDetallesFacturaProveedorController.pas

@@ -9,7 +9,7 @@ uses
 type
   IDetallesFacturaProveedorController = interface(IControllerDetallesArticulos)
   ['{49F6199E-E031-42F5-AEA5-E70C3E3479A1}']
-    procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; AProveedor: IBizProveedor; const ANuevaFila :Boolean = True; const ACantidad: Integer = 1); overload; 
+    procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; AProveedor: IBizProveedor; const ANuevaFila :Boolean = True; const ACantidad: Integer = 1); overload;
     procedure ActualizarDetalles(ADetalles: IDAStronglyTypedDataTable; AProveedor: IBizProveedor);
     procedure AnadirDetalleFacturaAsociadaAbono(ADetalles: IBizDetallesFacturaProveedor; AReferencia: String; AFecha: String);
     procedure DesglosarPorteDetalles(ImportePorte: Currency; ADetalles: IDAStronglyTypedDataTable);
@@ -25,10 +25,11 @@ type
 
     procedure AsignarController; override;
     //Si sobreescribimos este método podremos tener en cuenta otras columnas para el calculo del importe total de un concepto
-    function CalcularImporteTotalConcepto(DataTable: TDADataTable): Double; override;
+
     procedure ValidarCampos(DataTable: TDADataTable); override;
     procedure DesglosarPorteDetalles(ImportePorte: Currency; ADetalles: IDAStronglyTypedDataTable);
     function DarTotalPorteTotal(ADetalles: IDAStronglyTypedDataTable): Double;
+    function CalcularImporteTotalConcepto(DataTable: TDADataTable): Double; override;    
 
   public
     procedure AnadirArticulos(ADetalles: IDAStronglyTypedDataTable; AProveedor: IBizProveedor; const ANuevaFila :Boolean = True; const ACantidad: Integer = 1); overload;

Source/Modulos/Facturas de proveedor/Controller/uFacturasProveedorController.pas

@@ -257,14 +257,6 @@ begin
   if not Assigned(AFactura) then
     raise Exception.Create ('Factura no asignada (Anadir)');
   AFactura.Insert;
-
-  FDetallesController.Add(AFactura.Detalles, TIPO_DETALLE_CONCEPTO);
-  if not AFactura.Detalles.DataTable.Editing then
-     AFactura.Detalles.DataTable.Edit;
-  AFactura.Detalles.CANTIDAD := 1;
-  AFactura.Detalles.IMPORTE_UNIDAD := 0;
-  AFactura.Detalles.Post;
-
   Result := True;
 end;
 
@@ -708,8 +700,8 @@ begin
   if (EsFechaVacia(AFactura.FECHA_FACTURA)) then
     raise Exception.Create('Debe indicar la fecha de esta factura');
 
-  if (AFactura.Detalles.DataTable.RecordCount = 0) then
+//  if (AFactura.Detalles.DataTable.RecordCount = 0) then
-    raise Exception.Create('La factura debe tener al menos un concepto en su contenido');
+//    raise Exception.Create('La factura debe tener al menos un concepto en su contenido');
 
   if (AFactura.IGNORAR_CONTABILIDAD = 0) then
   begin
@@ -1037,7 +1029,7 @@ begin
   if Supports(ADataTable, IBizDetallesFacturaProveedor, ADetalles) and
      Supports(ADetalles.DataTable.MasterSource.DataTable, IBizFacturaProveedor, AFactura) then
   begin
-    RecalcularImportes(AFactura);
+//    RecalcularImportes(AFactura);
   end;
 end;
 
@@ -1166,7 +1158,7 @@ begin
     ShowHourglassCursor;
 
     // Asegurarnos de que todos los importes están bien.
-    RecalcularImportes(AFactura);
+//    RecalcularImportes(AFactura);
 
     try
       AFactura.DataTable.ApplyUpdates;

Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.dfm

@@ -82,7 +82,6 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
   inherited pgPaginas: TPageControl
     Width = 1105
     Height = 374
-    ActivePage = pagContenido
     OnChanging = pgPaginasChanging
     ExplicitTop = 109
     ExplicitWidth = 1105
@@ -205,11 +204,13 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
           end
           inherited frViewObservaciones1: TfrViewObservaciones
             Width = 671
+            Height = 228
             ExplicitWidth = 671
+            ExplicitHeight = 228
             inherited memObservaciones: TcxDBMemo
               DataBinding.DataSource = frViewFacturaProveedor1.DADataSource
-              ExplicitWidth = 1036
+              ExplicitWidth = 671
-              ExplicitHeight = 20
+              Height = 228
               Width = 671
             end
           end
@@ -219,6 +220,7 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
     object pagContenido: TTabSheet
       Caption = 'Contenido'
       ImageIndex = 1
+      TabVisible = False
       inline frViewDetallesFacturaProveedor1: TfrViewDetallesFacturaProveedor
         Left = 0
         Top = 0
@@ -375,6 +377,18 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         inherited ToolBar1: TToolBar
           Width = 1097
           ExplicitWidth = 1097
+          inherited ToolButton1: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton4: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton2: TToolButton
+            ExplicitWidth = 113
+          end
+          inherited ToolButton7: TToolButton
+            ExplicitWidth = 113
+          end
         end
       end
     end
@@ -451,94 +465,94 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
       Width = 1111
       ExplicitWidth = 1111
       inherited Bevel3: TBevel
-        Left = 630
+        Left = 587
         Top = 30
         Height = 122
-        ExplicitLeft = 630
+        ExplicitLeft = 587
         ExplicitTop = 30
         ExplicitHeight = 122
       end
       inherited Bevel4: TBevel
-        Left = 742
+        Left = 699
         Top = 57
         Width = 186
-        ExplicitLeft = 742
+        ExplicitLeft = 699
         ExplicitTop = 57
         ExplicitWidth = 186
       end
       inherited ImporteDto: TcxDBCurrencyEdit
-        Top = 84
+        Top = 57
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 84
+        ExplicitTop = 57
         ExplicitWidth = 207
         Width = 207
       end
       inherited ImporteIVA: TcxDBCurrencyEdit
-        Left = 813
+        Left = 770
         Top = 77
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 813
+        ExplicitLeft = 770
         ExplicitTop = 77
         ExplicitWidth = 143
         Width = 143
       end
       inherited ImporteTotal: TcxDBCurrencyEdit
-        Left = 743
+        Left = 700
         Top = 131
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 743
+        ExplicitLeft = 700
         ExplicitTop = 131
         ExplicitWidth = 213
         Width = 213
       end
       inherited edtDescuento: TcxDBSpinEdit
-        Top = 84
+        Top = 57
         Properties.OnValidate = frViewTotales1edtDescuentoPropertiesValidate
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 84
+        ExplicitTop = 57
       end
       inherited edtIVA: TcxDBSpinEdit
-        Left = 742
+        Left = 699
         Top = 77
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 742
+        ExplicitLeft = 699
         ExplicitTop = 77
       end
       inherited ImporteBase: TcxDBCurrencyEdit
-        Left = 742
+        Left = 699
         Top = 30
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 742
+        ExplicitLeft = 699
         ExplicitTop = 30
         ExplicitWidth = 214
         Width = 214
       end
       inherited edtRE: TcxDBSpinEdit
-        Left = 742
+        Left = 699
         Top = 104
         Properties.AssignedValues.MinValue = True
         Style.LookAndFeel.SkinName = ''
@@ -546,35 +560,37 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 742
+        ExplicitLeft = 699
         ExplicitTop = 104
       end
       inherited ImporteRE: TcxDBCurrencyEdit
-        Left = 813
+        Left = 770
         Top = 104
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitLeft = 813
+        ExplicitLeft = 770
         ExplicitTop = 104
         ExplicitWidth = 143
         Width = 143
       end
       inherited eImporteNeto: TcxDBCurrencyEdit
-        Top = 57
+        Top = 30
+        Enabled = True
+        Properties.ReadOnly = False
         Style.LookAndFeel.SkinName = ''
         Style.IsFontAssigned = True
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 57
+        ExplicitTop = 30
         ExplicitWidth = 278
         Width = 278
       end
       inherited ePorte: TcxDBCurrencyEdit
-        Top = 111
+        Top = 84
         DataBinding.DataSource = dsDataTable
         Properties.OnValidate = frViewTotales1ePortePropertiesValidate
         Style.LookAndFeel.SkinName = ''
@@ -583,62 +599,44 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
         OnEditing = frViewTotales1ePorteEditing
-        ExplicitTop = 111
+        ExplicitTop = 84
         ExplicitWidth = 278
         Width = 278
       end
       inherited eIVA: TcxDBLookupComboBox
-        Top = 138
+        Top = 111
         Properties.OnValidate = frViewTotales1eIVAPropertiesValidate
         Style.Color = clInfoBk
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 138
+        ExplicitTop = 111
         ExplicitWidth = 140
         Width = 140
       end
       inherited bTiposIVA: TButton
-        Left = 482
+        Left = 439
-        Top = 138
+        Top = 111
         OnClick = frViewTotales1bTiposIVAClick
-        ExplicitLeft = 482
+        ExplicitLeft = 439
-        ExplicitTop = 138
+        ExplicitTop = 111
       end
       inherited cbRecargoEquivalencia: TcxDBCheckBox
-        Top = 165
+        Top = 138
         Style.LookAndFeel.SkinName = ''
         StyleDisabled.LookAndFeel.SkinName = ''
         StyleFocused.LookAndFeel.SkinName = ''
         StyleHot.LookAndFeel.SkinName = ''
-        ExplicitTop = 165
+        ExplicitTop = 138
         ExplicitWidth = 278
         Width = 278
       end
-      inherited eImporteDetalleResumen: TcxDBCurrencyEdit
-        Top = 30
-        DataBinding.DataField = 'IMPORTE_UNIDAD'
-        DataBinding.DataSource = frViewDetallesFacturaProveedor1.DADataSource
-        Properties.ReadOnly = False
-        Properties.OnEditValueChanged = frViewTotales1eImporteDetalleResumenPropertiesEditValueChanged
-        Style.IsFontAssigned = True
-        ExplicitTop = 30
-        ExplicitWidth = 342
-        Width = 342
-      end
       inherited dxLayoutControl1Group_Root: TdxLayoutGroup
         LookAndFeel = frViewFacturaProveedor1.dxLayoutOfficeLookAndFeel1
         inherited dxLayoutControl1Group1: TdxLayoutGroup
           inherited dxLayoutControl1Group2: TdxLayoutGroup
-            inherited dxLayoutControl1Item10: TdxLayoutItem
-              Visible = True
-            end
-            inherited dxLayoutControl1Item8: TdxLayoutItem
-              Visible = False
-            end
             inherited dxLayoutControl1Group7: TdxLayoutGroup
-              Visible = False
               inherited dxLayoutControl1Group10: TdxLayoutGroup
                 inherited dxLayoutControl1Item4: TdxLayoutItem
                   Visible = False
@@ -647,6 +645,9 @@ inherited fEditorFacturaProveedor: TfEditorFacturaProveedor
                   Visible = False
                 end
               end
+              inherited dxLayoutControl1Item9: TdxLayoutItem
+                Visible = False
+              end
             end
           end
           inherited dxLayoutControl1Group5: TdxLayoutGroup

Source/Modulos/Facturas de proveedor/Views/uEditorFacturaProveedor.pas

@@ -44,8 +44,8 @@ type
     procedure frViewTotales1ePorteEditing(Sender: TObject; var CanEdit: Boolean);
     procedure OnRecargoEquivalenciaPropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
       var Error: Boolean);
-    procedure frViewTotales1eImporteDetalleResumenPropertiesEditValueChanged(
+
-      Sender: TObject); //Importante en este punto se deben de quitar los eventos que puedan afectar a la tabla una vez se cierre el editor.
+
 
   private
     procedure RecalcularPortePorUnidad;
@@ -198,13 +198,6 @@ begin
   Factura.DESCUENTO := DisplayValue;
 end;
 
-procedure TfEditorFacturaProveedor.frViewTotales1eImporteDetalleResumenPropertiesEditValueChanged(
-  Sender: TObject);
-begin
-  inherited;
-  showmessage('recalcular importes detalle');
-end;
-
 procedure TfEditorFacturaProveedor.frViewTotales1eIVAPropertiesValidate(
   Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption;
   var Error: Boolean);

Source/Modulos/Facturas de proveedor/Views/uViewDetallesFacturaProveedor.dfm

@@ -5,7 +5,11 @@ inherited frViewDetallesFacturaProveedor: TfrViewDetallesFacturaProveedor
         Properties.Alignment.Horz = taRightJustify
       end
       inherited cxGridViewDESCUENTO: TcxGridDBColumn
+        Properties.Alignment.Horz = taCenter
         Visible = False
+        FooterAlignmentHorz = taCenter
+        GroupSummaryAlignment = taCenter
+        HeaderAlignmentHorz = taCenter
         VisibleForCustomization = False
       end
       inherited cxGridViewIMPORTENETO: TcxGridDBColumn

Source/Modulos/Formas de pago/Plugin/uPluginFormasPago.dfm

@@ -53,7 +53,9 @@ object PluginFormasPago: TPluginFormasPago
     object actFormasPago: TAction
       Category = 'FormasPago'
       Caption = 'Formas de pago'
+      Enabled = False
       ImageIndex = 0
+      Visible = False
       OnExecute = actFormasPagoExecute
     end
   end

Source/Modulos/Formas de pago/Plugin/uPluginFormasPago.pas

@@ -31,7 +31,7 @@ implementation
 {$R *.dfm}
 
 uses
-  Forms, Dialogs, SysUtils,
+  Forms, Dialogs, SysUtils, uFactuGES_App,
   uFormasPagoController, uBizFormasPago, uFormasPagoViewRegister;
 
 function GetModule : TModuleController;
@@ -56,6 +56,14 @@ constructor TPluginFormasPago.Create(AOwner: TComponent);
 begin
   inherited;
   uFormasPagoViewRegister.RegisterViews;
+
+  //Solo lo verá el perfil Administrador
+  if ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA)) then
+  begin
+     actFormasPago.Visible := True;
+     actFormasPago.Enabled := True;
+  end;
+
 end;
 
 destructor TPluginFormasPago.Destroy;

Source/Modulos/Formas de pago/Views/uEditorFormaPago.dfm

@@ -4,8 +4,8 @@ object fEditorFormaPago: TfEditorFormaPago
   BorderIcons = [biSystemMenu]
   BorderStyle = bsSingle
   Caption = 'Forma de pago'
-  ClientHeight = 390
+  ClientHeight = 435
-  ClientWidth = 484
+  ClientWidth = 493
   Color = clBtnFace
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
@@ -26,21 +26,21 @@ object fEditorFormaPago: TfEditorFormaPago
   object dxLayoutControl1: TdxLayoutControl
     Left = 0
     Top = 0
-    Width = 484
+    Width = 493
-    Height = 390
+    Height = 435
     Align = alClient
     TabOrder = 0
     TabStop = False
     object Bevel4: TBevel
       Left = 10
-      Top = 329
+      Top = 380
       Width = 388
       Height = 10
       Shape = bsBottomLine
     end
     object Bevel2: TBevel
       Left = 10
-      Top = 151
+      Top = 202
       Width = 388
       Height = 10
       Shape = bsBottomLine
@@ -56,20 +56,9 @@ object fEditorFormaPago: TfEditorFormaPago
       DataSource = dsFormaPago
       TabOrder = 0
     end
-    object eDescripcion: TDBEdit
-      Left = 76
-      Top = 43
-      Width = 262
-      Height = 21
-      BorderStyle = bsNone
-      Color = clInfoBk
-      DataField = 'DESCRIPCION'
-      DataSource = dsFormaPago
-      TabOrder = 1
-    end
     object ListaFormasPago: TcxGrid
       Left = 10
-      Top = 167
+      Top = 218
       Width = 246
       Height = 156
       TabOrder = 6
@@ -112,7 +101,7 @@ object fEditorFormaPago: TfEditorFormaPago
     end
     object bAnadir: TButton
       Left = 262
-      Top = 167
+      Top = 218
       Width = 95
       Height = 23
       Action = actAnadir
@@ -120,7 +109,7 @@ object fEditorFormaPago: TfEditorFormaPago
     end
     object bEliminar: TButton
       Left = 262
-      Top = 196
+      Top = 247
       Width = 95
       Height = 23
       Action = actEliminar
@@ -128,7 +117,7 @@ object fEditorFormaPago: TfEditorFormaPago
     end
     object bAceptar: TButton
       Left = 314
-      Top = 345
+      Top = 396
       Width = 75
       Height = 23
       Action = actAceptar
@@ -136,7 +125,7 @@ object fEditorFormaPago: TfEditorFormaPago
     end
     object bCancelar: TButton
       Left = 395
-      Top = 345
+      Top = 396
       Width = 75
       Height = 23
       Action = actCancelar
@@ -145,7 +134,7 @@ object fEditorFormaPago: TfEditorFormaPago
     end
     object rdPagoPlazos: TcxRadioButton
       Left = 10
-      Top = 125
+      Top = 176
       Width = 388
       Height = 20
       Caption = 'Plazos del pago'
@@ -154,7 +143,7 @@ object fEditorFormaPago: TfEditorFormaPago
     end
     object rdPagoVencimiento: TcxRadioButton
       Left = 10
-      Top = 72
+      Top = 123
       Width = 388
       Height = 20
       Caption = 'Pago por vencimiento'
@@ -163,7 +152,7 @@ object fEditorFormaPago: TfEditorFormaPago
     end
     object cbSubcuenta: TcxDBLookupComboBox
       Left = 74
-      Top = 98
+      Top = 149
       DataBinding.DataField = 'ID_SUBCUENTA'
       DataBinding.DataSource = dsFormaPago
       Enabled = False
@@ -194,7 +183,7 @@ object fEditorFormaPago: TfEditorFormaPago
     end
     object cxDBCheckBox1: TcxDBCheckBox
       Left = 330
-      Top = 98
+      Top = 149
       Caption = 'Ignorar en contabilidad'
       DataBinding.DataField = 'IGNORAR_CONTABILIDAD'
       DataBinding.DataSource = dsFormaPago
@@ -204,6 +193,18 @@ object fEditorFormaPago: TfEditorFormaPago
       TabOrder = 4
       Width = 140
     end
+    object eDescripcion: TDBMemo
+      Left = 76
+      Top = 43
+      Width = 392
+      Height = 72
+      BorderStyle = bsNone
+      Color = clInfoBk
+      DataField = 'DESCRIPCION'
+      DataSource = dsFormaPago
+      ScrollBars = ssVertical
+      TabOrder = 1
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       AutoAligns = [aaVertical]
       AlignHorz = ahClient

Source/Modulos/Formas de pago/Views/uEditorFormaPago.pas

@@ -55,8 +55,6 @@ type
     dxLayoutControl1: TdxLayoutControl;
     dxLayoutControl1Item1: TdxLayoutItem;
     eReferencia: TDBEdit;
-    dxLayoutControl1Item2: TdxLayoutItem;
-    eDescripcion: TDBEdit;
     dxLayoutControl1Item3: TdxLayoutItem;
     ListaFormasPago: TcxGrid;
     ListaFormasPagoDBTableView1: TcxGridDBTableView;
@@ -90,6 +88,8 @@ type
     cxDBCheckBox1: TcxDBCheckBox;
     checkIgnorarContabilidad: TdxLayoutItem;
     panelVencimiento: TdxLayoutGroup;
+    dxLayoutControl1Item2: TdxLayoutItem;
+    eDescripcion: TDBMemo;
     procedure FormShow(Sender: TObject);
 
     procedure actAnadirExecute(Sender: TObject);

Source/Modulos/Formas de pago/Views/uEditorFormasPago.pas

@@ -115,7 +115,7 @@ begin
   (Sender as TAction).Enabled := Assigned(FFormasPago) and
                                  FFormasPago.DataTable.Active and
                                  (FFormasPago.DataTable.RecordCount > 0) and
-                                 (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR);
+                                 ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA))
 end;
 
 procedure TfEditorFormasPago.actModificarExecute(Sender: TObject);
@@ -128,7 +128,7 @@ begin
   (Sender as TAction).Enabled := Assigned(FFormasPago) and
                                  FFormasPago.DataTable.Active and
                                  (FFormasPago.DataTable.RecordCount > 0) and
-                                 (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR);
+                                 ((AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PERFIL_ADMINISTRADOR) OR (AppFactuGES.UsuarioActivo.ID_PERFIL = CTE_PREFIL_GERENCIA))
 end;
 
 constructor TfEditorFormasPago.Create(AOwner: TComponent);