From 05f1e83805b4b9162bc3911411ad8b65fabca4be Mon Sep 17 00:00:00 2001
From: Yoshinori Okuji <yo@nexedi.com>
Date: Wed, 8 Sep 2004 12:53:12 +0000
Subject: [PATCH] Renamed from Delivery_mergedDeliveryListForm.form to
 Delivery_viewMergedDeliveryList.form.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1537 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 ...rm.form => Delivery_viewMergedDeliveryList.form} | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)
 rename product/ERP5/skins/erp5_core/{Delivery_mergedDeliveryListForm.form => Delivery_viewMergedDeliveryList.form} (88%)

diff --git a/product/ERP5/skins/erp5_core/Delivery_mergedDeliveryListForm.form b/product/ERP5/skins/erp5_core/Delivery_viewMergedDeliveryList.form
similarity index 88%
rename from product/ERP5/skins/erp5_core/Delivery_mergedDeliveryListForm.form
rename to product/ERP5/skins/erp5_core/Delivery_viewMergedDeliveryList.form
index a95a9840f8..f957c23f72 100755
--- a/product/ERP5/skins/erp5_core/Delivery_mergedDeliveryListForm.form
+++ b/product/ERP5/skins/erp5_core/Delivery_viewMergedDeliveryList.form
@@ -3,9 +3,10 @@
 <form>
   <title>Merge the deliveries</title>
   <row_length>4</row_length>
-  <name>Delivery_mergedDeliveryListForm</name>
+  <name>Delivery_viewMergedDeliveryList</name>
   <pt>form_view_dialog</pt>
   <action>Delivery_mergeDeliveryList</action>
+  <update_action></update_action>
   <method>POST</method>
   <enctype></enctype>
   <encoding>UTF-8</encoding>
@@ -36,6 +37,7 @@
 
       <field><id>listbox</id> <type>ListBox</type>
         <values>
+          <Base_viewSearchResultList type="int">0</Base_viewSearchResultList>
           <all_columns type="list">[('id', 'R\xe9f\xe9rence'), ('portal_type', 'Type'), ('Title', 'Titre'), ('relative_url', "Chemin d'acc\xe8s"), ('Description', 'Description')]</all_columns>
           <all_editable_columns type="list">[]</all_editable_columns>
           <alternate_name></alternate_name>
@@ -53,19 +55,22 @@
           <global_attributes type="list">[]</global_attributes>
           <hidden type="int">0</hidden>
           <lines type="int">30</lines>
-          <list_action>folder_contents</list_action>
+          <list_action>Folder_viewContentList</list_action>
           <list_method></list_method>
           <meta_types type="list">[]</meta_types>
           <portal_types type="list">[]</portal_types>
           <report_root_list type="list">[]</report_root_list>
           <report_tree type="int">0</report_tree>
-          <search type="int">0</search>
+          <search></search>
           <search_columns type="list">[]</search_columns>
           <select type="int">0</select>
           <selection_name></selection_name>
           <sort type="list">[('relative_url', 'relative_url')]</sort>
+          <sort_columns></sort_columns>
+          <stat_columns></stat_columns>
           <stat_method></stat_method>
           <title>Merged deliveries</title>
+          <url_columns></url_columns>
         </values>
         <tales>
           <list_method>python:None</list_method>
@@ -84,4 +89,4 @@
       </fields>
     </group>
   </groups>
-</form>
+</form>
\ No newline at end of file
-- 
2.30.9