Merge lp:~derek-sheridan/credativ-openerp/addons-5.0 into lp:credativ-openerp/addons-5.0

Proposed by dsh-credativ
Status: Merged
Merge reported by: Craig Gowing (credativ)
Merged at revision: not available
Proposed branch: lp:~derek-sheridan/credativ-openerp/addons-5.0
Merge into: lp:credativ-openerp/addons-5.0
Diff against target: 12 lines (+1/-1)
1 file modified
stock_dispatch/stock_dispatch.py (+1/-1)
To merge this branch: bzr merge lp:~derek-sheridan/credativ-openerp/addons-5.0
Reviewer Review Type Date Requested Status
Craig Gowing (credativ) Approve
Review via email: mp+97248@code.launchpad.net

Description of the change

filtered assigned dispatches from new moves dispatch form

To post a comment you must log in.
Revision history for this message
Craig Gowing (credativ) (craiggowing) wrote :

Looks good :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stock_dispatch/stock_dispatch.py'
2--- stock_dispatch/stock_dispatch.py 2012-02-09 12:24:38 +0000
3+++ stock_dispatch/stock_dispatch.py 2012-03-13 15:54:17 +0000
4@@ -32,7 +32,7 @@
5 _rec_name = 'id'
6 _columns = {
7 'stock_moves': fields.one2many('stock.move', 'dispatch_id', 'Stock Moves', select=True,
8- domain=[('state', '=', 'assigned'), ('picking_type', '=', 'out')], readonly=True, states={'draft':[('readonly',False)]}),
9+ domain=[('state', '=', 'assigned'), ('picking_type', '=', 'out'), ('dispatch_id', '=', False)], readonly=True, states={'draft':[('readonly',False)]}),
10 'carrier_id': fields.many2one('res.partner', 'Carrier', required=True, select=True, readonly=True, states={'draft':[('readonly',False)]}),
11 'complete_uid': fields.many2one('res.users', 'Completed User', readonly=True),
12 'complete_date': fields.datetime('Completed date', readonly=True),

Subscribers

People subscribed via source and target branches

to all changes: