Merge lp:~mallorymarcot/unifield-server/us-1571 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 4122
Proposed branch: lp:~mallorymarcot/unifield-server/us-1571
Merge into: lp:unifield-server
Diff against target: 14 lines (+2/-1)
1 file modified
bin/addons/stock/stock_view.xml (+2/-1)
To merge this branch: bzr merge lp:~mallorymarcot/unifield-server/us-1571
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+313323@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-02-18 15:39:31 +0000
3+++ bin/addons/stock/stock_view.xml 2016-12-15 08:33:46 +0000
4@@ -1024,8 +1024,9 @@
5 <field name="arch" type="xml">
6 <search string="Picking list">
7 <group col="8" colspan="4">
8+ <filter icon="terp-document-new" name="draft" string="Draft" domain="[('state', 'in', ['draft'])]" help="Delivery orders which are in draft state" />
9+ <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
10 <filter icon="terp-check" name="available" string="Available" domain="[('state','=','assigned')]" help="Assigned Delivery Orders"/>
11- <filter icon="terp-camera_test" name="confirmed" string="Confirmed" domain="[('state','=','confirmed')]" help="Confirmed Delivery Orders"/>
12 <filter icon="terp-dialog-close" name="done" string="Done" domain="[('state','=','done')]" help="Delivery orders already processed"/>
13 <separator orientation="vertical"/>
14 <filter icon="terp-accessories-archiver-minus" string="Back Orders" domain="[('backorder_id', '!=', False)]" help="Is a Back Order" groups="base.group_extended"/>

Subscribers

People subscribed via source and target branches