[Erp5-report] r26834 - in /erp5/trunk/bt5/erp5_bpm: SkinTemplateItem/portal_skins/erp5_bpm/...

[nobody at svn.erp5.org]

Author: luke
Date: Wed May  6 13:28:28 2009
New Revision: 26834

URL: http://svn.erp5.org?rev=26834&view=rev
Log:
- use delivery on simulation movement to find corresponding delivery

Modified:
    erp5/trunk/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/InvoiceTransaction_selectDelivery.xml
    erp5/trunk/bt5/erp5_bpm/bt/revision

Modified: erp5/trunk/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/InvoiceTransaction_selectDelivery.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/InvoiceTransaction_selectDelivery.xml?rev=26834&r1=26833&r2=26834&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/InvoiceTransaction_selectDelivery.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/InvoiceTransaction_selectDelivery.xml [utf8] Wed May  6 13:28:28 2009
@@ -71,12 +71,11 @@
         continue\n
       for sm in other_rule.contentValues():\n
         line = sm.getDeliveryValue()\n
+\n
   # case of trade model movement\n
   if ar.getParentValue().getParentValue().getSpecialiseValue().getPortalType() == \'Trade Model Rule\':\n
     tm_related_movement = ar.getParentValue().getParentValue().getParentValue()\n
-    line = tm_related_movement.getOrderValue()\n
-    if line is None:\n
-      line = tm_related_movement.getParentValue().getParentValue().getOrderValue()\n
+    line = tm_related_movement.getDeliveryValue()\n
 \n
   # in case of invoice rule (ie. starting from Invoice)\n
   if line is None:\n

Modified: erp5/trunk/bt5/erp5_bpm/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_bpm/bt/revision?rev=26834&r1=26833&r2=26834&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_bpm/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_bpm/bt/revision [utf8] Wed May  6 13:28:28 2009
@@ -1,1 +1,1 @@
-178
+179