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

[FIX] hr_timesheet_invoice: fixed error when invoicing (due to previous merge on osv_memory) 

bzr revid: qdp-launchpad@openerp.com-20110315145931-zlle0u5ybzzep434
This commit is contained in:
Quentin (OpenERP) 2011-03-15 15:59:31 +01:00
parent 6c82be0d52
commit 9b351c8d5d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py
View File

@ -120,13 +120,13 @@ class hr_timesheet_invoice_create(osv.osv_memory):
raise osv.except_osv(_('Error'), _('At least one line has no product !'))
factor_name = ''
factor = invoice_factor_obj.browse(cr, uid, factor_id, context2)
if not data['product']:
if factor.customer_name:
factor_name = product.name+' - '+factor.customer_name
else:
factor_name = product.name
else:
data['product'] = data['product'][0]
factor_name = product_obj.name_get(cr, uid, [data['product']], context=context)[0][1]
if account.pricelist_id: