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 6454a79055bed75cb778c7416febce3c61271cc7..d2596ddd253306807431b00f119ab94162df5582 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
@@ -121,15 +121,21 @@ Test `preferred_gap_id` column of Account Module\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[@value=\'listbox.title\']</td>\n
+  <td>storeLocation</td>\n
+  <td>current_account_url</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- reset any sort on preferred_gap_id. previously here was sorting by title, \n
+       but now we can sort by multiple columns, so sort by title does not reset sorting. -->\n
+  <td>openAndWait</td>\n
+  <td>${current_account_url}&reset=int:1</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <!-- sort by preferred_gap_id -->\n
   <td>clickAndWait</td>\n
-  <td>//button[@value=\'listbox.preferred_gap_id\']</td>\n
+  <td>//button[@value=\'listbox.preferred_gap_id:asc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -153,7 +159,7 @@ Test `preferred_gap_id` column of Account Module\n
 <tr>\n
   <!-- sort by preferred_gap_id -->\n
   <td>clickAndWait</td>\n
-  <td>//button[@value=\'listbox.preferred_gap_id\']</td>\n
+  <td>//button[@value=\'listbox.preferred_gap_id:desc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -181,8 +187,7 @@ Test `preferred_gap_id` column of Account Module\n
 </tbody></table>\n
 </body>\n
 </html> <!-- vim: syntax=html foldmethod=marker\n
--->\n
-
+-->
 
 ]]></unicode> </value>
         </item>
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 7f7a0478062370ae200ba00480606a124f83b7e7..5130bc7db2385b43d50f7b929a34e88064a8cbf3 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
@@ -87,15 +87,21 @@ Test `preferred_gap_id` column of Account Module\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[@value=\'listbox.title\']</td>\n
+  <td>storeLocation</td>\n
+  <td>current_account_url</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- reset any sort on preferred_gap_id. previously here was sorting by title, \n
+       but now we can sort by multiple columns, so sort by title does not reset sorting. -->\n
+  <td>openAndWait</td>\n
+  <td>${current_account_url}&reset=int:1</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
   <!-- sort by preferred_gap_id -->\n
   <td>clickAndWait</td>\n
-  <td>//button[@value=\'listbox.preferred_gap_id\']</td>\n
+  <td>//button[@value=\'listbox.preferred_gap_id:asc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -124,7 +130,7 @@ Test `preferred_gap_id` column of Account Module\n
 <tr>\n
   <!-- sort by preferred_gap_id -->\n
   <td>clickAndWait</td>\n
-  <td>//button[@value=\'listbox.preferred_gap_id\']</td>\n
+  <td>//button[@value=\'listbox.preferred_gap_id:desc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -152,7 +158,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[@value=\'listbox.preferred_gap_id\']</td>\n
+  <td>//button[@value=\'listbox.preferred_gap_id:asc\']</td>\n
   <td></td>\n
 </tr>\n
 \n
@@ -160,8 +166,7 @@ Test `preferred_gap_id` column of Account Module\n
 </tbody></table>\n
 </body>\n
 </html> <!-- vim: syntax=html foldmethod=marker\n
--->\n
-
+-->
 
 ]]></unicode> </value>
         </item>
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 b5fa238f53a7e2a8a046a79d5fe256083757c989..957a6556eea039c4c65c53bf86c242cb753e131a 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
@@ -91,7 +91,7 @@ Test sort for Accounting module main listbox\n
 <!-- sort by title {{{ -->\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:asc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -129,7 +129,7 @@ Test sort for Accounting module main listbox\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:desc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -160,10 +160,21 @@ Test sort for Accounting module main listbox\n
 <!-- }}} -->\n
 \n
 <!-- sort by type {{{ -->\n
+<tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:none\']</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- reset title sorting -->\n
+  <td>clickAndWait</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:none\']</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.translated_portal_type\']</td>\n
+    @value=\'listbox.translated_portal_type:asc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -187,7 +198,7 @@ Test sort for Accounting module main listbox\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.translated_portal_type\']</td>\n
+    @value=\'listbox.translated_portal_type:desc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -208,10 +219,21 @@ Test sort for Accounting module main listbox\n
 <!-- }}} -->\n
 \n
 <!-- sort by date {{{ -->\n
+<tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_portal_type:none\']</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- reset type sorting -->\n
+  <td>clickAndWait</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_portal_type:none\']</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.operation_date\']</td>\n
+    @value=\'listbox.operation_date:asc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -245,7 +267,7 @@ Test sort for Accounting module main listbox\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.operation_date\']</td>\n
+    @value=\'listbox.operation_date:desc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -276,6 +298,17 @@ Test sort for Accounting module main listbox\n
 <!-- }}} -->\n
 \n
 <!-- sort by reference {{{ -->\n
+<tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.operation_date:none\']</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- reset date sorting -->\n
+  <td>clickAndWait</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.operation_date:none\']</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>type</td>\n
   <td>listbox_reference</td>\n
@@ -285,7 +318,7 @@ Test sort for Accounting module main listbox\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.reference\']</td>\n
+    @value=\'listbox.reference:asc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -309,7 +342,7 @@ Test sort for Accounting module main listbox\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.reference\']</td>\n
+    @value=\'listbox.reference:desc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -339,10 +372,22 @@ Test sort for Accounting module main listbox\n
 <!-- }}} -->\n
 \n
 <!-- sort by specific reference {{{ -->\n
+<tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.reference:none\']</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- reset reference sorting -->\n
+  <td>clickAndWait</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
+    @value=\'listbox.reference:none\']</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.specific_reference\']</td>\n
+    @value=\'listbox.specific_reference:asc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -376,7 +421,7 @@ Test sort for Accounting module main listbox\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.specific_reference\']</td>\n
+    @value=\'listbox.specific_reference:desc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -407,10 +452,22 @@ Test sort for Accounting module main listbox\n
 <!-- }}} -->\n
 \n
 <!-- sort by simulation state {{{ -->\n
+<tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.specific_reference:none\']</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- reset specific_reference sorting -->\n
+  <td>clickAndWait</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
+    @value=\'listbox.specific_reference:none\']</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.translated_simulation_state_title\']</td>\n
+    @value=\'listbox.translated_simulation_state_title:asc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\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 3ba48b982dee7c3f1debfa4fee89056ebec9aa86..490252a67dd25cd0c4f7d0eabc8abd7bfc603409 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
@@ -80,7 +80,7 @@ Test sort for Accounting module main listbox, without section\n
 <!-- sort by title {{{ -->\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:asc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -118,7 +118,7 @@ Test sort for Accounting module main listbox, without section\n
 </tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title\']</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:desc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -149,10 +149,21 @@ Test sort for Accounting module main listbox, without section\n
 <!-- }}} -->\n
 \n
 <!-- sort by type {{{ -->\n
+<tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:none\']</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- reset title sorting -->\n
+  <td>clickAndWait</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.title:none\']</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.translated_portal_type\']</td>\n
+    @value=\'listbox.translated_portal_type:asc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -176,7 +187,7 @@ Test sort for Accounting module main listbox, without section\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.translated_portal_type\']</td>\n
+    @value=\'listbox.translated_portal_type:desc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -197,10 +208,21 @@ Test sort for Accounting module main listbox, without section\n
 <!-- }}} -->\n
 \n
 <!-- sort by date {{{ -->\n
+<tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_portal_type:none\']</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- reset type sorting -->\n
+  <td>clickAndWait</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.translated_portal_type:none\']</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.operation_date\']</td>\n
+    @value=\'listbox.operation_date:asc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -215,7 +237,7 @@ Test sort for Accounting module main listbox, without section\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.operation_date\']</td>\n
+    @value=\'listbox.operation_date:desc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -227,6 +249,17 @@ Test sort for Accounting module main listbox, without section\n
 <!-- }}} -->\n
 \n
 <!-- sort by reference {{{ -->\n
+<tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.operation_date:none\']</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- reset date sorting -->\n
+  <td>clickAndWait</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.operation_date:none\']</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>type</td>\n
   <td>listbox_reference</td>\n
@@ -236,7 +269,7 @@ Test sort for Accounting module main listbox, without section\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.reference\']</td>\n
+    @value=\'listbox.reference:asc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -260,7 +293,7 @@ Test sort for Accounting module main listbox, without section\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.reference\']</td>\n
+    @value=\'listbox.reference:desc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -290,10 +323,22 @@ Test sort for Accounting module main listbox, without section\n
 <!-- }}} -->\n
 \n
 <!-- sort by specific reference {{{ -->\n
+<tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.reference:none\']</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- reset reference sorting -->\n
+  <td>clickAndWait</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
+    @value=\'listbox.reference:none\']</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.specific_reference\']</td>\n
+    @value=\'listbox.specific_reference:asc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -308,7 +353,7 @@ Test sort for Accounting module main listbox, without section\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.specific_reference\']</td>\n
+    @value=\'listbox.specific_reference:desc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -320,10 +365,22 @@ Test sort for Accounting module main listbox, without section\n
 <!-- }}} -->\n
 \n
 <!-- sort by simulation state {{{ -->\n
+<tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and @value=\'listbox.specific_reference:none\']</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- reset specific_reference sorting -->\n
+  <td>clickAndWait</td>\n
+  <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
+    @value=\'listbox.specific_reference:none\']</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
   <td>//button[@name=\'setSelectionQuickSortOrder:method\' and\n
-    @value=\'listbox.translated_simulation_state_title\']</td>\n
+    @value=\'listbox.translated_simulation_state_title:asc\']</td>\n
   <td></td>\n
 </tr>\n
 <tr>\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 80c2a3a5198c082f2a3184db8998f9d1b09cbc06..6436ee76827c7407107321b4e7dfa153602618f7 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
@@ -81,7 +81,7 @@ Sorting in Grouping Dialog\n
 <!-- Sort by date asc {{{ -->\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//tr[@class=\'listbox-label-line\']/th[6]/button</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[6]/button[@value="listbox.date:asc"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -109,7 +109,7 @@ Sorting in Grouping Dialog\n
 <!-- Sort by date desc {{{ -->\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//tr[@class=\'listbox-label-line\']/th[6]/button</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[6]/button[@value="listbox.date:desc"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -135,9 +135,20 @@ Sorting in Grouping Dialog\n
 <!-- }}} -->\n
 \n
 <!-- Sort by title asc {{{ -->\n
+<tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[6]/button[@value="listbox.date:none"]</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- reset date sorting -->\n
+  <td>clickAndWait</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[6]/button[@value="listbox.date:none"]</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//tr[@class=\'listbox-label-line\']/th[7]/button</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[7]/button[@value="listbox.parent_title:asc"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -165,7 +176,7 @@ Sorting in Grouping Dialog\n
 <!-- Sort by title desc {{{ -->\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//tr[@class=\'listbox-label-line\']/th[7]/button</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[7]/button[@value="listbox.parent_title:desc"]</td>\n
   <td></td>\n
 </tr>\n
 <tr>\n
@@ -192,17 +203,41 @@ Sorting in Grouping Dialog\n
 \n
 <!-- Sort by grouping reference asc {{{ -->\n
 <tr>\n
+  <!-- reset title sorting -->\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[7]/button[@value="listbox.parent_title:none"]</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- reset title sorting -->\n
   <td>clickAndWait</td>\n
-  <td>//tr[@class=\'listbox-label-line\']/th[2]/button</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[7]/button[@value="listbox.parent_title:none"]</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- XXX-Tatuya: For what purpose of this sort? -->\n
+  <td>clickAndWait</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[2]/button[@value="listbox.grouping_reference:asc"]</td>\n
   <td></td>\n
 </tr>\n
 <!-- }}} -->\n
 \n
 \n
 <!-- Sort by Account Name asc {{{ -->\n
+<tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[2]/button[@value="listbox.grouping_reference:none"]</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- reset grouping reference sorting -->\n
+  <td>clickAndWait</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[2]/button[@value="listbox.grouping_reference:none"]</td>\n
+  <td></td>\n
+</tr>\n
 <tr>\n
   <td>clickAndWait</td>\n
-  <td>//tr[@class=\'listbox-label-line\']/th[9]/button</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[9]/button[@value="listbox.node_title:asc"]</td>\n
   <td></td>\n
 </tr>\n
 <!-- all lines have the same account here. -->\n
@@ -210,8 +245,19 @@ Sorting in Grouping Dialog\n
 \n
 <!-- Sort by third party title asc {{{ -->\n
 <tr>\n
+  <td>assertElementPresent</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[9]/button[@value="listbox.node_title:none"]</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <!-- reset Account Name sorting -->\n
   <td>clickAndWait</td>\n
-  <td>//tr[@class=\'listbox-label-line\']/th[10]/button</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[9]/button[@value="listbox.node_title:none"]</td>\n
+  <td></td>\n
+</tr>\n
+<tr>\n
+  <td>clickAndWait</td>\n
+  <td>//tr[@class=\'listbox-label-line\']/th[10]/button[@value="listbox.Movement_getMirrorSectionTitle:asc"]</td>\n
   <td></td>\n
 </tr>\n
 <!-- this is not really sorting by title, but by uid just to make sure lines\n
@@ -222,8 +268,7 @@ for the same party are grouped together.\n
 </tbody></table>\n
 </body>\n
 </html> <!-- vim: syntax=html foldmethod=marker\n
--->\n
-
+-->
 
 ]]></unicode> </value>
         </item>
diff --git a/bt5/erp5_accounting_ui_test/bt/revision b/bt5/erp5_accounting_ui_test/bt/revision
index 412965750910b48d20bc79b925a1cc30685a9d64..fb351815657b5e2d423f156c000b624c3a74b73d 100644
--- a/bt5/erp5_accounting_ui_test/bt/revision
+++ b/bt5/erp5_accounting_ui_test/bt/revision
@@ -1 +1 @@
-196
\ No newline at end of file
+197
\ No newline at end of file