diff --git a/src/org/openbravo/retail/posterminal/OrderLoader.java b/src/org/openbravo/retail/posterminal/OrderLoader.java
--- a/src/org/openbravo/retail/posterminal/OrderLoader.java
+++ b/src/org/openbravo/retail/posterminal/OrderLoader.java
@@ -158,10 +158,8 @@
    */
   public void initializeVariables(JSONObject jsonorder) throws JSONException {
     try {
-      useOrderDocumentNoForRelatedDocs = "Y".equals(Preferences.getPreferenceValue(
-          "OBPOS_UseOrderDocumentNoForRelatedDocs", true, OBContext.getOBContext()
-              .getCurrentClient(), OBContext.getOBContext().getCurrentOrganization(), OBContext
-              .getOBContext().getUser(), OBContext.getOBContext().getRole(), null));
+      useOrderDocumentNoForRelatedDocs = "Y".equals(Preferences.getCurrentPreferenceValue(
+          "OBPOS_UseOrderDocumentNoForRelatedDocs", true, null));
     } catch (PropertyException e1) {
       log.error(
           "Error getting OBPOS_UseOrderDocumentNoForRelatedDocs preference: " + e1.getMessage(), e1);
diff --git a/src/org/openbravo/retail/posterminal/PaidReceiptsHeader.java b/src/org/openbravo/retail/posterminal/PaidReceiptsHeader.java
--- a/src/org/openbravo/retail/posterminal/PaidReceiptsHeader.java
+++ b/src/org/openbravo/retail/posterminal/PaidReceiptsHeader.java
@@ -45,10 +45,8 @@
       boolean useContains = true;
       try {
         OBContext.setAdminMode(false);
-        useContains = "Y".equals(Preferences.getPreferenceValue(
-            "OBPOS_remote.receipt_usesContains", true, OBContext.getOBContext().getCurrentClient(),
-            OBContext.getOBContext().getCurrentOrganization(), OBContext.getOBContext().getUser(),
-            OBContext.getOBContext().getRole(), null));
+        useContains = "Y".equals(Preferences.getCurrentPreferenceValue(
+            "OBPOS_remote.receipt_usesContains", true, null));
       } catch (PropertyException e) {
         log.error("Error getting preference OBPOS_remote.receipt_usesContains " + e.getMessage(), e);
       } finally {
diff --git a/src/org/openbravo/retail/posterminal/event/ProductListEventHandler.java b/src/org/openbravo/retail/posterminal/event/ProductListEventHandler.java
--- a/src/org/openbravo/retail/posterminal/event/ProductListEventHandler.java
+++ b/src/org/openbravo/retail/posterminal/event/ProductListEventHandler.java
@@ -58,9 +58,8 @@
     boolean isRemote = false;
     try {
       OBContext.setAdminMode(false);
-      isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.product", true, OBContext
-          .getOBContext().getCurrentClient(), OBContext.getOBContext().getCurrentOrganization(),
-          OBContext.getOBContext().getUser(), OBContext.getOBContext().getRole(), null));
+      isRemote = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_remote.product", true,
+          null));
     } catch (PropertyException e) {
       logger.error("Error getting preference OBPOS_remote.product " + e.getMessage(), e);
     } finally {
diff --git a/src/org/openbravo/retail/posterminal/master/Brand.java b/src/org/openbravo/retail/posterminal/master/Brand.java
--- a/src/org/openbravo/retail/posterminal/master/Brand.java
+++ b/src/org/openbravo/retail/posterminal/master/Brand.java
@@ -48,9 +48,8 @@
     boolean isRemote = false;
     try {
       OBContext.setAdminMode(false);
-      isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.product", true, OBContext
-          .getOBContext().getCurrentClient(), OBContext.getOBContext().getCurrentOrganization(),
-          OBContext.getOBContext().getUser(), OBContext.getOBContext().getRole(), null));
+      isRemote = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_remote.product", true,
+          null));
     } catch (PropertyException e) {
       log.error("Error getting preference OBPOS_remote.product " + e.getMessage(), e);
     } finally {
@@ -78,10 +77,8 @@
       boolean isRemote = false;
       try {
         OBContext.setAdminMode(false);
-        isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.product", true,
-            OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
-                .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
-                .getOBContext().getRole(), null));
+        isRemote = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_remote.product", true,
+            null));
       } catch (PropertyException e) {
         log.error("Error getting preference OBPOS_remote.product " + e.getMessage(), e);
       } finally {
@@ -110,9 +107,8 @@
     boolean isRemote = false;
     try {
       OBContext.setAdminMode(false);
-      isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.product", true, OBContext
-          .getOBContext().getCurrentClient(), OBContext.getOBContext().getCurrentOrganization(),
-          OBContext.getOBContext().getUser(), OBContext.getOBContext().getRole(), null));
+      isRemote = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_remote.product", true,
+          null));
     } catch (PropertyException e) {
       log.error("Error getting preference OBPOS_remote.product " + e.getMessage(), e);
     } finally {
diff --git a/src/org/openbravo/retail/posterminal/master/BrandProperties.java b/src/org/openbravo/retail/posterminal/master/BrandProperties.java
--- a/src/org/openbravo/retail/posterminal/master/BrandProperties.java
+++ b/src/org/openbravo/retail/posterminal/master/BrandProperties.java
@@ -22,9 +22,8 @@
     boolean isRemote = false;
     try {
       OBContext.setAdminMode(false);
-      isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.product", true, OBContext
-          .getOBContext().getCurrentClient(), OBContext.getOBContext().getCurrentOrganization(),
-          OBContext.getOBContext().getUser(), OBContext.getOBContext().getRole(), null));
+      isRemote = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_remote.product", true,
+          null));
     } catch (PropertyException e) {
       log.error("Error getting preference OBPOS_remote.product " + e.getMessage(), e);
     } finally {
diff --git a/src/org/openbravo/retail/posterminal/master/Category.java b/src/org/openbravo/retail/posterminal/master/Category.java
--- a/src/org/openbravo/retail/posterminal/master/Category.java
+++ b/src/org/openbravo/retail/posterminal/master/Category.java
@@ -53,10 +53,8 @@
       boolean isRemote = false;
       try {
         OBContext.setAdminMode(false);
-        isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.product", true,
-            OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
-                .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
-                .getOBContext().getRole(), null));
+        isRemote = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_remote.product", true,
+            null));
       } catch (PropertyException e) {
         log.error("Error getting preference OBPOS_remote.product " + e.getMessage(), e);
       } finally {
@@ -102,9 +100,8 @@
     boolean isRemote = false;
     try {
       OBContext.setAdminMode(false);
-      isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.product", true, OBContext
-          .getOBContext().getCurrentClient(), OBContext.getOBContext().getCurrentOrganization(),
-          OBContext.getOBContext().getUser(), OBContext.getOBContext().getRole(), null));
+      isRemote = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_remote.product", true,
+          null));
     } catch (PropertyException e) {
       log.error("Error getting preference OBPOS_remote.product " + e.getMessage(), e);
     } finally {
diff --git a/src/org/openbravo/retail/posterminal/master/CategoryTree.java b/src/org/openbravo/retail/posterminal/master/CategoryTree.java
--- a/src/org/openbravo/retail/posterminal/master/CategoryTree.java
+++ b/src/org/openbravo/retail/posterminal/master/CategoryTree.java
@@ -49,10 +49,8 @@
       boolean isRemote = false;
       try {
         OBContext.setAdminMode(false);
-        isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.product", true,
-            OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
-                .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
-                .getOBContext().getRole(), null));
+        isRemote = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_remote.product", true,
+            null));
       } catch (PropertyException e) {
         log.error("Error getting preference OBPOS_remote.product " + e.getMessage(), e);
       } finally {
@@ -84,9 +82,8 @@
     boolean isRemote = false;
     try {
       OBContext.setAdminMode(true);
-      isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.product", true, OBContext
-          .getOBContext().getCurrentClient(), OBContext.getOBContext().getCurrentOrganization(),
-          OBContext.getOBContext().getUser(), OBContext.getOBContext().getRole(), null));
+      isRemote = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_remote.product", true,
+          null));
     } catch (PropertyException e) {
       log.error("Error getting preference OBPOS_remote.product " + e.getMessage(), e);
     } finally {
diff --git a/src/org/openbravo/retail/posterminal/master/Characteristic.java b/src/org/openbravo/retail/posterminal/master/Characteristic.java
--- a/src/org/openbravo/retail/posterminal/master/Characteristic.java
+++ b/src/org/openbravo/retail/posterminal/master/Characteristic.java
@@ -62,9 +62,8 @@
     boolean isRemote = false;
     try {
       OBContext.setAdminMode(false);
-      isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.product", true, OBContext
-          .getOBContext().getCurrentClient(), OBContext.getOBContext().getCurrentOrganization(),
-          OBContext.getOBContext().getUser(), OBContext.getOBContext().getRole(), null));
+      isRemote = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_remote.product", true,
+          null));
     } catch (PropertyException e) {
       log.error("Error getting preference OBPOS_remote.product " + e.getMessage(), e);
     } finally {
diff --git a/src/org/openbravo/retail/posterminal/master/CharacteristicValue.java b/src/org/openbravo/retail/posterminal/master/CharacteristicValue.java
--- a/src/org/openbravo/retail/posterminal/master/CharacteristicValue.java
+++ b/src/org/openbravo/retail/posterminal/master/CharacteristicValue.java
@@ -66,9 +66,8 @@
     boolean isRemote = false;
     try {
       OBContext.setAdminMode(false);
-      isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.product", true, OBContext
-          .getOBContext().getCurrentClient(), OBContext.getOBContext().getCurrentOrganization(),
-          OBContext.getOBContext().getUser(), OBContext.getOBContext().getRole(), null));
+      isRemote = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_remote.product", true,
+          null));
     } catch (PropertyException e) {
       log.error("Error getting preference OBPOS_remote.product " + e.getMessage(), e);
     } finally {
diff --git a/src/org/openbravo/retail/posterminal/master/Discount.java b/src/org/openbravo/retail/posterminal/master/Discount.java
--- a/src/org/openbravo/retail/posterminal/master/Discount.java
+++ b/src/org/openbravo/retail/posterminal/master/Discount.java
@@ -58,10 +58,8 @@
     }
     boolean multiPrices = false;
     try {
-      multiPrices = "Y".equals(Preferences.getPreferenceValue("OBPOS_EnableMultiPriceList", true,
-          OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
-              .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
-              .getOBContext().getRole(), null));
+      multiPrices = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_EnableMultiPriceList",
+          true, null));
     } catch (PropertyException e1) {
       log.error("Error getting Preference: " + e1.getMessage(), e1);
     }
