[IMP] usability in pickings
bzr revid: qdp-launchpad@openerp.com-20130802145239-up063ryozskoa1u9
This commit is contained in:
parent
45bd8fc999
commit
09af7f5559
|
@ -398,7 +398,7 @@ class stock_picking(osv.osv):
|
||||||
def create(self, cr, user, vals, context=None):
|
def create(self, cr, user, vals, context=None):
|
||||||
context = context or {}
|
context = context or {}
|
||||||
if ('name' not in vals) or (vals.get('name') in ('/', False)):
|
if ('name' not in vals) or (vals.get('name') in ('/', False)):
|
||||||
ptype_id = vals.get('picking_type_id', context.get('picking_type_id', False))
|
ptype_id = vals.get('picking_type_id', context.get('default_picking_type_id', False))
|
||||||
sequence_id = self.pool.get('stock.picking.type').browse(cr, user, ptype_id, context=context).sequence_id.id
|
sequence_id = self.pool.get('stock.picking.type').browse(cr, user, ptype_id, context=context).sequence_id.id
|
||||||
vals['name'] = self.pool.get('ir.sequence').get_id(cr, user, sequence_id, 'id', context=context)
|
vals['name'] = self.pool.get('ir.sequence').get_id(cr, user, sequence_id, 'id', context=context)
|
||||||
return super(stock_picking, self).create(cr, user, vals, context)
|
return super(stock_picking, self).create(cr, user, vals, context)
|
||||||
|
@ -931,31 +931,26 @@ class stock_move(osv.osv):
|
||||||
|
|
||||||
def _default_location_destination(self, cr, uid, context=None):
|
def _default_location_destination(self, cr, uid, context=None):
|
||||||
context = context or {}
|
context = context or {}
|
||||||
if context.get('picking_type_id', False):
|
if context.get('default_picking_type_id', False):
|
||||||
pick_type = self.pool.get('stock.picking.type').browse(cr, uid, context['picking_type_id'], context=context)
|
pick_type = self.pool.get('stock.picking.type').browse(cr, uid, context['default_picking_type_id'], context=context)
|
||||||
return pick_type.location_dest_id and pick_type.location_dest_id.id or False
|
return pick_type.default_location_dest_id and pick_type.default_location_dest_id.id or False
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def _default_location_source(self, cr, uid, context=None):
|
def _default_location_source(self, cr, uid, context=None):
|
||||||
context = context or {}
|
context = context or {}
|
||||||
if context.get('picking_type_id', False):
|
if context.get('default_picking_type_id', False):
|
||||||
pick_type = self.pool.get('stock.picking.type').browse(cr, uid, context['picking_type_id'], context=context)
|
pick_type = self.pool.get('stock.picking.type').browse(cr, uid, context['default_picking_type_id'], context=context)
|
||||||
return pick_type.location_src_id and pick_type.location_src_id.id or False
|
return pick_type.default_location_src_id and pick_type.default_location_src_id.id or False
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def _default_destination_address(self, cr, uid, context=None):
|
def _default_destination_address(self, cr, uid, context=None):
|
||||||
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
|
user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
|
||||||
return user.company_id.partner_id.id
|
return user.company_id.partner_id.id
|
||||||
|
|
||||||
def _default_picking_type(self, cr, uid, context=None):
|
|
||||||
context = context or {}
|
|
||||||
return context.get('picking_type_id', False)
|
|
||||||
|
|
||||||
_defaults = {
|
_defaults = {
|
||||||
'location_id': _default_location_source,
|
'location_id': _default_location_source,
|
||||||
'location_dest_id': _default_location_destination,
|
'location_dest_id': _default_location_destination,
|
||||||
'partner_id': _default_destination_address,
|
'partner_id': _default_destination_address,
|
||||||
'picking_type_id': _default_picking_type,
|
|
||||||
'state': 'draft',
|
'state': 'draft',
|
||||||
'priority': '1',
|
'priority': '1',
|
||||||
'product_qty': 1.0,
|
'product_qty': 1.0,
|
||||||
|
|
|
@ -621,7 +621,7 @@
|
||||||
<field name="result_package_id"/>
|
<field name="result_package_id"/>
|
||||||
</tree>
|
</tree>
|
||||||
</field>
|
</field>
|
||||||
<field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree'}"/>
|
<field name="move_lines" context="{'address_in_id': partner_id, 'form_view_ref':'view_move_picking_form', 'tree_view_ref':'view_move_picking_tree', 'default_picking_type_id': picking_type_id}"/>
|
||||||
<field name="note" placeholder="Add an internal note..." class="oe_inline"/>
|
<field name="note" placeholder="Add an internal note..." class="oe_inline"/>
|
||||||
</page>
|
</page>
|
||||||
<page string="Additional Info">
|
<page string="Additional Info">
|
||||||
|
|
Loading…
Reference in New Issue