diff --git a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testComponentStoppedState.zpt b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testComponentStoppedState.zpt
index 4ec8578b80cd3efcde4d1ca6a27fe2101ffaf3c2..411ee223e8f918d4a6c1c99668d4f23e2144bcb7 100644
--- a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testComponentStoppedState.zpt
+++ b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testComponentStoppedState.zpt
@@ -17,10 +17,10 @@ Test stock browser for components portal type
 <!-- Check source -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_source_site_title';
                        node_title string: erp5_pdm_ui_test_source_node_title;
-                       movement_count python: 1;
-                       current_inventory python: -1.0;
-                       available_inventory python: -1.0;
-                       future_inventory python: -1.0;
+                       inventory_list_count python: 1;
+                       current_inventory python: -1;
+                       available_inventory python: -1;
+                       future_inventory python: -1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
@@ -28,10 +28,10 @@ Test stock browser for components portal type
 <!-- Check destination -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_destination_site_title';
                        node_title string: erp5_pdm_ui_test_destination_node_title;
-                       movement_count python: 1;
-                       current_inventory python: 1.0;
-                       available_inventory python: 1.0;
-                       future_inventory python: 1.0;
+                       inventory_list_count python: 1;
+                       current_inventory python: 1;
+                       available_inventory python: 1;
+                       future_inventory python: 1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
diff --git a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testConfirmedState.zpt b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testConfirmedState.zpt
index 9f3b51955cbbb8d0bd216688e4f187ad41a22959..aeb4188da4dc29d5644aa8748456a4f60e2a79a5 100644
--- a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testConfirmedState.zpt
+++ b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testConfirmedState.zpt
@@ -16,10 +16,10 @@ Test stock browser for confirmed state
 <!-- Check source -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_source_site_title';
                        node_title string: erp5_pdm_ui_test_source_node_title;
-                       movement_count python: 1;
-                       current_inventory python: 0.0;
-                       available_inventory python: -1.0;
-                       future_inventory python: -1.0;
+                       inventory_list_count python: 1;
+                       current_inventory python: 0;
+                       available_inventory python: -1;
+                       future_inventory python: -1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
@@ -27,10 +27,10 @@ Test stock browser for confirmed state
 <!-- Check destination -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_destination_site_title';
                        node_title string: erp5_pdm_ui_test_destination_node_title;
-                       movement_count python: 1;
-                       current_inventory python: 0.0;
-                       available_inventory python: 0.0;
-                       future_inventory python: 1.0;
+                       inventory_list_count python: 1;
+                       current_inventory python: 0;
+                       available_inventory python: 0;
+                       future_inventory python: 1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
diff --git a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testDeliveredState.zpt b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testDeliveredState.zpt
index cfd2454efe34697a2fd98cfd2dbbbac2781a73a9..cd069600673a1c199a2a65478a6fedb4b6c77be1 100644
--- a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testDeliveredState.zpt
+++ b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testDeliveredState.zpt
@@ -16,10 +16,10 @@ Test stock browser for delivered state
 <!-- Check source -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_source_site_title';
                        node_title string: erp5_pdm_ui_test_source_node_title;
-                       movement_count python: 1;
-                       current_inventory python: -1.0;
-                       available_inventory python: -1.0;
-                       future_inventory python: -1.0;
+                       inventory_list_count python: 1;
+                       current_inventory string: -1;
+                       available_inventory string: -1;
+                       future_inventory string: -1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
@@ -27,10 +27,10 @@ Test stock browser for delivered state
 <!-- Check destination -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_destination_site_title';
                        node_title string: erp5_pdm_ui_test_destination_node_title;
-                       movement_count python: 1;
-                       current_inventory python: 1.0;
-                       available_inventory python: 1.0;
-                       future_inventory python: 1.0;
+                       inventory_list_count python: 1;
+                       current_inventory string: 1;
+                       available_inventory string: 1;
+                       future_inventory string: 1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
diff --git a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testNodeCategoryPreference.zpt b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testNodeCategoryPreference.zpt
index 3e503045b7cc68b362f39a5c3f59782cdabbc866..7aebe2472c9524286c762ca32b3bf827eb3fce33 100644
--- a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testNodeCategoryPreference.zpt
+++ b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testNodeCategoryPreference.zpt
@@ -17,10 +17,10 @@ Test stock browser with node category preference
 <!-- Check destination -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_destination_site_title';
                        node_title string: erp5_pdm_ui_test_destination_node_title;
-                       movement_count python: 1;
-                       current_inventory python: 1.0;
-                       available_inventory python: 1.0;
-                       future_inventory python: 1.0;
+                       inventory_list_count python: 1;
+                       current_inventory python: 1;
+                       available_inventory python: 1;
+                       future_inventory python: 1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
diff --git a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testOrderedState.zpt b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testOrderedState.zpt
index ed9ced577f1888440001b927412859f8abc5045c..f18e1a90168ee0564eb1168734458be85134a7db 100644
--- a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testOrderedState.zpt
+++ b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testOrderedState.zpt
@@ -16,10 +16,10 @@ Test stock browser for ordered state
 <!-- Check source -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_source_site_title';
                        node_title string: erp5_pdm_ui_test_source_node_title;
