diff --git a/addons/project/project.py b/addons/project/project.py index 21e0c8f6011..e03f80b54b2 100644 --- a/addons/project/project.py +++ b/addons/project/project.py @@ -250,7 +250,8 @@ class project(osv.osv): 'active': True, 'priority': 1, 'sequence': 10, - 'type_ids': _get_type_common + 'type_ids': _get_type_common, + 'task' : True, } # TODO: Why not using a SQL contraints ? diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index f4237945866..44c902ff20c 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -171,6 +171,7 @@ + @@ -192,12 +193,15 @@

-
-
- hrs - - hrs -
+ + + + +
+ + + +
@@ -206,10 +210,13 @@ -
- - - + +
+
+ hrs + + hrs +
diff --git a/addons/project/static/src/css/project.css b/addons/project/static/src/css/project.css index e8ec4195add..3d8ef752a18 100644 --- a/addons/project/static/src/css/project.css +++ b/addons/project/static/src/css/project.css @@ -38,7 +38,8 @@ font-size: 9px; background-color: transparent; border: hidden; color: #0000FF; - + min-height: 50px; + min-width: 50px;* } .oe_project_buttons:hover { diff --git a/addons/project/static/src/img/bug.png b/addons/project/static/src/img/bug.png deleted file mode 100644 index a18278ff5c4..00000000000 Binary files a/addons/project/static/src/img/bug.png and /dev/null differ diff --git a/addons/project/static/src/img/tasks.png b/addons/project/static/src/img/tasks.png deleted file mode 100644 index 5c5073b1633..00000000000 Binary files a/addons/project/static/src/img/tasks.png and /dev/null differ diff --git a/addons/project_issue/project_issue_menu.xml b/addons/project_issue/project_issue_menu.xml index 5023891f6ba..82bc44b9d16 100644 --- a/addons/project_issue/project_issue_menu.xml +++ b/addons/project_issue/project_issue_menu.xml @@ -53,7 +53,7 @@ view_mode="tree,form,calendar,graph" view_type="form"/> - diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index a1b3bf19782..8e9cd432ff2 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -391,7 +391,7 @@
- +
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml index 12245814240..810389da11e 100644 --- a/addons/project_long_term/project_long_term_view.xml +++ b/addons/project_long_term/project_long_term_view.xml @@ -121,8 +121,8 @@
- - + +
diff --git a/addons/project_long_term/static/src/img/phases_icon.jpg b/addons/project_long_term/static/src/img/phases_icon.jpg new file mode 100644 index 00000000000..df58a827b11 Binary files /dev/null and b/addons/project_long_term/static/src/img/phases_icon.jpg differ 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..b9e8816802f 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