Odoo Addons (MOVED TO GITHUB)

Merge lp:~pniederlag/openobject-addons/fix_hr_timesheet_invoice_5.0 into lp:openobject-addons/5.0

  1. fix_hr_timesheet_invoice_5.0
  2. Merge into 5.0
Proposed by jugglefish
Status: Merged
Merged at revision: 2768
Proposed branch: lp:~pniederlag/openobject-addons/fix_hr_timesheet_invoice_5.0
Merge into: lp:openobject-addons/5.0
Diff against target: 22 lines (+3/-2)
1 file modified
hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py (+3/-2)
To merge this branch: bzr merge lp:~pniederlag/openobject-addons/fix_hr_timesheet_invoice_5.0
Reviewer Review Type Date Requested Status
Jay Vora (Serpent Consulting Services) (community) Approve
Review via email: mp+27530@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jay Vora (Serpent Consulting Services) (jayvora) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py'
2--- hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py 2010-02-22 12:30:34 +0000
3+++ hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py 2010-06-14 16:17:25 +0000
4@@ -148,7 +148,8 @@
5 " WHERE account_id=%s"
6 " AND id IN %s"
7 " AND product_id=%s"
8- " AND to_invoice=%s",
9+ " AND to_invoice=%s"
10+ " ORDER BY account_analytic_line.date",
11 (account.id, tuple(data['ids']), product_id, factor_id))
12 line_ids = cr.dictfetchall()
13 note = []
14@@ -159,7 +160,7 @@
15 details.append(line['date'])
16 if data['form']['time']:
17 if line['product_uom_id']:
18- details.append("%s %s" % (line['unit_amount'], pool.get('product.uom').browse(cr, uid, [line['product_uom_id']])[0].name))
19+ details.append("%s %s" % (line['unit_amount'], pool.get('product.uom').browse(cr, uid, [line['product_uom_id']],context2)[0].name))
20 else:
21 details.append("%s" % (line['unit_amount'], ))
22 if data['form']['name']: