diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Movement_getPriceCalculationOperandDict.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Movement_getPriceCalculationOperandDict.xml
index e2e15c2afe1853da306fcda027c37e95c8355088..a08e40a06ccc0df541db1d9857ae2f6fbff6a145 100644
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Movement_getPriceCalculationOperandDict.xml
+++ b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Movement_getPriceCalculationOperandDict.xml
@@ -137,7 +137,6 @@ def getRelatedTradeConditionList(trade_condition):\n
           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 @@ if explanation is not None:\n
   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
diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log
index 8fa85b8e76188e5bb26ee20618db69e420a76d44..b04eba1229689483adb27f721ff65d38f35e4fb0 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/change_log
+++ b/product/ERP5/bootstrap/erp5_core/bt/change_log
@@ -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.
 
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index a35ae73008d0f4efb58d1f852e5e67c2e35d781c..f609192e18ceebadc084ea29cc0c9bf4a761f42a 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-1584
\ No newline at end of file
+1585
\ No newline at end of file