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

Proposed by jftempo
Status: Merged
Merged at revision: 4262
Proposed branch: lp:~unifield-team/unifield-server/us-2550
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-2550
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+319027@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-12-14 08:13:13 +0000
+++ bin/addons/specific_rules/report/report_stock_inventory_view.xml 2017-03-06 08:37:26 +0000
@@ -33,7 +33,7 @@
33 <field name="model">export.report.stock.inventory</field>33 <field name="model">export.report.stock.inventory</field>
34 <field name="type">form</field>34 <field name="type">form</field>
35 <field name="arch" type="xml">35 <field name="arch" type="xml">
36 <form string="Export Inventory Level">36 <form string="Export Inventory Level" noteditable="state!='draft'">
37 <separator colspan="4" string="Request information" />37 <separator colspan="4" string="Request information" />
38 <field name="name" />38 <field name="name" />
39 <field name="company_id" />39 <field name="company_id" />
4040
=== modified file 'bin/addons/stock_override/report/report_stock_move_view.xml'
--- bin/addons/stock_override/report/report_stock_move_view.xml 2017-02-08 09:21:17 +0000
+++ bin/addons/stock_override/report/report_stock_move_view.xml 2017-03-06 08:37:26 +0000
@@ -147,7 +147,7 @@
147 <field name="model">export.report.stock.move</field>147 <field name="model">export.report.stock.move</field>
148 <field name="type">form</field>148 <field name="type">form</field>
149 <field name="arch" type="xml">149 <field name="arch" type="xml">
150 <form string="Export Moves Analysis">150 <form string="Export Moves Analysis" noteditable="state!='draft'">
151 <separator colspan="4" string="Request information" />151 <separator colspan="4" string="Request information" />
152 <field name="name" />152 <field name="name" />
153 <field name="company_id" />153 <field name="company_id" />

Subscribers

People subscribed via source and target branches

to all changes: