Se cambia texto de informe y algun ajuste de verifactu

Source/Cliente/FactuGES.dproj

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

Source/Modulos/Contratos de cliente/Controller/uContratosClienteController.pas

@@ -299,7 +299,13 @@ begin
     begin
       AContrato.DataTable.Edit;
       AContrato.SITUACION := Situacion;
-      AContrato.FECHA_DECISION := FechaDecision;
+      if Situacion = SITUACION_CONTRATO_RECHAZADO then
+      begin
+        AContrato.FECHA_RECHAZO := FechaDecision;
+        AContrato.FECHA_PREVISTA_MONTAJEIsNull := True;        
+      end
+      else
+        AContrato.FECHA_DECISION := FechaDecision;
       AContrato.DataTable.Post;
     end;
 
@@ -315,7 +321,13 @@ begin
            begin
              AContrato.DataTable.Edit;
              AContrato.SITUACION := Situacion;
-             AContrato.FECHA_DECISION := FechaDecision;             
+             if Situacion = SITUACION_CONTRATO_RECHAZADO then
+             begin
+               AContrato.FECHA_RECHAZO := FechaDecision;
+               AContrato.FECHA_PREVISTA_MONTAJEIsNull := True;
+             end
+             else
+               AContrato.FECHA_DECISION := FechaDecision;
              AContrato.DataTable.Post;
            end;
            Next;

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

@@ -382,6 +382,10 @@ inherited DataModuleContratosCliente: TDataModuleContratosCliente
       item
         Name = 'FECHA_ULT_PRESENTACION_CLIENTE'
         DataType = datDateTime
+      end
+      item
+        Name = 'FECHA_RECHAZO'
+        DataType = datDateTime
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]

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

@@ -9,13 +9,13 @@ 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 = '{52B71EED-9363-4A19-B433-C4917CBE0490}';
+  RID_Valores = '{9700A664-C99F-48AA-A7B6-705238D37C50}';
-  RID_Propiedades = '{28500097-0FDC-4DBF-8047-FF879A5DDC4A}';
+  RID_Propiedades = '{EC6EA736-6542-4230-9BA2-AA774B0DB400}';
-  RID_ListaAnosContratos = '{587736A2-5CC2-48D3-B32A-E54D4E7E23B5}';
+  RID_ListaAnosContratos = '{DEF02794-EC40-47F0-A94C-DB170EAB2B61}';
-  RID_ContratosClienteBeneficios = '{C9C242F8-9818-4C50-B4F8-12D1F83C3682}';
+  RID_ContratosClienteBeneficios = '{6C1D5DE4-C825-4354-B05D-5B0524347E6F}';
-  RID_ContratosCliente = '{25E7020F-9DCA-4458-BB59-6F80612DB958}';
+  RID_ContratosCliente = '{70625CCC-4B5D-494F-B047-42E0654C241F}';
-  RID_TiposCapitulos = '{FF4FB40E-4BDD-4D49-8893-AEF4013E66C7}';
+  RID_TiposCapitulos = '{91249E68-624E-41DB-9B31-838D8334D014}';
-  RID_ContratosCliente_Detalles = '{893CDA38-9F05-42E6-A176-200846BFB3B4}';
+  RID_ContratosCliente_Detalles = '{C4B0A81E-1FCC-42CD-B0E2-11B61C3D80A7}';
 
   { Data table names }
   nme_Valores = 'Valores';
@@ -144,6 +144,7 @@ const
   fld_ContratosClientePROCEDENCIA_CLIENTE = 'PROCEDENCIA_CLIENTE';
   fld_ContratosClienteEMAIL_1 = 'EMAIL_1';
   fld_ContratosClienteFECHA_ULT_PRESENTACION_CLIENTE = 'FECHA_ULT_PRESENTACION_CLIENTE';
+  fld_ContratosClienteFECHA_RECHAZO = 'FECHA_RECHAZO';
 
   { ContratosCliente field indexes }
   idx_ContratosClienteID = 0;
@@ -203,6 +204,7 @@ const
   idx_ContratosClientePROCEDENCIA_CLIENTE = 54;
   idx_ContratosClienteEMAIL_1 = 55;
   idx_ContratosClienteFECHA_ULT_PRESENTACION_CLIENTE = 56;
+  idx_ContratosClienteFECHA_RECHAZO = 57;
 
   { TiposCapitulos fields }
   fld_TiposCapitulosID = 'ID';
@@ -261,7 +263,7 @@ const
 type
   { IValores }
   IValores = interface(IDAStronglyTypedDataTable)
