diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_create_reversal.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_create_reversal.html.xml
index 031accc5ef7da64a106f14da445610fb81911654..c43c18ffef530603536fb6c3850ea08556cad07a 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_create_reversal.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_create_reversal.html.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -131,22 +128,22 @@ Test for Creating Reversal Transaction for an Accounting Transaction\n
 </tr>\n
 <tr>\n
   <td>select</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/select</td>\n
   <td>label=2 - Fixed Assets</td>\n
 </tr>\n
 <tr>\n
   <td>select</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/select</td>\n
   <td>label=3 - Stocks</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
   <td>20.0</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
   <td>20.0</td>\n
 </tr>\n
 <tr>\n
@@ -261,32 +258,32 @@ delivered. FIXME: we won\'t be able to delete the transaction later\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/select</td>\n
   <td>account_module/stocks</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/select</td>\n
   <td>account_module/fixed_assets</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
   <td>20.0</td> \n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[5]/input</td>\n
   <td>0.0</td> \n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
   <td>20.0</td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_input.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_input.html.xml
index 21ced784aca72de0376d749b7574feadb2ab92ab..e9229c92982e949aca65173c7a69adc0e0898da1 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_input.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_input.html.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -111,22 +108,22 @@ Test Simple view of an Accounting Transaction\n
 </tr>\n
 <tr>\n
   <td>select</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/select</td>\n
   <td>label=2 - Fixed Assets</td>\n
 </tr>\n
 <tr>\n
   <td>select</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/select</td>\n
   <td>label=3 - Stocks</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
   <td>10.0</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
   <td>20.0</td>\n
 </tr>\n
 <tr>\n
@@ -159,33 +156,33 @@ Test Simple view of an Accounting Transaction\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/select</td>\n
   <td>account_module/fixed_assets</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/select</td>\n
   <td>account_module/stocks</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
   <td>10.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
   <td>20.0</td>\n
 </tr>\n
 <!-- stat is updated -->\n
 <tr>\n
   <td>assertFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[3]</td>\n
+  <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
   <td>10</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
+  <td>//tr[@id=\'listbox_stat_line\']/td[5]</td>\n
   <td>20</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -208,17 +205,17 @@ Test Simple view of an Accounting Transaction\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_2\']/td[3]/select</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[3]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_2\']/td[4]/input</td>\n
   <td>0.0</td>\n
 </tr>          \n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[4]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_2\']/td[5]/input</td>\n
   <td>0.0</td>\n
 </tr> \n
 <!-- }}} -->\n
@@ -241,33 +238,33 @@ Test Simple view of an Accounting Transaction\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/select</td>\n
   <td>account_module/fixed_assets</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/select</td>\n
   <td>account_module/stocks</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
   <td>10.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
   <td>20.0</td>\n
 </tr>\n
 <!-- stat -->\n
 <tr>\n
   <td>assertFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[3]</td>\n
+  <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
   <td>10</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
+  <td>//tr[@id=\'listbox_stat_line\']/td[5]</td>\n
   <td>20</td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_payment_transaction_input_multiple_partners.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_payment_transaction_input_multiple_partners.html.xml
index b5f16faeabd05f301ef422850a737b87d8108dd9..9c89b31330a3659d4a45c03e58abd37d840c5c87 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_payment_transaction_input_multiple_partners.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_payment_transaction_input_multiple_partners.html.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -111,17 +108,17 @@ Test Simple view of an Accounting Transaction\n
 </tr>\n
 <tr>\n
   <td>select</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/select</td>\n
   <td>label=40 - Payable</td>\n
 </tr>\n
 <tr>\n
   <td>select</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/select</td>\n
   <td>label=41 - Receivable</td>\n
 </tr>\n
 <tr>\n
   <td>select</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_2\']/td[3]/select</td>\n
   <td>label=5 - Bank</td>\n
 </tr>\n
 <tr>\n
