diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py index 3efa8accb7e..1f6d8addc97 100644 --- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py +++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create.py @@ -158,7 +158,8 @@ class invoice_create(wizard.interface): pool.get('account.invoice.line').create(cr, uid, curr_line) strids = ','.join(map(str, data['ids'])) cr.execute("update account_analytic_line set invoice_id=%%s WHERE account_id = %%s and id IN (%s)" % strids, (last_invoice,account.id,)) - + pool.get('account.invoice').button_reset_taxes(cr, uid, [last_invoice], context) + return { 'domain': "[('id','in', ["+','.join(map(str,invoices))+"])]", 'name': _('Invoices'), diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index 22895032c34..c2f8d94eaac 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -712,7 +712,7 @@ - + diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py index 7d91c654f1e..0c08639ccad 100644 --- a/addons/project_timesheet/project_timesheet.py +++ b/addons/project_timesheet/project_timesheet.py @@ -78,7 +78,7 @@ class project_work(osv.osv): if line_id: obj = self.pool.get('hr.analytic.timesheet') if 'name' in vals: - vals_line['name'] = '%s: %s' % (task.name, vals['name'] or '/') + vals_line['name'] = '%s: %s' % (tools.ustr(task.name), tools.ustr(vals['name']) or '/') if 'user_id' in vals: vals_line['user_id'] = vals['user_id'] if 'date' in vals: