diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_fixDialogActions.py b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_fixDialogActions.py index 613a95ead2a85ff07555fcb8444425f438e80bdb..ca3e854a578a31834f89b891900727d8ddc0e384 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_fixDialogActions.py +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/Base_fixDialogActions.py @@ -3,6 +3,8 @@ actions that does not provide one. """ from Products.PythonScripts.standard import url_quote +if dialog_category == 'object_report': + return sorted(actions.get('object_report', []) + actions.get('object_report_jio', []), key=lambda x: x["priority"]) if dialog_category != 'object_print': return actions.get(dialog_category, []) diff --git a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.zpt b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.zpt index 7f07592769b95914dd23f6192a7feb8473f5c8dc..ecb11bd5c3fcc754641e5a32a2026f47ca33900b 100644 --- a/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.zpt +++ b/product/ERP5/bootstrap/erp5_xhtml_style/SkinTemplateItem/portal_skins/erp5_xhtml_style/context_box_render.zpt @@ -102,6 +102,7 @@ tal:define="search_actions actions/object_search | nothing; exchange_actions actions/object_exchange | nothing; report_actions actions/object_report | nothing; + report_jio_actions actions/object_report_jio | nothing; button_actions actions/object_button | nothing; fast_input_actions actions/object_fast_input | nothing; sort_actions actions/object_sort | nothing; @@ -220,7 +221,7 @@ <span class="image"></span> <span class="description" i18n:translate="" i18n:domain="ui">Import / Export</span> </button> - <button tal:condition="report_actions" class="report" type="submit" name="Base_doReport:method" title="Report" + <button tal:condition="report_actions | report_jio_actions" class="report" type="submit" name="Base_doReport:method" title="Report" i18n:attributes="title" i18n:domain="ui"> <span class="image"></span> <span class="description" i18n:translate="" i18n:domain="ui">Report</span>