From 46d143e483f2177dc37784f3411787c109b3c230 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Fri, 18 Feb 2011 17:23:30 +0530 Subject: [PATCH 01/27] [FIX]hr_timesheet:Different names for the same object : Timesheet Lines vs Working hour lp bug: https://launchpad.net/bugs/720627 fixed bzr revid: ara@tinyerp.com-20110218115330-7v6nw6yf8ez2996o --- addons/hr_timesheet/hr_timesheet_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 131148f373a..21aa716cd39 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -84,7 +84,7 @@ - Working Hours + Timesheet Lines ir.actions.act_window hr.analytic.timesheet form From d81f6de6f97e3f783af7eaf4a064df3705a01d44 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Fri, 18 Feb 2011 17:44:35 +0530 Subject: [PATCH 02/27] [FIX]hr_timesheet:HR - Format of the quantity field is not the same for timesheet lines of My current Timesheet and for working hours lp bug: https://launchpad.net/bugs/720623 fixed bzr revid: ara@tinyerp.com-20110218121435-edyh72deqzxebidx --- addons/hr_timesheet/hr_timesheet_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml index 131148f373a..bc406b221a4 100644 --- a/addons/hr_timesheet/hr_timesheet_view.xml +++ b/addons/hr_timesheet/hr_timesheet_view.xml @@ -14,7 +14,7 @@ - + @@ -38,7 +38,7 @@ - + From b36b8ba642e935e5b66d3b0d561591b16468d957 Mon Sep 17 00:00:00 2001 From: "ARA (OpenERP)" Date: Fri, 18 Feb 2011 18:57:42 +0530 Subject: [PATCH 03/27] [FIX] HR_expense:HR - Invoicing an expense doesn't open the invoice form lp bug: https://launchpad.net/bugs/720629 fixed bzr revid: ara@tinyerp.com-20110218132742-fyambo8pxr3fs1n1 --- addons/hr_expense/hr_expense.py | 19 +++++++++++++++++++ addons/hr_expense/hr_expense_view.xml | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/addons/hr_expense/hr_expense.py b/addons/hr_expense/hr_expense.py index 40e0091d05e..6e19d953b95 100644 --- a/addons/hr_expense/hr_expense.py +++ b/addons/hr_expense/hr_expense.py @@ -124,6 +124,25 @@ class hr_expense_expense(osv.osv): self.write(cr, uid, ids, {'state':'paid'}) return True + def invoice(self, cr, uid, ids, context=None): + mod_obj = self.pool.get('ir.model.data') + inv_id = self.action_invoice_create(cr, uid, ids) + res = mod_obj.get_object_reference(cr, uid, 'account', 'invoice_form') + res_id = res and res[1] or False, + + return { + 'name': 'Supplier Invoices', + 'view_type': 'form', + 'view_mode': 'form', + 'view_id': [res_id], + 'res_model': 'account.invoice', + 'context': "{'type':'out_invoice', 'journal_type': 'purchase'}", + 'type': 'ir.actions.act_window', + 'nodestroy': True, + 'target': 'current', + 'res_id': inv_id, + } + def action_invoice_create(self, cr, uid, ids): res = False invoice_obj = self.pool.get('account.invoice') diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml index aa98cc43c32..5aa2fe5c38e 100644 --- a/addons/hr_expense/hr_expense_view.xml +++ b/addons/hr_expense/hr_expense_view.xml @@ -104,7 +104,7 @@