diff --git a/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_checkStockBrowser.xml b/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_checkStockBrowser.xml
index 36478da2395f7f2a16d720b90b4ee9380b0a6710..2bc0760df30204b0f47b109b615a4e003f3de1be 100644
--- a/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_checkStockBrowser.xml
+++ b/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_checkStockBrowser.xml
@@ -64,29 +64,44 @@
       <td tal:content="python: \'link=+ %s\' % link_title">link=+ node</td>\n
       <td></td>\n
     </tr>\n
+\n
+    <!-- Check inventory -->\n
     <tr>\n
       <td>verifyText</td>\n
       <td>id=listbox_record_number</td>\n
       <td tal:content="python: \'%s record(s)\' % movement_count">number of record(s)</td>\n
     </tr>\n
     <tal:block tal:condition="python: movement_count != 0">\n
-      <tr>\n
-        <td>verifyText</td>\n
-        <td>//tr[@id="listbox_data_line_0"]/td[3]</td>\n
-        <td tal:content="python: current_inventory">current inventory</td>\n
-      </tr>\n
-      <tr>\n
-        <td>verifyText</td>\n
-        <td>//tr[@id="listbox_data_line_0"]/td[4]</td>\n
-        <td tal:content="python: available_inventory">available inventory</td>\n
-      </tr>\n
-      <tr>\n
-        <td>verifyText</td>\n
-        <td>//tr[@id="listbox_data_line_0"]/td[5]</td>\n
-        <td tal:content="python: future_inventory">future inventory</td>\n
-      </tr>\n
-    </tal:block>\n
 \n
+      <!-- Check that inventory and movement list are consistent -->\n
+      <tal:block tal:repeat="inventory_tuple python: [(current_inventory, 3),\n
+                                                      (available_inventory, 4),\n
+                                                      (future_inventory, 5),\n
+                                                     ]">\n
+        <tr>\n
+          <td>verifyText</td>\n
+          <td tal:content="python: \'//tr[@id=\\\'listbox_data_line_0\\\']/td[%s]\' % inventory_tuple[1]">inventory value</td>\n
+          <td tal:content="python: inventory_tuple[0]">current inventory</td>\n
+        </tr>\n
+        <!-- Check movement history list -->\n
+        <tr>\n
+          <td>clickAndWait</td>\n
+          <td tal:content="python: \'//tr[@id=\\\'listbox_data_line_0\\\']/td[%s]/a[1]\' % inventory_tuple[1]">link</td>\n
+          <td></td>\n
+        </tr>\n
+        <tr>\n
+          <td>verifyText</td>\n
+          <td>id=listbox_record_number</td>\n
+          <td tal:content="python: \'%s record(s)\' % int(abs(inventory_tuple[0]))">number of movement(s)</td>\n
+        </tr>\n
+        <!-- Go back to inventory view -->\n
+        <tr>\n
+          <td>clickAndWait</td>\n
+          <td>//a[@id="listbox_title"]</td>\n
+          <td></td>\n
+        </tr>\n
+      </tal:block>\n
+    </tal:block>\n
   </tal:block>\n
 </tal:block>
 
diff --git a/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_createDelivery.xml b/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_createDelivery.xml
index 17cb727b4e5eb5bcf0791255fb71d2eef47e61fc..db3899c62361367a23c4541206f1a220e3bf30fb 100644
--- a/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_createDelivery.xml
+++ b/bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_createDelivery.xml
@@ -105,6 +105,7 @@ if state in [\'planned\', \'ordered\']:\n
   order.portal_workflow.doActionFor(order, \'plan_action\')\n
   if state == \'ordered\':\n
     order.portal_workflow.doActionFor(order, \'order_action\')\n
+  delivery = order\n
 \n
 else:\n
   module = portal.getDefaultModule(delivery_portal_type)\n
diff --git a/bt5/erp5_pdm_ui_test/bt/revision b/bt5/erp5_pdm_ui_test/bt/revision
index e440e5c842586965a7fb77deda2eca68612b1f53..7813681f5b41c028345ca62a2be376bae70b7f61 100644
--- a/bt5/erp5_pdm_ui_test/bt/revision
+++ b/bt5/erp5_pdm_ui_test/bt/revision
@@ -1 +1 @@
-3
\ No newline at end of file
+5
\ No newline at end of file