Merge lp:~dorian-kemps/unifield-web/UW-5753 into lp:unifield-web

Proposed by jftempo on 2019-06-06
Status: Needs review
Proposed branch: lp:~dorian-kemps/unifield-web/UW-5753
Merge into: lp:unifield-web
Diff against target: 14 lines (+2/-2)
1 file modified
addons/openerp/widgets/templates/sidebar.mako (+2/-2)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-web/UW-5753
Reviewer Review Type Date Requested Status
UniField Dev Team 2019-06-06 Pending
Review via email: mp+368470@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

4957. By Dorian on 2019-06-05

UW-5753 [MERGE] Merge with trunk

4956. By Dorian on 2019-03-12

UW-5753 [IMP] Right Sidebar: Import lines actions is not added to the FO/IR sidebar

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/openerp/widgets/templates/sidebar.mako'
2--- addons/openerp/widgets/templates/sidebar.mako 2018-12-27 15:37:05 +0000
3+++ addons/openerp/widgets/templates/sidebar.mako 2019-06-06 13:39:04 +0000
4@@ -29,8 +29,8 @@
5 <div class="sideheader-a"><h2>${title}</h2></div>
6 <ul class="clean-a">
7 % for item in items:
8- % if item:
9- ${sidebox_action_item(item, model, submenu, icon)}
10+ % if item and (not item.get('res_model') or model != 'sale.order' or (model == 'sale.order' and item['res_model'] != 'procurement.request.import')):
11+ ${sidebox_action_item(item, model, submenu, icon)}
12 % endif
13 % endfor
14 </ul>

Subscribers

People subscribed via source and target branches