diff --git a/Build/Build.fbp5 b/Build/Build.fbp5 index 139edd5e..9e08fb88 100644 --- a/Build/Build.fbp5 +++ b/Build/Build.fbp5 @@ -683,7 +683,7 @@ source_path 1 0 - 4 + 6 False 0 %source_path%\Servidor\FactuGES_Server.dpr @@ -703,15 +703,15 @@ source_path True @@ -19259,7 +19259,7 @@ Comments= 1 0 - 4 + 6 False 0 %source_path%\Cliente\FactuGES.dpr @@ -19279,13 +19279,13 @@ Comments= False @@ -19329,7 +19329,7 @@ Comments= False %output_path%\Cliente False - PluginSDK_D10R;GUISDK_D11;Base;GUIBase;ApplicationBase; + PluginSDK_D11R;GUISDK_D11R;Base;GUIBase;ApplicationBase; False fa8 True diff --git a/Installer/librerias.txt b/Installer/librerias.txt index 31ced891..e61b4da0 100644 --- a/Installer/librerias.txt +++ b/Installer/librerias.txt @@ -28,7 +28,7 @@ frxe11.bpl frxTee11.bpl fs11.bpl fsTee11.bpl -GUISDK_D11.bpl +GUISDK_D11R.bpl Jcl110.bpl JclVcl110.bpl JSDialog100.bpl diff --git a/Source/ApplicationBase/ApplicationBase.dpk b/Source/ApplicationBase/ApplicationBase.dpk index 2400cb64..c17b8d7e 100644 --- a/Source/ApplicationBase/ApplicationBase.dpk +++ b/Source/ApplicationBase/ApplicationBase.dpk @@ -27,7 +27,7 @@ package ApplicationBase; requires JvJansD11R, - PluginSDK_D10R, + PluginSDK_D11R, Base, GUIBase; diff --git a/Source/ApplicationBase/ApplicationBase.dproj b/Source/ApplicationBase/ApplicationBase.dproj index 82f5ea20..7f62faa8 100644 --- a/Source/ApplicationBase/ApplicationBase.dproj +++ b/Source/ApplicationBase/ApplicationBase.dproj @@ -55,6 +55,11 @@ MainSource + + + + + @@ -63,11 +68,7 @@
DataModuleEmpresasObj
 - - - - @@ -77,7 +78,7 @@ TForm -
fEditorEmpresa
+
fEditorEmpresas
TForm diff --git a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm index 48a0c97e..0c8dc3f7 100644 --- a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm +++ b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.dfm @@ -1,7 +1,6 @@ object srvEmpresas: TsrvEmpresas OldCreateOrder = True OnCreate = DARemoteServiceCreate - RequiresSession = True ConnectionName = 'IBX' ServiceSchema = schEmpresas ServiceDataStreamer = DABin2DataStreamer diff --git a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.pas b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.pas index 9308087d..fc8b3813 100644 --- a/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.pas +++ b/Source/ApplicationBase/Empresas/Servidor/srvEmpresas_Impl.pas @@ -119,7 +119,7 @@ end; procedure TsrvEmpresas.DARemoteServiceCreate(Sender: TObject); begin - SessionManager := dmServer.SessionManager; + //SessionManager := dmServer.SessionManager; bpEmpresas.BusinessRulesID := BIZ_SERVER_EMPRESAS; end; diff --git a/Source/ApplicationBase/Usuarios/Servidor/srvUsuarios_Impl.dfm b/Source/ApplicationBase/Usuarios/Servidor/srvUsuarios_Impl.dfm index 77511a83..a6279fc0 100644 --- a/Source/ApplicationBase/Usuarios/Servidor/srvUsuarios_Impl.dfm +++ b/Source/ApplicationBase/Usuarios/Servidor/srvUsuarios_Impl.dfm @@ -1,7 +1,6 @@ object srvUsuarios: TsrvUsuarios OldCreateOrder = True OnCreate = DataAbstractServiceCreate - SessionManager = dmServer.SessionManager ServiceSchema = schUsuarios ServiceDataStreamer = Bin2DataStreamer AllowExecuteSQL = True diff --git a/Source/ApplicationBase/Usuarios/Servidor/srvUsuarios_Impl.pas b/Source/ApplicationBase/Usuarios/Servidor/srvUsuarios_Impl.pas index 4007ec6c..8a1c84fa 100644 --- a/Source/ApplicationBase/Usuarios/Servidor/srvUsuarios_Impl.pas +++ b/Source/ApplicationBase/Usuarios/Servidor/srvUsuarios_Impl.pas @@ -54,7 +54,7 @@ end; procedure TsrvUsuarios.DataAbstractServiceCreate(Sender: TObject); begin - SessionManager := dmServer.SessionManager; + //SessionManager := dmServer.SessionManager; end; initialization diff --git a/Source/Base/Base.dpk b/Source/Base/Base.dpk index 39d71f7b..61b65b18 100644 --- a/Source/Base/Base.dpk +++ b/Source/Base/Base.dpk @@ -30,7 +30,7 @@ requires rtl, vcl, TB2k_D10, - GUISDK_D11, + GUISDK_D11RR, RemObjects_Core_D11, DataAbstract_Core_D11, vcljpg, diff --git a/Source/Base/Base.dproj b/Source/Base/Base.dproj index 9dca296b..3c77ab2c 100644 --- a/Source/Base/Base.dproj +++ b/Source/Base/Base.dproj @@ -54,57 +54,57 @@ MainSource - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
fConfigurarConexion
diff --git a/Source/Base/Utiles/uGridClipboardUtils.pas b/Source/Base/Utiles/uGridClipboardUtils.pas index 35760c1e..e854dde8 100644 --- a/Source/Base/Utiles/uGridClipboardUtils.pas +++ b/Source/Base/Utiles/uGridClipboardUtils.pas @@ -273,12 +273,12 @@ begin try AIndex := -1; - ACaption := AReader.ReadString; + ACaption := AReader.ReadAnsiString; NumCols := AReader.ReadInteger; // nº de columnas for iContador := 0 to NumCols - 1 do begin - AValueName := AReader.ReadString; - AValueType := AReader.ReadString; + AValueName := AReader.ReadAnsiString; + AValueType := AReader.ReadAnsiString; AValueNameList.Add(AValueName); AValueTypeList.Add(AValueType); @@ -380,7 +380,7 @@ begin AWriter := TcxWriter.Create(AStream); try - AWriter.WriteString(ACaption); + AWriter.WriteAnsiString(ACaption); AWriter.WriteInteger(AView.ItemCount); for i := 0 to AView.ItemCount - 1 do @@ -396,8 +396,8 @@ begin AValueType := AView.Items[i].DataBinding.ValueType; - AWriter.WriteString(AName); - AWriter.WriteString(AValueType); + AWriter.WriteAnsiString(AName); + AWriter.WriteAnsiString(AValueType); end; with AView.DataController do diff --git a/Source/Base/Utiles/uReferenciasUtils.pas b/Source/Base/Utiles/uReferenciasUtils.pas index 05b2d92d..300efec6 100644 --- a/Source/Base/Utiles/uReferenciasUtils.pas +++ b/Source/Base/Utiles/uReferenciasUtils.pas @@ -12,7 +12,7 @@ function CompararReferencias(const ARef1, ARef2 : String) : Integer; implementation uses - JclStrings, cxVariants; + JclAnsiStrings, cxVariants; function CompararReferencias(const ARef1, ARef2 : String) : Integer; var diff --git a/Source/Cliente/FactuGES.dpr b/Source/Cliente/FactuGES.dpr index f5693134..b105df38 100644 --- a/Source/Cliente/FactuGES.dpr +++ b/Source/Cliente/FactuGES.dpr @@ -14,14 +14,14 @@ uses uNavPaneUtils in 'Utiles\uNavPaneUtils.pas', uMainMenuController in 'uMainMenuController.pas', uClienteUtils in 'Utiles\uClienteUtils.pas', - uBootStrap in 'uBootStrap.pas'; + uBootStrap in 'uBootStrap.pas', + VCLFixPack in 'VCLFixPack.pas'; {$R *.res} begin Application.Initialize; - //ReportMemoryLeaksOnShutdown := True; // ¡¡¡Fallo en Delphi 2007!!! diff --git a/Source/Cliente/FactuGES.dproj b/Source/Cliente/FactuGES.dproj index 876919ec..45f8bf9d 100644 --- a/Source/Cliente/FactuGES.dproj +++ b/Source/Cliente/FactuGES.dproj @@ -5,7 +5,7 @@ FactuGES.dpr Debug AnyCPU - PluginSDK_D10R;GUISDK_D11;Base;GUIBase;ApplicationBase;vclx;vcl;rtl;vclactnband;xmlrtl;JSDialog100 + PluginSDK_D11R;GUISDK_D11R;Base;GUIBase;ApplicationBase;vclx;vcl;rtl;vclactnband;xmlrtl;JSDialog100 DCC32 ..\..\Output\Debug\Cliente\FactuGES.exe true @@ -41,11 +41,10 @@ .\ .\ .\ - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib - $(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib - DEBUG; + C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib + C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib + C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib + C:\JCL\lib\d11\debug;$(BDS)\lib\Debug;$(BDS)\Lib\Debug\Indy10;T:\COMPON~1\jcl\lib\d11\debug;$(BDSCOMMONDIR)\Dcp;..\Lib;..\Modulos\Lib True True 2 @@ -54,16 +53,7 @@ Delphi.Personality VCLApplication -FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1680FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.6.8.0FactuGESFactuGES1.6.8.0 - - - - - ExpressPrinting System by Developer Express Inc. - PluginSDK for Delphi 10 (Runtime) - Microsoft Office 2000 Sample Automation Server Wrapper Components - Microsoft Office XP Sample Automation Server Wrapper Components - FactuGES.dprFalse +FalseTrueFalseC:\Archivos de programa\Borland\Delphi7\Bin\TrueFalse1690FalseFalseFalseFalseFalse30821252Rodax Software S.L.1.6.9.0FactuGESFactuGES1.6.9.0FactuGES.dprFalse @@ -83,6 +73,7 @@ +