Version 1.9.3:

Tareas #716: Poner opción de felicitación navideña a proveedores
    Errores #715: No aparece el nº total de clientes en el pie de la pantalla de lista de clientes


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

Database/scripts/factuges.sql

@@ -1077,7 +1077,8 @@ CREATE TABLE PROVEEDORES_DATOS (
     SUBCONTRATA            TIPO_BOOLEANO,
     VENCIMIENTO_FACTURAS_1  SMALLINT,
     VENCIMIENTO_FACTURAS_2  SMALLINT,
-    VENCIMIENTO_FACTURAS_3  SMALLINT        
+    VENCIMIENTO_FACTURAS_3  SMALLINT,
+    FELICITACION            TIPO_BOOLEANO /* TIPO_BOOLEANO = SMALLINT */          
 );
 
 CREATE TABLE PROVEEDORES_GRUPOS (
@@ -3145,7 +3146,8 @@ CREATE VIEW V_PROVEEDORES(
     SUBCONTRATA,
     VENCIMIENTO_FACTURAS_1,
     VENCIMIENTO_FACTURAS_2,
-    VENCIMIENTO_FACTURAS_3)
+    VENCIMIENTO_FACTURAS_3,
+    FELICITACION)
 AS
 SELECT
   V_CONTACTOS.ID,
@@ -3184,7 +3186,8 @@ SELECT
   PROVEEDORES_DATOS.SUBCONTRATA,
   PROVEEDORES_DATOS.VENCIMIENTO_FACTURAS_1,
   PROVEEDORES_DATOS.VENCIMIENTO_FACTURAS_2,
-  PROVEEDORES_DATOS.VENCIMIENTO_FACTURAS_3
+  PROVEEDORES_DATOS.VENCIMIENTO_FACTURAS_3,
+  PROVEEDORES_DATOS.FELICITACION
   
 FROM
   V_CONTACTOS

Source/Cliente/FactuGES.dproj

@@ -53,7 +53,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">1</VersionInfo><VersionInfo Name="MinorVer">9</VersionInfo><VersionInfo Name="Release">2</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">1.9.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.9.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></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">1</VersionInfo><VersionInfo Name="MinorVer">9</VersionInfo><VersionInfo Name="Release">3</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">1.9.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName">FactuGES</VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.9.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys></VersionInfoKeys><Excluded_Packages></Excluded_Packages><Source><Source Name="MainSource">FactuGES.dpr</Source></Source></Delphi.Personality><ModelSupport>False</ModelSupport></BorlandProject></BorlandProject>
   </ProjectExtensions>
   <Import Project="$(MSBuildBinPath)\Borland.Delphi.Targets" />
   <ItemGroup>

Source/Cliente/FactuGES.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Factuges.ico"
 1 VERSIONINFO
-FILEVERSION 1,9,2,0
+FILEVERSION 1,9,3,0
-PRODUCTVERSION 1,9,2,0
+PRODUCTVERSION 1,9,3,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -13,10 +13,10 @@ BEGIN
          BLOCK "0C0A04E4"
          BEGIN
               VALUE "CompanyName", "Rodax Software S.L.\0"
-              VALUE "FileVersion", "1.9.2.0\0"
+              VALUE "FileVersion", "1.9.3.0\0"
               VALUE "InternalName", "FactuGES\0"
               VALUE "ProductName", "FactuGES\0"
-              VALUE "ProductVersion", "1.9.2.0\0"
+              VALUE "ProductVersion", "1.9.3.0\0"
          END
     END
     BLOCK "VarFileInfo"

Source/Modulos/Contactos/Controller/uProveedoresController.pas

@@ -13,6 +13,7 @@ type
     ['{50F10D01-5120-470D-A61D-99FE8A76DF93}']
     function BuscarSubcontratas: IBizProveedor;    
     function BuscarTodosTiendaWeb: IBizProveedor;
+    function BuscarEtiquetadosFelicitacion: IBizProveedor;
     function ElegirDireccionEntrega(AProveedor: IBizProveedor; AMensaje: String): IBizDireccionesContacto;
     function EsEliminable(AProveedor: IBizContacto): Boolean;
     function Eliminar(AProveedor: IBizContacto; AllItems: Boolean = false): Boolean; overload;
@@ -38,6 +39,7 @@ type
     function BuscarTodos: IBizContacto; override;
     function BuscarTodosTiendaWeb: IBizProveedor;
     function BuscarSubcontratas: IBizProveedor;
+    function BuscarEtiquetadosFelicitacion: IBizProveedor;
     function Nuevo : IBizContacto; override;
     procedure Ver(AContacto : IBizContacto); override;
     procedure VerTodos(AContactos: IBizContacto); override;
@@ -75,6 +77,12 @@ begin
   FiltrarEmpresa(Result);
 end;
 
+function TProveedoresController.BuscarEtiquetadosFelicitacion: IBizProveedor;
+begin
+  Result := (FDataModule as IDataModuleProveedores).GetItemsFelicitacion;
+  FiltrarEmpresa(Result);
+end;
+
 function TProveedoresController.BuscarSubcontratas: IBizProveedor;
 var
   Condicion: TDAWhereExpression;
@@ -280,6 +288,12 @@ begin
   AReportController := TEtiquetasContactosReportController.Create;
   ListaID := TIntegerList.Create;
 
+  if not Assigned(AProveedor) then
+    raise Exception.Create ('Proveedor no asignado (TieneDatosBancarios)');
+
+  if not AProveedor.DataTable.Active then
+    AProveedor.DataTable.Active := True;
+
   try
    //Si deseamos previsualizar todos los items del objeto albaran
    if AllItems then
@@ -314,6 +328,12 @@ begin
   AReportController := TEtiquetasContactosReportController.Create;
   ListaID := TIntegerList.Create;
 
+  if not Assigned(AProveedor) then
+    raise Exception.Create ('Proveedor no asignado (TieneDatosBancarios)');
+
+  if not AProveedor.DataTable.Active then
+    AProveedor.DataTable.Active := True;
+  
   try
    //Si deseamos previsualizar todos los items del objeto albaran
    if AllItems then

Source/Modulos/Contactos/Data/uDataModuleProveedores.dfm

@@ -41,8 +41,6 @@ inherited DataModuleProveedores: TDataModuleProveedores
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteDataAdapter = rda_Contactos
     LocalDataStreamer = Bin2DataStreamer
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'GruposProveedor'
     IndexDefs = <>
     Left = 536
@@ -293,13 +291,15 @@ inherited DataModuleProveedores: TDataModuleProveedores
       item
         Name = 'VENCIMIENTO_FACTURAS_3'
         DataType = datSmallInt
+      end
+      item
+        Name = 'FELICITACION'
+        DataType = datSmallInt
       end>
     Params = <>
     StreamingOptions = [soDisableEventsWhileStreaming]
     RemoteDataAdapter = rda_Contactos
     LocalDataStreamer = Bin2DataStreamer
-    DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch]
-    MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates]
     LogicalName = 'Proveedores'
     IndexDefs = <>
     Left = 296

Source/Modulos/Contactos/Data/uDataModuleProveedores.pas

@@ -24,7 +24,8 @@ type
     function GetItems : IBizProveedor;
     function GetItemsTiendaWeb : IBizProveedor;
     function GetGruposProveedor : IBizGrupoProveedor;
-    function DarListaDescripcionesProveedores : TStringList;    
+    function DarListaDescripcionesProveedores : TStringList;
+    function GetItemsFelicitacion : IBizProveedor;     
   end;
 
 implementation
@@ -102,6 +103,27 @@ begin
   end;
 end;
 
+function TDataModuleProveedores.GetItemsFelicitacion: IBizProveedor;
+var
+  Condicion: TDAWhereExpression;
+begin
+  ShowHourglassCursor;
+  try
+    Result := Self.GetItems;
+
+    with Result.DataTable.DynamicWhere do
+    begin
+      Condicion := NewBinaryExpression(NewField('', fld_ProveedoresFELICITACION), NewConstant(1, datInteger), dboEqual);
+
+      Clear;
+      Expression := Condicion
+    end;
+
+  finally
+    HideHourglassCursor;
+  end;
+end;
+
 function TDataModuleProveedores.GetItemsTiendaWeb: IBizProveedor;
 var
   Condicion: TDAWhereExpression;

Source/Modulos/Contactos/Model/Data/uIDataModuleProveedores.pas

@@ -14,6 +14,7 @@ type
     function GetItemsTiendaWeb : IBizProveedor;
     function GetGruposProveedor : IBizGrupoProveedor;
     function DarListaDescripcionesProveedores : TStringList;
+    function GetItemsFelicitacion : IBizProveedor;    
   end;
 
 

Source/Modulos/Contactos/Model/schContactosClient_Intf.pas

@@ -9,20 +9,20 @@ const
   { Data table rules ids
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_Contactos = '{91BD66C3-1FC5-4B41-BFF5-3F577239FFE1}';
+  RID_Contactos = '{7141B502-9B65-4785-979D-C2A757A00606}';
-  RID_GruposCliente = '{9BDD01CD-BD83-47C8-9AD6-6D8FBAE22ED6}';
+  RID_GruposCliente = '{39FA2C99-EFEF-44B7-8553-FE9ED7DC92CF}';
-  RID_DatosBancarios = '{CCA1EE4C-5929-48A3-9555-48E29B7DD572}';
+  RID_DatosBancarios = '{A0D6D787-49D2-4B26-97EE-28413D2805FF}';
-  RID_Clientes = '{ED4F62A9-F376-489D-AEF4-EFF86539DBE5}';
+  RID_Clientes = '{9E0E225C-DDDF-4236-BBE1-85D5F56F94D6}';
-  RID_Proveedores = '{48BB1210-E1B8-4709-9C03-B67A5BD05555}';
+  RID_Proveedores = '{11258A53-A1EE-4D1F-AF6C-9EFB21815070}';
-  RID_Empleados = '{C2B52AD4-5128-4209-8CFD-30F762CA1A70}';
+  RID_Empleados = '{80DC22F2-84E0-4B45-A5D1-A6D9EEE4FCC6}';
-  RID_DireccionesContacto = '{57598C48-2F54-4D1E-BC79-FDFBD7A17309}';
+  RID_DireccionesContacto = '{D1F3FB34-E735-4EC2-9129-8C55B058F2A2}';
-  RID_ClientesDescuentos = '{ABB2FBD8-562E-4FBC-BC51-F39222C34ED1}';
+  RID_ClientesDescuentos = '{8CDF9F60-A25F-4078-8568-CA614F312FA6}';
-  RID_GruposProveedor = '{7A7DCFA2-55D3-441A-B027-DBC2E270E94F}';
+  RID_GruposProveedor = '{8147AAA0-C069-44CB-BB0F-4B605AB30F24}';
-  RID_GruposEmpleado = '{14B39DE3-DB7A-411D-8939-AFFE07E52994}';
+  RID_GruposEmpleado = '{8ECBF0BC-7391-46C0-BA36-58130B4A1984}';
-  RID_Contactos_Refresh = '{CF38DB4D-A4E7-48E8-8B3E-A4E243063727}';
+  RID_Contactos_Refresh = '{71DEEFA8-E2E2-4F41-82C2-A86578616408}';
-  RID_ContratosEmpleados = '{4B4ECE2D-339E-4F87-81E3-32FEAC58B727}';
+  RID_ContratosEmpleados = '{3E5EF78A-26C9-4FBA-B425-D826B32C19DF}';
-  RID_DescripcionesProveedores = '{57409654-6895-4601-A43B-1EEC21E6A7AD}';
+  RID_DescripcionesProveedores = '{15B20681-2870-4854-8D91-5E901B3F9F22}';
-  RID_PersonalContacto = '{DDB07051-5354-4084-A7B2-0F17B7BE23D0}';
+  RID_PersonalContacto = '{594ADB53-D0DD-446C-8BA7-D637F5FCFE43}';
 
   { Data table names }
   nme_Contactos = 'Contactos';
@@ -238,6 +238,7 @@ const
   fld_ProveedoresVENCIMIENTO_FACTURAS_1 = 'VENCIMIENTO_FACTURAS_1';
   fld_ProveedoresVENCIMIENTO_FACTURAS_2 = 'VENCIMIENTO_FACTURAS_2';
   fld_ProveedoresVENCIMIENTO_FACTURAS_3 = 'VENCIMIENTO_FACTURAS_3';
+  fld_ProveedoresFELICITACION = 'FELICITACION';
 
   { Proveedores field indexes }
   idx_ProveedoresID = 0;
@@ -277,6 +278,7 @@ const
   idx_ProveedoresVENCIMIENTO_FACTURAS_1 = 34;
   idx_ProveedoresVENCIMIENTO_FACTURAS_2 = 35;
   idx_ProveedoresVENCIMIENTO_FACTURAS_3 = 36;
+  idx_ProveedoresFELICITACION = 37;
 
   { Empleados fields }
   fld_EmpleadosID = 'ID';
@@ -501,7 +503,7 @@ const
 type
   { IContactos }
   IContactos = interface(IDAStronglyTypedDataTable)
-  ['{C5085E63-DBD8-48C6-AFF7-67F07615D040}']
+  ['{F9DD576D-5B03-49DE-B1B2-E2461815C411}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -800,7 +802,7 @@ type
 
   { IGruposCliente }
   IGruposCliente = interface(IDAStronglyTypedDataTable)
-  ['{FDEBCC24-A77C-45B4-99BA-C9548F695939}']
+  ['{58878E47-599B-4AF5-8F97-6D3CBA83128D}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -847,7 +849,7 @@ type
 
   { IDatosBancarios }
   IDatosBancarios = interface(IDAStronglyTypedDataTable)
-  ['{E31D5317-4CD7-4535-9231-6BC1F36CBCC2}']
+  ['{D3B0316F-6237-413E-95D3-2ED6B0529584}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -978,7 +980,7 @@ type
 
   { IClientes }
   IClientes = interface(IDAStronglyTypedDataTable)
-  ['{D4C197F8-243E-46C4-ACC5-E1F1CA7A2B19}']
+  ['{5CDD1282-A9AD-4BFA-BC69-8F0F63CC813A}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1457,7 +1459,7 @@ type
 
   { IProveedores }
   IProveedores = interface(IDAStronglyTypedDataTable)
-  ['{BFE5279B-5B45-490A-A5C0-4AFF6DB0405B}']
+  ['{A23614AA-9504-455B-92D6-CFB8EBEE9B7B}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -1606,6 +1608,10 @@ type
     procedure SetVENCIMIENTO_FACTURAS_3Value(const aValue: SmallInt);
     function GetVENCIMIENTO_FACTURAS_3IsNull: Boolean;
     procedure SetVENCIMIENTO_FACTURAS_3IsNull(const aValue: Boolean);
+    function GetFELICITACIONValue: SmallInt;
+    procedure SetFELICITACIONValue(const aValue: SmallInt);
+    function GetFELICITACIONIsNull: Boolean;
+    procedure SetFELICITACIONIsNull(const aValue: Boolean);
 
 
     { Properties }
@@ -1683,6 +1689,8 @@ type
     property VENCIMIENTO_FACTURAS_2IsNull: Boolean read GetVENCIMIENTO_FACTURAS_2IsNull write SetVENCIMIENTO_FACTURAS_2IsNull;
     property VENCIMIENTO_FACTURAS_3: SmallInt read GetVENCIMIENTO_FACTURAS_3Value write SetVENCIMIENTO_FACTURAS_3Value;
     property VENCIMIENTO_FACTURAS_3IsNull: Boolean read GetVENCIMIENTO_FACTURAS_3IsNull write SetVENCIMIENTO_FACTURAS_3IsNull;
+    property FELICITACION: SmallInt read GetFELICITACIONValue write SetFELICITACIONValue;
+    property FELICITACIONIsNull: Boolean read GetFELICITACIONIsNull write SetFELICITACIONIsNull;
   end;
 
   { TProveedoresDataTableRules }
@@ -1839,6 +1847,10 @@ type
     procedure SetVENCIMIENTO_FACTURAS_3Value(const aValue: SmallInt); virtual;
     function GetVENCIMIENTO_FACTURAS_3IsNull: Boolean; virtual;
     procedure SetVENCIMIENTO_FACTURAS_3IsNull(const aValue: Boolean); virtual;
+    function GetFELICITACIONValue: SmallInt; virtual;
+    procedure SetFELICITACIONValue(const aValue: SmallInt); virtual;
+    function GetFELICITACIONIsNull: Boolean; virtual;
+    procedure SetFELICITACIONIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID: Integer read GetIDValue write SetIDValue;
@@ -1915,6 +1927,8 @@ type
     property VENCIMIENTO_FACTURAS_2IsNull: Boolean read GetVENCIMIENTO_FACTURAS_2IsNull write SetVENCIMIENTO_FACTURAS_2IsNull;
     property VENCIMIENTO_FACTURAS_3: SmallInt read GetVENCIMIENTO_FACTURAS_3Value write SetVENCIMIENTO_FACTURAS_3Value;
     property VENCIMIENTO_FACTURAS_3IsNull: Boolean read GetVENCIMIENTO_FACTURAS_3IsNull write SetVENCIMIENTO_FACTURAS_3IsNull;
+    property FELICITACION: SmallInt read GetFELICITACIONValue write SetFELICITACIONValue;
+    property FELICITACIONIsNull: Boolean read GetFELICITACIONIsNull write SetFELICITACIONIsNull;
 
   public
     constructor Create(aDataTable: TDADataTable); override;
@@ -1924,7 +1938,7 @@ type
 
   { IEmpleados }
   IEmpleados = interface(IDAStronglyTypedDataTable)
-  ['{9283D681-D16D-4801-B1E7-5680B7DE24E1}']
+  ['{51CB10E8-9304-4853-802E-D2C06BC32E9E}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2355,7 +2369,7 @@ type
 
   { IDireccionesContacto }
   IDireccionesContacto = interface(IDAStronglyTypedDataTable)
-  ['{6AF38491-1DB2-414A-91D7-CC095D28FA6D}']
+  ['{C44B4E25-498B-4106-BBDA-B4DEEA209B7C}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2570,7 +2584,7 @@ type
 
   { IClientesDescuentos }
   IClientesDescuentos = interface(IDAStronglyTypedDataTable)
-  ['{4AA5CE18-35DB-4300-9ED4-331A887CE864}']
+  ['{8C316E4D-9D63-4252-92E2-110B2A2A39B5}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2653,7 +2667,7 @@ type
 
   { IGruposProveedor }
   IGruposProveedor = interface(IDAStronglyTypedDataTable)
-  ['{87338CE9-54B1-4773-8303-EA58DAF72943}']
+  ['{4913009E-F74C-47BC-9A91-EE5C1A50A9CA}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2700,7 +2714,7 @@ type
 
   { IGruposEmpleado }
   IGruposEmpleado = interface(IDAStronglyTypedDataTable)
-  ['{10F8F1C2-264B-4F90-BF92-E7C95B60CDAE}']
+  ['{3C1BD905-E66A-44E1-8B27-016826FD1904}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -2747,7 +2761,7 @@ type
 
   { IContactos_Refresh }
   IContactos_Refresh = interface(IDAStronglyTypedDataTable)
-  ['{8D106256-A4A6-4EFC-9B95-00E732F64CDD}']
+  ['{1662F8B8-376F-496A-A03F-59278E928467}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -3022,7 +3036,7 @@ type
 
   { IContratosEmpleados }
   IContratosEmpleados = interface(IDAStronglyTypedDataTable)
-  ['{CAB8E933-E3CA-45C3-BC64-E825B6A9CF9E}']
+  ['{0C862BE0-6492-4C78-9DAD-A55A6F921D42}']
     { Property getters and setters }
     function GetCONTRATOValue: String;
     procedure SetCONTRATOValue(const aValue: String);
@@ -3057,7 +3071,7 @@ type
 
   { IDescripcionesProveedores }
   IDescripcionesProveedores = interface(IDAStronglyTypedDataTable)
-  ['{0A691948-860C-439D-8E06-09FC51F537A4}']
+  ['{5724E137-1CF1-4674-ACB1-B2DE2881A360}']
     { Property getters and setters }
     function GetDESCRIPCION_PROVEEDORValue: String;
     procedure SetDESCRIPCION_PROVEEDORValue(const aValue: String);
@@ -3092,7 +3106,7 @@ type
 
   { IPersonalContacto }
   IPersonalContacto = interface(IDAStronglyTypedDataTable)
-  ['{4BF63909-FA4E-4769-97E2-FF0771DBDB4F}']
+  ['{EA400268-D6AE-47A9-A553-8978AF4D1A6A}']
     { Property getters and setters }
     function GetIDValue: Integer;
     procedure SetIDValue(const aValue: Integer);
@@ -5606,6 +5620,27 @@ begin
     DataTable.Fields[idx_ProveedoresVENCIMIENTO_FACTURAS_3].AsVariant := Null;
 end;
 
+function TProveedoresDataTableRules.GetFELICITACIONValue: SmallInt;
+begin
+  result := DataTable.Fields[idx_ProveedoresFELICITACION].AsSmallInt;
+end;
+
+procedure TProveedoresDataTableRules.SetFELICITACIONValue(const aValue: SmallInt);
+begin
+  DataTable.Fields[idx_ProveedoresFELICITACION].AsSmallInt := aValue;
+end;
+
+function TProveedoresDataTableRules.GetFELICITACIONIsNull: boolean;
+begin
+  result := DataTable.Fields[idx_ProveedoresFELICITACION].IsNull;
+end;
+
+procedure TProveedoresDataTableRules.SetFELICITACIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    DataTable.Fields[idx_ProveedoresFELICITACION].AsVariant := Null;
+end;
+
 
 { TEmpleadosDataTableRules }
 constructor TEmpleadosDataTableRules.Create(aDataTable: TDADataTable);

Source/Modulos/Contactos/Model/schContactosServer_Intf.pas

@@ -9,25 +9,25 @@ const
   { Delta rules ids 
        Feel free to change them to something more human readable
        but make sure they are unique in the context of your application }
-  RID_ContactosDelta = '{783D6342-53F9-40DF-81AF-DE782DA8B75A}';
+  RID_ContactosDelta = '{81517FFF-20E8-4465-BE0E-CB55E5890AFD}';
-  RID_GruposClienteDelta = '{F2CACBA5-7F04-4EDB-BC31-41E907B8EC26}';
+  RID_GruposClienteDelta = '{E7570DEB-D558-4E75-8E14-E4F58F5FB7FA}';
-  RID_DatosBancariosDelta = '{4EB1B188-CBE1-460A-A774-BF8E36A6E757}';
+  RID_DatosBancariosDelta = '{59B4AA7D-975F-4255-B35B-8C0CB9608482}';
-  RID_ClientesDelta = '{CAE0D87E-5926-4DB8-9AA3-541AFDE940D3}';
+  RID_ClientesDelta = '{CA2D623A-76FF-473A-9B05-139388FCE5CE}';
-  RID_ProveedoresDelta = '{FCE9CA4B-64BD-43E2-AF85-6C3388B64F14}';
+  RID_ProveedoresDelta = '{2FE9FC09-1295-4D0A-AD70-CA92CA193E6B}';
-  RID_EmpleadosDelta = '{18DB065A-0CFF-44C3-8221-283C5F804249}';
+  RID_EmpleadosDelta = '{29641F7D-F717-4FA7-AB7A-B84C1A1381D0}';
-  RID_DireccionesContactoDelta = '{43E64AF9-2F6C-4F2E-9933-0EB09313D982}';
+  RID_DireccionesContactoDelta = '{E659AD0F-82A8-45B2-81D8-775979642AB5}';
-  RID_ClientesDescuentosDelta = '{16AF7FE2-2AF0-4D98-ADA6-D29209C2A046}';
+  RID_ClientesDescuentosDelta = '{DAB3D283-302B-4B22-A694-DAA3DE315CC7}';
-  RID_GruposProveedorDelta = '{C607DA1D-70B8-4843-A46D-73691BCCF0FB}';
+  RID_GruposProveedorDelta = '{FF84FE1F-F7F0-492B-B0FF-33D4825D49B5}';
-  RID_GruposEmpleadoDelta = '{F2AA8B32-A14B-4754-BD82-531770EF1BA0}';
+  RID_GruposEmpleadoDelta = '{0C7FA5EF-4E50-401A-97F4-FC1A72F2AA30}';
-  RID_Contactos_RefreshDelta = '{0AD2BAF9-797E-49CD-A47C-4C50306595BF}';
+  RID_Contactos_RefreshDelta = '{E266652F-5500-452E-878A-E058FD97FCF8}';
-  RID_ContratosEmpleadosDelta = '{67B25A55-49CA-436A-A1A1-C058981C54BA}';
+  RID_ContratosEmpleadosDelta = '{EF4C6C08-21F1-4C07-A093-74CF2800F45C}';
-  RID_DescripcionesProveedoresDelta = '{4464B700-9CE4-4282-B765-52D43F0EA76D}';
+  RID_DescripcionesProveedoresDelta = '{467A45CA-058D-42EB-B8DD-50541B75C176}';
-  RID_PersonalContactoDelta = '{6010CBDE-27EB-414B-8609-5CC20E4C93B8}';
+  RID_PersonalContactoDelta = '{5BFD1443-6765-44EA-A185-DB73ADAD4A03}';
 
 type
   { IContactosDelta }
   IContactosDelta = interface(IContactos)
-  ['{783D6342-53F9-40DF-81AF-DE782DA8B75A}']
+  ['{81517FFF-20E8-4465-BE0E-CB55E5890AFD}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -326,7 +326,7 @@ type
 
   { IGruposClienteDelta }
   IGruposClienteDelta = interface(IGruposCliente)
-  ['{F2CACBA5-7F04-4EDB-BC31-41E907B8EC26}']
+  ['{E7570DEB-D558-4E75-8E14-E4F58F5FB7FA}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -372,7 +372,7 @@ type
 
   { IDatosBancariosDelta }
   IDatosBancariosDelta = interface(IDatosBancarios)
-  ['{4EB1B188-CBE1-460A-A774-BF8E36A6E757}']
+  ['{59B4AA7D-975F-4255-B35B-8C0CB9608482}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -502,7 +502,7 @@ type
 
   { IClientesDelta }
   IClientesDelta = interface(IClientes)
-  ['{CAE0D87E-5926-4DB8-9AA3-541AFDE940D3}']
+  ['{CA2D623A-76FF-473A-9B05-139388FCE5CE}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -981,7 +981,7 @@ type
 
   { IProveedoresDelta }
   IProveedoresDelta = interface(IProveedores)
-  ['{FCE9CA4B-64BD-43E2-AF85-6C3388B64F14}']
+  ['{2FE9FC09-1295-4D0A-AD70-CA92CA193E6B}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -1020,6 +1020,7 @@ type
     function GetOldVENCIMIENTO_FACTURAS_1Value : SmallInt;
     function GetOldVENCIMIENTO_FACTURAS_2Value : SmallInt;
     function GetOldVENCIMIENTO_FACTURAS_3Value : SmallInt;
+    function GetOldFELICITACIONValue : SmallInt;
 
     { Properties }
     property OldID : Integer read GetOldIDValue;
@@ -1059,6 +1060,7 @@ type
     property OldVENCIMIENTO_FACTURAS_1 : SmallInt read GetOldVENCIMIENTO_FACTURAS_1Value;
     property OldVENCIMIENTO_FACTURAS_2 : SmallInt read GetOldVENCIMIENTO_FACTURAS_2Value;
     property OldVENCIMIENTO_FACTURAS_3 : SmallInt read GetOldVENCIMIENTO_FACTURAS_3Value;
+    property OldFELICITACION : SmallInt read GetOldFELICITACIONValue;
   end;
 
   { TProveedoresBusinessProcessorRules }
@@ -1289,6 +1291,12 @@ type
     function GetOldVENCIMIENTO_FACTURAS_3IsNull: Boolean; virtual;
     procedure SetVENCIMIENTO_FACTURAS_3Value(const aValue: SmallInt); virtual;
     procedure SetVENCIMIENTO_FACTURAS_3IsNull(const aValue: Boolean); virtual;
+    function GetFELICITACIONValue: SmallInt; virtual;
+    function GetFELICITACIONIsNull: Boolean; virtual;
+    function GetOldFELICITACIONValue: SmallInt; virtual;
+    function GetOldFELICITACIONIsNull: Boolean; virtual;
+    procedure SetFELICITACIONValue(const aValue: SmallInt); virtual;
+    procedure SetFELICITACIONIsNull(const aValue: Boolean); virtual;
 
     { Properties }
     property ID : Integer read GetIDValue write SetIDValue;
@@ -1439,6 +1447,10 @@ type
     property VENCIMIENTO_FACTURAS_3IsNull : Boolean read GetVENCIMIENTO_FACTURAS_3IsNull write SetVENCIMIENTO_FACTURAS_3IsNull;
     property OldVENCIMIENTO_FACTURAS_3 : SmallInt read GetOldVENCIMIENTO_FACTURAS_3Value;
     property OldVENCIMIENTO_FACTURAS_3IsNull : Boolean read GetOldVENCIMIENTO_FACTURAS_3IsNull;
+    property FELICITACION : SmallInt read GetFELICITACIONValue write SetFELICITACIONValue;
+    property FELICITACIONIsNull : Boolean read GetFELICITACIONIsNull write SetFELICITACIONIsNull;
+    property OldFELICITACION : SmallInt read GetOldFELICITACIONValue;
+    property OldFELICITACIONIsNull : Boolean read GetOldFELICITACIONIsNull;
 
   public
     constructor Create(aBusinessProcessor: TDABusinessProcessor); override;
@@ -1448,7 +1460,7 @@ type
 
   { IEmpleadosDelta }
   IEmpleadosDelta = interface(IEmpleados)
-  ['{18DB065A-0CFF-44C3-8221-283C5F804249}']
+  ['{29641F7D-F717-4FA7-AB7A-B84C1A1381D0}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CATEGORIAValue : Integer;
@@ -1883,7 +1895,7 @@ type
 
   { IDireccionesContactoDelta }
   IDireccionesContactoDelta = interface(IDireccionesContacto)
-  ['{43E64AF9-2F6C-4F2E-9933-0EB09313D982}']
+  ['{E659AD0F-82A8-45B2-81D8-775979642AB5}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -2098,7 +2110,7 @@ type
 
   { IClientesDescuentosDelta }
   IClientesDescuentosDelta = interface(IClientesDescuentos)
-  ['{16AF7FE2-2AF0-4D98-ADA6-D29209C2A046}']
+  ['{DAB3D283-302B-4B22-A694-DAA3DE315CC7}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CLIENTEValue : Integer;
@@ -2180,7 +2192,7 @@ type
 
   { IGruposProveedorDelta }
   IGruposProveedorDelta = interface(IGruposProveedor)
-  ['{C607DA1D-70B8-4843-A46D-73691BCCF0FB}']
+  ['{FF84FE1F-F7F0-492B-B0FF-33D4825D49B5}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -2226,7 +2238,7 @@ type
 
   { IGruposEmpleadoDelta }
   IGruposEmpleadoDelta = interface(IGruposEmpleado)
-  ['{F2AA8B32-A14B-4754-BD82-531770EF1BA0}']
+  ['{0C7FA5EF-4E50-401A-97F4-FC1A72F2AA30}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldDESCRIPCIONValue : String;
@@ -2272,7 +2284,7 @@ type
 
   { IContactos_RefreshDelta }
   IContactos_RefreshDelta = interface(IContactos_Refresh)
-  ['{0AD2BAF9-797E-49CD-A47C-4C50306595BF}']
+  ['{E266652F-5500-452E-878A-E058FD97FCF8}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldNIF_CIFValue : String;
@@ -2547,7 +2559,7 @@ type
 
   { IContratosEmpleadosDelta }
   IContratosEmpleadosDelta = interface(IContratosEmpleados)
-  ['{67B25A55-49CA-436A-A1A1-C058981C54BA}']
+  ['{EF4C6C08-21F1-4C07-A093-74CF2800F45C}']
     { Property getters and setters }
     function GetOldCONTRATOValue : String;
 
@@ -2581,7 +2593,7 @@ type
 
   { IDescripcionesProveedoresDelta }
   IDescripcionesProveedoresDelta = interface(IDescripcionesProveedores)
-  ['{4464B700-9CE4-4282-B765-52D43F0EA76D}']
+  ['{467A45CA-058D-42EB-B8DD-50541B75C176}']
     { Property getters and setters }
     function GetOldDESCRIPCION_PROVEEDORValue : String;
 
@@ -2615,7 +2627,7 @@ type
 
   { IPersonalContactoDelta }
   IPersonalContactoDelta = interface(IPersonalContacto)
-  ['{6010CBDE-27EB-414B-8609-5CC20E4C93B8}']
+  ['{5BFD1443-6765-44EA-A185-DB73ADAD4A03}']
     { Property getters and setters }
     function GetOldIDValue : Integer;
     function GetOldID_CONTACTOValue : Integer;
@@ -6222,6 +6234,37 @@ begin
     BusinessProcessor.CurrentChange.NewValueByName[fld_ProveedoresVENCIMIENTO_FACTURAS_3] := Null;
 end;
 
+function TProveedoresBusinessProcessorRules.GetFELICITACIONValue: SmallInt;
+begin
+  result := BusinessProcessor.CurrentChange.NewValueByName[fld_ProveedoresFELICITACION];
+end;
+
+function TProveedoresBusinessProcessorRules.GetFELICITACIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ProveedoresFELICITACION]);
+end;
+
+function TProveedoresBusinessProcessorRules.GetOldFELICITACIONValue: SmallInt;
+begin
+  result := BusinessProcessor.CurrentChange.OldValueByName[fld_ProveedoresFELICITACION];
+end;
+
+function TProveedoresBusinessProcessorRules.GetOldFELICITACIONIsNull: Boolean;
+begin
+  result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ProveedoresFELICITACION]);
+end;
+
+procedure TProveedoresBusinessProcessorRules.SetFELICITACIONValue(const aValue: SmallInt);
+begin
+  BusinessProcessor.CurrentChange.NewValueByName[fld_ProveedoresFELICITACION] := aValue;
+end;
+
+procedure TProveedoresBusinessProcessorRules.SetFELICITACIONIsNull(const aValue: Boolean);
+begin
+  if aValue then
+    BusinessProcessor.CurrentChange.NewValueByName[fld_ProveedoresFELICITACION] := Null;
+end;
+
 
 { TEmpleadosBusinessProcessorRules }
 constructor TEmpleadosBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor);

Source/Modulos/Contactos/Model/uBizContactos.pas

@@ -156,6 +156,9 @@ type
     procedure SetVENCIMIENTO_FACTURAS_2Value(const Value: Smallint);
     procedure SetVENCIMIENTO_FACTURAS_3Value(const Value: Smallint);
 
+    function GetFELICITACIONValue: Integer;
+    procedure SetFELICITACIONValue(const aValue: Integer);
+
     property REGIMEN_IVA: String read GetREGIMEN_IVAValue write SetREGIMEN_IVAValue;
     property DESCUENTO: Float read GetDESCUENTOValue write SetDESCUENTOValue;
     property DESCRIPCION_PROVEEDOR: String read GetDESCRIPCION_PROVEEDORValue write SetDESCRIPCION_PROVEEDORValue;
@@ -170,6 +173,7 @@ type
     property VENCIMIENTO_FACTURAS_1: Smallint read GetVENCIMIENTO_FACTURAS_1Value write SetVENCIMIENTO_FACTURAS_1Value;
     property VENCIMIENTO_FACTURAS_2: Smallint read GetVENCIMIENTO_FACTURAS_2Value write SetVENCIMIENTO_FACTURAS_2Value;
     property VENCIMIENTO_FACTURAS_3: Smallint read GetVENCIMIENTO_FACTURAS_3Value write SetVENCIMIENTO_FACTURAS_3Value;
+    property FELICITACION: Integer read GetFELICITACIONValue write SetFELICITACIONValue;
   end;
 
   IBizEmpleado = interface (IBizContacto)
@@ -377,6 +381,9 @@ type
     procedure SetVENCIMIENTO_FACTURAS_2Value(const Value: Smallint);
     procedure SetVENCIMIENTO_FACTURAS_3Value(const Value: Smallint);
 
+    function GetFELICITACIONValue: Integer;
+    procedure SetFELICITACIONValue(const aValue: Integer);
+
   public
     procedure IniciarValoresContactoNuevo; override;
     property DESCUENTO: Float read GetDESCUENTOValue write SetDESCUENTOValue;
@@ -393,6 +400,7 @@ type
     property VENCIMIENTO_FACTURAS_1: Smallint read GetVENCIMIENTO_FACTURAS_1Value write SetVENCIMIENTO_FACTURAS_1Value;
     property VENCIMIENTO_FACTURAS_2: Smallint read GetVENCIMIENTO_FACTURAS_2Value write SetVENCIMIENTO_FACTURAS_2Value;
     property VENCIMIENTO_FACTURAS_3: Smallint read GetVENCIMIENTO_FACTURAS_3Value write SetVENCIMIENTO_FACTURAS_3Value;
+    property FELICITACION: Integer read GetFELICITACIONValue write SetFELICITACIONValue;
   end;
 
 
@@ -780,6 +788,7 @@ begin
   VENCIMIENTO_FACTURAS_1 := PROVEEDOR_DIAS_VENCIMIENTO;
   ID_FORMA_PAGO := AppFactuGES.EmpresaActiva.ID_FORMA_PAGO;
   ID_TIPO_IVA := AppFactuGES.EmpresaActiva.ID_TIPO_IVA;
+  FELICITACION := 0;  
 end;
 
 function TBizProveedor.GetCERTIFICACIONValue: String;
@@ -802,6 +811,11 @@ begin
   result := DataTable.Fields[idx_ProveedoresDESCUENTO].AsFloat;
 end;
 
+function TBizProveedor.GetFELICITACIONValue: Integer;
+begin
+  result := DataTable.Fields[idx_ProveedoresFELICITACION].AsInteger;
+end;
+
 procedure TBizProveedor.SetCERTIFICACIONValue(const aValue: String);
 begin
   DataTable.Fields[idx_ProveedoresCERTIFICACION].AsString := aValue;
@@ -822,6 +836,11 @@ begin
   DataTable.Fields[idx_ProveedoresDESCUENTO].AsFloat := aValue;
 end;
 
+procedure TBizProveedor.SetFELICITACIONValue(const aValue: Integer);
+begin
+  DataTable.Fields[idx_ProveedoresFELICITACION].AsInteger := aValue;
+end;
+
 procedure TBizProveedor.SetGRUPO_PROVEEDORValue(const aValue: String);
 begin
   DataTable.Fields[idx_ProveedoresGRUPO_PROVEEDOR].AsString := aValue;

Source/Modulos/Contactos/Model/uBizProveedoresServer.pas

@@ -94,6 +94,7 @@ begin
       ParamByName('VENCIMIENTO_FACTURAS_1').Value := aChange.NewValueByName[fld_ProveedoresVENCIMIENTO_FACTURAS_1];
       ParamByName('VENCIMIENTO_FACTURAS_2').Value := aChange.NewValueByName[fld_ProveedoresVENCIMIENTO_FACTURAS_2];
       ParamByName('VENCIMIENTO_FACTURAS_3').Value := aChange.NewValueByName[fld_ProveedoresVENCIMIENTO_FACTURAS_3];
+      ParamByName('FELICITACION').Value := aChange.NewValueByName[fld_ProveedoresFELICITACION];
 
       Execute;
     end;
@@ -134,6 +135,7 @@ begin
       ParamByName('VENCIMIENTO_FACTURAS_1').Value := aChange.NewValueByName[fld_ProveedoresVENCIMIENTO_FACTURAS_1];
       ParamByName('VENCIMIENTO_FACTURAS_2').Value := aChange.NewValueByName[fld_ProveedoresVENCIMIENTO_FACTURAS_2];
       ParamByName('VENCIMIENTO_FACTURAS_3').Value := aChange.NewValueByName[fld_ProveedoresVENCIMIENTO_FACTURAS_3];
+      ParamByName('FELICITACION').Value := aChange.NewValueByName[fld_ProveedoresFELICITACION];      
       
       Execute;
     end;

Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm

@@ -913,6 +913,10 @@ object srvContactos: TsrvContactos
               item
                 DatasetField = 'VENCIMIENTO_FACTURAS_3'
                 TableField = 'VENCIMIENTO_FACTURAS_3'
+              end
+              item
+                DatasetField = 'FELICITACION'
+                TableField = 'FELICITACION'
               end>
           end>
         Name = 'Proveedores'
@@ -1124,6 +1128,10 @@ object srvContactos: TsrvContactos
           item
             Name = 'VENCIMIENTO_FACTURAS_3'
             DataType = datSmallInt
+          end
+          item
+            Name = 'FELICITACION'
+            DataType = datSmallInt
           end>
       end
       item
@@ -3033,62 +3041,87 @@ object srvContactos: TsrvContactos
         Params = <
           item
             Name = 'ID_PROVEEDOR'
+            DataType = datInteger
             Value = ''
           end
           item
             Name = 'REGIMEN_IVA'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'DESCUENTO'
+            DataType = datCurrency
             Value = ''
           end
           item
             Name = 'DESCRIPCION_PROVEEDOR'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'CODIGO_ASIGNADO'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'ID_TIPO_IVA'
+            DataType = datInteger
             Value = ''
           end
           item
             Name = 'SUBCONTRATA'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'ID_FORMA_PAGO'
+            DataType = datInteger
             Value = ''
           end
           item
             Name = 'TIENDA_WEB'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'HOMOLOGADO'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'CERTIFICACION'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'GRUPO_PROVEEDOR'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'VENCIMIENTO_FACTURAS_1'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'VENCIMIENTO_FACTURAS_2'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'VENCIMIENTO_FACTURAS_3'
+            DataType = datSmallInt
+            Value = ''
+          end
+          item
+            Name = 'FELICITACION'
+            DataType = datSmallInt
             Value = ''
           end>
         Statements = <
@@ -3100,12 +3133,12 @@ object srvContactos: TsrvContactos
               'DESCUENTO, DESCRIPCION_PROVEEDOR,'#10'    CODIGO_ASIGNADO, ID_TIPO_I' +
               'VA, SUBCONTRATA, ID_FORMA_PAGO, TIENDA_WEB,'#10'    HOMOLOGADO, CERT' +
               'IFICACION, GRUPO_PROVEEDOR,'#10'    VENCIMIENTO_FACTURAS_1, VENCIMIE' +
-              'NTO_FACTURAS_2, VENCIMIENTO_FACTURAS_3)'#10'  VALUES'#10'    (:ID_PROVEE' +
+              'NTO_FACTURAS_2, VENCIMIENTO_FACTURAS_3,'#10'    FELICITACION)'#10'  VALU' +
-              'DOR, :REGIMEN_IVA, :DESCUENTO, :DESCRIPCION_PROVEEDOR,'#10'    :CODI' +
+              'ES'#10'    (:ID_PROVEEDOR, :REGIMEN_IVA, :DESCUENTO, :DESCRIPCION_PR' +
-              'GO_ASIGNADO, :ID_TIPO_IVA, :SUBCONTRATA, :ID_FORMA_PAGO, :TIENDA' +
+              'OVEEDOR,'#10'    :CODIGO_ASIGNADO, :ID_TIPO_IVA, :SUBCONTRATA, :ID_F' +
-              '_WEB,'#10'    :HOMOLOGADO, :CERTIFICACION, :GRUPO_PROVEEDOR,'#10'    :VE' +
+              'ORMA_PAGO, :TIENDA_WEB,'#10'    :HOMOLOGADO, :CERTIFICACION, :GRUPO_' +
-              'NCIMIENTO_FACTURAS_1, :VENCIMIENTO_FACTURAS_2, :VENCIMIENTO_FACT' +
+              'PROVEEDOR,'#10'    :VENCIMIENTO_FACTURAS_1, :VENCIMIENTO_FACTURAS_2,' +
-              'URAS_3)'#10
+              ' :VENCIMIENTO_FACTURAS_3,'#10'    :FELICITACION)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>
@@ -3135,62 +3168,87 @@ object srvContactos: TsrvContactos
         Params = <
           item
             Name = 'ID_PROVEEDOR'
+            DataType = datInteger
             Value = ''
           end
           item
             Name = 'REGIMEN_IVA'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'DESCUENTO'
+            DataType = datCurrency
             Value = ''
           end
           item
             Name = 'DESCRIPCION_PROVEEDOR'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'CODIGO_ASIGNADO'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'ID_TIPO_IVA'
+            DataType = datInteger
             Value = ''
           end
           item
             Name = 'ID_FORMA_PAGO'
+            DataType = datInteger
             Value = ''
           end
           item
             Name = 'TIENDA_WEB'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'HOMOLOGADO'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'CERTIFICACION'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'GRUPO_PROVEEDOR'
+            DataType = datString
+            Size = 255
             Value = ''
           end
           item
             Name = 'SUBCONTRATA'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'VENCIMIENTO_FACTURAS_1'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'VENCIMIENTO_FACTURAS_2'
+            DataType = datSmallInt
             Value = ''
           end
           item
             Name = 'VENCIMIENTO_FACTURAS_3'
+            DataType = datSmallInt
+            Value = ''
+          end
+          item
+            Name = 'FELICITACION'
+            DataType = datSmallInt
             Value = ''
           end
           item
@@ -3211,8 +3269,8 @@ object srvContactos: TsrvContactos
               '   GRUPO_PROVEEDOR = :GRUPO_PROVEEDOR,'#10'    SUBCONTRATA = :SUBCON' +
               'TRATA,'#10'    VENCIMIENTO_FACTURAS_1 = :VENCIMIENTO_FACTURAS_1,'#10'   ' +
               ' VENCIMIENTO_FACTURAS_2 = :VENCIMIENTO_FACTURAS_2,'#10'    VENCIMIEN' +
-              'TO_FACTURAS_3 = :VENCIMIENTO_FACTURAS_3'#10'  WHERE'#10'    (ID_PROVEEDO' +
+              'TO_FACTURAS_3 = :VENCIMIENTO_FACTURAS_3,'#10'    FELICITACION = :FEL' +
-              'R = :OLD_ID_PROVEEDOR)'#10
+              'ICITACION'#10'  WHERE'#10'    (ID_PROVEEDOR = :OLD_ID_PROVEEDOR)'#10
             StatementType = stSQL
             ColumnMappings = <>
           end>

Source/Modulos/Contactos/Views/uEditorClientes.dfm

@@ -138,12 +138,6 @@ inherited fEditorClientes: TfEditorClientes
       ExplicitWidth = 857
       ExplicitHeight = 270
       inherited cxGridView: TcxGridDBTableView
-        DataController.Summary.FooterSummaryItems = <
-          item
-            Format = '0 clientes'
-            Kind = skCount
-            Column = frViewClientes1.cxGridViewBLOQUEADO
-          end>
       end
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase

Source/Modulos/Contactos/Views/uEditorProveedores.dfm

@@ -1,6 +1,6 @@
 inherited fEditorProveedores: TfEditorProveedores
   Caption = 'fEditorProveedores'
-  ExplicitWidth = 714
+  ExplicitWidth = 902
   ExplicitHeight = 538
   PixelsPerInch = 96
   TextHeight = 13
@@ -42,7 +42,7 @@ inherited fEditorProveedores: TfEditorProveedores
   end
   inherited TBXDock: TTBXDock
     inherited tbxMain: TTBXToolbar
-      ExplicitWidth = 706
+      ExplicitWidth = 894
       inherited TBXItem2: TTBXItem
         Images = SmallImages
       end
@@ -103,7 +103,7 @@ inherited fEditorProveedores: TfEditorProveedores
   inline frViewProveedores1: TfrViewProveedores [3]
     Left = 0
     Top = 102
-    Width = 706
+    Width = 894
     Height = 383
     Align = alClient
     Font.Charset = DEFAULT_CHARSET
@@ -115,12 +115,12 @@ inherited fEditorProveedores: TfEditorProveedores
     TabOrder = 3
     ReadOnly = False
     ExplicitTop = 102
-    ExplicitWidth = 706
+    ExplicitWidth = 894
     ExplicitHeight = 383
     inherited cxGrid: TcxGrid
-      Width = 706
+      Width = 894
       Height = 255
-      ExplicitWidth = 706
+      ExplicitWidth = 894
       ExplicitHeight = 255
       inherited cxGridView: TcxGridDBTableView
         DataController.Summary.FooterSummaryItems = <
@@ -133,13 +133,13 @@ inherited fEditorProveedores: TfEditorProveedores
       end
     end
     inherited frViewFiltroBase1: TfrViewFiltroBase
-      Width = 706
+      Width = 894
-      ExplicitWidth = 706
+      ExplicitWidth = 894
       inherited TBXDockablePanel1: TTBXDockablePanel
-        ExplicitWidth = 706
+        ExplicitWidth = 894
         inherited dxLayoutControl1: TdxLayoutControl
-          Width = 706
+          Width = 894
-          ExplicitWidth = 706
+          ExplicitWidth = 894
           inherited txtFiltroTodo: TcxTextEdit
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
@@ -157,32 +157,32 @@ inherited fEditorProveedores: TfEditorProveedores
             Width = 219
           end
           inherited edtFechaFinFiltro: TcxDateEdit
-            Left = 323
+            Left = 361
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 323
+            ExplicitLeft = 361
             ExplicitWidth = 210
             Width = 210
           end
           inherited eLista: TcxComboBox
-            Left = 570
+            Left = 637
             Style.LookAndFeel.SkinName = ''
             StyleDisabled.LookAndFeel.SkinName = ''
             StyleFocused.LookAndFeel.SkinName = ''
             StyleHot.LookAndFeel.SkinName = ''
-            ExplicitLeft = 570
+            ExplicitLeft = 637
             ExplicitWidth = 215
             Width = 215
           end
         end
         inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-          Width = 706
+          Width = 894
-          ExplicitWidth = 706
+          ExplicitWidth = 894
           inherited tbxBotones: TTBXToolbar
-            Width = 696
+            Width = 884
-            ExplicitWidth = 696
+            ExplicitWidth = 884
           end
         end
       end
@@ -190,13 +190,13 @@ inherited fEditorProveedores: TfEditorProveedores
     inherited pnlAgrupaciones: TTBXDockablePanel
       Top = 357
       ExplicitTop = 357
-      ExplicitWidth = 706
+      ExplicitWidth = 894
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
-        Width = 706
+        Width = 894
-        ExplicitWidth = 706
+        ExplicitWidth = 894
         inherited TBXToolbar1: TTBXToolbar
-          Width = 696
+          Width = 884
-          ExplicitWidth = 696
+          ExplicitWidth = 884
         end
       end
     end
@@ -2293,6 +2293,10 @@ inherited fEditorProveedores: TfEditorProveedores
       item
         Caption = 'Previsualizar la lista de proveedores actual'
         Value = 200
+      end
+      item
+        Caption = 'Previsualizar las etiquetas de los proveedores con felicitaci'#243'n'
+        Value = 300
       end>
     ButtonBar.Buttons = [cbCancel]
     MainIcon = tdiCustom
@@ -2604,6 +2608,10 @@ inherited fEditorProveedores: TfEditorProveedores
       item
         Caption = 'Imprimir la lista de proveedores actual'
         Value = 200
+      end
+      item
+        Caption = 'Imprimir las etiquetas de los proveedores con felicitaci'#243'n'
+        Value = 300
       end>
     ButtonBar.Buttons = [cbCancel]
     MainIcon = tdiCustom

Source/Modulos/Contactos/Views/uEditorProveedores.pas

@@ -184,6 +184,12 @@ begin
         200   : begin   // Lista de elementos visibles
                   inherited;
                 end;
+        300   : begin   // Lista de elementos etiquetados con felicitación
+                  AllItems := True;
+                  AProveedores := (Controller as IProveedoresController).BuscarEtiquetadosFelicitacion;
+                  if Assigned(AProveedores) then
+                     (FController as IProveedoresController).Print(AProveedores, AllItems);
+                end;
         100   : begin   // Elemento Seleccionado
                   if AllItems then
                   begin
@@ -233,6 +239,12 @@ begin
         200   : begin   // Lista de elementos visibles
                   inherited;
                 end;
+        300   : begin   // Lista de elementos etiquetados con felicitación
+                  AllItems := True;
+                  AProveedores := (Controller as IProveedoresController).BuscarEtiquetadosFelicitacion;
+                  if Assigned(AProveedores) then
+                     (FController as IProveedoresController).Preview(AProveedores, AllItems);
+                end;
         100   : begin   // Elemento Seleccionado
                   if AllItems then
                   begin

Source/Modulos/Contactos/Views/uViewProveedor.dfm

@@ -9,7 +9,7 @@ inherited frViewProveedor: TfrViewProveedor
     Width = 799
     Height = 492
     ExplicitWidth = 799
-    ExplicitHeight = 454
+    ExplicitHeight = 492
     inherited PngSpeedButton1: TPngSpeedButton
       Left = 754
       ExplicitLeft = 754
@@ -23,7 +23,7 @@ inherited frViewProveedor: TfrViewProveedor
       ExplicitLeft = 754
     end
     object Label1: TLabel [3]
-      Left = 462
+      Left = 444
       Top = 262
       Width = 342
       Height = 26
@@ -35,6 +35,10 @@ inherited frViewProveedor: TfrViewProveedor
     inherited eCalle: TcxDBTextEdit
       Left = 134
       Top = 277
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 9
       ExplicitLeft = 134
       ExplicitTop = 277
@@ -44,6 +48,10 @@ inherited frViewProveedor: TfrViewProveedor
     inherited cbProvincia: TcxDBComboBox
       Left = 134
       Top = 304
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 10
       ExplicitLeft = 134
       ExplicitTop = 304
@@ -51,20 +59,32 @@ inherited frViewProveedor: TfrViewProveedor
     inherited cbPoblacion: TcxDBComboBox
       Left = 134
       Top = 331
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 12
       ExplicitLeft = 134
       ExplicitTop = 331
     end
     inherited eCodigoPostal: TcxDBTextEdit
-      Left = 379
+      Left = 361
       Top = 304
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 11
-      ExplicitLeft = 379
+      ExplicitLeft = 361
       ExplicitTop = 304
     end
     inherited eObservaciones: TcxDBMemo
       Top = 415
-      TabOrder = 22
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 23
       ExplicitTop = 415
       ExplicitHeight = 20
       Height = 20
@@ -180,63 +200,61 @@ inherited frViewProveedor: TfrViewProveedor
       Width = 330
     end
     inherited eTlfParticular: TcxDBTextEdit
-      Left = 569
+      Left = 551
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 15
-      ExplicitLeft = 569
+      ExplicitLeft = 551
       ExplicitWidth = 171
       Width = 171
     end
     inherited eTlfTrabajo: TcxDBTextEdit
-      Left = 569
+      Left = 551
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 14
-      ExplicitLeft = 569
+      ExplicitLeft = 551
       ExplicitWidth = 171
       Width = 171
     end
     inherited eTlfMovil: TcxDBTextEdit
-      Left = 569
+      Left = 551
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 16
-      ExplicitLeft = 569
+      ExplicitLeft = 551
       ExplicitWidth = 171
       Width = 171
     end
     inherited eFax: TcxDBTextEdit
-      Left = 569
+      Left = 551
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
       TabOrder = 17
-      ExplicitLeft = 569
+      ExplicitLeft = 551
       ExplicitWidth = 171
       Width = 171
     end
     inherited eNombre: TcxDBTextEdit
       Left = 134
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
       ExplicitLeft = 134
       ExplicitWidth = 330
       Width = 330
     end
-    inherited eNIFCIF: TcxDBTextEdit
+    object cxDBCheckBox3: TcxDBCheckBox [19]
-      Left = 231
+      Left = 343
-      ExplicitLeft = 231
-      ExplicitWidth = 226
-      Width = 226
-    end
-    inherited eMailTrabajo: TcxDBHyperLinkEdit
-      Left = 569
-      Properties.Prefix = 'mailto:'
-      TabOrder = 18
-      ExplicitLeft = 569
-      ExplicitWidth = 142
-      Width = 142
-    end
-    inherited eMailParticular: TcxDBHyperLinkEdit
-      Left = 569
-      Properties.Prefix = 'mailto:'
-      TabOrder = 19
-      ExplicitLeft = 569
-      ExplicitWidth = 142
-      Width = 142
-    end
-    object cxDBCheckBox3: TcxDBCheckBox [22]
-      Left = 361
       Top = 136
       Caption = 'Subcontrata'
       DataBinding.DataField = 'SUBCONTRATA'
@@ -259,30 +277,42 @@ inherited frViewProveedor: TfrViewProveedor
       TabOrder = 6
       Width = 83
     end
-    inherited ePaginaWeb: TcxDBHyperLinkEdit
+    inherited eNIFCIF: TcxDBTextEdit
-      Left = 569
+      Left = 224
-      TabOrder = 20
+      Style.LookAndFeel.SkinName = ''
-      ExplicitLeft = 569
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 224
+      ExplicitWidth = 226
+      Width = 226
+    end
+    inherited eMailTrabajo: TcxDBHyperLinkEdit
+      Left = 551
+      Properties.Prefix = 'mailto:'
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 18
+      ExplicitLeft = 551
       ExplicitWidth = 142
       Width = 142
     end
-    inherited eReferencia: TcxDBTextEdit
+    inherited eMailParticular: TcxDBHyperLinkEdit
-      Left = 134
+      Left = 551
-      ExplicitLeft = 134
+      Properties.Prefix = 'mailto:'
-      ExplicitWidth = 51
+      Style.LookAndFeel.SkinName = ''
-      Width = 51
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 19
+      ExplicitLeft = 551
+      ExplicitWidth = 142
+      Width = 142
     end
-    inherited ePersonaContacto: TcxDBTextEdit
+    object cxDBCheckBox1: TcxDBCheckBox [23]
-      Left = 134
+      Left = 444
-      Top = 358
-      TabOrder = 13
-      ExplicitLeft = 134
-      ExplicitTop = 358
-      ExplicitWidth = 330
-      Width = 330
-    end
-    object cxDBCheckBox1: TcxDBCheckBox [26]
-      Left = 462
       Top = 294
       Caption = 'Incluir este proveedor en la tienda web'
       DataBinding.DataField = 'TIENDA_WEB'
@@ -306,6 +336,64 @@ inherited frViewProveedor: TfrViewProveedor
       TabOrder = 21
       Width = 236
     end
+    inherited ePaginaWeb: TcxDBHyperLinkEdit
+      Left = 551
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 20
+      ExplicitLeft = 551
+      ExplicitWidth = 142
+      Width = 142
+    end
+    inherited eReferencia: TcxDBTextEdit
+      Left = 134
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      ExplicitLeft = 134
+      ExplicitWidth = 51
+      Width = 51
+    end
+    inherited ePersonaContacto: TcxDBTextEdit
+      Left = 134
+      Top = 358
+      Style.LookAndFeel.SkinName = ''
+      StyleDisabled.LookAndFeel.SkinName = ''
+      StyleFocused.LookAndFeel.SkinName = ''
+      StyleHot.LookAndFeel.SkinName = ''
+      TabOrder = 13
+      ExplicitLeft = 134
+      ExplicitTop = 358
+      ExplicitWidth = 330
+      Width = 330
+    end
+    object cbFelicitacion: TcxDBCheckBox [27]
+      Left = 456
+      Top = 339
+      Caption = 'Mandar felicitaci'#243'n navide'#241'a a este proveedor'
+      DataBinding.DataField = 'FELICITACION'
+      DataBinding.DataSource = dsContacto
+      Properties.ImmediatePost = True
+      Properties.NullStyle = nssUnchecked
+      Properties.ValueChecked = 1
+      Properties.ValueUnchecked = 0
+      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 = 22
+      Width = 352
+    end
     inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup
       inherited dxLayoutControlContactoGroup9: TdxLayoutGroup
         inherited dxLayoutControlContactoGroup4: TdxLayoutGroup
@@ -370,6 +458,14 @@ inherited frViewProveedor: TfrViewProveedor
             Control = cxDBCheckBox1
             ControlOptions.ShowBorder = False
           end
+          object dxLayoutControlContactoGroup8: TdxLayoutGroup
+            Caption = 'Otros'
+            object dxLayoutControlContactoItem27: TdxLayoutItem
+              ShowCaption = False
+              Control = cbFelicitacion
+              ControlOptions.ShowBorder = False
+            end
+          end
         end
       end
     end

Source/Modulos/Contactos/Views/uViewProveedor.pas

@@ -34,6 +34,9 @@ type
     cxDBCheckBox1: TcxDBCheckBox;
     dxLayoutControlContactoItem19: TdxLayoutItem;
     Label1: TLabel;
+    dxLayoutControlContactoItem27: TdxLayoutItem;
+    cbFelicitacion: TcxDBCheckBox;
+    dxLayoutControlContactoGroup8: TdxLayoutGroup;
     procedure CustomViewCreate(Sender: TObject);
     procedure CustomViewDestroy(Sender: TObject);
     procedure cbGrupoProveedorPropertiesInitPopup(Sender: TObject);

Source/Modulos/Contactos/Views/uViewProveedores.dfm

@@ -45,6 +45,22 @@ inherited frViewProveedores: TfrViewProveedores
         VisibleForCustomization = False
         Width = 22
       end
+      object cxGridViewFELICITACION: TcxGridDBColumn [4]
+        Caption = 'Felicitaci'#243'n'
+        DataBinding.FieldName = 'FELICITACION'
+        PropertiesClassName = 'TcxImageComboBoxProperties'
+        Properties.Images = GridPNGImageList
+        Properties.Items = <
+          item
+            Description = 'Mandar felicitaci'#243'n'
+            ImageIndex = 3
+            Value = 1
+          end
+          item
+            Value = 0
+          end>
+        Properties.ShowDescriptions = False
+      end
     end
   end
   inherited frViewFiltroBase1: TfrViewFiltroBase
@@ -72,15 +88,25 @@ inherited frViewProveedores: TfrViewProveedores
           Width = 125
         end
         inherited edtFechaFinFiltro: TcxDateEdit
-          Left = 229
+          Left = 157
           Style.LookAndFeel.SkinName = ''
           StyleDisabled.LookAndFeel.SkinName = ''
           StyleFocused.LookAndFeel.SkinName = ''
           StyleHot.LookAndFeel.SkinName = ''
-          ExplicitLeft = 229
+          ExplicitLeft = 157
           ExplicitWidth = 244
           Width = 244
         end
+        inherited eLista: TcxComboBox
+          Left = 347
+          Style.LookAndFeel.SkinName = ''
+          StyleDisabled.LookAndFeel.SkinName = ''
+          StyleFocused.LookAndFeel.SkinName = ''
+          StyleHot.LookAndFeel.SkinName = ''
+          ExplicitLeft = 347
+          ExplicitWidth = 215
+          Width = 215
+        end
       end
       inherited TBXAlignmentPanel1: TTBXAlignmentPanel
         Width = 483
@@ -431,6 +457,21 @@ inherited frViewProveedores: TfrViewProveedores
           3CF11B67B066C954E54E420000000049454E44AE426082}
         Name = 'PngImage1'
         Background = clWindow
+      end
+      item
+        PngImage.Data = {
+          89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF
+          610000000970485973000017120000171201679FD252000000DA4944415478DA
+          63FCFFFF3F03258091620356EF3C4F9109600342DC0C082AFCF5E72FC3EFDF40
+          0CA47FFD86B07DE32B1106FCACF4842B666FDF8E55F3FB0A0706711375864727
+          2E326CB7686398B77413611720DB3C31C29AA12A429F7803D09DFDB9D60E2E47
+          D0006C7E06B3A1E2FB8F5FC06E80E3CC9B585D33DF4714C5D023A72F631AF0F7
+          DF7FB0E4DFBFFF70DA0C133F75E11AAA0130CD9EF3EF6275C114677E1443CF5F
+          BD893020D0451F2AF907D5DF7FFEA188832D81CA5FB9790761808F830EC39C95
+          7B484E857003DAFA66919E86A180F2CC44A90100C02F10E6EECAFFF800000000
+          49454E44AE426082}
+        Name = 'PngImage3'
+        Background = clWindow
       end>
     Bitmap = {}
   end

Source/Modulos/Contactos/Views/uViewProveedores.pas

@@ -12,7 +12,7 @@ uses
   cxGridLevel, cxGridCustomTableView, cxGridTableView, cxGridDBTableView,
   cxClasses, cxControls, cxGridCustomView, cxGrid, dxPgsDlg, ActnList, TB2Item,
   TBX, TB2Toolbar, TBXDkPanels, TB2Dock, uViewFiltroBase, cxImageComboBox,
-  uDAInterfaces, Menus;
+  uDAInterfaces, Menus, uCustomView, uViewBase;
 
 type
   IViewProveedores = interface(IViewContactos)
@@ -22,6 +22,7 @@ type
   TfrViewProveedores = class(TfrViewContactos, IViewProveedores)
     cxGridViewTIENDA_WEB: TcxGridDBColumn;
     cxGridViewHOMOLOGADO: TcxGridDBColumn;
+    cxGridViewFELICITACION: TcxGridDBColumn;
     procedure cxGridViewICONOGetCellHint(Sender: TcxCustomGridTableItem;
       ARecord: TcxCustomGridRecord; ACellViewInfo: TcxGridTableDataCellViewInfo;
       const AMousePos: TPoint; var AHintText: TCaption;

Source/Servidor/FactuGES_Server.dpr

@@ -130,12 +130,12 @@ uses
   schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas',
   schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas',
   schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas',
-  schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
-  schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas',
   schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas',
   schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas',
   schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas',
-  schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas';
+  schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas',
+  schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas',
+  schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas';
 
 {$R *.res}
 {$R ..\Servicios\RODLFile.res}

Source/Servidor/FactuGES_Server.dproj

@@ -35,7 +35,7 @@
 		<Borland.Personality>Delphi.Personality</Borland.Personality>
 		<Borland.ProjectType/>
 		<BorlandProject>
-			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">9</VersionInfo><VersionInfo Name="Release">2</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.9.2.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.9.2.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 27 de julio de 2011 11:21</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
+			<BorlandProject><Delphi.Personality><Parameters><Parameters Name="UseLauncher">False</Parameters><Parameters Name="LoadAllSymbols">True</Parameters><Parameters Name="LoadUnspecifiedSymbols">False</Parameters><Parameters Name="RunParams">/standalone</Parameters></Parameters><VersionInfo><VersionInfo Name="IncludeVerInfo">True</VersionInfo><VersionInfo Name="AutoIncBuild">False</VersionInfo><VersionInfo Name="MajorVer">1</VersionInfo><VersionInfo Name="MinorVer">9</VersionInfo><VersionInfo Name="Release">3</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"></VersionInfoKeys><VersionInfoKeys Name="FileDescription"></VersionInfoKeys><VersionInfoKeys Name="FileVersion">1.9.3.0</VersionInfoKeys><VersionInfoKeys Name="InternalName"></VersionInfoKeys><VersionInfoKeys Name="LegalCopyright"></VersionInfoKeys><VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys><VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys><VersionInfoKeys Name="ProductName"></VersionInfoKeys><VersionInfoKeys Name="ProductVersion">1.9.3.0</VersionInfoKeys><VersionInfoKeys Name="Comments"></VersionInfoKeys><VersionInfoKeys Name="CompileDate">miércoles, 27 de julio de 2011 13:11</VersionInfoKeys></VersionInfoKeys><Excluded_Packages>
 						<Excluded_Packages Name="C:\Documents and Settings\All Users\Documentos\RAD Studio\5.0\Bpl\dxPSCoreD11.bpl">ExpressPrinting System by Developer Express Inc.</Excluded_Packages>
 					</Excluded_Packages><Source><Source Name="MainSource">FactuGES_Server.dpr</Source></Source></Delphi.Personality></BorlandProject></BorlandProject>
 	</ProjectExtensions>

Source/Servidor/FactuGES_Server.rc

@@ -1,7 +1,7 @@
 MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Servidor.ico"
 1 VERSIONINFO
-FILEVERSION 1,9,2,0
+FILEVERSION 1,9,3,0
-PRODUCTVERSION 1,9,2,0
+PRODUCTVERSION 1,9,3,0
 FILEFLAGSMASK 0x3FL
 FILEFLAGS 0x00L
 FILEOS 0x40004L
@@ -12,9 +12,9 @@ BEGIN
     BEGIN
          BLOCK "0C0A04E4"
          BEGIN
-              VALUE "FileVersion", "1.9.2.0\0"
+              VALUE "FileVersion", "1.9.3.0\0"
-              VALUE "ProductVersion", "1.9.2.0\0"
+              VALUE "ProductVersion", "1.9.3.0\0"
-              VALUE "CompileDate", "miércoles, 27 de julio de 2011 13:11\0"
+              VALUE "CompileDate", "martes, 22 de noviembre de 2011 10:27\0"
          END
     END
     BLOCK "VarFileInfo"