Project for Service Management

Merge lp:~dreis-pt/project-service/7.0-bug1183497-dr into lp:~project-core-editors/project-service/trunk

  1. 7.0-bug1183497-dr
  2. Merge into trunk
Proposed by Daniel Reis
Status: Merged
Merged at revision: 27
Proposed branch: lp:~dreis-pt/project-service/7.0-bug1183497-dr
Merge into: lp:~project-core-editors/project-service/trunk
Diff against target: 195 lines (+0/-169)
5 files modified
project_issue_department/__init__.py (+0/-3)
project_issue_department/__openerp__.py (+0/-37)
project_issue_department/project_issue.py (+0/-45)
project_issue_department/project_issue_view.xml (+0/-81)
project_issue_department/security/ir.model.access.csv (+0/-3)
To merge this branch: bzr merge lp:~dreis-pt/project-service/7.0-bug1183497-dr
Reviewer Review Type Date Requested Status
Maxime Chambreuil (http://www.savoirfairelinux.com) Approve
Guewen Baconnier @ Camptocamp Approve
Review via email: mp+180862@code.launchpad.net

Description of the change

Please wait until https://code.launchpad.net/~dreis-pt/department-mgmt/project-issue/+merge/175079 is merged.

To post a comment you must log in.
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) wrote :

approve for the removal once the linked MP is merged into project-issue, thanks

review: Approve
Revision history for this message
Maxime Chambreuil (http://www.savoirfairelinux.com) (max3903) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== removed directory 'project_issue_department'
=== removed file 'project_issue_department/__init__.py'
--- project_issue_department/__init__.py 2012-11-22 13:17:40 +0000
+++ project_issue_department/__init__.py 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1# -*- coding: utf-8 -*-
2import project_issue
3# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
40
=== removed file 'project_issue_department/__openerp__.py'
--- project_issue_department/__openerp__.py 2013-03-04 16:16:31 +0000
+++ project_issue_department/__openerp__.py 1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
1# -*- coding: utf-8 -*-
2##############################################################################
3#
4# Copyright (C) 2012 Daniel Reis
5#
6# This program is free software: you can redistribute it and/or modify
7# it under the terms of the GNU Affero General Public License as
8# published by the Free Software Foundation, either version 3 of the
9# License, or (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU Affero General Public License for more details.
15#
16# You should have received a copy of the GNU Affero General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19##############################################################################
20{
21 'name': 'Project Issue with Department',
22 'version': '1',
23 "category": "Project Management",
24 'description': """\
25Add Department field to Project Issues.
26""",
27 'author': 'Daniel Reis',
28 'website': 'daniel.reis@securitas.pt',
29 'depends': ['project_issue', 'hr'],
30 'update_xml': [
31 'project_issue_view.xml',
32 'security/ir.model.access.csv',
33 ],
34 'installable': False,
35 'application': False,
36}
37# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
380
=== removed file 'project_issue_department/project_issue.py'
--- project_issue_department/project_issue.py 2012-11-22 13:17:40 +0000
+++ project_issue_department/project_issue.py 1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
1# -*- coding: utf-8 -*-
2##############################################################################
3#
4# Copyright (C) 2012 Daniel Reis
5#
6# This program is free software: you can redistribute it and/or modify
7# it under the terms of the GNU Affero General Public License as
8# published by the Free Software Foundation, either version 3 of the
9# License, or (at your option) any later version.
10#
11# This program is distributed in the hope that it will be useful,
12# but WITHOUT ANY WARRANTY; without even the implied warranty of
13# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14# GNU Affero General Public License for more details.
15#
16# You should have received a copy of the GNU Affero General Public License
17# along with this program. If not, see <http://www.gnu.org/licenses/>.
18#
19##############################################################################
20
21from osv import fields, osv
22
23
24class project_issue(osv.osv):
25 _inherit = 'project.issue'
26 _columns = {
27 'department_id': fields.many2one('hr.department', 'Department'),
28 }
29
30 def on_change_project(self, cr, uid, ids, proj_id=False, context=None):
31 """When Project is changed: copy it's Department to the issue."""
32 res = super(project_issue, self).on_change_project(cr, uid, ids, proj_id, context = context)
33 data = res.get('value', {})
34 if proj_id:
35 proj_obj = self.pool.get('project.project').browse(cr, uid, proj_id, context)
36 if proj_obj.department_id:
37 data.update( {'department_id': proj_obj.department_id.id} )
38 return {'value': data}
39
40project_issue()
41
42
43# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
44
45
460
=== removed file 'project_issue_department/project_issue_view.xml'
--- project_issue_department/project_issue_view.xml 2012-11-22 13:17:40 +0000
+++ project_issue_department/project_issue_view.xml 1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
1<?xml version="1.0" encoding="utf-8"?>
2<openerp>
3 <data>
4
5 <!--PROJECT ISSUE FORM -->
6 <record id="project_issue_department_form_view" model="ir.ui.view">
7 <field name="name">project_issue_department_form_view</field>
8 <field name="model">project.issue</field>
9 <field name="inherit_id" ref="project_issue.project_issue_form_view"/>
10 <field name="arch" type="xml">
11 <field name="project_id" position="after">
12 <field name="department_id" required="True"/>
13 </field>
14 </field>
15 </record>
16
17 <!--PROJECT ISSUE SEARCH -->
18 <record id="view_project_issue_filter_dreis" model="ir.ui.view">
19 <field name="name">Project Issue Tracker Search</field>
20 <field name="model">project.issue</field>
21 <field name="inherit_id" ref="project_issue.view_project_issue_filter"/>
22 <field name="arch" type="xml">
23 <field name="user_id" position="after">
24 <field name="department_id" widget="selection" operator="child_of"/>
25 </field>
26 <!-- GROUP BY -->
27 <filter string="Partner" position="after">
28 <filter string="Department" icon="terp-partner" domain="[]" context="{'group_by':'department_id'}"/>
29 </filter>
30 </field>
31 </record>
32
33 <!--PROJECT ISSUE TREE -->
34 <record model="ir.ui.view" id="project_issue_tree_view_reis">
35 <field name="name">Project Issue Tracker Tree</field>
36 <field name="model">project.issue</field>
37 <field name="inherit_id" ref="project_issue.project_issue_tree_view"/>
38 <field name="arch" type="xml">
39 <data>
40 <field name="user_id" position="after">
41 <field name="department_id" groups="base.group_extended"/>
42 </field>
43 </data>
44 </field>
45 </record>
46
47 <!-- PROJECT ISSUE MENU ACTION: [-]no default pressed buttons and user; [+] default department -->
48 <record model="ir.actions.act_window" id="project_issue.project_issue_categ_act0">
49 <field name="name">Issues</field>
50 <field name="res_model">project.issue</field>
51 <field name="view_type">form</field>
52 <field name="view_mode">kanban,tree,calendar</field>
53 <field name="view_id" eval="False"/>
54 <field name="domain" eval=""/>
55 <field name="context">{"search_default_project_id":project_id, "search_default_department_id":department_id}</field>
56 <field name="search_view_id" ref="project_issue.view_project_issue_filter"/>
57 <field name="help">Issues such as system bugs, customer complaints, and material breakdowns are collected here. You can define the stages assigned when solving the project issue (analysis, development, done). With the mailgateway module, issues can be integrated through an email address (example: support@mycompany.com)</field>
58 </record>
59
60 </data>
61</openerp>
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
820
=== removed directory 'project_issue_department/security'
=== removed file 'project_issue_department/security/ir.model.access.csv'
--- project_issue_department/security/ir.model.access.csv 2012-11-22 13:22:12 +0000
+++ project_issue_department/security/ir.model.access.csv 1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
1"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
2"access_hr_department_project_manager","hr_department_project_manager","hr.model_hr_department","project.group_project_manager",1,0,0,0
3"access_hr_department_project_user","hr_department_project_user","hr.model_hr_department","project.group_project_user",1,0,0,0

Subscribers

People subscribed via source and target branches