-  ['{D4C72CBB-5A40-48B5-852D-1A61B100DFEB}']
+  ['{584885FC-527A-4BA9-98B6-64EC56AB2F15}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -320,7 +322,7 @@ type
 
   { IPropiedades }
   IPropiedades = interface(IDAStronglyTypedDataTable)
-  ['{F803D346-E489-4868-B0A3-F1C2E96E16B2}']
+  ['{31AC7CB8-FA2C-4508-9285-3410D3912EFD}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -379,7 +381,7 @@ type
 
   { IListaAnosContratos }
   IListaAnosContratos = interface(IDAStronglyTypedDataTable)
-  ['{B9314FAD-1F9D-40AE-BA67-0D5AB968CB40}']
+  ['{B425B427-D454-4FFB-983E-41AC8EDB68A1}']
     { Property getters and setters }
     function GetANOValue: String;
     procedure SetANOValue(const aValue: String);
@@ -414,7 +416,7 @@ type
 
   { IContratosClienteBeneficios }
   IContratosClienteBeneficios = interface(IDAStronglyTypedDataTable)
-  ['{EFDA00B5-AC6D-4E4E-A034-0AA20C0A990A}']
+  ['{21CAC860-3B38-4B1B-8510-FD380C7ADFFE}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -617,7 +619,7 @@ type
 
   { IContratosCliente }
   IContratosCliente = interface(IDAStronglyTypedDataTable)
-  ['{F8022D8A-297E-4D9D-8AC6-B18A5C333FE6}']
+  ['{73D85A00-9EA2-401B-93DC-EDC60F0AC62D}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -841,6 +843,10 @@ type
     procedure SetFECHA_ULT_PRESENTACION_CLIENTEValue(const aValue: DateTime);
     function GetFECHA_ULT_PRESENTACION_CLIENTEIsNull: Boolean;
     procedure SetFECHA_ULT_PRESENTACION_CLIENTEIsNull(const aValue: Boolean);
+    function GetFECHA_RECHAZOValue: DateTime;
+    procedure SetFECHA_RECHAZOValue(const aValue: DateTime);
+    function GetFECHA_RECHAZOIsNull: Boolean;
+    procedure SetFECHA_RECHAZOIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -958,6 +964,8 @@ type
     property EMAIL_1IsNull: Boolean read GetEMAIL_1IsNull write SetEMAIL_1IsNull;
     property FECHA_ULT_PRESENTACION_CLIENTE: DateTime read GetFECHA_ULT_PRESENTACION_CLIENTEValue write SetFECHA_ULT_PRESENTACION_CLIENTEValue;
     property FECHA_ULT_PRESENTACION_CLIENTEIsNull: Boolean read GetFECHA_ULT_PRESENTACION_CLIENTEIsNull write SetFECHA_ULT_PRESENTACION_CLIENTEIsNull;
+    property FECHA_RECHAZO: DateTime read GetFECHA_RECHAZOValue write SetFECHA_RECHAZOValue;
+    property FECHA_RECHAZOIsNull: Boolean read GetFECHA_RECHAZOIsNull write SetFECHA_RECHAZOIsNull;
   end;
 
   { TContratosClienteDataTableRules }
@@ -1199,6 +1207,10 @@ type
     procedure SetFECHA_ULT_PRESENTACION_CLIENTEValue(const aValue: DateTime); virtual;
     function GetFECHA_ULT_PRESENTACION_CLIENTEIsNull: Boolean; virtual;
     procedure SetFECHA_ULT_PRESENTACION_CLIENTEIsNull(const aValue: Boolean); virtual;
+    function GetFECHA_RECHAZOValue: DateTime; virtual;
+    procedure SetFECHA_RECHAZOValue(const aValue: DateTime); virtual;
+    function GetFECHA_RECHAZOIsNull: Boolean; virtual;
+    procedure SetFECHA_RECHAZOIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -1315,6 +1327,8 @@ type
     property EMAIL_1IsNull: Boolean read GetEMAIL_1IsNull write SetEMAIL_1IsNull;
     property FECHA_ULT_PRESENTACION_CLIENTE: DateTime read GetFECHA_ULT_PRESENTACION_CLIENTEValue write SetFECHA_ULT_PRESENTACION_CLIENTEValue;
     property FECHA_ULT_PRESENTACION_CLIENTEIsNull: Boolean read GetFECHA_ULT_PRESENTACION_CLIENTEIsNull write SetFECHA_ULT_PRESENTACION_CLIENTEIsNull;
+    property FECHA_RECHAZO: DateTime read GetFECHA_RECHAZOValue write SetFECHA_RECHAZOValue;
+    property FECHA_RECHAZOIsNull: Boolean read GetFECHA_RECHAZOIsNull write SetFECHA_RECHAZOIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -1327,7 +1341,7 @@ type
   }
   { ITiposCapitulos }
   ITiposCapitulos = interface(IDAStronglyTypedDataTable)
-  ['{B0A1870A-440A-4DA1-A1F7-BC9AD8D5F1A2}']
+  ['{C366B6C5-E4C3-444F-A3E3-E17B42B57DC1}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1422,7 +1436,7 @@ type
 
   { IContratosCliente_Detalles }
   IContratosCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{0CF18EC5-18A6-409F-B07C-417A09924B1C}']
+  ['{ED020C20-17FD-4FC2-A75D-A683AC6EE042}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3401,6 +3415,27 @@ begin
     DataTable.Fields[idx_ContratosClienteFECHA_ULT_PRESENTACION_CLIENTE].AsVariant := Null;
 end;
 
+function TContratosClienteDataTableRules.GetFECHA_RECHAZOValue: DateTime;
+begin
+  result := DataTable.Fields[idx_ContratosClienteFECHA_RECHAZO].AsDateTime;
+end;
+
+procedure TContratosClienteDataTableRules.SetFECHA_RECHAZOValue(const aValue: DateTime);
+begin
+  DataTable.Fields[idx_ContratosClienteFECHA_RECHAZO].AsDateTime := aValue;
+end;
+
+function TContratosClienteDataTableRules.GetFECHA_RECHAZOIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ContratosClienteFECHA_RECHAZO].IsNull;
+end;
+
+procedure TContratosClienteDataTableRules.SetFECHA_RECHAZOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ContratosClienteFECHA_RECHAZO].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 = '{2AA17EFC-B6ED-42C1-8998-4A61B38C6C9C}';
+  RID_ValoresDelta = '{4DFF50AE-FD6A-44EA-B636-49EBA31E4FB3}';
-  RID_PropiedadesDelta = '{CFCEAC41-2605-4AB8-8708-9376886949CD}';
+  RID_PropiedadesDelta = '{329C5B5D-C5D8-4ED4-A927-D3872EE2D377}';
-  RID_ListaAnosContratosDelta = '{3CF93616-7DEB-4108-BBF9-DF16A4F51DF1}';
+  RID_ListaAnosContratosDelta = '{4F49F674-B444-42C6-BB05-8D804D176E74}';
-  RID_ContratosClienteBeneficiosDelta = '{0B3B92D0-5683-4069-BCC9-BF13F3D32B81}';
+  RID_ContratosClienteBeneficiosDelta = '{D276DE4B-DED7-4DF7-BA03-5BA6662B4763}';
-  RID_ContratosClienteDelta = '{5972C7CE-C947-4BB7-ADA5-E24116CC4879}';
+  RID_ContratosClienteDelta = '{3CAE4DFF-C9A2-4486-8C92-705B6EB93DCB}';
-  RID_TiposCapitulosDelta = '{C2270A90-511B-4330-B083-2AB5AE7B2621}';
+  RID_TiposCapitulosDelta = '{0CE1D021-C816-464F-8BDE-F1892636EFFB}';
-  RID_ContratosCliente_DetallesDelta = '{D393C1E6-380F-4806-9BE9-C4894A4D3E3E}';
+  RID_ContratosCliente_DetallesDelta = '{E213EFE6-9AA9-4E94-BF7F-23E37D48392F}';
 
 type
   { IValoresDelta }
   IValoresDelta = interface(IValores)
-  ['{2AA17EFC-B6ED-42C1-8998-4A61B38C6C9C}']
+  ['{4DFF50AE-FD6A-44EA-B636-49EBA31E4FB3}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_PROPIEDADValue : Integer;
@@ -78,7 +78,7 @@ type
 
   { IPropiedadesDelta }
   IPropiedadesDelta = interface(IPropiedades)
-  ['{CFCEAC41-2605-4AB8-8708-9376886949CD}']
+  ['{329C5B5D-C5D8-4ED4-A927-D3872EE2D377}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -136,7 +136,7 @@ type
 
   { IListaAnosContratosDelta }
   IListaAnosContratosDelta = interface(IListaAnosContratos)
-  ['{3CF93616-7DEB-4108-BBF9-DF16A4F51DF1}']
+  ['{4F49F674-B444-42C6-BB05-8D804D176E74}']
     { Property getters and setters }
     function GetOldANOValue : String;
 
@@ -170,7 +170,7 @@ type
 
   { IContratosClienteBeneficiosDelta }
   IContratosClienteBeneficiosDelta = interface(IContratosClienteBeneficios)
-  ['{0B3B92D0-5683-4069-BCC9-BF13F3D32B81}']
+  ['{D276DE4B-DED7-4DF7-BA03-5BA6662B4763}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldREFERENCIAValue : String;
@@ -372,7 +372,7 @@ type
 
   { IContratosClienteDelta }
   IContratosClienteDelta = interface(IContratosCliente)
-  ['{5972C7CE-C947-4BB7-ADA5-E24116CC4879}']
+  ['{3CAE4DFF-C9A2-4486-8C92-705B6EB93DCB}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -431,6 +431,7 @@ type
     function GetOldPROCEDENCIA_CLIENTEValue : String;
     function GetOldEMAIL_1Value : String;
     function GetOldFECHA_ULT_PRESENTACION_CLIENTEValue : DateTime;
+    function GetOldFECHA_RECHAZOValue : DateTime;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -490,6 +491,7 @@ type
     property OldPROCEDENCIA_CLIENTE : String read GetOldPROCEDENCIA_CLIENTEValue;
     property OldEMAIL_1 : String read GetOldEMAIL_1Value;
     property OldFECHA_ULT_PRESENTACION_CLIENTE : DateTime read GetOldFECHA_ULT_PRESENTACION_CLIENTEValue;
+    property OldFECHA_RECHAZO : DateTime read GetOldFECHA_RECHAZOValue;
   end;
 
   { TContratosClienteBusinessProcessorRules }
@@ -845,6 +847,12 @@ type
     function GetOldFECHA_ULT_PRESENTACION_CLIENTEIsNull: Boolean; virtual;
     procedure SetFECHA_ULT_PRESENTACION_CLIENTEValue(const aValue: DateTime); virtual;
     procedure SetFECHA_ULT_PRESENTACION_CLIENTEIsNull(const aValue: Boolean); virtual;
+    function GetFECHA_RECHAZOValue: DateTime; virtual;
+    function GetFECHA_RECHAZOIsNull: Boolean; virtual;
+    function GetOldFECHA_RECHAZOValue: DateTime; virtual;
+    function GetOldFECHA_RECHAZOIsNull: Boolean; virtual;
+    procedure SetFECHA_RECHAZOValue(const aValue: DateTime); virtual;
+    procedure SetFECHA_RECHAZOIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -1075,6 +1083,10 @@ type
     property FECHA_ULT_PRESENTACION_CLIENTEIsNull : Boolean read GetFECHA_ULT_PRESENTACION_CLIENTEIsNull write SetFECHA_ULT_PRESENTACION_CLIENTEIsNull;
     property OldFECHA_ULT_PRESENTACION_CLIENTE : DateTime read GetOldFECHA_ULT_PRESENTACION_CLIENTEValue;
     property OldFECHA_ULT_PRESENTACION_CLIENTEIsNull : Boolean read GetOldFECHA_ULT_PRESENTACION_CLIENTEIsNull;
+    property FECHA_RECHAZO : DateTime read GetFECHA_RECHAZOValue write SetFECHA_RECHAZOValue;
+    property FECHA_RECHAZOIsNull : Boolean read GetFECHA_RECHAZOIsNull write SetFECHA_RECHAZOIsNull;
+    property OldFECHA_RECHAZO : DateTime read GetOldFECHA_RECHAZOValue;
+    property OldFECHA_RECHAZOIsNull : Boolean read GetOldFECHA_RECHAZOIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -1084,7 +1096,7 @@ type
 
   { ITiposCapitulosDelta }
   ITiposCapitulosDelta = interface(ITiposCapitulos)
-  ['{C2270A90-511B-4330-B083-2AB5AE7B2621}']
+  ['{0CE1D021-C816-464F-8BDE-F1892636EFFB}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldPOSICIONValue : Integer;
@@ -1178,7 +1190,7 @@ type
 
   { IContratosCliente_DetallesDelta }
   IContratosCliente_DetallesDelta = interface(IContratosCliente_Detalles)
-  ['{D393C1E6-380F-4806-9BE9-C4894A4D3E3E}']
+  ['{E213EFE6-9AA9-4E94-BF7F-23E37D48392F}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTRATOValue : Integer;
@@ -3953,6 +3965,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_ULT_PRESENTACION_CLIENTE] := Null;
 end;
 
+function TContratosClienteBusinessProcessorRules.GetFECHA_RECHAZOValue: DateTime;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_RECHAZO];
+end;
+
+function TContratosClienteBusinessProcessorRules.GetFECHA_RECHAZOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_RECHAZO]);
+end;
+
+function TContratosClienteBusinessProcessorRules.GetOldFECHA_RECHAZOValue: DateTime;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteFECHA_RECHAZO];
+end;
+
+function TContratosClienteBusinessProcessorRules.GetOldFECHA_RECHAZOIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteFECHA_RECHAZO]);
+end;
+
+procedure TContratosClienteBusinessProcessorRules.SetFECHA_RECHAZOValue(const aValue: DateTime);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_RECHAZO] := aValue;
+end;
+
+procedure TContratosClienteBusinessProcessorRules.SetFECHA_RECHAZOIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteFECHA_RECHAZO] := Null;
+end;
+
 
 { TTiposCapitulosBusinessProcessorRules }
 constructor TTiposCapitulosBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

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