diff --git a/src/org/openbravo/retail/posterminal/master/PriceList.java b/src/org/openbravo/retail/posterminal/master/PriceList.java
--- a/src/org/openbravo/retail/posterminal/master/PriceList.java
+++ b/src/org/openbravo/retail/posterminal/master/PriceList.java
@@ -64,10 +64,8 @@
 
     HQLPropertyList priceListHQLProperties = ModelExtensionUtils.getPropertyExtensions(extensions);
     try {
-      multiPrices = "Y".equals(Preferences.getPreferenceValue("OBPOS_EnableMultiPriceList", true,
-          OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
-              .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
-              .getOBContext().getRole(), null));
+      multiPrices = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_EnableMultiPriceList",
+          true, null));
     } catch (PropertyException e1) {
       log.error("Error getting Preference: " + e1.getMessage(), e1);
     }
diff --git a/src/org/openbravo/retail/posterminal/master/Product.java b/src/org/openbravo/retail/posterminal/master/Product.java
--- a/src/org/openbravo/retail/posterminal/master/Product.java
+++ b/src/org/openbravo/retail/posterminal/master/Product.java
@@ -73,9 +73,8 @@
       posPrecision = (priceList.getCurrency().getObposPosprecision() == null ? priceList
           .getCurrency().getPricePrecision() : priceList.getCurrency().getObposPosprecision())
           .toString();
-      isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.product", true, OBContext
-          .getOBContext().getCurrentClient(), OBContext.getOBContext().getCurrentOrganization(),
-          OBContext.getOBContext().getUser(), OBContext.getOBContext().getRole(), null));
+      isRemote = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_remote.product", true,
+          null));
     } catch (PropertyException e) {
       log.error("Error getting preference OBPOS_remote.product " + e.getMessage(), e);
     } finally {
@@ -84,10 +83,8 @@
     boolean isMultipricelist = false;
     try {
       OBContext.setAdminMode(false);
-      isMultipricelist = "Y".equals(Preferences.getPreferenceValue("OBPOS_EnableMultiPriceList",
-          true, OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
-              .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
-              .getOBContext().getRole(), null));
+      isMultipricelist = "Y".equals(Preferences.getCurrentPreferenceValue(
+          "OBPOS_EnableMultiPriceList", true, null));
     } catch (PropertyException e) {
       log.error("Error getting preference EnableMultiPriceList " + e.getMessage(), e);
     } finally {
@@ -132,10 +129,8 @@
       boolean isMultipricelist = false;
       try {
         OBContext.setAdminMode(false);
-        isMultipricelist = "Y".equals(Preferences.getPreferenceValue("OBPOS_EnableMultiPriceList",
-            true, OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
-                .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
-                .getOBContext().getRole(), null));
+        isMultipricelist = "Y".equals(Preferences.getCurrentPreferenceValue(
+            "OBPOS_EnableMultiPriceList", true, null));
       } catch (PropertyException e) {
         log.error("Error getting preference EnableMultiPriceList " + e.getMessage(), e);
       } finally {
@@ -144,10 +139,8 @@
       boolean isRemote = false;
       try {
         OBContext.setAdminMode(false);
-        isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.product", true,
-            OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
-                .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
-                .getOBContext().getRole(), null));
+        isRemote = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_remote.product", true,
+            null));
       } catch (PropertyException e) {
         log.error("Error getting preference OBPOS_remote.product " + e.getMessage(), e);
       } finally {
@@ -201,9 +194,8 @@
       posPrecision = (priceList.getCurrency().getObposPosprecision() == null ? priceList
           .getCurrency().getPricePrecision() : priceList.getCurrency().getObposPosprecision())
           .toString();
-      isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.product", true, OBContext
-          .getOBContext().getCurrentClient(), OBContext.getOBContext().getCurrentOrganization(),
-          OBContext.getOBContext().getUser(), OBContext.getOBContext().getRole(), null));
+      isRemote = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_remote.product", true,
+          null));
     } catch (PropertyException e) {
       log.error("Error getting preference OBPOS_remote.product " + e.getMessage(), e);
     } finally {
@@ -212,10 +204,8 @@
     boolean isMultipricelist = false;
     try {
       OBContext.setAdminMode(false);
-      isMultipricelist = "Y".equals(Preferences.getPreferenceValue("OBPOS_EnableMultiPriceList",
-          true, OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
-              .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
-              .getOBContext().getRole(), null));
+      isMultipricelist = "Y".equals(Preferences.getCurrentPreferenceValue(
+          "OBPOS_EnableMultiPriceList", true, null));
     } catch (PropertyException e) {
       log.error("Error getting preference EnableMultiPriceList " + e.getMessage(), e);
     } finally {
diff --git a/src/org/openbravo/retail/posterminal/master/ProductDiscProperties.java b/src/org/openbravo/retail/posterminal/master/ProductDiscProperties.java
--- a/src/org/openbravo/retail/posterminal/master/ProductDiscProperties.java
+++ b/src/org/openbravo/retail/posterminal/master/ProductDiscProperties.java
@@ -49,10 +49,8 @@
       {
         String discountNameTrl;
         try {
-          boolean isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.customer",
-              true, OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
-                  .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
-                  .getOBContext().getRole(), null));
+          boolean isRemote = "Y".equals(Preferences.getCurrentPreferenceValue(
+              "OBPOS_remote.customer", true, null));
           if (OBContext.hasTranslationInstalled() && !isRemote) {
             discountNameTrl = "coalesce ((select pt.name from PricingAdjustmentTrl pt where pt.promotionDiscount=p and pt.language='"
                 + OBContext.getOBContext().getLanguage().getLanguage() + "'), p.name) ";
diff --git a/src/org/openbravo/retail/posterminal/master/ProductPrice.java b/src/org/openbravo/retail/posterminal/master/ProductPrice.java
--- a/src/org/openbravo/retail/posterminal/master/ProductPrice.java
+++ b/src/org/openbravo/retail/posterminal/master/ProductPrice.java
@@ -89,10 +89,8 @@
     }
 
     try {
-      multiPrices = "Y".equals(Preferences.getPreferenceValue("OBPOS_EnableMultiPriceList", true,
-          OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
-              .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
-              .getOBContext().getRole(), null));
+      multiPrices = "Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_EnableMultiPriceList",
+          true, null));
     } catch (PropertyException e1) {
       log.error("Error getting Preference: " + e1.getMessage(), e1);
     }
