From d3c5abed0ae91aef20de52fcd28cd7bff5d465fe Mon Sep 17 00:00:00 2001 From: david Date: Thu, 23 Jan 2014 17:52:29 +0000 Subject: [PATCH] =?UTF-8?q?Tarea=20#1307=20->=20A=C3=B1adir=20a=20la=20fic?= =?UTF-8?q?ha=20de=20proveedor=20un=20campo=20de=20'fecha=20de=20alta'=20m?= =?UTF-8?q?odificable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@1086 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- Database/scripts/factuges.sql | 10 +- Source/Cliente/FactuGES.dproj | 2 +- Source/Cliente/FactuGES.rc | 8 +- Source/Cliente/FactuGES.res | Bin 171984 -> 171984 bytes .../Contactos/Data/uDataModuleProveedores.dfm | 15 ++ .../Model/schContactosClient_Intf.pas | 91 ++++--- .../Model/schContactosServer_Intf.pas | 99 +++++--- .../Modulos/Contactos/Model/uBizContactos.pas | 21 +- .../Contactos/Model/uBizProveedoresServer.pas | 4 +- .../Contactos/Servidor/srvContactos_Impl.dfm | 57 ++++- .../Modulos/Contactos/Views/uViewEmpleado.dfm | 118 +++++++-- .../Contactos/Views/uViewProveedor.dfm | 224 ++++++++++-------- .../Contactos/Views/uViewProveedor.pas | 5 +- Source/Servidor/FactuGES_Server.RES | Bin 23216 -> 23340 bytes Source/Servidor/FactuGES_Server.dpr | 6 +- Source/Servidor/FactuGES_Server.dproj | 2 +- Source/Servidor/FactuGES_Server.rc | 4 +- 17 files changed, 465 insertions(+), 201 deletions(-) diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql index a7da7d63..3aedcfc8 100644 --- a/Database/scripts/factuges.sql +++ b/Database/scripts/factuges.sql @@ -1083,7 +1083,8 @@ CREATE TABLE PROVEEDORES_DATOS ( VENCIMIENTO_FACTURAS_1 SMALLINT, VENCIMIENTO_FACTURAS_2 SMALLINT, VENCIMIENTO_FACTURAS_3 SMALLINT, - FELICITACION TIPO_BOOLEANO /* TIPO_BOOLEANO = SMALLINT */ + FELICITACION TIPO_BOOLEANO, /* TIPO_BOOLEANO = SMALLINT */ + FECHA_INGRESO DATE ); CREATE TABLE PROVEEDORES_GRUPOS ( @@ -3152,7 +3153,8 @@ CREATE VIEW V_PROVEEDORES( VENCIMIENTO_FACTURAS_1, VENCIMIENTO_FACTURAS_2, VENCIMIENTO_FACTURAS_3, - FELICITACION) + FELICITACION, + FECHA_INGRESO) AS SELECT V_CONTACTOS.ID, @@ -3192,7 +3194,8 @@ SELECT PROVEEDORES_DATOS.VENCIMIENTO_FACTURAS_1, PROVEEDORES_DATOS.VENCIMIENTO_FACTURAS_2, PROVEEDORES_DATOS.VENCIMIENTO_FACTURAS_3, - PROVEEDORES_DATOS.FELICITACION + PROVEEDORES_DATOS.FELICITACION, + PROVEEDORES_DATOS.FECHA_INGRESO FROM V_CONTACTOS @@ -3202,7 +3205,6 @@ WHERE ; - /* View: V_REC_CLI_COMPENSADOS */ CREATE VIEW V_REC_CLI_COMPENSADOS( ID_RECIBO, diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 4a332c94..747678bb 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\TrueFalse2030FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.0.3.0FactuGESFactuGES2.0.3.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2040FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.0.4.0FactuGESFactuGES2.0.4.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 3ee68e5d..d445ffb9 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 2,0,3,0 -PRODUCTVERSION 2,0,3,0 +FILEVERSION 2,0,4,0 +PRODUCTVERSION 2,0,4,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "2.0.3.0\0" + VALUE "FileVersion", "2.0.4.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "2.0.3.0\0" + VALUE "ProductVersion", "2.0.4.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 64f96b641e24f71f1547a653b581789e1f925d00..9868e7e2d1ead4d89f7c408bb65a9afb9a3b6876 100644 GIT binary patch delta 42 wcmcbxpX Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas index 53e30f91..0d38d629 100644 --- a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas +++ b/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 = '{7141B502-9B65-4785-979D-C2A757A00606}'; - RID_GruposCliente = '{39FA2C99-EFEF-44B7-8553-FE9ED7DC92CF}'; - RID_DatosBancarios = '{A0D6D787-49D2-4B26-97EE-28413D2805FF}'; - RID_Clientes = '{9E0E225C-DDDF-4236-BBE1-85D5F56F94D6}'; - RID_Proveedores = '{11258A53-A1EE-4D1F-AF6C-9EFB21815070}'; - RID_Empleados = '{80DC22F2-84E0-4B45-A5D1-A6D9EEE4FCC6}'; - RID_DireccionesContacto = '{D1F3FB34-E735-4EC2-9129-8C55B058F2A2}'; - RID_ClientesDescuentos = '{8CDF9F60-A25F-4078-8568-CA614F312FA6}'; - RID_GruposProveedor = '{8147AAA0-C069-44CB-BB0F-4B605AB30F24}'; - RID_GruposEmpleado = '{8ECBF0BC-7391-46C0-BA36-58130B4A1984}'; - RID_Contactos_Refresh = '{71DEEFA8-E2E2-4F41-82C2-A86578616408}'; - RID_ContratosEmpleados = '{3E5EF78A-26C9-4FBA-B425-D826B32C19DF}'; - RID_DescripcionesProveedores = '{15B20681-2870-4854-8D91-5E901B3F9F22}'; - RID_PersonalContacto = '{594ADB53-D0DD-446C-8BA7-D637F5FCFE43}'; + RID_Contactos = '{81A319E9-32CE-42C3-B1CF-7152A2504D04}'; + RID_GruposCliente = '{748DF5E6-9269-4A72-8743-9907E262184F}'; + RID_DatosBancarios = '{7FCCFBC2-8717-424E-8BC0-F5F3EA2856E1}'; + RID_Clientes = '{AA66B9FA-FBCD-4C5C-AB98-FC38BB903765}'; + RID_Proveedores = '{BCC3A934-DD3A-4AEA-84BB-8B90785EFB42}'; + RID_Empleados = '{F1F6952D-FA62-465D-A239-F3F5BB2E34B0}'; + RID_DireccionesContacto = '{F630FC1F-E130-41D5-BF5A-1B04E361E770}'; + RID_ClientesDescuentos = '{BCBF04E9-60F8-4257-8B46-378BB03E98BE}'; + RID_GruposProveedor = '{5BE25EB1-41D8-473C-8A87-21E3AE13D6CC}'; + RID_GruposEmpleado = '{95721FA1-5036-438F-8373-6319ED762CC3}'; + RID_Contactos_Refresh = '{0C8F4F56-3609-4F6E-B043-B2A6139052E5}'; + RID_ContratosEmpleados = '{9AFA6F82-CB30-4CD7-A61D-5559A9100F3D}'; + RID_DescripcionesProveedores = '{A991D8A3-0C8F-401D-90A5-8C3B022578CF}'; + RID_PersonalContacto = '{F8778328-6C26-4AB3-9676-3B6C6E376DB8}'; { Data table names } nme_Contactos = 'Contactos'; @@ -239,6 +239,7 @@ const fld_ProveedoresVENCIMIENTO_FACTURAS_2 = 'VENCIMIENTO_FACTURAS_2'; fld_ProveedoresVENCIMIENTO_FACTURAS_3 = 'VENCIMIENTO_FACTURAS_3'; fld_ProveedoresFELICITACION = 'FELICITACION'; + fld_ProveedoresFECHA_INGRESO = 'FECHA_INGRESO'; { Proveedores field indexes } idx_ProveedoresID = 0; @@ -279,6 +280,7 @@ const idx_ProveedoresVENCIMIENTO_FACTURAS_2 = 35; idx_ProveedoresVENCIMIENTO_FACTURAS_3 = 36; idx_ProveedoresFELICITACION = 37; + idx_ProveedoresFECHA_INGRESO = 38; { Empleados fields } fld_EmpleadosID = 'ID'; @@ -503,7 +505,7 @@ const type { IContactos } IContactos = interface(IDAStronglyTypedDataTable) - ['{F9DD576D-5B03-49DE-B1B2-E2461815C411}'] + ['{795E31BE-2803-47BF-94DB-8C826BD50D76}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -802,7 +804,7 @@ type { IGruposCliente } IGruposCliente = interface(IDAStronglyTypedDataTable) - ['{58878E47-599B-4AF5-8F97-6D3CBA83128D}'] + ['{87CD9F5E-ED73-46CA-9D1D-70E04F018328}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -849,7 +851,7 @@ type { IDatosBancarios } IDatosBancarios = interface(IDAStronglyTypedDataTable) - ['{D3B0316F-6237-413E-95D3-2ED6B0529584}'] + ['{3BF87686-B4CE-4E8D-837A-00C8FD215AA8}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -980,7 +982,7 @@ type { IClientes } IClientes = interface(IDAStronglyTypedDataTable) - ['{5CDD1282-A9AD-4BFA-BC69-8F0F63CC813A}'] + ['{0E0415EC-1EF5-48EE-B597-FBCFC8FB4146}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1459,7 +1461,7 @@ type { IProveedores } IProveedores = interface(IDAStronglyTypedDataTable) - ['{A23614AA-9504-455B-92D6-CFB8EBEE9B7B}'] + ['{5DBDBAED-001D-4F0E-A30B-ACBE55F7787C}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1612,6 +1614,10 @@ type procedure SetFELICITACIONValue(const aValue: SmallInt); function GetFELICITACIONIsNull: Boolean; procedure SetFELICITACIONIsNull(const aValue: Boolean); + function GetFECHA_INGRESOValue: DateTime; + procedure SetFECHA_INGRESOValue(const aValue: DateTime); + function GetFECHA_INGRESOIsNull: Boolean; + procedure SetFECHA_INGRESOIsNull(const aValue: Boolean); { Properties } @@ -1691,6 +1697,8 @@ type 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; + property FECHA_INGRESO: DateTime read GetFECHA_INGRESOValue write SetFECHA_INGRESOValue; + property FECHA_INGRESOIsNull: Boolean read GetFECHA_INGRESOIsNull write SetFECHA_INGRESOIsNull; end; { TProveedoresDataTableRules } @@ -1851,6 +1859,10 @@ type procedure SetFELICITACIONValue(const aValue: SmallInt); virtual; function GetFELICITACIONIsNull: Boolean; virtual; procedure SetFELICITACIONIsNull(const aValue: Boolean); virtual; + function GetFECHA_INGRESOValue: DateTime; virtual; + procedure SetFECHA_INGRESOValue(const aValue: DateTime); virtual; + function GetFECHA_INGRESOIsNull: Boolean; virtual; + procedure SetFECHA_INGRESOIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -1929,6 +1941,8 @@ type 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; + property FECHA_INGRESO: DateTime read GetFECHA_INGRESOValue write SetFECHA_INGRESOValue; + property FECHA_INGRESOIsNull: Boolean read GetFECHA_INGRESOIsNull write SetFECHA_INGRESOIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -1938,7 +1952,7 @@ type { IEmpleados } IEmpleados = interface(IDAStronglyTypedDataTable) - ['{51CB10E8-9304-4853-802E-D2C06BC32E9E}'] + ['{A2E61A13-58B5-45E4-A44D-70B842EE7AE7}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2369,7 +2383,7 @@ type { IDireccionesContacto } IDireccionesContacto = interface(IDAStronglyTypedDataTable) - ['{C44B4E25-498B-4106-BBDA-B4DEEA209B7C}'] + ['{1176AADF-9890-46D7-A71E-3D0E49BF787A}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2584,7 +2598,7 @@ type { IClientesDescuentos } IClientesDescuentos = interface(IDAStronglyTypedDataTable) - ['{8C316E4D-9D63-4252-92E2-110B2A2A39B5}'] + ['{2FBC2FDD-15ED-4B53-A36D-6909CFB76C46}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2667,7 +2681,7 @@ type { IGruposProveedor } IGruposProveedor = interface(IDAStronglyTypedDataTable) - ['{4913009E-F74C-47BC-9A91-EE5C1A50A9CA}'] + ['{1D37F1A0-D99B-4CE3-B04A-9A5B61AFB2EF}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2714,7 +2728,7 @@ type { IGruposEmpleado } IGruposEmpleado = interface(IDAStronglyTypedDataTable) - ['{3C1BD905-E66A-44E1-8B27-016826FD1904}'] + ['{E7B9C907-DC0F-4D59-97AB-658244CE36ED}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2761,7 +2775,7 @@ type { IContactos_Refresh } IContactos_Refresh = interface(IDAStronglyTypedDataTable) - ['{1662F8B8-376F-496A-A03F-59278E928467}'] + ['{4D484421-7F47-4678-AB0E-825B633392BB}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -3036,7 +3050,7 @@ type { IContratosEmpleados } IContratosEmpleados = interface(IDAStronglyTypedDataTable) - ['{0C862BE0-6492-4C78-9DAD-A55A6F921D42}'] + ['{C2E8F03A-48AE-43CF-971B-BD72FFA4B54C}'] { Property getters and setters } function GetCONTRATOValue: String; procedure SetCONTRATOValue(const aValue: String); @@ -3071,7 +3085,7 @@ type { IDescripcionesProveedores } IDescripcionesProveedores = interface(IDAStronglyTypedDataTable) - ['{5724E137-1CF1-4674-ACB1-B2DE2881A360}'] + ['{66FE1BD5-2B4A-401C-BDAF-979D86602A5E}'] { Property getters and setters } function GetDESCRIPCION_PROVEEDORValue: String; procedure SetDESCRIPCION_PROVEEDORValue(const aValue: String); @@ -3106,7 +3120,7 @@ type { IPersonalContacto } IPersonalContacto = interface(IDAStronglyTypedDataTable) - ['{EA400268-D6AE-47A9-A553-8978AF4D1A6A}'] + ['{7E175730-1E6E-4435-AD82-AD6241938A2E}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -5641,6 +5655,27 @@ begin DataTable.Fields[idx_ProveedoresFELICITACION].AsVariant := Null; end; +function TProveedoresDataTableRules.GetFECHA_INGRESOValue: DateTime; +begin + result := DataTable.Fields[idx_ProveedoresFECHA_INGRESO].AsDateTime; +end; + +procedure TProveedoresDataTableRules.SetFECHA_INGRESOValue(const aValue: DateTime); +begin + DataTable.Fields[idx_ProveedoresFECHA_INGRESO].AsDateTime := aValue; +end; + +function TProveedoresDataTableRules.GetFECHA_INGRESOIsNull: boolean; +begin + result := DataTable.Fields[idx_ProveedoresFECHA_INGRESO].IsNull; +end; + +procedure TProveedoresDataTableRules.SetFECHA_INGRESOIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ProveedoresFECHA_INGRESO].AsVariant := Null; +end; + { TEmpleadosDataTableRules } constructor TEmpleadosDataTableRules.Create(aDataTable: TDADataTable); diff --git a/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas b/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas index 0756a660..22137b00 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 = '{81517FFF-20E8-4465-BE0E-CB55E5890AFD}'; - RID_GruposClienteDelta = '{E7570DEB-D558-4E75-8E14-E4F58F5FB7FA}'; - RID_DatosBancariosDelta = '{59B4AA7D-975F-4255-B35B-8C0CB9608482}'; - RID_ClientesDelta = '{CA2D623A-76FF-473A-9B05-139388FCE5CE}'; - RID_ProveedoresDelta = '{2FE9FC09-1295-4D0A-AD70-CA92CA193E6B}'; - RID_EmpleadosDelta = '{29641F7D-F717-4FA7-AB7A-B84C1A1381D0}'; - RID_DireccionesContactoDelta = '{E659AD0F-82A8-45B2-81D8-775979642AB5}'; - RID_ClientesDescuentosDelta = '{DAB3D283-302B-4B22-A694-DAA3DE315CC7}'; - RID_GruposProveedorDelta = '{FF84FE1F-F7F0-492B-B0FF-33D4825D49B5}'; - RID_GruposEmpleadoDelta = '{0C7FA5EF-4E50-401A-97F4-FC1A72F2AA30}'; - RID_Contactos_RefreshDelta = '{E266652F-5500-452E-878A-E058FD97FCF8}'; - RID_ContratosEmpleadosDelta = '{EF4C6C08-21F1-4C07-A093-74CF2800F45C}'; - RID_DescripcionesProveedoresDelta = '{467A45CA-058D-42EB-B8DD-50541B75C176}'; - RID_PersonalContactoDelta = '{5BFD1443-6765-44EA-A185-DB73ADAD4A03}'; + RID_ContactosDelta = '{13484D11-0D60-43D3-A9D7-7FDE6A475326}'; + RID_GruposClienteDelta = '{260C98E9-8831-46BB-BC02-8A8FD3EBFDC8}'; + RID_DatosBancariosDelta = '{D37E3D21-436D-429A-BFD5-C008FD5F1026}'; + RID_ClientesDelta = '{E0FABA52-A1D2-4762-9228-A4C1B75A63CD}'; + RID_ProveedoresDelta = '{95BBBF6E-2266-49CE-9D70-AEB10279BCF1}'; + RID_EmpleadosDelta = '{546286BC-647C-44F4-9D35-3B664889DBF6}'; + RID_DireccionesContactoDelta = '{D5BE55B6-0A80-4D33-8909-7412A486A985}'; + RID_ClientesDescuentosDelta = '{C77A3BB3-C076-412E-BB6B-459110C91F1A}'; + RID_GruposProveedorDelta = '{6CBCEF66-F2C7-4E20-B06A-335D433C662E}'; + RID_GruposEmpleadoDelta = '{E1BDFF09-3B9D-4822-9B64-226FF0902CE5}'; + RID_Contactos_RefreshDelta = '{331FFCB0-68F9-41FF-BC21-292C60BDB1E1}'; + RID_ContratosEmpleadosDelta = '{1308007A-1199-4F43-9E85-7173D077005A}'; + RID_DescripcionesProveedoresDelta = '{FA426C9E-3ECF-446E-8D2F-9BA5189AA9DE}'; + RID_PersonalContactoDelta = '{2125A02B-BA0F-4C4B-93F9-3F9DDAB6058E}'; type { IContactosDelta } IContactosDelta = interface(IContactos) - ['{81517FFF-20E8-4465-BE0E-CB55E5890AFD}'] + ['{13484D11-0D60-43D3-A9D7-7FDE6A475326}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -326,7 +326,7 @@ type { IGruposClienteDelta } IGruposClienteDelta = interface(IGruposCliente) - ['{E7570DEB-D558-4E75-8E14-E4F58F5FB7FA}'] + ['{260C98E9-8831-46BB-BC02-8A8FD3EBFDC8}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -372,7 +372,7 @@ type { IDatosBancariosDelta } IDatosBancariosDelta = interface(IDatosBancarios) - ['{59B4AA7D-975F-4255-B35B-8C0CB9608482}'] + ['{D37E3D21-436D-429A-BFD5-C008FD5F1026}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -502,7 +502,7 @@ type { IClientesDelta } IClientesDelta = interface(IClientes) - ['{CA2D623A-76FF-473A-9B05-139388FCE5CE}'] + ['{E0FABA52-A1D2-4762-9228-A4C1B75A63CD}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -981,7 +981,7 @@ type { IProveedoresDelta } IProveedoresDelta = interface(IProveedores) - ['{2FE9FC09-1295-4D0A-AD70-CA92CA193E6B}'] + ['{95BBBF6E-2266-49CE-9D70-AEB10279BCF1}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -1021,6 +1021,7 @@ type function GetOldVENCIMIENTO_FACTURAS_2Value : SmallInt; function GetOldVENCIMIENTO_FACTURAS_3Value : SmallInt; function GetOldFELICITACIONValue : SmallInt; + function GetOldFECHA_INGRESOValue : DateTime; { Properties } property OldID : Integer read GetOldIDValue; @@ -1061,6 +1062,7 @@ type property OldVENCIMIENTO_FACTURAS_2 : SmallInt read GetOldVENCIMIENTO_FACTURAS_2Value; property OldVENCIMIENTO_FACTURAS_3 : SmallInt read GetOldVENCIMIENTO_FACTURAS_3Value; property OldFELICITACION : SmallInt read GetOldFELICITACIONValue; + property OldFECHA_INGRESO : DateTime read GetOldFECHA_INGRESOValue; end; { TProveedoresBusinessProcessorRules } @@ -1297,6 +1299,12 @@ type function GetOldFELICITACIONIsNull: Boolean; virtual; procedure SetFELICITACIONValue(const aValue: SmallInt); virtual; procedure SetFELICITACIONIsNull(const aValue: Boolean); virtual; + function GetFECHA_INGRESOValue: DateTime; virtual; + function GetFECHA_INGRESOIsNull: Boolean; virtual; + function GetOldFECHA_INGRESOValue: DateTime; virtual; + function GetOldFECHA_INGRESOIsNull: Boolean; virtual; + procedure SetFECHA_INGRESOValue(const aValue: DateTime); virtual; + procedure SetFECHA_INGRESOIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -1451,6 +1459,10 @@ type property FELICITACIONIsNull : Boolean read GetFELICITACIONIsNull write SetFELICITACIONIsNull; property OldFELICITACION : SmallInt read GetOldFELICITACIONValue; property OldFELICITACIONIsNull : Boolean read GetOldFELICITACIONIsNull; + property FECHA_INGRESO : DateTime read GetFECHA_INGRESOValue write SetFECHA_INGRESOValue; + property FECHA_INGRESOIsNull : Boolean read GetFECHA_INGRESOIsNull write SetFECHA_INGRESOIsNull; + property OldFECHA_INGRESO : DateTime read GetOldFECHA_INGRESOValue; + property OldFECHA_INGRESOIsNull : Boolean read GetOldFECHA_INGRESOIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -1460,7 +1472,7 @@ type { IEmpleadosDelta } IEmpleadosDelta = interface(IEmpleados) - ['{29641F7D-F717-4FA7-AB7A-B84C1A1381D0}'] + ['{546286BC-647C-44F4-9D35-3B664889DBF6}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -1895,7 +1907,7 @@ type { IDireccionesContactoDelta } IDireccionesContactoDelta = interface(IDireccionesContacto) - ['{E659AD0F-82A8-45B2-81D8-775979642AB5}'] + ['{D5BE55B6-0A80-4D33-8909-7412A486A985}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -2110,7 +2122,7 @@ type { IClientesDescuentosDelta } IClientesDescuentosDelta = interface(IClientesDescuentos) - ['{DAB3D283-302B-4B22-A694-DAA3DE315CC7}'] + ['{C77A3BB3-C076-412E-BB6B-459110C91F1A}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CLIENTEValue : Integer; @@ -2192,7 +2204,7 @@ type { IGruposProveedorDelta } IGruposProveedorDelta = interface(IGruposProveedor) - ['{FF84FE1F-F7F0-492B-B0FF-33D4825D49B5}'] + ['{6CBCEF66-F2C7-4E20-B06A-335D433C662E}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -2238,7 +2250,7 @@ type { IGruposEmpleadoDelta } IGruposEmpleadoDelta = interface(IGruposEmpleado) - ['{0C7FA5EF-4E50-401A-97F4-FC1A72F2AA30}'] + ['{E1BDFF09-3B9D-4822-9B64-226FF0902CE5}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -2284,7 +2296,7 @@ type { IContactos_RefreshDelta } IContactos_RefreshDelta = interface(IContactos_Refresh) - ['{E266652F-5500-452E-878A-E058FD97FCF8}'] + ['{331FFCB0-68F9-41FF-BC21-292C60BDB1E1}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldNIF_CIFValue : String; @@ -2559,7 +2571,7 @@ type { IContratosEmpleadosDelta } IContratosEmpleadosDelta = interface(IContratosEmpleados) - ['{EF4C6C08-21F1-4C07-A093-74CF2800F45C}'] + ['{1308007A-1199-4F43-9E85-7173D077005A}'] { Property getters and setters } function GetOldCONTRATOValue : String; @@ -2593,7 +2605,7 @@ type { IDescripcionesProveedoresDelta } IDescripcionesProveedoresDelta = interface(IDescripcionesProveedores) - ['{467A45CA-058D-42EB-B8DD-50541B75C176}'] + ['{FA426C9E-3ECF-446E-8D2F-9BA5189AA9DE}'] { Property getters and setters } function GetOldDESCRIPCION_PROVEEDORValue : String; @@ -2627,7 +2639,7 @@ type { IPersonalContactoDelta } IPersonalContactoDelta = interface(IPersonalContacto) - ['{5BFD1443-6765-44EA-A185-DB73ADAD4A03}'] + ['{2125A02B-BA0F-4C4B-93F9-3F9DDAB6058E}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -6265,6 +6277,37 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_ProveedoresFELICITACION] := Null; end; +function TProveedoresBusinessProcessorRules.GetFECHA_INGRESOValue: DateTime; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ProveedoresFECHA_INGRESO]; +end; + +function TProveedoresBusinessProcessorRules.GetFECHA_INGRESOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ProveedoresFECHA_INGRESO]); +end; + +function TProveedoresBusinessProcessorRules.GetOldFECHA_INGRESOValue: DateTime; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ProveedoresFECHA_INGRESO]; +end; + +function TProveedoresBusinessProcessorRules.GetOldFECHA_INGRESOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ProveedoresFECHA_INGRESO]); +end; + +procedure TProveedoresBusinessProcessorRules.SetFECHA_INGRESOValue(const aValue: DateTime); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ProveedoresFECHA_INGRESO] := aValue; +end; + +procedure TProveedoresBusinessProcessorRules.SetFECHA_INGRESOIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ProveedoresFECHA_INGRESO] := Null; +end; + { TEmpleadosBusinessProcessorRules } constructor TEmpleadosBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); diff --git a/Source/Modulos/Contactos/Model/uBizContactos.pas b/Source/Modulos/Contactos/Model/uBizContactos.pas index c0108aca..35981103 100644 --- a/Source/Modulos/Contactos/Model/uBizContactos.pas +++ b/Source/Modulos/Contactos/Model/uBizContactos.pas @@ -159,6 +159,9 @@ type function GetFELICITACIONValue: Integer; procedure SetFELICITACIONValue(const aValue: Integer); + function GetFECHA_INGRESOValue: TDateTime; + procedure SetFECHA_INGRESOValue(const aValue: TDateTime); + 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; @@ -174,6 +177,7 @@ type 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; + property FECHA_INGRESO: TDateTime read GetFECHA_INGRESOValue write SetFECHA_INGRESOValue; end; IBizEmpleado = interface (IBizContacto) @@ -384,6 +388,9 @@ type function GetFELICITACIONValue: Integer; procedure SetFELICITACIONValue(const aValue: Integer); + function GetFECHA_INGRESOValue: TDateTime; + procedure SetFECHA_INGRESOValue(const aValue: TDateTime); + public procedure IniciarValoresContactoNuevo; override; property DESCUENTO: Float read GetDESCUENTOValue write SetDESCUENTOValue; @@ -401,6 +408,7 @@ type 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; + property FECHA_INGRESO: TDateTime read GetFECHA_INGRESOValue write SetFECHA_INGRESOValue; end; @@ -788,7 +796,8 @@ 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; + FELICITACION := 0; + FECHA_INGRESO := DateOf(Now); end; function TBizProveedor.GetCERTIFICACIONValue: String; @@ -811,6 +820,11 @@ begin result := DataTable.Fields[idx_ProveedoresDESCUENTO].AsFloat; end; +function TBizProveedor.GetFECHA_INGRESOValue: TDateTime; +begin + result := DataTable.Fields[idx_ProveedoresFECHA_INGRESO].AsDateTime; +end; + function TBizProveedor.GetFELICITACIONValue: Integer; begin result := DataTable.Fields[idx_ProveedoresFELICITACION].AsInteger; @@ -836,6 +850,11 @@ begin DataTable.Fields[idx_ProveedoresDESCUENTO].AsFloat := aValue; end; +procedure TBizProveedor.SetFECHA_INGRESOValue(const aValue: TDateTime); +begin + DataTable.Fields[idx_ProveedoresFECHA_INGRESO].AsDateTime := aValue; +end; + procedure TBizProveedor.SetFELICITACIONValue(const aValue: Integer); begin DataTable.Fields[idx_ProveedoresFELICITACION].AsInteger := aValue; diff --git a/Source/Modulos/Contactos/Model/uBizProveedoresServer.pas b/Source/Modulos/Contactos/Model/uBizProveedoresServer.pas index 50c13de7..b92eb4d5 100644 --- a/Source/Modulos/Contactos/Model/uBizProveedoresServer.pas +++ b/Source/Modulos/Contactos/Model/uBizProveedoresServer.pas @@ -95,7 +95,7 @@ begin 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]; - + ParamByName('FECHA_INGRESO').Value := aChange.NewValueByName[fld_ProveedoresFECHA_INGRESO]; Execute; end; finally @@ -136,7 +136,7 @@ begin 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]; - + ParamByName('FECHA_INGRESO').Value := aChange.NewValueByName[fld_ProveedoresFECHA_INGRESO]; Execute; end; finally diff --git a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm index 75e9af64..d4c38be3 100644 --- a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm +++ b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm @@ -1121,18 +1121,27 @@ object srvContactos: TsrvContactos item Name = 'VENCIMIENTO_FACTURAS_1' DataType = datSmallInt + DictionaryEntry = 'Proveedores_VENCIMIENTO_FACTURAS_1' end item Name = 'VENCIMIENTO_FACTURAS_2' DataType = datSmallInt + DictionaryEntry = 'Proveedores_VENCIMIENTO_FACTURAS_2' end item Name = 'VENCIMIENTO_FACTURAS_3' DataType = datSmallInt + DictionaryEntry = 'Proveedores_VENCIMIENTO_FACTURAS_3' end item Name = 'FELICITACION' DataType = datSmallInt + DictionaryEntry = 'Proveedores_FELICITACION' + end + item + Name = 'FECHA_INGRESO' + DataType = datDateTime + DictionaryEntry = 'Proveedores_FECHA_INGRESO' end> end item @@ -3001,6 +3010,11 @@ object srvContactos: TsrvContactos end item Params = < + item + Name = 'FECHA_INGRESO' + DataType = datDateTime + Value = '' + end item Name = 'ID_PROVEEDOR' DataType = datInteger @@ -3095,12 +3109,13 @@ 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' FELICITACION)'#10' VALU' + - 'ES'#10' (:ID_PROVEEDOR, :REGIMEN_IVA, :DESCUENTO, :DESCRIPCION_PR' + - 'OVEEDOR,'#10' :CODIGO_ASIGNADO, :ID_TIPO_IVA, :SUBCONTRATA, :ID_F' + - 'ORMA_PAGO, :TIENDA_WEB,'#10' :HOMOLOGADO, :CERTIFICACION, :GRUPO_' + - 'PROVEEDOR,'#10' :VENCIMIENTO_FACTURAS_1, :VENCIMIENTO_FACTURAS_2,' + - ' :VENCIMIENTO_FACTURAS_3,'#10' :FELICITACION)'#10 + 'NTO_FACTURAS_2, VENCIMIENTO_FACTURAS_3,'#10' FELICITACION, FECHA_' + + 'INGRESO)'#10' VALUES'#10' (:ID_PROVEEDOR, :REGIMEN_IVA, :DESCUENTO, ' + + ':DESCRIPCION_PROVEEDOR,'#10' :CODIGO_ASIGNADO, :ID_TIPO_IVA, :SUB' + + 'CONTRATA, :ID_FORMA_PAGO, :TIENDA_WEB,'#10' :HOMOLOGADO, :CERTIFI' + + 'CACION, :GRUPO_PROVEEDOR,'#10' :VENCIMIENTO_FACTURAS_1, :VENCIMIE' + + 'NTO_FACTURAS_2, :VENCIMIENTO_FACTURAS_3,'#10' :FELICITACION, :FEC' + + 'HA_INGRESO)'#10 StatementType = stSQL ColumnMappings = <> end> @@ -3128,6 +3143,11 @@ object srvContactos: TsrvContactos end item Params = < + item + Name = 'FECHA_INGRESO' + DataType = datDateTime + Value = '' + end item Name = 'ID_PROVEEDOR' DataType = datInteger @@ -3232,7 +3252,8 @@ object srvContactos: TsrvContactos 'TRATA,'#10' VENCIMIENTO_FACTURAS_1 = :VENCIMIENTO_FACTURAS_1,'#10' ' + ' VENCIMIENTO_FACTURAS_2 = :VENCIMIENTO_FACTURAS_2,'#10' VENCIMIEN' + 'TO_FACTURAS_3 = :VENCIMIENTO_FACTURAS_3,'#10' FELICITACION = :FEL' + - 'ICITACION'#10' WHERE'#10' (ID_PROVEEDOR = :OLD_ID_PROVEEDOR)'#10 + 'ICITACION,'#10' FECHA_INGRESO = :FECHA_INGRESO'#10' WHERE'#10' (ID_PR' + + 'OVEEDOR = :OLD_ID_PROVEEDOR)'#10 StatementType = stSQL ColumnMappings = <> end> @@ -4819,6 +4840,28 @@ object srvContactos: TsrvContactos item Name = 'PersonalContacto_FECHA_MODIFICACION' DataType = datDateTime + end + item + Name = 'Proveedores_FECHA_INGRESO' + DataType = datDateTime + DisplayLabel = 'Fecha de alta' + Alignment = taRightJustify + end + item + Name = 'Proveedores_VENCIMIENTO_FACTURAS_1' + DataType = datSmallInt + end + item + Name = 'Proveedores_VENCIMIENTO_FACTURAS_2' + DataType = datSmallInt + end + item + Name = 'Proveedores_VENCIMIENTO_FACTURAS_3' + DataType = datSmallInt + end + item + Name = 'Proveedores_FELICITACION' + DataType = datSmallInt end> Left = 126 Top = 14 diff --git a/Source/Modulos/Contactos/Views/uViewEmpleado.dfm b/Source/Modulos/Contactos/Views/uViewEmpleado.dfm index 97a2baeb..02c11258 100644 --- a/Source/Modulos/Contactos/Views/uViewEmpleado.dfm +++ b/Source/Modulos/Contactos/Views/uViewEmpleado.dfm @@ -25,6 +25,10 @@ inherited frViewEmpleado: TfrViewEmpleado inherited eCalle: TcxDBTextEdit Left = 121 Top = 247 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 8 ExplicitLeft = 121 ExplicitTop = 247 @@ -34,6 +38,10 @@ inherited frViewEmpleado: TfrViewEmpleado inherited cbProvincia: TcxDBComboBox Left = 121 Top = 274 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 9 ExplicitLeft = 121 ExplicitTop = 274 @@ -43,6 +51,10 @@ inherited frViewEmpleado: TfrViewEmpleado inherited cbPoblacion: TcxDBComboBox Left = 121 Top = 301 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 11 ExplicitLeft = 121 ExplicitTop = 301 @@ -52,12 +64,20 @@ inherited frViewEmpleado: TfrViewEmpleado inherited eCodigoPostal: TcxDBTextEdit Left = 285 Top = 274 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 10 ExplicitLeft = 285 ExplicitTop = 274 end inherited eObservaciones: TcxDBMemo Top = 385 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 22 ExplicitTop = 385 ExplicitWidth = 629 @@ -167,6 +187,10 @@ inherited frViewEmpleado: TfrViewEmpleado end inherited eTlfParticular: TcxDBTextEdit Left = 475 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 14 ExplicitLeft = 475 ExplicitWidth = 166 @@ -174,6 +198,10 @@ inherited frViewEmpleado: TfrViewEmpleado end inherited eTlfTrabajo: TcxDBTextEdit Left = 475 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 13 ExplicitLeft = 475 ExplicitWidth = 166 @@ -181,6 +209,10 @@ inherited frViewEmpleado: TfrViewEmpleado end inherited eTlfMovil: TcxDBTextEdit Left = 475 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 15 ExplicitLeft = 475 ExplicitWidth = 166 @@ -188,6 +220,10 @@ inherited frViewEmpleado: TfrViewEmpleado end inherited eFax: TcxDBTextEdit Left = 475 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 16 ExplicitLeft = 475 ExplicitWidth = 166 @@ -195,12 +231,20 @@ inherited frViewEmpleado: TfrViewEmpleado end inherited eNombre: TcxDBTextEdit Left = 121 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 121 ExplicitWidth = 239 Width = 239 end inherited eNIFCIF: TcxDBTextEdit Left = 225 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 225 ExplicitWidth = 126 Width = 126 @@ -208,6 +252,10 @@ inherited frViewEmpleado: TfrViewEmpleado inherited eMailTrabajo: TcxDBHyperLinkEdit Left = 475 Properties.Prefix = 'mailto:' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 17 ExplicitLeft = 475 ExplicitWidth = 137 @@ -216,34 +264,16 @@ inherited frViewEmpleado: TfrViewEmpleado inherited eMailParticular: TcxDBHyperLinkEdit Left = 475 Properties.Prefix = 'mailto:' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' TabOrder = 18 ExplicitLeft = 475 ExplicitWidth = 137 Width = 137 end - inherited ePaginaWeb: TcxDBHyperLinkEdit - Left = 475 - TabOrder = 19 - ExplicitLeft = 475 - ExplicitWidth = 137 - Width = 137 - end - inherited eReferencia: TcxDBTextEdit - Left = 121 - ExplicitLeft = 121 - ExplicitWidth = 73 - Width = 73 - end - inherited ePersonaContacto: TcxDBTextEdit - Left = 121 - Top = 328 - TabOrder = 12 - ExplicitLeft = 121 - ExplicitTop = 328 - ExplicitWidth = 239 - Width = 239 - end - object eFechaBaja: TcxDBDateEdit [24] + object eFechaBaja: TcxDBDateEdit [21] Left = 121 Top = 163 DataBinding.DataField = 'FECHA_BAJA' @@ -260,7 +290,7 @@ inherited frViewEmpleado: TfrViewEmpleado TabOrder = 6 Width = 229 end - object eCausaBaja: TcxDBTextEdit [25] + object eCausaBaja: TcxDBTextEdit [22] Left = 121 Top = 190 DataBinding.DataField = 'CAUSA_BAJA' @@ -280,6 +310,40 @@ inherited frViewEmpleado: TfrViewEmpleado TabOrder = 7 Width = 229 end + inherited ePaginaWeb: TcxDBHyperLinkEdit + Left = 475 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 19 + ExplicitLeft = 475 + ExplicitWidth = 137 + Width = 137 + end + inherited eReferencia: TcxDBTextEdit + Left = 121 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 121 + ExplicitWidth = 73 + Width = 73 + end + inherited ePersonaContacto: TcxDBTextEdit + Left = 121 + Top = 328 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 12 + ExplicitLeft = 121 + ExplicitTop = 328 + ExplicitWidth = 239 + Width = 239 + end inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup inherited dxLayoutControlContactoGroup9: TdxLayoutGroup inherited dxLayoutControlContactoGroup4: TdxLayoutGroup @@ -365,4 +429,10 @@ inherited frViewEmpleado: TfrViewEmpleado Left = 32 Top = 80 end + inherited ActionList1: TActionList + Top = 168 + end + inherited ImageList1: TPngImageList + Top = 168 + end end diff --git a/Source/Modulos/Contactos/Views/uViewProveedor.dfm b/Source/Modulos/Contactos/Views/uViewProveedor.dfm index f5db58ad..ec4e1dae 100644 --- a/Source/Modulos/Contactos/Views/uViewProveedor.dfm +++ b/Source/Modulos/Contactos/Views/uViewProveedor.dfm @@ -39,7 +39,7 @@ inherited frViewProveedor: TfrViewProveedor StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 9 + TabOrder = 10 ExplicitLeft = 134 ExplicitTop = 277 ExplicitWidth = 330 @@ -52,7 +52,7 @@ inherited frViewProveedor: TfrViewProveedor StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 10 + TabOrder = 11 ExplicitLeft = 134 ExplicitTop = 304 end @@ -63,7 +63,7 @@ inherited frViewProveedor: TfrViewProveedor StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 12 + TabOrder = 13 ExplicitLeft = 134 ExplicitTop = 331 end @@ -74,7 +74,7 @@ inherited frViewProveedor: TfrViewProveedor StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 11 + TabOrder = 12 ExplicitLeft = 361 ExplicitTop = 304 end @@ -84,7 +84,7 @@ inherited frViewProveedor: TfrViewProveedor StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 23 + TabOrder = 24 ExplicitTop = 415 ExplicitHeight = 20 Height = 20 @@ -110,7 +110,7 @@ inherited frViewProveedor: TfrViewProveedor StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 7 + TabOrder = 8 Width = 442 end object eCertificaciones: TcxDBTextEdit [10] @@ -129,7 +129,7 @@ inherited frViewProveedor: TfrViewProveedor StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 8 + TabOrder = 9 Width = 330 end object cbGrupoProveedor: TcxDBComboBox [11] @@ -153,7 +153,7 @@ inherited frViewProveedor: TfrViewProveedor StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 5 + TabOrder = 6 Width = 241 end object cbDescripcionProveedor: TcxDBComboBox [12] @@ -197,31 +197,9 @@ inherited frViewProveedor: TfrViewProveedor StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True TabOrder = 4 - Width = 330 + Width = 99 end - inherited eTlfParticular: TcxDBTextEdit - Left = 551 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 15 - ExplicitLeft = 551 - ExplicitWidth = 171 - Width = 171 - end - inherited eTlfTrabajo: TcxDBTextEdit - Left = 551 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 14 - ExplicitLeft = 551 - ExplicitWidth = 171 - Width = 171 - end - object cxDBCheckBox3: TcxDBCheckBox [16] + object cxDBCheckBox3: TcxDBCheckBox [14] Left = 343 Top = 136 Caption = 'Subcontrata' @@ -242,42 +220,10 @@ inherited frViewProveedor: TfrViewProveedor StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 6 + TabOrder = 7 Width = 83 end - inherited eTlfMovil: TcxDBTextEdit - Left = 551 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 16 - ExplicitLeft = 551 - ExplicitWidth = 171 - Width = 171 - end - inherited eFax: TcxDBTextEdit - Left = 551 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 17 - 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 - object cxDBCheckBox1: TcxDBCheckBox [20] + object cxDBCheckBox1: TcxDBCheckBox [15] Left = 444 Top = 294 Caption = 'Incluir este proveedor en la tienda web' @@ -299,44 +245,32 @@ inherited frViewProveedor: TfrViewProveedor StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 21 - Width = 236 + TabOrder = 22 + Width = 253 end - inherited eNIFCIF: TcxDBTextEdit - Left = 224 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 224 - ExplicitWidth = 226 - Width = 226 - end - inherited eMailTrabajo: TcxDBHyperLinkEdit + inherited eTlfParticular: TcxDBTextEdit Left = 551 - Properties.Prefix = 'mailto:' Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 18 + TabOrder = 16 ExplicitLeft = 551 - ExplicitWidth = 142 - Width = 142 + ExplicitWidth = 171 + Width = 171 end - inherited eMailParticular: TcxDBHyperLinkEdit + inherited eTlfTrabajo: TcxDBTextEdit Left = 551 - Properties.Prefix = 'mailto:' Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 19 + TabOrder = 15 ExplicitLeft = 551 - ExplicitWidth = 142 - Width = 142 + ExplicitWidth = 171 + Width = 171 end - object cbFelicitacion: TcxDBCheckBox [24] + object cbFelicitacion: TcxDBCheckBox [18] Left = 456 Top = 339 Caption = 'Mandar felicitaci'#243'n navide'#241'a a este proveedor' @@ -357,16 +291,99 @@ inherited frViewProveedor: TfrViewProveedor StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 22 + TabOrder = 23 Width = 352 end + inherited eTlfMovil: TcxDBTextEdit + Left = 551 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 17 + ExplicitLeft = 551 + ExplicitWidth = 171 + Width = 171 + end + inherited eFax: TcxDBTextEdit + Left = 551 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 18 + 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 + Left = 224 + Style.LookAndFeel.SkinName = '' + 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 = 19 + ExplicitLeft = 551 + ExplicitWidth = 142 + Width = 142 + end + inherited eMailParticular: TcxDBHyperLinkEdit + Left = 551 + Properties.Prefix = 'mailto:' + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 20 + ExplicitLeft = 551 + ExplicitWidth = 142 + Width = 142 + end + object eFechaIngreso: TcxDBDateEdit [25] + Left = 307 + Top = 109 + DataBinding.DataField = 'FECHA_INGRESO' + DataBinding.DataSource = dsContacto + Style.BorderColor = clWindowFrame + Style.BorderStyle = ebs3D + Style.HotTrack = False + Style.LookAndFeel.NativeStyle = True + Style.ButtonStyle = bts3D + Style.PopupBorderStyle = epbsFrame3D + StyleDisabled.LookAndFeel.NativeStyle = True + StyleFocused.LookAndFeel.NativeStyle = True + StyleHot.LookAndFeel.NativeStyle = True + TabOrder = 5 + Width = 124 + end inherited ePaginaWeb: TcxDBHyperLinkEdit Left = 551 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 20 + TabOrder = 21 ExplicitLeft = 551 ExplicitWidth = 142 Width = 142 @@ -388,7 +405,7 @@ inherited frViewProveedor: TfrViewProveedor StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 13 + TabOrder = 14 ExplicitLeft = 134 ExplicitTop = 358 ExplicitWidth = 330 @@ -403,10 +420,25 @@ inherited frViewProveedor: TfrViewProveedor Control = cbDescripcionProveedor ControlOptions.ShowBorder = False end - object dxLayoutControlContactoItem24: TdxLayoutItem - Caption = 'C'#243'digo de cliente:' - Control = eCodigoAsignado - ControlOptions.ShowBorder = False + object dxLayoutControlContactoGroup17: TdxLayoutGroup + ShowCaption = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControlContactoItem24: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'C'#243'digo de cliente:' + Control = eCodigoAsignado + ControlOptions.ShowBorder = False + end + object dxLayoutControlContactoItem28: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Fecha de alta:' + Control = eFechaIngreso + ControlOptions.ShowBorder = False + end end object dxLayoutControlContactoGroup15: TdxLayoutGroup ShowCaption = False diff --git a/Source/Modulos/Contactos/Views/uViewProveedor.pas b/Source/Modulos/Contactos/Views/uViewProveedor.pas index d8ce64c6..650033e3 100644 --- a/Source/Modulos/Contactos/Views/uViewProveedor.pas +++ b/Source/Modulos/Contactos/Views/uViewProveedor.pas @@ -8,7 +8,7 @@ uses dxLayoutControl, cxMemo, cxDBEdit, cxContainer, cxEdit, cxTextEdit, cxControls, cxMaskEdit, cxSpinEdit, ImgList, PngImageList, ActnList, cxHyperLinkEdit, Buttons, PngSpeedButton, StdCtrls, cxCheckBox, cxGraphics, cxDropDownEdit, - uGruposProveedorController, uDAInterfaces; + uGruposProveedorController, uDAInterfaces, cxCalendar; type IViewProveedor = interface(IViewContacto) @@ -37,6 +37,9 @@ type dxLayoutControlContactoItem27: TdxLayoutItem; cbFelicitacion: TcxDBCheckBox; dxLayoutControlContactoGroup8: TdxLayoutGroup; + dxLayoutControlContactoItem28: TdxLayoutItem; + eFechaIngreso: TcxDBDateEdit; + dxLayoutControlContactoGroup17: TdxLayoutGroup; procedure CustomViewCreate(Sender: TObject); procedure CustomViewDestroy(Sender: TObject); procedure cbGrupoProveedorPropertiesInitPopup(Sender: TObject); diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index fdfed707f1796b04dcec17573fd0dc6418b64d68..43e02426e0d5a1f35d80ab92268d1d6540a70b50 100644 GIT binary patch delta 258 zcmdn6m2u5B#tnBOm<*UE-;0m~QU4;M7$;1Qj8taIVVqnSDdy_IAi}`N;LMQEkjqfO zkjRk7P|4s2q;nZk89*QiD3b!@S1>3r1OwS=3?&TZKzQLo!e$vPo`0T_CYi26qNmpiYqPRG{iIhD@OPe1@XQ2P4gyQy7#c|BjS( z%mS)Q17z`OqfP6y+3kEBoTFc3qQSJc2 C?lnUI delta 138 zcmZ3pjd8hH0m&2~Ux6VHC{qShmCBIIkOWi-5`)MX Z0o55Y7z6o+3>FMl3`Ri6F!^beI{=W)BJuzL diff --git a/Source/Servidor/FactuGES_Server.dpr b/Source/Servidor/FactuGES_Server.dpr index 98faa8b1..45216db6 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -132,10 +132,10 @@ uses schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas', schArticulosClient_Intf in '..\Modulos\Articulos\Model\schArticulosClient_Intf.pas', schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas', - schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas', - schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_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} diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 24a9b914..4069a051 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -35,7 +35,7 @@ Delphi.Personality - FalseTrueFalse/standaloneTrueFalse2030FalseFalseFalseFalseFalse308212522.0.3.02.0.3.0miércoles, 06 de noviembre de 2013 13:14 + FalseTrueFalse/standaloneTrueFalse2030FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.0.3.0FactuGES Servidor2.0.4.0miércoles, 06 de noviembre de 2013 18:22 ExpressPrinting System by Developer Express Inc. FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index f1f1d149..6821aa4d 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -12,9 +12,11 @@ BEGIN BEGIN BLOCK "0C0A04E4" BEGIN + VALUE "CompanyName", "Rodax Software S.L.\0" VALUE "FileVersion", "2.0.3.0\0" + VALUE "ProductName", "FactuGES Servidor\0" VALUE "ProductVersion", "2.0.3.0\0" - VALUE "CompileDate", "miércoles, 06 de noviembre de 2013 18:22\0" + VALUE "CompileDate", "jueves, 23 de enero de 2014 18:39\0" END END BLOCK "VarFileInfo"