[Erp5-report] r20590 - in /erp5/trunk/bt5/erp5_invoicing: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Apr 16 18:56:44 2008
New Revision: 20590

URL: http://svn.erp5.org?rev=20590&view=rev
Log:
generate invoices in confirmed state, and use a Message to have "Initialized by Delivery Builder" translated

Modified:
    erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml
    erp5/trunk/bt5/erp5_invoicing/bt/revision

Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml?rev=20590&r1=20589&r2=20590&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGenerationActivity.xml Wed Apr 16 18:56:44 2008
@@ -70,6 +70,7 @@
 # after the invoice_builder delivery builder has created\n
 # the new Sale Invoice Transaction\n
 #\n
+from Products.ERP5Type.Message import Message\n
 try:\n
   from Products.CMFCore.WorkflowCore import WorkflowException\n
 except ImportError:\n
@@ -113,8 +114,8 @@
 if invoice.getSimulationState() == \'draft\':\n
   try :\n
     context.getPortalObject().portal_workflow.doActionFor(\n
-      invoice, \'plan_action\',\n
-      comment=\'Initialized by Delivery Builder\',\n
+      invoice, \'confirm_action\',\n
+      comment=Message(\'erp5_ui\', \'Initialized by Delivery Builder\'),\n
       skip_period_validation=1)\n
   except WorkflowException, e:\n
     # The user cannot pass the transition, it\'s OK\n
@@ -122,7 +123,7 @@
 \n
   if invoice.getSimulationState() == \'draft\':\n
     # call the workflow method, if the user cannot perform this operation.\n
-    invoice.plan()\n
+    invoice.confirm()\n
 \n
 # First set the invoice in the building state on the causality workflow\n
 invoice.startBuilding()\n
@@ -180,6 +181,8 @@
                           <tuple>
                             <string>related_simulation_movement_path_list</string>
                             <string>kw</string>
+                            <string>Products.ERP5Type.Message</string>
+                            <string>Message</string>
                             <string>Products.CMFCore.WorkflowCore</string>
                             <string>WorkflowException</string>
                             <string>ImportError</string>

Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=20590&r1=20589&r2=20590&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision Wed Apr 16 18:56:44 2008
@@ -1,1 +1,1 @@
-57
+58