odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] Change auto in waiting for picking state, add picking type in push rule view 

bzr revid: jco@openerp.com-20130816150226-th1rpjoozdf6p1wt
This commit is contained in:
Josse Colpaert 2013-08-16 17:02:26 +02:00
parent bcbd83f242
commit 593f1ddc8a
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
addons/stock/stock.py
View File

@ -61,7 +61,7 @@ class stock_location(osv.osv):
_order = 'parent_left'
def name_get(self, cr, uid, ids, context=None):
res = self._complete_name(cr, uid, ids, 'complete_name', None, context=context)
return res.items()
return res.items()
def _complete_name(self, cr, uid, ids, name, args, context=None):
""" Forms complete name of location from parent location to child location.
@ -432,7 +432,7 @@ class stock_picking(osv.osv):
res[pick.id] = 'done'
continue
order = {'confirmed':0, 'auto':1, 'assigned':2}
order = {'confirmed':0, 'waiting':1, 'assigned':2}
order_inv = dict(zip(order.values(),order.keys()))
lst = [order[x.state] for x in pick.move_lines if x.state not in ('cancel','done')]
if pick.move_lines == 'one':
@ -467,7 +467,7 @@ class stock_picking(osv.osv):
'stock.move': (_get_pickings, ['state', 'picking_id'], 20)}, selection = [
('draft', 'Draft'),
('cancel', 'Cancelled'),
('auto', 'Waiting Another Operation'),
('waiting', 'Waiting Another Operation'),
('confirmed', 'Waiting Availability'),
('assigned', 'Ready to Transfer'),
('done', 'Transferred'),
@ -1199,7 +1199,7 @@ class stock_move(osv.osv):
('group_id', '=', move.group_id.id),
('location_id', '=', move.location_id.id),
('location_dest_id', '=', move.location_dest_id.id),
('state', 'in', ['confirmed', 'auto'])], context=context)
('state', 'in', ['confirmed', 'waiting'])], context=context)
if picks:
pick = picks[0]
else:

5
addons/stock_location/stock_location.py
View File

@ -52,9 +52,6 @@ class stock_location_path(osv.osv):
'name': fields.char('Operation', size=64),
'company_id': fields.many2one('res.company', 'Company'),
'route_id': fields.many2one('stock.location.route', 'Route'),
'product_id' : fields.many2one('product.product', 'Products', ondelete='cascade', select=1),
'location_from_id' : fields.many2one('stock.location', 'Source Location', ondelete='cascade', select=1, required=True),
'location_dest_id' : fields.many2one('stock.location', 'Destination Location', ondelete='cascade', select=1, required=True),
'delay': fields.integer('Delay (days)', help="Number of days to do this transition"),
@ -62,7 +59,7 @@ class stock_location_path(osv.osv):
("invoiced", "Invoiced"),
("2binvoiced", "To Be Invoiced"),
("none", "Not Applicable")], "Invoice Status",
required=True,),
required=True,),
'picking_type_id': fields.many2one('stock.picking.type', 'Picking Type', help="This is the picking type associated with the different pickings"),
'auto': fields.selection(
[('auto','Automatic Move'), ('manual','Manual Operation'),('transparent','Automatic No Step Added')],

11
addons/stock_location/stock_location_view.xml
View File

@ -87,14 +87,15 @@
<field name="arch" type="xml">
<form string="Location Paths" version="7.0">
<group col="4">
<field name="name" />
<field name="name"/>
<newline />
<field name="company_id" groups="base.group_multi_company" />
<newline />
<field name="location_from_id" />
<field name="location_dest_id" />
<field name="auto" />
<field name="delay" />
<field name="location_from_id"/>
<field name="location_dest_id"/>
<field name="picking_type_id"/>
<field name="auto"/>
<field name="delay"/>
</group>
</form>
</field>