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

Task ID-578: Rename the field of last_out_picking with picking_id 

bzr revid: sbh@tinyerp.com-20100513082142-kr3r5sqp9hg01y4j
This commit is contained in:
sbh (Open ERP) 2010-05-13 13:51:42 +05:30
parent 869a83bf30
commit 1aa1cc8dcd
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/point_of_sale/pos.py
View File

@ -237,7 +237,7 @@ class pos_order(osv.osv):
'partner_id': False,
'invoice_id': False,
'account_move': False,
'last_out_picking': False,
'picking_id': False,
'nb_print': 0,
'pickings': []
})
@ -308,7 +308,7 @@ class pos_order(osv.osv):
'invoice_id': fields.many2one('account.invoice', 'Invoice'),
'account_move': fields.many2one('account.move', 'Account Entry', readonly=True),
'pickings': fields.one2many('stock.picking', 'pos_order', 'Picking', readonly=True),
'last_out_picking': fields.many2one('stock.picking', 'Last Output Picking', readonly=True),
'picking_id': fields.many2one('stock.picking', 'Last Output Picking', readonly=True),
'first_name': fields.char('First Name', size=64),
'state_2': fields.function(_get_v,type='selection',selection=[('to_verify', 'To Verify'), ('accepted', 'Accepted'),
('refused', 'Refused')], string='State', readonly=True, method=True, store=True),
@ -467,7 +467,7 @@ class pos_order(osv.osv):
orders = self.browse(cr, uid, ids, context)
for order in orders:
if not order.last_out_picking:
if not order.picking_id:
new = True
picking_id = picking_obj.create(cr, uid, {
'origin': order.name,
@ -479,9 +479,9 @@ class pos_order(osv.osv):
'auto_picking': True,
'pos_order': order.id,
})
self.write(cr, uid, [order.id], {'last_out_picking': picking_id})
self.write(cr, uid, [order.id], {'picking_id': picking_id})
else:
picking_id = order.last_out_picking.id
picking_id = order.picking_id.id
picking_obj.write(cr, uid, [picking_id], {'auto_picking': True})
picking = picking_obj.browse(cr, uid, [picking_id], context)[0]
new = False

2
addons/point_of_sale/wizard/pos_get_sale.py
View File

@ -55,7 +55,7 @@ class pos_get_sale(osv.osv_memory):
for pick in proxy_pick.browse(cr, uid, [this.picking_id.id], context):
proxy_pos.write(cr, uid, record_id, {
'last_out_picking': this.picking_id.id,
'picking_id': this.picking_id.id,
'partner_id': pick.address_id and pick.address_id.partner_id.id
})

6
addons/point_of_sale/wizard/pos_return.py
View File

@ -158,14 +158,14 @@ class pos_return(osv.osv_memory):
location_id=res and res[0] or None
stock_dest_id = val.id
new_picking=picking_obj.copy(cr, uid, order_id.last_out_picking.id, {'name':'%s (return)' % order_id.name,
new_picking=picking_obj.copy(cr, uid, order_id.picking_id.id, {'name':'%s (return)' % order_id.name,
'move_lines':[], 'state':'draft', 'type':'in',
'type':'in',
'date':date_cur})
new_order=order_obj.copy(cr,uid,order_id.id, {'name': 'Refund %s'%order_id.name,
'lines':[],
'statement_ids':[],
'last_out_picking':[]})
'picking_id':[]})
for line in order_id.lines:
if line.id and (data['return%s' %line.id]!=0.0):
new_move=stock_move_obj.create(cr, uid,{
@ -262,7 +262,7 @@ class add_product(osv.osv_memory):
wf_service.trg_validate(uid, 'stock.picking',new_picking,'button_confirm', cr)
picking_obj.force_assign(cr, uid, [new_picking], context)
order_obj.write(cr,uid,active_id,{'last_out_picking':new_picking})
order_obj.write(cr,uid,active_id,{'picking_id':new_picking})
return {