@@ -510,6 +510,10 @@ object srvContratosCliente: TsrvContratosCliente
               item
                 DatasetField = 'FECHA_ULT_PRESENTACION_CLIENTE'
                 TableField = 'FECHA_ULT_PRESENTACION_CLIENTE'
+              end
+              item
+                DatasetField = 'FECHA_RECHAZO'
+                TableField = 'FECHA_RECHAZO'
               end>
           end>
         Name = 'ContratosCliente'
@@ -820,6 +824,10 @@ object srvContratosCliente: TsrvContratosCliente
           item
             Name = 'FECHA_ULT_PRESENTACION_CLIENTE'
             DataType = datDateTime
+          end
+          item
+            Name = 'FECHA_RECHAZO'
+            DataType = datDateTime
           end>
       end
       item
@@ -1305,6 +1313,11 @@ object srvContratosCliente: TsrvContratosCliente
             Name = 'FECHA_ULT_PRESENTACION_CLIENTE'
             DataType = datDateTime
             Value = ''
+          end
+          item
+            Name = 'FECHA_RECHAZO'
+            DataType = datDateTime
+            Value = ''
           end>
         Statements = <
           item
@@ -1322,18 +1335,19 @@ object srvContratosCliente: TsrvContratosCliente
               ' PERSONA_CONTACTO,'#10'     RE, IMPORTE_RE, RECARGO_EQUIVALENCIA, TE' +
               'LEFONO, MOVIL, TIPO_CONTRATO, CONDICIONES,'#10'     CALIDADES, REFER' +
               'ENCIA_CLIENTE, FECHA_DECISION, FECHA_PREVISTA_MONTAJE, CAMPO_LIB' +
-              'RE,'#10'     FECHA_ULT_PRESENTACION_CLIENTE)'#10'  VALUES'#10'    (:ID, :ID_' +
+              'RE,'#10'     FECHA_ULT_PRESENTACION_CLIENTE, FECHA_RECHAZO)'#10'  VALUES' +
-              'CLIENTE, :NIF_CIF, :NOMBRE, :ID_DIRECCION, :CALLE, :POBLACION, :' +
+              #10'    (:ID, :ID_CLIENTE, :NIF_CIF, :NOMBRE, :ID_DIRECCION, :CALLE' +
-              'PROVINCIA,'#10'     :CODIGO_POSTAL, :REFERENCIA, :FECHA_CONTRATO, :S' +
+              ', :POBLACION, :PROVINCIA,'#10'     :CODIGO_POSTAL, :REFERENCIA, :FEC' +
-              'ITUACION, :FORMA_PAGO,'#10'     :PLAZO_ENTREGA, :OBSERVACIONES, :INC' +
+              'HA_CONTRATO, :SITUACION, :FORMA_PAGO,'#10'     :PLAZO_ENTREGA, :OBSE' +
-              'IDENCIAS, :INCIDENCIAS_ACTIVAS, CURRENT_TIMESTAMP,'#10'     :USUARIO' +
+              'RVACIONES, :INCIDENCIAS, :INCIDENCIAS_ACTIVAS, CURRENT_TIMESTAMP' +
-              ', :IMPORTE_NETO, :IMPORTE_PORTE, :DESCUENTO, :IMPORTE_DESCUENTO,' +
+              ','#10'     :USUARIO, :IMPORTE_NETO, :IMPORTE_PORTE, :DESCUENTO, :IMP' +
-              #10'     :BASE_IMPONIBLE, :ID_TIPO_IVA, :IVA, :IMPORTE_IVA, :IMPORT' +
+              'ORTE_DESCUENTO,'#10'     :BASE_IMPONIBLE, :ID_TIPO_IVA, :IVA, :IMPOR' +
-              'E_TOTAL, :ID_FORMA_PAGO,'#10'     :ID_TIENDA, :ID_VENDEDOR, :PERSONA' +
+              'TE_IVA, :IMPORTE_TOTAL, :ID_FORMA_PAGO,'#10'     :ID_TIENDA, :ID_VEN' +
-              '_CONTACTO, :RE, :IMPORTE_RE, :RECARGO_EQUIVALENCIA,'#10'     :TELEFO' +
+              'DEDOR, :PERSONA_CONTACTO, :RE, :IMPORTE_RE, :RECARGO_EQUIVALENCI' +
-              'NO, :MOVIL, :TIPO_CONTRATO, :CONDICIONES, :CALIDADES, :REFERENCI' +
+              'A,'#10'     :TELEFONO, :MOVIL, :TIPO_CONTRATO, :CONDICIONES, :CALIDA' +
-              'A_CLIENTE,'#10'     :FECHA_DECISION, :FECHA_PREVISTA_MONTAJE, :CAMPO' +
+              'DES, :REFERENCIA_CLIENTE,'#10'     :FECHA_DECISION, :FECHA_PREVISTA_' +
-              '_LIBRE, :FECHA_ULT_PRESENTACION_CLIENTE)'#10#10
+              'MONTAJE, :CAMPO_LIBRE, :FECHA_ULT_PRESENTACION_CLIENTE, :FECHA_R' +
+              'ECHAZO)'#10#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -1594,6 +1608,11 @@ object srvContratosCliente: TsrvContratosCliente
             DataType = datDateTime
             Value = ''
           end
+          item
+            Name = 'FECHA_RECHAZO'
+            DataType = datDateTime
+            Value = ''
+          end
           item
             Name = 'OLD_ID'
             Value = ''
@@ -1626,8 +1645,8 @@ object srvContratosCliente: TsrvContratosCliente
               'ES,'#10'    REFERENCIA_CLIENTE = :REFERENCIA_CLIENTE,'#10'    FECHA_DECI' +
               'SION = :FECHA_DECISION,'#10'    FECHA_PREVISTA_MONTAJE = :FECHA_PREV' +
               'ISTA_MONTAJE,'#10'    CAMPO_LIBRE = :CAMPO_LIBRE,'#10'    FECHA_ULT_PRES' +
-              'ENTACION_CLIENTE = :FECHA_ULT_PRESENTACION_CLIENTE'#10'  WHERE'#10'    (' +
+              'ENTACION_CLIENTE = :FECHA_ULT_PRESENTACION_CLIENTE,'#10'    FECHA_RE' +
-              'ID = :OLD_ID)'#10#10
+              'CHAZO = :FECHA_RECHAZO'#10'  WHERE'#10'    (ID = :OLD_ID)'#10#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

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

@@ -2,8 +2,8 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
   Caption = 'Lista de presupuestos de cliente'
   ClientHeight = 551
   ClientWidth = 1119
-  ExplicitWidth = 1127
+  ExplicitWidth = 1135
-  ExplicitHeight = 585
+  ExplicitHeight = 589
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
@@ -126,7 +126,7 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
     Width = 1119
     ExplicitWidth = 1119
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 982
+      ExplicitWidth = 1052
       object TBXSubmenuItem3: TTBXSubmenuItem [0]
         Caption = 'Nuevo'
         DisplayMode = nbdmImageAndText
@@ -161,7 +161,7 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
       end
     end
     inherited tbxFiltro: TTBXToolbar
-      ExplicitWidth = 481
+      ExplicitWidth = 487
       inherited lblAno: TTBXLabelItem
         Visible = True
       end
@@ -198,11 +198,11 @@ inherited fEditorContratosCliente: TfEditorContratosCliente
       end
     end
     inherited TBXTMain2: TTBXToolbar
-      Left = 481
+      Left = 487
       DockPos = 343
       Visible = True
-      ExplicitLeft = 481
+      ExplicitLeft = 487
-      ExplicitWidth = 430
+      ExplicitWidth = 448
       object TBXItem50: TTBXItem
         Action = actLOPD
         DisplayMode = nbdmImageAndText

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

@@ -459,7 +459,7 @@ begin
   inherited;
   (Sender as TAction).Enabled := HayDatos
                                  and ViewGrid.esSeleccionCeldaDatos
-                                 and (FContratos.SITUACION = SITUACION_CONTRATO_PENDIENTE);
+                                 and (FContratos.SITUACION <> SITUACION_CONTRATO_RECHAZADO);
 end;
 
 procedure TfEditorContratosCliente.actGenerarReciboCliExecute(Sender: TObject);

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

@@ -3,6 +3,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
   Height = 491
   OnCreate = CustomViewCreate
   OnDestroy = CustomViewDestroy
+  OnShow = CustomViewShow
   ExplicitWidth = 817
   ExplicitHeight = 491
   object dxLayoutControl1: TdxLayoutControl
@@ -59,7 +60,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 14
+      TabOrder = 15
       Height = 139
       Width = 404
     end
@@ -90,7 +91,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
     end
     object cbFormaPago: TcxDBLookupComboBox
       Left = 198
-      Top = 217
+      Top = 244
       DataBinding.DataField = 'ID_FORMA_PAGO'
       DataBinding.DataSource = DADataSource
       Properties.KeyFieldNames = 'ID'
@@ -115,16 +116,16 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 8
+      TabOrder = 9
       Width = 122
     end
     object bFormasPago: TButton
       Left = 305
-      Top = 217
+      Top = 244
       Width = 132
       Height = 21
       Caption = 'Ver las formas de pago...'
-      TabOrder = 9
+      TabOrder = 10
       OnClick = bFormasPagoClick
     end
     object cbSituacion: TcxDBImageComboBox
@@ -132,6 +133,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       Top = 163
       DataBinding.DataField = 'SITUACION'
       DataBinding.DataSource = DADataSource
+      Properties.ImmediatePost = True
       Properties.Items = <
         item
           Description = 'PENDIENTE'
@@ -159,7 +161,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
     end
     object memFormaPago: TcxDBMemo
       Left = 22
-      Top = 301
+      Top = 328
       Anchors = [akLeft, akTop, akRight, akBottom]
       DataBinding.DataField = 'FORMA_PAGO'
       DataBinding.DataSource = DADataSource
@@ -175,35 +177,35 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 11
-      Height = 100
-      Width = 396
-    end
-    object memPlazoEntrega: TcxDBMemo
-      Left = 22
-      Top = 403
-      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 = 12
       Height = 100
       Width = 396
     end
+    object memPlazoEntrega: TcxDBMemo
+      Left = 22
+      Top = 417
+      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 = 13
+      Height = 100
+      Width = 396
+    end
     object cbVendedor: TcxDBLookupComboBox
       Left = 198
-      Top = 244
+      Top = 271
       DataBinding.DataField = 'ID_VENDEDOR'
       DataBinding.DataSource = DADataSource
       Properties.KeyFieldNames = 'ID'
@@ -228,7 +230,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       StyleFocused.LookAndFeel.NativeStyle = True
       StyleHot.LookAndFeel.Kind = lfStandard
       StyleHot.LookAndFeel.NativeStyle = True
-      TabOrder = 10
+      TabOrder = 11
       Width = 27
     end
     object cbTipoContrato: TcxDBComboBox
@@ -284,7 +286,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       Top = 28
       Width = 366
       Height = 270
-      TabOrder = 13
+      TabOrder = 14
       ReadOnly = False
       ExplicitLeft = 467
       ExplicitTop = 28
@@ -293,7 +295,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       inherited dxLayoutControl1: TdxLayoutControl
         Width = 366
         Height = 270
-        ExplicitWidth = 327
+        ExplicitWidth = 366
         ExplicitHeight = 270
         inherited edtlNombre: TcxDBTextEdit
           ExplicitWidth = 707
@@ -323,6 +325,10 @@ inherited frViewContratoCliente: TfrViewContratoCliente
           Left = 126
           ExplicitLeft = 126
         end
+        inherited cxDBTextEdit1: TcxDBTextEdit
+          ExplicitWidth = 283
+          Width = 283
+        end
         inherited dxLayoutControl1Group_Root: TdxLayoutGroup
           inherited dxLayoutControl1Item10: TdxLayoutItem
             Enabled = False
@@ -360,6 +366,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       Anchors = [akLeft, akTop, akRight]
       DataBinding.DataField = 'FECHA_PREVISTA_MONTAJE'
       DataBinding.DataSource = DADataSource
+      Enabled = False
       Properties.DateButtons = [btnToday]
       Properties.ImmediatePost = True
       Style.BorderColor = clWindowFrame
@@ -400,6 +407,30 @@ inherited frViewContratoCliente: TfrViewContratoCliente
       TabOrder = 4
       Width = 106
     end
+    object edtFechaRechazo: TcxDBDateEdit
+      Left = 198
+      Top = 217
+      Anchors = [akLeft, akTop, akRight]
+      DataBinding.DataField = 'FECHA_RECHAZO'
+      DataBinding.DataSource = DADataSource
+      Enabled = False
+      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 = 8
+      Width = 239
+    end
     object dxLayoutControl1Group_Root: TdxLayoutGroup
       ShowCaption = False
       Hidden = True
@@ -469,11 +500,18 @@ inherited frViewContratoCliente: TfrViewContratoCliente
             Control = cbSituacion
             ControlOptions.ShowBorder = False
           end
-          object dxLayoutControl1Item14: TdxLayoutItem
+          object dxLayoutControlMontaje: TdxLayoutItem
             Caption = 'Fecha prev. montaje:'
+            Enabled = False
             Control = edtFechaPrevMontaje
             ControlOptions.ShowBorder = False
           end
+          object dxLayoutControlRechazo: TdxLayoutItem
+            Caption = 'Fecha rechazo:'
+            Enabled = False
+            Control = edtFechaRechazo
+            ControlOptions.ShowBorder = False
+          end
           object dxLayoutControl1Group5: TdxLayoutGroup
             ShowCaption = False
             Hidden = True

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

@@ -69,16 +69,20 @@ type
     frViewClienteContrato1: TfrViewClienteContrato;
     dxLayoutControl1Item13: TdxLayoutItem;
     edtFechaDecision: TcxDBDateEdit;
-    dxLayoutControl1Item14: TdxLayoutItem;
+    dxLayoutControlMontaje: TdxLayoutItem;
     edtFechaPrevMontaje: TcxDBDateEdit;
     dxLayoutControl1Item15: TdxLayoutItem;
     edtFechaUltPresentacion: TcxDBDateEdit;
     dxLayoutControl1Group10: TdxLayoutGroup;
+    dxLayoutControlRechazo: TdxLayoutItem;
+    edtFechaRechazo: TcxDBDateEdit;
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure bFormasPagoClick(Sender: TObject);
     procedure frViewClienteContratoButton1Click(Sender: TObject);
     procedure frViewClienteContratoButton2Click(Sender: TObject);
+    procedure OnSituacionPropertiesEditValueChanged(Sender: TObject);
+    procedure CustomViewShow(Sender: TObject);
   protected
     FContrato : IBizContratoCliente;
     FFormasPago : IBizFormaPago;
@@ -92,6 +96,7 @@ type
 
     function GetController : IContratosClienteController;
     procedure SetController (const Value : IContratosClienteController);