-                       movement_count python: 1;
-                       current_inventory python: 0.0;
-                       available_inventory python: 0.0;
-                       future_inventory python: -1.0;
+                       inventory_list_count python: 1;
+                       current_inventory python: 0;
+                       available_inventory python: 0;
+                       future_inventory python: -1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
@@ -27,10 +27,10 @@ Test stock browser for ordered state
 <!-- Check destination -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_destination_site_title';
                        node_title string: erp5_pdm_ui_test_destination_node_title;
-                       movement_count python: 1;
-                       current_inventory python: 0.0;
-                       available_inventory python: 0.0;
-                       future_inventory python: 1.0;
+                       inventory_list_count python: 1;
+                       current_inventory python: 0;
+                       available_inventory python: 0;
+                       future_inventory python: 1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
diff --git a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testPlannedState.zpt b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testPlannedState.zpt
index 2de16477bf6a82c01ec9bf85234d32fae6718ab8..ac3941917c766c15d396ac715a1f912269abffc9 100644
--- a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testPlannedState.zpt
+++ b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testPlannedState.zpt
@@ -16,10 +16,10 @@ Test stock browser for planned state
 <!-- Check source -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_source_site_title';
                        node_title string: erp5_pdm_ui_test_source_node_title;
-                       movement_count python: 1;
-                       current_inventory python: 0.0;
-                       available_inventory python: 0.0;
-                       future_inventory python: -1.0;
+                       inventory_list_count python: 1;
+                       current_inventory python: 0;
+                       available_inventory python: 0;
+                       future_inventory python: -1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
@@ -27,10 +27,10 @@ Test stock browser for planned state
 <!-- Check destination -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_destination_site_title';
                        node_title string: erp5_pdm_ui_test_destination_node_title;
-                       movement_count python: 1;
-                       current_inventory python: 0.0;
-                       available_inventory python: 0.0;
-                       future_inventory python: 1.0;
+                       inventory_list_count python: 1;
+                       current_inventory python: 0;
+                       available_inventory python: 0;
+                       future_inventory python: 1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
diff --git a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testReadyState.zpt b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testReadyState.zpt
index 531ba5e82827c1fe6a67c14ef1cd501853b25c95..f25c6a377fa00ea633e0a9a5770f98fe2d8987c7 100644
--- a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testReadyState.zpt
+++ b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testReadyState.zpt
@@ -16,10 +16,10 @@ Test stock browser for ready state
 <!-- Check source -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_source_site_title';
                        node_title string: erp5_pdm_ui_test_source_node_title;
-                       movement_count python: 1;
-                       current_inventory python: 0.0;
-                       available_inventory python: -1.0;
-                       future_inventory python: -1.0;
+                       inventory_list_count python: 1;
+                       current_inventory python: 0;
+                       available_inventory python: -1;
+                       future_inventory python: -1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
@@ -27,10 +27,10 @@ Test stock browser for ready state
 <!-- Check destination -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_destination_site_title';
                        node_title string: erp5_pdm_ui_test_destination_node_title;
-                       movement_count python: 1;
-                       current_inventory python: 0.0;
-                       available_inventory python: 0.0;
-                       future_inventory python: 1.0;
+                       inventory_list_count python: 1;
+                       current_inventory python: 0;
+                       available_inventory python: 0;
+                       future_inventory python: 1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
diff --git a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testStartedState.zpt b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testStartedState.zpt
index c4056c6563bbd6f49dc0349fa5f086b1f887895f..72f3d85d819c1d251bdc7a0b483db15c09a67252 100644
--- a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testStartedState.zpt
+++ b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testStartedState.zpt
@@ -16,10 +16,10 @@ Test stock browser for started state
 <!-- Check source -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_source_site_title';
                        node_title string: erp5_pdm_ui_test_source_node_title;
-                       movement_count python: 1;
-                       current_inventory python: -1.0;
-                       available_inventory python: -1.0;
-                       future_inventory python: -1.0;
+                       inventory_list_count python: 1;
+                       current_inventory python: -1;
+                       available_inventory python: -1;
+                       future_inventory python: -1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
@@ -27,10 +27,10 @@ Test stock browser for started state
 <!-- Check destination -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_destination_site_title';
                        node_title string: erp5_pdm_ui_test_destination_node_title;
-                       movement_count python: 1;
-                       current_inventory python: 0.0;
-                       available_inventory python: 0.0;
-                       future_inventory python: 1.0;
+                       inventory_list_count python: 1;
+                       current_inventory python: 0;
+                       available_inventory python: 0;
+                       future_inventory python: 1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
diff --git a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testStoppedState.zpt b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testStoppedState.zpt
index 51ce67851b99590f99f48b668951153e864b1d11..123b99aa32403009b59f73a05563eb87c323c6da 100644
--- a/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testStoppedState.zpt
+++ b/bt5/erp5_pdm_renderjs_ui_test/PathTemplateItem/portal_tests/renderjs_ui_stock_browser_zuite/testStoppedState.zpt
@@ -16,10 +16,10 @@ Test stock browser for stopped state
 <!-- Check source -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_source_site_title';
                        node_title string: erp5_pdm_ui_test_source_node_title;
