diff --git a/addons/stock/stock.py b/addons/stock/stock.py index 1d7b69c6b3a..6410bb16d09 100644 --- a/addons/stock/stock.py +++ b/addons/stock/stock.py @@ -467,7 +467,8 @@ class stock_picking(osv.osv): if default is None: default = {} default = default.copy() - default['name'] = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking') + if not default.get('name',False): + default['name'] = self.pool.get('ir.sequence').get(cr, uid, 'stock.picking') return super(stock_picking, self).copy(cr, uid, id, default, context) def onchange_partner_in(self, cr, uid, context, partner_id=None): diff --git a/addons/stock/wizard/wizard_partial_picking.py b/addons/stock/wizard/wizard_partial_picking.py index 2fe375c1b4f..89d34605dcd 100644 --- a/addons/stock/wizard/wizard_partial_picking.py +++ b/addons/stock/wizard/wizard_partial_picking.py @@ -27,6 +27,7 @@ import pooler import wizard from osv import osv +import tools _moves_arch = UpdateableStr() _moves_fields = UpdateableDict() @@ -34,8 +35,11 @@ _moves_fields = UpdateableDict() _moves_arch_end = '''
''' -_moves_fields_end = {} +_moves_fields_end = { + 'back_order_notification': {'string':'Back Order' ,'type':'text', 'readonly':True} + } def make_default(val): def fct(uid, data, state): @@ -198,8 +202,15 @@ def _do_split(self, cr, uid, data, context): else: pick_obj.action_move(cr, uid, [pick.id]) wf_service.trg_validate(uid, 'stock.picking', pick.id, 'button_done', cr) - return {'new_picking':new_picking or False} + bo_name = '' + if new_picking: + bo_name = pick_obj.read(cr, uid, [new_picking], ['name'])[0]['name'] + return {'new_picking':new_picking or False, 'back_order':bo_name} +def _get_default(self, cr, uid, data, context): + if data['form']['back_order']: + data['form']['back_order_notification'] = 'Back Order ' + tools.ustr(data['form']['back_order']) + ' Assigned to this Packing.' + return data['form'] class partial_picking(wizard.interface): @@ -215,10 +226,10 @@ class partial_picking(wizard.interface): }, 'split': { 'actions': [ _do_split ], - 'result': {'type': 'state', 'state': 'end'}, + 'result': {'type': 'state', 'state': 'end2'}, }, 'end2': { - 'actions': [ ], + 'actions': [ _get_default ], 'result': {'type': 'form', 'arch': _moves_arch_end, 'fields': _moves_fields_end, 'state': (