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

merge 

bzr revid: fp@tinyerp.com-20110924143437-6e30p8zk0s8grs9p
This commit is contained in:
Fabien Pinckaers 2011-09-24 16:34:37 +02:00
parent a3f18d099f 2a373c64c6
commit 5ce328e22c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/point_of_sale/point_of_sale.py
View File

@ -675,12 +675,13 @@ class pos_order(osv.osv):
'quantity': line.qty,
}
inv_name = product_obj.name_get(cr, uid, [line.product_id.id], context=context)[0][1]
inv_line.update(inv_line_ref.product_id_change(cr, uid, [],
line.product_id.id,
line.product_id.uom_id.id,
line.qty, partner_id = order.partner_id.id,
fposition_id=order.partner_id.property_account_position.id)['value'])
if line.product_id.description_sale:
inv_line['note'] = line.product_id.description_sale
inv_line['price_unit'] = line.price_unit
inv_line['discount'] = line.discount
inv_line['name'] = inv_name
@ -1179,7 +1180,7 @@ class pos_order_line(osv.osv):
if 'product_id' in values and not values['product_id']:
return False
return super(pos_order_line, self).write(cr, user, ids, values, context=context)
def copy_data(self, cr, uid, id, default=None, context=None):
if not default:
default = {}