+    procedure cambiarSituacion;
   public
     property Controller : IContratosClienteController read GetController  write SetController;
 	property Contrato: IBizContratoCliente read GetContrato write SetContrato;
@@ -114,6 +119,32 @@ begin
      FFormasPagoController.VerTodos(FFormasPago);
 end;
 
+procedure TfrViewContratoCliente.OnSituacionPropertiesEditValueChanged(
+  Sender: TObject);
+begin
+  inherited;
+  cambiarSituacion;
+end;
+
+procedure TfrViewContratoCliente.cambiarSituacion;
+begin
+  if (Contrato.SITUACION = SITUACION_CONTRATO_PENDIENTE) then
+  begin
+    dxLayoutControlMontaje.Enabled := False;
+    dxLayoutControlRechazo.Enabled := False;
+  end
+  else if (Contrato.SITUACION = SITUACION_CONTRATO_ACEPTADO) then
+  begin
+    dxLayoutControlMontaje.Enabled := True;
+    dxLayoutControlRechazo.Enabled := False;
+  end
+  else if (Contrato.SITUACION = SITUACION_CONTRATO_RECHAZADO) then
+  begin
+    dxLayoutControlMontaje.Enabled := False;
+    dxLayoutControlRechazo.Enabled := True;
+  end;
+end;
+
 procedure TfrViewContratoCliente.CustomViewCreate(Sender: TObject);
 begin
   inherited;
@@ -133,6 +164,7 @@ end;
 
 procedure TfrViewContratoCliente.CustomViewDestroy(Sender: TObject);
 begin
+  cbSituacion.Properties.OnEditValueChanged := Nil;
   FFormasPago := Nil;
   FFormasPagoController := NIL;
   FVendedor := Nil;
@@ -141,6 +173,13 @@ begin
   inherited;
 end;
 
+procedure TfrViewContratoCliente.CustomViewShow(Sender: TObject);
+begin
+  inherited;
+  cbSituacion.Properties.OnEditValueChanged := OnSituacionPropertiesEditValueChanged;
+  cambiarSituacion;
+end;
+
 procedure TfrViewContratoCliente.frViewClienteContratoButton1Click(Sender: TObject);
 begin
   if Assigned(Contrato) and Assigned(Contrato.Cliente) and

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

@@ -125,6 +125,10 @@ inherited frViewContratosCliente: TfrViewContratosCliente
         Caption = 'Fecha prev. montaje'
         DataBinding.FieldName = 'FECHA_PREVISTA_MONTAJE'
       end
+      object cxGridViewFECHA_RECHAZO: TcxGridDBColumn
+        Caption = 'Fecha rechazo'
+        DataBinding.FieldName = 'FECHA_RECHAZO'
+      end
       object cxGridViewTIPO_CONTRATO: TcxGridDBColumn
         DataBinding.FieldName = 'TIPO_CONTRATO'
         BestFitMaxWidth = 25

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

@@ -68,6 +68,7 @@ type
     cxGridViewIMPORTE_NETO: TcxGridDBColumn;
     cxGridViewFECHA_ULT_PRESENTACION_CLIENTE: TcxGridDBColumn;
     cxGridViewFORMA_PAGO: TcxGridDBColumn;
+    cxGridViewFECHA_RECHAZO: TcxGridDBColumn;
     procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel:
             TcxGridLevel);
     procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;

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

@@ -741,6 +741,7 @@ begin
       SITUACION := CTE_PENDIENTE; //Al ser una nueva debe de estar pendiente
       FECHA_FACTURA := DateOf(Now);
       ID_COMISION_LIQUIDADA := 0;
+      VERIFACTU := 0;
 
       //CONTABILIDAD
       ID_EJERCICIO := AppFactuGES.EjercicioActivo.ID;

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

@@ -348,6 +348,10 @@ inherited DataModuleFacturasCliente: TDataModuleFacturasCliente
       item
         Name = 'VERIFACTU'
         DataType = datSmallInt
+      end
+      item
+        Name = 'VERIFACTU_NOTES'
+        DataType = datMemo
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]

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

@@ -9,9 +9,9 @@ const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_ListaAnosFacturas = '{EC351ED2-7BF8-494B-9B7C-495108F936A7}';
+  RID_ListaAnosFacturas = '{3F96D548-F60F-47A9-8FF5-69911BF9A52F}';
-  RID_FacturasCliente = '{84BEF764-5EF2-4622-8D10-17FFE87C28E2}';
+  RID_FacturasCliente = '{6812EF13-C1F6-4408-A14E-2D350D48FBB9}';
-  RID_FacturasCliente_Detalles = '{B354C63E-51A8-4BB6-A70A-334BF9907B9C}';
+  RID_FacturasCliente_Detalles = '{737BFF0A-CF18-45F0-9E77-4E40DF66AE2F}';
 
   { Data table names }
   nme_ListaAnosFacturas = 'ListaAnosFacturas';
@@ -81,6 +81,7 @@ const
   fld_FacturasClienteLISTA_NOMBRES = 'LISTA_NOMBRES';
   fld_FacturasClientePROCEDENCIA_CLIENTE = 'PROCEDENCIA_CLIENTE';
   fld_FacturasClienteVERIFACTU = 'VERIFACTU';
+  fld_FacturasClienteVERIFACTU_NOTES = 'VERIFACTU_NOTES';
 
   { FacturasCliente field indexes }
   idx_FacturasClienteID = 0;
@@ -139,6 +140,7 @@ const
   idx_FacturasClienteLISTA_NOMBRES = 53;
   idx_FacturasClientePROCEDENCIA_CLIENTE = 54;
   idx_FacturasClienteVERIFACTU = 55;
+  idx_FacturasClienteVERIFACTU_NOTES = 56;
 
   { FacturasCliente_Detalles fields }
   fld_FacturasCliente_DetallesID = 'ID';
@@ -175,7 +177,7 @@ const
 type
   { IListaAnosFacturas }
   IListaAnosFacturas = interface(IDAStronglyTypedDataTable)
-  ['{303CA029-3F55-4813-90D8-0DFD72FD0C16}']
+  ['{8A84B0DE-B034-48D1-8C69-8213E69F3369}']
     { Property getters and setters }
     function GetANOValue: String;
     procedure SetANOValue(const aValue: String);
@@ -210,7 +212,7 @@ type
 
   { IFacturasCliente }
   IFacturasCliente = interface(IDAStronglyTypedDataTable)
-  ['{A13D1B5E-6AF7-4F09-A95F-C9C49D5AD089}']
+  ['{4507B473-7DD5-4F77-870F-BAB62C5E368A}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -435,6 +437,9 @@ type
     procedure SetVERIFACTUValue(const aValue: SmallInt);
     function GetVERIFACTUIsNull: Boolean;
     procedure SetVERIFACTUIsNull(const aValue: Boolean);
+    function GetVERIFACTU_NOTESValue: IROStrings;
+    function GetVERIFACTU_NOTESIsNull: Boolean;
+    procedure SetVERIFACTU_NOTESIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -550,13 +555,17 @@ type
     property PROCEDENCIA_CLIENTEIsNull: Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull;
     property VERIFACTU: SmallInt read GetVERIFACTUValue write SetVERIFACTUValue;
     property VERIFACTUIsNull: Boolean read GetVERIFACTUIsNull write SetVERIFACTUIsNull;
+    property VERIFACTU_NOTES: IROStrings read GetVERIFACTU_NOTESValue;
+    property VERIFACTU_NOTESIsNull: Boolean read GetVERIFACTU_NOTESIsNull write SetVERIFACTU_NOTESIsNull;
   end;
 
   { TFacturasClienteDataTableRules }
   TFacturasClienteDataTableRules = class(TIntfObjectDADataTableRules, IFacturasCliente)
   private
     f_OBSERVACIONES: IROStrings;
+    f_VERIFACTU_NOTES: IROStrings;
     procedure OBSERVACIONES_OnChange(Sender: TObject);
+    procedure VERIFACTU_NOTES_OnChange(Sender: TObject);
   protected
     { Property getters and setters }
     function GetIDValue: Integer; virtual;
@@ -782,6 +791,9 @@ type
     procedure SetVERIFACTUValue(const aValue: SmallInt); virtual;
     function GetVERIFACTUIsNull: Boolean; virtual;
     procedure SetVERIFACTUIsNull(const aValue: Boolean); virtual;
+    function GetVERIFACTU_NOTESValue: IROStrings; virtual;
+    function GetVERIFACTU_NOTESIsNull: Boolean; virtual;
+    procedure SetVERIFACTU_NOTESIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -896,6 +908,8 @@ type
     property PROCEDENCIA_CLIENTEIsNull: Boolean read GetPROCEDENCIA_CLIENTEIsNull write SetPROCEDENCIA_CLIENTEIsNull;
     property VERIFACTU: SmallInt read GetVERIFACTUValue write SetVERIFACTUValue;
     property VERIFACTUIsNull: Boolean read GetVERIFACTUIsNull write SetVERIFACTUIsNull;
+    property VERIFACTU_NOTES: IROStrings read GetVERIFACTU_NOTESValue;
+    property VERIFACTU_NOTESIsNull: Boolean read GetVERIFACTU_NOTESIsNull write SetVERIFACTU_NOTESIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -905,7 +919,7 @@ type
 
   { IFacturasCliente_Detalles }
   IFacturasCliente_Detalles = interface(IDAStronglyTypedDataTable)
-  ['{3D8FF2B9-F029-413E-913C-13EEFF51E336}']
+  ['{6D0FEE88-A9F5-460C-B18E-107E6043013C}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1141,6 +1155,10 @@ begin
   StrList := TStringList.Create;
   StrList.OnChange := OBSERVACIONES_OnChange;
   f_OBSERVACIONES := NewROStrings(StrList,True);
+
+  StrList := TStringList.Create;
+  StrList.OnChange := VERIFACTU_NOTES_OnChange;
+  f_VERIFACTU_NOTES := NewROStrings(StrList,True);
 end;
 
 destructor TFacturasClienteDataTableRules.Destroy;
@@ -1153,6 +1171,11 @@ begin
   if DataTable.Editing then DataTable.Fields[idx_FacturasClienteOBSERVACIONES].AsVariant := TStringList(Sender).Text;
 end;
 
+procedure TFacturasClienteDataTableRules.VERIFACTU_NOTES_OnChange(Sender: TObject);
+begin
+  if DataTable.Editing then DataTable.Fields[idx_FacturasClienteVERIFACTU_NOTES].AsVariant := TStringList(Sender).Text;
+end;
+
 function TFacturasClienteDataTableRules.GetIDValue: Integer;
 begin
   result := DataTable.Fields[idx_FacturasClienteID].AsInteger;
@@ -2325,6 +2348,23 @@ begin
     DataTable.Fields[idx_FacturasClienteVERIFACTU].AsVariant := Null;
 end;
 
+function TFacturasClienteDataTableRules.GetVERIFACTU_NOTESValue: IROStrings;
+begin
+  result := f_VERIFACTU_NOTES;
+  result.Text := DataTable.Fields[idx_FacturasClienteVERIFACTU_NOTES].AsString;
+end;
+
+function TFacturasClienteDataTableRules.GetVERIFACTU_NOTESIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_FacturasClienteVERIFACTU_NOTES].IsNull;
+end;
+
+procedure TFacturasClienteDataTableRules.SetVERIFACTU_NOTESIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_FacturasClienteVERIFACTU_NOTES].AsVariant := Null;
+end;
+
 
 { TFacturasCliente_DetallesDataTableRules }
 constructor TFacturasCliente_DetallesDataTableRules.Create(aDataTable: TDADataTable);

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

@@ -9,14 +9,14 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_ListaAnosFacturasDelta = '{6532598B-1674-446B-ADA2-D250E745EC09}';
+  RID_ListaAnosFacturasDelta = '{9AA3FE0F-1FB8-4A28-B8F7-5EBAD11281E4}';
-  RID_FacturasClienteDelta = '{3A243DCA-E97B-429B-9561-264578B839FF}';
+  RID_FacturasClienteDelta = '{4299E068-B1B0-4B45-AD01-3494E8CEB99B}';
-  RID_FacturasCliente_DetallesDelta = '{841BC37D-B095-42F3-83B5-DFE3A61B8B44}';
+  RID_FacturasCliente_DetallesDelta = '{D2FF3B9A-DD0B-4E78-AD52-1C6D072564A7}';
 
 type
   { IListaAnosFacturasDelta }
   IListaAnosFacturasDelta = interface(IListaAnosFacturas)
-  ['{6532598B-1674-446B-ADA2-D250E745EC09}']
+  ['{9AA3FE0F-1FB8-4A28-B8F7-5EBAD11281E4}']
     { Property getters and setters }
     function GetOldANOValue : String;
 
@@ -50,7 +50,7 @@ type
 
   { IFacturasClienteDelta }
   IFacturasClienteDelta = interface(IFacturasCliente)
-  ['{3A243DCA-E97B-429B-9561-264578B839FF}']
+  ['{4299E068-B1B0-4B45-AD01-3494E8CEB99B}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_EMPRESAValue : Integer;
@@ -108,6 +108,7 @@ type
     function GetOldLISTA_NOMBRESValue : String;
     function GetOldPROCEDENCIA_CLIENTEValue : String;
     function GetOldVERIFACTUValue : SmallInt;
+    function GetOldVERIFACTU_NOTESValue : IROStrings;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -166,13 +167,16 @@ type
     property OldLISTA_NOMBRES : String read GetOldLISTA_NOMBRESValue;
     property OldPROCEDENCIA_CLIENTE : String read GetOldPROCEDENCIA_CLIENTEValue;
     property OldVERIFACTU : SmallInt read GetOldVERIFACTUValue;
+    property OldVERIFACTU_NOTES : IROStrings read GetOldVERIFACTU_NOTESValue;
   end;
 
   { TFacturasClienteBusinessProcessorRules }
   TFacturasClienteBusinessProcessorRules = class(TDABusinessProcessorRules, IFacturasCliente, IFacturasClienteDelta)
   private
     f_OBSERVACIONES: IROStrings;
+    f_VERIFACTU_NOTES: IROStrings;
     procedure OBSERVACIONES_OnChange(Sender: TObject);
+    procedure VERIFACTU_NOTES_OnChange(Sender: TObject);
   protected
     { Property getters and setters }
     function GetIDValue: Integer; virtual;
@@ -510,6 +514,11 @@ type
     function GetOldVERIFACTUIsNull: Boolean; virtual;
     procedure SetVERIFACTUValue(const aValue: SmallInt); virtual;
     procedure SetVERIFACTUIsNull(const aValue: Boolean); virtual;
+    function GetVERIFACTU_NOTESValue: IROStrings; virtual;
+    function GetVERIFACTU_NOTESIsNull: Boolean; virtual;
+    function GetOldVERIFACTU_NOTESValue: IROStrings; virtual;
+    function GetOldVERIFACTU_NOTESIsNull: Boolean; virtual;
+    procedure SetVERIFACTU_NOTESIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -736,6 +745,10 @@ type
     property VERIFACTUIsNull : Boolean read GetVERIFACTUIsNull write SetVERIFACTUIsNull;
     property OldVERIFACTU : SmallInt read GetOldVERIFACTUValue;
     property OldVERIFACTUIsNull : Boolean read GetOldVERIFACTUIsNull;
+    property VERIFACTU_NOTES : IROStrings read GetVERIFACTU_NOTESValue;
+    property VERIFACTU_NOTESIsNull : Boolean read GetVERIFACTU_NOTESIsNull write SetVERIFACTU_NOTESIsNull;
+    property OldVERIFACTU_NOTES : IROStrings read GetOldVERIFACTU_NOTESValue;
+    property OldVERIFACTU_NOTESIsNull : Boolean read GetOldVERIFACTU_NOTESIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -745,7 +758,7 @@ type
 
   { IFacturasCliente_DetallesDelta }
   IFacturasCliente_DetallesDelta = interface(IFacturasCliente_Detalles)
-  ['{841BC37D-B095-42F3-83B5-DFE3A61B8B44}']
+  ['{D2FF3B9A-DD0B-4E78-AD52-1C6D072564A7}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_FACTURAValue : Integer;
@@ -991,6 +1004,10 @@ begin
   StrList := TStringList.Create;
   StrList.OnChange := OBSERVACIONES_OnChange;
   f_OBSERVACIONES := NewROStrings(StrList,True);
+
+  StrList := TStringList.Create;
+  StrList.OnChange := VERIFACTU_NOTES_OnChange;
+  f_VERIFACTU_NOTES := NewROStrings(StrList,True);
 end;
 
 destructor TFacturasClienteBusinessProcessorRules.Destroy;
@@ -1003,6 +1020,11 @@ begin
   BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteOBSERVACIONES] := TStringList(Sender).Text;
 end;
 
+procedure TFacturasClienteBusinessProcessorRules.VERIFACTU_NOTES_OnChange(Sender: TObject);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteVERIFACTU_NOTES] := TStringList(Sender).Text;
+end;
+
 function TFacturasClienteBusinessProcessorRules.GetIDValue: Integer;
 begin
   result := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteID];
