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

[Fix] purchase: Fix the yml, 

stock:Remove the sale_id

bzr revid: sbh@tinyerp.com-20100804064430-u38z7eqie2f26v5e
This commit is contained in:
sbh (Open ERP) 2010-08-04 12:14:30 +05:30
parent 6704953f03
commit 697372ae38
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/purchase/__openerp__.py
View File

@ -57,7 +57,7 @@
'test': [
'test/purchase_from_order.yml',
'test/purchase_from_manual.yml',
# 'test/purchase_from_picking.yml',
'test/purchase_from_picking.yml',
'purchase_unit_test.xml',
'test/procurement_buy.yml',
],

4
addons/stock/stock.py
View File

@ -897,7 +897,7 @@ class stock_picking(osv.osv):
'origin': (invoice.origin or '') + ', ' + (picking.name or '') + (picking.origin and (':' + picking.origin) or ''),
'comment': (comment and (invoice.comment and invoice.comment+"\n"+comment or comment)) or (invoice.comment and invoice.comment or ''),
'date_invoice':context.get('date_inv',False),
'user_id':picking.sale_id.user_id and picking.sale_id.user_id.id or False
'user_id':uid
}
invoice_obj.write(cr, uid, [invoice_id], invoice_vals, context=context)
else:
@ -914,7 +914,7 @@ class stock_picking(osv.osv):
'fiscal_position': partner.property_account_position.id,
'date_invoice': context.get('date_inv',False),
'company_id': picking.company_id.id,
'user_id':picking.sale_id.user_id and picking.sale_id.user_id.id or False
'user_id':uid
}
cur_id = self.get_currency_id(cr, uid, picking)
if cur_id: