[Erp5-report] r40730 nicolas - in /erp5/trunk/bt5/erp5_trade: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: nicolas
Date: Thu Nov 25 17:50:29 2010
New Revision: 40730

URL: http://svn.erp5.org?rev=40730&view=rev
Log:
Restrict display of aggregated_items on Order views if context is a movement
and if there no variation categories configured.

Modified:
    erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_isAggregateItemListEnabled.xml
    erp5/trunk/bt5/erp5_trade/bt/revision

Modified: erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_isAggregateItemListEnabled.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_isAggregateItemListEnabled.xml?rev=40730&r1=40729&r2=40730&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_isAggregateItemListEnabled.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Movement_isAggregateItemListEnabled.xml [utf8] Thu Nov 25 17:50:29 2010
@@ -54,7 +54,7 @@
 for Base_viewTradeFieldLibrary/my_view_mode_aggregate_title_list.enable\n
 """\n
 \n
-if context.getResource() and context.getResourceValue().getAggregatedPortalTypeList():\n
+if context.getResource() and context.getResourceValue().getAggregatedPortalTypeList() and context.isMovement() and not context.getVariationCategoryList():\n
   return True\n
 if context.getAggregate():\n
   return True\n

Modified: erp5/trunk/bt5/erp5_trade/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_trade/bt/revision?rev=40730&r1=40729&r2=40730&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_trade/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_trade/bt/revision [utf8] Thu Nov 25 17:50:29 2010
@@ -1 +1 @@
-1041
\ No newline at end of file
+1042
\ No newline at end of file