diff --git a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox.xml b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox.xml
index 5c8e8608e9914510b2248ba18f6c57be24a38400..5ff6a763d9368a80b54840c17265698786c179dd 100644
--- a/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox.xml
+++ b/bt5/erp5_pdm/SkinTemplateItem/portal_skins/erp5_pdm/Resource_viewMovementHistory/listbox.xml
@@ -160,10 +160,18 @@
<key> <string>alternate_name</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>anchor</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>columns</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>count_method</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>css_class</string> </key>
<value> <string></string> </value>
@@ -172,6 +180,10 @@
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>default_display_style</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>default_params</string> </key>
<value> <string></string> </value>
@@ -180,6 +192,10 @@
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>display_style_list</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>domain_root_list</string> </key>
<value> <string></string> </value>
@@ -188,10 +204,18 @@
<key> <string>domain_tree</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>editable_columns</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>external_validator</string> </key>
<value> <string></string> </value>
@@ -200,10 +224,18 @@
<key> <string>global_attributes</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>global_search_column</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>hidden</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>hide_rows_on_no_search_criterion</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>lines</string> </key>
<value> <string></string> </value>
@@ -220,6 +252,14 @@
<key> <string>meta_types</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>page_navigation_template</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>page_template</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>portal_types</string> </key>
<value> <string></string> </value>
@@ -232,6 +272,10 @@
<key> <string>report_tree</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>row_css_method</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>search</string> </key>
<value> <string></string> </value>
@@ -256,14 +300,36 @@
<key> <string>sort_columns</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>stat_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>stat_method</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>style_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>untranslatable_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>url_columns</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>url_parameter_dict</string> </key>
+ <value>
+ <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ </value>
+ </item>
</dictionary>
</value>
</item>
@@ -338,6 +404,10 @@
<key> <string>default</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>default_display_style</string> </key>
+ <value> <string>table</string> </value>
+ </item>
<item>
<key> <string>default_params</string> </key>
<value>
@@ -348,6 +418,12 @@
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
+ <item>
+ <key> <string>display_style_list</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
<item>
<key> <string>domain_root_list</string> </key>
<value>
@@ -404,10 +480,18 @@
<list/>
</value>
</item>
+ <item>
+ <key> <string>global_search_column</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>hidden</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>hide_rows_on_no_search_criterion</string> </key>
+ <value> <int>0</int> </value>
+ </item>
<item>
<key> <string>lines</string> </key>
<value> <int>20</int> </value>
@@ -419,7 +503,7 @@
<item>
<key> <string>list_method</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
@@ -428,6 +512,10 @@
<list/>
</value>
</item>
+ <item>
+ <key> <string>page_navigation_template</string> </key>
+ <value> <string>ListBox_viewSliderPageNavigationRenderer</string> </value>
+ </item>
<item>
<key> <string>page_template</string> </key>
<value> <string></string> </value>
@@ -448,6 +536,10 @@
<key> <string>report_tree</string> </key>
<value> <int>0</int> </value>
</item>
+ <item>
+ <key> <string>row_css_method</string> </key>
+ <value> <string></string> </value>
+ </item>
<item>
<key> <string>search</string> </key>
<value> <int>0</int> </value>
@@ -472,7 +564,7 @@
<list>
<tuple>
<string>date</string>
- <string>Date</string>
+ <string>asc</string>
</tuple>
</list>
</value>
@@ -492,7 +584,13 @@
<item>
<key> <string>stat_method</string> </key>
<value>
- <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+ <persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
+ </value>
+ </item>
+ <item>
+ <key> <string>style_columns</string> </key>
+ <value>
+ <list/>
</value>
</item>
<item>
@@ -511,6 +609,12 @@
<list/>
</value>
</item>
+ <item>
+ <key> <string>url_parameter_dict</string> </key>
+ <value>
+ <list/>
+ </value>
+ </item>
</dictionary>
</value>
</item>
@@ -518,6 +622,19 @@
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
+ <pickle>
+ <global name="TALESMethod" module="Products.Formulator.TALESField"/>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>_text</string> </key>
+ <value> <string>python: {\'date\': {}, \'getExplanationText\': {}, \'node_title\':{}, \'section_title\':{}, \'variation_category_item_list\': {},\'total_quantity\':{}, \'getTranslatedSimulationStateTitle\':{}}</string> </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+ <record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
@@ -530,7 +647,7 @@
</dictionary>
</pickle>
</record>
- <record id="3" aka="AAAAAAAAAAM=">
+ <record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="Method" module="Products.Formulator.MethodField"/>
</pickle>
diff --git a/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.InventoryBrain.py b/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.InventoryBrain.py
index 171c88c8e03aaffa88ad730fdf089e0e1e5e1d9c..d1e9551941b746550cc1b735184d20748aae785f 100644
--- a/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.InventoryBrain.py
+++ b/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.InventoryBrain.py
@@ -343,15 +343,20 @@ class MovementHistoryListBrain(InventoryListBrain):
return self._convertDateToZone(self.date_utc)
date = ComputedAttribute(_date, 1)
+ def getListItem(self, cname_id, selection_index, selection_name):
+ document = self.getObject()
+ if document.isMovement():
+ return document.getExplanationValue()
+ def getListItemParamDict(self, cname_id, selection_index, selection_name):
+ return {}
+
def getListItemUrl(self, cname_id, selection_index, selection_name):
"""Returns the URL for column `cname_id`. Used by ListBox
Here we just want a link to the explanation of movement.
"""
- document = self.getObject()
- if document.isMovement():
- explanation = document.getExplanationValue()
- if explanation is not None:
- return explanation.absolute_url()
+ item = self.getListItem(cname_id, selection_index, selection_name)
+ if item is not None:
+ return item.absolute_url()
return ''
def _debit(self):
diff --git a/product/ERP5Form/ListBox.py b/product/ERP5Form/ListBox.py
index fd59622ade76aeed31bc3c2274fddb2848c5afa0..9ecb68d2296f0ce75daab34bbc38b9ab3ee68e35 100644
--- a/product/ERP5Form/ListBox.py
+++ b/product/ERP5Form/ListBox.py
@@ -2344,20 +2344,24 @@ class ListBoxHTMLRendererLine(ListBoxRendererLine):
result_dict[key] = value(selection=selection, selection_name=selection.getName(), column_id=sql, index=self.index)
except TypeError:
result_dict[key] = value()
- if result_dict:
- if 'jio_key' not in result_dict:
- url = ''
- else:
- try:
- url = self.getObject().getPortalObject().restrictedTraverse(result_dict['jio_key']).absolute_url()
- except KeyError:
- url = result_dict['jio_key']
-
- if 'view_action' in result_dict:
- url += result_dict['view_action']
- if 'parameter' not in result_dict and getattr(brain, 'getListItemParamDict', None) is not None:
- result_dict['parameter'] = brain.getListItemParamDict(alias, self.index, selection_name)
- if 'parameter' in result_dict:
+
+ if 'jio_key' not in result_dict:
+ url = ''
+ if getattr(brain, 'getListItem', None) is not None:
+ item = brain.getListItem(alias, self.index, selection_name)
+ if item is not None:
+ url = item.absolute_url()
+ else:
+ try:
+ url = self.getObject().getPortalObject().restrictedTraverse(result_dict['jio_key']).absolute_url()
+ except KeyError:
+ url = result_dict['jio_key']
+
+ if 'view_action' in result_dict:
+ url += result_dict['view_action']
+ if 'parameter' not in result_dict and getattr(brain, 'getListItemParamDict', None) is not None:
+ result_dict['parameter'] = brain.getListItemParamDict(alias, self.index, selection_name)
+ if 'parameter' in result_dict:
url = '%s?%s' % (url, make_query(result_dict['parameter']))
# Find an URL method.