From 18be1c7626af54ccb39ce469021079000fff8268 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Wed, 8 Sep 2010 12:22:16 +0000
Subject: [PATCH] Listbox uses no longer Ids but CSS classes. Adjust tests
 accordingly after r38122.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38194 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../test_account_module_at_date.html.xml      |  65 +++---
 .../test_account_module_default_list.html.xml | 185 +++++++++---------
 ...odule_default_list_with_employees.html.xml | 185 +++++++++---------
 .../test_account_module_domain_tree.html.xml  |  95 +++++----
 .../test_account_module_filter.html.xml       | 111 +++++------
 .../test_account_module_from_date.html.xml    | 185 +++++++++---------
 ...ferred_gap_id_as_reference_column.html.xml |  41 ++--
 ...nt_module_preferred_gap_id_column.html.xml |  39 ++--
 ...est_account_module_search_columns.html.xml |  85 ++++----
 ...g_transaction_module_change_state.html.xml |  35 ++--
 ...ounting_transaction_module_delete.html.xml |  23 +--
 ...saction_module_empty_transactions.html.xml |  89 ++++-----
 ...ounting_transaction_module_filter.html.xml |  33 ++--
 ...transaction_module_multiple_pages.html.xml | 119 ++++++-----
 ...transaction_module_search_columns.html.xml | 139 +++++++------
 ...le_search_dialog_search_by_amount.html.xml |  29 ++-
 ...dule_search_dialog_search_by_date.html.xml |  33 ++--
 ...ccounting_transaction_module_sort.html.xml | 125 ++++++------
 ...ction_module_sort_without_section.html.xml |  81 ++++----
 ...odule_transactions_with_employees.html.xml |  21 +-
 .../test_template.xml                         |  33 ++--
 ..._expense_account_transaction_list.html.xml |  51 +++--
 .../test_account_transaction_list.html.xml    |  49 +++--
 ..._account_transaction_list_at_date.html.xml |  19 +-
 ...ccount_transaction_list_from_date.html.xml |  37 ++--
 ...ction_list_jump_accounting_module.html.xml |  31 ++-
 .../test_organisation_jump.html.xml           |  45 ++---
 ...est_organisation_transaction_list.html.xml |  51 +++--
 ...nisation_transaction_list_at_date.html.xml |  19 +-
 ...sation_transaction_list_from_date.html.xml |  67 +++----
 ...sation_transaction_list_multipage.html.xml |  55 +++---
 ...ransaction_list_node_independance.html.xml |  25 ++-
 .../test_group_dialog_sorting.html.xml        |  55 +++---
 ...oup_from_account_transaction_list.html.xml |  35 ++--
 ...roup_from_entity_transaction_list.html.xml |  37 ++--
 .../test_group_multi_pages.html.xml           |  45 ++---
 bt5/erp5_accounting_ui_test/bt/revision       |   2 +-
 37 files changed, 1133 insertions(+), 1241 deletions(-)

diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_at_date.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_at_date.html.xml
index b1092e3c43..c0e541db13 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_at_date.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_at_date.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -96,30 +93,30 @@ Test display of Account Module, with at_date parameter\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>10 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>10</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
 <!-- check transaction count {{{ -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_4\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[5]</td>\n
   <td>28</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_6\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[5]</td>\n
   <td>24</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_7\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[5]</td>\n
   <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_9\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[5]</td>\n
   <td>24</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -127,22 +124,22 @@ Test display of Account Module, with at_date parameter\n
 <!-- {{{ Debit -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_4\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[6]</td>\n
   <td>257400</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_6\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[6]</td>\n
   <td>0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_7\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[6]</td>\n
   <td>9900</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_9\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[6]</td>\n
   <td>0</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -150,22 +147,22 @@ Test display of Account Module, with at_date parameter\n
 <!-- {{{ Credit -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_4\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[7]</td>\n
   <td>9900.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_6\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[7]</td>\n
   <td>23400</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_7\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[7]</td>\n
   <td>0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_9\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[7]</td>\n
   <td>234000</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -173,22 +170,22 @@ Test display of Account Module, with at_date parameter\n
 <!-- {{{ Debit Balance -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_4\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[8]</td>\n
   <td>247500.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_6\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[8]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_7\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[8]</td>\n
   <td>9900</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_9\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[8]</td>\n
   <td></td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -196,22 +193,22 @@ Test display of Account Module, with at_date parameter\n
 <!-- {{{ Credit Balance -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_4\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[9]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_6\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[9]</td>\n
   <td>23400</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_7\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[9]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_9\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[9]</td>\n
   <td>234000</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -219,43 +216,43 @@ Test display of Account Module, with at_date parameter\n
 <!-- Check Stat columns {{{ -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[2]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[3]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[4]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[5]</td>\n
   <td>80</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[6]</td>\n
   <td>267300</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[7]</td>\n
   <td>267300</td>\n
 </tr>\n
 <!-- XXX Currently no stat for Debit Balance and Credit Balance -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[8]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td></td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_default_list.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_default_list.html.xml
index 760a140232..cbe52f5148 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_default_list.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_default_list.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -65,8 +62,8 @@ Test default display of Account Module\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>10 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>10</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
@@ -91,402 +88,402 @@ for line_idx, line in enumerate(list(csv.reader(f))[1:]):\n
 -->\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a</td>\n
     <td>Equity</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]/a</td>\n
     <td>20000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a</td>\n
     <td>20000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]/a</td>\n
     <td>2</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[3]/a</td>\n
     <td>Fixed Assets</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[6]/a</td>\n
     <td>15000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[8]/a</td>\n
     <td>15000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[2]/a</td>\n
     <td>3</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[3]/a</td>\n
     <td>Stocks</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[6]/a</td>\n
     <td>5000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[8]/a</td>\n
     <td>5000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[2]/a</td>\n
     <td>40</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[3]/a</td>\n
     <td>Payable</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[5]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[7]/a</td>\n
     <td>7700.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[9]/a</td>\n
     <td>7700.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[2]/a</td>\n
     <td>41</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[3]/a</td>\n
     <td>Receivable</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[5]/a</td>\n
     <td>2</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[6]/a</td>\n
     <td>5500.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[8]/a</td>\n
     <td>5500.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[2]/a</td>\n
     <td>4457</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[3]/a</td>\n
     <td>Collected VAT 10%</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[5]/a</td>\n
     <td>2</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[7]/a</td>\n
     <td>500.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[9]/a</td>\n
     <td>500.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[2]/a</td>\n
     <td>4456</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[3]/a</td>\n
     <td>Refundable VAT 10%</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[5]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[6]/a</td>\n
     <td>700.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[8]/a</td>\n
     <td>700.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[2]/a</td>\n
     <td>5</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[3]/a</td>\n
     <td>Bank</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[5]/a</td>\n
     <td>0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[2]/a</td>\n
     <td>6</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[3]/a</td>\n
     <td>Goods Purchase</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[5]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[6]/a</td>\n
     <td>7000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[8]/a</td>\n
     <td>7000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[2]/a</td>\n
     <td>7</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[3]/a</td>\n
     <td>Goods Sales</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[5]/a</td>\n
     <td>2</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[7]/a</td>\n
     <td>5000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[9]/a</td>\n
     <td>5000.0</td>\n
   </tr>\n
 <!-- }}} -->\n
@@ -494,43 +491,43 @@ for line_idx, line in enumerate(list(csv.reader(f))[1:]):\n
 <!-- Check Stat columns {{{ -->\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[2]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[2]</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[3]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[3]</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[4]</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[5]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[5]</td>\n
     <td>12</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[6]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[6]</td>\n
     <td>33200.00</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[7]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[7]</td>\n
     <td>33200.00</td>\n
   </tr>\n
   <!-- XXX Currently no stat for Debit Balance and Credit Balance -->\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[8]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[8]</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
     <td></td>\n
   </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_default_list_with_employees.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_default_list_with_employees.html.xml
index 17e9a64fd8..7aff83861b 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_default_list_with_employees.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_default_list_with_employees.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -66,410 +63,410 @@ Test default display of Account Module With Employees.\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>10 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>10</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
 <!-- check lines contents {{{ -->\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a</td>\n
     <td>Equity</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/a</td>\n
     <td>0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]/a</td>\n
     <td>2</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[3]/a</td>\n
     <td>Fixed Assets</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[2]/a</td>\n
     <td>3</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[3]/a</td>\n
     <td>Stocks</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]/a</td>\n
     <td>0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[2]/a</td>\n
     <td>40</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[3]/a</td>\n
     <td>Payable</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[5]/a</td>\n
     <td>0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[2]/a</td>\n
     <td>41</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[3]/a</td>\n
     <td>Receivable</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[5]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[6]/a</td>\n
     <td>1100.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[8]/a</td>\n
     <td>1100.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[2]/a</td>\n
     <td>4456</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[3]/a</td>\n
     <td>Refundable VAT 10%</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[5]/a</td>\n
     <td>0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[2]/a</td>\n
     <td>4457</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[3]/a</td>\n
     <td>Collected VAT 10%</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[5]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[7]/a</td>\n
     <td>100.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[9]/a</td>\n
     <td>100.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[2]/a</td>\n
     <td>5</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[3]/a</td>\n
     <td>Bank</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[5]/a</td>\n
     <td>0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[2]/a</td>\n
     <td>6</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[3]/a</td>\n
     <td>Goods Purchase</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[5]/a</td>\n
     <td>0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[2]/a</td>\n
     <td>7</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[3]/a</td>\n
     <td>Goods Sales</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[5]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[7]/a</td>\n
     <td>1000</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[9]/a</td>\n
     <td>1000.0</td>\n
   </tr>\n
 <!-- }}} -->\n
@@ -477,43 +474,43 @@ Test default display of Account Module With Employees.\n
 <!-- Cheek Stat columns {{{ -->\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[2]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[2]</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[3]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[3]</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[4]</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[5]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[5]</td>\n
     <td>3</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[6]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[6]</td>\n
     <td>1100.00</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[7]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[7]</td>\n
     <td>1100.00</td>\n
   </tr>\n
   <!-- XXX Currently no stat for Debit Balance and Credit Balance -->\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[8]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[8]</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
     <td></td>\n
   </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_domain_tree.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_domain_tree.html.xml
index 5a97a00e0f..7ee25ed9de 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_domain_tree.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_domain_tree.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -63,7 +60,7 @@ Test domain tree of Account Module\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>listbox_domain_tree_mode</td>\n
+  <td>//input[@class="listbox-tree-domain-tree-mode"]</td>\n
   <td></td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -76,8 +73,8 @@ Test domain tree of Account Module\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>10 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>10</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
@@ -85,60 +82,60 @@ Test domain tree of Account Module\n
 <tr>\n
   <td>clickAndWait</td>\n
   <!-- XXX it should probably be the category `id`, not the title. -->\n
-  <td>//table[@id="listbox_domain_tree_table"]//tr[2]//a[@class="tree_closed"]</td>\n
+  <td>//table[//table[@class="listbox-table-domain-tree"]]//tr[2]//a[@class="tree-closed"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
   <!-- XXX it should probably be the category `id`, not the title. -->\n
-  <td>//table[@id="listbox_domain_tree_table"]//tr[3]//a[@class="tree_closed"]</td>\n
+  <td>//table[//table[@class="listbox-table-domain-tree"]]//tr[3]//a[@class="tree-closed"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>10 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>10</td>\n
 </tr>\n
 \n
 <!-- stat -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[2]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[3]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[4]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[5]</td>\n
   <td>12</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[6]</td>\n
   <td>33200</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[7]</td>\n
   <td>33200</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[8]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td></td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -148,54 +145,54 @@ Test domain tree of Account Module\n
 -->\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//table[@id="listbox_domain_tree_table"]//tr[7]//a[@class="tree_closed"]</td>\n
+  <td>//table[@class="listbox-table-domain-tree"]//tr[7]//a[@class="tree-closed"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 \n
 <!-- stat -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[2]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[3]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[4]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[5]</td>\n
   <td>6</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[6]</td>\n
   <td>6200</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[7]</td>\n
   <td>8200</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[8]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td></td>\n
 </tr>\n
 <!--}}}  -->\n
@@ -203,7 +200,7 @@ Test domain tree of Account Module\n
 <!-- Filter on title {{{ -->\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[3]/span/input</td>  \n
+  <td>//tr[@class="listbox-search-line"]/th[3]/input</td>  \n
   <td>Payable</td>\n
 </tr>\n
 <tr>\n
@@ -213,91 +210,91 @@ Test domain tree of Account Module\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 \n
 <!-- column values -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n
   <td>40</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a</td>\n
   <td>Payable</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/a</td>\n
   <td>Validated</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/a</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[6]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[6]/a</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]/a</td>\n
   <td>7700.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[8]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[8]/a</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a</td>\n
   <td>7700.0</td>\n
 </tr>\n
 \n
 <!-- stat -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[2]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[3]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[4]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[5]</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[6]</td>\n
   <td>0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[7]</td>\n
   <td>7700</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[8]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td></td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_filter.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_filter.html.xml
index 1b5049900e..797e703d31 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_filter.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_filter.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -66,15 +63,15 @@ Test filter in Account Module\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>10 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>10</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
 <!-- Filter on one account {{{ -->\n
 <tr>\n
   <td>click</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[1]/input[@type=\'checkbox\']</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]/input[@type=\'checkbox\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -84,92 +81,92 @@ Test filter in Account Module\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 \n
 <!-- column values -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a</td>\n
   <td>Equity</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/a</td>\n
   <td>Validated</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/a</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[6]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[6]/a</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]/a</td>\n
   <td>20000.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[8]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[8]/a</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a</td>\n
   <td>20000.0</td>\n
 </tr>\n
 \n
 <!-- stat -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[2]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[3]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[4]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[5]</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[6]</td>\n
   <td>0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[7]</td>\n
   <td>20000.00</td>\n
 </tr>\n
 <!-- XXX Currently no stat for Debit Balance and Credit Balance -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[8]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td></td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -182,20 +179,20 @@ Test filter in Account Module\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>10 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>10</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
 <!-- Filter on two accounts {{{ -->\n
 <tr>\n
   <td>click</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[1]/input[@type=\'checkbox\']</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]/input[@type=\'checkbox\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>click</td>\n
-  <td>//tr[@id=\'listbox_data_line_4\']/td[1]/input[@type=\'checkbox\']</td>\n
+  <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[1]/input[@type=\'checkbox\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -205,133 +202,133 @@ Test filter in Account Module\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 \n
 <!-- column values -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a</td>\n
   <td>Equity</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/a</td>\n
   <td>Validated</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/a</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[6]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[6]/a</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]/a</td>\n
   <td>20000.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[8]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[8]/a</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a</td>\n
   <td>20000.0</td>\n
 </tr>\n
 \n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]/a</td>\n
   <td>41</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[3]/a</td>\n
   <td>Receivable</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]/a</td>\n
   <td>Validated</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]/a</td>\n
   <td>2</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[6]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[6]/a</td>\n
   <td>5500.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[7]/a</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[8]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[8]/a</td>\n
   <td>5500.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[9]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[9]/a</td>\n
   <td></td>\n
 </tr>\n
 \n
 <!-- stat -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[2]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[3]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[4]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[5]</td>\n
   <td>3</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[6]</td>\n
   <td>5500</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[7]</td>\n
   <td>20000.00</td>\n
 </tr>\n
 <!-- XXX Currently no stat for Debit Balance and Credit Balance -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[8]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td></td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -344,8 +341,8 @@ Test filter in Account Module\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>10 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>10</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_from_date.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_from_date.html.xml
index 874125de41..5ba9e3b6af 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_from_date.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_from_date.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -96,410 +93,410 @@ Test display of Account Module, with from_date parameter (which has no impact)\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>10 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>10</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
 <!-- Listbox lines {{{ -->\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a</td>\n
     <td>Equity</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]/a</td>\n
     <td>20000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_0\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a</td>\n
     <td>20000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]/a</td>\n
     <td>2</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[3]/a</td>\n
     <td>Fixed Assets</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[6]/a</td>\n
     <td>15000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[8]/a</td>\n
     <td>15000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_1\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[2]/a</td>\n
     <td>3</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[3]/a</td>\n
     <td>Stocks</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[6]/a</td>\n
     <td>5000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[8]/a</td>\n
     <td>5000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_2\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[2]/a</td>\n
     <td>40</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[3]/a</td>\n
     <td>Payable</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[5]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[7]/a</td>\n
     <td>7700.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_3\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[9]/a</td>\n
     <td>7700.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[2]/a</td>\n
     <td>41</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[3]/a</td>\n
     <td>Receivable</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[5]/a</td>\n
     <td>2</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[6]/a</td>\n
     <td>5500.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[8]/a</td>\n
     <td>5500.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_4\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[2]/a</td>\n
     <td>4457</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[3]/a</td>\n
     <td>Collected VAT 10%</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[5]/a</td>\n
     <td>2</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[7]/a</td>\n
     <td>500.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_6\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[9]/a</td>\n
     <td>500.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[2]/a</td>\n
     <td>4456</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[3]/a</td>\n
     <td>Refundable VAT 10%</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[5]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[6]/a</td>\n
     <td>700.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[8]/a</td>\n
     <td>700.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_5\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[2]/a</td>\n
     <td>5</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[3]/a</td>\n
     <td>Bank</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[5]/a</td>\n
     <td>0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_7\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[2]/a</td>\n
     <td>6</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[3]/a</td>\n
     <td>Goods Purchase</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[5]/a</td>\n
     <td>1</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[6]/a</td>\n
     <td>7000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[7]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[8]/a</td>\n
     <td>7000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_8\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[9]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[2]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[2]/a</td>\n
     <td>7</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[3]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[3]/a</td>\n
     <td>Goods Sales</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[4]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[4]/a</td>\n
     <td>Validated</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[5]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[5]/a</td>\n
     <td>2</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[6]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[6]/a</td>\n
     <td>0.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[7]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[7]/a</td>\n
     <td>5000.0</td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[8]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[8]/a</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_data_line_9\']/td[9]/a</td>\n
+    <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[9]/a</td>\n
     <td>5000.0</td>\n
   </tr>\n
 <!-- }}} -->\n
@@ -507,43 +504,43 @@ Test display of Account Module, with from_date parameter (which has no impact)\n
 <!-- Check Stat columns {{{ -->\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[2]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[2]</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[3]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[3]</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[4]</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[5]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[5]</td>\n
     <td>12</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[6]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[6]</td>\n
     <td>33200.00</td>\n
   </tr>\n
   <tr>\n
     <td>verifyFloat</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[7]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[7]</td>\n
     <td>33200.00</td>\n
   </tr>\n
   <!-- XXX Currently no stat for Debit Balance and Credit Balance -->\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[8]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[8]</td>\n
     <td></td>\n
   </tr>\n
   <tr>\n
     <td>verifyText</td>\n
-    <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+    <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
     <td></td>\n
   </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_as_reference_column.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_as_reference_column.html.xml
index 18049d5b95..086d8946f6 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_as_reference_column.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_as_reference_column.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -82,15 +79,15 @@ Test `preferred_gap_id` column of Account Module\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>10 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>10</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
 <!-- Filter on preferred_gap_id {{{ -->\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[2]/span/input</td>\n
+  <td>//tr[@class="listbox-search-line"]/th[2]/input</td>\n
   <td>A-STOCK</td>\n
 </tr>\n
 <tr>\n
@@ -100,13 +97,13 @@ Test `preferred_gap_id` column of Account Module\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 \n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[2]/span/input</td>\n
+  <td>//tr[@class="listbox-search-line"]/th[2]/input</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -116,8 +113,8 @@ Test `preferred_gap_id` column of Account Module\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>10 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>10</td>\n
 </tr>\n
 \n
 \n
@@ -126,28 +123,28 @@ Test `preferred_gap_id` column of Account Module\n
 <tr>\n
   <!-- sort by title, to reset any sort on preferred_gap_id -->\n
   <td>clickAndWait</td>\n
-  <td>//button[@title=\'Account Name\']</td>\n
+  <td>//button[@value=\'listbox.title\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <!-- sort by preferred_gap_id -->\n
   <td>clickAndWait</td>\n
-  <td>//button[@title=\'GAP Number\']</td>\n
+  <td>//button[@value=\'listbox.preferred_gap_id\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n
   <td>A-BANK</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]/a</td>\n
   <td>A-COLLECTED-VAT</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[2]/a</td>\n
   <td>A-EQUITY</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -156,27 +153,27 @@ Test `preferred_gap_id` column of Account Module\n
 <tr>\n
   <!-- sort by preferred_gap_id -->\n
   <td>clickAndWait</td>\n
-  <td>//button[@title=\'GAP Number\']</td>\n
+  <td>//button[@value=\'listbox.preferred_gap_id\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n
   <td>A-STOCK</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]/a</td>\n
   <td>A-REF-VAT</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[2]/a</td>\n
   <td>A-REC</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[2]/a</td>\n
   <td>A-PAY</td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_column.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_column.html.xml
index 7d32c02449..4df46cab1f 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_column.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_preferred_gap_id_column.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -66,15 +63,15 @@ Test `preferred_gap_id` column of Account Module\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>10 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>10</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
 <!-- Filter on preferred_gap_id {{{ -->\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[2]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[2]/input</td>\n
   <td>4</td>\n
 </tr>\n
 <tr>\n
@@ -84,41 +81,41 @@ Test `preferred_gap_id` column of Account Module\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 \n
 <!-- make sure we are sorted by preferred_gap_id ASC -->\n
 <tr>\n
   <!-- sort by title, to reset any sort on preferred_gap_id -->\n
   <td>clickAndWait</td>\n
-  <td>//button[@title=\'Account Name\']</td>\n
+  <td>//button[@value=\'listbox.title\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <!-- sort by preferred_gap_id -->\n
   <td>clickAndWait</td>\n
-  <td>//button[@title=\'GAP Number\']</td>\n
+  <td>//button[@value=\'listbox.preferred_gap_id\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n
   <td>40</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]/a</td>\n
   <td>41</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[2]/a</td>\n
   <td>4456</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[2]/a</td>\n
   <td>4457</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -127,27 +124,27 @@ Test `preferred_gap_id` column of Account Module\n
 <tr>\n
   <!-- sort by preferred_gap_id -->\n
   <td>clickAndWait</td>\n
-  <td>//button[@title=\'GAP Number\']</td>\n
+  <td>//button[@value=\'listbox.preferred_gap_id\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n
   <td>4457</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]/a</td>\n
   <td>4456</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[2]/a</td>\n
   <td>41</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[2]/a</td>\n
   <td>40</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -155,7 +152,7 @@ Test `preferred_gap_id` column of Account Module\n
 <tr>\n
   <!-- make sure we end up sorting in ASCENDING-->\n
   <td>clickAndWait</td>\n
-  <td>//button[@title=\'GAP Number\']</td>\n
+  <td>//button[@value=\'listbox.preferred_gap_id\']</td>\n
   <td></td>\n
 </tr>\n
 \n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_search_columns.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_search_columns.html.xml
index 879595a08c..b2f4307563 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_search_columns.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_account_module/test_account_module_search_columns.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -66,15 +63,15 @@ Test search columns of Account Module\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>10 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>10</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
 <!-- Filter on preferred_gap_id {{{ -->\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[2]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[2]/input</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
@@ -84,92 +81,92 @@ Test search columns of Account Module\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 \n
 <!-- column values -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a</td>\n
   <td>Equity</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/a</td>\n
   <td>Validated</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/a</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[6]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[6]/a</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]/a</td>\n
   <td>20000.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[8]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[8]/a</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a</td>\n
   <td>20000.0</td>\n
 </tr>\n
 \n
 <!-- stat -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[2]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[3]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[4]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[5]</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[6]</td>\n
   <td>0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[7]</td>\n
   <td>20000.00</td>\n
 </tr>\n
 <!-- XXX Currently no stat for Debit Balance and Credit Balance -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[8]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td></td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -182,7 +179,7 @@ Test search columns of Account Module\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[3]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[3]/input</td>\n
   <td>Equity</td>\n
 </tr>\n
 <tr>\n
@@ -192,92 +189,92 @@ Test search columns of Account Module\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 \n
 <!-- column values -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a</td>\n
   <td>Equity</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/a</td>\n
   <td>Validated</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/a</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[6]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[6]/a</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]/a</td>\n
   <td>20000.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[8]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[8]/a</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a</td>\n
   <td>20000.0</td>\n
 </tr>\n
 \n
 <!-- stat -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[2]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[3]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[4]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[5]</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[6]</td>\n
   <td>0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[7]</td>\n
   <td>20000.00</td>\n
 </tr>\n
 <!-- XXX Currently no stat for Debit Balance and Credit Balance -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[8]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td></td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_change_state.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_change_state.html.xml
index 3264723d8d..9d3aa76934 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_change_state.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_change_state.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -66,7 +63,7 @@ Test changing state in accounting module (with custom search)\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[5]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[5]/input</td>\n
   <td>2005/01/01</td>\n
 </tr>\n
 <tr>\n
@@ -76,8 +73,8 @@ Test changing state in accounting module (with custom search)\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 \n
 <!-- Change state -->\n
@@ -88,28 +85,28 @@ Test changing state in accounting module (with custom search)\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[1]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]/a</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a</td>\n
   <td>Accounting Transaction</td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a</td>\n
   <td>Posted to General Ledger</td>\n
 </tr>\n
 \n
 <tr>\n
   <td>select</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]/select</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/select</td>\n
   <td>label=Cancel Transaction</td>\n
 </tr>\n
 \n
@@ -122,8 +119,8 @@ Test changing state in accounting module (with custom search)\n
 \n
 <tr>\n
   <td>assertText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
@@ -165,7 +162,7 @@ Test changing state in accounting module (with custom search)\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[5]/span/input</td>\n
+  <td>//tr[@class="listbox-search-line"]/th[5]/input</td>\n
   <td>2005/01/01</td>\n
 </tr>\n
 <tr>\n
@@ -175,12 +172,12 @@ Test changing state in accounting module (with custom search)\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[8]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[8]/a</td>\n
   <td>Cancelled</td>\n
 </tr>\n
 \n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_delete.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_delete.html.xml
index f95024eb87..7c34b67360 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_delete.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_delete.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -81,15 +78,15 @@ Test Accounting module listbox supports deleting\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
 <!-- Delete {{{ -->\n
 <tr>\n
   <td>click</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[1]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]/input</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -102,22 +99,22 @@ Test Accounting module listbox supports deleting\n
 <!-- Check content of delete confirmation dialog -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 \n
 <!-- check amounts for lines -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[8]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[8]/a\n
 </td>\n
   <td>20000.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[9]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a\n
 </td>\n
   <td>20000.0</td>\n
 </tr>\n
@@ -125,14 +122,14 @@ Test Accounting module listbox supports deleting\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[8]\n
+//tr[@class=\'listbox_stat_line\']/td[8]\n
 </td>\n
   <td>20000.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>20000.00</td>\n
 </tr>\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_empty_transactions.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_empty_transactions.html.xml
index 2caacd0b88..d82b9de0b2 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_empty_transactions.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_empty_transactions.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,21 +65,21 @@ Accounting Transaction Module Displays empty Transactions\n
 <!-- 4 item by default -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <!-- check amounts for stats -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>33200.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>33200.00</td>\n
 </tr>\n
@@ -134,63 +131,63 @@ Accounting Transaction Module Displays empty Transactions\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>5 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>5</td>\n
 </tr>\n
 <!-- column properties -->\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[3]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[3]\n
   </td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[4]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[4]\n
   </td>\n
   <td>Accounting Transaction</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[5]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[5]\n
   </td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[6]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[6]\n
   </td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[7]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[7]\n
   </td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[8]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[8]\n
   </td>\n
   <td>Draft</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[9]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[9]\n
   </td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[10]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[10]\n
   </td>\n
   <td>0.0</td>\n
 </tr>\n
@@ -199,14 +196,14 @@ Accounting Transaction Module Displays empty Transactions\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>33200.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>33200.00</td>\n
 </tr>\n
@@ -242,12 +239,12 @@ Accounting Transaction Module Displays empty Transactions\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>link=Accounting Transaction Lines:</td>\n
+  <td>link=Accounting Transaction Lines</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>listbox_check_all</td>\n
+  <td>//input[@class="listbox-check-all"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -257,8 +254,8 @@ Accounting Transaction Module Displays empty Transactions\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -273,8 +270,8 @@ Accounting Transaction Module Displays empty Transactions\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>0 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>0</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -302,63 +299,63 @@ Accounting Transaction Module Displays empty Transactions\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>6 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>6</td>\n
 </tr>\n
 <!-- column properties line 0 -->\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[3]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[3]\n
   </td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[4]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[4]\n
   </td>\n
   <td>Accounting Transaction</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[5]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[5]\n
   </td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[6]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[6]\n
   </td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[7]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[7]\n
   </td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[8]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[8]\n
   </td>\n
   <td>Draft</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[9]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[9]\n
   </td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[10]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[10]\n
   </td>\n
   <td>0.0</td>\n
 </tr>\n
@@ -366,56 +363,56 @@ Accounting Transaction Module Displays empty Transactions\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_1\']/td[3]\n
+//tr[@class=\'listbox-data-line-1 DataB\']/td[3]\n
   </td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_1\']/td[4]\n
+//tr[@class=\'listbox-data-line-1 DataB\']/td[4]\n
   </td>\n
   <td>Accounting Transaction</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_1\']/td[5]\n
+//tr[@class=\'listbox-data-line-1 DataB\']/td[5]\n
   </td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_1\']/td[6]\n
+//tr[@class=\'listbox-data-line-1 DataB\']/td[6]\n
   </td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_1\']/td[7]\n
+//tr[@class=\'listbox-data-line-1 DataB\']/td[7]\n
   </td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_1\']/td[8]\n
+//tr[@class=\'listbox-data-line-1 DataB\']/td[8]\n
   </td>\n
   <td>Draft</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_1\']/td[9]\n
+//tr[@class=\'listbox-data-line-1 DataB\']/td[9]\n
   </td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_1\']/td[10]\n
+//tr[@class=\'listbox-data-line-1 DataB\']/td[10]\n
   </td>\n
   <td>0.0</td>\n
 </tr>\n
@@ -424,14 +421,14 @@ Accounting Transaction Module Displays empty Transactions\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>33200.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>33200.00</td>\n
 </tr>\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_filter.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_filter.html.xml
index aea1eb9b65..af1a2fa039 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_filter.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_filter.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -66,15 +63,15 @@ Test Accounting module listbox supports filtering\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
 <!-- Filter {{{ -->\n
 <tr>\n
   <td>click</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[1]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]/input</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -84,8 +81,8 @@ Test Accounting module listbox supports filtering\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 <tr> <!-- maybe too low level -->\n
   <td>assertAttribute</td>\n
@@ -97,31 +94,31 @@ Test Accounting module listbox supports filtering\n
 <!-- check content of known lines {{{ -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>2005/01/01</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]</td>\n
   <td>Accounts opening</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]</td>\n
   <td></td>\n
 </tr>\n
 \n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[9]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[9]\n
 </td>\n
   <td>20000.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[10]\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[10]\n
 </td>\n
   <td>20000.00</td>\n
 </tr>\n
@@ -131,14 +128,14 @@ Test Accounting module listbox supports filtering\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>20000.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>20000.00</td>\n
 </tr>\n
@@ -153,8 +150,8 @@ Test Accounting module listbox supports filtering\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <tr> <!-- maybe too low level -->\n
   <td>assertAttribute</td>\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_multiple_pages.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_multiple_pages.html.xml
index f628fd894b..5fd3b60d60 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_multiple_pages.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_multiple_pages.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -66,60 +63,60 @@ Test Accounting module listbox multi pages\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>48 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>48</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
 <!-- we will check all dates {{{ -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>2005/01/01</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]</td>\n
   <td>2005/01/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]</td>\n
   <td>2005/01/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[5]</td>\n
   <td>2005/01/04</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_4\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[5]</td>\n
   <td>2005/02/01</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_5\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[5]</td>\n
   <td>2005/02/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_6\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[5]</td>\n
   <td>2005/02/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_7\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[5]</td>\n
   <td>2005/02/04</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_8\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[5]</td>\n
   <td>2005/03/01</td>\n
 </tr>\n
 <tr> \n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_9\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[5]</td>\n
   <td>2005/03/02</td>\n
 </tr>\n
 \n
@@ -130,14 +127,14 @@ Test Accounting module listbox multi pages\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>398400.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>398400.00</td>\n
 </tr>\n
@@ -145,59 +142,59 @@ Test Accounting module listbox multi pages\n
 \n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>listbox_next_page</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
 \n
 \n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>2005/03/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]</td>\n
   <td>2005/03/04</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]</td>\n
   <td>2005/04/01</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[5]</td>\n
   <td>2005/04/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_4\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[5]</td>\n
   <td>2005/04/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_5\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[5]</td>\n
   <td>2005/04/04</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_6\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[5]</td>\n
   <td>2005/05/01</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_7\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[5]</td>\n
   <td>2005/05/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_8\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[5]</td>\n
   <td>2005/05/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_9\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[5]</td>\n
   <td>2005/05/04</td>\n
 </tr>\n
 \n
@@ -207,14 +204,14 @@ Test Accounting module listbox multi pages\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>398400.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>398400.00</td>\n
 </tr>\n
@@ -230,13 +227,13 @@ Test Accounting module listbox multi pages\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>48 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>48</td>\n
 </tr>\n
 \n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[2]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[2]/input</td>\n
   <td>%Client%</td>\n
 </tr>\n
 \n
@@ -247,58 +244,58 @@ Test Accounting module listbox multi pages\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>24 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>24</td>\n
 </tr>\n
 \n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>2005/01/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]</td>\n
   <td>2005/01/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]</td>\n
   <td>2005/02/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[5]</td>\n
   <td>2005/02/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_4\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[5]</td>\n
   <td>2005/03/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_5\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[5]</td>\n
   <td>2005/03/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_6\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[5]</td>\n
   <td>2005/04/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_7\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[5]</td>\n
   <td>2005/04/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_8\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[5]</td>\n
   <td>2005/05/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_9\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[5]</td>\n
   <td>2005/05/03</td>\n
 </tr>\n
 \n
@@ -306,72 +303,72 @@ Test Accounting module listbox multi pages\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>66000.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>66000.00</td>\n
 </tr>\n
 \n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>listbox_next_page</td>\n
+  <td>//button[@class="listbox_next_page"]</td>\n
   <td></td>\n
 </tr>\n
 \n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>2005/06/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]</td>\n
   <td>2005/06/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]</td>\n
   <td>2005/07/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[5]</td>\n
   <td>2005/07/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_4\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[5]</td>\n
   <td>2005/08/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_5\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[5]</td>\n
   <td>2005/08/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_6\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[5]</td>\n
   <td>2005/09/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_7\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[5]</td>\n
   <td>2005/09/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_8\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[5]</td>\n
   <td>2005/10/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_9\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[5]</td>\n
   <td>2005/10/03</td>\n
 </tr>\n
 \n
@@ -379,14 +376,14 @@ Test Accounting module listbox multi pages\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>66000.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>66000.00</td>\n
 </tr>\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_columns.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_columns.html.xml
index bfa843b018..1c815d017b 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_columns.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_columns.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -67,7 +64,7 @@ Accounting Transaction Module Search Columns\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[2]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[2]/input</td>\n
   <td>Client 1 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
@@ -78,22 +75,22 @@ Accounting Transaction Module Search Columns\n
 <!-- list filtered with 1 item-->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 \n
 <!-- check amounts for lines -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[9]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a\n
 </td>\n
   <td>2200.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[10]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[10]/a\n
 </td>\n
   <td>2200.0</td>\n
 </tr>\n
@@ -101,14 +98,14 @@ Accounting Transaction Module Search Columns\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>2200.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>2200.00</td>\n
 </tr>\n
@@ -144,7 +141,7 @@ as title is a search key -->\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[2]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[2]/input</td>\n
   <td>%Client%</td>\n
 </tr>\n
 <tr>\n
@@ -155,13 +152,13 @@ as title is a search key -->\n
 <!-- list filtered with 2 items -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[3]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a\n
 </td>\n
   <td>Client 1</td>\n
 </tr>\n
@@ -169,21 +166,21 @@ as title is a search key -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[9]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a\n
 </td>\n
   <td>2200.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[10]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[10]/a\n
 </td>\n
   <td>2200.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_1\']/td[3]/a\n
+//tr[@class=\'listbox-data-line-1 DataB\']/td[3]/a\n
 </td>\n
   <td>Client 2</td>\n
 </tr>\n
@@ -191,14 +188,14 @@ as title is a search key -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_1\']/td[9]/a\n
+//tr[@class=\'listbox-data-line-1 DataB\']/td[9]/a\n
 </td>\n
   <td>3300.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_1\']/td[10]/a\n
+//tr[@class=\'listbox-data-line-1 DataB\']/td[10]/a\n
 </td>\n
   <td>3300.0</td>\n
 </tr>\n
@@ -206,14 +203,14 @@ as title is a search key -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>5500.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>5500.00</td>\n
 </tr>\n
@@ -227,7 +224,7 @@ as title is a search key -->\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[3]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[3]/input</td>\n
   <td>Client%</td>\n
 </tr>\n
 <tr>\n
@@ -238,13 +235,13 @@ as title is a search key -->\n
 <!-- list filtered with 2 items -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[3]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a\n
 </td>\n
   <td>Client 1</td>\n
 </tr>\n
@@ -252,21 +249,21 @@ as title is a search key -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[9]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a\n
 </td>\n
   <td>2200.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[10]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[10]/a\n
 </td>\n
   <td>2200.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_1\']/td[3]/a\n
+//tr[@class=\'listbox-data-line-1 DataB\']/td[3]/a\n
 </td>\n
   <td>Client 2</td>\n
 </tr>\n
@@ -275,14 +272,14 @@ as title is a search key -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_1\']/td[9]/a\n
+//tr[@class=\'listbox-data-line-1 DataB\']/td[9]/a\n
 </td>\n
   <td>3300.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_1\']/td[10]/a\n
+//tr[@class=\'listbox-data-line-1 DataB\']/td[10]/a\n
 </td>\n
   <td>3300.0</td>\n
 </tr>\n
@@ -290,14 +287,14 @@ as title is a search key -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>5500.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>5500.00</td>\n
 </tr>\n
@@ -311,7 +308,7 @@ as title is a search key -->\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[3]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[3]/input</td>\n
   <td>Supplier</td>\n
 </tr>\n
 <tr>\n
@@ -321,13 +318,13 @@ as title is a search key -->\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[3]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/a\n
 </td>\n
   <td>Supplier</td>\n
 </tr>\n
@@ -335,14 +332,14 @@ as title is a search key -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[9]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a\n
 </td>\n
   <td>7700.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[10]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[10]/a\n
 </td>\n
   <td>7700.0</td>\n
 </tr>\n
@@ -350,14 +347,14 @@ as title is a search key -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>7700.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>7700.00</td>\n
 </tr>\n
@@ -392,7 +389,7 @@ as title is a search key -->\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[4]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[4]/input</td>\n
   <td>Accounting Transaction</td>\n
 </tr>\n
 <tr>\n
@@ -402,13 +399,13 @@ as title is a search key -->\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[2]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a\n
 </td>\n
   <td>Accounts opening</td>\n
 </tr>\n
@@ -416,14 +413,14 @@ as title is a search key -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[9]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a\n
 </td>\n
   <td>20000.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[10]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[10]/a\n
 </td>\n
   <td>20000.0</td>\n
 </tr>\n
@@ -431,14 +428,14 @@ as title is a search key -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>20000.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>20000.00</td>\n
 </tr>\n
@@ -453,7 +450,7 @@ as title is a search key -->\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[5]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[5]/input</td>\n
   <td>2005/01/02</td>\n
 </tr>\n
 <tr>\n
@@ -463,13 +460,13 @@ as title is a search key -->\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[2]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a\n
 </td>\n
   <td>Client 1 Sale Invoice</td>\n
 </tr>\n
@@ -477,14 +474,14 @@ as title is a search key -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[9]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a\n
 </td>\n
   <td>2200.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[10]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[10]/a\n
 </td>\n
   <td>2200.0</td>\n
 </tr>\n
@@ -492,14 +489,14 @@ as title is a search key -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>2200.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>2200.00</td>\n
 </tr>\n
@@ -507,7 +504,7 @@ as title is a search key -->\n
 <!-- unset search parameters, to make sure it\'s not kept -->\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[5]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[5]/input</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -517,8 +514,8 @@ as title is a search key -->\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 \n
 \n
@@ -530,7 +527,7 @@ as title is a search key -->\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[5]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[5]/input</td>\n
   <td>&lt;= 2005/01/01</td>\n
 </tr>\n
 <tr>\n
@@ -540,13 +537,13 @@ as title is a search key -->\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[2]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a\n
 </td>\n
   <td>Accounts opening</td>\n
 </tr>\n
@@ -554,14 +551,14 @@ as title is a search key -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[9]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a\n
 </td>\n
   <td>20000.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[10]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[10]/a\n
 </td>\n
   <td>20000.0</td>\n
 </tr>\n
@@ -569,21 +566,21 @@ as title is a search key -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>20000.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>20000.00</td>\n
 </tr>\n
 <!-- unset search parameters, to make sure it\'s not kept -->\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_search_line\']/td[5]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[5]/input</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -593,8 +590,8 @@ as title is a search key -->\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 \n
 <!-- }}} --> \n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_dialog_search_by_amount.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_dialog_search_by_amount.html.xml
index acec12118b..3844348e73 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_dialog_search_by_amount.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_dialog_search_by_amount.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -78,22 +75,22 @@ Accounting Transaction Module Search Dialog: seach by amount\n
 <!-- list filtered with 1 item-->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 \n
 <!-- check amounts for lines -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[9]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a\n
 </td>\n
   <td>2200.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[10]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[10]/a\n
 </td>\n
   <td>2200.0</td>\n
 </tr>\n
@@ -101,14 +98,14 @@ Accounting Transaction Module Search Dialog: seach by amount\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>2200.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>2200.00</td>\n
 </tr>\n
@@ -148,22 +145,22 @@ Accounting Transaction Module Search Dialog: seach by amount\n
 <!-- list filtered with 1 item-->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 \n
 <!-- check amounts for lines -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[9]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a\n
 </td>\n
   <td>2200.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[10]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[10]/a\n
 </td>\n
   <td>2200.0</td>\n
 </tr>\n
@@ -171,14 +168,14 @@ Accounting Transaction Module Search Dialog: seach by amount\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>2200.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>2200.00</td>\n
 </tr>\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_dialog_search_by_date.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_dialog_search_by_date.html.xml
index 08db62c568..1a1b46cc2f 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_dialog_search_by_date.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_search_dialog_search_by_date.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -88,22 +85,22 @@ Accounting Transaction Module Search Dialog: seach by date\n
 <!-- list filtered with 1 item-->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 \n
 <!-- check amounts for lines -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[9]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a\n
 </td>\n
   <td>7700.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[10]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[10]/a\n
 </td>\n
   <td>7700.0</td>\n
 </tr>\n
@@ -111,14 +108,14 @@ Accounting Transaction Module Search Dialog: seach by date\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>7700.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>7700.00</td>\n
 </tr>\n
@@ -183,36 +180,36 @@ Accounting Transaction Module Search Dialog: seach by date\n
 <!-- list filtered with 2 item-->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 \n
 <!-- check amounts for lines -->\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[9]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a\n
 </td>\n
   <td>2200.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_0\']/td[10]/a\n
+//tr[@class=\'listbox-data-line-0 DataA\']/td[10]/a\n
 </td>\n
   <td>2200.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_1\']/td[9]/a\n
+//tr[@class=\'listbox-data-line-1 DataB\']/td[9]/a\n
 </td>\n
   <td>3300.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_data_line_1\']/td[10]/a\n
+//tr[@class=\'listbox-data-line-1 DataB\']/td[10]/a\n
 </td>\n
   <td>3300.0</td>\n
 </tr>\n
@@ -220,14 +217,14 @@ Accounting Transaction Module Search Dialog: seach by date\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[9]\n
+//tr[@class=\'listbox_stat_line\']/td[9]\n
 </td>\n
   <td>5500.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
   <td>\n
-//tr[@id=\'listbox_stat_line\']/td[10]\n
+//tr[@class=\'listbox_stat_line\']/td[10]\n
 </td>\n
   <td>5500.00</td>\n
 </tr>\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort.html.xml
index 7ba51d18c3..da0fd75634 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -66,27 +63,27 @@ Test sort for Accounting module main listbox\n
 <!-- check content of known lines {{{ -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>2005/01/01</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]</td>\n
   <td>2005/01/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]</td>\n
   <td>2005/01/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[5]</td>\n
   <td>2005/01/04</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -99,27 +96,27 @@ Test sort for Accounting module main listbox\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>2005/01/01</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]</td>\n
   <td>2005/01/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]</td>\n
   <td>2005/01/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[5]</td>\n
   <td>2005/01/04</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -137,27 +134,27 @@ Test sort for Accounting module main listbox\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>2005/01/04</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]</td>\n
   <td>2005/01/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]</td>\n
   <td>2005/01/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[5]</td>\n
   <td>2005/01/01</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -171,17 +168,17 @@ Test sort for Accounting module main listbox\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>2005/01/01</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]</td>\n
   <td>2005/01/04</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -195,17 +192,17 @@ Test sort for Accounting module main listbox\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]</td>\n
   <td>2005/01/04</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[5]</td>\n
   <td>2005/01/01</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -219,27 +216,27 @@ Test sort for Accounting module main listbox\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>2005/01/01</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]</td>\n
   <td>2005/01/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]</td>\n
   <td>2005/01/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[5]</td>\n
   <td>2005/01/04</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -253,27 +250,27 @@ Test sort for Accounting module main listbox\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>2005/01/04</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]</td>\n
   <td>2005/01/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]</td>\n
   <td>2005/01/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[5]</td>\n
   <td>2005/01/01</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -293,17 +290,17 @@ Test sort for Accounting module main listbox\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>2005/01/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]</td>\n
   <td>2005/01/03</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -317,17 +314,17 @@ Test sort for Accounting module main listbox\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>2005/01/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]</td>\n
   <td>2005/01/02</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -350,27 +347,27 @@ Test sort for Accounting module main listbox\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>2005/01/01</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]</td>\n
   <td>2005/01/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]</td>\n
   <td>2005/01/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[5]</td>\n
   <td>2005/01/04</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -384,27 +381,27 @@ Test sort for Accounting module main listbox\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>2005/01/04</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]</td>\n
   <td>2005/01/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]</td>\n
   <td>2005/01/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[5]</td>\n
   <td>2005/01/01</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -418,8 +415,8 @@ Test sort for Accounting module main listbox\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort_without_section.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort_without_section.html.xml
index 1a07465310..40dfe7650b 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort_without_section.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_sort_without_section.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -88,27 +85,27 @@ Test sort for Accounting module main listbox, without section\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]</td>\n
   <td>Accounts opening</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]</td>\n
   <td>Client 1 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[2]</td>\n
   <td>Client 2 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[2]</td>\n
   <td>First Purchase Invoice</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -126,27 +123,27 @@ Test sort for Accounting module main listbox, without section\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]</td>\n
   <td>First Purchase Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]</td>\n
   <td>Client 2 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[2]</td>\n
   <td>Client 1 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[2]</td>\n
   <td>Accounts opening</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -160,17 +157,17 @@ Test sort for Accounting module main listbox, without section\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]</td>\n
   <td>Accounts opening</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]</td>\n
   <td>First Purchase Invoice</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -184,17 +181,17 @@ Test sort for Accounting module main listbox, without section\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[2]</td>\n
   <td>First Purchase Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[2]</td>\n
   <td>Accounts opening</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -208,8 +205,8 @@ Test sort for Accounting module main listbox, without section\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <!-- no error -->\n
 <!-- }}} -->\n
