From 5cd76d74c7b6ebac8cc98498ef6c8422d226a85e Mon Sep 17 00:00:00 2001 From: Yoshinori Okuji <yo@nexedi.com> Date: Thu, 20 May 2010 13:01:20 +0000 Subject: [PATCH] 2010-05-20 yo * Movement_getPriceCalculationOperandDict must take into account delivery types when getting Trade Conditions. git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35488 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../erp5_core/Movement_getPriceCalculationOperandDict.xml | 3 +-- product/ERP5/bootstrap/erp5_core/bt/change_log | 3 +++ product/ERP5/bootstrap/erp5_core/bt/revision | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) 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 e2e15c2afe..a08e40a06c 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 8fa85b8e76..b04eba1229 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 a35ae73008..f609192e18 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 -- 2.30.9