Commit 5cd76d74 authored by Yoshinori Okuji's avatar Yoshinori Okuji

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
parent e95d6dfe
...@@ -137,7 +137,6 @@ def getRelatedTradeConditionList(trade_condition):\n ...@@ -137,7 +137,6 @@ def getRelatedTradeConditionList(trade_condition):\n
getRelatedTradeConditionList(related_trade_condition))\n getRelatedTradeConditionList(related_trade_condition))\n
return related_trade_condition_list\n return related_trade_condition_list\n
\n \n
\n
try:\n try:\n
explanation = context.getExplanationValue()\n explanation = context.getExplanationValue()\n
except AttributeError:\n except AttributeError:\n
...@@ -148,7 +147,7 @@ if explanation is not None:\n ...@@ -148,7 +147,7 @@ if explanation is not None:\n
explanation_type = explanation.getPortalType()\n explanation_type = explanation.getPortalType()\n
high_priority_supply_line_list = []\n high_priority_supply_line_list = []\n
if explanation_type in context.getPortalInvoiceTypeList() +\\\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 # if there are trade conditions containing supply lines related to that\n
# order/invoice, we give high priority to those supply lines\n # order/invoice, we give high priority to those supply lines\n
for trade_condition in getRelatedTradeConditionList(explanation):\n for trade_condition in getRelatedTradeConditionList(explanation):\n
......
2010-05-20 yo
* Movement_getPriceCalculationOperandDict must take into account delivery types when getting Trade Conditions.
2010-05-19 yusei 2010-05-19 yusei
* Add two work lists to validation workflow for supply portal types. * Add two work lists to validation workflow for supply portal types.
......
1584 1585
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment