Unifield Server

Merge lp:~unifield-team/unifield-server/us-1696 into lp:unifield-server

  1. us-1696
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4161
Proposed branch: lp:~unifield-team/unifield-server/us-1696
Merge into: lp:unifield-server
Diff against target: 25 lines (+2/-2)
2 files modified
bin/addons/specific_rules/report/report_stock_inventory_view.xml (+1/-1)
bin/addons/stock_override/report/report_stock_move_view.xml (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-1696
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+314826@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/specific_rules/report/report_stock_inventory_view.xml'
2--- bin/addons/specific_rules/report/report_stock_inventory_view.xml 2016-10-10 09:10:27 +0000
3+++ bin/addons/specific_rules/report/report_stock_inventory_view.xml 2017-01-16 10:23:10 +0000
4@@ -7,7 +7,7 @@
5 <field name="model">export.report.stock.inventory</field>
6 <field name="type">tree</field>
7 <field name="arch" type="xml">
8- <tree string="Export Inventory Level">
9+ <tree string="Export Inventory Level" noteditable="1">
10 <field name="name" />
11 <field name="location_id" />
12 <field name="state" />
13
14=== modified file 'bin/addons/stock_override/report/report_stock_move_view.xml'
15--- bin/addons/stock_override/report/report_stock_move_view.xml 2015-05-22 12:23:21 +0000
16+++ bin/addons/stock_override/report/report_stock_move_view.xml 2017-01-16 10:23:10 +0000
17@@ -120,7 +120,7 @@
18 <field name="model">export.report.stock.move</field>
19 <field name="type">tree</field>
20 <field name="arch" type="xml">
21- <tree string="Export Moves Analysis">
22+ <tree string="Export Moves Analysis" noteditable="1">
23 <field name="name" />
24 <field name="date_from" />
25 <field name="date_to" />

Subscribers

People subscribed via source and target branches

to all changes: