[Erp5-report] r31889 luke - in /erp5/trunk/bt5/erp5_invoicing: SkinTemplateItem/portal_skin...

[nobody at svn.erp5.org]

Author: luke
Date: Thu Jan 21 17:42:10 2010
New Revision: 31889

URL: http://svn.erp5.org?rev=31889&view=rev
Log:
 - confirm invoice "unconditionally"

Post building script shall work in all possible cases.

Catching only WorkflowException was in consistent:

 * user without privileges in accounting was able to build invoice coming from
   packing list without price currency (script worked well)
 * user with privileges in accounting, which delivered packing list, was not
   able to confirm this invoice, as ValidationFailed was raised

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

Modified: erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml?rev=31889&r1=31888&r2=31889&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/SkinTemplateItem/portal_skins/erp5_invoicing/InvoiceTransaction_postGeneration.xml [utf8] Thu Jan 21 17:42:10 2010
@@ -105,19 +105,7 @@
 \n
 # initialize accounting_workflow to confirmed state\n
 if invoice.getSimulationState() == \'draft\':\n
-  try :\n
-    context.getPortalObject().portal_workflow.doActionFor(\n
-      invoice, \'confirm_action\',\n
-      comment=translateString(\'Initialised by Delivery Builder.\'),\n
-      skip_period_validation=1)\n
-  except WorkflowException, e:\n
-    # The user cannot pass the transition, it\'s OK\n
-    pass\n
-\n
-  if invoice.getSimulationState() == \'draft\':\n
-    # call the workflow method, if the user cannot perform this operation.\n
-    invoice.confirm(comment=translateString(\'Initialised by Delivery Builder.\'),)\n
-\n
+  invoice.confirm(comment=translateString(\'Initialised by Delivery Builder.\'),)\n
 \n
 # First set the invoice in the building state on the causality workflow\n
 invoice.startBuilding()\n
@@ -184,7 +172,6 @@
                             <string>order_trade_model_line_copy_id_list</string>
                             <string>order_trade_model_line</string>
                             <string>clipboard</string>
-                            <string>e</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_invoicing/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_invoicing/bt/revision?rev=31889&r1=31888&r2=31889&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_invoicing/bt/revision [utf8] Thu Jan 21 17:42:10 2010
@@ -1,1 +1,1 @@
-324
+325