zope4py2: fix some merge mistakes

bt5/erp5_officejs_support_request_ui_test/PathTemplateItem/portal_tests/officejs_support_request_ui_zuite/zzz_logout_test/testLogin.zpt

@@ -21,6 +21,7 @@
   <td>Reset Successfully.</td>
   <td></td>
 </tr>
+
 <tr>
   <td>open</td>
   <td>${base_url}/ERP5Site_addManagerAclUserIfNotExisting</td>

bt5/erp5_officejs_ui_test/PathTemplateItem/portal_tests/officejs_ui_smartassistant_zuite/testOfficeJSSmartAssistantAll.zpt

@@ -347,18 +347,6 @@
   <td>//button[@data-i18n='Proceed']</td>
   <td></td>
 </tr>
-<<<<<<< HEAD
-<tr>
-  <td>waitForElementPresent</td>
-  <td>link=${title}</td>
-  <td></td>
-</tr>
-<tr>
-  <td>click</td>
-  <td>link=${title}</td>
-  <td></td>
-</tr>
-=======
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_app_loaded" />
 
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_listbox_loaded" />
@@ -368,7 +356,6 @@
 </tal:block>
 <tal:block metal:use-macro="here/Zuite_CommonTemplateForRenderjsUi/macros/wait_for_content_loaded" />
 
->>>>>>> nexedi/master
 <tr>
   <td>waitForElementPresent</td>
   <td>//pre[contains(text(), "This is a reply test")]</td>

bt5/erp5_pdm_ui_test/SkinTemplateItem/portal_skins/erp5_pdm_ui_test/PdmZuite_deleteData.py

@@ -72,11 +72,4 @@ for transformation_id in (
     portal.transformation_module.manage_delObjects([transformation_id])
 
 
-# delete supplies
-for supply_portal_type in ('Purchase Supply', 'Sale Supply', 'Internal Supply', ):
-  module = portal.getDefaultModule(supply_portal_type)
-  for supply_id in ('erp5_pdm_ui_test_supply_1', 'erp5_pdm_ui_test_supply_2', 'erp5_pdm_ui_test_supply_3'):
-    if getattr(module, supply_id, None) is not None:
-      module.manage_delObjects([supply_id])
-
 return "Deleted Successfully."

bt5/erp5_trade_ui_test/PathTemplateItem/portal_tests/trade_zuite/testOrganisationJumpToTradeCondition.xml

+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="ZopePageTemplate" module="Products.PageTemplates.ZopePageTemplate"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <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_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>content_type</string> </key>
+            <value> <string>text/html</string> </value>
+        </item>
+        <item>
+            <key> <string>expand</string> </key>
+            <value> <int>0</int> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>testOrganisationJumpToTradeCondition</string> </value>
+        </item>
+        <item>
+            <key> <string>output_encoding</string> </key>
+            <value> <string>utf-8</string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <unicode></unicode> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>

bt5/erp5_ui_test/PathTemplateItem/portal_tests/matrixbox_zuite/testEditableCellTALES.zpt

@@ -87,4 +87,4 @@
 </tbody>
 </table>
 </body>
-</html>
+</html>
\ No newline at end of file

bt5/erp5_web_monitoring_ui_test/PathTemplateItem/portal_tests/web_monitoring_ui_zuite/testMonitoringSyncNavigation.zpt

@@ -512,4 +512,4 @@
 </tr>
 </tbody></table>
 </body>
-</html>
+</html>
\ No newline at end of file