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

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
=== modified file 'bin/addons/specific_rules/report/report_stock_inventory_view.xml'
--- bin/addons/specific_rules/report/report_stock_inventory_view.xml 2016-10-10 09:10:27 +0000
+++ bin/addons/specific_rules/report/report_stock_inventory_view.xml 2017-01-16 10:23:10 +0000
@@ -7,7 +7,7 @@
7 <field name="model">export.report.stock.inventory</field>7 <field name="model">export.report.stock.inventory</field>
8 <field name="type">tree</field>8 <field name="type">tree</field>
9 <field name="arch" type="xml">9 <field name="arch" type="xml">
10 <tree string="Export Inventory Level">10 <tree string="Export Inventory Level" noteditable="1">
11 <field name="name" />11 <field name="name" />
12 <field name="location_id" />12 <field name="location_id" />
13 <field name="state" />13 <field name="state" />
1414
=== modified file 'bin/addons/stock_override/report/report_stock_move_view.xml'
--- bin/addons/stock_override/report/report_stock_move_view.xml 2015-05-22 12:23:21 +0000
+++ bin/addons/stock_override/report/report_stock_move_view.xml 2017-01-16 10:23:10 +0000
@@ -120,7 +120,7 @@
120 <field name="model">export.report.stock.move</field>120 <field name="model">export.report.stock.move</field>
121 <field name="type">tree</field>121 <field name="type">tree</field>
122 <field name="arch" type="xml">122 <field name="arch" type="xml">
123 <tree string="Export Moves Analysis">123 <tree string="Export Moves Analysis" noteditable="1">
124 <field name="name" />124 <field name="name" />
125 <field name="date_from" />125 <field name="date_from" />
126 <field name="date_to" />126 <field name="date_to" />

Subscribers

People subscribed via source and target branches

to all changes: