diff --git a/Build/Build.fbpInf b/Build/Build.fbpInf index 1a0b5bc5..5b7ef20b 100644 --- a/Build/Build.fbpInf +++ b/Build/Build.fbpInf @@ -6,7 +6,7 @@ - + diff --git a/Source/Cliente/FactuGES.rc b/Source/Cliente/FactuGES.rc index 6e13db00..54b2ea20 100644 --- a/Source/Cliente/FactuGES.rc +++ b/Source/Cliente/FactuGES.rc @@ -1,7 +1,7 @@ -MAINICON ICON "C:\Codigo Tecsitel\Resources\Iconos\Factuges.ico" +MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Factuges.ico" 1 VERSIONINFO -FILEVERSION 1,8,3,0 -PRODUCTVERSION 1,8,3,0 +FILEVERSION 1,8,5,0 +PRODUCTVERSION 1,8,5,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.3.0\0" + VALUE "FileVersion", "1.8.5.0\0" VALUE "InternalName", "FactuGES\0" VALUE "ProductName", "FactuGES\0" - VALUE "ProductVersion", "1.8.3.0\0" + VALUE "ProductVersion", "1.8.5.0\0" END END BLOCK "VarFileInfo" diff --git a/Source/Cliente/FactuGES.res b/Source/Cliente/FactuGES.res index 24dfcf0e..ba95f9bb 100644 Binary files a/Source/Cliente/FactuGES.res and b/Source/Cliente/FactuGES.res differ diff --git a/Source/Modulos/Contactos/Model/uBizContactos.pas b/Source/Modulos/Contactos/Model/uBizContactos.pas index bee44df7..c1941f76 100644 --- a/Source/Modulos/Contactos/Model/uBizContactos.pas +++ b/Source/Modulos/Contactos/Model/uBizContactos.pas @@ -517,7 +517,6 @@ end; procedure TBizContacto.OnNewRecord(Sender: TDADataTable); begin inherited; - ID := GetRecNo; // -1, -2, -3... IniciarValoresContactoNuevo; end; diff --git a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm index 1211e53a..c4bf88e0 100644 --- a/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm +++ b/Source/Modulos/Contactos/Servidor/srvContactos_Impl.dfm @@ -1882,6 +1882,7 @@ object srvContactos: TsrvContactos Name = 'ID' DataType = datAutoInc GeneratorName = 'GEN_CONTACTOS_ID' + ServerAutoRefresh = True DictionaryEntry = 'Contactos_ID' InPrimaryKey = True end diff --git a/Source/Modulos/Contactos/Views/uViewContactos.dfm b/Source/Modulos/Contactos/Views/uViewContactos.dfm index ca86f4eb..21202b23 100644 --- a/Source/Modulos/Contactos/Views/uViewContactos.dfm +++ b/Source/Modulos/Contactos/Views/uViewContactos.dfm @@ -18,6 +18,11 @@ inherited frViewContactos: TfrViewContactos Column = cxGridViewNOMBRE end> OptionsBehavior.PullFocusing = True + object cxGridViewID: TcxGridDBColumn + DataBinding.FieldName = 'ID' + Visible = False + VisibleForCustomization = False + end object cxGridViewREFERENCIA: TcxGridDBColumn Caption = 'C'#243'digo' DataBinding.FieldName = 'REFERENCIA' @@ -132,10 +137,14 @@ inherited frViewContactos: TfrViewContactos Width = 322 end inherited eLista: TcxComboBox + Left = 412 Style.LookAndFeel.SkinName = '' StyleDisabled.LookAndFeel.SkinName = '' StyleFocused.LookAndFeel.SkinName = '' StyleHot.LookAndFeel.SkinName = '' + ExplicitLeft = 412 + ExplicitWidth = 215 + Width = 215 end end inherited TBXAlignmentPanel1: TTBXAlignmentPanel diff --git a/Source/Modulos/Contactos/Views/uViewContactos.pas b/Source/Modulos/Contactos/Views/uViewContactos.pas index 6903893c..19536c43 100644 --- a/Source/Modulos/Contactos/Views/uViewContactos.pas +++ b/Source/Modulos/Contactos/Views/uViewContactos.pas @@ -39,6 +39,7 @@ type cxGridViewEMAIL_2: TcxGridDBColumn; cxGridViewPAGINA_WEB: TcxGridDBColumn; cxGridViewREFERENCIA: TcxGridDBColumn; + cxGridViewID: TcxGridDBColumn; protected FContactos: IBizContacto; function GetContactos: IBizContacto; virtual; diff --git a/Source/Servidor/FactuGES_Server.RES b/Source/Servidor/FactuGES_Server.RES index 7c8c9fce..a9d0a28b 100644 Binary files a/Source/Servidor/FactuGES_Server.RES and b/Source/Servidor/FactuGES_Server.RES differ diff --git a/Source/Servidor/FactuGES_Server.dproj b/Source/Servidor/FactuGES_Server.dproj index 21374f6f..6d76a4d3 100644 --- a/Source/Servidor/FactuGES_Server.dproj +++ b/Source/Servidor/FactuGES_Server.dproj @@ -38,6 +38,9 @@ FalseTrueFalse/standaloneTrueFalse1850FalseFalseFalseFalseFalse308212521.8.5.01.8.5.0martes, 20 de julio de 2010 11:19 + + + ExpressPrinting System by Developer Express Inc. FactuGES_Server.dpr diff --git a/Source/Servidor/FactuGES_Server.rc b/Source/Servidor/FactuGES_Server.rc index 5f0a7f6a..86d15740 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" +MAINICON ICON "C:\Codigo tecsitel\Resources\Iconos\Servidor.ico" 1 VERSIONINFO -FILEVERSION 1,8,3,0 -PRODUCTVERSION 1,8,3,0 +FILEVERSION 1,8,5,0 +PRODUCTVERSION 1,8,5,0 FILEFLAGSMASK 0x3FL FILEFLAGS 0x00L FILEOS 0x40004L @@ -12,9 +12,9 @@ BEGIN BEGIN BLOCK "0C0A04E4" BEGIN - VALUE "FileVersion", "1.8.3.0\0" - VALUE "ProductVersion", "1.8.3.0\0" - VALUE "CompileDate", "martes, 20 de julio de 2010 11:19\0" + VALUE "FileVersion", "1.8.5.0\0" + VALUE "ProductVersion", "1.8.5.0\0" + VALUE "CompileDate", "miércoles, 22 de septiembre de 2010 19:15\0" END END BLOCK "VarFileInfo"