@@ -2736,6 +2758,34 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteVERIFACTU] := Null;
 end;
 
+function TFacturasClienteBusinessProcessorRules.GetVERIFACTU_NOTESValue: IROStrings;
+begin
+  result := f_VERIFACTU_NOTES;
+  result.Text := BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteVERIFACTU_NOTES];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetVERIFACTU_NOTESIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteVERIFACTU_NOTES]);
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldVERIFACTU_NOTESValue: IROStrings;
+begin
+  result := NewROStrings();
+  result.Text := BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteVERIFACTU_NOTES];
+end;
+
+function TFacturasClienteBusinessProcessorRules.GetOldVERIFACTU_NOTESIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_FacturasClienteVERIFACTU_NOTES]);
+end;
+
+procedure TFacturasClienteBusinessProcessorRules.SetVERIFACTU_NOTESIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_FacturasClienteVERIFACTU_NOTES] := Null;
+end;
+
 
 { TFacturasCliente_DetallesBusinessProcessorRules }
 constructor TFacturasCliente_DetallesBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

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

@@ -271,6 +271,10 @@ object srvFacturasCliente: TsrvFacturasCliente
               item
                 DatasetField = 'VERIFACTU'
                 TableField = 'VERIFACTU'
+              end
+              item
+                DatasetField = 'VERIFACTU_NOTES'
+                TableField = 'VERIFACTU_NOTES'
               end>
           end>
         Name = 'FacturasCliente'
@@ -563,6 +567,10 @@ object srvFacturasCliente: TsrvFacturasCliente
           item
             Name = 'VERIFACTU'
             DataType = datSmallInt
+          end
+          item
+            Name = 'VERIFACTU_NOTES'
+            DataType = datMemo
           end>
       end
       item

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

@@ -1,17 +1,17 @@
 inherited fEditorFacturasCliente: TfEditorFacturasCliente
   Caption = 'Lista de facturas de cliente'
-  ClientHeight = 666
+  ClientHeight = 637
-  ClientWidth = 640
+  ClientWidth = 1094
-  ExplicitWidth = 656
+  ExplicitWidth = 1110
-  ExplicitHeight = 704
+  ExplicitHeight = 675
   PixelsPerInch = 96
   TextHeight = 13
   inherited JvNavPanelHeader: TJvNavPanelHeader
-    Width = 640
+    Width = 1094
     Caption = 'Lista de facturas de cliente'
     ExplicitWidth = 640
     inherited Image1: TImage
