diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
index f9bcfe6ddb81714a194164232d752c07a88565a6..e7b60aa1b3189baad44be3962e9a63abf9588382 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
@@ -74,8 +74,6 @@ if packing_list_state == "draft":\n
                                   packing_list,\n
                                   \'confirm_action\',\n
                                   comment="Initialized by Delivery Builder")\n
-\n
-packing_list.edit()\n
 </string> </value>
         </item>
         <item>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/Container_edit.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/Container_edit.xml
index a8bc81480377ae70725ca75247898715a71ac9cd..0017c8b4c298e70c18a449e72bf3e3dff65c8aa1 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/Container_edit.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/Container_edit.xml
@@ -59,12 +59,16 @@
             <key> <string>method_id</string> </key>
             <value>
               <list>
-                <string>_edit</string>
+                <string>_set.*</string>
                 <string>manage_afterAdd</string>
                 <string>manage_afterClone</string>
               </list>
             </value>
         </item>
+        <item>
+            <key> <string>once_per_transaction</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>portal_type_filter</string> </key>
             <value>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_delete.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_delete.xml
index 3c16fe153a31d68efd2b8ebe81d89b18f74081f4..d3fd012b9ef93970a13436f824f42c03a585c93d 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_delete.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_delete.xml
@@ -61,14 +61,15 @@
               </list>
             </value>
         </item>
+        <item>
+            <key> <string>once_per_transaction</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>portal_type_filter</string> </key>
             <value>
               <list>
                 <string>Delivery Cell</string>
-                <string>Production Packing List Line</string>
-                <string>Production Report Cell</string>
-                <string>Production Report Line</string>
                 <string>Purchase Packing List Line</string>
                 <string>Sale Packing List Line</string>
               </list>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_edit.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_edit.xml
index b27bb6604b09e40ced46b8d25ecb47167f12f4fc..4e27630c9768963ec0424f89a311aec87ce1ad41 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_edit.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingListContent_edit.xml
@@ -59,18 +59,19 @@
             <key> <string>method_id</string> </key>
             <value>
               <list>
-                <string>_edit</string>
+                <string>_set.*</string>
               </list>
             </value>
         </item>
+        <item>
+            <key> <string>once_per_transaction</string> </key>
+            <value> <int>1</int> </value>
+        </item>
         <item>
             <key> <string>portal_type_filter</string> </key>
             <value>
               <list>
                 <string>Delivery Cell</string>
-                <string>Production Packing List Line</string>
-                <string>Production Report Cell</string>
-                <string>Production Report Line</string>
                 <string>Purchase Packing List Line</string>
                 <string>Sale Packing List Line</string>
               </list>
diff --git a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingList_edit.xml b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingList_edit.xml
index 3e249e2560c4be868b9bc21ef9971028a57e1649..a33b9e83c262bba2beee54a068b5a3263e9fd263 100644
--- a/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingList_edit.xml
+++ b/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_interaction_workflow/interactions/PackingList_edit.xml
@@ -59,16 +59,18 @@
             <key> <string>method_id</string> </key>
             <value>
               <list>
-                <string>edit</string>
+                <string>_set.*</string>
               </list>
             </value>
         </item>
+        <item>
+            <key> <string>once_per_transaction</string> </key>
+            <value> <int>0</int> </value>
+        </item>
         <item>
             <key> <string>portal_type_filter</string> </key>
             <value>
               <list>
-                <string>Production Packing List</string>
-                <string>Production Report</string>
                 <string>Purchase Packing List</string>
                 <string>Sale Packing List</string>
               </list>
diff --git a/bt5/erp5_trade/bt/change_log b/bt5/erp5_trade/bt/change_log
index 3ab63f22703d46441da6c6ce069bcd749a4bb77e..df80006d4acd9926f8348ce1d6893f09ce4bb4b2 100644
--- a/bt5/erp5_trade/bt/change_log
+++ b/bt5/erp5_trade/bt/change_log
@@ -1,3 +1,6 @@
+2007-09-05 Kazuhiko
+* Remove packing_list.edit() from Delivery_confirm because expansion will be invoked from interaction workflow.
+
 2007-08-13 Jerome
 * Remove portal type actions that are now defined as global actions
 
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 105d7d9ad3afc7bb78a0dec4d829880831605dfb..97a55e1d749c6ac7c783778b6ea2d19cb770909d 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-100
\ No newline at end of file
+101
\ No newline at end of file