diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql index 815d4e2e..8c0378a6 100644 --- a/Database/scripts/factuges.sql +++ b/Database/scripts/factuges.sql @@ -465,7 +465,8 @@ CREATE TABLE CLIENTES_DATOS ( VENCIMIENTO_FACTURAS_1 SMALLINT, VENCIMIENTO_FACTURAS_2 SMALLINT, VENCIMIENTO_FACTURAS_3 SMALLINT, - FELICITACION TIPO_BOOLEANO + FELICITACION TIPO_BOOLEANO, + FECHA_INGRESO DATE ); CREATE TABLE CLIENTES_DTOS_PROVEEDORES ( @@ -1782,7 +1783,8 @@ CREATE VIEW V_CLIENTES( TIENDA_WEB, CODIGO_ASIGNADO, DESCUENTO, - FELICITACION) + FELICITACION, + FECHA_INGRESO) AS SELECT V_CONTACTOS.ID, @@ -1822,7 +1824,8 @@ SELECT CLIENTES_DATOS.TIENDA_WEB, CLIENTES_DATOS.CODIGO_ASIGNADO, CLIENTES_DATOS.DESCUENTO, - CLIENTES_DATOS.FELICITACION + CLIENTES_DATOS.FELICITACION, + CLIENTES_DATOS.FECHA_INGRESO FROM V_CONTACTOS LEFT OUTER JOIN CLIENTES_DATOS ON (V_CONTACTOS.ID = CLIENTES_DATOS.ID_CLIENTE) diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 459d7f68..6606704d 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\TrueFalse2060FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.0.6.0FactuGESFactuGES2.0.6.0FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse2070FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.0.7.0FactuGESFactuGES2.0.7.0FactuGES.dprFalse diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 941cf2b4..8a075229 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,6,0 -PRODUCTVERSION 2,0,6,0 +FILEVERSION 2,0,7,0 +PRODUCTVERSION 2,0,7,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.6.0\0" + VALUE "FileVersion", "2.0.7.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "2.0.6.0\0" + VALUE "ProductVersion", "2.0.7.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index b78f7037..796d1c37 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm b/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm index bc833b1f..ef81df40 100644 --- a/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm +++ b/Source/Modulos/Contactos/Data/uDataModuleClientes.dfm @@ -411,13 +411,17 @@ inherited DataModuleClientes: TDataModuleClientes end item Name = 'DESCUENTO' - DataType = datFloat + DataType = datCurrency end item Name = 'FELICITACION' DataType = datSmallInt DisplayLabel = #191'Felicitaci'#243'n?' DictionaryEntry = 'Clientes_FELICITACION' + end + item + Name = 'FECHA_INGRESO' + DataType = datDateTime end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas index 0d38d629..d5ecccb3 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 = '{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}'; + RID_Contactos = '{C78BACC1-F2BB-473F-A884-0C99A35D12C5}'; + RID_GruposCliente = '{1AF06554-3E62-440F-A3EA-98F6780C904D}'; + RID_DatosBancarios = '{0ABB73CA-0D88-45CA-8C6B-7DFB43186B29}'; + RID_Clientes = '{72136A7F-7375-469E-BC58-189DBEBFE6E5}'; + RID_Proveedores = '{A1937E85-EF1D-45DC-9BD2-61F434E4D923}'; + RID_Empleados = '{DF352049-627F-45E4-ADAC-F275C35851E2}'; + RID_DireccionesContacto = '{DDFBBB18-107D-4841-B71D-CB49A83364A5}'; + RID_ClientesDescuentos = '{367BEC69-5039-4C6A-BE86-30C5CDD10F30}'; + RID_GruposProveedor = '{4CBB39D3-9794-4CD6-9B4B-271AC297DEE6}'; + RID_GruposEmpleado = '{B94316A8-DB07-453D-B019-B9B7967C1003}'; + RID_Contactos_Refresh = '{A80834D1-B3BD-41A9-AF85-7C523BA328D0}'; + RID_ContratosEmpleados = '{2E4A61D9-2497-4300-AD40-9BBED3854C31}'; + RID_DescripcionesProveedores = '{086DFAF6-4C45-467E-96E2-174D8C397EDD}'; + RID_PersonalContacto = '{C75E2066-5FB7-406A-BA2C-C34CB8396A6F}'; { Data table names } nme_Contactos = 'Contactos'; @@ -159,6 +159,7 @@ const fld_ClientesCODIGO_ASIGNADO = 'CODIGO_ASIGNADO'; fld_ClientesDESCUENTO = 'DESCUENTO'; fld_ClientesFELICITACION = 'FELICITACION'; + fld_ClientesFECHA_INGRESO = 'FECHA_INGRESO'; { Clientes field indexes } idx_ClientesID = 0; @@ -199,6 +200,7 @@ const idx_ClientesCODIGO_ASIGNADO = 35; idx_ClientesDESCUENTO = 36; idx_ClientesFELICITACION = 37; + idx_ClientesFECHA_INGRESO = 38; { Proveedores fields } fld_ProveedoresID = 'ID'; @@ -505,7 +507,7 @@ const type { IContactos } IContactos = interface(IDAStronglyTypedDataTable) - ['{795E31BE-2803-47BF-94DB-8C826BD50D76}'] + ['{995253BD-DD00-467F-B013-9D7E899B0224}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -804,7 +806,7 @@ type { IGruposCliente } IGruposCliente = interface(IDAStronglyTypedDataTable) - ['{87CD9F5E-ED73-46CA-9D1D-70E04F018328}'] + ['{69643734-5A5A-4716-B5AD-269D1190306C}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -851,7 +853,7 @@ type { IDatosBancarios } IDatosBancarios = interface(IDAStronglyTypedDataTable) - ['{3BF87686-B4CE-4E8D-837A-00C8FD215AA8}'] + ['{B8BB890C-F529-4164-8C9F-8DBD0C27D973}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -982,7 +984,7 @@ type { IClientes } IClientes = interface(IDAStronglyTypedDataTable) - ['{0E0415EC-1EF5-48EE-B597-FBCFC8FB4146}'] + ['{B59AAFC5-4C46-43B8-ACB9-F4517154DF67}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1127,14 +1129,18 @@ type procedure SetCODIGO_ASIGNADOValue(const aValue: String); function GetCODIGO_ASIGNADOIsNull: Boolean; procedure SetCODIGO_ASIGNADOIsNull(const aValue: Boolean); - function GetDESCUENTOValue: Float; - procedure SetDESCUENTOValue(const aValue: Float); + function GetDESCUENTOValue: Currency; + procedure SetDESCUENTOValue(const aValue: Currency); function GetDESCUENTOIsNull: Boolean; procedure SetDESCUENTOIsNull(const aValue: Boolean); function GetFELICITACIONValue: SmallInt; 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 } @@ -1210,10 +1216,12 @@ type property TIENDA_WEBIsNull: Boolean read GetTIENDA_WEBIsNull write SetTIENDA_WEBIsNull; property CODIGO_ASIGNADO: String read GetCODIGO_ASIGNADOValue write SetCODIGO_ASIGNADOValue; property CODIGO_ASIGNADOIsNull: Boolean read GetCODIGO_ASIGNADOIsNull write SetCODIGO_ASIGNADOIsNull; - property DESCUENTO: Float read GetDESCUENTOValue write SetDESCUENTOValue; + property DESCUENTO: Currency 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; + property FECHA_INGRESO: DateTime read GetFECHA_INGRESOValue write SetFECHA_INGRESOValue; + property FECHA_INGRESOIsNull: Boolean read GetFECHA_INGRESOIsNull write SetFECHA_INGRESOIsNull; end; { TClientesDataTableRules } @@ -1366,14 +1374,18 @@ type procedure SetCODIGO_ASIGNADOValue(const aValue: String); virtual; function GetCODIGO_ASIGNADOIsNull: Boolean; virtual; procedure SetCODIGO_ASIGNADOIsNull(const aValue: Boolean); virtual; - function GetDESCUENTOValue: Float; virtual; - procedure SetDESCUENTOValue(const aValue: Float); virtual; + function GetDESCUENTOValue: Currency; virtual; + procedure SetDESCUENTOValue(const aValue: Currency); 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; + 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; @@ -1448,10 +1460,12 @@ type property TIENDA_WEBIsNull: Boolean read GetTIENDA_WEBIsNull write SetTIENDA_WEBIsNull; property CODIGO_ASIGNADO: String read GetCODIGO_ASIGNADOValue write SetCODIGO_ASIGNADOValue; property CODIGO_ASIGNADOIsNull: Boolean read GetCODIGO_ASIGNADOIsNull write SetCODIGO_ASIGNADOIsNull; - property DESCUENTO: Float read GetDESCUENTOValue write SetDESCUENTOValue; + property DESCUENTO: Currency 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; + 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; @@ -1461,7 +1475,7 @@ type { IProveedores } IProveedores = interface(IDAStronglyTypedDataTable) - ['{5DBDBAED-001D-4F0E-A30B-ACBE55F7787C}'] + ['{BC9D4BA3-7046-4B52-B4B9-12059B87077E}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1952,7 +1966,7 @@ type { IEmpleados } IEmpleados = interface(IDAStronglyTypedDataTable) - ['{A2E61A13-58B5-45E4-A44D-70B842EE7AE7}'] + ['{3E168A28-126B-4618-AF2D-47AEFEC9E931}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2383,7 +2397,7 @@ type { IDireccionesContacto } IDireccionesContacto = interface(IDAStronglyTypedDataTable) - ['{1176AADF-9890-46D7-A71E-3D0E49BF787A}'] + ['{B18EFEC9-A76C-45ED-B72B-35B71DE5AC74}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2598,7 +2612,7 @@ type { IClientesDescuentos } IClientesDescuentos = interface(IDAStronglyTypedDataTable) - ['{2FBC2FDD-15ED-4B53-A36D-6909CFB76C46}'] + ['{63059A24-808E-4593-8A3A-ACE892D9AAB8}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2681,7 +2695,7 @@ type { IGruposProveedor } IGruposProveedor = interface(IDAStronglyTypedDataTable) - ['{1D37F1A0-D99B-4CE3-B04A-9A5B61AFB2EF}'] + ['{A892C931-CECA-4710-A94D-9C781488453E}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2728,7 +2742,7 @@ type { IGruposEmpleado } IGruposEmpleado = interface(IDAStronglyTypedDataTable) - ['{E7B9C907-DC0F-4D59-97AB-658244CE36ED}'] + ['{6294A7B2-BD27-4C76-8F3B-1B5EA3C297BD}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2775,7 +2789,7 @@ type { IContactos_Refresh } IContactos_Refresh = interface(IDAStronglyTypedDataTable) - ['{4D484421-7F47-4678-AB0E-825B633392BB}'] + ['{81A9A821-0477-4BC1-A3ED-8E03C07B1426}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -3050,7 +3064,7 @@ type { IContratosEmpleados } IContratosEmpleados = interface(IDAStronglyTypedDataTable) - ['{C2E8F03A-48AE-43CF-971B-BD72FFA4B54C}'] + ['{1932323D-FE8C-44B4-BDB7-0457AEE5F4D9}'] { Property getters and setters } function GetCONTRATOValue: String; procedure SetCONTRATOValue(const aValue: String); @@ -3085,7 +3099,7 @@ type { IDescripcionesProveedores } IDescripcionesProveedores = interface(IDAStronglyTypedDataTable) - ['{66FE1BD5-2B4A-401C-BDAF-979D86602A5E}'] + ['{2589FD0E-6E35-4162-8772-7E2631F3E71A}'] { Property getters and setters } function GetDESCRIPCION_PROVEEDORValue: String; procedure SetDESCRIPCION_PROVEEDORValue(const aValue: String); @@ -3120,7 +3134,7 @@ type { IPersonalContacto } IPersonalContacto = interface(IDAStronglyTypedDataTable) - ['{7E175730-1E6E-4435-AD82-AD6241938A2E}'] + ['{7F089E93-7F99-423C-A934-C4EE7D453A9B}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -4796,14 +4810,14 @@ begin DataTable.Fields[idx_ClientesCODIGO_ASIGNADO].AsVariant := Null; end; -function TClientesDataTableRules.GetDESCUENTOValue: Float; +function TClientesDataTableRules.GetDESCUENTOValue: Currency; begin - result := DataTable.Fields[idx_ClientesDESCUENTO].AsFloat; + result := DataTable.Fields[idx_ClientesDESCUENTO].AsCurrency; end; -procedure TClientesDataTableRules.SetDESCUENTOValue(const aValue: Float); +procedure TClientesDataTableRules.SetDESCUENTOValue(const aValue: Currency); begin - DataTable.Fields[idx_ClientesDESCUENTO].AsFloat := aValue; + DataTable.Fields[idx_ClientesDESCUENTO].AsCurrency := aValue; end; function TClientesDataTableRules.GetDESCUENTOIsNull: boolean; @@ -4838,6 +4852,27 @@ begin DataTable.Fields[idx_ClientesFELICITACION].AsVariant := Null; end; +function TClientesDataTableRules.GetFECHA_INGRESOValue: DateTime; +begin + result := DataTable.Fields[idx_ClientesFECHA_INGRESO].AsDateTime; +end; + +procedure TClientesDataTableRules.SetFECHA_INGRESOValue(const aValue: DateTime); +begin + DataTable.Fields[idx_ClientesFECHA_INGRESO].AsDateTime := aValue; +end; + +function TClientesDataTableRules.GetFECHA_INGRESOIsNull: boolean; +begin + result := DataTable.Fields[idx_ClientesFECHA_INGRESO].IsNull; +end; + +procedure TClientesDataTableRules.SetFECHA_INGRESOIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ClientesFECHA_INGRESO].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 22137b00..c7e2a80d 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 = '{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}'; + RID_ContactosDelta = '{886E86A0-D4BF-4D1B-BD9D-44B85DF6DED6}'; + RID_GruposClienteDelta = '{822E5984-3550-48B6-96DF-464D42A68A54}'; + RID_DatosBancariosDelta = '{4656BA5E-4D68-49EE-9D4B-DF38FB57FBE7}'; + RID_ClientesDelta = '{8EC0A982-2CFE-4434-9CAB-12DBE4E8AE72}'; + RID_ProveedoresDelta = '{33EB3E3C-ECC8-442A-91BE-D9E401995049}'; + RID_EmpleadosDelta = '{B3390413-C227-499A-8298-D8B04E8D2E57}'; + RID_DireccionesContactoDelta = '{950070DE-22F7-48F3-B280-479D36251736}'; + RID_ClientesDescuentosDelta = '{CCD7FCFA-0A27-4E1D-8243-CAC24C626854}'; + RID_GruposProveedorDelta = '{016C3DFC-7F72-4722-9DF0-ED2A60C22D7A}'; + RID_GruposEmpleadoDelta = '{B525392E-6148-4638-884F-16976E0C7F19}'; + RID_Contactos_RefreshDelta = '{16A2B77E-BF46-4AF8-8D07-026A8BD18212}'; + RID_ContratosEmpleadosDelta = '{E0E1F72C-1FBB-47BC-B7DB-452A87582646}'; + RID_DescripcionesProveedoresDelta = '{BA1C3AFA-7305-44F0-A3A9-3CF71991DB93}'; + RID_PersonalContactoDelta = '{EE009FFC-8BA2-4A49-ACCE-4B7C0837427D}'; type { IContactosDelta } IContactosDelta = interface(IContactos) - ['{13484D11-0D60-43D3-A9D7-7FDE6A475326}'] + ['{886E86A0-D4BF-4D1B-BD9D-44B85DF6DED6}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -326,7 +326,7 @@ type { IGruposClienteDelta } IGruposClienteDelta = interface(IGruposCliente) - ['{260C98E9-8831-46BB-BC02-8A8FD3EBFDC8}'] + ['{822E5984-3550-48B6-96DF-464D42A68A54}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -372,7 +372,7 @@ type { IDatosBancariosDelta } IDatosBancariosDelta = interface(IDatosBancarios) - ['{D37E3D21-436D-429A-BFD5-C008FD5F1026}'] + ['{4656BA5E-4D68-49EE-9D4B-DF38FB57FBE7}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -502,7 +502,7 @@ type { IClientesDelta } IClientesDelta = interface(IClientes) - ['{E0FABA52-A1D2-4762-9228-A4C1B75A63CD}'] + ['{8EC0A982-2CFE-4434-9CAB-12DBE4E8AE72}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -540,8 +540,9 @@ type function GetOldID_FORMA_PAGOValue : Integer; function GetOldTIENDA_WEBValue : SmallInt; function GetOldCODIGO_ASIGNADOValue : String; - function GetOldDESCUENTOValue : Float; + function GetOldDESCUENTOValue : Currency; function GetOldFELICITACIONValue : SmallInt; + function GetOldFECHA_INGRESOValue : DateTime; { Properties } property OldID : Integer read GetOldIDValue; @@ -580,8 +581,9 @@ type property OldID_FORMA_PAGO : Integer read GetOldID_FORMA_PAGOValue; property OldTIENDA_WEB : SmallInt read GetOldTIENDA_WEBValue; property OldCODIGO_ASIGNADO : String read GetOldCODIGO_ASIGNADOValue; - property OldDESCUENTO : Float read GetOldDESCUENTOValue; + property OldDESCUENTO : Currency read GetOldDESCUENTOValue; property OldFELICITACION : SmallInt read GetOldFELICITACIONValue; + property OldFECHA_INGRESO : DateTime read GetOldFECHA_INGRESOValue; end; { TClientesBusinessProcessorRules } @@ -806,11 +808,11 @@ type function GetOldCODIGO_ASIGNADOIsNull: Boolean; virtual; procedure SetCODIGO_ASIGNADOValue(const aValue: String); virtual; procedure SetCODIGO_ASIGNADOIsNull(const aValue: Boolean); virtual; - function GetDESCUENTOValue: Float; virtual; + function GetDESCUENTOValue: Currency; virtual; function GetDESCUENTOIsNull: Boolean; virtual; - function GetOldDESCUENTOValue: Float; virtual; + function GetOldDESCUENTOValue: Currency; virtual; function GetOldDESCUENTOIsNull: Boolean; virtual; - procedure SetDESCUENTOValue(const aValue: Float); virtual; + procedure SetDESCUENTOValue(const aValue: Currency); virtual; procedure SetDESCUENTOIsNull(const aValue: Boolean); virtual; function GetFELICITACIONValue: SmallInt; virtual; function GetFELICITACIONIsNull: Boolean; virtual; @@ -818,6 +820,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; @@ -964,14 +972,18 @@ type property CODIGO_ASIGNADOIsNull : Boolean read GetCODIGO_ASIGNADOIsNull write SetCODIGO_ASIGNADOIsNull; property OldCODIGO_ASIGNADO : String read GetOldCODIGO_ASIGNADOValue; property OldCODIGO_ASIGNADOIsNull : Boolean read GetOldCODIGO_ASIGNADOIsNull; - property DESCUENTO : Float read GetDESCUENTOValue write SetDESCUENTOValue; + property DESCUENTO : Currency read GetDESCUENTOValue write SetDESCUENTOValue; property DESCUENTOIsNull : Boolean read GetDESCUENTOIsNull write SetDESCUENTOIsNull; - property OldDESCUENTO : Float read GetOldDESCUENTOValue; + property OldDESCUENTO : Currency 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; + 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; @@ -981,7 +993,7 @@ type { IProveedoresDelta } IProveedoresDelta = interface(IProveedores) - ['{95BBBF6E-2266-49CE-9D70-AEB10279BCF1}'] + ['{33EB3E3C-ECC8-442A-91BE-D9E401995049}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -1472,7 +1484,7 @@ type { IEmpleadosDelta } IEmpleadosDelta = interface(IEmpleados) - ['{546286BC-647C-44F4-9D35-3B664889DBF6}'] + ['{B3390413-C227-499A-8298-D8B04E8D2E57}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -1907,7 +1919,7 @@ type { IDireccionesContactoDelta } IDireccionesContactoDelta = interface(IDireccionesContacto) - ['{D5BE55B6-0A80-4D33-8909-7412A486A985}'] + ['{950070DE-22F7-48F3-B280-479D36251736}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -2122,7 +2134,7 @@ type { IClientesDescuentosDelta } IClientesDescuentosDelta = interface(IClientesDescuentos) - ['{C77A3BB3-C076-412E-BB6B-459110C91F1A}'] + ['{CCD7FCFA-0A27-4E1D-8243-CAC24C626854}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CLIENTEValue : Integer; @@ -2204,7 +2216,7 @@ type { IGruposProveedorDelta } IGruposProveedorDelta = interface(IGruposProveedor) - ['{6CBCEF66-F2C7-4E20-B06A-335D433C662E}'] + ['{016C3DFC-7F72-4722-9DF0-ED2A60C22D7A}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -2250,7 +2262,7 @@ type { IGruposEmpleadoDelta } IGruposEmpleadoDelta = interface(IGruposEmpleado) - ['{E1BDFF09-3B9D-4822-9B64-226FF0902CE5}'] + ['{B525392E-6148-4638-884F-16976E0C7F19}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -2296,7 +2308,7 @@ type { IContactos_RefreshDelta } IContactos_RefreshDelta = interface(IContactos_Refresh) - ['{331FFCB0-68F9-41FF-BC21-292C60BDB1E1}'] + ['{16A2B77E-BF46-4AF8-8D07-026A8BD18212}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldNIF_CIFValue : String; @@ -2571,7 +2583,7 @@ type { IContratosEmpleadosDelta } IContratosEmpleadosDelta = interface(IContratosEmpleados) - ['{1308007A-1199-4F43-9E85-7173D077005A}'] + ['{E0E1F72C-1FBB-47BC-B7DB-452A87582646}'] { Property getters and setters } function GetOldCONTRATOValue : String; @@ -2605,7 +2617,7 @@ type { IDescripcionesProveedoresDelta } IDescripcionesProveedoresDelta = interface(IDescripcionesProveedores) - ['{FA426C9E-3ECF-446E-8D2F-9BA5189AA9DE}'] + ['{BA1C3AFA-7305-44F0-A3A9-3CF71991DB93}'] { Property getters and setters } function GetOldDESCRIPCION_PROVEEDORValue : String; @@ -2639,7 +2651,7 @@ type { IPersonalContactoDelta } IPersonalContactoDelta = interface(IPersonalContacto) - ['{2125A02B-BA0F-4C4B-93F9-3F9DDAB6058E}'] + ['{EE009FFC-8BA2-4A49-ACCE-4B7C0837427D}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -5017,7 +5029,7 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesCODIGO_ASIGNADO] := Null; end; -function TClientesBusinessProcessorRules.GetDESCUENTOValue: Float; +function TClientesBusinessProcessorRules.GetDESCUENTOValue: Currency; begin result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDESCUENTO]; end; @@ -5027,7 +5039,7 @@ begin result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDESCUENTO]); end; -function TClientesBusinessProcessorRules.GetOldDESCUENTOValue: Float; +function TClientesBusinessProcessorRules.GetOldDESCUENTOValue: Currency; begin result := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDESCUENTO]; end; @@ -5037,7 +5049,7 @@ begin result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesDESCUENTO]); end; -procedure TClientesBusinessProcessorRules.SetDESCUENTOValue(const aValue: Float); +procedure TClientesBusinessProcessorRules.SetDESCUENTOValue(const aValue: Currency); begin BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesDESCUENTO] := aValue; end; @@ -5079,6 +5091,37 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesFELICITACION] := Null; end; +function TClientesBusinessProcessorRules.GetFECHA_INGRESOValue: DateTime; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesFECHA_INGRESO]; +end; + +function TClientesBusinessProcessorRules.GetFECHA_INGRESOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesFECHA_INGRESO]); +end; + +function TClientesBusinessProcessorRules.GetOldFECHA_INGRESOValue: DateTime; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesFECHA_INGRESO]; +end; + +function TClientesBusinessProcessorRules.GetOldFECHA_INGRESOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ClientesFECHA_INGRESO]); +end; + +procedure TClientesBusinessProcessorRules.SetFECHA_INGRESOValue(const aValue: DateTime); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesFECHA_INGRESO] := aValue; +end; + +procedure TClientesBusinessProcessorRules.SetFECHA_INGRESOIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ClientesFECHA_INGRESO] := 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 c6fdcbeb..d61e1691 100644 --- a/Source/Modulos/Contactos/Model/uBizClientesServer.pas +++ b/Source/Modulos/Contactos/Model/uBizClientesServer.pas @@ -96,7 +96,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]; + ParamByName('FELICITACION').Value := aChange.NewValueByName[fld_ClientesFELICITACION]; + ParamByName('FECHA_INGRESO').Value := aChange.NewValueByName[fld_ClientesFECHA_INGRESO]; Execute; end; finally @@ -137,7 +138,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]; + ParamByName('FELICITACION').Value := aChange.NewValueByName[fld_ClientesFELICITACION]; + ParamByName('FECHA_INGRESO').Value := aChange.NewValueByName[fld_ClientesFECHA_INGRESO]; Execute; end; diff --git a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm index d4c38be3..7139d793 100644 --- a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm +++ b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm @@ -543,6 +543,10 @@ object srvContactos: TsrvContactos item DatasetField = 'FELICITACION' TableField = 'FELICITACION' + end + item + DatasetField = 'FECHA_INGRESO' + TableField = 'FECHA_INGRESO' end> end> Name = 'Clientes' @@ -750,12 +754,16 @@ object srvContactos: TsrvContactos end item Name = 'DESCUENTO' - DataType = datFloat + DataType = datCurrency end item Name = 'FELICITACION' DataType = datSmallInt DictionaryEntry = 'Clientes_FELICITACION' + end + item + Name = 'FECHA_INGRESO' + DataType = datDateTime end> end item @@ -2855,6 +2863,11 @@ object srvContactos: TsrvContactos Name = 'FELICITACION' DataType = datSmallInt Value = '' + end + item + Name = 'FECHA_INGRESO' + DataType = datDateTime + Value = '' end> Statements = < item @@ -2865,12 +2878,13 @@ 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' 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 + 'NTO_FACTURAS_2, VENCIMIENTO_FACTURAS_3,'#10' FELICITACION, FECHA' + + '_INGRESO)'#10' VALUES'#10' (:ID_CLIENTE, :GRUPO_CLIENTE, :RECARGO_EQ' + + 'UIVALENCIA, :NOMBRE_COMERCIAL,'#10' :BLOQUEADO, :MOTIVO_BLOQUEO,' + + ' :REGIMEN_IVA, :ID_TIPO_IVA, :ID_FORMA_PAGO,'#10' :TIENDA_WEB, :' + + 'CODIGO_ASIGNADO, :DESCUENTO,'#10' :VENCIMIENTO_FACTURAS_1, :VENC' + + 'IMIENTO_FACTURAS_2, :VENCIMIENTO_FACTURAS_3,'#10' :FELICITACION,' + + ' :FECHA_INGRESO)'#10 StatementType = stSQL ColumnMappings = <> end> @@ -2983,6 +2997,11 @@ object srvContactos: TsrvContactos DataType = datSmallInt Value = '' end + item + Name = 'FECHA_INGRESO' + DataType = datDateTime + Value = '' + end item Name = 'OLD_ID_CLIENTE' Value = '' @@ -3002,7 +3021,8 @@ object srvContactos: TsrvContactos 'TO,'#10' VENCIMIENTO_FACTURAS_1 = :VENCIMIENTO_FACTURAS_1,'#10' VE' + 'NCIMIENTO_FACTURAS_2 = :VENCIMIENTO_FACTURAS_2,'#10' VENCIMIENTO_' + 'FACTURAS_3 = :VENCIMIENTO_FACTURAS_3,'#10' FELICITACION = :FELICI' + - 'TACION'#10' WHERE'#10' (ID_CLIENTE = :OLD_ID_CLIENTE)'#10 + 'TACION,'#10' FECHA_INGRESO = :FECHA_INGRESO'#10' WHERE'#10' (ID_CLIEN' + + 'TE = :OLD_ID_CLIENTE)'#10 StatementType = stSQL ColumnMappings = <> end> diff --git a/Source/Modulos/Contactos/Views/uViewCliente.dfm b/Source/Modulos/Contactos/Views/uViewCliente.dfm index 95dde585..c29d74c1 100644 --- a/Source/Modulos/Contactos/Views/uViewCliente.dfm +++ b/Source/Modulos/Contactos/Views/uViewCliente.dfm @@ -11,16 +11,16 @@ inherited frViewCliente: TfrViewCliente ExplicitWidth = 777 ExplicitHeight = 506 inherited PngSpeedButton1: TPngSpeedButton - Left = 733 - ExplicitLeft = 733 + Left = 732 + ExplicitLeft = 732 end inherited PngSpeedButton2: TPngSpeedButton - Left = 733 - ExplicitLeft = 733 + Left = 732 + ExplicitLeft = 732 end inherited PngSpeedButton3: TPngSpeedButton - Left = 733 - ExplicitLeft = 733 + Left = 732 + ExplicitLeft = 732 end inherited eCalle: TcxDBTextEdit Left = 132 @@ -29,7 +29,7 @@ inherited frViewCliente: TfrViewCliente StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 8 + TabOrder = 9 ExplicitLeft = 132 ExplicitTop = 277 ExplicitWidth = 260 @@ -42,7 +42,7 @@ inherited frViewCliente: TfrViewCliente StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 9 + TabOrder = 10 ExplicitLeft = 132 ExplicitTop = 304 ExplicitWidth = 159 @@ -55,21 +55,21 @@ inherited frViewCliente: TfrViewCliente StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 11 + TabOrder = 12 ExplicitLeft = 132 ExplicitTop = 331 ExplicitWidth = 260 Width = 260 end inherited eCodigoPostal: TcxDBTextEdit - Left = 309 + Left = 384 Top = 304 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 10 - ExplicitLeft = 309 + TabOrder = 11 + ExplicitLeft = 384 ExplicitTop = 304 end inherited eObservaciones: TcxDBMemo @@ -78,7 +78,7 @@ inherited frViewCliente: TfrViewCliente StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - TabOrder = 21 + TabOrder = 22 ExplicitTop = 415 ExplicitWidth = 733 ExplicitHeight = 69 @@ -126,7 +126,7 @@ inherited frViewCliente: TfrViewCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 6 + TabOrder = 7 Width = 370 end object cbGrupoCliente: TcxDBComboBox [10] @@ -150,7 +150,7 @@ inherited frViewCliente: TfrViewCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 5 + TabOrder = 6 Width = 260 end object eBloqueo: TcxDBTextEdit [11] @@ -169,7 +169,7 @@ inherited frViewCliente: TfrViewCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 7 + TabOrder = 8 Width = 260 end object eCodigoAsignado: TcxDBTextEdit [12] @@ -193,46 +193,46 @@ inherited frViewCliente: TfrViewCliente Width = 260 end inherited eTlfParticular: TcxDBTextEdit - Left = 499 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 14 - ExplicitLeft = 499 - ExplicitWidth = 238 - Width = 238 - end - inherited eTlfTrabajo: TcxDBTextEdit - Left = 499 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 13 - ExplicitLeft = 499 - ExplicitWidth = 238 - Width = 238 - end - inherited eTlfMovil: TcxDBTextEdit - Left = 499 + Left = 574 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 15 - ExplicitLeft = 499 + ExplicitLeft = 574 ExplicitWidth = 238 Width = 238 end - inherited eFax: TcxDBTextEdit - Left = 499 + inherited eTlfTrabajo: TcxDBTextEdit + Left = 574 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 14 + ExplicitLeft = 574 + ExplicitWidth = 238 + Width = 238 + end + inherited eTlfMovil: TcxDBTextEdit + Left = 574 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 16 - ExplicitLeft = 499 + ExplicitLeft = 574 + ExplicitWidth = 238 + Width = 238 + end + inherited eFax: TcxDBTextEdit + Left = 574 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 17 + ExplicitLeft = 574 ExplicitWidth = 238 Width = 238 end @@ -247,73 +247,41 @@ inherited frViewCliente: TfrViewCliente Width = 260 end inherited eNIFCIF: TcxDBTextEdit - Left = 283 + Left = 329 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 283 + ExplicitLeft = 329 ExplicitWidth = 91 Width = 91 end inherited eMailTrabajo: TcxDBHyperLinkEdit - Left = 499 - Properties.Prefix = 'mailto:' - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' - TabOrder = 17 - ExplicitLeft = 499 - ExplicitWidth = 209 - Width = 209 - end - inherited eMailParticular: TcxDBHyperLinkEdit - Left = 499 + Left = 574 Properties.Prefix = 'mailto:' Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 18 - ExplicitLeft = 499 + ExplicitLeft = 574 ExplicitWidth = 209 Width = 209 end - inherited ePaginaWeb: TcxDBHyperLinkEdit - Left = 499 + inherited eMailParticular: TcxDBHyperLinkEdit + Left = 574 + Properties.Prefix = 'mailto:' Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' TabOrder = 19 - ExplicitLeft = 499 + ExplicitLeft = 574 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 + object cbFelicitacion: TcxDBCheckBox [21] + Left = 479 Top = 280 Caption = 'Mandar felicitaci'#243'n navide'#241'a a este cliente' DataBinding.DataField = 'FELICITACION' @@ -333,9 +301,58 @@ inherited frViewCliente: TfrViewCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 20 + TabOrder = 21 Width = 370 end + inherited ePaginaWeb: TcxDBHyperLinkEdit + Left = 574 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + TabOrder = 20 + ExplicitLeft = 574 + 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 = 13 + ExplicitLeft = 132 + ExplicitTop = 358 + ExplicitWidth = 260 + Width = 260 + end + object eFechaIngreso: TcxDBDateEdit [25] + Left = 330 + 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 = 119 + end inherited dxLayoutControlContactoGroup_Root: TdxLayoutGroup AutoAligns = [aaHorizontal] AlignVert = avBottom @@ -347,10 +364,23 @@ inherited frViewCliente: TfrViewCliente Control = eNombreComercial ControlOptions.ShowBorder = False end - object dxLayoutControlContactoItem22: TdxLayoutItem - Caption = 'C'#243'digo de proveedor:' - Control = eCodigoAsignado - ControlOptions.ShowBorder = False + object dxLayoutControlContactoGroup14: TdxLayoutGroup + ShowCaption = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControlContactoItem22: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'C'#243'digo de proveedor:' + Control = eCodigoAsignado + ControlOptions.ShowBorder = False + end + object dxLayoutControlContactoItem21: TdxLayoutItem + Caption = 'Fecha de alta:' + Control = eFechaIngreso + ControlOptions.ShowBorder = False + end end object dxLayoutControlContactoItem19: TdxLayoutItem AutoAligns = [aaVertical] diff --git a/Source/Modulos/Contactos/Views/uViewCliente.pas b/Source/Modulos/Contactos/Views/uViewCliente.pas index b3c66f39..66355575 100644 --- a/Source/Modulos/Contactos/Views/uViewCliente.pas +++ b/Source/Modulos/Contactos/Views/uViewCliente.pas @@ -11,7 +11,7 @@ uses dxLayoutControl, cxMemo, cxHyperLinkEdit, ImgList, ActnList, Buttons, PngSpeedButton, PngImageList, cxGraphics, cxMaskEdit, cxDropDownEdit, cxLookupEdit, cxDBLookupEdit, cxDBLookupComboBox, uGruposClienteController, - cxCheckBox, cxSpinEdit, Grids, DBGrids, uDAInterfaces; + cxCheckBox, cxSpinEdit, Grids, DBGrids, uDAInterfaces, cxCalendar; type IViewCliente = interface(IViewContacto) @@ -34,6 +34,9 @@ type dxLayoutControlContactoGroup8: TdxLayoutGroup; dxLayoutControlContactoItem20: TdxLayoutItem; cbFelicitacion: TcxDBCheckBox; + dxLayoutControlContactoItem21: TdxLayoutItem; + eFechaIngreso: TcxDBDateEdit; + dxLayoutControlContactoGroup14: TdxLayoutGroup; 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 db6ddf36..89570090 100644 --- a/Source/Modulos/Contactos/Views/uViewClientes.dfm +++ b/Source/Modulos/Contactos/Views/uViewClientes.dfm @@ -69,7 +69,12 @@ inherited frViewClientes: TfrViewClientes VisibleForCustomization = False Width = 22 end - object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn [7] + object cxGridViewFECHA_INGRESO: TcxGridDBColumn [6] + Caption = 'Fecha de alta' + DataBinding.FieldName = 'FECHA_INGRESO' + PropertiesClassName = 'TcxDateEditProperties' + end + object cxGridViewNOMBRE_COMERCIAL: TcxGridDBColumn [8] DataBinding.FieldName = 'NOMBRE_COMERCIAL' BestFitMaxWidth = 90 Width = 164 @@ -101,22 +106,34 @@ inherited frViewClientes: TfrViewClientes Width = 154 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 223 + Left = 166 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 223 + ExplicitLeft = 166 ExplicitWidth = 525 Width = 525 end inherited eLista: TcxComboBox - Left = 705 + Left = 514 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 705 + ExplicitLeft = 514 + ExplicitWidth = 215 + Width = 215 + end + inherited eLista2: TcxComboBox + Left = 674 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 674 + ExplicitWidth = 207 + Width = 207 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Contactos/Views/uViewClientes.pas b/Source/Modulos/Contactos/Views/uViewClientes.pas index f1d0d4ef..0198a5ba 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, uCustomView, uViewBase; + uDAInterfaces, cxTextEdit, Menus, uCustomView, uViewBase, cxCalendar; type IViewClientes = interface(IViewContactos) @@ -26,6 +26,7 @@ type cxGridViewBLOQUEADO: TcxGridDBColumn; cxGridViewTiendaWeb: TcxGridDBColumn; cxGridViewFELICITACION: TcxGridDBColumn; + cxGridViewFECHA_INGRESO: TcxGridDBColumn; procedure cxGridViewICONOGetCellHint(Sender: TcxCustomGridTableItem; ARecord: TcxCustomGridRecord; ACellViewInfo: TcxGridTableDataCellViewInfo; const AMousePos: TPoint; var AHintText: TCaption; diff --git a/Source/Modulos/Contactos/Views/uViewProveedores.dfm b/Source/Modulos/Contactos/Views/uViewProveedores.dfm index 6000c892..09d12341 100644 --- a/Source/Modulos/Contactos/Views/uViewProveedores.dfm +++ b/Source/Modulos/Contactos/Views/uViewProveedores.dfm @@ -65,6 +65,7 @@ inherited frViewProveedores: TfrViewProveedores object cxGridViewFECHA_INGRESO: TcxGridDBColumn [6] Caption = 'Fecha de alta' DataBinding.FieldName = 'FECHA_INGRESO' + PropertiesClassName = 'TcxDateEditProperties' Width = 50 end end @@ -94,25 +95,35 @@ inherited frViewProveedores: TfrViewProveedores Width = 125 end inherited edtFechaFinFiltro: TcxDateEdit - Left = 157 + Left = 124 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 157 + ExplicitLeft = 124 ExplicitWidth = 244 Width = 244 end inherited eLista: TcxComboBox - Left = 347 + Left = 269 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' - ExplicitLeft = 347 + ExplicitLeft = 269 ExplicitWidth = 215 Width = 215 end + inherited eLista2: TcxComboBox + Left = 396 + Style.LookAndFeel.SkinName = '' + StyleDisabled.LookAndFeel.SkinName = '' + StyleFocused.LookAndFeel.SkinName = '' + StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 396 + ExplicitWidth = 207 + Width = 207 + end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel Width = 483 diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index e2c6f1d8..1eeef744 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 176abd94..16c3b80f 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -128,14 +128,14 @@ uses schArticulosServer_Intf in '..\Modulos\Articulos\Model\schArticulosServer_Intf.pas', schFacturasProveedorClient_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorClient_Intf.pas', schFacturasProveedorServer_Intf in '..\Modulos\Facturas de proveedor\Model\schFacturasProveedorServer_Intf.pas', - schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas', - schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas', schPresupuestosClienteClient_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteClient_Intf.pas', schPresupuestosClienteServer_Intf in '..\Modulos\Presupuestos de cliente\Model\schPresupuestosClienteServer_Intf.pas', schFacturasClienteClient_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteClient_Intf.pas', schFacturasClienteServer_Intf in '..\Modulos\Facturas de cliente\Model\schFacturasClienteServer_Intf.pas', schRecibosProveedorClient_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorClient_Intf.pas', - schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_Intf.pas'; + schRecibosProveedorServer_Intf in '..\Modulos\Recibos de proveedor\Model\schRecibosProveedorServer_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 19180dee..0fe4498b 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -35,7 +35,7 @@ Delphi.Personality - FalseTrueFalse/standaloneTrueFalse2060FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.0.6.0FactuGES Servidor2.0.6.0martes, 04 de marzo de 2014 11:21 + FalseTrueFalse/standaloneTrueFalse2070FalseFalseFalseFalseFalse30821252Rodax Software S.L.2.0.7.0FactuGES Servidor2.0.7.0viernes, 06 de junio de 2014 10:17 ExpressPrinting System by Developer Express Inc. FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index dbbd4669..2aaa85f3 100644 --- a/Source/Servidor/FactuGES_Server.rc +++ b/Source/Servidor/FactuGES_Server.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 2,0,6,0 -PRODUCTVERSION 2,0,6,0 +FILEVERSION 2,0,7,0 +PRODUCTVERSION 2,0,7,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.6.0\0" + VALUE "FileVersion", "2.0.7.0\0" VALUE "ProductName", "FactuGES Servidor\0" - VALUE "ProductVersion", "2.0.6.0\0" - VALUE "CompileDate", "lunes, 26 de mayo de 2014 10:39\0" + VALUE "ProductVersion", "2.0.7.0\0" + VALUE "CompileDate", "viernes, 10 de octubre de 2014 12:57\0" END END BLOCK "VarFileInfo"