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 e7b60aa1b3189baad44be3962e9a63abf9588382..2e2c7967f679814e8a3787d717867e1e8e6b2d75 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
@@ -65,15 +65,16 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>packing_list = context\n
+            <value> <string>from Products.ERP5Type.Message import Message\n
+\n
+packing_list = context\n
  \n
-# Then, modify state\n
+# Modify state\n
 packing_list_state = packing_list.getSimulationState()\n
 if packing_list_state == "draft":\n
   packing_list.portal_workflow.doActionFor(\n
-                                  packing_list,\n
-                                  \'confirm_action\',\n
-                                  comment="Initialized by Delivery Builder")\n
+     packing_list, \'confirm_action\',\n
+     comment=Message(\'erp5_ui\', "Initialized by Delivery Builder"))\n
 </string> </value>
         </item>
         <item>
@@ -123,6 +124,8 @@ if packing_list_state == "draft":\n
                         <value>
                           <tuple>
                             <string>kw</string>
+                            <string>Products.ERP5Type.Message</string>
+                            <string>Message</string>
                             <string>context</string>
                             <string>packing_list</string>
                             <string>_getattr_</string>
diff --git a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
index 5067f405bf5b74f40982bf1acf36c05e5ac75148..0d86bff282905f861ef28a634ab90e3dc6dd6836 100644
--- a/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
+++ b/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
@@ -65,7 +65,9 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string>packing_list = context\n
+            <value> <string>from Products.ERP5Type.Message import Message\n
+\n
+packing_list = context\n
  \n
 # First, copy Order properties\n
 packing_list.PackingList_copyOrderProperties()\n
@@ -75,10 +77,8 @@ packing_list_state = packing_list.getSimulationState()\n
 \n
 if packing_list_state == "draft":\n
   packing_list.portal_workflow.doActionFor(\n
-                                  packing_list,\n
-                                  \'confirm_action\',\n
-                                  wf_id=\'packing_list_workflow\',\n
-                                  comment="Initialized by Delivery Builder")\n
+     packing_list, \'confirm_action\',\n
+     comment=Message(\'erp5_ui\', "Initialized by Delivery Builder"))\n
 \n
 # First set the packing_list in the building state\n
 packing_list.startBuilding()\n
@@ -127,6 +127,8 @@ packing_list.activate(after_method_id=(\'immediateReindexObject\',\'recursiveImm
                         <key> <string>co_varnames</string> </key>
                         <value>
                           <tuple>
+                            <string>Products.ERP5Type.Message</string>
+                            <string>Message</string>
                             <string>context</string>
                             <string>packing_list</string>
                             <string>_getattr_</string>
diff --git a/bt5/erp5_trade/bt/revision b/bt5/erp5_trade/bt/revision
index 34bba940d19c5c03f8a0d63433cba1cf420f1d71..2bab4226fc3d27e9a3034dc5c0cd22f5b9b30888 100644
--- a/bt5/erp5_trade/bt/revision
+++ b/bt5/erp5_trade/bt/revision
@@ -1 +1 @@
-156
\ No newline at end of file
+157
\ No newline at end of file