Merge lp:~dorian-kemps/unifield-server/US-2600 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 5834
Proposed branch: lp:~dorian-kemps/unifield-server/US-2600
Merge into: lp:unifield-server
Diff against target: 12 lines (+1/-1)
1 file modified
bin/addons/msf_outgoing/msf_outgoing_view.xml (+1/-1)
To merge this branch: bzr merge lp:~dorian-kemps/unifield-server/US-2600
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+388478@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/msf_outgoing/msf_outgoing_view.xml'
2--- bin/addons/msf_outgoing/msf_outgoing_view.xml 2020-02-07 16:37:57 +0000
3+++ bin/addons/msf_outgoing/msf_outgoing_view.xml 2020-07-31 12:01:21 +0000
4@@ -400,7 +400,7 @@
5 <button name="action_confirm_moves" string="Confirm" type="object" icon="gtk-apply" attrs="{'invisible': [('has_draft_moves', '!=', True)]}"/>
6 <button name="check_availability_manually" states="draft,confirmed,assigned" string="Check Availability" type="object" icon="gtk-find" context="{'from_button': True}"/>
7 <button name="convert_to_standard" states="draft" string="Convert to Simple Out" type="object" icon="gtk-convert" context="{'from_button': True}" />
8- <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to" context="{'from_button': True}" />
9+ <button name="force_assign" states="draft,confirmed,assigned" string="Force Availability" type="object" icon="gtk-jump-to" context="{'from_button': True}" />
10 <button name="do_create_picking_bg" states="draft" string="Create Picking" type="object" icon="gtk-add" context="{'from_button': True}" />
11 <button name="do_validate_picking_bg" states="assigned" string="Validate Picking" type="object" icon="gtk-apply" context="{'from_button': True}" />
12 </group>

Subscribers

People subscribed via source and target branches