diff --git a/src/org/openbravo/retail/posterminal/master/ProductProperties.java b/src/org/openbravo/retail/posterminal/master/ProductProperties.java
--- a/src/org/openbravo/retail/posterminal/master/ProductProperties.java
+++ b/src/org/openbravo/retail/posterminal/master/ProductProperties.java
@@ -64,10 +64,8 @@
       private static final long serialVersionUID = 1L;
       {
         try {
-          if ("Y".equals(Preferences.getPreferenceValue("OBPOS_retail.productImages", true,
-              OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
-                  .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
-                  .getOBContext().getRole(), null))) {
+          if ("Y".equals(Preferences.getCurrentPreferenceValue("OBPOS_retail.productImages", true,
+              null))) {
           } else {
             add(new HQLProperty("img.bindaryData", "img"));
           }
@@ -146,10 +144,8 @@
         {
           String trlName;
           try {
-            boolean isRemote = "Y".equals(Preferences.getPreferenceValue("OBPOS_remote.product",
-                true, OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
-                    .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
-                    .getOBContext().getRole(), null));
+            boolean isRemote = "Y".equals(Preferences.getCurrentPreferenceValue(
+                "OBPOS_remote.product", true, null));
 
             if (OBContext.hasTranslationInstalled() && !isRemote) {
               trlName = "coalesce((select pt.name from ProductTrl AS pt where pt.language='"
diff --git a/src/org/openbravo/retail/posterminal/term/Terminal.java b/src/org/openbravo/retail/posterminal/term/Terminal.java
--- a/src/org/openbravo/retail/posterminal/term/Terminal.java
+++ b/src/org/openbravo/retail/posterminal/term/Terminal.java
@@ -133,10 +133,8 @@
 
       int sessionTimeout;
       try {
-        String sessionShouldExpire = Preferences.getPreferenceValue("OBPOS_SessionTimeout", true,
-            OBContext.getOBContext().getCurrentClient(), OBContext.getOBContext()
-                .getCurrentOrganization(), OBContext.getOBContext().getUser(), OBContext
-                .getOBContext().getRole(), null);
+        String sessionShouldExpire = Preferences.getCurrentPreferenceValue("OBPOS_SessionTimeout",
+            true, null);
         try {
           sessionTimeout = sessionShouldExpire == null ? 0 : Integer.parseInt(sessionShouldExpire);
         } catch (NumberFormatException nfe) {