Unifield Server

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

  1. us-2050
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4309
Proposed branch: lp:~unifield-team/unifield-server/us-2050
Merge into: lp:unifield-server
Diff against target: 25 lines (+2/-2)
2 files modified
bin/addons/stock/stock_view.xml (+1/-1)
bin/addons/stock_override/stock_view.xml (+1/-1)
To merge this branch: bzr merge lp:~unifield-team/unifield-server/us-2050
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+320469@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/stock/stock_view.xml'
2--- bin/addons/stock/stock_view.xml 2016-11-25 14:15:34 +0000
3+++ bin/addons/stock/stock_view.xml 2017-03-21 09:49:21 +0000
4@@ -171,7 +171,7 @@
5 <field name="state"/>
6 </group>
7 <group col="3" colspan="2">
8- <button name="action_cancel_inventary" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
9+ <button name="action_cancel_inventary" states="draft,confirm" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
10 <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
11 <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>
12 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
13
14=== modified file 'bin/addons/stock_override/stock_view.xml'
15--- bin/addons/stock_override/stock_view.xml 2017-03-10 15:44:31 +0000
16+++ bin/addons/stock_override/stock_view.xml 2017-03-21 09:49:21 +0000
17@@ -1166,7 +1166,7 @@
18 <field name="state"/>
19 </group>
20 <group col="3" colspan="2">
21- <button name="action_cancel_inventary" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
22+ <button name="action_cancel_inventary" states="draft,confirm" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
23 <button name="action_confirm" states="draft" string="Validate Inventory" type="object" icon="gtk-apply"/>
24 <button name="action_done" states="confirm" string="Confirm Inventory" type="object" icon="gtk-jump-to"/>
25 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>

Subscribers

People subscribed via source and target branches

to all changes: