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 2baeae18fedd014d19ae8c4888733be79fdbfb54..6889bbfcc27114e3d93bdc5ef9ef29d2103a449d 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 @@ -99,15 +99,19 @@ def resourceSalePriceSortMethod(a, b):\n else:\n return sourceSortMethod(a, b)\n \n -if hasattr(context, \'getExplanationValue\'):\n +try:\n explanation = context.getExplanationValue()\n - if explanation is not None:\n - explanation_type = explanation.getPortalType()\n - # XXX FIXME: Hardcoded values\n - if "Purchase" in explanation_type:\n - kw[\'sort_method\'] = resourcePurchasePriceSortMethod\n - elif "Sale" in explanation_type:\n - kw[\'sort_method\'] = resourceSalePriceSortMethod\n +except AttributeError:\n + # Sometime, movements doesn\'t have an explanation.\n + explanation = None\n +\n +if explanation is not None:\n + explanation_type = explanation.getPortalType()\n + # XXX FIXME: Hardcoded values\n + if "Purchase" in explanation_type:\n + kw[\'sort_method\'] = resourcePurchasePriceSortMethod\n + elif "Sale" in explanation_type:\n + kw[\'sort_method\'] = resourceSalePriceSortMethod\n \n resource = context.getResourceValue()\n if resource is not None:\n @@ -168,10 +172,10 @@ else:\n <string>destinationSortMethod</string> <string>resourcePurchasePriceSortMethod</string> <string>resourceSalePriceSortMethod</string> - <string>hasattr</string> - <string>context</string> <string>_getattr_</string> + <string>context</string> <string>explanation</string> + <string>AttributeError</string> <string>None</string> <string>explanation_type</string> <string>_write_</string> diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision index e1233a6405176c98c5142e093653947622454e9d..2975e638ba3df389f654c414d29fa71fbea21367 100644 --- a/product/ERP5/bootstrap/erp5_core/bt/revision +++ b/product/ERP5/bootstrap/erp5_core/bt/revision @@ -1 +1 @@ -787 \ No newline at end of file +788 \ No newline at end of file