diff --git a/Database/scripts/factuges.sql b/Database/scripts/factuges.sql index 3cbe2277..626aea33 100644 --- a/Database/scripts/factuges.sql +++ b/Database/scripts/factuges.sql @@ -1297,7 +1297,8 @@ CREATE TABLE CONTRATOS_CLIENTE ( PERSONA_CONTACTO VARCHAR(255) COLLATE ES_ES, RECARGO_EQUIVALENCIA TIPO_BOOLEANO, RE TIPO_PORCENTAJE, - IMPORTE_RE TIPO_IMPORTE + IMPORTE_RE TIPO_IMPORTE, + TIPO_CONTRATO VARCHAR(255) ); CREATE TABLE CONTRATOS_CLIENTE_DETALLES ( @@ -3730,7 +3731,8 @@ CREATE VIEW V_CONTRATOS_CLIENTE( ID_FORMA_PAGO, ID_VENDEDOR, VENDEDOR, - PERSONA_CONTACTO) + PERSONA_CONTACTO, + TIPO_CONTRATO) AS SELECT CONTRATOS_CLIENTE.ID, /* CONTRATOS_CLIENTE.ID_EMPRESA,*/ @@ -3776,8 +3778,8 @@ SELECT CONTRATOS_CLIENTE.ID, CONTRATOS_CLIENTE.ID_FORMA_PAGO, CONTRATOS_CLIENTE.ID_VENDEDOR, CONTACTOS2.NOMBRE AS VENDEDOR, - CONTRATOS_CLIENTE.PERSONA_CONTACTO - + CONTRATOS_CLIENTE.PERSONA_CONTACTO, + CONTRATOS_CLIENTE.TIPO_CONTRATO FROM CONTRATOS_CLIENTE LEFT OUTER JOIN CONTACTOS ON (CONTACTOS.ID = CONTRATOS_CLIENTE.ID_CLIENTE) LEFT JOIN EMPRESAS_CONTACTOS ON (EMPRESAS_CONTACTOS.ID_CONTACTO = CONTACTOS.ID) diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 3ee4d9ed..426db58c 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -58,55 +58,55 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
TForm diff --git a/Source/GUIBase/GUIBase.dproj b/Source/GUIBase/GUIBase.dproj index a2fc16c9..85ee60ff 100644 --- a/Source/GUIBase/GUIBase.dproj +++ b/Source/GUIBase/GUIBase.dproj @@ -58,34 +58,34 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fDialogBase
 diff --git a/Source/Modulos/Articulos/Controller/Articulos_controller.rc b/Source/Modulos/Articulos/Controller/Articulos_controller.rc index e69de29b..153736af 100644 --- a/Source/Modulos/Articulos/Controller/Articulos_controller.rc +++ b/Source/Modulos/Articulos/Controller/Articulos_controller.rc @@ -0,0 +1,22 @@ +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK 0x3FL +FILEFLAGS 0x00L +FILEOS 0x40004L +FILETYPE 0x1L +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0A04E4" + BEGIN + VALUE "FileVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0C0A, 1252 + END +END diff --git a/Source/Modulos/Articulos/Data/Articulos_data.rc b/Source/Modulos/Articulos/Data/Articulos_data.rc index e69de29b..153736af 100644 --- a/Source/Modulos/Articulos/Data/Articulos_data.rc +++ b/Source/Modulos/Articulos/Data/Articulos_data.rc @@ -0,0 +1,22 @@ +1 VERSIONINFO +FILEVERSION 1,0,0,0 +PRODUCTVERSION 1,0,0,0 +FILEFLAGSMASK 0x3FL +FILEFLAGS 0x00L +FILEOS 0x40004L +FILETYPE 0x1L +FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "0C0A04E4" + BEGIN + VALUE "FileVersion", "1.0.0.0\0" + VALUE "ProductVersion", "1.0.0.0\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0C0A, 1252 + END +END diff --git a/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm index c50047bd..dd7771e9 100644 --- a/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Data/uDataModuleContratosCliente.dfm @@ -135,6 +135,7 @@ inherited DataModuleContratosCliente: TDataModuleContratosCliente DataType = datString Size = 255 DisplayLabel = 'Referencia' + ServerAutoRefresh = True DictionaryEntry = 'ContratosCliente_REFERENCIA' end item @@ -312,6 +313,13 @@ inherited DataModuleContratosCliente: TDataModuleContratosCliente Size = 255 DisplayLabel = 'Persona de contacto' DictionaryEntry = 'ContratosCliente_PERSONA_CONTACTO' + end + item + Name = 'TIPO_CONTRATO' + DataType = datString + Size = 255 + DisplayLabel = 'Tipo' + DictionaryEntry = 'ContratosCliente_TIPO_CONTRATO' end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/Modulos/Contratos de cliente/Model/ContratosCliente_model.dproj b/Source/Modulos/Contratos de cliente/Model/ContratosCliente_model.dproj index 3aab6d3b..e8f8b499 100644 --- a/Source/Modulos/Contratos de cliente/Model/ContratosCliente_model.dproj +++ b/Source/Modulos/Contratos de cliente/Model/ContratosCliente_model.dproj @@ -43,8 +43,6 @@ Package FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 - - RemObjects Pascal Script - RemObjects SDK 3.0 Integration EurekaLog 5.1.9 ContratosCliente_model.dpk diff --git a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas index 3d214180..74d18136 100644 --- a/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas +++ b/Source/Modulos/Contratos de cliente/Model/schContratosClienteClient_Intf.pas @@ -9,12 +9,12 @@ const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_Valores = '{C4BF01E2-31F4-4AB9-8B68-44342C4EC58C}'; - RID_Propiedades = '{54F6EFB8-CF1F-49A0-A5ED-410EE8AF1E84}'; - RID_ListaAnosContratos = '{B15460FD-230C-47B6-B916-9DD01DBF78D7}'; - RID_ContratosCliente = '{AA883DBC-951B-429E-ACF6-25E65CD069CF}'; - RID_TiposCapitulos = '{A5CF013F-B9D5-4F6E-9CF9-EAEC850DABAF}'; - RID_ContratosCliente_Detalles = '{6BF2A61B-E6A3-4683-9E5E-517F1C2A9414}'; + RID_Valores = '{57BFD5F5-494A-4231-B97D-032F7E10F24B}'; + RID_Propiedades = '{4D58ECE3-A9F8-43A4-AAA3-CD646C22B7DE}'; + RID_ListaAnosContratos = '{1D11C4F1-0182-4996-BAC0-9196D938AA76}'; + RID_ContratosCliente = '{73CCDE34-A6B2-46FB-A827-92F690E6DDBC}'; + RID_TiposCapitulos = '{EDB0FFD7-2779-4985-821B-E4777E629C36}'; + RID_ContratosCliente_Detalles = '{4B663F62-78D9-4AFF-A977-54BE10A624FE}'; { Data table names } nme_Valores = 'Valores'; @@ -95,6 +95,7 @@ const fld_ContratosClienteID_VENDEDOR = 'ID_VENDEDOR'; fld_ContratosClienteVENDEDOR = 'VENDEDOR'; fld_ContratosClientePERSONA_CONTACTO = 'PERSONA_CONTACTO'; + fld_ContratosClienteTIPO_CONTRATO = 'TIPO_CONTRATO'; { ContratosCliente field indexes } idx_ContratosClienteID = 0; @@ -141,6 +142,7 @@ const idx_ContratosClienteID_VENDEDOR = 41; idx_ContratosClienteVENDEDOR = 42; idx_ContratosClientePERSONA_CONTACTO = 43; + idx_ContratosClienteTIPO_CONTRATO = 44; { TiposCapitulos fields } fld_TiposCapitulosID = 'ID'; @@ -195,7 +197,7 @@ const type { IValores } IValores = interface(IDAStronglyTypedDataTable) - ['{1182811B-CA60-444B-8E48-100F58175E23}'] + ['{7C23406A-157C-424B-ABCF-148CC015BC4F}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -254,7 +256,7 @@ type { IPropiedades } IPropiedades = interface(IDAStronglyTypedDataTable) - ['{3CC8D26D-D024-4B4C-B349-63C6BC8828B8}'] + ['{52FAC363-53E6-4F11-AE60-FE16A842EEA4}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -313,7 +315,7 @@ type { IListaAnosContratos } IListaAnosContratos = interface(IDAStronglyTypedDataTable) - ['{115F0DE9-0E1F-481F-8A31-A4F2B409ED8B}'] + ['{F741301B-D6DB-457C-9B43-1EC77A740D17}'] { Property getters and setters } function GetANOValue: String; procedure SetANOValue(const aValue: String); @@ -348,7 +350,7 @@ type { IContratosCliente } IContratosCliente = interface(IDAStronglyTypedDataTable) - ['{0D9EA959-92B6-43CB-95E5-5A0F0F1A8845}'] + ['{BC6E72B5-30B2-4553-8C99-CBBBCA899EBA}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -522,6 +524,10 @@ type procedure SetPERSONA_CONTACTOValue(const aValue: String); function GetPERSONA_CONTACTOIsNull: Boolean; procedure SetPERSONA_CONTACTOIsNull(const aValue: Boolean); + function GetTIPO_CONTRATOValue: String; + procedure SetTIPO_CONTRATOValue(const aValue: String); + function GetTIPO_CONTRATOIsNull: Boolean; + procedure SetTIPO_CONTRATOIsNull(const aValue: Boolean); { Properties } @@ -613,6 +619,8 @@ type property VENDEDORIsNull: Boolean read GetVENDEDORIsNull write SetVENDEDORIsNull; property PERSONA_CONTACTO: String read GetPERSONA_CONTACTOValue write SetPERSONA_CONTACTOValue; property PERSONA_CONTACTOIsNull: Boolean read GetPERSONA_CONTACTOIsNull write SetPERSONA_CONTACTOIsNull; + property TIPO_CONTRATO: String read GetTIPO_CONTRATOValue write SetTIPO_CONTRATOValue; + property TIPO_CONTRATOIsNull: Boolean read GetTIPO_CONTRATOIsNull write SetTIPO_CONTRATOIsNull; end; { TContratosClienteDataTableRules } @@ -800,6 +808,10 @@ type procedure SetPERSONA_CONTACTOValue(const aValue: String); virtual; function GetPERSONA_CONTACTOIsNull: Boolean; virtual; procedure SetPERSONA_CONTACTOIsNull(const aValue: Boolean); virtual; + function GetTIPO_CONTRATOValue: String; virtual; + procedure SetTIPO_CONTRATOValue(const aValue: String); virtual; + function GetTIPO_CONTRATOIsNull: Boolean; virtual; + procedure SetTIPO_CONTRATOIsNull(const aValue: Boolean); virtual; { Properties } property ID: Integer read GetIDValue write SetIDValue; @@ -890,6 +902,8 @@ type property VENDEDORIsNull: Boolean read GetVENDEDORIsNull write SetVENDEDORIsNull; property PERSONA_CONTACTO: String read GetPERSONA_CONTACTOValue write SetPERSONA_CONTACTOValue; property PERSONA_CONTACTOIsNull: Boolean read GetPERSONA_CONTACTOIsNull write SetPERSONA_CONTACTOIsNull; + property TIPO_CONTRATO: String read GetTIPO_CONTRATOValue write SetTIPO_CONTRATOValue; + property TIPO_CONTRATOIsNull: Boolean read GetTIPO_CONTRATOIsNull write SetTIPO_CONTRATOIsNull; public constructor Create(aDataTable: TDADataTable); override; @@ -902,7 +916,7 @@ type } { ITiposCapitulos } ITiposCapitulos = interface(IDAStronglyTypedDataTable) - ['{C7356BFF-06B4-4FA2-A24C-9B3B9A82480C}'] + ['{BA175773-59CB-4349-A002-2BF8672EFA85}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -997,7 +1011,7 @@ type { IContratosCliente_Detalles } IContratosCliente_Detalles = interface(IDAStronglyTypedDataTable) - ['{8D251749-25EB-4C4C-B0E0-8E8848E0DE02}'] + ['{45989059-DF2C-4A8B-8A53-028E6F526A87}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2342,6 +2356,27 @@ begin DataTable.Fields[idx_ContratosClientePERSONA_CONTACTO].AsVariant := Null; end; +function TContratosClienteDataTableRules.GetTIPO_CONTRATOValue: String; +begin + result := DataTable.Fields[idx_ContratosClienteTIPO_CONTRATO].AsString; +end; + +procedure TContratosClienteDataTableRules.SetTIPO_CONTRATOValue(const aValue: String); +begin + DataTable.Fields[idx_ContratosClienteTIPO_CONTRATO].AsString := aValue; +end; + +function TContratosClienteDataTableRules.GetTIPO_CONTRATOIsNull: boolean; +begin + result := DataTable.Fields[idx_ContratosClienteTIPO_CONTRATO].IsNull; +end; + +procedure TContratosClienteDataTableRules.SetTIPO_CONTRATOIsNull(const aValue: Boolean); +begin + if aValue then + DataTable.Fields[idx_ContratosClienteTIPO_CONTRATO].AsVariant := Null; +end; + { TTiposCapitulosDataTableRules } constructor TTiposCapitulosDataTableRules.Create(aDataTable: TDADataTable); diff --git a/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas b/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas index fb46cd1a..a1b61bf0 100644 --- a/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas +++ b/Source/Modulos/Contratos de cliente/Model/schContratosClienteServer_Intf.pas @@ -9,17 +9,17 @@ const { Delta rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_ValoresDelta = '{99FB8B11-BABD-437D-8CF7-E71ED3293C56}'; - RID_PropiedadesDelta = '{957B81A4-2A44-4028-A288-7D141540CFB7}'; - RID_ListaAnosContratosDelta = '{5099A92C-DD01-4C99-8739-32C7316F0F29}'; - RID_ContratosClienteDelta = '{08EE2D2A-1788-482F-AC8D-C6ABF921D84E}'; - RID_TiposCapitulosDelta = '{C725F601-473D-44E3-A497-3AAD4D96A6AA}'; - RID_ContratosCliente_DetallesDelta = '{5BA78EB9-366D-4035-8B44-A771F9EBB0D3}'; + RID_ValoresDelta = '{94A3010D-5D46-4AA9-9838-04B55576C94E}'; + RID_PropiedadesDelta = '{99F13846-B993-4348-AE33-7D0922C5D1AD}'; + RID_ListaAnosContratosDelta = '{74150E30-F707-4AF1-9D4C-69ACEE1FF491}'; + RID_ContratosClienteDelta = '{4D6235D2-E6FF-4894-889B-937ED4E1A5C7}'; + RID_TiposCapitulosDelta = '{837573E5-D7F7-44CC-A73C-797CBB7D62F0}'; + RID_ContratosCliente_DetallesDelta = '{EA0605D9-70CD-4487-8706-ECC60AEC6E82}'; type { IValoresDelta } IValoresDelta = interface(IValores) - ['{99FB8B11-BABD-437D-8CF7-E71ED3293C56}'] + ['{94A3010D-5D46-4AA9-9838-04B55576C94E}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_PROPIEDADValue : Integer; @@ -77,7 +77,7 @@ type { IPropiedadesDelta } IPropiedadesDelta = interface(IPropiedades) - ['{957B81A4-2A44-4028-A288-7D141540CFB7}'] + ['{99F13846-B993-4348-AE33-7D0922C5D1AD}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -135,7 +135,7 @@ type { IListaAnosContratosDelta } IListaAnosContratosDelta = interface(IListaAnosContratos) - ['{5099A92C-DD01-4C99-8739-32C7316F0F29}'] + ['{74150E30-F707-4AF1-9D4C-69ACEE1FF491}'] { Property getters and setters } function GetOldANOValue : String; @@ -169,7 +169,7 @@ type { IContratosClienteDelta } IContratosClienteDelta = interface(IContratosCliente) - ['{08EE2D2A-1788-482F-AC8D-C6ABF921D84E}'] + ['{4D6235D2-E6FF-4894-889B-937ED4E1A5C7}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -215,6 +215,7 @@ type function GetOldID_VENDEDORValue : Integer; function GetOldVENDEDORValue : String; function GetOldPERSONA_CONTACTOValue : String; + function GetOldTIPO_CONTRATOValue : String; { Properties } property OldID : Integer read GetOldIDValue; @@ -261,6 +262,7 @@ type property OldID_VENDEDOR : Integer read GetOldID_VENDEDORValue; property OldVENDEDOR : String read GetOldVENDEDORValue; property OldPERSONA_CONTACTO : String read GetOldPERSONA_CONTACTOValue; + property OldTIPO_CONTRATO : String read GetOldTIPO_CONTRATOValue; end; { TContratosClienteBusinessProcessorRules } @@ -536,6 +538,12 @@ type function GetOldPERSONA_CONTACTOIsNull: Boolean; virtual; procedure SetPERSONA_CONTACTOValue(const aValue: String); virtual; procedure SetPERSONA_CONTACTOIsNull(const aValue: Boolean); virtual; + function GetTIPO_CONTRATOValue: String; virtual; + function GetTIPO_CONTRATOIsNull: Boolean; virtual; + function GetOldTIPO_CONTRATOValue: String; virtual; + function GetOldTIPO_CONTRATOIsNull: Boolean; virtual; + procedure SetTIPO_CONTRATOValue(const aValue: String); virtual; + procedure SetTIPO_CONTRATOIsNull(const aValue: Boolean); virtual; { Properties } property ID : Integer read GetIDValue write SetIDValue; @@ -714,6 +722,10 @@ type property PERSONA_CONTACTOIsNull : Boolean read GetPERSONA_CONTACTOIsNull write SetPERSONA_CONTACTOIsNull; property OldPERSONA_CONTACTO : String read GetOldPERSONA_CONTACTOValue; property OldPERSONA_CONTACTOIsNull : Boolean read GetOldPERSONA_CONTACTOIsNull; + property TIPO_CONTRATO : String read GetTIPO_CONTRATOValue write SetTIPO_CONTRATOValue; + property TIPO_CONTRATOIsNull : Boolean read GetTIPO_CONTRATOIsNull write SetTIPO_CONTRATOIsNull; + property OldTIPO_CONTRATO : String read GetOldTIPO_CONTRATOValue; + property OldTIPO_CONTRATOIsNull : Boolean read GetOldTIPO_CONTRATOIsNull; public constructor Create(aBusinessProcessor: TDABusinessProcessor); override; @@ -723,7 +735,7 @@ type { ITiposCapitulosDelta } ITiposCapitulosDelta = interface(ITiposCapitulos) - ['{C725F601-473D-44E3-A497-3AAD4D96A6AA}'] + ['{837573E5-D7F7-44CC-A73C-797CBB7D62F0}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldPOSICIONValue : Integer; @@ -817,7 +829,7 @@ type { IContratosCliente_DetallesDelta } IContratosCliente_DetallesDelta = interface(IContratosCliente_Detalles) - ['{5BA78EB9-366D-4035-8B44-A771F9EBB0D3}'] + ['{EA0605D9-70CD-4487-8706-ECC60AEC6E82}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTRATOValue : Integer; @@ -2676,6 +2688,37 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClientePERSONA_CONTACTO] := Null; end; +function TContratosClienteBusinessProcessorRules.GetTIPO_CONTRATOValue: String; +begin + result := BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteTIPO_CONTRATO]; +end; + +function TContratosClienteBusinessProcessorRules.GetTIPO_CONTRATOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteTIPO_CONTRATO]); +end; + +function TContratosClienteBusinessProcessorRules.GetOldTIPO_CONTRATOValue: String; +begin + result := BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteTIPO_CONTRATO]; +end; + +function TContratosClienteBusinessProcessorRules.GetOldTIPO_CONTRATOIsNull: Boolean; +begin + result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_ContratosClienteTIPO_CONTRATO]); +end; + +procedure TContratosClienteBusinessProcessorRules.SetTIPO_CONTRATOValue(const aValue: String); +begin + BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteTIPO_CONTRATO] := aValue; +end; + +procedure TContratosClienteBusinessProcessorRules.SetTIPO_CONTRATOIsNull(const aValue: Boolean); +begin + if aValue then + BusinessProcessor.CurrentChange.NewValueByName[fld_ContratosClienteTIPO_CONTRATO] := Null; +end; + { TTiposCapitulosBusinessProcessorRules } constructor TTiposCapitulosBusinessProcessorRules.Create(aBusinessProcessor: TDABusinessProcessor); diff --git a/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm b/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm index e0e3a1f2..f052faff 100644 --- a/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm +++ b/Source/Modulos/Contratos de cliente/Servidor/srvContratosCliente_Impl.dfm @@ -311,6 +311,10 @@ object srvContratosCliente: TsrvContratosCliente item DatasetField = 'ID_DIRECCION' TableField = 'ID_DIRECCION' + end + item + DatasetField = 'TIPO_CONTRATO' + TableField = 'TIPO_CONTRATO' end> end> Name = 'ContratosCliente' @@ -557,6 +561,12 @@ object srvContratosCliente: TsrvContratosCliente DataType = datString Size = 255 DictionaryEntry = 'ContratosCliente_PERSONA_CONTACTO' + end + item + Name = 'TIPO_CONTRATO' + DataType = datString + Size = 255 + DictionaryEntry = 'ContratosCliente_TIPO_CONTRATO' end> end item @@ -790,6 +800,12 @@ object srvContratosCliente: TsrvContratosCliente Commands = < item Params = < + item + Name = 'TIPO_CONTRATO' + DataType = datString + Size = 255 + Value = '' + end item Name = 'ID' DataType = datAutoInc @@ -997,15 +1013,16 @@ object srvContratosCliente: TsrvContratosCliente 'MPORTE_DESCUENTO,'#10' BASE_IMPONIBLE, ID_TIPO_IVA, IVA, IMPORTE' + '_IVA,'#10' IMPORTE_TOTAL, ID_FORMA_PAGO, ID_TIENDA, ID_VENDEDOR,' + ' PERSONA_CONTACTO,'#10' RE, IMPORTE_RE, RECARGO_EQUIVALENCIA, TE' + - 'LEFONO, MOVIL)'#10' VALUES'#10' (:ID, :ID_CLIENTE, :NIF_CIF, :NOMBRE' + - ', :ID_DIRECCION, :CALLE, :POBLACION, :PROVINCIA,'#10' :CODIGO_PO' + - 'STAL, :REFERENCIA, :FECHA_CONTRATO, :SITUACION, :FORMA_PAGO,'#10' ' + - ' :PLAZO_ENTREGA, :OBSERVACIONES, :INCIDENCIAS, :INCIDENCIAS_ACT' + - 'IVAS, CURRENT_TIMESTAMP,'#10' :USUARIO, :IMPORTE_NETO, :IMPORTE_' + - 'PORTE, :DESCUENTO, :IMPORTE_DESCUENTO,'#10' :BASE_IMPONIBLE, :ID' + - '_TIPO_IVA, :IVA, :IMPORTE_IVA, :IMPORTE_TOTAL, :ID_FORMA_PAGO,'#10' ' + - ' :ID_TIENDA, :ID_VENDEDOR, :PERSONA_CONTACTO, :RE, :IMPORTE_R' + - 'E, :RECARGO_EQUIVALENCIA,'#10' :TELEFONO, :MOVIL)'#10#10 + 'LEFONO, MOVIL, TIPO_CONTRATO)'#10' VALUES'#10' (:ID, :ID_CLIENTE, :N' + + 'IF_CIF, :NOMBRE, :ID_DIRECCION, :CALLE, :POBLACION, :PROVINCIA,'#10 + + ' :CODIGO_POSTAL, :REFERENCIA, :FECHA_CONTRATO, :SITUACION, :' + + 'FORMA_PAGO,'#10' :PLAZO_ENTREGA, :OBSERVACIONES, :INCIDENCIAS, :' + + 'INCIDENCIAS_ACTIVAS, CURRENT_TIMESTAMP,'#10' :USUARIO, :IMPORTE_' + + 'NETO, :IMPORTE_PORTE, :DESCUENTO, :IMPORTE_DESCUENTO,'#10' :BASE' + + '_IMPONIBLE, :ID_TIPO_IVA, :IVA, :IMPORTE_IVA, :IMPORTE_TOTAL, :I' + + 'D_FORMA_PAGO,'#10' :ID_TIENDA, :ID_VENDEDOR, :PERSONA_CONTACTO, ' + + ':RE, :IMPORTE_RE, :RECARGO_EQUIVALENCIA,'#10' :TELEFONO, :MOVIL,' + + ' :TIPO_CONTRATO)'#10#10 StatementType = stSQL ColumnMappings = <> end> @@ -1031,6 +1048,12 @@ object srvContratosCliente: TsrvContratosCliente end item Params = < + item + Name = 'TIPO_CONTRATO' + DataType = datString + Size = 255 + Value = '' + end item Name = 'ID' DataType = datInteger @@ -1250,7 +1273,8 @@ object srvContratosCliente: TsrvContratosCliente '= :ID_TIENDA,'#10' ID_VENDEDOR = :ID_VENDEDOR,'#10' PERSONA_CONTAC' + 'TO = :PERSONA_CONTACTO,'#10' RE = :RE,'#10' IMPORTE_RE = :IMPORTE_' + 'RE,'#10' RECARGO_EQUIVALENCIA = :RECARGO_EQUIVALENCIA,'#10' TELEFO' + - 'NO = :TELEFONO,'#10' MOVIL = :MOVIL'#10' WHERE'#10' (ID = :OLD_ID)'#10#10 + 'NO = :TELEFONO,'#10' MOVIL = :MOVIL,'#10' TIPO_CONTRATO = :TIPO_CO' + + 'NTRATO'#10' WHERE'#10' (ID = :OLD_ID)'#10#10 StatementType = stSQL ColumnMappings = <> end> @@ -1855,6 +1879,12 @@ object srvContratosCliente: TsrvContratosCliente item Name = 'ContratosCliente_ID_DIRECCION' DataType = datInteger + end + item + Name = 'ContratosCliente_TIPO_CONTRATO' + DataType = datString + Size = 255 + DisplayLabel = 'Tipo' end> Left = 48 Top = 152 diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm index e0a54a61..f64d1257 100644 --- a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.dfm @@ -187,6 +187,10 @@ inherited fEditorContratoCliente: TfEditorContratoCliente object pagContenido: TTabSheet Caption = 'Contenido' ImageIndex = 1 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 inline frViewDetallesContratoCliente1: TfrViewDetallesContratoCliente Left = 0 Top = 0 @@ -207,91 +211,72 @@ inherited fEditorContratoCliente: TfEditorContratoCliente ExplicitHeight = 242 inherited ToolBar1: TToolBar Width = 831 - Height = 24 ExplicitWidth = 831 - ExplicitHeight = 24 + inherited ToolButton4: TToolButton + Wrap = True + end inherited ToolButton14: TToolButton + Left = 0 + Top = 22 Wrap = False + ExplicitLeft = 0 + ExplicitTop = 22 end inherited FontName: TJvFontComboBox - Left = 368 - Top = 0 - ExplicitLeft = 368 - ExplicitTop = 0 + Left = 34 + ExplicitLeft = 34 end inherited FontSize: TEdit - Left = 513 - Top = 0 + Left = 179 Width = 74 - ExplicitLeft = 513 - ExplicitTop = 0 + ExplicitLeft = 179 ExplicitWidth = 74 end inherited UpDown1: TUpDown - Left = 587 - Top = 0 - ExplicitLeft = 587 - ExplicitTop = 0 + Left = 253 + ExplicitLeft = 253 end inherited ToolButton13: TToolButton - Left = 604 - Top = 0 - ExplicitLeft = 604 - ExplicitTop = 0 + Left = 270 + ExplicitLeft = 270 end inherited ToolButton6: TToolButton - Left = 612 - Top = 0 - ExplicitLeft = 612 - ExplicitTop = 0 + Left = 278 + ExplicitLeft = 278 end inherited ToolButton7: TToolButton - Left = 646 - Top = 0 - ExplicitLeft = 646 - ExplicitTop = 0 + Left = 312 + ExplicitLeft = 312 end inherited ToolButton8: TToolButton - Left = 680 - Top = 0 - ExplicitLeft = 680 - ExplicitTop = 0 + Left = 346 + ExplicitLeft = 346 end inherited ToolButton12: TToolButton - Left = 714 - Top = 0 - ExplicitLeft = 714 - ExplicitTop = 0 + Left = 380 + ExplicitLeft = 380 end inherited ToolButton9: TToolButton - Left = 722 - Top = 0 - ExplicitLeft = 722 - ExplicitTop = 0 + Left = 388 + ExplicitLeft = 388 end inherited ToolButton10: TToolButton - Left = 756 - Top = 0 - ExplicitLeft = 756 - ExplicitTop = 0 + Left = 422 + ExplicitLeft = 422 end inherited ToolButton11: TToolButton - Left = 790 - Top = 0 - ExplicitLeft = 790 - ExplicitTop = 0 + Left = 456 + ExplicitLeft = 456 end end inherited cxGrid: TcxGrid - Top = 50 Width = 831 - Height = 192 + Height = 170 ExplicitTop = 50 ExplicitWidth = 834 ExplicitHeight = 273 end inherited TBXDock1: TTBXDock - Top = 24 Width = 831 ExplicitTop = 24 ExplicitWidth = 834 @@ -310,6 +295,10 @@ inherited fEditorContratoCliente: TfEditorContratoCliente object pagInicidencias: TTabSheet Caption = 'Incidencias' ImageIndex = 2 + ExplicitLeft = 0 + ExplicitTop = 0 + ExplicitWidth = 0 + ExplicitHeight = 0 inline frViewIncidenciasCli: TfrViewIncidencias Left = 0 Top = 0 @@ -386,10 +375,6 @@ inherited fEditorContratoCliente: TfEditorContratoCliente inherited PnlComentario: TPanel Width = 845 ExplicitWidth = 845 - inherited lbComentario: TLabel - Width = 835 - Height = 25 - end end inline frViewTotales1: TfrViewTotales [5] Left = 0 @@ -503,15 +488,6 @@ inherited fEditorContratoCliente: TfEditorContratoCliente end end end - inherited dxLayoutControl1Group5: TdxLayoutGroup - inherited dxLayoutControl1Group3: TdxLayoutGroup - inherited dxLayoutControl1Group8: TdxLayoutGroup - inherited dxLayoutControl1Item7: TdxLayoutItem - Visible = True - end - end - end - end end end end diff --git a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas index 83cd068a..6ef92e85 100644 --- a/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas +++ b/Source/Modulos/Contratos de cliente/Views/uEditorContratoCliente.pas @@ -54,7 +54,7 @@ type var Error: Boolean); //Importante en este punto se deben de quitar los eventos que puedan afectar a la tabla una vez se cierre el editor. private - procedure RecalcularPortePorUnidad; + //procedure RecalcularPortePorUnidad; protected FContrato: IBizContratoCliente; @@ -351,14 +351,14 @@ begin FController.Preview(FContrato); end; -procedure TfEditorContratoCliente.RecalcularPortePorUnidad; +{procedure TfEditorContratoCliente.RecalcularPortePorUnidad; begin //Esta lógica se llamará en el editor porque es para facilitar el rellenado de información del documento //no puede ir en la clase de negocio porque no es una lógica que tenga sentido fuera del editor. if Assigned(Controller) and Assigned(Controller.DetallesController) then Controller.DetallesController.DesglosarPorteDetalles(FContrato.IMPORTE_PORTE, FContrato.Detalles) -end; +end;} procedure TfEditorContratoCliente.SetController(const Value: IContratosClienteController); begin diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm index 7ec70d61..d8b8b7ca 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.dfm @@ -39,10 +39,10 @@ inherited frViewContratoCliente: TfrViewContratoCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True TabOrder = 1 - Width = 260 + Width = 129 end object memObservaciones: TcxDBMemo - Left = 374 + Left = 377 Top = 289 Anchors = [akLeft, akTop, akRight, akBottom] DataBinding.DataField = 'OBSERVACIONES' @@ -59,7 +59,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 9 + TabOrder = 10 Height = 200 Width = 507 end @@ -115,16 +115,16 @@ inherited frViewContratoCliente: TfrViewContratoCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 3 + TabOrder = 4 Width = 122 end object bFormasPago: TButton - Left = 212 + Left = 215 Top = 109 Width = 132 Height = 21 Caption = 'Ver las formas de pago...' - TabOrder = 4 + TabOrder = 5 OnClick = bFormasPagoClick end object cbSituacion: TcxDBImageComboBox @@ -150,11 +150,11 @@ inherited frViewContratoCliente: TfrViewContratoCliente StyleDisabled.LookAndFeel.NativeStyle = True StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 2 + TabOrder = 3 Width = 260 end inline frViewDatosYSeleccionClienteContrato1: TfrViewDatosYSeleccionClienteContrato - Left = 374 + Left = 377 Top = 28 Width = 127 Height = 225 @@ -164,9 +164,9 @@ inherited frViewContratoCliente: TfrViewContratoCliente Font.Name = 'Tahoma' Font.Style = [] ParentFont = False - TabOrder = 8 + TabOrder = 9 ReadOnly = False - ExplicitLeft = 374 + ExplicitLeft = 377 ExplicitTop = 28 ExplicitWidth = 127 ExplicitHeight = 225 @@ -184,24 +184,24 @@ inherited frViewContratoCliente: TfrViewContratoCliente Width = 103 end inherited bVerFichaCliente: TBitBtn - Left = 212 - ExplicitLeft = 212 + Left = 209 + ExplicitLeft = 209 end inherited edtDireccion: TcxMemo ExplicitWidth = 121 Width = 121 end inherited bElegirDireccion: TButton - Left = 381 - ExplicitLeft = 381 + Left = 378 + ExplicitLeft = 378 end inherited edtTelefonos: TcxTextEdit ExplicitWidth = 193 Width = 193 end inherited edtReferencia: TcxDBTextEdit - Left = 268 - ExplicitLeft = 268 + Left = 267 + ExplicitLeft = 267 ExplicitWidth = 103 Width = 103 end @@ -225,7 +225,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 6 + TabOrder = 7 Height = 100 Width = 396 end @@ -247,7 +247,7 @@ inherited frViewContratoCliente: TfrViewContratoCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 7 + TabOrder = 8 Height = 100 Width = 396 end @@ -278,9 +278,34 @@ inherited frViewContratoCliente: TfrViewContratoCliente StyleFocused.LookAndFeel.NativeStyle = True StyleHot.LookAndFeel.Kind = lfStandard StyleHot.LookAndFeel.NativeStyle = True - TabOrder = 5 + TabOrder = 6 Width = 27 end + object cbTipoPresupuesto: TcxDBComboBox + Left = 271 + Top = 55 + DataBinding.DataField = 'TIPO_CONTRATO' + DataBinding.DataSource = DADataSource + Properties.ImmediatePost = True + Properties.Items.Strings = ( + 'Cocina' + 'Ba'#241'o' + 'Armarios' + 'Electrodom'#233'sticos' + 'Varios') + Properties.PostPopupValueOnTab = True + 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 = 2 + Width = 113 + end object dxLayoutControl1Group_Root: TdxLayoutGroup ShowCaption = False Hidden = True @@ -303,12 +328,29 @@ inherited frViewContratoCliente: TfrViewContratoCliente Control = eReferencia ControlOptions.ShowBorder = False end - object dxLayoutControl1Item2: TdxLayoutItem - Caption = 'Fecha contrato:' - Control = edtFechaContrato - ControlOptions.ShowBorder = False + object dxLayoutControl1Group11: TdxLayoutGroup + ShowCaption = False + Hidden = True + LayoutDirection = ldHorizontal + ShowBorder = False + object dxLayoutControl1Item2: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Fecha contrato:' + Control = edtFechaContrato + ControlOptions.ShowBorder = False + end + object dxLayoutControl1Item7: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient + Caption = 'Tipo contrato:' + Control = cbTipoPresupuesto + ControlOptions.ShowBorder = False + end end object dxLayoutControl1Item10: TdxLayoutItem + AutoAligns = [aaVertical] + AlignHorz = ahClient Caption = 'Situaci'#243'n:' Control = cbSituacion ControlOptions.ShowBorder = False diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas b/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas index de3ceeda..266bcb79 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratoCliente.pas @@ -61,6 +61,9 @@ type dxLayoutControl1Group9: TdxLayoutGroup; cbVendedor: TcxDBLookupComboBox; dsVendedor: TDADataSource; + dxLayoutControl1Item7: TdxLayoutItem; + cbTipoPresupuesto: TcxDBComboBox; + dxLayoutControl1Group11: TdxLayoutGroup; procedure CustomViewCreate(Sender: TObject); procedure CustomViewDestroy(Sender: TObject); procedure bFormasPagoClick(Sender: TObject); diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm index 3267285d..026ea459 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.dfm @@ -68,6 +68,11 @@ inherited frViewContratosCliente: TfrViewContratosCliente SortOrder = soDescending Width = 58 end + object cxGridViewTIPO_CONTRATO: TcxGridDBColumn + DataBinding.FieldName = 'TIPO_CONTRATO' + BestFitMaxWidth = 25 + Width = 55 + end object cxGridViewSITUACION: TcxGridDBColumn Caption = 'Situaci'#243'n' DataBinding.FieldName = 'SITUACION' @@ -121,27 +126,15 @@ inherited frViewContratosCliente: TfrViewContratosCliente Width = 903 ExplicitWidth = 903 inherited txtFiltroTodo: TcxTextEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 806 Width = 806 end inherited edtFechaIniFiltro: TcxDateEdit - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitWidth = 285 Width = 285 end inherited edtFechaFinFiltro: TcxDateEdit Left = 389 - Style.LookAndFeel.SkinName = '' - StyleDisabled.LookAndFeel.SkinName = '' - StyleFocused.LookAndFeel.SkinName = '' - StyleHot.LookAndFeel.SkinName = '' ExplicitLeft = 389 ExplicitWidth = 504 Width = 504 diff --git a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas index 999da11c..8de58ac5 100644 --- a/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas +++ b/Source/Modulos/Contratos de cliente/Views/uViewContratosCliente.pas @@ -39,6 +39,7 @@ type cxGridViewNIF_CIF: TcxGridDBColumn; cxGridViewINCIDENCIAS: TcxGridDBColumn; cxStyleRECHAZADO: TcxStyle; + cxGridViewTIPO_CONTRATO: TcxGridDBColumn; procedure cxGridActiveTabChanged(Sender: TcxCustomGrid; ALevel: TcxGridLevel); procedure cxGridViewStylesGetContentStyle(Sender: TcxCustomGridTableView; diff --git a/Source/Modulos/Presupuestos de cliente/Model/PresupuestosCliente_model.dproj b/Source/Modulos/Presupuestos de cliente/Model/PresupuestosCliente_model.dproj index 74e09ad3..b303edca 100644 --- a/Source/Modulos/Presupuestos de cliente/Model/PresupuestosCliente_model.dproj +++ b/Source/Modulos/Presupuestos de cliente/Model/PresupuestosCliente_model.dproj @@ -43,6 +43,10 @@ Package FalseTrueFalseFalseFalseFalseTrueFalse1000FalseFalseFalseFalseFalse308212521.0.0.01.0.0.0 + + + + RemObjects Pascal Script - RemObjects SDK 3.0 Integration EurekaLog 5.1.9 PresupuestosCliente_model.dpk @@ -52,21 +56,21 @@ MainSource - - - - - - - - - + + + + + + + + +