diff --git a/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/Delivery_updateAggregatedAmountList.xml b/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/Delivery_updateAggregatedAmountList.xml index ded9194f89f496ac422821926015143133780c98..e3704eec7c5d9f24d1d3054047b44a77ef1a28d7 100644 --- a/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/Delivery_updateAggregatedAmountList.xml +++ b/bt5/erp5_bpm/SkinTemplateItem/portal_skins/erp5_bpm/Delivery_updateAggregatedAmountList.xml @@ -54,25 +54,15 @@ <item> <key> <string>_body</string> </key> <value> <string>delivery = context\n -\n -# XXX begin\n -portal_type_movement_list_mapping = {\n - \'Purchase Invoice Transaction\' : \'Invoice Line\',\n - \'Purchase Order\' : \'Purchase Order Line\',\n - \'Sale Invoice Transaction\' : \'Invoice Line\',\n - \'Sale Order\' : \'Sale Order Line\',\n -}\n -destination_portal_type = portal_type_movement_list_mapping[\n - delivery.getPortalType()]\n trade_condition_portal_type_list = (\'Sale Trade Condition\',\n \'Purchase Trade Condition\')\n -# XXX end\n \n trade_condition = delivery.getSpecialiseValue(portal_type=\n - trade_condition_portal_type_list )\n + trade_condition_portal_type_list)\n \n if trade_condition is not None:\n - trade_condition.updateAggregatedAmountList(delivery,destination_portal_type)\n + return trade_condition.updateAggregatedAmountList(delivery)\n +return []\n </string> </value> </item> <item> @@ -113,11 +103,8 @@ if trade_condition is not None:\n <string>kwargs</string> <string>context</string> <string>delivery</string> - <string>portal_type_movement_list_mapping</string> - <string>_getitem_</string> - <string>_getattr_</string> - <string>destination_portal_type</string> <string>trade_condition_portal_type_list</string> + <string>_getattr_</string> <string>trade_condition</string> <string>None</string> </tuple> diff --git a/bt5/erp5_bpm/bt/revision b/bt5/erp5_bpm/bt/revision index 9da06a18339c312235ed2a16c054f2bb70981398..7f3a7cc66c28f7ce9fa4e69a9fcc5e8f03bbad1b 100644 --- a/bt5/erp5_bpm/bt/revision +++ b/bt5/erp5_bpm/bt/revision @@ -1 +1 @@ -160 \ No newline at end of file +161 \ No newline at end of file