[Erp5-report] r21679 - in /erp5/trunk/bt5/erp5_trade: WorkflowTemplateItem/portal_workflow/...

[nobody at svn.erp5.org]

Author: jerome
Date: Wed Jun 18 14:50:04 2008
New Revision: 21679

URL: http://svn.erp5.org?rev=21679&view=rev
Log:
ignore container state. It is now possible to pass transition even if the packing list is not packed.

Modified:
    erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver_action.xml
    erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver_action.xml?rev=21679&r1=21678&r2=21679&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver_action.xml (original)
+++ erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/deliver_action.xml Wed Jun 18 14:50:04 2008
@@ -102,7 +102,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>python:(here.getCausalityState() not in (\'building\',\'diverged\')) and (here.getPortalType() != \'Sale Packing List\' or here.getContainerState() == \'packed\')</string> </value>
+            <value> <string>python: here.getCausalityState() not in (\'building\', \'diverged\')</string> </value>
         </item>
       </dictionary>
     </pickle>

Modified: erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml?rev=21679&r1=21678&r2=21679&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml (original)
+++ erp5/trunk/bt5/erp5_trade/WorkflowTemplateItem/portal_workflow/packing_list_workflow/transitions/set_ready_action.xml Wed Jun 18 14:50:04 2008
@@ -103,7 +103,7 @@
       <dictionary>
         <item>
             <key> <string>text</string> </key>
-            <value> <string>python:(here.getCausalityState() not in (\'building\',\'diverged\')) and (here.getPortalType() != \'Sale Packing List\' or here.getContainerState() == \'packed\')</string> </value>
+            <value> <string>python: here.getCausalityState() not in (\'building\', \'diverged\')</string> </value>
         </item>
       </dictionary>
     </pickle>

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=21679&r1=21678&r2=21679&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision Wed Jun 18 14:50:04 2008
@@ -1,1 +1,1 @@
-384
+385