diff --git a/org.adempiere.base/src/org/compiere/model/MUserPreference.java b/org.adempiere.base/src/org/compiere/model/MUserPreference.java
index 1c73f6e5ea..6de7ba1561 100644
--- a/org.adempiere.base/src/org/compiere/model/MUserPreference.java
+++ b/org.adempiere.base/src/org/compiere/model/MUserPreference.java
@@ -34,7 +34,7 @@ public class MUserPreference extends X_AD_UserPreference{
/**
*
*/
- private static final long serialVersionUID = 4653362918831026642L;
+ private static final long serialVersionUID = -5816348717625872665L;
public MUserPreference(Properties ctx, int AD_UserPreference_ID,
String trxName) {
@@ -55,21 +55,25 @@ public class MUserPreference extends X_AD_UserPreference{
super.setAD_User_ID(AD_User_ID);
} //setAD_User_ID
- private static MUserPreference createUserPreferences(int AD_User_ID, int AD_Client_ID){
- MUserPreference preferences = new MUserPreference(Env.getCtx(), 0, null);
+ private static MUserPreference createUserPreferences(int AD_User_ID, int AD_Client_ID, String trxName){
+ MUserPreference preferences = new MUserPreference(Env.getCtx(), 0, trxName);
preferences.setAD_User_ID(AD_User_ID);
preferences.setAD_Client_ID(AD_Client_ID);
preferences.saveEx();
return preferences;
} //createUserPreferences
-
+
public static MUserPreference getUserPreference(int AD_User_ID, int AD_Client_ID){
- Query query = new Query(Env.getCtx(), MUserPreference.Table_Name, "AD_User_ID=? AND AD_Client_ID=?", null);
+ return getUserPreference(AD_User_ID, AD_Client_ID, null);
+ }
+
+ public static MUserPreference getUserPreference(int AD_User_ID, int AD_Client_ID, String trxName){
+ Query query = new Query(Env.getCtx(), MUserPreference.Table_Name, "AD_User_ID=? AND AD_Client_ID=?", trxName);
MUserPreference preferences = query.setParameters(new Object[]{AD_User_ID, AD_Client_ID}).firstOnly();
if(preferences==null){
- preferences = createUserPreferences(AD_User_ID, AD_Client_ID);
+ preferences = createUserPreferences(AD_User_ID, AD_Client_ID, trxName);
}
return preferences;
diff --git a/org.adempiere.install/install.app.launch b/org.adempiere.install/install.app.launch
index 46b8ca7efd..e6f0bd0ae1 100644
--- a/org.adempiere.install/install.app.launch
+++ b/org.adempiere.install/install.app.launch
@@ -21,7 +21,7 @@
-
+
diff --git a/org.adempiere.server-feature/server.product.launch b/org.adempiere.server-feature/server.product.launch
index 897f033c93..b470e8ade3 100644
--- a/org.adempiere.server-feature/server.product.launch
+++ b/org.adempiere.server-feature/server.product.launch
@@ -24,7 +24,7 @@
-
+