@@ -159,17 +156,17 @@ Test Simple view of an Accounting Transaction\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/select</td>\n
   <td>account_module/payable</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/select</td>\n
   <td>account_module/receivable</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_2\']/td[3]/select</td>\n
   <td>account_module/bank</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -177,7 +174,7 @@ Test Simple view of an Accounting Transaction\n
 <!-- Edit the party on a line {{{ -->\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>link=payable</td>\n
+  <td>link=Payable</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -205,17 +202,17 @@ Test Simple view of an Accounting Transaction\n
 <!-- Check new column is here {{{ -->\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[4]</td>\n
   <td>Supplier</td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[3]</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[4]</td>\n
   <td>Client 1</td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[3]</td>\n
+  <td>//tr[@id=\'listbox_data_line_2\']/td[4]</td>\n
   <td>Client 1</td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_purchase_invoice_transaction_create_reversal.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_purchase_invoice_transaction_create_reversal.html.xml
index 2599e7713427464c6943e57cbd87662501ce008c..7d58d51cdc21815914cf6376f52d6f273aa53c58 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_purchase_invoice_transaction_create_reversal.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_purchase_invoice_transaction_create_reversal.html.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -137,32 +134,32 @@ Test for Creating Reversal Transaction for a Purchase Invoice Transaction\n
 \n
 <tr>\n
   <td>select</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/select</td>\n
   <td>label=6 - Goods Purchase</td>\n
 </tr>\n
 <tr>\n
   <td>select</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/select</td>\n
   <td>label=4456 - Refundable VAT 10%</td>\n
 </tr>\n
 <tr>\n
   <td>select</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_2\']/td[3]/select</td>\n
   <td>label=40 - Payable</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
   <td>11.0</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
   <td>1.0</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[4]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_2\']/td[5]/input</td>\n
   <td>10.0</td>\n
 </tr>\n
 <tr>\n
@@ -283,47 +280,47 @@ delivered. FIXME: we won\'t be able to delete the transaction later\n
 <!-- Same as above, bad ordering ... -->\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/select</td>\n
   <td>account_module/payable</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/select</td>\n
   <td>account_module/refundable_vat</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_2\']/td[3]/select</td>\n
   <td>account_module/goods_purchase</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
   <td>10.0</td> \n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[5]/input</td>\n
   <td>0.0</td> \n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
   <td>1.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[3]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_2\']/td[4]/input</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[4]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_2\']/td[5]/input</td>\n
   <td>11.0</td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_sale_invoice_transaction_create_reversal.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_sale_invoice_transaction_create_reversal.html.xml
index 711f1cc1bf661b5d60a46d1e3d8b2ccaccb294f2..729eff61b0d5d4218b65a71d462cbce993db34d3 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_sale_invoice_transaction_create_reversal.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_sale_invoice_transaction_create_reversal.html.xml
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PageTemplates.ZopePageTemplate</string>
-          <string>ZopePageTemplate</string>
-        </tuple>
-        <none/>
+        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -139,32 +136,32 @@ Test for Creating Reversal Transaction for a Sale Invoice Transaction\n
 fixing. -->\n
 <tr>\n
   <td>select</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/select</td>\n
   <td>label=7 - Goods Sales</td>\n
 </tr>\n
 <tr>\n
   <td>select</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/select</td>\n
   <td>label=4457 - Collected VAT 10%</td>\n
 </tr>\n
 <tr>\n
   <td>select</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_2\']/td[3]/select</td>\n
   <td>label=41 - Receivable</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[5]/input</td>\n
   <td>11.0</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
   <td>1.0</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[3]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_2\']/td[4]/input</td>\n
   <td>10.0</td>\n
 </tr>\n
 <tr>\n
@@ -285,47 +282,47 @@ delivered. FIXME: we won\'t be able to delete the transaction later\n
 <!-- Same as above, bad ordering ... -->\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/select</td>\n
   <td>account_module/receivable</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/select</td>\n
   <td>account_module/collected_vat</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[2]/select</td>\n
+  <td>//tr[@id=\'listbox_data_line_2\']/td[3]/select</td>\n
   <td>account_module/goods_sales</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
   <td>0.0</td> \n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_0\']/td[5]/input</td>\n
   <td>10.0</td> \n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
   <td>1.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[3]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_2\']/td[4]/input</td>\n
   <td>11.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[4]/input</td>\n
+  <td>//tr[@id=\'listbox_data_line_2\']/td[5]/input</td>\n
   <td>0.0</td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/bt/revision b/bt5/erp5_accounting_ui_test/bt/revision
index b2412e34dff05e77952f3f930772631cac5a3be7..4e9e288487445d1193130dba3e3c6af29b242115 100644
--- a/bt5/erp5_accounting_ui_test/bt/revision
+++ b/bt5/erp5_accounting_ui_test/bt/revision
@@ -1 +1 @@
-62
\ No newline at end of file
+63
\ No newline at end of file