diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql index f04c2629..f74dbfde 100644 --- a/Database/scripts/factuges.sql +++ b/Database/scripts/factuges.sql @@ -452,7 +452,8 @@ CREATE TABLE CLIENTES_DATOS ( CODIGO_ASIGNADO VARCHAR(255), VENCIMIENTO_FACTURAS_1 SMALLINT, VENCIMIENTO_FACTURAS_2 SMALLINT, - VENCIMIENTO_FACTURAS_3 SMALLINT + VENCIMIENTO_FACTURAS_3 SMALLINT, + FELICITACION TIPO_BOOLEANO ); CREATE TABLE CLIENTES_DTOS_PROVEEDORES ( @@ -1756,7 +1757,8 @@ CREATE VIEW V_CLIENTES( ID_FORMA_PAGO, TIENDA_WEB, CODIGO_ASIGNADO, - DESCUENTO) + DESCUENTO, + FELICITACION) AS SELECT V_CONTACTOS.ID, @@ -1795,7 +1797,8 @@ SELECT CLIENTES_DATOS.ID_FORMA_PAGO, CLIENTES_DATOS.TIENDA_WEB, CLIENTES_DATOS.CODIGO_ASIGNADO, - CLIENTES_DATOS.DESCUENTO + CLIENTES_DATOS.DESCUENTO, + CLIENTES_DATOS.FELICITACION FROM V_CONTACTOS LEFT OUTER JOIN CLIENTES_DATOS ON (V_CONTACTOS.ID = CLIENTES_DATOS.ID_CLIENTE) diff --git a/Resources/Iconos/Contactos/16x16/Letter.png b/Resources/Iconos/Contactos/16x16/Letter.png new file mode 100644 index 00000000..f0a2284c Binary files /dev/null and b/Resources/Iconos/Contactos/16x16/Letter.png differ diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index f4910a29..c3119f00 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -54,58 +54,58 @@ MainSource + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
fConfigurarConexion
TForm diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 1641339f..8b251f31 100644 Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index cccb4ff9..3deb91f7 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -53,7 +53,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1770FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.7.7.0FactuGESFactuGES1.7.7.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1780FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.7.8.0FactuGESFactuGES1.7.8.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index d5ee4ea8..02132187 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 1,7,7,0 -PRODUCTVERSION 1,7,7,0 +FILEVERSION 1,7,8,0 +PRODUCTVERSION 1,7,8,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.7.7.0\0" + VALUE "FileVersion", "1.7.8.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "1.7.7.0\0" + VALUE "ProductVersion", "1.7.8.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 80e1df23..1eeb96b6 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Modulos/Contactos/Controller/uClientesController.pas b/Source/Modulos/Contactos/Controller/uClientesController.pas index bb65eec9..a46d9a32 100644 --- a/Source/Modulos/Contactos/Controller/uClientesController.pas +++ b/Source/Modulos/Contactos/Controller/uClientesController.pas @@ -12,6 +12,7 @@ type IClientesController = interface(IContactosController) ['{AAC3C51A-37F7-4961-B39F-FBC6B6A2B0F1}'] function BuscarTodosTiendaWeb: IBizCliente; + function BuscarEtiquetadosFelicitacion: IBizCliente; function TieneDatosBancarios(ACliente: IBizCliente) : Boolean; function ElegirDireccionEntrega(ACliente: IBizCliente; AMensaje: String): IBizDireccionesContacto; function EsEliminable(ACliente: IBizContacto): Boolean; @@ -38,6 +39,7 @@ type function Buscar(const ID: Integer): IBizContacto; override; function BuscarTodos: IBizContacto; override; function BuscarTodosTiendaWeb: IBizCliente; + function BuscarEtiquetadosFelicitacion: IBizCliente; function Nuevo : IBizContacto; override; procedure Ver(AContacto : IBizContacto); override; procedure VerTodos(AContactos: IBizContacto); override; @@ -74,6 +76,12 @@ begin FiltrarEmpresa(Result); end; +function TClientesController.BuscarEtiquetadosFelicitacion: IBizCliente; +begin + Result := (FDataModule as IDataModuleClientes).GetItemsFelicitacion; + FiltrarEmpresa(Result); +end; + function TClientesController.BuscarTodos: IBizContacto; begin Result := (FDataModule as IDataModuleClientes).GetItems; @@ -274,6 +282,12 @@ begin AReportController := TEtiquetasContactosReportController.Create; ListaID := TIntegerList.Create; + if not Assigned(ACliente) then + raise Exception.Create ('Cliente no asignado (TieneDatosBancarios)'); + + if not ACliente.DataTable.Active then + ACliente.DataTable.Active := True; + try //Si deseamos previsualizar todos los items del objeto albaran if AllItems then @@ -308,6 +322,12 @@ begin AReportController := TEtiquetasContactosReportController.Create; ListaID := TIntegerList.Create; + if not Assigned(ACliente) then + raise Exception.Create ('Cliente no asignado (TieneDatosBancarios)'); + + if not ACliente.DataTable.Active then + ACliente.DataTable.Active := True; + try //Si deseamos previsualizar todos los items del objeto albaran if AllItems then @@ -340,7 +360,7 @@ begin if not Assigned(ACliente) then raise Exception.Create ('Cliente no asignado (TieneDatosBancarios)'); - if ACliente.DataTable.Active then + if not ACliente.DataTable.Active then ACliente.DataTable.Active := True; with ACliente.DatosBancarios do @@ -421,7 +441,7 @@ begin if not Assigned(ACliente) then raise Exception.Create ('Cliente no asignado (VerAlbaranesDeCliente)'); - if ACliente.DataTable.Active then + if not ACliente.DataTable.Active then ACliente.DataTable.Active := True; AModule := AppFactuGES.GetModule(MODULENAME_ALBARANES_CLIENTE); @@ -442,7 +462,7 @@ begin if not Assigned(ACliente) then raise Exception.Create ('Cliente no asignado (VerFacturasDeCliente)'); - if ACliente.DataTable.Active then + if not ACliente.DataTable.Active then ACliente.DataTable.Active := True; AModule := AppFactuGES.GetModule(MODULENAME_FACTURAS_CLIENTE); @@ -463,7 +483,7 @@ begin if not Assigned(ACliente) then raise Exception.Create ('Cliente no asignado (VerPresupuestosDeCliente)'); - if ACliente.DataTable.Active then + if not ACliente.DataTable.Active then ACliente.DataTable.Active := True; AModule := AppFactuGES.GetModule(MODULENAME_PRESUPUESTOS_CLIENTE); @@ -484,7 +504,7 @@ begin if not Assigned(ACliente) then raise Exception.Create ('Cliente no asignado (VerFacturasDeCliente)'); - if ACliente.DataTable.Active then + if not ACliente.DataTable.Active then ACliente.DataTable.Active := True; AModule := AppFactuGES.GetModule(MODULENAME_RECIBOS_CLIENTE); diff --git a/Source/Modulos/Contactos/Controller/uContactosController.pas b/Source/Modulos/Contactos/Controller/uContactosController.pas index 23914afa..d1b1da5d 100644 --- a/Source/Modulos/Contactos/Controller/uContactosController.pas +++ b/Source/Modulos/Contactos/Controller/uContactosController.pas @@ -340,4 +340,3 @@ begin end; end. - \ No newline at end of file diff --git a/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm b/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm index 549ffa45..bc833b1f 100644 --- a/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm +++ b/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm @@ -412,13 +412,17 @@ inherited DataModuleClientes: TDataModuleClientes item Name = 'DESCUENTO' DataType = datFloat + end + item + Name = 'FELICITACION' + DataType = datSmallInt + DisplayLabel = #191'Felicitaci'#243'n?' + DictionaryEntry = 'Clientes_FELICITACION' 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 = 'Clientes' IndexDefs = <> Left = 296 @@ -474,8 +478,6 @@ inherited DataModuleClientes: TDataModuleClientes MasterSource = ds_Clientes MasterFields = 'ID' DetailFields = 'ID_CLIENTE' - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'ClientesDescuentos' IndexDefs = <> Left = 448 @@ -509,8 +511,6 @@ inherited DataModuleClientes: TDataModuleClientes StreamingOptions = [soDisableEventsWhileStreaming] RemoteDataAdapter = rda_Contactos LocalDataStreamer = Bin2DataStreamer - DetailOptions = [dtCascadeOpenClose, dtCascadeApplyUpdates, dtAutoFetch, dtCascadeDelete, dtCascadeUpdate, dtDisableLogOfCascadeDeletes, dtDisableLogOfCascadeUpdates, dtIncludeInAllInOneFetch] - MasterOptions = [moCascadeOpenClose, moCascadeApplyUpdates, moCascadeDelete, moCascadeUpdate, moDisableLogOfCascadeDeletes, moDisableLogOfCascadeUpdates] LogicalName = 'GruposCliente' IndexDefs = <> Left = 552 diff --git a/Source/Modulos/Contactos/Data/uDataModuleClientes.pas b/Source/Modulos/Contactos/Data/uDataModuleClientes.pas index c9999c37..5e0fb9e4 100644 --- a/Source/Modulos/Contactos/Data/uDataModuleClientes.pas +++ b/Source/Modulos/Contactos/Data/uDataModuleClientes.pas @@ -28,6 +28,7 @@ type function NewItem : IBizCliente; function GetItems : IBizCliente; function GetItemsTiendaWeb : IBizCliente; + function GetItemsFelicitacion : IBizCliente; function GetGruposCliente : IBizGrupoCliente; end; @@ -102,6 +103,27 @@ begin end; end; +function TDataModuleClientes.GetItemsFelicitacion: IBizCliente; +var + Condicion: TDAWhereExpression; +begin + ShowHourglassCursor; + try + Result := Self.GetItems; + + with Result.DataTable.DynamicWhere do + begin + Condicion := NewBinaryExpression(NewField('', fld_ClientesFELICITACION), NewConstant(1, datInteger), dboEqual); + + Clear; + Expression := Condicion + end; + + finally + HideHourglassCursor; + end; +end; + function TDataModuleClientes.GetItemsTiendaWeb: IBizCliente; var Condicion: TDAWhereExpression; diff --git a/Source/Modulos/Contactos/Model/Data/uIDataModuleClientes.pas b/Source/Modulos/Contactos/Model/Data/uIDataModuleClientes.pas index f61e519e..9fd5cf76 100644 --- a/Source/Modulos/Contactos/Model/Data/uIDataModuleClientes.pas +++ b/Source/Modulos/Contactos/Model/Data/uIDataModuleClientes.pas @@ -15,6 +15,7 @@ type function NewItem : IBizCliente; function GetItems : IBizCliente; function GetItemsTiendaWeb : IBizCliente; + function GetItemsFelicitacion : IBizCliente; function GetGruposCliente : IBizGrupoCliente; end; diff --git a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas index 3ae97470..52ef6485 100644 --- a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas +++ b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas @@ -3,26 +3,26 @@ unit schContactosClient_Intf; interface uses - Classes, DB, schBase_Intf, SysUtils, uROClasses, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_Contactos = '{88717C58-84A8-470B-8059-994AF283CC87}'; - RID_GruposCliente = '{90F0D80D-0042-409F-A93C-D60BD9489A4E}'; - RID_DatosBancarios = '{41C82024-6751-44B3-86F0-E9B28C80A41E}'; - RID_Clientes = '{9BCF75EE-2AB3-4C30-9011-34AC743797E4}'; - RID_Proveedores = '{8E2A120D-0C53-448B-8D16-B6CB84FD1460}'; - RID_Empleados = '{DD85830B-87E7-4DD3-AF23-8275488E4FEE}'; - RID_DireccionesContacto = '{D8B8A3EE-3456-4C88-BED6-4E4D72D6298C}'; - RID_ClientesDescuentos = '{1662F266-6825-4D7F-9997-9C51E1C93268}'; - RID_GruposProveedor = '{82427930-F4BB-4FE4-9518-C4F54C0F1D2B}'; - RID_GruposEmpleado = '{F3BFF021-A070-412E-9598-663C15F3B32E}'; - RID_Contactos_Refresh = '{0CE3BACA-C2F3-40AB-90B2-96A8C154F878}'; - RID_ContratosEmpleados = '{7156547B-6339-4D6F-9C67-7AB4D18C9287}'; - RID_DescripcionesProveedores = '{69CF40B3-A1ED-49EA-8FF9-A290DCF31967}'; - RID_PersonalContacto = '{9CED0719-51EC-481B-99D3-9D5091DED177}'; + RID_Contactos = '{C0F3C133-4B33-4386-8853-5C1CBDDC4381}'; + RID_GruposCliente = '{9CE88C99-80A8-403D-B850-3CFE30ED393D}'; + RID_DatosBancarios = '{F8D4FF6B-189D-4D47-8A20-AD339C85B3E9}'; + RID_Clientes = '{BD11BF18-A1AD-429C-BC06-7BF3B26C0C5D}'; + RID_Proveedores = '{4B4C2BD8-EF05-4315-9CA5-C8E3EBD7D079}'; + RID_Empleados = '{26E7320B-E2CF-45FB-808C-7A8EA9370AC1}'; + RID_DireccionesContacto = '{DF8F36B7-5FA9-475F-82D3-4E01CF8E3A32}'; + RID_ClientesDescuentos = '{417EE563-4846-45DF-89B1-F3B242BB8EA3}'; + RID_GruposProveedor = '{3FC380F7-61B7-466A-AEBB-5D9FB5D6FF33}'; + RID_GruposEmpleado = '{D4F3440A-E9C3-4A34-A72D-15BB3B3EB07A}'; + RID_Contactos_Refresh = '{943C99BF-0AD0-41F7-B2DE-2ABCBCD2FB63}'; + RID_ContratosEmpleados = '{79B74B0A-6A6F-4C32-BEAB-A1214049B702}'; + RID_DescripcionesProveedores = '{017164B2-8D2B-404F-8962-C943B4502268}'; + RID_PersonalContacto = '{1D351CFF-D5C9-444D-A55E-9B33C8D7ED97}'; { Data table names } nme_Contactos = 'Contactos'; @@ -158,6 +158,7 @@ const fld_ClientesTIENDA_WEB = 'TIENDA_WEB'; fld_ClientesCODIGO_ASIGNADO = 'CODIGO_ASIGNADO'; fld_ClientesDESCUENTO = 'DESCUENTO'; + fld_ClientesFELICITACION = 'FELICITACION'; { Clientes field indexes } idx_ClientesID = 0; @@ -197,6 +198,7 @@ const idx_ClientesTIENDA_WEB = 34; idx_ClientesCODIGO_ASIGNADO = 35; idx_ClientesDESCUENTO = 36; + idx_ClientesFELICITACION = 37; { Proveedores fields } fld_ProveedoresID = 'ID'; @@ -499,7 +501,7 @@ const type { IContactos } IContactos = interface(IDAStronglyTypedDataTable) - ['{3D3289B5-C0D5-4B66-8805-D141DFD0F3B5}'] + ['{C97BE809-CDC1-45DC-A200-6DB52EBC2EB6}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -798,7 +800,7 @@ type { IGruposCliente } IGruposCliente = interface(IDAStronglyTypedDataTable) - ['{D1AF4F9C-B92D-4F21-9443-BBCD429BD57A}'] + ['{07904A8B-36C2-4832-A77B-C8FF40A5009D}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -845,7 +847,7 @@ type { IDatosBancarios } IDatosBancarios = interface(IDAStronglyTypedDataTable) - ['{76A6EA81-8519-43E0-852F-FEBD576D1356}'] + ['{63B57F8B-86DE-420F-B48C-FB4B3B58958C}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -976,7 +978,7 @@ type { IClientes } IClientes = interface(IDAStronglyTypedDataTable) - ['{90497427-B985-42B3-86FE-B131BFB87831}'] + ['{66563838-1A22-4AFE-9BB3-9788D074FB56}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1125,6 +1127,10 @@ type procedure SetDESCUENTOValue(const aValue: Float); function GetDESCUENTOIsNull: Boolean; procedure SetDESCUENTOIsNull(const aValue: Boolean); + function GetFELICITACIONValue: SmallInt; + procedure SetFELICITACIONValue(const aValue: SmallInt); + function GetFELICITACIONIsNull: Boolean; + procedure SetFELICITACIONIsNull(const aValue: Boolean); { Properties } @@ -1202,6 +1208,8 @@ type property CODIGO_ASIGNADOIsNull: Boolean read GetCODIGO_ASIGNADOIsNull write SetCODIGO_ASIGNADOIsNull; property DESCUENTO: Float read GetDESCUENTOValue write SetDESCUENTOValue; property DESCUENTOIsNull: Boolean read GetDESCUENTOIsNull write SetDESCUENTOIsNull; + property FELICITACION: SmallInt read GetFELICITACIONValue write SetFELICITACIONValue; + property FELICITACIONIsNull: Boolean read GetFELICITACIONIsNull write SetFELICITACIONIsNull; end; { TClientesDataTableRules } @@ -1358,6 +1366,10 @@ type procedure SetDESCUENTOValue(const aValue: Float); virtual; function GetDESCUENTOIsNull: Boolean; virtual; procedure SetDESCUENTOIsNull(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; @@ -1434,6 +1446,8 @@ type property CODIGO_ASIGNADOIsNull: Boolean read GetCODIGO_ASIGNADOIsNull write SetCODIGO_ASIGNADOIsNull; property DESCUENTO: Float read GetDESCUENTOValue write SetDESCUENTOValue; property DESCUENTOIsNull: Boolean read GetDESCUENTOIsNull write SetDESCUENTOIsNull; + property FELICITACION: SmallInt read GetFELICITACIONValue write SetFELICITACIONValue; + property FELICITACIONIsNull: Boolean read GetFELICITACIONIsNull write SetFELICITACIONIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -1443,7 +1457,7 @@ type { IProveedores } IProveedores = interface(IDAStronglyTypedDataTable) - ['{250B746E-0268-4403-B61C-8DA02AB23E18}'] + ['{BB9CEFC1-3669-441F-9275-84812796D171}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1910,7 +1924,7 @@ type { IEmpleados } IEmpleados = interface(IDAStronglyTypedDataTable) - ['{3614AEDF-A5C6-49A3-9224-018A2080B884}'] + ['{6ED9C6C1-324B-4095-A2BC-5E2FB2B95E7B}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2341,7 +2355,7 @@ type { IDireccionesContacto } IDireccionesContacto = interface(IDAStronglyTypedDataTable) - ['{14C481DB-4878-4FF1-A4A0-1F6A1CA94358}'] + ['{9B97A0EF-E53E-4D87-AC0C-6DA85C2F761B}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2556,7 +2570,7 @@ type { IClientesDescuentos } IClientesDescuentos = interface(IDAStronglyTypedDataTable) - ['{D833E457-3E68-4FB7-B2A3-30DB1FA76212}'] + ['{C8E59947-D16F-4E0C-8083-6E38976D3AEE}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2639,7 +2653,7 @@ type { IGruposProveedor } IGruposProveedor = interface(IDAStronglyTypedDataTable) - ['{6AE5C79F-BE48-4B9D-9B76-D4DDA6C1F9BD}'] + ['{282A2E8C-4215-4E53-B288-D0A1F06F1D88}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2686,7 +2700,7 @@ type { IGruposEmpleado } IGruposEmpleado = interface(IDAStronglyTypedDataTable) - ['{5D14CA3F-E109-4CB0-8A5B-21D6FB2C08E0}'] + ['{D776A77F-764B-41EF-A7DB-CE2CC3103899}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2733,7 +2747,7 @@ type { IContactos_Refresh } IContactos_Refresh = interface(IDAStronglyTypedDataTable) - ['{2929B073-299D-4AE6-8549-239C114B6773}'] + ['{4FC84341-3F8B-44B1-BC92-DD268A9B78E9}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -3008,7 +3022,7 @@ type { IContratosEmpleados } IContratosEmpleados = interface(IDAStronglyTypedDataTable) - ['{EA7CCC36-96F3-4B1D-8F78-D03AF5C0E35F}'] + ['{6C57D443-4524-4643-B586-BD52E3627E42}'] { Property getters and setters } function GetCONTRATOValue: String; procedure SetCONTRATOValue(const aValue: String); @@ -3043,7 +3057,7 @@ type { IDescripcionesProveedores } IDescripcionesProveedores = interface(IDAStronglyTypedDataTable) - ['{18711C3F-5D12-4EE5-9BF3-9447FA00C6B1}'] + ['{5283DEB9-049A-401A-9CB7-B1CFA1CCAD9E}'] { Property getters and setters } function GetDESCRIPCION_PROVEEDORValue: String; procedure SetDESCRIPCION_PROVEEDORValue(const aValue: String); @@ -3078,7 +3092,7 @@ type { IPersonalContacto } IPersonalContacto = interface(IDAStronglyTypedDataTable) - ['{1D234231-A4D4-4114-B9C2-FADD996CBF04}'] + ['{8F0EC704-5AB2-499D-8437-5068F50CEEF0}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -4775,6 +4789,27 @@ begin DataTable.Fields[idx_ClientesDESCUENTO].AsVariant := Null; end; +function TClientesDataTableRules.GetFELICITACIONValue: SmallInt; +begin + result := DataTable.Fields[idx_ClientesFELICITACION].AsSmallInt; +end; + +procedure TClientesDataTableRules.SetFELICITACIONValue(const aValue: SmallInt); +begin + DataTable.Fields[idx_ClientesFELICITACION].AsSmallInt := aValue; +end; + +function TClientesDataTableRules.GetFELICITACIONIsNull: boolean; +begin + result := DataTable.Fields[idx_ClientesFELICITACION].IsNull; +end; + +procedure TClientesDataTableRules.SetFELICITACIONIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ClientesFELICITACION].AsVariant := Null; +end; + { TProveedoresDataTableRules } constructor TProveedoresDataTableRules.Create(aDataTable: TDADataTable); diff --git a/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas b/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas index 363172c0..d8932cdc 100644 --- a/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas +++ b/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 = '{1C5B32B2-64A7-46DC-80ED-D55EC2EAB36E}'; - RID_GruposClienteDelta = '{DBE23906-43B6-40D4-89A6-8C43DE5D0199}'; - RID_DatosBancariosDelta = '{38A6CAFD-4A4A-4428-8FBD-B69CDA95CD55}'; - RID_ClientesDelta = '{64BFD4A6-E90F-4DA2-B05F-5F502159D5A0}'; - RID_ProveedoresDelta = '{1670C1F4-BF8D-452C-842A-B0ED16A60DC0}'; - RID_EmpleadosDelta = '{3A92EF9C-7A9F-4B3D-8DFF-D64D46E5AD46}'; - RID_DireccionesContactoDelta = '{C30F8EFB-4A0F-42B8-9F1F-6278977F2027}'; - RID_ClientesDescuentosDelta = '{77E7EAAB-0BAB-4FC2-A30D-D829675B9158}'; - RID_GruposProveedorDelta = '{EFDF5B68-9988-4B1F-BAAB-58D7364DBF52}'; - RID_GruposEmpleadoDelta = '{3E423ADF-172F-41AD-B354-2E4B5527CCDA}'; - RID_Contactos_RefreshDelta = '{76D97E59-A5FC-4DE6-8562-180558DF00C0}'; - RID_ContratosEmpleadosDelta = '{9779B5A3-C2B5-45B6-A303-D965A44A0A20}'; - RID_DescripcionesProveedoresDelta = '{E4568314-2296-4F51-8A69-5D98C83B7D6F}'; - RID_PersonalContactoDelta = '{EA96B4AB-F363-4868-88B7-D29F001991C5}'; + RID_ContactosDelta = '{5D663643-B45F-42DF-B806-6054C92C256F}'; + RID_GruposClienteDelta = '{A22E564C-9D18-40D7-AC06-2AE7A6719723}'; + RID_DatosBancariosDelta = '{D0E06730-72AE-48A3-AD77-BCC0557E09E3}'; + RID_ClientesDelta = '{B591C54A-E5D0-4628-B3A5-E7362608E4E7}'; + RID_ProveedoresDelta = '{F0162520-4D44-4911-8B70-5FB15FE8098A}'; + RID_EmpleadosDelta = '{CD6CA1DF-ECE1-41E8-80D2-F3DB2CEECDBF}'; + RID_DireccionesContactoDelta = '{19FE4B40-6CA1-4373-9C7A-E4037FB533E2}'; + RID_ClientesDescuentosDelta = '{283BCBC2-EE2C-4B22-B9A7-A8F1498F33DD}'; + RID_GruposProveedorDelta = '{CEAE47D6-CA85-4726-B05B-C31C73DEAD0A}'; + RID_GruposEmpleadoDelta = '{F9D415C5-F9FE-410D-AB3A-9B6090F0C373}'; + RID_Contactos_RefreshDelta = '{5ACD3F74-2EF3-4596-AE9C-1FC05A27262C}'; + RID_ContratosEmpleadosDelta = '{2710E74D-E05B-4D23-9E25-72BAA0DE2535}'; + RID_DescripcionesProveedoresDelta = '{30AA4ECE-FE1C-4A9A-94EC-F6C4075E80E3}'; + RID_PersonalContactoDelta = '{995D0237-5EF5-4E5A-B44E-747F0A81D6D5}'; type { IContactosDelta } IContactosDelta = interface(IContactos) - ['{1C5B32B2-64A7-46DC-80ED-D55EC2EAB36E}'] + ['{5D663643-B45F-42DF-B806-6054C92C256F}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -326,7 +326,7 @@ type { IGruposClienteDelta } IGruposClienteDelta = interface(IGruposCliente) - ['{DBE23906-43B6-40D4-89A6-8C43DE5D0199}'] + ['{A22E564C-9D18-40D7-AC06-2AE7A6719723}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -372,7 +372,7 @@ type { IDatosBancariosDelta } IDatosBancariosDelta = interface(IDatosBancarios) - ['{38A6CAFD-4A4A-4428-8FBD-B69CDA95CD55}'] + ['{D0E06730-72AE-48A3-AD77-BCC0557E09E3}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -502,7 +502,7 @@ type { IClientesDelta } IClientesDelta = interface(IClientes) - ['{64BFD4A6-E90F-4DA2-B05F-5F502159D5A0}'] + ['{B591C54A-E5D0-4628-B3A5-E7362608E4E7}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -541,6 +541,7 @@ type function GetOldTIENDA_WEBValue : SmallInt; function GetOldCODIGO_ASIGNADOValue : String; function GetOldDESCUENTOValue : Float; + function GetOldFELICITACIONValue : SmallInt; { Properties } property OldID : Integer read GetOldIDValue; @@ -580,6 +581,7 @@ type property OldTIENDA_WEB : SmallInt read GetOldTIENDA_WEBValue; property OldCODIGO_ASIGNADO : String read GetOldCODIGO_ASIGNADOValue; property OldDESCUENTO : Float read GetOldDESCUENTOValue; + property OldFELICITACION : SmallInt read GetOldFELICITACIONValue; end; { TClientesBusinessProcessorRules } @@ -810,6 +812,12 @@ type function GetOldDESCUENTOIsNull: Boolean; virtual; procedure SetDESCUENTOValue(const aValue: Float); virtual; procedure SetDESCUENTOIsNull(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; @@ -960,6 +968,10 @@ type property DESCUENTOIsNull : Boolean read GetDESCUENTOIsNull write SetDESCUENTOIsNull; property OldDESCUENTO : Float read GetOldDESCUENTOValue; property OldDESCUENTOIsNull : Boolean read GetOldDESCUENTOIsNull; + 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; @@ -969,7 +981,7 @@ type { IProveedoresDelta } IProveedoresDelta = interface(IProveedores) - ['{1670C1F4-BF8D-452C-842A-B0ED16A60DC0}'] + ['{F0162520-4D44-4911-8B70-5FB15FE8098A}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -1436,7 +1448,7 @@ type { IEmpleadosDelta } IEmpleadosDelta = interface(IEmpleados) - ['{3A92EF9C-7A9F-4B3D-8DFF-D64D46E5AD46}'] + ['{CD6CA1DF-ECE1-41E8-80D2-F3DB2CEECDBF}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -1871,7 +1883,7 @@ type { IDireccionesContactoDelta } IDireccionesContactoDelta = interface(IDireccionesContacto) - ['{C30F8EFB-4A0F-42B8-9F1F-6278977F2027}'] + ['{19FE4B40-6CA1-4373-9C7A-E4037FB533E2}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -2086,7 +2098,7 @@ type { IClientesDescuentosDelta } IClientesDescuentosDelta = interface(IClientesDescuentos) - ['{77E7EAAB-0BAB-4FC2-A30D-D829675B9158}'] + ['{283BCBC2-EE2C-4B22-B9A7-A8F1498F33DD}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CLIENTEValue : Integer; @@ -2168,7 +2180,7 @@ type { IGruposProveedorDelta } IGruposProveedorDelta = interface(IGruposProveedor) - ['{EFDF5B68-9988-4B1F-BAAB-58D7364DBF52}'] + ['{CEAE47D6-CA85-4726-B05B-C31C73DEAD0A}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -2214,7 +2226,7 @@ type { IGruposEmpleadoDelta } IGruposEmpleadoDelta = interface(IGruposEmpleado) - ['{3E423ADF-172F-41AD-B354-2E4B5527CCDA}'] + ['{F9D415C5-F9FE-410D-AB3A-9B6090F0C373}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -2260,7 +2272,7 @@ type { IContactos_RefreshDelta } IContactos_RefreshDelta = interface(IContactos_Refresh) - ['{76D97E59-A5FC-4DE6-8562-180558DF00C0}'] + ['{5ACD3F74-2EF3-4596-AE9C-1FC05A27262C}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldNIF_CIFValue : String; @@ -2535,7 +2547,7 @@ type { IContratosEmpleadosDelta } IContratosEmpleadosDelta = interface(IContratosEmpleados) - ['{9779B5A3-C2B5-45B6-A303-D965A44A0A20}'] + ['{2710E74D-E05B-4D23-9E25-72BAA0DE2535}'] { Property getters and setters } function GetOldCONTRATOValue : String; @@ -2569,7 +2581,7 @@ type { IDescripcionesProveedoresDelta } IDescripcionesProveedoresDelta = interface(IDescripcionesProveedores) - ['{E4568314-2296-4F51-8A69-5D98C83B7D6F}'] + ['{30AA4ECE-FE1C-4A9A-94EC-F6C4075E80E3}'] { Property getters and setters } function GetOldDESCRIPCION_PROVEEDORValue : String; @@ -2603,7 +2615,7 @@ type { IPersonalContactoDelta } IPersonalContactoDelta = interface(IPersonalContacto) - ['{EA96B4AB-F363-4868-88B7-D29F001991C5}'] + ['{995D0237-5EF5-4E5A-B44E-747F0A81D6D5}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -5012,6 +5024,37 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDESCUENTO] := Null; end; +function TClientesBusinessProcessorRules.GetFELICITACIONValue: SmallInt; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesFELICITACION]; +end; + +function TClientesBusinessProcessorRules.GetFELICITACIONIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesFELICITACION]); +end; + +function TClientesBusinessProcessorRules.GetOldFELICITACIONValue: SmallInt; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesFELICITACION]; +end; + +function TClientesBusinessProcessorRules.GetOldFELICITACIONIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesFELICITACION]); +end; + +procedure TClientesBusinessProcessorRules.SetFELICITACIONValue(const aValue: SmallInt); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesFELICITACION] := aValue; +end; + +procedure TClientesBusinessProcessorRules.SetFELICITACIONIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesFELICITACION] := Null; +end; + { TProveedoresBusinessProcessorRules } constructor TProveedoresBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); diff --git a/Source/Modulos/Contactos/Model/uBizClientesServer.pas b/Source/Modulos/Contactos/Model/uBizClientesServer.pas index a2f45f3b..c6fdcbeb 100644 --- a/Source/Modulos/Contactos/Model/uBizClientesServer.pas +++ b/Source/Modulos/Contactos/Model/uBizClientesServer.pas @@ -96,6 +96,7 @@ begin ParamByName('VENCIMIENTO_FACTURAS_1').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_1]; ParamByName('VENCIMIENTO_FACTURAS_2').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_2]; ParamByName('VENCIMIENTO_FACTURAS_3').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_3]; + ParamByName('FELICITACION').Value := aChange.NewValueByName[fld_ClientesFELICITACION]; Execute; end; finally @@ -136,6 +137,8 @@ begin ParamByName('VENCIMIENTO_FACTURAS_1').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_1]; ParamByName('VENCIMIENTO_FACTURAS_2').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_2]; ParamByName('VENCIMIENTO_FACTURAS_3').Value := aChange.NewValueByName[fld_ClientesVENCIMIENTO_FACTURAS_3]; + ParamByName('FELICITACION').Value := aChange.NewValueByName[fld_ClientesFELICITACION]; + Execute; end; finally diff --git a/Source/Modulos/Contactos/Model/uBizContactos.pas b/Source/Modulos/Contactos/Model/uBizContactos.pas index b0943aee..bee44df7 100644 --- a/Source/Modulos/Contactos/Model/uBizContactos.pas +++ b/Source/Modulos/Contactos/Model/uBizContactos.pas @@ -93,6 +93,9 @@ type procedure SetDescuentos(Value: IBizClienteDescuentos); property Descuentos: IBizClienteDescuentos read GetDescuentos write SetDescuentos; + function GetFELICITACIONValue: Integer; + procedure SetFELICITACIONValue(const aValue: Integer); + property GRUPO_CLIENTE: String read GetGRUPO_CLIENTEValue write SetGRUPO_CLIENTEValue; property NOMBRE_COMERCIAL: String read GetNOMBRE_COMERCIALValue write SetNOMBRE_COMERCIALValue; property VENCIMIENTO_FACTURAS_1: Smallint read GetVENCIMIENTO_FACTURAS_1Value write SetVENCIMIENTO_FACTURAS_1Value; @@ -106,6 +109,7 @@ type property ID_FORMA_PAGO: Integer read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue; property TIENDA_WEB: Integer read GetTIENDA_WEBValue write SetTIENDA_WEBValue; property DESCUENTO: Double read GetDESCUENTOValue write SetDESCUENTOValue; + property FELICITACION: Integer read GetFELICITACIONValue write SetFELICITACIONValue; end; IBizProveedor = interface (IBizContacto) @@ -305,6 +309,9 @@ type function GetDescuentos: IBizClienteDescuentos; procedure SetDescuentos(Value: IBizClienteDescuentos); + + function GetFELICITACIONValue: Integer; + procedure SetFELICITACIONValue(const aValue: Integer); public procedure IniciarValoresContactoNuevo; override; constructor Create(aDataTable: TDADataTable); override; @@ -323,6 +330,7 @@ type property ID_FORMA_PAGO: Integer read GetID_FORMA_PAGOValue write SetID_FORMA_PAGOValue; property TIENDA_WEB: Integer read GetTIENDA_WEBValue write SetTIENDA_WEBValue; property DESCUENTO: Double read GetDESCUENTOValue write SetDESCUENTOValue; + property FELICITACION: Integer read GetFELICITACIONValue write SetFELICITACIONValue; end; @@ -564,6 +572,11 @@ begin result := DataTable.Fields[idx_ClientesDESCUENTO].AsFloat; end; +function TBizCliente.GetFELICITACIONValue: Integer; +begin + result := DataTable.Fields[idx_ClientesFELICITACION].AsInteger; +end; + function TBizCliente.GetGRUPO_CLIENTEValue: String; begin result := DataTable.Fields[idx_ClientesGRUPO_CLIENTE].AsString; @@ -605,6 +618,11 @@ begin DataTable.Fields[idx_ClientesDESCUENTO].AsFloat := aValue; end; +procedure TBizCliente.SetFELICITACIONValue(const aValue: Integer); +begin + DataTable.Fields[idx_ClientesFELICITACION].AsInteger := aValue; +end; + procedure TBizCliente.SetGRUPO_CLIENTEValue(const aValue: String); begin DataTable.Fields[idx_ClientesGRUPO_CLIENTE].AsString := aValue; @@ -696,6 +714,7 @@ begin ID_CATEGORIA := CATEGORIA_CLIENTE; VENCIMIENTO_FACTURAS_1 := CLIENTE_DIAS_VENCIMIENTO; BLOQUEADO := 0; + FELICITACION := 0; RECARGO_EQUIVALENCIA := CLIENTE_RECARGO_EQUIVALENCIA; REGIMEN_IVA := CLIENTE_REGIMEN_IVA; ID_FORMA_PAGO := AppFactuGES.EmpresaActiva.ID_FORMA_PAGO; diff --git a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm index 10a03ccc..407b8de6 100644 --- a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm +++ b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm @@ -539,6 +539,10 @@ object srvContactos: TsrvContactos item DatasetField = 'VENCIMIENTO_FACTURAS_3' TableField = 'VENCIMIENTO_FACTURAS_3' + end + item + DatasetField = 'FELICITACION' + TableField = 'FELICITACION' end> end> Name = 'Clientes' @@ -747,6 +751,11 @@ object srvContactos: TsrvContactos item Name = 'DESCUENTO' DataType = datFloat + end + item + Name = 'FELICITACION' + DataType = datSmallInt + DictionaryEntry = 'Clientes_FELICITACION' end> end item @@ -2782,62 +2791,87 @@ object srvContactos: TsrvContactos Params = < item Name = 'ID_CLIENTE' + DataType = datInteger Value = '' end item Name = 'GRUPO_CLIENTE' + DataType = datString + Size = 255 Value = '' end item Name = 'RECARGO_EQUIVALENCIA' + DataType = datSmallInt Value = '' end item Name = 'NOMBRE_COMERCIAL' + DataType = datString + Size = 255 Value = '' end item Name = 'BLOQUEADO' + DataType = datSmallInt Value = '' end item Name = 'MOTIVO_BLOQUEO' + DataType = datString + Size = 255 Value = '' end item Name = 'REGIMEN_IVA' + 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 = 'CODIGO_ASIGNADO' + DataType = datString + Size = 255 Value = '' end item Name = 'DESCUENTO' + DataType = datCurrency 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 = < @@ -2849,12 +2883,12 @@ object srvContactos: TsrvContactos 'ARGO_EQUIVALENCIA, NOMBRE_COMERCIAL,'#10' BLOQUEADO, MOTIVO_BLOQ' + 'UEO, REGIMEN_IVA, ID_TIPO_IVA, ID_FORMA_PAGO,'#10' TIENDA_WEB, C' + 'ODIGO_ASIGNADO, DESCUENTO,'#10' VENCIMIENTO_FACTURAS_1, VENCIMIE' + - 'NTO_FACTURAS_2, VENCIMIENTO_FACTURAS_3)'#10' VALUES'#10' (:ID_CLIENT' + - 'E, :GRUPO_CLIENTE, :RECARGO_EQUIVALENCIA, :NOMBRE_COMERCIAL,'#10' ' + - ' :BLOQUEADO, :MOTIVO_BLOQUEO, :REGIMEN_IVA, :ID_TIPO_IVA, :ID_F' + - 'ORMA_PAGO,'#10' :TIENDA_WEB, :CODIGO_ASIGNADO, :DESCUENTO,'#10' ' + - ':VENCIMIENTO_FACTURAS_1, :VENCIMIENTO_FACTURAS_2, :VENCIMIENTO_F' + - 'ACTURAS_3)'#10 + 'NTO_FACTURAS_2, VENCIMIENTO_FACTURAS_3,'#10' FELICITACION)'#10' VAL' + + 'UES'#10' (:ID_CLIENTE, :GRUPO_CLIENTE, :RECARGO_EQUIVALENCIA, :NO' + + 'MBRE_COMERCIAL,'#10' :BLOQUEADO, :MOTIVO_BLOQUEO, :REGIMEN_IVA, ' + + ':ID_TIPO_IVA, :ID_FORMA_PAGO,'#10' :TIENDA_WEB, :CODIGO_ASIGNADO' + + ', :DESCUENTO,'#10' :VENCIMIENTO_FACTURAS_1, :VENCIMIENTO_FACTURA' + + 'S_2, :VENCIMIENTO_FACTURAS_3,'#10' :FELICITACION)'#10 StatementType = stSQL ColumnMappings = <> end> @@ -2884,62 +2918,87 @@ object srvContactos: TsrvContactos Params = < item Name = 'ID_CLIENTE' + DataType = datInteger Value = '' end item Name = 'GRUPO_CLIENTE' + DataType = datString + Size = 255 Value = '' end item Name = 'MOTIVO_BLOQUEO' + DataType = datString + Size = 255 Value = '' end item Name = 'RECARGO_EQUIVALENCIA' + DataType = datSmallInt Value = '' end item Name = 'NOMBRE_COMERCIAL' + DataType = datString + Size = 255 Value = '' end item Name = 'BLOQUEADO' + DataType = datSmallInt Value = '' end item Name = 'REGIMEN_IVA' + 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 = 'CODIGO_ASIGNADO' + DataType = datString + Size = 255 Value = '' end item Name = 'DESCUENTO' + DataType = datCurrency 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 @@ -2960,8 +3019,8 @@ object srvContactos: TsrvContactos ' CODIGO_ASIGNADO = :CODIGO_ASIGNADO,'#10' DESCUENTO = :DESCUEN' + 'TO,'#10' VENCIMIENTO_FACTURAS_1 = :VENCIMIENTO_FACTURAS_1,'#10' VE' + 'NCIMIENTO_FACTURAS_2 = :VENCIMIENTO_FACTURAS_2,'#10' VENCIMIENTO_' + - 'FACTURAS_3 = :VENCIMIENTO_FACTURAS_3'#10' WHERE'#10' (ID_CLIENTE = :' + - 'OLD_ID_CLIENTE)'#10 + 'FACTURAS_3 = :VENCIMIENTO_FACTURAS_3,'#10' FELICITACION = :FELICI' + + 'TACION'#10' WHERE'#10' (ID_CLIENTE = :OLD_ID_CLIENTE)'#10 StatementType = stSQL ColumnMappings = <> end> @@ -4371,6 +4430,11 @@ object srvContactos: TsrvContactos DataType = datInteger DisplayLabel = 'Vencimiento' end + item + Name = 'Clientes_FELICITACION' + DataType = datSmallInt + DisplayLabel = #191'Felicitaci'#243'n?' + end item Name = 'Clientes_BLOQUEADO' DataType = datSmallInt diff --git a/Source/Modulos/Contactos/Views/uEditorCliente.dfm b/Source/Modulos/Contactos/Views/uEditorCliente.dfm index c9c2975d..7323f35c 100644 --- a/Source/Modulos/Contactos/Views/uEditorCliente.dfm +++ b/Source/Modulos/Contactos/Views/uEditorCliente.dfm @@ -50,6 +50,8 @@ inherited fEditorCliente: TfEditorCliente inherited lblDesbloquear: TcxLabel Left = 667 ExplicitLeft = 667 + AnchorX = 712 + AnchorY = 14 end end inherited TBXDock: TTBXDock @@ -120,7 +122,7 @@ inherited fEditorCliente: TfEditorCliente inherited pgPaginas: TPageControl Width = 786 Height = 530 - ActivePage = pagDatosComerciales + ActivePage = pagGeneral ExplicitWidth = 786 ExplicitHeight = 530 inherited pagGeneral: TTabSheet @@ -149,31 +151,17 @@ inherited fEditorCliente: TfEditorCliente ExplicitWidth = 778 ExplicitHeight = 502 inherited PngSpeedButton1: TPngSpeedButton - Left = 733 Top = 218 - ExplicitLeft = 733 ExplicitTop = 218 end inherited PngSpeedButton2: TPngSpeedButton - Left = 733 Top = 190 - ExplicitLeft = 733 ExplicitTop = 190 end inherited PngSpeedButton3: TPngSpeedButton - Left = 733 Top = 162 - ExplicitLeft = 733 ExplicitTop = 162 end - inherited Label1: TLabel - Left = 419 - Top = 251 - Width = 161 - ExplicitLeft = 419 - ExplicitTop = 251 - ExplicitWidth = 161 - end inherited eCalle: TcxDBTextEdit Top = 267 Style.LookAndFeel.SkinName = '' @@ -205,13 +193,13 @@ inherited fEditorCliente: TfEditorCliente Width = 246 end inherited eCodigoPostal: TcxDBTextEdit - Left = 337 + Left = 303 Top = 294 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 337 + ExplicitLeft = 303 ExplicitTop = 294 end inherited eObservaciones: TcxDBMemo @@ -277,49 +265,49 @@ inherited fEditorCliente: TfEditorCliente Width = 246 end inherited eTlfParticular: TcxDBTextEdit - Left = 525 + Left = 491 Top = 57 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 525 + ExplicitLeft = 491 ExplicitTop = 57 ExplicitWidth = 177 Width = 177 end inherited eTlfTrabajo: TcxDBTextEdit - Left = 525 + Left = 491 Top = 30 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 525 + ExplicitLeft = 491 ExplicitTop = 30 ExplicitWidth = 177 Width = 177 end inherited eTlfMovil: TcxDBTextEdit - Left = 525 + Left = 491 Top = 84 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 525 + ExplicitLeft = 491 ExplicitTop = 84 ExplicitWidth = 177 Width = 177 end inherited eFax: TcxDBTextEdit - Left = 525 + Left = 491 Top = 111 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 525 + ExplicitLeft = 491 ExplicitTop = 111 ExplicitWidth = 177 Width = 177 @@ -334,64 +322,52 @@ inherited fEditorCliente: TfEditorCliente ExplicitWidth = 246 Width = 246 end - inherited cxDBCheckBox1: TcxDBCheckBox - Left = 419 - Top = 322 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 419 - ExplicitTop = 322 - ExplicitWidth = 328 - Width = 328 - end inherited eNIFCIF: TcxDBTextEdit - Left = 226 + Left = 212 Top = 30 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 226 + ExplicitLeft = 212 ExplicitTop = 30 ExplicitWidth = 162 Width = 162 end inherited eMailTrabajo: TcxDBHyperLinkEdit - Left = 525 + Left = 491 Top = 162 Properties.Prefix = 'mailto:' Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 525 + ExplicitLeft = 491 ExplicitTop = 162 ExplicitWidth = 148 Width = 148 end inherited eMailParticular: TcxDBHyperLinkEdit - Left = 525 + Left = 491 Top = 190 Properties.Prefix = 'mailto:' Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 525 + ExplicitLeft = 491 ExplicitTop = 190 ExplicitWidth = 148 Width = 148 end inherited ePaginaWeb: TcxDBHyperLinkEdit - Left = 525 + Left = 491 Top = 217 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 525 + ExplicitLeft = 491 ExplicitTop = 217 ExplicitWidth = 148 Width = 148 @@ -416,6 +392,14 @@ inherited fEditorCliente: TfEditorCliente ExplicitWidth = 246 Width = 246 end + inherited cbFelicitacion: TcxDBCheckBox + Left = 396 + Top = 270 + ExplicitLeft = 396 + ExplicitTop = 270 + ExplicitWidth = 370 + Width = 370 + end end inherited dsContacto: TDADataSource Left = 24 diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.dfm b/Source/Modulos/Contactos/Views/uEditorClientes.dfm index 26ee4139..47ca6a83 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.dfm +++ b/Source/Modulos/Contactos/Views/uEditorClientes.dfm @@ -171,22 +171,22 @@ inherited fEditorClientes: TfEditorClientes Width = 460 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 564 + Left = 467 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 564 + ExplicitLeft = 467 ExplicitWidth = 212 Width = 212 end inherited eLista: TcxComboBox - Left = 813 + Left = 676 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 813 + ExplicitLeft = 676 ExplicitWidth = 215 Width = 215 end @@ -2602,6 +2602,10 @@ inherited fEditorClientes: TfEditorClientes item Caption = 'Previsualizar la lista de clientes actual' Value = 200 + end + item + Caption = 'Previsualizar las etiquetas de los clientes con felicitaci'#243'n' + Value = 300 end> ButtonBar.Buttons = [cbCancel] MainIcon = tdiCustom @@ -2913,6 +2917,10 @@ inherited fEditorClientes: TfEditorClientes item Caption = 'Imprimir la lista de clientes actual' Value = 200 + end + item + Caption = 'Previsualizar las etiquetas de los clientes con felicitaci'#243'n' + Value = 300 end> ButtonBar.Buttons = [cbCancel] MainIcon = tdiCustom diff --git a/Source/Modulos/Contactos/Views/uEditorClientes.pas b/Source/Modulos/Contactos/Views/uEditorClientes.pas index e40b14ba..732f28cc 100644 --- a/Source/Modulos/Contactos/Views/uEditorClientes.pas +++ b/Source/Modulos/Contactos/Views/uEditorClientes.pas @@ -189,13 +189,19 @@ begin inherited else begin - Respuesta := JsPrevisualizarDialog.Execute; + Respuesta := JsImprimirDialog.Execute; if Respuesta <> IDCANCEL then begin case JsPrevisualizarDialog.CustomButtonResult of 200 : begin // Lista de elementos visibles inherited; end; + 300 : begin // Lista de elementos etiquetados con felicitación + AllItems := True; + AClientes := (Controller as IClientesController).BuscarEtiquetadosFelicitacion; + if Assigned(AClientes) then + (FController as IClientesController).Print(AClientes, AllItems); + end; 100 : begin // Elemento Seleccionado if AllItems then begin @@ -245,6 +251,12 @@ begin 200 : begin // Lista de elementos visibles inherited; end; + 300 : begin // Lista de elementos etiquetados con felicitación + AllItems := True; + AClientes := (Controller as IClientesController).BuscarEtiquetadosFelicitacion; + if Assigned(AClientes) then + (FController as IClientesController).Preview(AClientes, AllItems); + end; 100 : begin // Elemento Seleccionado if AllItems then begin diff --git a/Source/Modulos/Contactos/Views/uEditorContacto.dfm b/Source/Modulos/Contactos/Views/uEditorContacto.dfm index 62d5d655..c8ab0b23 100644 --- a/Source/Modulos/Contactos/Views/uEditorContacto.dfm +++ b/Source/Modulos/Contactos/Views/uEditorContacto.dfm @@ -7,6 +7,7 @@ inherited fEditorContacto: TfEditorContacto ClientWidth = 632 Scaled = False ExplicitWidth = 640 + ExplicitHeight = 240 PixelsPerInch = 96 TextHeight = 13 inherited JvNavPanelHeader: TJvNavPanelHeader @@ -110,6 +111,18 @@ inherited fEditorContacto: TfEditorContacto inherited ToolBar1: TToolBar Width = 618 ExplicitWidth = 618 + inherited ToolButton1: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton4: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton2: TToolButton + ExplicitWidth = 113 + end + inherited ToolButton7: TToolButton + ExplicitWidth = 113 + end end end end diff --git a/Source/Modulos/Contactos/Views/uEditorContactos.dfm b/Source/Modulos/Contactos/Views/uEditorContactos.dfm index 2594d661..79c1d17d 100644 --- a/Source/Modulos/Contactos/Views/uEditorContactos.dfm +++ b/Source/Modulos/Contactos/Views/uEditorContactos.dfm @@ -25,8 +25,8 @@ inherited fEditorContactos: TfEditorContactos end end inherited TBXTMain2: TTBXToolbar - Left = 334 - ExplicitLeft = 334 + Left = 318 + ExplicitLeft = 318 end end inherited EditorActionList: TActionList diff --git a/Source/Modulos/Contactos/Views/uViewCliente.dfm b/Source/Modulos/Contactos/Views/uViewCliente.dfm index 5b77d71d..95dde585 100644 --- a/Source/Modulos/Contactos/Views/uViewCliente.dfm +++ b/Source/Modulos/Contactos/Views/uViewCliente.dfm @@ -11,31 +11,24 @@ inherited frViewCliente: TfrViewCliente ExplicitWidth = 777 ExplicitHeight = 506 inherited PngSpeedButton1: TPngSpeedButton - Left = 732 - ExplicitLeft = 732 + Left = 733 + ExplicitLeft = 733 end inherited PngSpeedButton2: TPngSpeedButton - Left = 732 - ExplicitLeft = 732 + Left = 733 + ExplicitLeft = 733 end inherited PngSpeedButton3: TPngSpeedButton - Left = 732 - ExplicitLeft = 732 - end - object Label1: TLabel [3] - Left = 410 - Top = 262 - Width = 161 - Height = 65 - Margins.Bottom = 0 - Caption = - 'Para que el cliente pueda tener acceso a la tienda web, obligato' + - 'riamente debe tener indicado un correo electr'#243'nico de trabajo' - WordWrap = True + Left = 733 + ExplicitLeft = 733 end inherited eCalle: TcxDBTextEdit Left = 132 Top = 277 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 8 ExplicitLeft = 132 ExplicitTop = 277 @@ -45,7 +38,10 @@ inherited frViewCliente: TfrViewCliente inherited cbProvincia: TcxDBComboBox Left = 132 Top = 304 - Properties.OnValidate = nil + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 9 ExplicitLeft = 132 ExplicitTop = 304 @@ -55,6 +51,10 @@ inherited frViewCliente: TfrViewCliente inherited cbPoblacion: TcxDBComboBox Left = 132 Top = 331 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 11 ExplicitLeft = 132 ExplicitTop = 331 @@ -62,14 +62,22 @@ inherited frViewCliente: TfrViewCliente Width = 260 end inherited eCodigoPostal: TcxDBTextEdit - Left = 327 + Left = 309 Top = 304 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 10 - ExplicitLeft = 327 + ExplicitLeft = 309 ExplicitTop = 304 end inherited eObservaciones: TcxDBMemo Top = 415 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 21 ExplicitTop = 415 ExplicitWidth = 733 @@ -77,7 +85,7 @@ inherited frViewCliente: TfrViewCliente Height = 69 Width = 733 end - object eNombreComercial: TcxDBTextEdit [9] + object eNombreComercial: TcxDBTextEdit [8] Left = 132 Top = 82 DataBinding.DataField = 'NOMBRE_COMERCIAL' @@ -97,7 +105,7 @@ inherited frViewCliente: TfrViewCliente TabOrder = 3 Width = 260 end - object cbClienteBloqueado: TcxDBCheckBox [10] + object cbClienteBloqueado: TcxDBCheckBox [9] Left = 22 Top = 193 Action = actBloqueoCliente @@ -121,7 +129,7 @@ inherited frViewCliente: TfrViewCliente TabOrder = 6 Width = 370 end - object cbGrupoCliente: TcxDBComboBox [11] + object cbGrupoCliente: TcxDBComboBox [10] Left = 132 Top = 136 DataBinding.DataField = 'GRUPO_CLIENTE' @@ -145,7 +153,7 @@ inherited frViewCliente: TfrViewCliente TabOrder = 5 Width = 260 end - object eBloqueo: TcxDBTextEdit [12] + object eBloqueo: TcxDBTextEdit [11] Left = 132 Top = 220 DataBinding.DataField = 'MOTIVO_BLOQUEO' @@ -164,7 +172,7 @@ inherited frViewCliente: TfrViewCliente TabOrder = 7 Width = 260 end - object eCodigoAsignado: TcxDBTextEdit [13] + object eCodigoAsignado: TcxDBTextEdit [12] Left = 132 Top = 109 DataBinding.DataField = 'CODIGO_ASIGNADO' @@ -185,69 +193,132 @@ inherited frViewCliente: TfrViewCliente Width = 260 end inherited eTlfParticular: TcxDBTextEdit - Left = 517 + Left = 499 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 14 - ExplicitLeft = 517 + ExplicitLeft = 499 ExplicitWidth = 238 Width = 238 end inherited eTlfTrabajo: TcxDBTextEdit - Left = 517 + Left = 499 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 13 - ExplicitLeft = 517 + ExplicitLeft = 499 ExplicitWidth = 238 Width = 238 end inherited eTlfMovil: TcxDBTextEdit - Left = 517 + Left = 499 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 15 - ExplicitLeft = 517 + ExplicitLeft = 499 ExplicitWidth = 238 Width = 238 end inherited eFax: TcxDBTextEdit - Left = 517 + Left = 499 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 16 - ExplicitLeft = 517 + ExplicitLeft = 499 ExplicitWidth = 238 Width = 238 end inherited eNombre: TcxDBTextEdit Left = 132 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 132 ExplicitWidth = 260 Width = 260 end inherited eNIFCIF: TcxDBTextEdit - Left = 301 - ExplicitLeft = 301 + Left = 283 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 283 ExplicitWidth = 91 Width = 91 end inherited eMailTrabajo: TcxDBHyperLinkEdit - Left = 517 + Left = 499 Properties.Prefix = 'mailto:' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 17 - ExplicitLeft = 517 + ExplicitLeft = 499 ExplicitWidth = 209 Width = 209 end inherited eMailParticular: TcxDBHyperLinkEdit - Left = 517 + Left = 499 Properties.Prefix = 'mailto:' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 18 - ExplicitLeft = 517 + ExplicitLeft = 499 ExplicitWidth = 209 Width = 209 end - object cxDBCheckBox1: TcxDBCheckBox [22] - Left = 410 - Top = 333 - Caption = 'Permitir el acceso de este cliente a la tienda web' - DataBinding.DataField = 'TIENDA_WEB' + inherited ePaginaWeb: TcxDBHyperLinkEdit + Left = 499 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 19 + ExplicitLeft = 499 + ExplicitWidth = 209 + Width = 209 + end + inherited eReferencia: TcxDBTextEdit + Left = 132 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 132 + end + inherited ePersonaContacto: TcxDBTextEdit + Left = 132 + Top = 358 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 12 + ExplicitLeft = 132 + ExplicitTop = 358 + ExplicitWidth = 260 + Width = 260 + end + object cbFelicitacion: TcxDBCheckBox [24] + Left = 404 + Top = 280 + Caption = 'Mandar felicitaci'#243'n navide'#241'a a este cliente' + DataBinding.DataField = 'FELICITACION' DataBinding.DataSource = dsContacto Properties.ImmediatePost = True - Properties.MultiLine = True Properties.NullStyle = nssUnchecked Properties.ValueChecked = 1 Properties.ValueUnchecked = 0 @@ -263,27 +334,7 @@ inherited frViewCliente: TfrViewCliente StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 20 - Width = 357 - end - inherited ePaginaWeb: TcxDBHyperLinkEdit - Left = 517 - TabOrder = 19 - ExplicitLeft = 517 - ExplicitWidth = 209 - Width = 209 - end - inherited eReferencia: TcxDBTextEdit - Left = 132 - ExplicitLeft = 132 - end - inherited ePersonaContacto: TcxDBTextEdit - Left = 132 - Top = 358 - TabOrder = 12 - ExplicitLeft = 132 - ExplicitTop = 358 - ExplicitWidth = 260 - Width = 260 + Width = 370 end inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup AutoAligns = [aaHorizontal] @@ -330,22 +381,13 @@ inherited frViewCliente: TfrViewCliente end end inherited dxLayoutControlContactoGroup6: TdxLayoutGroup - object dxLayoutControlContactoItem20: TdxLayoutItem - AutoAligns = [aaVertical] - AlignHorz = ahClient - ShowCaption = False - Visible = False - Control = Label1 - ControlOptions.AutoColor = True - ControlOptions.ShowBorder = False - end - object dxLayoutControlContactoItem21: TdxLayoutItem - AutoAligns = [aaVertical] - AlignHorz = ahClient - ShowCaption = False - Visible = False - Control = cxDBCheckBox1 - ControlOptions.ShowBorder = False + object dxLayoutControlContactoGroup8: TdxLayoutGroup + Caption = 'Otros' + object dxLayoutControlContactoItem20: TdxLayoutItem + ShowCaption = False + Control = cbFelicitacion + ControlOptions.ShowBorder = False + end end end end @@ -357,9 +399,12 @@ inherited frViewCliente: TfrViewCliente end end inherited dsContacto: TDADataSource - Top = 144 + Left = 8 + Top = 0 end inherited ActionList1: TActionList + Left = 40 + Top = 0 inherited actMandarCorreoParticular: TAction Category = 'Correos' end @@ -375,4 +420,8 @@ inherited frViewCliente: TfrViewCliente OnExecute = actBloqueoClienteExecute end end + inherited ImageList1: TPngImageList + Left = 72 + Top = 0 + end end diff --git a/Source/Modulos/Contactos/Views/uViewCliente.pas b/Source/Modulos/Contactos/Views/uViewCliente.pas index aedb388e..b3c66f39 100644 --- a/Source/Modulos/Contactos/Views/uViewCliente.pas +++ b/Source/Modulos/Contactos/Views/uViewCliente.pas @@ -31,10 +31,9 @@ type actBloqueoCliente: TAction; dxLayoutControlContactoItem22: TdxLayoutItem; eCodigoAsignado: TcxDBTextEdit; + dxLayoutControlContactoGroup8: TdxLayoutGroup; dxLayoutControlContactoItem20: TdxLayoutItem; - Label1: TLabel; - dxLayoutControlContactoItem21: TdxLayoutItem; - cxDBCheckBox1: TcxDBCheckBox; + cbFelicitacion: TcxDBCheckBox; procedure cbGrupoClientePropertiesInitPopup(Sender: TObject); procedure cbGrupoClientePropertiesValidate(Sender: TObject; var DisplayValue: Variant; var ErrorText: TCaption; var Error: Boolean); diff --git a/Source/Modulos/Contactos/Views/uViewClientes.dfm b/Source/Modulos/Contactos/Views/uViewClientes.dfm index c4731211..db6ddf36 100644 --- a/Source/Modulos/Contactos/Views/uViewClientes.dfm +++ b/Source/Modulos/Contactos/Views/uViewClientes.dfm @@ -1,13 +1,13 @@ inherited frViewClientes: TfrViewClientes Width = 793 - Height = 592 + Height = 449 ExplicitWidth = 793 - ExplicitHeight = 592 + ExplicitHeight = 449 inherited cxGrid: TcxGrid Width = 793 - Height = 464 + Height = 321 ExplicitWidth = 793 - ExplicitHeight = 464 + ExplicitHeight = 321 inherited cxGridView: TcxGridDBTableView DataController.Summary.FooterSummaryItems = < item @@ -28,7 +28,28 @@ inherited frViewClientes: TfrViewClientes VisibleForCustomization = False Width = 22 end - object cxGridViewTiendaWeb: TcxGridDBColumn [2] + object cxGridViewFELICITACION: TcxGridDBColumn [2] + Caption = 'Felicitaci'#243'n' + DataBinding.FieldName = 'FELICITACION' + PropertiesClassName = 'TcxImageComboBoxProperties' + Properties.Images = GridPNGImageList + Properties.Items = < + item + Description = 'Mandar felicitacion' + ImageIndex = 3 + Value = 1 + end + item + Value = 0 + end> + Properties.ReadOnly = True + OnGetCellHint = cxGridViewFELICITACIONGetCellHint + BestFitMaxWidth = 22 + MinWidth = 22 + Options.HorzSizing = False + Width = 22 + end + object cxGridViewTiendaWeb: TcxGridDBColumn [3] Caption = 'Acceso a tienda web' DataBinding.FieldName = 'TIENDA_WEB' PropertiesClassName = 'TcxImageComboBoxProperties' @@ -48,7 +69,7 @@ inherited frViewClientes: TfrViewClientes VisibleForCustomization = False Width = 22 end - object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn [6] + object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn [7] DataBinding.FieldName = 'NOMBRE_COMERCIAL' BestFitMaxWidth = 90 Width = 164 @@ -80,24 +101,22 @@ inherited frViewClientes: TfrViewClientes Width = 154 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 258 + Left = 223 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 258 + ExplicitLeft = 223 ExplicitWidth = 525 Width = 525 end inherited eLista: TcxComboBox - Left = 820 + Left = 705 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 820 - ExplicitWidth = 215 - Width = 215 + ExplicitLeft = 705 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel @@ -111,8 +130,8 @@ inherited frViewClientes: TfrViewClientes end end inherited pnlAgrupaciones: TTBXDockablePanel - Top = 566 - ExplicitTop = 566 + Top = 423 + ExplicitTop = 423 ExplicitWidth = 793 inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 793 @@ -375,6 +394,21 @@ inherited frViewClientes: TfrViewClientes 49454E44AE426082} Name = 'PngImage2' Background = clWindow + end + item + PngImage.Data = { + 89504E470D0A1A0A0000000D49484452000000100000001008060000001FF3FF + 610000000970485973000017120000171201679FD252000000DA4944415478DA + 63FCFFFF3F03258091620356EF3C4F9109600342DC0C082AFCF5E72FC3EFDF40 + 0CA47FFD86B07DE32B1106FCACF4842B666FDF8E55F3FB0A0706711375864727 + 2E326CB7686398B77413611720DB3C31C29AA12A429F7803D09DFDB9D60E2E47 + D0006C7E06B3A1E2FB8F5FC06E80E3CC9B585D33DF4714C5D023A72F631AF0F7 + DF7FB0E4DFBFFF70DA0C133F75E11AAA0130CD9EF3EF6275C114677E1443CF5F + BD893020D0451F2AF907D5DF7FFEA188832D81CA5FB9790761808F830EC39C95 + 7B484E857003DAFA66919E86A180F2CC44A90100C02F10E6EECAFFF800000000 + 49454E44AE426082} + Name = 'PngImage3' + Background = clWindow end> Bitmap = {} end diff --git a/Source/Modulos/Contactos/Views/uViewClientes.pas b/Source/Modulos/Contactos/Views/uViewClientes.pas index a4367726..f1d0d4ef 100644 --- a/Source/Modulos/Contactos/Views/uViewClientes.pas +++ b/Source/Modulos/Contactos/Views/uViewClientes.pas @@ -14,7 +14,7 @@ uses dxPScxCommon, cxImageComboBox, cxGridCustomPopupMenu, cxGridPopupMenu, dxPScxGrid6Lnk, ExtCtrls, JvComponentBase, JvBalloonHint, JvHint, uViewFiltroBase, dxPgsDlg, TB2Item, TBX, TB2Toolbar, TBXDkPanels, TB2Dock, - uDAInterfaces, cxTextEdit, Menus; + uDAInterfaces, cxTextEdit, Menus, uCustomView, uViewBase; type IViewClientes = interface(IViewContactos) @@ -25,10 +25,15 @@ type cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn; cxGridViewBLOQUEADO: TcxGridDBColumn; cxGridViewTiendaWeb: TcxGridDBColumn; + cxGridViewFELICITACION: TcxGridDBColumn; procedure cxGridViewICONOGetCellHint(Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord; ACellViewInfo: TcxGridTableDataCellViewInfo; const AMousePos: TPoint; var AHintText: TCaption; var AIsHintMultiLine: Boolean; var AHintTextRect: TRect); + procedure cxGridViewFELICITACIONGetCellHint(Sender: TcxCustomGridTableItem; + ARecord: TcxCustomGridRecord; ACellViewInfo: TcxGridTableDataCellViewInfo; + const AMousePos: TPoint; var AHintText: TCaption; + var AIsHintMultiLine: Boolean; var AHintTextRect: TRect); end; @@ -40,6 +45,17 @@ uses uViewGridBase; {$R *.dfm} +procedure TfrViewClientes.cxGridViewFELICITACIONGetCellHint( + Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord; + ACellViewInfo: TcxGridTableDataCellViewInfo; const AMousePos: TPoint; + var AHintText: TCaption; var AIsHintMultiLine: Boolean; + var AHintTextRect: TRect); +begin + inherited; + if (cxGridView.DataController.DisplayTexts[ARecord.Index, cxGridViewFELICITACION.Index] = '1') then + AHintText := 'Enviar felicitación navideña'; +end; + procedure TfrViewClientes.cxGridViewICONOGetCellHint( Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord; ACellViewInfo: TcxGridTableDataCellViewInfo; const AMousePos: TPoint; diff --git a/Source/Modulos/Contactos/Views/uViewContactos.dfm b/Source/Modulos/Contactos/Views/uViewContactos.dfm index a3a4bd1e..ca86f4eb 100644 --- a/Source/Modulos/Contactos/Views/uViewContactos.dfm +++ b/Source/Modulos/Contactos/Views/uViewContactos.dfm @@ -6,7 +6,6 @@ inherited frViewContactos: TfrViewContactos inherited cxGrid: TcxGrid Width = 557 Height = 330 - ExplicitTop = 102 ExplicitWidth = 557 ExplicitHeight = 330 inherited cxGridView: TcxGridDBTableView @@ -123,15 +122,21 @@ inherited frViewContactos: TfrViewContactos Width = 121 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 225 + Left = 161 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 225 + ExplicitLeft = 161 ExplicitWidth = 322 Width = 322 end + inherited eLista: TcxComboBox + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 557 diff --git a/Source/Modulos/Contactos/Views/uViewContactos.pas b/Source/Modulos/Contactos/Views/uViewContactos.pas index 44f8dcaf..6903893c 100644 --- a/Source/Modulos/Contactos/Views/uViewContactos.pas +++ b/Source/Modulos/Contactos/Views/uViewContactos.pas @@ -14,7 +14,7 @@ uses dxPSEdgePatterns, cxIntlPrintSys3, dxPSCore, dxPScxCommon, uDataModuleClientes, cxGridCustomPopupMenu, cxGridPopupMenu, uViewFiltroBase, ComCtrls, TB2Item, TBX, TB2Toolbar, dxPgsDlg, dxPScxGrid6Lnk, uDAInterfaces, TBXDkPanels, - TB2Dock; + TB2Dock, uCustomView, uViewBase; type IViewContactos = interface(IViewGrid) diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 182a83e9..ad8e8b78 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index 2cd01239..90151021 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -108,8 +108,6 @@ uses schAlbaranesClienteServer_Intf in '..\Modulos\Albaranes de cliente\Model\schAlbaranesClienteServer_Intf.pas', schUsuariosClient_Intf in '..\ApplicationBase\Usuarios\Model\schUsuariosClient_Intf.pas', schUsuariosServer_Intf in '..\ApplicationBase\Usuarios\Model\schUsuariosServer_Intf.pas', - schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas', - schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas', srvGestorInformes_Impl in '..\Modulos\Gestor de informes\Servidor\srvGestorInformes_Impl.pas' {srvGestorInformes: TDataAbstractService}, schObrasClient_Intf in '..\Modulos\Obras\Model\schObrasClient_Intf.pas', schObrasServer_Intf in '..\Modulos\Obras\Model\schObrasServer_Intf.pas', @@ -135,7 +133,9 @@ uses schAlbaranesProveedorClient_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorClient_Intf.pas', schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas', schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas', - schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas'; + schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_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} diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index ba3be1ca..3ee90f31 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -35,7 +35,7 @@ Delphi.Personality - FalseTrueFalse/standaloneTrueFalse1780FalseFalseFalseFalseFalse308212521.7.8.01.7.8.0martes, 01 de septiembre de 2009 18:11 + FalseTrueFalse/standaloneTrueFalse1780FalseFalseFalseFalseFalse308212521.7.8.01.7.8.0miércoles, 18 de noviembre de 2009 10:47 ExpressPrinting System by Developer Express Inc. FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 6e071dcb..55ee2251 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -14,7 +14,7 @@ BEGIN BEGIN VALUE "FileVersion", "1.7.8.0\0" VALUE "ProductVersion", "1.7.8.0\0" - VALUE "CompileDate", "miércoles, 23 de septiembre de 2009 10:14\0" + VALUE "CompileDate", "jueves, 19 de noviembre de 2009 13:03\0" END END BLOCK "VarFileInfo"