@@ -223,8 +220,8 @@ Test sort for Accounting module main listbox, without section\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <!-- no error -->\n
 <!-- }}} -->\n
@@ -244,17 +241,17 @@ Test sort for Accounting module main listbox, without section\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]</td>\n
   <td>Client 1 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]</td>\n
   <td>Client 2 Sale Invoice</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -268,17 +265,17 @@ Test sort for Accounting module main listbox, without section\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]</td>\n
   <td>Client 2 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]</td>\n
   <td>Client 1 Sale Invoice</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -301,8 +298,8 @@ Test sort for Accounting module main listbox, without section\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <!-- no error -->\n
 <!-- }}} -->\n
@@ -316,8 +313,8 @@ Test sort for Accounting module main listbox, without section\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <!-- no error -->\n
 <!-- }}} -->\n
@@ -331,8 +328,8 @@ Test sort for Accounting module main listbox, without section\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_transactions_with_employees.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_transactions_with_employees.html.xml
index 09adacec93..c2cd9aab37 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_transactions_with_employees.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_module/test_accounting_transaction_module_transactions_with_employees.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -69,45 +66,45 @@ the group category from their subordination\n
 <!-- 1 item by default -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 \n
 <!-- third party -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]</td>\n
   <td>John Smith</td>\n
 </tr>\n
 \n
 <!-- transaction reference -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]</td>\n
   <td>source_reference</td>\n
 </tr>\n
 \n
 <!-- transaction debit & credit -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]</td>\n
   <td>1100.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[10]</td>\n
   <td>1100.00</td>\n
 </tr>\n
  \n
 <!-- check amounts for stats -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td>1100.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[10]</td>\n
   <td>1100.00</td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_transaction_template/test_template.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_transaction_template/test_template.xml
index 8fdeb08cf0..964ed1987e 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_transaction_template/test_template.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounting_transaction_template/test_template.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -110,22 +107,22 @@ Test Accounting Transaction Template\n
 </tr>\n
 <tr>\n
   <td>select</td>\n
-  <td>//tr[@id="listbox_data_line_0"]/td[3]/select</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/select</td>\n
   <td>label=1 - Equity</td>\n
 </tr>\n
 <tr>\n
   <td>select</td>\n
-  <td>//tr[@id="listbox_data_line_1"]/td[3]/select</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/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_2"]/td[3]/select</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/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_3"]/td[3]/select</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[3]/select</td>\n
   <td>label=41 - Receivable</td>\n
 </tr>\n
 <tr>\n
@@ -204,22 +201,22 @@ Test Accounting Transaction Template\n
 </tr>\n
 <tr>\n
   <td>verifySelected</td>\n
-  <td>//tr[@id="listbox_data_line_0"]/td[3]/select</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/select</td>\n
   <td>label=1 - Equity</td>\n
 </tr>\n
 <tr>\n
   <td>verifySelected</td>\n
-  <td>//tr[@id="listbox_data_line_1"]/td[3]/select</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[3]/select</td>\n
   <td>label=2 - Fixed Assets</td>\n
 </tr>\n
 <tr>\n
   <td>verifySelected</td>\n
