[Erp5-report] r35488 yo - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplateIte...

[nobody at svn.erp5.org]

Author: yo
Date: Thu May 20 15:01:20 2010
New Revision: 35488

URL: http://svn.erp5.org?rev=35488&view=rev
Log:
2010-05-20 yo
* Movement_getPriceCalculationOperandDict must take into account delivery types when getting Trade Conditions.

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Movement_getPriceCalculationOperandDict.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Movement_getPriceCalculationOperandDict.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Movement_getPriceCalculationOperandDict.xml?rev=35488&r1=35487&r2=35488&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Movement_getPriceCalculationOperandDict.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Movement_getPriceCalculationOperandDict.xml [utf8] Thu May 20 15:01:20 2010
@@ -137,7 +137,6 @@
           getRelatedTradeConditionList(related_trade_condition))\n
   return related_trade_condition_list\n
 \n
-\n
 try:\n
   explanation = context.getExplanationValue()\n
 except AttributeError:\n
@@ -148,7 +147,7 @@
   explanation_type = explanation.getPortalType()\n
   high_priority_supply_line_list = []\n
   if explanation_type in context.getPortalInvoiceTypeList() +\\\n
-                              context.getPortalOrderTypeList():\n
+                              context.getPortalOrderTypeList() + context.getPortalDeliveryTypeList():\n
     # if there are trade conditions containing supply lines related to that\n
     # order/invoice, we give high priority to those supply lines\n
     for trade_condition in getRelatedTradeConditionList(explanation):\n

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log?rev=35488&r1=35487&r2=35488&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/change_log [utf8] Thu May 20 15:01:20 2010
@@ -1,3 +1,6 @@
+2010-05-20 yo
+* Movement_getPriceCalculationOperandDict must take into account delivery types when getting Trade Conditions.
+
 2010-05-19 yusei
 * Add two work lists to validation workflow for supply portal types.
 

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=35488&r1=35487&r2=35488&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Thu May 20 15:01:20 2010
@@ -1,1 +1,1 @@
-1584
+1585