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
=== modified file 'bin/addons/stock/stock_view.xml'
--- bin/addons/stock/stock_view.xml 2016-11-25 14:15:34 +0000
+++ bin/addons/stock/stock_view.xml 2017-03-21 09:49:21 +0000
@@ -171,7 +171,7 @@
171 <field name="state"/>171 <field name="state"/>
172 </group>172 </group>
173 <group col="3" colspan="2">173 <group col="3" colspan="2">
174 <button name="action_cancel_inventary" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>174 <button name="action_cancel_inventary" states="draft,confirm" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
175 <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>175 <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
176 <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>176 <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>
177 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>177 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
178178
=== modified file 'bin/addons/stock_override/stock_view.xml'
--- bin/addons/stock_override/stock_view.xml 2017-03-10 15:44:31 +0000
+++ bin/addons/stock_override/stock_view.xml 2017-03-21 09:49:21 +0000
@@ -1166,7 +1166,7 @@
1166 <field name="state"/>1166 <field name="state"/>
1167 </group>1167 </group>
1168 <group col="3" colspan="2">1168 <group col="3" colspan="2">
1169 <button name="action_cancel_inventary" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>1169 <button name="action_cancel_inventary" states="draft,confirm" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
1170 <button name="action_confirm" states="draft" string="Validate Inventory" type="object" icon="gtk-apply"/>1170 <button name="action_confirm" states="draft" string="Validate Inventory" type="object" icon="gtk-apply"/>
1171 <button name="action_done" states="confirm" string="Confirm Inventory" type="object" icon="gtk-jump-to"/>1171 <button name="action_done" states="confirm" string="Confirm Inventory" type="object" icon="gtk-jump-to"/>
1172 <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>1172 <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: