[Erp5-report] r18782 - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins/erp5_tr...

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Jan 17 18:26:09 2008
New Revision: 18782

URL: http://svn.erp5.org?rev=18782&view=rev
Log:
Use a translatable message for "Initialized by Delivery Builder" message.
Don't hardcode wf_id when calling doActionFor in SalePackingList_copyOrderProperties

Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml?rev=18782&r1=18781&r2=18782&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_confirm.xml Thu Jan 17 18:26:09 2008
@@ -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 @@
                         <value>
                           <tuple>
                             <string>kw</string>
+                            <string>Products.ERP5Type.Message</string>
+                            <string>Message</string>
                             <string>context</string>
                             <string>packing_list</string>
                             <string>_getattr_</string>

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml?rev=18782&r1=18781&r2=18782&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/SalePackingList_copyOrderProperties.xml Thu Jan 17 18:26:09 2008
@@ -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 @@
 \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 @@
                         <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>

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=18782&r1=18781&r2=18782&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Thu Jan 17 18:26:09 2008
@@ -1,1 +1,1 @@
-156
+157