-  <td>//tr[@id="listbox_data_line_2"]/td[3]/select</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[3]/select</td>\n
   <td>label=40 - Payable</td>\n
 </tr>\n
 <tr>\n
   <td>verifySelected</td>\n
-  <td>//tr[@id="listbox_data_line_3"]/td[3]/select</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[3]/select</td>\n
   <td>label=41 - Receivable</td>\n
 </tr>\n
 \n
@@ -258,17 +255,17 @@ Test Accounting Transaction Template\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>listbox_title</td>\n
+  <td>//a[@class="listbox_title"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>listbox_check_all</td>\n
+  <td>//input[@class="listbox-check-all"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -288,8 +285,8 @@ Test Accounting Transaction Template\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>0 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>0</td>\n
 </tr>\n
 \n
 <tr>\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_expense_account_transaction_list.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_expense_account_transaction_list.html.xml
index a990d72d36..876b83d84f 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_expense_account_transaction_list.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_expense_account_transaction_list.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -76,100 +73,100 @@ Test Transactions related to an account\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 \n
 <!-- dumped listbox {{{2 -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]</td>\n
   <td>Client 1 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]</td>\n
   <td>2005/01/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]</td>\n
   <td>Sale Invoice Transaction</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[6]</td>\n
   <td>Client 1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]</td>\n
   <td>Posted to General Ledger</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[8]</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]</td>\n
   <td>2000.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[10]</td>\n
   <td>-2000.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[11]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[11]</td>\n
   <td>-2000.0</td>\n
 </tr>\n
 \n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]</td>\n
   <td>Client 2 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[3]</td>\n
   <td>2005/01/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]</td>\n
   <td>Sale Invoice Transaction</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[6]</td>\n
   <td>Client 2</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[7]</td>\n
   <td>Posted to General Ledger</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[8]</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[9]</td>\n
   <td>3000.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[10]</td>\n
   <td>-3000.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[11]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[11]</td>\n
   <td>-5000.0</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -177,17 +174,17 @@ Test Transactions related to an account\n
 <!-- {{{ stat line -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[8]</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td>5000.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[10]</td>\n
   <td>-5000.0</td>\n
 </tr>\n
 <!-- 2}}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list.html.xml
index 20b6078d3f..c5ae9f94da 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -76,95 +73,95 @@ Test Transactions related to an account\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 \n
 <!-- dumped listbox {{{2 -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]</td>\n
   <td>Client 1 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]</td>\n
   <td>2005/01/02</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]</td>\n
   <td>Sale Invoice Transaction</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[6]</td>\n
   <td>Client 1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]</td>\n
   <td>Posted to General Ledger</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[8]</td>\n
   <td>2200.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[10]</td>\n
   <td>2200.0</td>\n
 </tr>\n
 \n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]</td>\n
   <td>Client 2 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[3]</td>\n
   <td>2005/01/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]</td>\n
   <td>Sale Invoice Transaction</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[6]</td>\n
   <td>Client 2</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[7]</td>\n
   <td>Posted to General Ledger</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[8]</td>\n
   <td>3300.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[9]</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[10]</td>\n
   <td>3300.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[11]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[11]</td>\n
   <td>5500.0</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -172,17 +169,17 @@ Test Transactions related to an account\n
 <!-- {{{ stat line -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[8]</td>\n
   <td>5500.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[10]</td>\n
   <td>5500.0</td>\n
 </tr>\n
 <!-- 2}}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_at_date.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_at_date.html.xml
index f741d44d56..753ade3551 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_at_date.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_at_date.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -106,20 +103,20 @@ Test Transactions related to an account, with at date parameter\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>24 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>24</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
 <!-- List lines {{{ -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[11]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[11]</td>\n
   <td>2200.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[11]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[11]</td>\n
   <td>3300.0</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -127,17 +124,17 @@ Test Transactions related to an account, with at date parameter\n
 <!-- {{{ stat line -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[8]</td>\n
   <td>217800.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td>3300.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[10]</td>\n
   <td>214500</td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_from_date.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_from_date.html.xml
index f2e97a2c92..f90967fb17 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_from_date.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_from_date.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -106,8 +103,8 @@ Test Transactions related to an account, with from date parameter\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>89 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>89</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
@@ -119,57 +116,57 @@ Test Transactions related to an account, with from date parameter\n
 <!-- {{{ Summary Line -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[1]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]</td>\n
   <td>Previous Balance</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]</td>\n
   <td>2005/01/12</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[6]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[6]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[8]</td>\n
   <td>217800.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]</td>\n
   <td>3300</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[10]</td>\n
   <td>214500.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[11]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[11]</td>\n
   <td>214500.0</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -180,17 +177,17 @@ client 1 invoice or client 2 invoice will have the first uid. -->\n
 <!-- {{{ stat line -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[8]</td>\n
   <td>1339800.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td>1339800.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[10]</td>\n
   <td>0.0</td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_jump_accounting_module.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_jump_accounting_module.html.xml
index 4bfdc876cb..a050410976 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_jump_accounting_module.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_accounts/test_account_transaction_list_jump_accounting_module.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -76,24 +73,24 @@ Test Account Transaction List then jump to accounting module.\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 \n
 <!-- {{{ stat line -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[8]</td>\n
   <td>5500.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[10]</td>\n
   <td>5500.0</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -106,39 +103,39 @@ Test Account Transaction List then jump to accounting module.\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 <!-- check amounts for lines -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]</td>\n
   <td>2200.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[10]</td>\n
   <td>2200.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[9]</td>\n
   <td>3300.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[10]</td>\n
   <td>3300.0</td>\n
 </tr>\n
 <!-- check amounts for stats -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td>5500.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[10]</td>\n
   <td>5500.00</td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_jump.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_jump.html.xml
index 613bfc4b33..b608115529 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_jump.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_jump.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -80,8 +77,8 @@ section or destination section\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>5 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>5</td>\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
@@ -95,29 +92,29 @@ section or destination section\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 <!-- check amounts for lines -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a</td>\n
   <td>3300.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[10]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[10]/a</td>\n
   <td>3300.0</td>\n
 </tr>\n
 <!-- check amounts for stats -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td>3300.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[10]</td>\n
   <td>3300.00</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -136,8 +133,8 @@ section or destination section\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>5 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>5</td>\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
@@ -151,8 +148,8 @@ section or destination section\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>0 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>0</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
@@ -171,8 +168,8 @@ We have a purchase with `Supplier` Organisation\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>5 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>5</td>\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
@@ -186,29 +183,29 @@ We have a purchase with `Supplier` Organisation\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 <!-- check amounts for lines -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]/a</td>\n
   <td>7700.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[10]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[10]/a</td>\n
   <td>7700.0</td>\n
 </tr>\n
 <!-- check amounts for stats -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td>7700.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[10]</td>\n
   <td>7700.00</td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list.html.xml
index 010c490ab6..3682e81da7 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -67,7 +64,7 @@ Test Transactions related to an Organisation\n
 <tr>\n
   <td>type</td>\n
   <!-- title -->\n
-  <td>//tr[@id=\'listbox_search_line\']/td[2]/span/input</td>  \n
+  <td>//tr[@class=\'listbox-search-line\']/th[2]/input</td>  \n
   <td>Client 2</td>\n
 </tr>\n
 <tr>\n
@@ -87,8 +84,8 @@ Test Transactions related to an Organisation\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 \n
 <!-- Dumped lisbox {{{ \n
@@ -97,74 +94,74 @@ from http://localhost:9080/erp5/Entity_viewAccountingTransactionList/listbox?for
 \n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[1]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]</td>\n
   <td>Client 2 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]</td>\n
   <td>My Organisation</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]</td>\n
   <td>2005/01/03</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]</td>\n
   <td>Sale Invoice Transaction</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>41</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[8]</td>\n
   <td>Posted to General Ledger</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]</td>\n
   <td>3300.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[10]</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[12]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[12]</td>\n
   <td>3300.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[13]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[13]</td>\n
   <td>3300.0</td>\n
 </tr>\n
 \n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td>3300.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[10]</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[12]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[12]</td>\n
   <td>3300.0</td>\n
 </tr>\n
 \n
 <tr>\n
   <td>storeText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[7]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]</td>\n
   <td>specific_reference</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -194,29 +191,29 @@ from http://localhost:9080/erp5/Entity_viewAccountingTransactionList/listbox?for
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 <!-- check amounts for lines -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]</td>\n
   <td>3300.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[10]</td>\n
   <td>3300.0</td>\n
 </tr>\n
 <!-- check amounts for stats -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td>3300.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[10]</td>\n
   <td>3300.00</td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_at_date.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_at_date.html.xml
index d20e3dc367..f260634284 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_at_date.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_at_date.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -98,7 +95,7 @@ Test Transactions related to an Organisation, with stop date\n
 <tr>\n
   <td>type</td>\n
   <!-- title -->\n
-  <td>//tr[@id=\'listbox_search_line\']/td[2]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[2]/input</td>\n
   <td>Client 1</td>\n
 </tr>\n
 <tr>\n
@@ -118,8 +115,8 @@ Test Transactions related to an Organisation, with stop date\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>12 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>12</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
@@ -128,24 +125,24 @@ Test Transactions related to an Organisation, with stop date\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td>72600.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[10]</td>\n
   <td>1100.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[12]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[12]</td>\n
   <td>71500.0</td>\n
 </tr>\n
 <!-- the last line of running total column shows the same value that the total\n
 balance. -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_11\']/td[13]</td>\n
+  <td>//tr[@class=\'listbox-data-line-11 DataB\']/td[13]</td>\n
   <td>71500.0</td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.xml
index 656ce19e64..42c236a960 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_from_date.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -98,7 +95,7 @@ Test Transactions related to an Organisation, with start date\n
 <tr>\n
   <td>type</td>\n
   <!-- title -->\n
-  <td>//tr[@id=\'listbox_search_line\']/td[2]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[2]/input</td>\n
   <td>Client 1</td>\n
 </tr>\n
 <tr>\n
@@ -124,40 +121,40 @@ Test Transactions related to an Organisation, with start date\n
 <!-- The summary line is counted here. -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>45 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>45</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
 <!-- The first line is a \'summary\' line. {{{ -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[1]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]</td>\n
   <td>Previous Balance</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]</td>\n
   <td>2005/01/12</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]</td>\n
   <td>72600.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[10]</td>\n
   <td>1100.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[12]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[12]</td>\n
   <td>71500.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[13]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[13]</td>\n
   <td>71500.00</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -165,37 +162,37 @@ Test Transactions related to an Organisation, with start date\n
 <!-- Lisbox body, especially the second line {{{ -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[1]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[1]</td>\n
   <td>Client 1 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[3]</td>\n
   <td>2005/01/12</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[8]</td>\n
   <td>Posted to General Ledger</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[9]</td>\n
   <td>13200.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[10]</td>\n
   <td>0.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[12]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[12]</td>\n
   <td>13200.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[13]</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[13]</td>\n
   <td>84700.00</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -203,17 +200,17 @@ Test Transactions related to an Organisation, with start date\n
 <!-- Stat line {{{ -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td>446600.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[10]</td>\n
   <td>446600.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[12]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[12]</td>\n
   <td>0</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -221,47 +218,47 @@ Test Transactions related to an Organisation, with start date\n
 <!-- Second page {{{ -->\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>2</td>\n
 </tr>\n
 <tr>\n
   <td>keyPressAndWait</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>\\13</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[1]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]</td>\n
   <td>Payment from Client 1 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]</td>\n
   <td>2005/01/21*</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]</td>\n
   <td>0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[10]</td>\n
   <td>12100</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[12]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[12]</td>\n
   <td>-12100</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[13]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[13]</td>\n
   <td>181500</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -269,17 +266,17 @@ Test Transactions related to an Organisation, with start date\n
 <!-- Stat line again {{{ -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td>446600.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[10]</td>\n
   <td>446600.0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[12]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[12]</td>\n
   <td>0</td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_multipage.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_multipage.html.xml
index d7d123c7fa..84c1baebcb 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_multipage.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_multipage.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -67,7 +64,7 @@ Test Transactions related to an Organisation, with multiple pages and date range
 <tr>\n
   <td>type</td>\n
   <!-- title -->\n
-  <td>//tr[@id=\'listbox_search_line\']/td[2]/span/input</td>\n
+  <td>//tr[@class=\'listbox-search-line\']/th[2]/input</td>\n
   <td>Client 1</td>\n
 </tr>\n
 <tr>\n
@@ -87,23 +84,23 @@ Test Transactions related to an Organisation, with multiple pages and date range
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>56 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>56</td>\n
 </tr>\n
 \n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td>446600.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[10]</td>\n
   <td>446600.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[12]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[12]</td>\n
   <td>0.0</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -111,96 +108,96 @@ Test Transactions related to an Organisation, with multiple pages and date range
 <!-- {{{ check second page -->\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>2</td>\n
 </tr>\n
 <tr>\n
   <td>keyPressAndWait</td>\n
-  <td>id=listbox_set_page</td>\n
+  <td>//input[@class="listbox_set_page"]</td>\n
   <td>\\13</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>56 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>56</td>\n
 </tr>\n
 <!-- check first line -->\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[1]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]</td>\n
   <td>Client 1 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]</td>\n
   <td>My Organisation</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]</td>\n
   <td>2005/01/16</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]</td>\n
   <td>Sale Invoice Transaction</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]</td>\n
   <td>41</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[8]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[8]</td>\n
   <td>Posted to General Ledger</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[9]</td>\n
   <td>17600.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[10]</td>\n
   <td>0</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[11]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[11]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[12]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[12]</td>\n
   <td>17600.00</td>\n
 </tr>\n
 <!-- this is the same as the last net_balance from the previous page -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[13]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[13]</td>\n
   <td>133100.00</td>\n
 </tr>\n
 \n
 <!-- Stats should not change -->\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[9]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[9]</td>\n
   <td>446600.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[10]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[10]</td>\n
   <td>446600.00</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[12]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[12]</td>\n
   <td>0.0</td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_node_independance.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_node_independance.html.xml
index 97a3a015fc..5aa3a9bc9e 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_node_independance.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_entities/test_organisation_transaction_list_node_independance.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,7 +65,7 @@ organisation and no bogus parameters are kept in the selection.\n
 <tr>\n
   <td>type</td>\n
   <!-- title -->\n
-  <td>//tr[@id=\'listbox_search_line\']/td[2]/span/input</td>  \n
+  <td>//tr[@class=\'listbox-search-line\']/th[2]/input</td>  \n
   <td>Client 1</td>\n
 </tr>\n
 <tr>\n
@@ -88,17 +85,17 @@ organisation and no bogus parameters are kept in the selection.\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[1]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]</td>\n
   <td>Client 1 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[12]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[12]</td>\n
   <td>2200</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -117,7 +114,7 @@ organisation and no bogus parameters are kept in the selection.\n
 <tr>\n
   <td>type</td>\n
   <!-- title -->\n
-  <td>//tr[@id=\'listbox_search_line\']/td[2]/span/input</td>  \n
+  <td>//tr[@class=\'listbox-search-line\']/th[2]/input</td>  \n
   <td>Client 2</td>\n
 </tr>\n
 <tr>\n
@@ -137,17 +134,17 @@ organisation and no bogus parameters are kept in the selection.\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>1 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[1]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]</td>\n
   <td>Client 2 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[12]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[12]</td>\n
   <td>3300</td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_sorting.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_sorting.html.xml
index 2b1af68ec0..c3720d8f2f 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_sorting.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_dialog_sorting.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -77,34 +74,34 @@ Sorting in Grouping Dialog\n
 \n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 \n
 <!-- Sort by date asc {{{ -->\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[6]/button</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[6]/button</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]/a</td>\n
   <td>Client 1 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[7]/a</td>\n
   <td>Client 1 Payment</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[7]/a</td>\n
   <td>Client 2 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[7]/a</td>\n
   <td>Client 2 Payment</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -112,27 +109,27 @@ Sorting in Grouping Dialog\n
 <!-- Sort by date desc {{{ -->\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[6]/button</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[6]/button</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[7]/a</td>\n
   <td>Client 1 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[7]/a</td>\n
   <td>Client 1 Payment</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[7]/a</td>\n
   <td>Client 2 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]/a</td>\n
   <td>Client 2 Payment</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -140,27 +137,27 @@ Sorting in Grouping Dialog\n
 <!-- Sort by title asc {{{ -->\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[7]/button</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[7]/button</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]/a</td>\n
   <td>Client 1 Payment</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[7]/a</td>\n
   <td>Client 1 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[7]/a</td>\n
   <td>Client 2 Payment</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[7]/a</td>\n
   <td>Client 2 Sale Invoice</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -168,27 +165,27 @@ Sorting in Grouping Dialog\n
 <!-- Sort by title desc {{{ -->\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[7]/button</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[7]/button</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[7]/a</td>\n
   <td>Client 1 Payment</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[7]/a</td>\n
   <td>Client 1 Sale Invoice</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[7]/a</td>\n
   <td>Client 2 Payment</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[7]/a</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[7]/a</td>\n
   <td>Client 2 Sale Invoice</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -196,7 +193,7 @@ Sorting in Grouping Dialog\n
 <!-- Sort by grouping reference asc {{{ -->\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[2]/button</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[2]/button</td>\n
   <td></td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -205,7 +202,7 @@ Sorting in Grouping Dialog\n
 <!-- Sort by Account Name asc {{{ -->\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[9]/button</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[9]/button</td>\n
   <td></td>\n
 </tr>\n
 <!-- all lines have the same account here. -->\n
@@ -214,7 +211,7 @@ Sorting in Grouping Dialog\n
 <!-- Sort by third party title asc {{{ -->\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//tr[@id=\'listbox_label_line\']/td[10]/button</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[10]/button</td>\n
   <td></td>\n
 </tr>\n
 <!-- this is not really sorting by title, but by uid just to make sure lines\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.xml
index 20cd9ec980..bb60d66d8a 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_account_transaction_list.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -93,12 +90,12 @@ Grouping from account transaction view\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>click</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[1]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[1]/input</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -137,7 +134,7 @@ Grouping from account transaction view\n
 <!-- select one more -->\n
 <tr>\n
   <td>click</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[1]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[1]/input</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -250,24 +247,24 @@ Grouping from account transaction view\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a/text()</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a/text()</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/a/text()</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]/a/text()</td>\n
   <td></td>\n
 </tr>\n
 \n
 <!-- now try to ungroup with only one, it will ungroup all related lines -->\n
 <tr>\n
   <td>click</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[1]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[1]/input</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -340,27 +337,27 @@ Grouping from account transaction view\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>4 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a/text()</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a/text()</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/a/text()</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]/a/text()</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[2]/a/text()</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[2]/a/text()</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[2]/a/text()</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[2]/a/text()</td>\n
   <td></td>\n
 </tr>\n
 \n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.xml
index 0db139e62e..fad854cba6 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_from_entity_transaction_list.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -64,7 +61,7 @@ Grouping from entity transaction view\n
 <tr>\n
   <td>type</td>\n
   <!-- title -->\n
-  <td>//tr[@id=\'listbox_search_line\']/td[2]/span/input</td>  \n
+  <td>//tr[@class=\'listbox-search-line\']/th[2]/input</td>  \n
   <td>Client 1</td>\n
 </tr>\n
 <tr>\n
@@ -104,8 +101,8 @@ Grouping from entity transaction view\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>5 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>5</td>\n
 </tr>\n
 <tr>\n
   <td>select</td>\n
@@ -125,19 +122,19 @@ Grouping from entity transaction view\n
 \n
 <tr>\n
   <td>assertText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 \n
 <!-- select and group -->\n
 <tr>\n
   <td>click</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[1]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]/input</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>click</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[1]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[1]/input</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -233,17 +230,17 @@ Grouping from entity transaction view\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a/text()</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a/text()</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/a/text()</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]/a/text()</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -251,7 +248,7 @@ Grouping from entity transaction view\n
 lines -->\n
 <tr>\n
   <td>click</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[1]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[1]/input</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -324,17 +321,17 @@ lines -->\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a/text()</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a/text()</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/a/text()</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]/a/text()</td>\n
   <td></td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_multi_pages.html.xml b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_multi_pages.html.xml
index 070ddd650b..315e7c8533 100644
--- a/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_multi_pages.html.xml
+++ b/bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/test_grouping_reference/test_group_multi_pages.html.xml
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
-        <tuple/>
-      </tuple>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -64,7 +61,7 @@ Grouping with multiple pages\n
 <tr>\n
   <td>type</td>\n
   <!-- title -->\n
-  <td>//tr[@id=\'listbox_search_line\']/td[2]/span/input</td>  \n
+  <td>//tr[@class=\'listbox-search-line\']/th[2]/input</td>  \n
   <td>Client 1</td>\n
 </tr>\n
 <tr>\n
@@ -120,29 +117,29 @@ Grouping with multiple pages\n
 \n
 <tr>\n
   <td>assertText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>12 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>12</td>\n
 </tr>\n
 \n
 <!-- select and group -->\n
 <tr>\n
   <td>click</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[1]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[1]/input</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//input[@id=\'listbox_next_page\']</td>\n
+  <td>//button[@class=\'listbox_next_page\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//span[@id=\'listbox_item_number\']</td>\n
-  <td>- 1 items selected</td>\n
+  <td>//span[@class=\'listbox-current-item-number\']</td>\n
+  <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>click</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[1]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[1]/input</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -157,8 +154,8 @@ Grouping with multiple pages\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//span[@id=\'listbox_item_number\']</td>\n
-  <td>- 0 items selected</td>\n
+  <td>//span[@class=\'listbox-current-item-number\']</td>\n
+  <td>0</td>\n
 </tr>\n
 \n
 <!-- mark the module as changed, reindex and come back to the entity -->\n
@@ -243,22 +240,22 @@ Grouping with multiple pages\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>2 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>2</td>\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//span[@id=\'listbox_item_number\']</td>\n
-  <td>- 0 items selected</td>\n
+  <td>//span[@class="listbox-current-item-number"]</td>\n
+  <td>0</td>\n
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a/text()</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a/text()</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[2]/a/text()</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[2]/a/text()</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -266,7 +263,7 @@ Grouping with multiple pages\n
 lines -->\n
 <tr>\n
   <td>click</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[1]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[1]/input</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -339,12 +336,12 @@ lines -->\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>12 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>12</td>\n
 </tr>\n
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[2]/a/text()</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[2]/a/text()</td>\n
   <td></td>\n
 </tr>\n
 <!-- }}} -->\n
diff --git a/bt5/erp5_accounting_ui_test/bt/revision b/bt5/erp5_accounting_ui_test/bt/revision
index 3968aef87f..89a16a7ddc 100644
--- a/bt5/erp5_accounting_ui_test/bt/revision
+++ b/bt5/erp5_accounting_ui_test/bt/revision
@@ -1 +1 @@
-170
\ No newline at end of file
+172
\ No newline at end of file
-- 
2.30.9