Sync with trunk@38207

Conflicts:
	products/ERP5/Document/OrderBuilder.py

git-svn-id: https://svn.erp5.org/repos/public/erp5/sandbox/amount_generator@38291 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewDialogFieldLibrary/your_simulation_state.xml

@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -264,10 +261,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -280,26 +274,20 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:here.Base_getTranslatedWorkflowStateItemList(wf_id=\'accounting_workflow\')</string> </value>
+            <value> <string>python:here.Base_getTranslatedAccountingWorkflowStateItemList()</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewReportFieldLibrary/your_function.xml

@@ -90,7 +90,9 @@
                 </item>
                 <item>
                     <key> <string>title</string> </key>
-                    <value> <string></string> </value>
+                    <value>
+                      <persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
+                    </value>
                 </item>
               </dictionary>
             </value>
@@ -191,4 +193,20 @@
       </dictionary>
     </pickle>
   </record>
+  <record id="5" aka="AAAAAAAAAAU=">
+    <pickle>
+      <tuple>
+        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+        <tuple/>
+      </tuple>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>_text</string> </key>
+            <value> <string>context/AccountingTransactionLine_getFunctionBaseCategoryTitle</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
 </ZopeData>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountModule_viewReportFieldLibrary/your_simulation_state.xml

@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -264,10 +261,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -280,26 +274,20 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:here.Base_getTranslatedWorkflowStateItemList(wf_id = \'accounting_workflow\')</string> </value>
+            <value> <string>python:here.Base_getTranslatedAccountingWorkflowStateItemList()</string> </value>
         </item>
       </dictionary>
     </pickle>
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Account_viewAccountingTransactionList/your_preferred_simulation_state.xml

@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -264,10 +261,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -280,10 +274,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -296,16 +287,13 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:[(\'\', \'\')] + here.Base_getTranslatedWorkflowStateItemList(wf_id=\'accounting_workflow\')</string> </value>
+            <value> <string>python:[(\'\', \'\')] + here.Base_getTranslatedAccountingWorkflowStateItemList()</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_getJournalSectionLineList.xml

@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransactionModule_viewSearchDialog/your_simulation_state.xml

@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -262,13 +259,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -281,19 +272,13 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <tuple>
-          <string>Products.Formulator.TALESField</string>
-          <string>TALESMethod</string>
-        </tuple>
-        <none/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:here.Base_getTranslatedWorkflowStateItemList(wf_id=\'accounting_workflow\')</string> </value>
+            <value> <string>python:here.Base_getTranslatedAccountingWorkflowStateItemList()</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isDestinationView.xml

@@ -56,13 +56,17 @@
             <value> <string>destination = context.getDestinationSectionValue()\n
 section_category = context.portal_preferences\\\n
          .getPreferredAccountingTransactionSectionCategory()\n
+section_category_strict = context.portal_preferences\\\n
+         .getPreferredAccountingSectionCategoryStrict()\n
+\n
 \n
 # If the destination is an organisation member of the preferred section category,\n
 # then we\'ll show destination view\n
 if destination is not None and section_category:\n
   if destination.getPortalType() == \'Person\':\n
     return False\n
-  if destination.isMemberOf(section_category):\n
+  if destination.isMemberOf(section_category,\n
+                            strict_membership=section_category_strict):\n
     return True\n
 \n
 # If the source is an organisation member of the preferred section category,\n
@@ -71,7 +75,8 @@ source = context.getSourceSectionValue()\n
 if source is not None and section_category:\n
   if source.getPortalType() == \'Person\':\n
     return True\n
-  if source.isMemberOf(section_category):\n
+  if source.isMemberOf(section_category,\n
+                       strict_membership=section_category_strict):\n
     return False\n
 \n
 # If we reach this point, none of the sections are member of the preferred section\n
@@ -117,6 +122,7 @@ return True\n
                             <string>context</string>
                             <string>destination</string>
                             <string>section_category</string>
+                            <string>section_category_strict</string>
                             <string>None</string>
                             <string>False</string>
                             <string>True</string>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_isSourceView.xml

@@ -56,13 +56,16 @@
             <value> <string>source = context.getSourceSectionValue()\n
 section_category = context.portal_preferences\\\n
          .getPreferredAccountingTransactionSectionCategory()\n
+section_category_strict = context.portal_preferences\\\n
+         .getPreferredAccountingSectionCategoryStrict()\n
 \n
 # If the source is an organisation member of the preferred section category,\n
 # then we\'ll show the source view\n
 if source is not None and section_category:\n
   if source.getPortalType() == \'Person\':\n
     return False\n
-  if source.isMemberOf(section_category):\n
+  if source.isMemberOf(section_category,\n
+                       strict_membership=section_category_strict):\n
     return True\n
 \n
 # Else, if the destination is an organisation member of the preferred section category,\n
@@ -71,7 +74,8 @@ destination = context.getDestinationSectionValue()\n
 if destination is not None and section_category:\n
   if destination.getPortalType() == \'Person\':\n
     return True\n
-  if destination.isMemberOf(section_category):\n
+  if destination.isMemberOf(section_category,\n
+                            strict_membership=section_category_strict):\n
     return False\n
 \n
 # If we reach this point, none of the sections are member of the preferred section\n
@@ -117,6 +121,7 @@ return True\n
                             <string>context</string>
                             <string>source</string>
                             <string>section_category</string>
+                            <string>section_category_strict</string>
                             <string>None</string>
                             <string>False</string>
                             <string>True</string>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/AccountingTransaction_setDefaultMirrorAccountList.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string># Auto-fill mirror accounts in transaction lines automatically, if necessary.\n
+portal = context.getPortalObject()\n
+movement_data_list = []\n
+has_source = False\n
+has_destination = False\n
+for movement in context.contentValues(portal_type=portal.getPortalAccountingMovementTypeList()):\n
+  source_account = movement.getSourceValue(portal_type=\'Account\')\n
+  destination_account = movement.getDestinationValue(portal_type=\'Account\')\n
+  if source_account is not None:\n
+    has_source = True\n
+  if destination_account is not None:\n
+    has_destination = True\n
+  # Interested in movements which lack one side only.\n
+  if (source_account is not None) ^ (destination_account is not None):\n
+    movement_data_list.append((movement, source_account, destination_account))\n
+\n
+# If both are true, mirror accounting is used.\n
+if has_source and has_destination:\n
+  for movement, source_account, destination_account in movement_data_list:\n
+    if source_account is None:\n
+      account = destination_account\n
+      base_category = \'source\'\n
+    else:\n
+      account = source_account\n
+      base_category = \'destination\'\n
+    \n
+    mirror_account = account.getDefaultDestination()\n
+    if mirror_account:\n
+      movement.setProperty(base_category, mirror_account)\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>**kw</string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>0</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>kw</string>
+                            <string>_getattr_</string>
+                            <string>context</string>
+                            <string>portal</string>
+                            <string>movement_data_list</string>
+                            <string>False</string>
+                            <string>has_source</string>
+                            <string>has_destination</string>
+                            <string>_getiter_</string>
+                            <string>movement</string>
+                            <string>source_account</string>
+                            <string>destination_account</string>
+                            <string>None</string>
+                            <string>True</string>
+                            <string>account</string>
+                            <string>base_category</string>
+                            <string>mirror_account</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>AccountingTransaction_setDefaultMirrorAccountList</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/BankAccount_viewAccountingTransactionList/your_preferred_simulation_state.xml

@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -262,10 +259,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -278,16 +272,13 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:[(\'\', \'\')] + here.Base_getTranslatedWorkflowStateItemList(wf_id=\'accounting_workflow\')</string> </value>
+            <value> <string>python:[(\'\', \'\')] + Base_getTranslatedAccountingWorkflowStateItemList()</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_getAccountingWorkflowId.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>return \'accounting_workflow\'\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>0</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple/>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Base_getAccountingWorkflowId</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Base_getTranslatedAccountingWorkflowStateItemList.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>return context.Base_getTranslatedWorkflowStateItemList(wf_id=context.Base_getAccountingWorkflowId())\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_code</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>errors</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_code</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>co_argcount</string> </key>
+                        <value> <int>0</int> </value>
+                    </item>
+                    <item>
+                        <key> <string>co_varnames</string> </key>
+                        <value>
+                          <tuple>
+                            <string>_getattr_</string>
+                            <string>context</string>
+                          </tuple>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>func_defaults</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>Base_getTranslatedAccountingWorkflowStateItemList</string> </value>
+        </item>
+        <item>
+            <key> <string>warnings</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Entity_viewAccountingTransactionList/your_preferred_simulation_state.xml

@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="MultiListField" module="Products.Formulator.StandardFields"/>
-        <tuple/>
-      </tuple>
+      <global name="MultiListField" module="Products.Formulator.StandardFields"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -264,10 +261,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -280,10 +274,7 @@
   </record>
   <record id="3" aka="AAAAAAAAAAM=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -296,16 +287,13 @@
   </record>
   <record id="4" aka="AAAAAAAAAAQ=">
     <pickle>
-      <tuple>
-        <global name="TALESMethod" module="Products.Formulator.TALESField"/>
-        <tuple/>
-      </tuple>
+      <global name="TALESMethod" module="Products.Formulator.TALESField"/>
     </pickle>
     <pickle>
       <dictionary>
         <item>
             <key> <string>_text</string> </key>
-            <value> <string>python:[(\'\', \'\')] + here.Base_getTranslatedWorkflowStateItemList(wf_id=\'accounting_workflow\')</string> </value>
+            <value> <string>python:[(\'\', \'\')] + Base_getTranslatedAccountingWorkflowStateItemList()</string> </value>
         </item>
       </dictionary>
     </pickle>

bt5/erp5_accounting/SkinTemplateItem/portal_skins/erp5_accounting/Invoice_getRemainingTotalPayablePrice.xml

@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -85,7 +82,7 @@ portal = context.getPortalObject()\n
 total_payable_price_per_node_section = dict()\n
 \n
 if simulation_state is None:\n
-  state_list = [x[1] for x in context.Base_getTranslatedWorkflowStateItemList(wf_id=\'accounting_workflow\')]\n
+  state_list = [x[1] for x in context.Base_getTranslatedAccountingWorkflowStateItemList()]\n
   simulation_state = [x for x in state_list\n
                       if x not in (\'draft\', \'cancelled\', \'deleted\', \'rejected\')]\n
 \n

bt5/erp5_accounting/WorkflowTemplateItem/portal_workflow/accounting_workflow/scripts/validateTransaction.xml

@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,6 +65,9 @@ transaction = state_change[\'object\']\n
 if not transaction.getStartDate() and transaction.getStopDate():\n
   transaction.setStartDate(transaction.getStopDate())\n
 \n
+# XXX auto-fill mirror accounts, if necessary.\n
+transaction.AccountingTransaction_setDefaultMirrorAccountList()\n
+\n
 # Check constraints\n
 transaction.Base_checkConsistency()\n
 \n

bt5/erp5_accounting/bt/change_log

+2010-09-08 yo
+* Forgot to add .append. Sorry.
+
+2010-09-08 yo
+* Auto-fill mirror accounts, if necessary, before running the accounting transaction constraint.
+
+2010-09-08 yusei
+Revert my change on AccountingTransactionModule_getJournalSectionLineList at 2010-09-02.
+
+2010-09-03 yusei
+* Add Base_getAccountingWorkflowId and Base_getTranslatedAccountingWorkflowStateItemList to make accounting workflow easier to customise.
+
+2010-09-02 yusei
+* Display account title to journal report. Displaying gap id only is not useful at least in Japan.
+
 2010-08-23 yusei
 * Allow users to change section on line level. This is sometimes needed. Use case: expense happens at section A, corresponding payment is done at section B. This is journalized in single transaction document.
 

bt5/erp5_accounting/bt/revision

-1341
+1351
\ No newline at end of file

bt5/erp5_accounting_l10n_jp/SkinTemplateItem/portal_skins/erp5_accounting_l10n_jp/AccountModule_getJapaneseGapAssetCategoryList.xml

@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -53,20 +50,123 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>root = context.portal_categories.gap.jp.afbe2\n
+            <value> <string>root = context.portal_categories.gap.jp.afbe\n
 \n
 return [\n
   (depth,\n
    root.restrictedTraverse(path))\n
   for depth, path in (\n
-    (2, \'5\'),\n
-    (2, \'4/41\'),\n
-    (2, \'4/44/441/4412\'),\n
-    (1, \'4/44/443/4432\'),\n
-    (1, \'4/46/462\'),\n
-    (1, \'4/49\'),\n
-    (3, \'2\'),\n
-    (2, \'3\'),\n
+\n
+#######################\n
+# 流動資産\n
+#######################\n
+\n
+# 現金預金\n
+#######################\n
+(2, \'5/53\'), # 現金\n
+             # 小口現金\n
+\n
+(2, \'5/51\'), # 普通預金 (GAP上では預金があるだけ。細かい分類はない)\n
+             # 当座預金\n
+             # 定期預金\n
+             # 定期積金\n
+             # 通知預金\n
+             # 別段預金\n
+\n
+#売上債権\n
+########################\n
+\n
+(2, \'4/41\'), # 受取手形\n
+             # 売掛金\n
+             # 前渡金 (GAPには前払金とあるが、一般的には前渡金のようである)\n
+             # 立替金\n
+             # 仮払金\n
+             # 未収入金\n
+             # 前払費用\n
+             # 未収収益\n
+             # 短期貸付金 (GAP上は貸付金)\n
+\n
+(2, \'4/49\'), # 貸倒引当金\n
+\n
+# 有価証券\n
+#########################\n
+(2, \'5/50/503\'), # 有価証券\n
+\n
+# 棚卸資産\n
+#########################\n
+(2, \'3\'), # 商品 (GAPの中に棚卸引当金というのがあるけど、これはなに?)\n
+          # 製品\n
+          # 半製品\n
+          # 仕掛品\n
+          # 原材料\n
+          # 貯蔵品\n
+\n
+# その他の流動資産\n
+#########################\n
+(2, \'4/44/441/4412\'), # 仮払消費税等\n
+                      # 未収消費税等\n
+\n
+                      # 繰延税金資産(流動)  (GAPの中に固定資産のものはあるが、流動資産のものはない)\n
+\n
+(2, \'4/44/443\'), # 仮払法人税等\n
+\n
+\n
+###########################\n
+# 固定資産\n
+###########################\n
+\n
+# 有形固定資産\n
+###########################\n
+\n
+(2, \'2/21\'), # 建物\n
+             # 構築物\n
+             # 車両・運搬具\n
+             # 土地\n
+             # 建設仮勘定\n
+\n
+             # 建物付属設備 (GAPに該当なし)\n
+             # 機械・装置 (GAPに該当なし)\n
+             # 工具・備品・医療器具備品 (GAPに該当なし)\n
+\n
+(2, \'2/28\'), # 減価償却累計額\n
+\n
+#######################\n
+# 無形固定資産\n
+#######################\n
+(2, \'2/20/205\'), # ソフトウェア\n
+            # 電話加入権\n
+            # 特許権\n
+            # 借地権\n
+\n
+(2, \'2/20/207/2071\'), # のれん\n
+\n
+             # 水道施設利用権 (GAPに該当しない)\n
+\n
+\n
+# 投資その他の資産\n
+#####################\n
+(2, \'2/27/271\'), # 投資有価証券\n
+                 # 長期前払費用\n
+                 # 長期貸付金\n
+                 # 保証金 (GAP上の差入れ保証金に該当)\n
+\n
+                 # 関係会社株式 (GAPに該当しない)\n
+                 # 出資金 (GAPに該当しない)\n
+                 # ゴルフ会員権 (GAPに該当しない)\n
+                 # 敷金 (GAPに該当しない)\n
+                 # 保険積立金 (GAPに該当しない)\n
+                 # 破産更生債権 (GAPに該当しない)\n
+\n
+(2, \'2/20/208/2081\'), # 繰延税金資産(固定)\n
+\n
+# 繰延資産\n
+############################\n
+(2, \'2/20/201\'), # 創立費\n
+                 # 開業費\n
+                 # 新株発行費 (GAP上の株式交付費)\n
+                 # 社債発行費\n
+                 # 開発費 (GAP上の繰越研究開発費)\n
+\n
   )]\n
 </string> </value>
         </item>

bt5/erp5_accounting_l10n_jp/SkinTemplateItem/portal_skins/erp5_accounting_l10n_jp/AccountModule_getJapaneseGapCapitalCategoryList.xml

@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -53,7 +50,33 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>return []\n
+            <value> <string>root = context.portal_categories.gap.jp.afbe\n
+\n
+return [\n
+  (depth,\n
+   root.restrictedTraverse(path))\n
+  for depth, path in (\n
+######################\n
+# 株主資本\n
+######################\n
+(2, \'1/10\'), # 資本金\n
+             # 新株式申込証拠金\n
+             # 資本準備金\n
+             # その他の資本余剰金\n
+             # 利益準備金\n
+             # 繰越利益余剰金\n
+             # 自己株式\n
+\n
+             # xxx準備金 (GAPに該当なし、必要だと思われる)\n
+             # xxx積立金 (GAPに該当なし、必要だと思われる)\n
+\n
+(2, \'1/11\'), # その他有価証券評価差額金\n
+             # 繰越ヘッジ損失\n
+             # 土地再評価差額金\n
+(2, \'1/12\'), # 新株予約権\n
+(2, \'1/13\'), # 小数株主持分\n
+\n
+  )]\n
 </string> </value>
         </item>
         <item>
@@ -62,6 +85,10 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>errors</string> </key>
             <value>
@@ -85,7 +112,16 @@
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
-                          <tuple/>
+                          <tuple>
+                            <string>_getattr_</string>
+                            <string>context</string>
+                            <string>root</string>
+                            <string>append</string>
+                            <string>$append0</string>
+                            <string>_getiter_</string>
+                            <string>depth</string>
+                            <string>path</string>
+                          </tuple>
                         </value>
                     </item>
                   </dictionary>

bt5/erp5_accounting_l10n_jp/SkinTemplateItem/portal_skins/erp5_accounting_l10n_jp/AccountModule_getJapaneseGapDebtCategoryList.xml

@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -53,7 +50,47 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>return []\n
+            <value> <string>root = context.portal_categories.gap.jp.afbe\n
+\n
+return [\n
+  (depth,\n
+   root.restrictedTraverse(path))\n
+  for depth, path in (\n
+######################\n
+# 流動負債\n
+######################\n
+(2, \'4/40\'),     # 支払手形\n
+                 # 買掛金\n
+                 # 短期借入金\n
+                 # 未払金\n
+                 # 未払費用\n
+                 # 前受金\n
+                 # 預り金\n
+                 # 前受収益\n
+                 # 仮受金 \n
+\n
+(2, \'4/46/461\'), # 未払配当金\n
+\n
+                 # コマーシャルペーパー(該当GAPなし)\n
+                 # 1年内返済予定の長期借入金、社債等(該当GAPなし)\n
+\n
+(2, \'4/44/443/4431\'),                 # 未払法人税等\n
+(2, \'4/44/441/4412/44121\'),           # 未払消費税等\n
+(2, \'4/44/441/4411/44112\'),           # 仮受消費税等\n
+(2, \'4/42/422\'),                      # 賞与引当金\n
+\n
+                 # 繰延税金負債(流動) (該当GAPなし、流動負債にもこれが必要)\n
+\n
+######################\n
+# 固定負債\n
+######################\n
+(2, \'5/50/505\'),          # 社債 (GAP上では財務(資産っぽい)の中にあるけど正しいのか？)\n
+(2, \'2/27/272\'),          # 長期借入金 (GAP上では固定資産の中にあるけど正しいのか？)\n
+(2, \'4/42/423\'),          # 退職給付引当金 (GAP上では流動資産の中にあるけど正しいのか?)\n
+(2, \'2/20/207/2072\'),     # 負ののれん\n
+(2, \'2/20/208/2082\'),     # 繰延税金負債(固定) (GAP上では固定資産の中にあるけど正しいのか?)\n
+\n
+  )]\n
 </string> </value>
         </item>
         <item>
@@ -62,6 +99,10 @@
               <none/>
             </value>
         </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>errors</string> </key>
             <value>
@@ -85,7 +126,16 @@
                     <item>
                         <key> <string>co_varnames</string> </key>
                         <value>
-                          <tuple/>
+                          <tuple>
+                            <string>_getattr_</string>
+                            <string>context</string>
+                            <string>root</string>
+                            <string>append</string>
+                            <string>$append0</string>
+                            <string>_getiter_</string>
+                            <string>depth</string>
+                            <string>path</string>
+                          </tuple>
                         </value>
                     </item>
                   </dictionary>

bt5/erp5_accounting_l10n_jp/bt/change_log

+2010-09-04 yusei
+* Implement Japanese B/S report. (Although Japanese GAP is not good enough)
+
+2010-09-03 yusei
+* Add Japanese profit and loss report to accounting module.
+
 2010-08-19 yusei
 * Remove old afbe and rename afbe2 to afbe.
 

bt5/erp5_accounting_l10n_jp/bt/revision

-26
+27
\ No newline at end of file

bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_create_reversal.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>
@@ -117,27 +114,27 @@ Test for Creating Reversal Transaction for an Accounting Transaction\n
 </tr>\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
 <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=2 - Fixed Assets</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=3 - Stocks</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/input</td>\n
   <td>20.0</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]/input</td>\n
   <td>20.0</td>\n
 </tr>\n
 <tr>\n
@@ -252,37 +249,37 @@ delivered.\n
 </tr>\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
 <tr>\n
   <td>assertValue</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>account_module/stocks</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</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>account_module/fixed_assets</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/input</td>\n
   <td>20.0</td> \n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/input</td>\n
   <td>0.0</td> \n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]/input</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]/input</td>\n
   <td>20.0</td>\n
 </tr>\n
 <!-- }}} -->\n

bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_create_reversal_with_cancellation.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>
@@ -117,27 +114,27 @@ Test for Creating Reversal Transaction for an Accounting Transaction\n
 </tr>\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
 <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=2 - Fixed Assets</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=3 - Stocks</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/input</td>\n
   <td>20.0</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]/input</td>\n
   <td>20.0</td>\n
 </tr>\n
 <tr>\n
@@ -257,37 +254,37 @@ delivered.\n
 </tr>\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
 <tr>\n
   <td>assertValue</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>account_module/fixed_assets</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</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>account_module/stocks</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/input</td>\n
   <td>-20.0</td> \n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/input</td>\n
   <td>0.0</td> \n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]/input</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]/input</td>\n
   <td>-20.0</td>\n
 </tr>\n
 <!-- }}} -->\n

bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_input.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>
@@ -97,27 +94,27 @@ Test Simple view of an Accounting Transaction\n
 </tr>\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
 <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=2 - Fixed Assets</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=3 - Stocks</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/input</td>\n
   <td>10.0</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]/input</td>\n
   <td>20.0</td>\n
 </tr>\n
 <tr>\n
@@ -150,33 +147,33 @@ Test Simple view of an Accounting Transaction\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/select</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/select</td>\n
   <td>account_module/fixed_assets</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/select</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[3]/select</td>\n
   <td>account_module/stocks</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/input</td>\n
   <td>10.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]/input</td>\n
   <td>20.0</td>\n
 </tr>\n
 <!-- stat is updated -->\n
 <tr>\n
   <td>assertFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[4]</td>\n
   <td>10</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[5]</td>\n
   <td>20</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -200,22 +197,22 @@ Test Simple view of an Accounting Transaction\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>3 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>3</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</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></td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[4]/input</td>\n
   <td>0.0</td>\n
 </tr>          \n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]/input</td>\n
   <td>0.0</td>\n
 </tr> \n
 <!-- }}} -->\n
@@ -238,33 +235,33 @@ Test Simple view of an Accounting Transaction\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/select</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/select</td>\n
   <td>account_module/fixed_assets</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[3]/select</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[3]/select</td>\n
   <td>account_module/stocks</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/input</td>\n
   <td>10.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]/input</td>\n
   <td>20.0</td>\n
 </tr>\n
 <!-- stat -->\n
 <tr>\n
   <td>assertFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[4]</td>\n
   <td>10</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloat</td>\n
-  <td>//tr[@id=\'listbox_stat_line\']/td[5]</td>\n
+  <td>//tr[@class=\'listbox_stat_line\']/td[5]</td>\n
   <td>20</td>\n
 </tr>\n
 <!-- }}} -->\n

bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_input_invalidated_accounts.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>
@@ -120,12 +117,12 @@ be selected {{{ -->\n
 </tr>\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
 <tr>\n
   <td>assertElementNotPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/select/option[contains(text(), \'41 - Receivable\')]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/select/option[contains(text(), \'41 - Receivable\')]</td>\n
   <td></td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -149,12 +146,12 @@ be selected {{{ -->\n
 </tr>\n
 <tr>\n
   <td>assertValue</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>account_module/receivable</td>\n
 </tr>\n
 <tr>\n
   <td>assertElementPresent</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[3]/select/option[contains(text(), \'41 - Receivable\')]</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[3]/select/option[contains(text(), \'41 - Receivable\')]</td>\n
   <td></td>\n
 </tr>\n
 <!-- }}} -->\n

bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_lines_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>
@@ -102,54 +99,54 @@ Test Simple view of an Accounting Transaction\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>9 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>9</td>\n
 </tr>\n
 \n
 <!-- store the index of each line -->\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/input</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]/input</td>\n
   <td>2</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[4]/input</td>\n
   <td>3</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[4]/input</td>\n
   <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_4\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[4]/input</td>\n
   <td>5</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_5\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[4]/input</td>\n
   <td>6</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_6\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[4]/input</td>\n
   <td>7</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_7\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[4]/input</td>\n
   <td>8</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_8\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[4]/input</td>\n
   <td>9</td>\n
 </tr>\n
 <tr>\n
@@ -183,59 +180,59 @@ other lines\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
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/input</td>\n
   <td>1</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]/input</td>\n
   <td>2</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[4]/input</td>\n
   <td>3</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_3\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-3 DataB\']/td[4]/input</td>\n
   <td>4</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_4\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-4 DataA\']/td[4]/input</td>\n
   <td>5</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_5\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-5 DataB\']/td[4]/input</td>\n
   <td>6</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_6\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-6 DataA\']/td[4]/input</td>\n
   <td>7</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_7\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-7 DataB\']/td[4]/input</td>\n
   <td>8</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_8\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-8 DataA\']/td[4]/input</td>\n
   <td>9</td>\n
 </tr>\n
 <!-- our new lines, at the end -->\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_9\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-9 DataB\']/td[4]/input</td>\n
   <td>0</td>\n
 </tr>\n
 \n

bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_module_create_related_payment.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,7 +79,7 @@ Test for Creating Payment Transactions related to some Invoices\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>Sale Invoice Transaction</td>\n
 </tr>\n
 <tr>\n
@@ -92,8 +89,8 @@ Test for Creating Payment Transactions related to some Invoices\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
 \n
@@ -181,8 +178,8 @@ Test for Creating Payment Transactions related to some Invoices\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
 <!-- }}} -->\n
 \n

bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_accounting_transaction_module_create_reversal.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,8 +78,8 @@ Test for Creating reversal of multiple transactions\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
@@ -127,8 +124,8 @@ Test for Creating reversal of multiple transactions\n
 </tr>\n
 <tr>\n
   <td>verifyText</td>\n
-  <td>listbox_record_number</td>\n
-  <td>8 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>8</td>\n
 </tr>\n
 <!-- }}} -->\n
 \n

bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_payment_transaction_input_multiple_partners.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>
@@ -97,22 +94,22 @@ Test Simple view of an Accounting Transaction with Multiple partners\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>3 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>3</td>\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=5 - Bank</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=41 - Receivable</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
@@ -150,17 +147,17 @@ Test Simple view of an Accounting Transaction with Multiple partners\n
 </tr>\n
 <tr>\n
   <td>assertValue</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>account_module/bank</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</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>account_module/receivable</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</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>account_module/payable</td>\n
 </tr>\n
 <!-- }}} -->\n
@@ -196,17 +193,17 @@ Test Simple view of an Accounting Transaction with Multiple partners\n
 <!-- Check new column is here {{{ -->\n
 <tr>\n
   <td>assertText</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>Client 1</td>\n
 </tr>\n
 <tr>\n
   <td>assertText</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>Client 1</td>\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[4]</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[4]</td>\n
   <td>Supplier</td>\n
 </tr>\n
 <!-- }}} -->\n

bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_purchase_invoice_transaction_create_reversal.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>
@@ -127,38 +124,38 @@ Test for Creating Reversal Transaction for a Purchase Invoice Transaction\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>3 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>3</td>\n
 </tr>\n
 \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=6 - Goods Purchase</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=4456 - Refundable VAT 10%</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>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/input</td>\n
   <td>11.0</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]/input</td>\n
   <td>1.0</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]/input</td>\n
   <td>10.0</td>\n
 </tr>\n
 <tr>\n
@@ -283,53 +280,53 @@ delivered.\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>3 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>3</td>\n
 </tr>\n
 <!-- Same as above, bad ordering ... -->\n
 <tr>\n
   <td>assertValue</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>account_module/payable</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</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>account_module/refundable_vat</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</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>account_module/goods_purchase</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/input</td>\n
   <td>10.0</td> \n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/input</td>\n
   <td>0.0</td> \n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]/input</td>\n
   <td>1.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]/input</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[4]/input</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]/input</td>\n
   <td>11.0</td>\n
 </tr>\n
 <!-- }}} -->\n

bt5/erp5_accounting_ui_test/PathTemplateItem/portal_tests/accounting_zuite/accounting_transaction_zuite/test_sale_invoice_transaction_create_reversal.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>
@@ -127,38 +124,38 @@ Test for Creating Reversal Transaction for a Sale Invoice Transaction\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>3 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>3</td>\n
 </tr>\n
 \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=41 - Receivable</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=4457 - Collected VAT 10%</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=7 - Goods Sales</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/input</td>\n
   <td>10.0</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]/input</td>\n
   <td>1.0</td>\n
 </tr>\n
 <tr>\n
   <td>type</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]/input</td>\n
   <td>11.0</td>\n
 </tr>\n
 <tr>\n
@@ -283,52 +280,52 @@ delivered.\n
 </tr>\n
 <tr>\n
   <td>assertText</td>\n
-  <td>//span[@id=\'listbox_record_number\']</td>\n
-  <td>3 records</td>\n
+  <td>//span[@class="listbox-current-page-total-number"]</td>\n
+  <td>3</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</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>account_module/goods_sales</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</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>account_module/collected_vat</td>\n
 </tr>\n
 <tr>\n
   <td>assertValue</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>account_module/receivable</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[4]/input</td>\n
   <td>11.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_0\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-0 DataA\']/td[5]/input</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[4]/input</td>\n
   <td>0.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_1\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-1 DataB\']/td[5]/input</td>\n
   <td>1.0</td>\n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[4]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[4]/input</td>\n
   <td>0.0</td> \n
 </tr>\n
 <tr>\n
   <td>assertFloatValue</td>\n
-  <td>//tr[@id=\'listbox_data_line_2\']/td[5]/input</td>\n
+  <td>//tr[@class=\'listbox-data-line-2 DataA\']/td[5]/input</td>\n
   <td>10.0</td> \n
 </tr>\n
 <!-- }}} -->\n

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

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

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

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

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

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

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

bt5/erp5_accounting_ui_test/bt/revision

-169
+172
\ No newline at end of file

bt5/erp5_administration/ActionTemplateItem/portal_types/Applied%20Rule/view.xml

@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
-        <tuple/>
-      </tuple>
+      <global name="ActionInformation" module="Products.CMFCore.ActionInformation"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -68,10 +65,7 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <tuple>
-        <global name="Expression" module="Products.CMFCore.Expression"/>
-        <tuple/>
-      </tuple>
+      <global name="Expression" module="Products.CMFCore.Expression"/>
     </pickle>
     <pickle>
       <dictionary>

bt5/erp5_administration/PathTemplateItem/portal_alarms/check_catalog.xml

@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="Alarm" module="Products.ERP5Type.Document.Alarm"/>
-        <tuple/>
-      </tuple>
+      <global name="Alarm" module="Products.ERP5Type.Document.Alarm"/>
     </pickle>
     <pickle>
       <dictionary>