-                       movement_count python: 1;
-                       current_inventory python: -1.0;
-                       available_inventory python: -1.0;
-                       future_inventory python: -1.0;
+                       inventory_list_count python: 1;
+                       current_inventory python: -1;
+                       available_inventory python: -1;
+                       future_inventory python: -1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
@@ -27,10 +27,10 @@ Test stock browser for stopped state
 <!-- Check destination -->
 <tal:block tal:define="node_category python: 'erp5_pdm_ui_test_destination_site_title';
                        node_title string: erp5_pdm_ui_test_destination_node_title;
-                       movement_count python: 1;
-                       current_inventory python: 1.0;
-                       available_inventory python: 1.0;
-                       future_inventory python: 1.0;
+                       inventory_list_count python: 1;
+                       current_inventory python: 1;
+                       available_inventory python: 1;
+                       future_inventory python: 1;
                        ">
   <tal:block metal:use-macro="here/PdmZuite_checkStockBrowserForRenderjsUi/macros/check_inventory" />
 </tal:block>
diff --git a/bt5/erp5_pdm_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_renderjs_ui_test/PdmZuite_checkStockBrowserForRenderjsUi.zpt b/bt5/erp5_pdm_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_renderjs_ui_test/PdmZuite_checkStockBrowserForRenderjsUi.zpt
index 123ffd6ad91d0755e000a280e1d74659640a85e2..f2f43bfe8cfe1d7af2c9b6bfd9f720ead1930151 100644
--- a/bt5/erp5_pdm_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_renderjs_ui_test/PdmZuite_checkStockBrowserForRenderjsUi.zpt
+++ b/bt5/erp5_pdm_renderjs_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_renderjs_ui_test/PdmZuite_checkStockBrowserForRenderjsUi.zpt
@@ -1,5 +1,26 @@
 <tal:block xmlns:tal="http://xml.zope.org/namespaces/tal"
            xmlns:metal="http://xml.zope.org/namespaces/metal">
+
+  <!--
+    Macro to check inventory displayed in stock browser.
+
+    This selects the node category and check each of the current, available and future
+    inventory match. Then for each value, it will click to "drill down" and check that the
+    movement history list show the expected number of lines.
+    TODO: this is not yet the case for renderjs version of this test, the drill down is
+    still only covered in erp5_xhtml_style
+
+    Required parameters:
+      - node_category: the label of the node category to select in the dialog
+      - node_title: the label of the node organisation expected in the listbox
+      - inventory_list_count: the number of "invenvory list" lines expected in the first dialog.
+      - current_inventory: the quantity for the current inventory
+      - available_inventory: the quantity for the available inventory
+      - future_inventory: the quantity for the future inventory
+
+    Optional parameters:
+      - select_node_category: if True (the default) the node category will be selected
+  -->
   <tal:block
     metal:define-macro="check_inventory"
     tal:define="base_url python: '/' + here.getPortalObject().getId();
@@ -27,7 +48,7 @@
     </tal:block>
 
     <!-- Check inventory total records -->
-    <tal:block tal:define="pagination_configuration python: {'header': '(%s)' % movement_count, 'footer': '%s Records' % movement_count}">
+    <tal:block tal:define="pagination_configuration python: {'header': '(%s)' % inventory_list_count, 'footer': '%s Records' % inventory_list_count}">
       <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/check_listbox_pagination_text" />
     </tal:block>
 
@@ -46,7 +67,7 @@
       <tr>
         <td>assertText</td>
         <td tal:content="python: '//div[@data-gadget-scope=\'field_listbox\']//table/tbody/tr[1]/td[%s]' % (inventory_tuple[1])">inventory value</td>
-        <td tal:content="python: int(inventory_tuple[0])"></td>
+        <td tal:content="python: inventory_tuple[0]"></td>
       </tr>
     </tal:block>
     <tr>
@@ -60,17 +81,17 @@
     <tr>
       <td>assertText</td>
       <td>//div[@data-gadget-scope='field_listbox']//table/tfoot/tr[1]/td[3]</td>
-      <td tal:content="python: int(current_inventory)"></td>
+      <td tal:content="python: current_inventory"></td>
     </tr>
     <tr>
       <td>assertText</td>
       <td>//div[@data-gadget-scope='field_listbox']//table/tfoot/tr[1]/td[4]</td>
-      <td tal:content="python: int(available_inventory)"></td>
+      <td tal:content="python: available_inventory"></td>
     </tr>
     <tr>
       <td>assertText</td>
       <td>//div[@data-gadget-scope='field_listbox']//table/tfoot/tr[1]/td[5]</td>
-      <td tal:content="python: int(future_inventory)"></td>
+      <td tal:content="python: future_inventory"></td>
     </tr>
 
     <tr>