Unifield Server

Merge lp:~dorian-kemps/unifield-server/US-4925 into lp:unifield-server

  1. US-4925
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 5767
Proposed branch: lp:~dorian-kemps/unifield-server/US-4925
Merge into: lp:unifield-server
Diff against target: 26 lines (+3/-2)
2 files modified
bin/addons/consumption_calculation/consumption_view.xml (+2/-1)
bin/addons/stock/stock_view.xml (+1/-1)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-4925
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+385994@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/consumption_calculation/consumption_view.xml'
2--- bin/addons/consumption_calculation/consumption_view.xml 2019-06-18 11:15:45 +0000
3+++ bin/addons/consumption_calculation/consumption_view.xml 2020-06-18 09:49:48 +0000
4@@ -185,7 +185,8 @@
5 <menuitem
6 id="consumption_reports_menu"
7 action="action_real_average_consumption"
8- parent="warehouse_consumption_menu" />
9+ parent="stock.menu_stock_warehouse_mgmt"
10+ sequence="3"/>
11
12 <record id="monthly_review_consumption_form_view" model="ir.ui.view">
13 <field name="name">monthly.review.consumption.form.view</field>
14
15=== modified file 'bin/addons/stock/stock_view.xml'
16--- bin/addons/stock/stock_view.xml 2020-02-25 10:55:04 +0000
17+++ bin/addons/stock/stock_view.xml 2020-06-18 09:49:48 +0000
18@@ -878,7 +878,7 @@
19 <field name="view_mode">calendar</field>
20 <field name="act_window_id" ref="action_picking_tree"/>
21 </record>
22- <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_warehouse_mgmt" sequence="3"/>
23+ <menuitem action="action_picking_tree" id="menu_action_picking_tree" parent="menu_stock_warehouse_mgmt" sequence="4"/>
24
25 <record id="view_picking_in_tree" model="ir.ui.view">
26 <field name="name">stock.picking.in.tree</field>

Subscribers

People subscribed via source and target branches