diff --git a/src/components/ADempiere/Form/PriceChecking/index.vue b/src/components/ADempiere/Form/PriceChecking/index.vue
index 34d26b32f3b..5e25c99f6ba 100644
--- a/src/components/ADempiere/Form/PriceChecking/index.vue
+++ b/src/components/ADempiere/Form/PriceChecking/index.vue
@@ -238,8 +238,8 @@ export default {
             getProductPrice({
               searchValue: mutation.payload.value,
               posUuid: this.currentPointOfSales.uuid,
-              priceListUuid: this.currentPointOfSales.priceList.uuid,
-              warehouseUuid: this.currentPointOfSales.warehouse.uuid
+              priceListUuid: this.currentPointOfSales.currentPriceList.uuid,
+              warehouseUuid: this.currentPointOfSales.currentWarehouse.uuid
             })
               .then(productPrice => {
                 this.messageError = true
@@ -294,8 +294,8 @@ export default {
             getProductPrice({
               searchValue: mutation.payload.value,
               posUuid: this.currentPointOfSales.uuid,
-              priceListUuid: this.currentPointOfSales.priceList.uuid,
-              warehouseUuid: this.currentPointOfSales.warehouse.uuid
+              priceListUuid: this.currentPointOfSales.currentPriceList.uuid,
+              warehouseUuid: this.currentPointOfSales.currentWarehouse.uuid
             })
               .then(productPrice => {
                 this.messageError = true
diff --git a/src/components/ADempiere/Form/VPOS/Options/index.vue b/src/components/ADempiere/Form/VPOS/Options/index.vue
index a6279e0ff86..3172da4fb8f 100644
--- a/src/components/ADempiere/Form/VPOS/Options/index.vue
+++ b/src/components/ADempiere/Form/VPOS/Options/index.vue
@@ -710,8 +710,8 @@ export default {
       createOrder({
         posUuid,
         customerUuid: this.currentOrder.businessPartner.uuid,
-        priceListUuid: this.currentPointOfSales.priceList.uuid,
-        warehouseUuid: this.currentPointOfSales.warehouse.uuid
+        priceListUuid: this.currentPointOfSales.currentPriceList.uuid,
+        warehouseUuid: this.currentPointOfSales.currentWarehouse.uuid
       })
         .then(order => {
           this.$store.dispatch('currentOrder', order)
diff --git a/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js b/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js
index 0774daeae96..42e0789a8ee 100644
--- a/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js
+++ b/src/components/ADempiere/Form/VPOS/Order/orderLineMixin.js
@@ -145,8 +145,8 @@ export default {
       createOrderLine({
         orderUuid,
         productUuid,
-        priceListUuid: this.currentPointOfSales.priceList.uuid,
-        warehouseUuid: this.currentPointOfSales.warehouse.uuid
+        priceListUuid: this.currentPointOfSales.currentPriceList.uuid,
+        warehouseUuid: this.currentPointOfSales.currentWarehouse.uuid
       })
         .then(orderLine => {
           this.fillOrderLine(orderLine)
@@ -191,8 +191,8 @@ export default {
         quantity,
         price,
         discountRate,
-        priceListUuid: this.currentPointOfSales.priceList.uuid,
-        warehouseUuid: this.currentPointOfSales.warehouse.uuid
+        priceListUuid: this.currentPointOfSales.currentPriceList.uuid,
+        warehouseUuid: this.currentPointOfSales.currentWarehouse.uuid
       })
         .then(response => {
           this.fillOrderLineQuantities({
diff --git a/src/components/ADempiere/Form/VPOS/posMixin.js b/src/components/ADempiere/Form/VPOS/posMixin.js
index 81f27ece2c3..797795214bf 100644
--- a/src/components/ADempiere/Form/VPOS/posMixin.js
+++ b/src/components/ADempiere/Form/VPOS/posMixin.js
@@ -490,8 +490,8 @@ export default {
       findProduct({
         searchValue: searchProduct,
         posUuid: this.currentPointOfSales.uuid,
-        priceListUuid: this.currentPointOfSales.priceList.uuid,
-        warehouseUuid: this.currentPointOfSales.warehouse.uuid
+        priceListUuid: this.currentPointOfSales.currentPriceList.uuid,
+        warehouseUuid: this.currentPointOfSales.currentWarehouse.uuid
       })
         .then(productPrice => {
           this.product = productPrice.product
diff --git a/src/store/modules/ADempiere/pointOfSales/getters/index.js b/src/store/modules/ADempiere/pointOfSales/getters/index.js
index 040dc926b6c..de9c5ed3120 100644
--- a/src/store/modules/ADempiere/pointOfSales/getters/index.js
+++ b/src/store/modules/ADempiere/pointOfSales/getters/index.js
@@ -55,6 +55,7 @@ export default {
         ...state.currentPointOfSales,
         listOrder: state.listOrder,
         warehousesList: state.warehousesList,
+        currentWarehouse: state.currentWarehousePos,
         documentTypesList: state.documentTypesList,
         pricesList: state.pricesList,
         currentPriceList: state.currentPriceList,
diff --git a/src/store/modules/ADempiere/pointOfSales/order/actions.js b/src/store/modules/ADempiere/pointOfSales/order/actions.js
index 1c8b2db4560..15efa86ad82 100644
--- a/src/store/modules/ADempiere/pointOfSales/order/actions.js
+++ b/src/store/modules/ADempiere/pointOfSales/order/actions.js
@@ -38,16 +38,15 @@ export default {
   createOrder({ commit, dispatch, rootGetters }, {
     posUuid,
     customerUuid,
-    documentTypeUuid,
-    priceListUuid,
-    warehouseUuid
+    documentTypeUuid
   }) {
+    const { currentPriceList, currentWarehouse } = rootGetters.posAttributes.currentPointOfSales
     return createOrder({
       posUuid,
       customerUuid,
       documentTypeUuid,
-      priceListUuid,
-      warehouseUuid
+      priceListUuid: currentPriceList.uuid,
+      warehouseUuid: currentWarehouse.uuid
     })
       .then(order => {
         commit('setOrder', order)
@@ -75,17 +74,16 @@ export default {
     orderUuid,
     posUuid,
     customerUuid,
-    documentTypeUuid,
-    priceListUuid,
-    warehouseUuid
+    documentTypeUuid
   }) {
+    const { currentPriceList, currentWarehouse } = rootGetters.posAttributes.currentPointOfSales
     updateOrder({
       orderUuid,
       posUuid,
       documentTypeUuid,
       customerUuid,
-      priceListUuid,
-      warehouseUuid
+      priceListUuid: currentPriceList.uuid,
+      warehouseUuid: currentWarehouse.uuid
     })
       .then(response => {
         dispatch('reloadOrder', { orderUuid: response.uuid })
@@ -110,10 +108,8 @@ export default {
    * @param {number} price Price Producto
    * @param {number} discountRate DiscountRate Producto
    */
-  createOrderLine({ commit, dispatch }, {
+  createOrderLine({ commit, dispatch, rootGetters }, {
     orderUuid,
-    priceListUuid,
-    warehouseUuid,
     productUuid,
     chargeUuid,
     description,
@@ -121,10 +117,11 @@ export default {
     price,
     discountRate
   }) {
+    const { currentPriceList, currentWarehouse } = rootGetters.posAttributes.currentPointOfSales
     createOrderLine({
       orderUuid,
-      priceListUuid,
-      warehouseUuid,
+      priceListUuid: currentPriceList.uuid,
+      warehouseUuid: currentWarehouse.uuid,
       productUuid,
       chargeUuid,
       description,
diff --git a/src/store/modules/ADempiere/pointOfSales/productPrice/actions.js b/src/store/modules/ADempiere/pointOfSales/productPrice/actions.js
index c1e419ea0d3..f9f8f102ff1 100644
--- a/src/store/modules/ADempiere/pointOfSales/productPrice/actions.js
+++ b/src/store/modules/ADempiere/pointOfSales/productPrice/actions.js
@@ -59,9 +59,8 @@ export default {
       }
     }
     const currentPointOfSales = rootGetters.posAttributes.currentPointOfSales
-    const { templateBusinessPartner, priceList, warehouse } = currentPointOfSales
+    const { templateBusinessPartner, currentPriceList, currentWarehouse } = currentPointOfSales
     const { uuid: businessPartnerUuid } = templateBusinessPartner
-    const { uuid: warehouseUuid } = rootGetters['user/getWarehouse']
     if (isEmptyValue(searchValue)) {
       searchValue = rootGetters.getValueOfField({
         containerUuid,
@@ -73,8 +72,8 @@ export default {
         searchValue,
         posUuid,
         businessPartnerUuid,
-        priceListUuid: priceList.uuid,
-        warehouseUuid: warehouse.uuid,
+        priceListUuid: currentPriceList.uuid,
+        warehouseUuid: currentWarehouse.uuid,
         pageToken
       }).then(responseProductPrice => {
         if (isEmptyValue(token) || isEmptyValue(pageToken)) {
@@ -86,7 +85,7 @@ export default {
           isLoaded: true,
           isReload: false,
           businessPartnerUuid,
-          warehouseUuid,
+          warehouseUuid: currentWarehouse.uuid,
           token,
           pageNumber
         })
@@ -131,11 +130,9 @@ export default {
         pageToken = token + '-' + pageNumber
       }
     }
-
     const currentPointOfSales = rootGetters.posAttributes.currentPointOfSales
-    const { templateBusinessPartner, priceList, warehouse } = currentPointOfSales
+    const { templateBusinessPartner, currentPriceList, currentWarehouse } = currentPointOfSales
     const { uuid: businessPartnerUuid } = templateBusinessPartner
-    const { uuid: warehouseUuid } = rootGetters['user/getWarehouse']
 
     if (isEmptyValue(searchValue)) {
       searchValue = rootGetters.getValueOfField({
@@ -148,8 +145,8 @@ export default {
         searchValue,
         posUuid: posUuid,
         businessPartnerUuid,
-        priceListUuid: priceList.uuid,
-        warehouseUuid: warehouse.uuid,
+        priceListUuid: currentPriceList.uuid,
+        warehouseUuid: currentWarehouse.uuid,
         pageToken
       }).then(responseProductPrice => {
         if (isEmptyValue(token) || isEmptyValue(pageToken)) {
@@ -161,7 +158,7 @@ export default {
           isLoaded: true,
           isReload: false,
           businessPartnerUuid,
-          warehouseUuid,
+          warehouseUuid: currentWarehouse.uuid,
           token,
           pageNumber
         })