Merge lp:~openerp-dev/openobject-addons/trunk-bug-1170266-cga into lp:openobject-addons

[Chandni Gandhi(OpenERP)]

Hello,

I have fixed issue of invoice on tasks (timesheet) multiples entries are not splited by user on description but doubled.

Thanks.
CGA

Unmerged revisions

8696. By Chandni Gandhi(OpenERP) on 2013-05-01

[IMP]:Improve code

8695. By Chandni Gandhi(OpenERP) on 2013-05-01

[FIX]:Add user name in description field of invoice line

=== modified file 'hr_timesheet_invoice/hr_timesheet_invoice.py'
--- hr_timesheet_invoice/hr_timesheet_invoice.py	2013-04-15 10:23:49 +0000
+++ hr_timesheet_invoice/hr_timesheet_invoice.py	2013-05-20 08:56:29 +0000
@@ -231,6 +231,9 @@
                     factor_name = product_obj.name_get(cr, uid, [product_id], context=context2)[0][1]
                     if factor.customer_name:
                         factor_name += ' - ' + factor.customer_name
+                    if user_id:
+                        user = self.pool.get('res.users').browse(cr, uid, user_id, context)
+                        factor_name += ' - ' + user.name 
 
                     ctx =  context.copy()
                     ctx.update({'uom':uom})
@@ -273,12 +276,7 @@
                                 details.append("%s %s" % (line['unit_amount'], product_uom_obj.browse(cr, uid, [line['product_uom_id']],context2)[0].name))
                             else:
                                 details.append("%s" % (line['unit_amount'], ))
-                        if data.get('name', False):
-                            details.append(line['name'])
-                        note.append(u' - '.join(map(lambda x: unicode(x) or '',details)))
 
-                    if note:
-                        curr_line['name'] += "\n" + ("\n".join(map(lambda x: unicode(x) or '',note)))
                     invoice_line_obj.create(cr, uid, curr_line, context=context)
                     cr.execute("update account_analytic_line set invoice_id=%s WHERE account_id = %s and id IN %s", (last_invoice, account.id, tuple(ids)))