diff --git a/package.json b/package.json
index 55d0698c..bf1599e0 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
   "license": "MIT",
   "dependencies": {
     "@2fd/graphdoc": "^2.4.0",
-    "@adempiere/grpc-api": "3.4.9",
+    "@adempiere/grpc-api": "3.5.0",
     "@adempiere/grpc-web-store-api": "1.5.7",
     "@elastic/elasticsearch": "7.14.0",
     "@google-cloud/storage": "^3.0.3",
diff --git a/src/modules/adempiere-api/api/extensions/adempiere/form/addons/point-of-sales/index.js b/src/modules/adempiere-api/api/extensions/adempiere/form/addons/point-of-sales/index.js
index 3a6ff9c4..4ea76373 100644
--- a/src/modules/adempiere-api/api/extensions/adempiere/form/addons/point-of-sales/index.js
+++ b/src/modules/adempiere-api/api/extensions/adempiere/form/addons/point-of-sales/index.js
@@ -31,6 +31,7 @@ import {
   convertCurrencyFromGRPC,
   convertWarehouseFromGRPC
 } from '@adempiere/grpc-api/src/utils/convertCoreFunctionality'
+import { convertResourceAssignment } from '../../../util/convertData';
 
 function convertPointOfSalesFromGRPC (pointOfSales) {
   if (pointOfSales) {
@@ -460,6 +461,9 @@ function convertOrderLineFromGRPC (orderLineToConvert) {
       ),
       product_uom: convertProductConversionFromGRPC(
         orderLineToConvert.getProductUom()
+      ),
+      resource_assignment: convertResourceAssignment(
+        orderLineToConvert.getResourceAssignment()
       )
     };
   }
@@ -1730,6 +1734,7 @@ module.exports = ({ config }) => {
         orderUuid: req.body.order_uuid,
         productUuid: req.body.product_uuid,
         chargeUuid: req.body.charge_uuid,
+        resourceAssignmentUuid: req.body.resource_assignment_uuid,
         description: req.body.description,
         quantity: req.body.quantity,
         price: req.body.price,
diff --git a/src/modules/adempiere-api/api/extensions/adempiere/form/addons/time-control/index.js b/src/modules/adempiere-api/api/extensions/adempiere/form/addons/time-control/index.js
index 17b810e8..a2a2acf9 100644
--- a/src/modules/adempiere-api/api/extensions/adempiere/form/addons/time-control/index.js
+++ b/src/modules/adempiere-api/api/extensions/adempiere/form/addons/time-control/index.js
@@ -15,58 +15,7 @@
 
 import { Router } from 'express';
 
-import {
-  getDecimalFromGRPC
-} from '@adempiere/grpc-api/lib/convertBaseDataType.js';
-
-// Convert resourtce type from gRPC to JSON
-function convertResourceType (resourceType) {
-  if (resourceType) {
-    return {
-      id: resourceType.getId(),
-      uuid: resourceType.getUuid(),
-      value: resourceType.getValue(),
-      name: resourceType.getName(),
-      description: resourceType.getDescription()
-    }
-  }
-  return undefined;
-}
-
-// Convert resourtce from gRPC to JSON
-function convertResource (resource) {
-  if (resource) {
-    return {
-      id: resource.getId(),
-      uuid: resource.getUuid(),
-      name: resource.getName(),
-      resource_type: convertResourceType(
-        resource.getResourceType()
-      )
-    }
-  }
-  return undefined;
-}
-
-// Convert resourtce assignment from gRPC to JSON
-function convertResourceAssignment (resourceAssignment) {
-  if (resourceAssignment) {
-    return {
-      id: resourceAssignment.getId(),
-      uuid: resourceAssignment.getUuid(),
-      resource: convertResource(
-        resourceAssignment.getResource()
-      ),
-      name: resourceAssignment.getName(),
-      description: resourceAssignment.getDescription(),
-      assign_date_from: resourceAssignment.getAssignDateFrom(),
-      assign_date_to: resourceAssignment.getAssignDateTo(),
-      is_confirmed: resourceAssignment.getIsConfirmed(),
-      quantity: getDecimalFromGRPC(resourceAssignment.getQuantity())
-    }
-  }
-  return undefined;
-}
+import { convertResourceAssignment } from '../../../util/convertData';
 
 module.exports = ({ config }) => {
   const api = Router();
@@ -102,24 +51,22 @@ module.exports = ({ config }) => {
   });
 
   /**
-   * GET List Accounting Combinations
-   *
-   * req.query.token - user token
-   * req.query.language - login language
-   * req.query.search_value - search value optional
-   * req.query.context_attributes - attributes
-   * req.query.filters - filters to reduce list values
+   * POST List Accounting Combinations
    */
-  api.get('/list-resources-assignment', (req, res) => {
-    if (req.query) {
+  api.post('/list-resources-assignment', (req, res) => {
+    if (req.body) {
       service.listResourcesAssignment({
         token: req.query.token,
         language: req.query.language,
         //  DSL Query
-        resourceTypeId: req.query.resource_resource_type_id,
-        resourceTypeUuid: req.query.resource_resource_type_uuid,
-        name: req.query.name,
-        description: req.query.description,
+        resourceTypeId: req.body.resource_type_id,
+        resourceTypeUuid: req.body.resource_type_uuid,
+        name: req.body.name,
+        description: req.body.description,
+        isOnlyConfirmed: req.body.is_only_confirmed,
+        isWaitingForOrdered: req.body.is_waiting_for_ordered,
+        dateFrom: req.body.date_from,
+        dateTo: req.body.date_to,
         //  Page Data
         pageSize: req.query.page_size,
         pageToken: req.query.page_token
diff --git a/src/modules/adempiere-api/api/extensions/adempiere/util/convertData.js b/src/modules/adempiere-api/api/extensions/adempiere/util/convertData.js
index 8fe4f672..3040ab88 100644
--- a/src/modules/adempiere-api/api/extensions/adempiere/util/convertData.js
+++ b/src/modules/adempiere-api/api/extensions/adempiere/util/convertData.js
@@ -1,7 +1,11 @@
 
 import {
-  convertEntityFromGRPC
+  convertEntityFromGRPC,
+  getDecimalFromGRPC
 } from '@adempiere/grpc-api/lib/convertBaseDataType';
+import {
+  convertUnitOfMeasureFromGRPC
+} from '@adempiere/grpc-api/src/utils/convertCoreFunctionality'
 
 export function convertEntitiesListFromGRPC (entitiesList) {
   return {
@@ -12,3 +16,55 @@ export function convertEntitiesListFromGRPC (entitiesList) {
     })
   }
 }
+
+// Convert resourtce type from gRPC to JSON
+export function convertResourceType (resourceType) {
+  if (resourceType) {
+    return {
+      id: resourceType.getId(),
+      uuid: resourceType.getUuid(),
+      value: resourceType.getValue(),
+      name: resourceType.getName(),
+      description: resourceType.getDescription(),
+      unit_of_measure: convertUnitOfMeasureFromGRPC(
+        resourceType.getUnitOfMeasure()
+      )
+    }
+  }
+  return undefined;
+}
+
+// Convert resourtce from gRPC to JSON
+export function convertResource (resource) {
+  if (resource) {
+    return {
+      id: resource.getId(),
+      uuid: resource.getUuid(),
+      name: resource.getName(),
+      resource_type: convertResourceType(
+        resource.getResourceType()
+      )
+    }
+  }
+  return undefined;
+}
+
+// Convert resourtce assignment from gRPC to JSON
+export function convertResourceAssignment (resourceAssignment) {
+  if (resourceAssignment) {
+    return {
+      id: resourceAssignment.getId(),
+      uuid: resourceAssignment.getUuid(),
+      resource: convertResource(
+        resourceAssignment.getResource()
+      ),
+      name: resourceAssignment.getName(),
+      description: resourceAssignment.getDescription(),
+      assign_date_from: resourceAssignment.getAssignDateFrom(),
+      assign_date_to: resourceAssignment.getAssignDateTo(),
+      is_confirmed: resourceAssignment.getIsConfirmed(),
+      quantity: getDecimalFromGRPC(resourceAssignment.getQuantity())
+    }
+  }
+  return undefined;
+}
diff --git a/yarn.lock b/yarn.lock
index a0dbcfca..ba977b74 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -24,10 +24,10 @@
     striptags "^3.0.1"
     word-wrap "^1.2.1"
 
-"@adempiere/grpc-api@3.4.9":
-  version "3.4.9"
-  resolved "https://registry.yarnpkg.com/@adempiere/grpc-api/-/grpc-api-3.4.9.tgz#365e387ac8981eafa3ecd3d963a08b36aca3dcb5"
-  integrity sha512-BF4zWciZIoEJxBHb9BcmSCQcrftFgExyigZ6aitlhb9dUQvEUo4q9bRN4dn4sVhohbDdHw99IOWX7V9+hL2aSQ==
+"@adempiere/grpc-api@3.5.0":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@adempiere/grpc-api/-/grpc-api-3.5.0.tgz#0b58d9e0367ee9d6333b9ae47713ce97fb9426cc"
+  integrity sha512-1OYqlAuKlpC6/3b01triTLVA0FIZo750MierIgYsfcZ6QmazllsiZs4cc8hCI7JgJuJJsgHwfeX3uffBxKY9aw==
   dependencies:
     "@grpc/grpc-js" "1.7.0"
     google-protobuf "3.21.0"