From 625fc8c17417262045e2938fe005874dc7f9ef96 Mon Sep 17 00:00:00 2001 From: roberto Date: Wed, 9 Jun 2010 18:22:44 +0000 Subject: [PATCH] =?UTF-8?q?Se=20arregla=20refresco=20de=20contactos=20en?= =?UTF-8?q?=20la=20parte=20servidora=20para=20cuando=20a=C3=B1aden=20un=20?= =?UTF-8?q?cliente=20o=20proveedor=20no=20se=20duplique=20el=20elemento=20?= =?UTF-8?q?insertado=20falseando=20asi=20la=20informacion.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://192.168.0.254/svn/Proyectos.Tecsitel_FactuGES2/trunk@999 0c75b7a4-871f-7646-8a2f-f78d34cc349f --- .../Empresas/Data/uDataModuleEmpresas.dfm | 12 ++- .../Empresas/Model/schEmpresasClient_Intf.pas | 54 +++++----- .../Empresas/Model/schEmpresasServer_Intf.pas | 48 ++++----- .../Empresas/Servidor/srvEmpresas_Impl.dfm | 31 +++++- Source/Base/Base.dproj | 102 +++++++++--------- Source/Base/Base.res | Bin 384 -> 4748 bytes Source/Cliente/FactuGES.rc | 8 +- Source/Cliente/FactuGES.res | Bin 172156 -> 171984 bytes .../Model/schContactosClient_Intf.pas | 86 +++++++-------- .../Model/schContactosServer_Intf.pas | 56 +++++----- .../Contactos/Servidor/srvContactos_Impl.dfm | 3 +- Source/Servidor/FactuGES_Server.RES | Bin 23480 -> 23200 bytes Source/Servidor/FactuGES_Server.dpr | 6 +- Source/Servidor/FactuGES_Server.dproj | 4 + Source/Servidor/FactuGES_Server.rc | 10 +- 15 files changed, 230 insertions(+), 190 deletions(-) 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 8b251f312bcccec5485024f6fe8d80e1cdf25746..1641339fcc482e7e3492d1b45813a86619622c33 100644 GIT binary patch literal 4748 zcmbW5&ub)A5XUPdpe&2#;C*uNAUVhgd+&(4um@dnom`vXF9g}ZuHJ;se=<3UNdFJg zbCw+UD9j$byGIXV`~6hC>h4S?F|k9X-j90q{Z_qtZ<;nUJCO8!h?p${kR>3GhM`oH*q zk=UsjOCIgA_4!`B+Gb&`I84R)bT4dy-BQV<-SyFz?R8ILEQ(+JB$u{sEXE@j@B*7W zT;iZH#|OJ<&DO$RCkM6VbK3(B(k{nbdv1lpc;E$xz9as|v3uE1V{hw2w~g3eD0an7 z{BT%G%irdMe*|oDJmgvJaA2`9B<6Xi*?M~Q;)@Sbfwf3uf zVaWkbUjU=;sL{BlYemIZXv%qZ{SZw{-TCU+;!nH6KDDIJumU+9{E0zXW4>7T)y|>$DQlv zRJe?TjSp{c!DqeayAnSMTtZZT;>LN7J0Rls+5m@q)MbyB*eL%Eu@(+$Cw}Pd@q7N| z%Q0*AHpCP^b9v`@jx-l_FD>khpW2W8(OU2&V5TrnoAY-m_hlcV?zq3;7{2gF{J#Hc z6R+o~mVenX?>@W0@_DVzyOFs(5464CY{!q9ChoF#_*eXi@4gFuV8?vhl=_w5$iKL0 zEV0nMBcN08xtRmsgJrqjh@s#|{?*ssnsG)mH*wa6{efF0JFWHok@kA5%b661{B38= zCcgJ|*ZFTpV$8<-&+AWpa)Q8*`wL&hMeNQ^v6I7$HSdLZhZ^&+6<@Uw_Zsml9^v3W zVvPDBKHh;i=RU4J_ta3E;)Mn>Y+L zKLZ0UQ+*km9FO-b?U4gmn-62iwzH6&*duKGo~aUV)bYDla8wWZ9+^7p-F<8lP@i!m z@vhbD_${F}h>^T;C(?(b*OJDk?{dEXB?nuehoON3HAb!7Mr7-ls!84-5V-jJugbu<_$}mU=Yd9!?TOX;|B-#B)+0x#9q*yqJiqS!`49d=7ztk$O+9=1i;?K_|J<8T z?0b7=-`Z3A#vV$4XJ5(lQ~TOZHUFdA%oWvK5zg&_IKXIbughQBA8XAsd#=@|TFLXC zy(^m((;DnQmDQKatmw!@c`| G?EMQ&4NnpP delta 11 ScmeBCZD5|Duvteife`=|>;pCc 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 8e8d712dbe2d1d485762edb8f618ebc94b28d6b9..75bbc8a2d1109620ab5d3cd906122748f1211bc2 100644 GIT binary patch delta 284 zcmY+9u?m7v6o$Wh(^8WVS{#K48XA0oK$;vI+AC=2Eplk^0fIYeYeQpujg3A-b3+dh z)D=bPhr{9HKj(1%&)q3*PI3@eX=MA*b6gq;Ts#j1K0CAQ4H+Qu{mOfEq0>-mgFz5f z-q`}PC4H?+7}nkZdM%AvVG%`@Ihlh^99NVs!C}3w7mv^ilR>W142=e41!DdHmD>;tEIX)HG@NcfRLrFYZfmAo6~5nG^X zG>rCHg|(7-jB8-wc}B}@sFchjlWA3aztlEiy=08 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 8c41a174e05697c9e7815eb3f67aa9ccad07f3ff..c3351fe6040ec4e48b121726ef6194b8d79f977b 100644 GIT binary patch delta 175 zcmdn7opHfd#tkJASq1`JJPdHa$iT)RAi%)D$RNRx!3v_`JQfB9CI$rsh};Se1_ovX z52%BM!N342$H&0Hir}d-0L^4zSi(5@UW6PIkop(lA;JPQ85OWFPL7IHVtT+Zxh_&{ V@{>q|$#9$dpt10zBwdAkRPip6)MPA?-31XxO z@rW5Ni81b0wu3^`#Ry}*p72a?gN%KOoOeQ3QTjz4KHJ1IzU5SA#E`yn=6;cQPJURh zW`4@aCUc00PFr^JT6axFh+Fz%VulB9vMj6ZcU{QH4PLHo)>wbaE_p?5!ni5Flb2W2 N-)detLPx7X?;laELFE7d 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"