diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index 0b2a01e76a8..571f378b755 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -171,6 +171,7 @@
+
@@ -207,9 +208,12 @@
+
+
+
|
diff --git a/addons/project_timesheet/project_timesheet.py b/addons/project_timesheet/project_timesheet.py
index 30914410a82..be736c58986 100644
--- a/addons/project_timesheet/project_timesheet.py
+++ b/addons/project_timesheet/project_timesheet.py
@@ -43,6 +43,42 @@ class project_project(osv.osv):
res['value'].update({'to_invoice': factor_id})
return res
+ def open_timesheets(self, cr, uid, ids, context=None):
+ #Open the View for the Timesheet of the project
+ """
+ This opens Timesheets views
+ @return :Dictionary value for timesheet view
+ """
+ if context is None:
+ context = {}
+ value = {}
+ data_obj = self.pool.get('ir.model.data')
+ for project in self.browse(cr, uid, ids, context=context):
+ # Get Timesheet views
+ tree_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_tree_inherit_account_id')
+ form_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_form_inherit_account_id')
+ search_view = data_obj.get_object_reference(cr, uid, 'project_timesheet', 'view_account_analytic_line_search_account_inherit')
+ context.update({
+ #'search_default_user_id': uid,
+ 'search_default_project_id':project.id,
+ #'search_default_open':1,
+ })
+ value = {
+ 'name': _('Bill Tasks Works'),
+ 'context': context,
+ 'view_type': 'form',
+ 'view_mode': 'form,tree',
+ 'res_model': 'account.analytic.line',
+ 'view_id': False,
+ # 'domain':[('project_id','=', context.get('active_id',False))],
+ 'context': context,
+ 'views': [(tree_view and tree_view[1] or False, 'tree'),(form_view and form_view[1] or False, 'form')],
+ 'type': 'ir.actions.act_window',
+ 'search_view_id': search_view and search_view[1] or False,
+ 'nodestroy': True
+ }
+ return value
+
project_project()
class project_work(osv.osv):
diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index c7d2ea2d4fc..af5a9a45a3b 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -23,6 +23,23 @@
+
+ project.project.kanban.inherited
+ project.project
+ kanban
+
+
+
+
+
+
+
+
+
+
+
+
+
Inherit project form : Customer
project.project
diff --git a/addons/project_timesheet/static/src/img/timesheet.png b/addons/project_timesheet/static/src/img/timesheet.png
new file mode 100644
index 00000000000..2adc25dc45b
Binary files /dev/null and b/addons/project_timesheet/static/src/img/timesheet.png differ