diff --git a/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm b/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm index f5fc92ad..1ccfd12e 100644 --- a/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm +++ b/Source/ApplicationBase/Empresas/Data/uDataModuleEmpresas.dfm @@ -182,23 +182,31 @@ inherited DataModuleEmpresas: TDataModuleEmpresas end item Name = 'PARAM_TIEMPO' - DataType = datCurrency + DataType = datFloat + DictionaryEntry = 'Empresas_PARAM_TIEMPO' end item Name = 'PARAM_MARGEN' - DataType = datCurrency + DataType = datFloat + DictionaryEntry = 'Empresas_PARAM_MARGEN' end item Name = 'ID_TIPO_IVA' DataType = datSmallInt + DisplayLabel = 'Empresas_ID_TIPO_IVA' + DictionaryEntry = 'Empresas_ID_TIPO_IVA' end item Name = 'ID_FORMA_PAGO' DataType = datSmallInt + DisplayLabel = 'Empresas_ID_FORMA_PAGO' + DictionaryEntry = 'Empresas_ID_FORMA_PAGO' end item Name = 'ID_ALMACEN' DataType = datSmallInt + DisplayLabel = 'Empresas_ID_ALMACEN' + DictionaryEntry = 'Empresas_ID_ALMACEN' end> Params = <> StreamingOptions = [soDisableEventsWhileStreaming] diff --git a/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas b/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas index 148c2610..f83bac57 100644 --- a/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas +++ b/Source/ApplicationBase/Empresas/Model/schEmpresasClient_Intf.pas @@ -3,14 +3,14 @@ unit schEmpresasClient_Intf; interface uses - Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_Empresas = '{85F3347F-FE10-4BF0-AE37-0004F98A0C9B}'; - RID_EmpresasDatosBanco = '{136900A4-D1E4-4EB2-971E-48636C5033E5}'; + RID_Empresas = '{88621D33-852A-4B38-8FFB-0894C98719CA}'; + RID_EmpresasDatosBanco = '{E2ABA941-53D7-41CD-9755-CCBD66A72247}'; { Data table names } nme_Empresas = 'Empresas'; @@ -103,7 +103,7 @@ const type { IEmpresas } IEmpresas = interface(IDAStronglyTypedDataTable) - ['{C3E9B00D-726C-44B6-BB08-7F12DA6AB6AF}'] + ['{50BEAD2C-AEF9-4858-AF21-E427E1B39CC6}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -191,12 +191,12 @@ type procedure SetREGISTRO_MERCANTILValue(const aValue: String); function GetREGISTRO_MERCANTILIsNull: Boolean; procedure SetREGISTRO_MERCANTILIsNull(const aValue: Boolean); - function GetPARAM_TIEMPOValue: Currency; - procedure SetPARAM_TIEMPOValue(const aValue: Currency); + function GetPARAM_TIEMPOValue: Float; + procedure SetPARAM_TIEMPOValue(const aValue: Float); function GetPARAM_TIEMPOIsNull: Boolean; procedure SetPARAM_TIEMPOIsNull(const aValue: Boolean); - function GetPARAM_MARGENValue: Currency; - procedure SetPARAM_MARGENValue(const aValue: Currency); + function GetPARAM_MARGENValue: Float; + procedure SetPARAM_MARGENValue(const aValue: Float); function GetPARAM_MARGENIsNull: Boolean; procedure SetPARAM_MARGENIsNull(const aValue: Boolean); function GetID_TIPO_IVAValue: SmallInt; @@ -258,9 +258,9 @@ type property LOGOTIPOIsNull: Boolean read GetLOGOTIPOIsNull write SetLOGOTIPOIsNull; property REGISTRO_MERCANTIL: String read GetREGISTRO_MERCANTILValue write SetREGISTRO_MERCANTILValue; property REGISTRO_MERCANTILIsNull: Boolean read GetREGISTRO_MERCANTILIsNull write SetREGISTRO_MERCANTILIsNull; - property PARAM_TIEMPO: Currency read GetPARAM_TIEMPOValue write SetPARAM_TIEMPOValue; + property PARAM_TIEMPO: Float read GetPARAM_TIEMPOValue write SetPARAM_TIEMPOValue; property PARAM_TIEMPOIsNull: Boolean read GetPARAM_TIEMPOIsNull write SetPARAM_TIEMPOIsNull; - property PARAM_MARGEN: Currency read GetPARAM_MARGENValue write SetPARAM_MARGENValue; + property PARAM_MARGEN: Float read GetPARAM_MARGENValue write SetPARAM_MARGENValue; property PARAM_MARGENIsNull: Boolean read GetPARAM_MARGENIsNull write SetPARAM_MARGENIsNull; property ID_TIPO_IVA: SmallInt read GetID_TIPO_IVAValue write SetID_TIPO_IVAValue; property ID_TIPO_IVAIsNull: Boolean read GetID_TIPO_IVAIsNull write SetID_TIPO_IVAIsNull; @@ -271,7 +271,7 @@ type end; { TEmpresasDataTableRules } - TEmpresasDataTableRules = class(TIntfObjectDADataTableRules, IEmpresas) + TEmpresasDataTableRules = class(TDADataTableRules, IEmpresas) private f_NOTAS: IROStrings; f_LOGOTIPO: IROStream; @@ -365,12 +365,12 @@ type procedure SetREGISTRO_MERCANTILValue(const aValue: String); virtual; function GetREGISTRO_MERCANTILIsNull: Boolean; virtual; procedure SetREGISTRO_MERCANTILIsNull(const aValue: Boolean); virtual; - function GetPARAM_TIEMPOValue: Currency; virtual; - procedure SetPARAM_TIEMPOValue(const aValue: Currency); virtual; + function GetPARAM_TIEMPOValue: Float; virtual; + procedure SetPARAM_TIEMPOValue(const aValue: Float); virtual; function GetPARAM_TIEMPOIsNull: Boolean; virtual; procedure SetPARAM_TIEMPOIsNull(const aValue: Boolean); virtual; - function GetPARAM_MARGENValue: Currency; virtual; - procedure SetPARAM_MARGENValue(const aValue: Currency); virtual; + function GetPARAM_MARGENValue: Float; virtual; + procedure SetPARAM_MARGENValue(const aValue: Float); virtual; function GetPARAM_MARGENIsNull: Boolean; virtual; procedure SetPARAM_MARGENIsNull(const aValue: Boolean); virtual; function GetID_TIPO_IVAValue: SmallInt; virtual; @@ -431,9 +431,9 @@ type property LOGOTIPOIsNull: Boolean read GetLOGOTIPOIsNull write SetLOGOTIPOIsNull; property REGISTRO_MERCANTIL: String read GetREGISTRO_MERCANTILValue write SetREGISTRO_MERCANTILValue; property REGISTRO_MERCANTILIsNull: Boolean read GetREGISTRO_MERCANTILIsNull write SetREGISTRO_MERCANTILIsNull; - property PARAM_TIEMPO: Currency read GetPARAM_TIEMPOValue write SetPARAM_TIEMPOValue; + property PARAM_TIEMPO: Float read GetPARAM_TIEMPOValue write SetPARAM_TIEMPOValue; property PARAM_TIEMPOIsNull: Boolean read GetPARAM_TIEMPOIsNull write SetPARAM_TIEMPOIsNull; - property PARAM_MARGEN: Currency read GetPARAM_MARGENValue write SetPARAM_MARGENValue; + property PARAM_MARGEN: Float read GetPARAM_MARGENValue write SetPARAM_MARGENValue; property PARAM_MARGENIsNull: Boolean read GetPARAM_MARGENIsNull write SetPARAM_MARGENIsNull; property ID_TIPO_IVA: SmallInt read GetID_TIPO_IVAValue write SetID_TIPO_IVAValue; property ID_TIPO_IVAIsNull: Boolean read GetID_TIPO_IVAIsNull write SetID_TIPO_IVAIsNull; @@ -450,7 +450,7 @@ type { IEmpresasDatosBanco } IEmpresasDatosBanco = interface(IDAStronglyTypedDataTable) - ['{F703B8E7-3A99-4097-BC8F-9F10A4D3D4F3}'] + ['{092FC338-3912-4550-982D-89A97A0ACFDD}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -524,7 +524,7 @@ type end; { TEmpresasDatosBancoDataTableRules } - TEmpresasDatosBancoDataTableRules = class(TIntfObjectDADataTableRules, IEmpresasDatosBanco) + TEmpresasDatosBancoDataTableRules = class(TDADataTableRules, IEmpresasDatosBanco) private protected { Property getters and setters } @@ -1097,14 +1097,14 @@ begin DataTable.Fields[idx_EmpresasREGISTRO_MERCANTIL].AsVariant := Null; end; -function TEmpresasDataTableRules.GetPARAM_TIEMPOValue: Currency; +function TEmpresasDataTableRules.GetPARAM_TIEMPOValue: Float; begin - result := DataTable.Fields[idx_EmpresasPARAM_TIEMPO].AsCurrency; + result := DataTable.Fields[idx_EmpresasPARAM_TIEMPO].AsFloat; end; -procedure TEmpresasDataTableRules.SetPARAM_TIEMPOValue(const aValue: Currency); +procedure TEmpresasDataTableRules.SetPARAM_TIEMPOValue(const aValue: Float); begin - DataTable.Fields[idx_EmpresasPARAM_TIEMPO].AsCurrency := aValue; + DataTable.Fields[idx_EmpresasPARAM_TIEMPO].AsFloat := aValue; end; function TEmpresasDataTableRules.GetPARAM_TIEMPOIsNull: boolean; @@ -1118,14 +1118,14 @@ begin DataTable.Fields[idx_EmpresasPARAM_TIEMPO].AsVariant := Null; end; -function TEmpresasDataTableRules.GetPARAM_MARGENValue: Currency; +function TEmpresasDataTableRules.GetPARAM_MARGENValue: Float; begin - result := DataTable.Fields[idx_EmpresasPARAM_MARGEN].AsCurrency; + result := DataTable.Fields[idx_EmpresasPARAM_MARGEN].AsFloat; end; -procedure TEmpresasDataTableRules.SetPARAM_MARGENValue(const aValue: Currency); +procedure TEmpresasDataTableRules.SetPARAM_MARGENValue(const aValue: Float); begin - DataTable.Fields[idx_EmpresasPARAM_MARGEN].AsCurrency := aValue; + DataTable.Fields[idx_EmpresasPARAM_MARGEN].AsFloat := aValue; end; function TEmpresasDataTableRules.GetPARAM_MARGENIsNull: boolean; diff --git a/Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas b/Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas index 97e7111d..2990e358 100644 --- a/Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas +++ b/Source/ApplicationBase/Empresas/Model/schEmpresasServer_Intf.pas @@ -9,13 +9,13 @@ 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_EmpresasDelta = '{73622B14-9061-4F32-977D-AFE85BFD7278}'; - RID_EmpresasDatosBancoDelta = '{DB55B5DC-17DD-4A0B-A1AE-62E00F888F38}'; + RID_EmpresasDelta = '{43119B6A-7006-4045-B378-1516B8CA32E1}'; + RID_EmpresasDatosBancoDelta = '{A79108BB-E362-4338-9188-6D5683DCE289}'; type { IEmpresasDelta } IEmpresasDelta = interface(IEmpresas) - ['{73622B14-9061-4F32-977D-AFE85BFD7278}'] + ['{43119B6A-7006-4045-B378-1516B8CA32E1}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldNIF_CIFValue : String; @@ -39,8 +39,8 @@ type function GetOldUSUARIOValue : String; function GetOldLOGOTIPOValue : IROStream; function GetOldREGISTRO_MERCANTILValue : String; - function GetOldPARAM_TIEMPOValue : Currency; - function GetOldPARAM_MARGENValue : Currency; + function GetOldPARAM_TIEMPOValue : Float; + function GetOldPARAM_MARGENValue : Float; function GetOldID_TIPO_IVAValue : SmallInt; function GetOldID_FORMA_PAGOValue : SmallInt; function GetOldID_ALMACENValue : SmallInt; @@ -68,8 +68,8 @@ type property OldUSUARIO : String read GetOldUSUARIOValue; property OldLOGOTIPO : IROStream read GetOldLOGOTIPOValue; property OldREGISTRO_MERCANTIL : String read GetOldREGISTRO_MERCANTILValue; - property OldPARAM_TIEMPO : Currency read GetOldPARAM_TIEMPOValue; - property OldPARAM_MARGEN : Currency read GetOldPARAM_MARGENValue; + property OldPARAM_TIEMPO : Float read GetOldPARAM_TIEMPOValue; + property OldPARAM_MARGEN : Float read GetOldPARAM_MARGENValue; property OldID_TIPO_IVA : SmallInt read GetOldID_TIPO_IVAValue; property OldID_FORMA_PAGO : SmallInt read GetOldID_FORMA_PAGOValue; property OldID_ALMACEN : SmallInt read GetOldID_ALMACENValue; @@ -214,17 +214,17 @@ type function GetOldREGISTRO_MERCANTILIsNull: Boolean; virtual; procedure SetREGISTRO_MERCANTILValue(const aValue: String); virtual; procedure SetREGISTRO_MERCANTILIsNull(const aValue: Boolean); virtual; - function GetPARAM_TIEMPOValue: Currency; virtual; + function GetPARAM_TIEMPOValue: Float; virtual; function GetPARAM_TIEMPOIsNull: Boolean; virtual; - function GetOldPARAM_TIEMPOValue: Currency; virtual; + function GetOldPARAM_TIEMPOValue: Float; virtual; function GetOldPARAM_TIEMPOIsNull: Boolean; virtual; - procedure SetPARAM_TIEMPOValue(const aValue: Currency); virtual; + procedure SetPARAM_TIEMPOValue(const aValue: Float); virtual; procedure SetPARAM_TIEMPOIsNull(const aValue: Boolean); virtual; - function GetPARAM_MARGENValue: Currency; virtual; + function GetPARAM_MARGENValue: Float; virtual; function GetPARAM_MARGENIsNull: Boolean; virtual; - function GetOldPARAM_MARGENValue: Currency; virtual; + function GetOldPARAM_MARGENValue: Float; virtual; function GetOldPARAM_MARGENIsNull: Boolean; virtual; - procedure SetPARAM_MARGENValue(const aValue: Currency); virtual; + procedure SetPARAM_MARGENValue(const aValue: Float); virtual; procedure SetPARAM_MARGENIsNull(const aValue: Boolean); virtual; function GetID_TIPO_IVAValue: SmallInt; virtual; function GetID_TIPO_IVAIsNull: Boolean; virtual; @@ -334,13 +334,13 @@ type property REGISTRO_MERCANTILIsNull : Boolean read GetREGISTRO_MERCANTILIsNull write SetREGISTRO_MERCANTILIsNull; property OldREGISTRO_MERCANTIL : String read GetOldREGISTRO_MERCANTILValue; property OldREGISTRO_MERCANTILIsNull : Boolean read GetOldREGISTRO_MERCANTILIsNull; - property PARAM_TIEMPO : Currency read GetPARAM_TIEMPOValue write SetPARAM_TIEMPOValue; + property PARAM_TIEMPO : Float read GetPARAM_TIEMPOValue write SetPARAM_TIEMPOValue; property PARAM_TIEMPOIsNull : Boolean read GetPARAM_TIEMPOIsNull write SetPARAM_TIEMPOIsNull; - property OldPARAM_TIEMPO : Currency read GetOldPARAM_TIEMPOValue; + property OldPARAM_TIEMPO : Float read GetOldPARAM_TIEMPOValue; property OldPARAM_TIEMPOIsNull : Boolean read GetOldPARAM_TIEMPOIsNull; - property PARAM_MARGEN : Currency read GetPARAM_MARGENValue write SetPARAM_MARGENValue; + property PARAM_MARGEN : Float read GetPARAM_MARGENValue write SetPARAM_MARGENValue; property PARAM_MARGENIsNull : Boolean read GetPARAM_MARGENIsNull write SetPARAM_MARGENIsNull; - property OldPARAM_MARGEN : Currency read GetOldPARAM_MARGENValue; + property OldPARAM_MARGEN : Float read GetOldPARAM_MARGENValue; property OldPARAM_MARGENIsNull : Boolean read GetOldPARAM_MARGENIsNull; property ID_TIPO_IVA : SmallInt read GetID_TIPO_IVAValue write SetID_TIPO_IVAValue; property ID_TIPO_IVAIsNull : Boolean read GetID_TIPO_IVAIsNull write SetID_TIPO_IVAIsNull; @@ -363,7 +363,7 @@ type { IEmpresasDatosBancoDelta } IEmpresasDatosBancoDelta = interface(IEmpresasDatosBanco) - ['{DB55B5DC-17DD-4A0B-A1AE-62E00F888F38}'] + ['{A79108BB-E362-4338-9188-6D5683DCE289}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_EMPRESAValue : Integer; @@ -1232,7 +1232,7 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasREGISTRO_MERCANTIL] := Null; end; -function TEmpresasBusinessProcessorRules.GetPARAM_TIEMPOValue: Currency; +function TEmpresasBusinessProcessorRules.GetPARAM_TIEMPOValue: Float; begin result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasPARAM_TIEMPO]; end; @@ -1242,7 +1242,7 @@ begin result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasPARAM_TIEMPO]); end; -function TEmpresasBusinessProcessorRules.GetOldPARAM_TIEMPOValue: Currency; +function TEmpresasBusinessProcessorRules.GetOldPARAM_TIEMPOValue: Float; begin result := BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasPARAM_TIEMPO]; end; @@ -1252,7 +1252,7 @@ begin result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasPARAM_TIEMPO]); end; -procedure TEmpresasBusinessProcessorRules.SetPARAM_TIEMPOValue(const aValue: Currency); +procedure TEmpresasBusinessProcessorRules.SetPARAM_TIEMPOValue(const aValue: Float); begin BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasPARAM_TIEMPO] := aValue; end; @@ -1263,7 +1263,7 @@ begin BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasPARAM_TIEMPO] := Null; end; -function TEmpresasBusinessProcessorRules.GetPARAM_MARGENValue: Currency; +function TEmpresasBusinessProcessorRules.GetPARAM_MARGENValue: Float; begin result := BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasPARAM_MARGEN]; end; @@ -1273,7 +1273,7 @@ begin result := VarIsNull(BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasPARAM_MARGEN]); end; -function TEmpresasBusinessProcessorRules.GetOldPARAM_MARGENValue: Currency; +function TEmpresasBusinessProcessorRules.GetOldPARAM_MARGENValue: Float; begin result := BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasPARAM_MARGEN]; end; @@ -1283,7 +1283,7 @@ begin result := VarIsNull(BusinessProcessor.CurrentChange.OldValueByName[fld_EmpresasPARAM_MARGEN]); end; -procedure TEmpresasBusinessProcessorRules.SetPARAM_MARGENValue(const aValue: Currency); +procedure TEmpresasBusinessProcessorRules.SetPARAM_MARGENValue(const aValue: Float); begin BusinessProcessor.CurrentChange.NewValueByName[fld_EmpresasPARAM_MARGEN] := aValue; end; diff --git a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm index d9f8f1ae..1bbf696d 100644 --- a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm +++ b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm @@ -269,23 +269,28 @@ object srvEmpresas: TsrvEmpresas end item Name = 'PARAM_TIEMPO' - DataType = datCurrency + DataType = datFloat + DictionaryEntry = 'Empresas_PARAM_TIEMPO' end item Name = 'PARAM_MARGEN' - DataType = datCurrency + DataType = datFloat + DictionaryEntry = 'Empresas_PARAM_MARGEN' end item Name = 'ID_TIPO_IVA' DataType = datSmallInt + DictionaryEntry = 'Empresas_ID_TIPO_IVA' end item Name = 'ID_FORMA_PAGO' DataType = datSmallInt + DictionaryEntry = 'Empresas_ID_FORMA_PAGO' end item Name = 'ID_ALMACEN' DataType = datSmallInt + DictionaryEntry = 'Empresas_ID_ALMACEN' end> end item @@ -688,6 +693,28 @@ object srvEmpresas: TsrvEmpresas Required = True DisplayLabel = 'ID' ServerAutoRefresh = True + end + item + Name = 'Empresas_PARAM_TIEMPO' + DataType = datFloat + DisplayLabel = 'PARAM_TIEMPO' + end + item + Name = 'Empresas_PARAM_MARGEN' + DataType = datFloat + DisplayLabel = 'PARAM_MARGEN' + end + item + Name = 'Empresas_ID_TIPO_IVA' + DataType = datSmallInt + end + item + Name = 'Empresas_ID_FORMA_PAGO' + DataType = datSmallInt + end + item + Name = 'Empresas_ID_ALMACEN' + DataType = datSmallInt end> Left = 158 Top = 22 diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index c6d0a5bc..f4910a29 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -54,58 +54,58 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
TForm diff --git a/Source/Base/Base.res b/Source/Base/Base.res index 8b251f31..1641339f 100644 Binary files a/Source/Base/Base.res and b/Source/Base/Base.res differ diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index a4ec8ffc..6a014193 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 1,8,0,0 -PRODUCTVERSION 1,8,0,0 +FILEVERSION 1,8,1,0 +PRODUCTVERSION 1,8,1,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -13,10 +13,10 @@ BEGIN BLOCK "0C0A04E4" BEGIN VALUE "CompanyName", "Rodax Software S.L.\0" - VALUE "FileVersion", "1.8.0.0\0" + VALUE "FileVersion", "1.8.1.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "1.8.0.0\0" + VALUE "ProductVersion", "1.8.1.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 8e8d712d..75bbc8a2 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas index 52ef6485..7aa4c743 100644 --- a/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas +++ b/Source/Modulos/Contactos/Model/schContactosClient_Intf.pas @@ -3,26 +3,26 @@ unit schContactosClient_Intf; interface uses - Classes, DB, schBase_Intf, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; + Classes, DB, SysUtils, uROClasses, uDAInterfaces, uDADataTable, FmtBCD, uROXMLIntf; const { Data table rules ids Feel free to change them to something more human readable but make sure they are unique in the context of your application } - RID_Contactos = '{C0F3C133-4B33-4386-8853-5C1CBDDC4381}'; - RID_GruposCliente = '{9CE88C99-80A8-403D-B850-3CFE30ED393D}'; - RID_DatosBancarios = '{F8D4FF6B-189D-4D47-8A20-AD339C85B3E9}'; - RID_Clientes = '{BD11BF18-A1AD-429C-BC06-7BF3B26C0C5D}'; - RID_Proveedores = '{4B4C2BD8-EF05-4315-9CA5-C8E3EBD7D079}'; - RID_Empleados = '{26E7320B-E2CF-45FB-808C-7A8EA9370AC1}'; - RID_DireccionesContacto = '{DF8F36B7-5FA9-475F-82D3-4E01CF8E3A32}'; - RID_ClientesDescuentos = '{417EE563-4846-45DF-89B1-F3B242BB8EA3}'; - RID_GruposProveedor = '{3FC380F7-61B7-466A-AEBB-5D9FB5D6FF33}'; - RID_GruposEmpleado = '{D4F3440A-E9C3-4A34-A72D-15BB3B3EB07A}'; - RID_Contactos_Refresh = '{943C99BF-0AD0-41F7-B2DE-2ABCBCD2FB63}'; - RID_ContratosEmpleados = '{79B74B0A-6A6F-4C32-BEAB-A1214049B702}'; - RID_DescripcionesProveedores = '{017164B2-8D2B-404F-8962-C943B4502268}'; - RID_PersonalContacto = '{1D351CFF-D5C9-444D-A55E-9B33C8D7ED97}'; + RID_Contactos = '{91BD66C3-1FC5-4B41-BFF5-3F577239FFE1}'; + RID_GruposCliente = '{9BDD01CD-BD83-47C8-9AD6-6D8FBAE22ED6}'; + RID_DatosBancarios = '{CCA1EE4C-5929-48A3-9555-48E29B7DD572}'; + RID_Clientes = '{ED4F62A9-F376-489D-AEF4-EFF86539DBE5}'; + RID_Proveedores = '{48BB1210-E1B8-4709-9C03-B67A5BD05555}'; + RID_Empleados = '{C2B52AD4-5128-4209-8CFD-30F762CA1A70}'; + RID_DireccionesContacto = '{57598C48-2F54-4D1E-BC79-FDFBD7A17309}'; + RID_ClientesDescuentos = '{ABB2FBD8-562E-4FBC-BC51-F39222C34ED1}'; + RID_GruposProveedor = '{7A7DCFA2-55D3-441A-B027-DBC2E270E94F}'; + RID_GruposEmpleado = '{14B39DE3-DB7A-411D-8939-AFFE07E52994}'; + RID_Contactos_Refresh = '{CF38DB4D-A4E7-48E8-8B3E-A4E243063727}'; + RID_ContratosEmpleados = '{4B4ECE2D-339E-4F87-81E3-32FEAC58B727}'; + RID_DescripcionesProveedores = '{57409654-6895-4601-A43B-1EEC21E6A7AD}'; + RID_PersonalContacto = '{DDB07051-5354-4084-A7B2-0F17B7BE23D0}'; { Data table names } nme_Contactos = 'Contactos'; @@ -501,7 +501,7 @@ const type { IContactos } IContactos = interface(IDAStronglyTypedDataTable) - ['{C97BE809-CDC1-45DC-A200-6DB52EBC2EB6}'] + ['{C5085E63-DBD8-48C6-AFF7-67F07615D040}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -646,7 +646,7 @@ type end; { TContactosDataTableRules } - TContactosDataTableRules = class(TIntfObjectDADataTableRules, IContactos) + TContactosDataTableRules = class(TDADataTableRules, IContactos) private f_NOTAS: IROStrings; procedure NOTAS_OnChange(Sender: TObject); @@ -800,7 +800,7 @@ type { IGruposCliente } IGruposCliente = interface(IDAStronglyTypedDataTable) - ['{07904A8B-36C2-4832-A77B-C8FF40A5009D}'] + ['{FDEBCC24-A77C-45B4-99BA-C9548F695939}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -820,7 +820,7 @@ type end; { TGruposClienteDataTableRules } - TGruposClienteDataTableRules = class(TIntfObjectDADataTableRules, IGruposCliente) + TGruposClienteDataTableRules = class(TDADataTableRules, IGruposCliente) private protected { Property getters and setters } @@ -847,7 +847,7 @@ type { IDatosBancarios } IDatosBancarios = interface(IDAStronglyTypedDataTable) - ['{63B57F8B-86DE-420F-B48C-FB4B3B58958C}'] + ['{E31D5317-4CD7-4535-9231-6BC1F36CBCC2}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -909,7 +909,7 @@ type end; { TDatosBancariosDataTableRules } - TDatosBancariosDataTableRules = class(TIntfObjectDADataTableRules, IDatosBancarios) + TDatosBancariosDataTableRules = class(TDADataTableRules, IDatosBancarios) private protected { Property getters and setters } @@ -978,7 +978,7 @@ type { IClientes } IClientes = interface(IDAStronglyTypedDataTable) - ['{66563838-1A22-4AFE-9BB3-9788D074FB56}'] + ['{D4C197F8-243E-46C4-ACC5-E1F1CA7A2B19}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1213,7 +1213,7 @@ type end; { TClientesDataTableRules } - TClientesDataTableRules = class(TIntfObjectDADataTableRules, IClientes) + TClientesDataTableRules = class(TDADataTableRules, IClientes) private f_NOTAS: IROStrings; procedure NOTAS_OnChange(Sender: TObject); @@ -1457,7 +1457,7 @@ type { IProveedores } IProveedores = interface(IDAStronglyTypedDataTable) - ['{BB9CEFC1-3669-441F-9275-84812796D171}'] + ['{BFE5279B-5B45-490A-A5C0-4AFF6DB0405B}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -1686,7 +1686,7 @@ type end; { TProveedoresDataTableRules } - TProveedoresDataTableRules = class(TIntfObjectDADataTableRules, IProveedores) + TProveedoresDataTableRules = class(TDADataTableRules, IProveedores) private f_NOTAS: IROStrings; procedure NOTAS_OnChange(Sender: TObject); @@ -1924,7 +1924,7 @@ type { IEmpleados } IEmpleados = interface(IDAStronglyTypedDataTable) - ['{6ED9C6C1-324B-4095-A2BC-5E2FB2B95E7B}'] + ['{9283D681-D16D-4801-B1E7-5680B7DE24E1}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2131,7 +2131,7 @@ type end; { TEmpleadosDataTableRules } - TEmpleadosDataTableRules = class(TIntfObjectDADataTableRules, IEmpleados) + TEmpleadosDataTableRules = class(TDADataTableRules, IEmpleados) private f_NOTAS: IROStrings; f_FORMACION_BASE: IROStrings; @@ -2355,7 +2355,7 @@ type { IDireccionesContacto } IDireccionesContacto = interface(IDAStronglyTypedDataTable) - ['{9B97A0EF-E53E-4D87-AC0C-6DA85C2F761B}'] + ['{6AF38491-1DB2-414A-91D7-CC095D28FA6D}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2458,7 +2458,7 @@ type end; { TDireccionesContactoDataTableRules } - TDireccionesContactoDataTableRules = class(TIntfObjectDADataTableRules, IDireccionesContacto) + TDireccionesContactoDataTableRules = class(TDADataTableRules, IDireccionesContacto) private f_NOTAS: IROStrings; procedure NOTAS_OnChange(Sender: TObject); @@ -2570,7 +2570,7 @@ type { IClientesDescuentos } IClientesDescuentos = interface(IDAStronglyTypedDataTable) - ['{C8E59947-D16F-4E0C-8083-6E38976D3AEE}'] + ['{4AA5CE18-35DB-4300-9ED4-331A887CE864}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2608,7 +2608,7 @@ type end; { TClientesDescuentosDataTableRules } - TClientesDescuentosDataTableRules = class(TIntfObjectDADataTableRules, IClientesDescuentos) + TClientesDescuentosDataTableRules = class(TDADataTableRules, IClientesDescuentos) private protected { Property getters and setters } @@ -2653,7 +2653,7 @@ type { IGruposProveedor } IGruposProveedor = interface(IDAStronglyTypedDataTable) - ['{282A2E8C-4215-4E53-B288-D0A1F06F1D88}'] + ['{87338CE9-54B1-4773-8303-EA58DAF72943}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2673,7 +2673,7 @@ type end; { TGruposProveedorDataTableRules } - TGruposProveedorDataTableRules = class(TIntfObjectDADataTableRules, IGruposProveedor) + TGruposProveedorDataTableRules = class(TDADataTableRules, IGruposProveedor) private protected { Property getters and setters } @@ -2700,7 +2700,7 @@ type { IGruposEmpleado } IGruposEmpleado = interface(IDAStronglyTypedDataTable) - ['{D776A77F-764B-41EF-A7DB-CE2CC3103899}'] + ['{10F8F1C2-264B-4F90-BF92-E7C95B60CDAE}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2720,7 +2720,7 @@ type end; { TGruposEmpleadoDataTableRules } - TGruposEmpleadoDataTableRules = class(TIntfObjectDADataTableRules, IGruposEmpleado) + TGruposEmpleadoDataTableRules = class(TDADataTableRules, IGruposEmpleado) private protected { Property getters and setters } @@ -2747,7 +2747,7 @@ type { IContactos_Refresh } IContactos_Refresh = interface(IDAStronglyTypedDataTable) - ['{4FC84341-3F8B-44B1-BC92-DD268A9B78E9}'] + ['{8D106256-A4A6-4EFC-9B95-00E732F64CDD}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -2880,7 +2880,7 @@ type end; { TContactos_RefreshDataTableRules } - TContactos_RefreshDataTableRules = class(TIntfObjectDADataTableRules, IContactos_Refresh) + TContactos_RefreshDataTableRules = class(TDADataTableRules, IContactos_Refresh) private f_NOTAS: IROStrings; procedure NOTAS_OnChange(Sender: TObject); @@ -3022,7 +3022,7 @@ type { IContratosEmpleados } IContratosEmpleados = interface(IDAStronglyTypedDataTable) - ['{6C57D443-4524-4643-B586-BD52E3627E42}'] + ['{CAB8E933-E3CA-45C3-BC64-E825B6A9CF9E}'] { Property getters and setters } function GetCONTRATOValue: String; procedure SetCONTRATOValue(const aValue: String); @@ -3036,7 +3036,7 @@ type end; { TContratosEmpleadosDataTableRules } - TContratosEmpleadosDataTableRules = class(TIntfObjectDADataTableRules, IContratosEmpleados) + TContratosEmpleadosDataTableRules = class(TDADataTableRules, IContratosEmpleados) private protected { Property getters and setters } @@ -3057,7 +3057,7 @@ type { IDescripcionesProveedores } IDescripcionesProveedores = interface(IDAStronglyTypedDataTable) - ['{5283DEB9-049A-401A-9CB7-B1CFA1CCAD9E}'] + ['{0A691948-860C-439D-8E06-09FC51F537A4}'] { Property getters and setters } function GetDESCRIPCION_PROVEEDORValue: String; procedure SetDESCRIPCION_PROVEEDORValue(const aValue: String); @@ -3071,7 +3071,7 @@ type end; { TDescripcionesProveedoresDataTableRules } - TDescripcionesProveedoresDataTableRules = class(TIntfObjectDADataTableRules, IDescripcionesProveedores) + TDescripcionesProveedoresDataTableRules = class(TDADataTableRules, IDescripcionesProveedores) private protected { Property getters and setters } @@ -3092,7 +3092,7 @@ type { IPersonalContacto } IPersonalContacto = interface(IDAStronglyTypedDataTable) - ['{8F0EC704-5AB2-499D-8437-5068F50CEEF0}'] + ['{4BF63909-FA4E-4769-97E2-FF0771DBDB4F}'] { Property getters and setters } function GetIDValue: Integer; procedure SetIDValue(const aValue: Integer); @@ -3160,7 +3160,7 @@ type end; { TPersonalContactoDataTableRules } - TPersonalContactoDataTableRules = class(TIntfObjectDADataTableRules, IPersonalContacto) + TPersonalContactoDataTableRules = class(TDADataTableRules, IPersonalContacto) private protected { Property getters and setters } diff --git a/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas b/Source/Modulos/Contactos/Model/schContactosServer_Intf.pas index d8932cdc..5e2067d9 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 = '{5D663643-B45F-42DF-B806-6054C92C256F}'; - RID_GruposClienteDelta = '{A22E564C-9D18-40D7-AC06-2AE7A6719723}'; - RID_DatosBancariosDelta = '{D0E06730-72AE-48A3-AD77-BCC0557E09E3}'; - RID_ClientesDelta = '{B591C54A-E5D0-4628-B3A5-E7362608E4E7}'; - RID_ProveedoresDelta = '{F0162520-4D44-4911-8B70-5FB15FE8098A}'; - RID_EmpleadosDelta = '{CD6CA1DF-ECE1-41E8-80D2-F3DB2CEECDBF}'; - RID_DireccionesContactoDelta = '{19FE4B40-6CA1-4373-9C7A-E4037FB533E2}'; - RID_ClientesDescuentosDelta = '{283BCBC2-EE2C-4B22-B9A7-A8F1498F33DD}'; - RID_GruposProveedorDelta = '{CEAE47D6-CA85-4726-B05B-C31C73DEAD0A}'; - RID_GruposEmpleadoDelta = '{F9D415C5-F9FE-410D-AB3A-9B6090F0C373}'; - RID_Contactos_RefreshDelta = '{5ACD3F74-2EF3-4596-AE9C-1FC05A27262C}'; - RID_ContratosEmpleadosDelta = '{2710E74D-E05B-4D23-9E25-72BAA0DE2535}'; - RID_DescripcionesProveedoresDelta = '{30AA4ECE-FE1C-4A9A-94EC-F6C4075E80E3}'; - RID_PersonalContactoDelta = '{995D0237-5EF5-4E5A-B44E-747F0A81D6D5}'; + RID_ContactosDelta = '{783D6342-53F9-40DF-81AF-DE782DA8B75A}'; + RID_GruposClienteDelta = '{F2CACBA5-7F04-4EDB-BC31-41E907B8EC26}'; + RID_DatosBancariosDelta = '{4EB1B188-CBE1-460A-A774-BF8E36A6E757}'; + RID_ClientesDelta = '{CAE0D87E-5926-4DB8-9AA3-541AFDE940D3}'; + RID_ProveedoresDelta = '{FCE9CA4B-64BD-43E2-AF85-6C3388B64F14}'; + RID_EmpleadosDelta = '{18DB065A-0CFF-44C3-8221-283C5F804249}'; + RID_DireccionesContactoDelta = '{43E64AF9-2F6C-4F2E-9933-0EB09313D982}'; + RID_ClientesDescuentosDelta = '{16AF7FE2-2AF0-4D98-ADA6-D29209C2A046}'; + RID_GruposProveedorDelta = '{C607DA1D-70B8-4843-A46D-73691BCCF0FB}'; + RID_GruposEmpleadoDelta = '{F2AA8B32-A14B-4754-BD82-531770EF1BA0}'; + RID_Contactos_RefreshDelta = '{0AD2BAF9-797E-49CD-A47C-4C50306595BF}'; + RID_ContratosEmpleadosDelta = '{67B25A55-49CA-436A-A1A1-C058981C54BA}'; + RID_DescripcionesProveedoresDelta = '{4464B700-9CE4-4282-B765-52D43F0EA76D}'; + RID_PersonalContactoDelta = '{6010CBDE-27EB-414B-8609-5CC20E4C93B8}'; type { IContactosDelta } IContactosDelta = interface(IContactos) - ['{5D663643-B45F-42DF-B806-6054C92C256F}'] + ['{783D6342-53F9-40DF-81AF-DE782DA8B75A}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -326,7 +326,7 @@ type { IGruposClienteDelta } IGruposClienteDelta = interface(IGruposCliente) - ['{A22E564C-9D18-40D7-AC06-2AE7A6719723}'] + ['{F2CACBA5-7F04-4EDB-BC31-41E907B8EC26}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -372,7 +372,7 @@ type { IDatosBancariosDelta } IDatosBancariosDelta = interface(IDatosBancarios) - ['{D0E06730-72AE-48A3-AD77-BCC0557E09E3}'] + ['{4EB1B188-CBE1-460A-A774-BF8E36A6E757}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -502,7 +502,7 @@ type { IClientesDelta } IClientesDelta = interface(IClientes) - ['{B591C54A-E5D0-4628-B3A5-E7362608E4E7}'] + ['{CAE0D87E-5926-4DB8-9AA3-541AFDE940D3}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -981,7 +981,7 @@ type { IProveedoresDelta } IProveedoresDelta = interface(IProveedores) - ['{F0162520-4D44-4911-8B70-5FB15FE8098A}'] + ['{FCE9CA4B-64BD-43E2-AF85-6C3388B64F14}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -1448,7 +1448,7 @@ type { IEmpleadosDelta } IEmpleadosDelta = interface(IEmpleados) - ['{CD6CA1DF-ECE1-41E8-80D2-F3DB2CEECDBF}'] + ['{18DB065A-0CFF-44C3-8221-283C5F804249}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CATEGORIAValue : Integer; @@ -1883,7 +1883,7 @@ type { IDireccionesContactoDelta } IDireccionesContactoDelta = interface(IDireccionesContacto) - ['{19FE4B40-6CA1-4373-9C7A-E4037FB533E2}'] + ['{43E64AF9-2F6C-4F2E-9933-0EB09313D982}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; @@ -2098,7 +2098,7 @@ type { IClientesDescuentosDelta } IClientesDescuentosDelta = interface(IClientesDescuentos) - ['{283BCBC2-EE2C-4B22-B9A7-A8F1498F33DD}'] + ['{16AF7FE2-2AF0-4D98-ADA6-D29209C2A046}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CLIENTEValue : Integer; @@ -2180,7 +2180,7 @@ type { IGruposProveedorDelta } IGruposProveedorDelta = interface(IGruposProveedor) - ['{CEAE47D6-CA85-4726-B05B-C31C73DEAD0A}'] + ['{C607DA1D-70B8-4843-A46D-73691BCCF0FB}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -2226,7 +2226,7 @@ type { IGruposEmpleadoDelta } IGruposEmpleadoDelta = interface(IGruposEmpleado) - ['{F9D415C5-F9FE-410D-AB3A-9B6090F0C373}'] + ['{F2AA8B32-A14B-4754-BD82-531770EF1BA0}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldDESCRIPCIONValue : String; @@ -2272,7 +2272,7 @@ type { IContactos_RefreshDelta } IContactos_RefreshDelta = interface(IContactos_Refresh) - ['{5ACD3F74-2EF3-4596-AE9C-1FC05A27262C}'] + ['{0AD2BAF9-797E-49CD-A47C-4C50306595BF}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldNIF_CIFValue : String; @@ -2547,7 +2547,7 @@ type { IContratosEmpleadosDelta } IContratosEmpleadosDelta = interface(IContratosEmpleados) - ['{2710E74D-E05B-4D23-9E25-72BAA0DE2535}'] + ['{67B25A55-49CA-436A-A1A1-C058981C54BA}'] { Property getters and setters } function GetOldCONTRATOValue : String; @@ -2581,7 +2581,7 @@ type { IDescripcionesProveedoresDelta } IDescripcionesProveedoresDelta = interface(IDescripcionesProveedores) - ['{30AA4ECE-FE1C-4A9A-94EC-F6C4075E80E3}'] + ['{4464B700-9CE4-4282-B765-52D43F0EA76D}'] { Property getters and setters } function GetOldDESCRIPCION_PROVEEDORValue : String; @@ -2615,7 +2615,7 @@ type { IPersonalContactoDelta } IPersonalContactoDelta = interface(IPersonalContacto) - ['{995D0237-5EF5-4E5A-B44E-747F0A81D6D5}'] + ['{6010CBDE-27EB-414B-8609-5CC20E4C93B8}'] { Property getters and setters } function GetOldIDValue : Integer; function GetOldID_CONTACTOValue : Integer; diff --git a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm index 407b8de6..66ccec06 100644 --- a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm +++ b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm @@ -1779,6 +1779,7 @@ object srvContactos: TsrvContactos end> Statements = < item + Connection = 'IBX' ConnectionType = 'Interbase' Default = True TargetTable = 'CONTACTOS' @@ -1787,7 +1788,7 @@ object srvContactos: TsrvContactos 'DIGO_POSTAL, '#10' TELEFONO_1, TELEFONO_2, MOVIL_1, MOVIL_2, FAX,' + ' EMAIL_1, '#10' EMAIL_2, PAGINA_WEB, NOTAS, FECHA_ALTA, FECHA_MOD' + 'IFICACION, '#10' USUARIO, REFERENCIA, PERSONA_CONTACTO'#10' FROM'#10' ' + - ' CONTACTOS'#10' WHERE ID = :ID'#10 + ' CONTACTOS'#10' WHERE {where}'#10' and ID = :ID'#10#10 StatementType = stSQL ColumnMappings = < item diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 8c41a174..c3351fe6 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 f56fab86..a0a73b2c 100644 --- a/Source/Servidor/FactuGES_Server.dpr +++ b/Source/Servidor/FactuGES_Server.dpr @@ -132,10 +132,10 @@ uses schAlbaranesProveedorServer_Intf in '..\Modulos\Albaranes de proveedor\Model\schAlbaranesProveedorServer_Intf.pas', schInventarioClient_Intf in '..\Modulos\Inventario\Model\schInventarioClient_Intf.pas', schInventarioServer_Intf in '..\Modulos\Inventario\Model\schInventarioServer_Intf.pas', - schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas', - schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas', schEmpresasClient_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasClient_Intf.pas', - schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas'; + schEmpresasServer_Intf in '..\ApplicationBase\Empresas\Model\schEmpresasServer_Intf.pas', + schContactosClient_Intf in '..\Modulos\Contactos\Model\schContactosClient_Intf.pas', + schContactosServer_Intf in '..\Modulos\Contactos\Model\schContactosServer_Intf.pas'; {$R *.res} {$R ..\Servicios\RODLFile.res} diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 137084f0..7dd6081d 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -37,6 +37,10 @@ FalseTrueFalse/standaloneTrueFalse1810FalseFalseFalseFalseFalse308212521.8.1.01.8.1.0martes, 16 de marzo de 2010 17:45 + + + + ExpressPrinting System by Developer Express Inc. FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index a8b8b45b..feaf9a99 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 1,8,0,0 -PRODUCTVERSION 1,8,0,0 +FILEVERSION 1,8,1,0 +PRODUCTVERSION 1,8,1,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -12,9 +12,9 @@ BEGIN BEGIN BLOCK "0C0A04E4" BEGIN - VALUE "FileVersion", "1.8.0.0\0" - VALUE "ProductVersion", "1.8.0.0\0" - VALUE "CompileDate", "martes, 16 de marzo de 2010 17:45\0" + VALUE "FileVersion", "1.8.1.0\0" + VALUE "ProductVersion", "1.8.1.0\0" + VALUE "CompileDate", "martes, 16 de marzo de 2010 17:57\0" END END BLOCK "VarFileInfo"