-      Left = 613
+      Left = 1067
       Picture.Data = {
         0A54504E474F626A65637489504E470D0A1A0A0000000D494844520000001800
         0000180806000000E0773DF80000000970485973000017120000171201679FD2
@@ -35,10 +35,10 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
     end
   end
   inherited TBXDock: TTBXDock
-    Width = 640
+    Width = 1094
     ExplicitWidth = 640
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 640
+      ExplicitWidth = 926
       object TBXSubmenuItem2: TTBXSubmenuItem [0]
         Caption = 'Nuevo'
         DisplayMode = nbdmImageAndText
@@ -82,21 +82,25 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
       end
     end
     inherited tbxMenu: TTBXToolbar
-      ExplicitWidth = 640
+      ExplicitWidth = 1094
     end
     inherited TBXTMain2: TTBXToolbar
       Left = 487
       Visible = True
       ExplicitLeft = 487
-      ExplicitWidth = 153
+      ExplicitWidth = 392
       object TBXItem42: TTBXItem
         Action = actCambiarSituacion
         DisplayMode = nbdmImageAndText
       end
+      object TBSeparatorItem2: TTBSeparatorItem
+      end
       object TBXItem44: TTBXItem
         Action = actLOPD
         DisplayMode = nbdmImageAndText
       end
+      object TBSeparatorItem3: TTBSeparatorItem
+      end
       object TBXItem43: TTBXItem
         Action = actVerContrato
         DisplayMode = nbdmImageAndText
@@ -116,16 +120,16 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
     end
   end
   inherited StatusBar: TJvStatusBar
-    Top = 647
+    Top = 618
-    Width = 640
+    Width = 1094
-    ExplicitTop = 647
+    ExplicitTop = 555
     ExplicitWidth = 640
   end
   inline frViewFacturasCliente1: TfrViewFacturasCliente [3]
     Left = 0
     Top = 105
-    Width = 640
+    Width = 1094
-    Height = 542
+    Height = 513
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
     Font.Color = clWindowText
@@ -137,12 +141,12 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
     ReadOnly = False
     ExplicitTop = 105
     ExplicitWidth = 640
-    ExplicitHeight = 542
+    ExplicitHeight = 450
     inherited cxGrid: TcxGrid
-      Width = 640
+      Width = 1094
-      Height = 411
+      Height = 382
       ExplicitWidth = 640
-      ExplicitHeight = 411
+      ExplicitHeight = 319
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.DefaultGroupSummaryItems = <
           item
@@ -219,12 +223,12 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
       end
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase
-      Width = 640
+      Width = 1094
       ExplicitWidth = 640
       inherited TBXDockablePanel1: TTBXDockablePanel
         ExplicitWidth = 640
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 640
+          Width = 1094
           ExplicitWidth = 640
           inherited txtFiltroTodo: TcxTextEdit
             Style.LookAndFeel.SkinName = ''
@@ -273,36 +277,36 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
             StyleHot.LookAndFeel.SkinName = ''
           end
           inherited txtFiltroTodo2: TcxTextEdit
-            Left = 436
+            Left = 746
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 436
+            ExplicitLeft = 746
             ExplicitWidth = 275
             Width = 275
           end
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-          Width = 640
+          Width = 1094
           ExplicitTop = 75
           ExplicitWidth = 640
           inherited tbxBotones: TTBXToolbar
-            Width = 630
+            Width = 1084
             ExplicitWidth = 630
           end
         end
       end
     end
     inherited pnlAgrupaciones: TTBXDockablePanel
-      Top = 516
+      Top = 487
-      ExplicitTop = 516
+      ExplicitTop = 424
       ExplicitWidth = 640
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-        Width = 640
+        Width = 1094
         ExplicitWidth = 640
         inherited TBXToolbar1: TTBXToolbar
-          Width = 630
+          Width = 1084
           ExplicitWidth = 630
         end
       end
@@ -2056,12 +2060,24 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
     inherited N2: TMenuItem
       Visible = False
     end
-    object N4: TMenuItem [8]
+    object GenerarPDF1: TMenuItem [8]
+      Action = actGenerarPDF
+    end
+    object N4: TMenuItem [9]
       Caption = '-'
     end
-    object Cambiarlasituacin1: TMenuItem [9]
+    object Cambiarlasituacin1: TMenuItem [10]
       Action = actCambiarSituacion
     end
+    object GDPR1: TMenuItem [11]
+      Action = actLOPD
+    end
+    object MandarVerifactu1: TMenuItem [12]
+      Action = actMandarVerifactu
+    end
+    object Verpresupuesto1: TMenuItem [16]
+      Action = actVerContrato
+    end
   end
   object JsNuevaFacturaDialog: TJSDialog
     Content.Strings = (
@@ -4237,8 +4253,8 @@ inherited fEditorFacturasCliente: TfEditorFacturasCliente
       0007C0000007C000000700000007000000070000000700000007C000000FC000
       001F8000003F800000FFF8FFFFFF}
     Width = 450
-    Left = 408
+    Left = 400
-    Top = 80
+    Top = 104
   end
   object JsListaFacturasNoModificadas: TJSDialog
     Glyph.Data = {

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

@@ -50,6 +50,12 @@ type
     actMandarVerifactu: TAction;
     TBXItem46: TTBXItem;
     TBSeparatorItem1: TTBSeparatorItem;
+    GenerarPDF1: TMenuItem;
+    MandarVerifactu1: TMenuItem;
+    TBSeparatorItem2: TTBSeparatorItem;
+    TBSeparatorItem3: TTBSeparatorItem;
+    GDPR1: TMenuItem;
+    Verpresupuesto1: TMenuItem;
     procedure FormShow(Sender: TObject);
     procedure actEliminarUpdate(Sender: TObject);
     procedure actNuevaFacturaExecute(Sender: TObject);
@@ -325,14 +331,14 @@ begin
 
   if AllItems then
   begin
-    if (Application.MessageBox('¿Desea mandar a verifactu los borradores seleccionados?, ya no podrá modificarlos', 'Atención', MB_YESNO) = IDYES) then
+    if (Application.MessageBox('¿Desea mandar a VERIFACTU los borradores seleccionados, para que se conviertan en FACTURAS DEFINITIVAS EN LA AEAT?, ya no podrá modificarlos', 'Atención', MB_YESNO) = IDYES) then
     begin
       SeleccionarFilasDesdeGrid(ViewGrid._FocusedView, (Facturas as ISeleccionable).SelectedRecords);
       AFacturas := (Controller as IFacturasClienteController).ExtraerSeleccionados(Facturas) as IBizFacturaCliente;
     end
   end
   else begin
-     if (Application.MessageBox('¿Desea mandar a verifactu el borrador seleccionado?, ya no podrá modificarlo', 'Atención', MB_YESNO) = IDYES) then
+     if (Application.MessageBox('¿Desea mandar a VERIFACTU el borrador seleccionado, para que se convierta en FACTURA DEFINITIVAS EN LA AEAT?, ya no podrá modificarlo', 'Atención', MB_YESNO) = IDYES) then
         AFacturas := Facturas;
   end;
 
@@ -373,17 +379,14 @@ end;
 procedure TfEditorFacturasCliente.actMandarVerifactuUpdate(Sender: TObject);
 begin
   inherited;
-
+{
-  (Sender as TAction).Enabled := False;
-  
-{Quitar al activar verifactu
   if HayDatos and Assigned(ViewGrid) then
     (Sender as TAction).Enabled := ViewGrid.EsSeleccionCeldaDatos
       and (ViewGrid.NumSeleccionados > 0)
       and (FFacturas.VERIFACTU < 1)
   else
+}  
     (Sender as TAction).Enabled := False;
-}
 end;
 
 procedure TfEditorFacturasCliente.actNuevaFacturaExecute(Sender: TObject);

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

@@ -202,13 +202,24 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
         Properties.Images = PngImageList
         Properties.Items = <
           item
-            Description = 'Verifactu'
+            Value = 0
+          end
+          item
+            Description = 'VERIFACTU'
             ImageIndex = 0
             Value = 1
           end
           item
-            Value = 0
+            Description = 'INCIDENCIA'
+            ImageIndex = 4
+            Value = '2'
           end>
+        OnGetCellHint = cxGridViewVERIFACTUGetCellHint
+      end
+      object cxGridViewVERIFACTU_NOTES: TcxGridDBColumn
+        DataBinding.FieldName = 'VERIFACTU_NOTES'
+        Visible = False
+        VisibleForCustomization = False
       end
     end
     inherited cxGridLevel: TcxGridLevel
@@ -237,6 +248,8 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
+          ExplicitWidth = 273
+          Width = 273
         end
         inherited edtFechaIniFiltro: TcxDateEdit
           Style.LookAndFeel.SkinName = ''
@@ -275,13 +288,15 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
           StyleHot.LookAndFeel.SkinName = ''
         end
         inherited txtFiltroTodo2: TcxTextEdit
-          Left = 444
+          Left = 445
           Enabled = True
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 444
+          ExplicitLeft = 445
+          ExplicitWidth = 275
+          Width = 275
         end
         inherited dxLayoutControl1Group_Root: TdxLayoutGroup
           inherited dxLayoutControl1Group3: TdxLayoutGroup
@@ -294,7 +309,6 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 802
-        ExplicitTop = 75
         ExplicitWidth = 802
         inherited tbxBotones: TTBXToolbar
           Width = 792
@@ -738,6 +752,34 @@ inherited frViewFacturasCliente: TfrViewFacturasCliente
           064200A70120096201BA0100A6C62916A56F74520000000049454E44AE426082}
         Name = 'PngImage3'
         Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          61000000097048597300000AEB00000AEB01828B0D5A0000027F4944415478DA
+          95926D48535118C79FDB268AA54485D62C4C50962CDC87F5416D9AB966CEA440
+          A4E84D828C304C89B217DB87D00F65252B69422F9A4161D6A0507C6D595A6450
+          83CC55787129CE19949B6DD3DDEDDE9D73BABB561835D3030FCF39E739FFDFF3
+          C2A1608EF5A1467A415632783A589C100254B0A0EB5A623A9392DCD365B89DBE
+          FF3CBC5830C0DD9DD726922B34EFDAEB5B53F75972170470D4C8E461DB724D78
+          091139AC66F4FC5E9BA24007FDF3064C75E6DE7DE94BD8DBDC4A834615014B5D
+          BD8D6985E37BE6056074D2B544934357DCFA1CD2FBEA1B6C908742E96EAFBFFB
+          7E5FE2A15A18FA2FC0F978B35E9CBAE94895EE2DB474D82053B918CA4BA2A1BF
+          D37823B3D879784E80BB36298ADA98368C97937043F3185CACA1E164F12AD89E
+          1509132316E659BB39A14807B6A000E74365A5282D43EB67BFC020FD1D76159A
+          C0502785D8984580B8691830BEA9561F634EFC1340AAA4111E55C60817859611
+          E4038EF34256FE6BE86C5A0F807D4010035F2DA3EE1EA32DEEA81EEC7F0126EF
+          288E87A8D597389F8DC28280858ACB9FE06C690CBFF702E60DB153E463EF70C5
+          D632EEDC1F00FA6A7CA824397D888B46AB671EF300CC826DDC092B5710411CB0
+          406C62D86EEFEA72C69DAA07F76FC0645DD241B15A7D93E3C6A85FE2471D5E68
+          6872C1CE1C2FE46BF0AC2A1842F7B9CBB2CFF8AB05007900A26949819995E075
+          184D43A0FF400B95575CD0FED4010A9907AAB5E1BC9801EC9FA9C261656D0346
+          7FFC8106E2A55C7A591EA551197CC84A1121BB4FC8346AF540CB1307A8950462
+          25E8670B8CD01E6611B198C445D9E5DC75EABD7E4DA32B322C05630F3F15BE54
+          82788F788FF9E9FB679D9110C781FBC077B753433BB478CB0F7C3B8CF0987D51
+          CF0000000049454E44AE426082}
+        Name = 'PngImage4'
+        Background = clWindow
       end>
     Left = 56
     Top = 48

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

@@ -69,6 +69,7 @@ type
     cxGridViewPROCEDENCIA_CLIENTE: TcxGridDBColumn;
     cxGridViewREF_FORMA_PAGO: TcxGridDBColumn;
     cxGridViewVERIFACTU: TcxGridDBColumn;
+    cxGridViewVERIFACTU_NOTES: TcxGridDBColumn;
     procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView;
       ARecord: TcxCustomGridRecord; AItem: TcxCustomGridTableItem;
       out AStyle: TcxStyle);
@@ -77,6 +78,10 @@ type
     procedure actProvinciaExecute(Sender: TObject);
     procedure actProvinciaUpdate(Sender: TObject);
     procedure actClienteUpdate(Sender: TObject);
+    procedure cxGridViewVERIFACTUGetCellHint(Sender: TcxCustomGridTableItem;
+      ARecord: TcxCustomGridRecord; ACellViewInfo: TcxGridTableDataCellViewInfo;
+      const AMousePos: TPoint; var AHintText: TCaption;
+      var AIsHintMultiLine: Boolean; var AHintTextRect: TRect);
 
   private
     //Filtros relativos a la vista
@@ -224,6 +229,21 @@ begin
   end;
 end;
 
+procedure TfrViewFacturasCliente.cxGridViewVERIFACTUGetCellHint(
+  Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord;
+  ACellViewInfo: TcxGridTableDataCellViewInfo; const AMousePos: TPoint;
+  var AHintText: TCaption; var AIsHintMultiLine: Boolean;
+  var AHintTextRect: TRect);
+begin
+  inherited;
+  if (ARecord.DisplayTexts[Sender.Index] = 'INCIDENCIA') then
+  begin
+    AIsHintMultiLine := True;
+    if not VarIsNull(ARecord.Values[cxGridViewVERIFACTU_NOTES.Index]) then
+       AHintText := ARecord.Values[cxGridViewVERIFACTU_NOTES.Index];
+  end;
+end;
+
 function TfrViewFacturasCliente.GetFacturas: IBizFacturaCliente;
 begin
   Result := FFacturas;