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
1=== removed directory 'project_issue_department'
2=== removed file 'project_issue_department/__init__.py'
3--- project_issue_department/__init__.py 2012-11-22 13:17:40 +0000
4+++ project_issue_department/__init__.py 1970-01-01 00:00:00 +0000
5@@ -1,3 +0,0 @@
6-# -*- coding: utf-8 -*-
7-import project_issue
8-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
9
10=== removed file 'project_issue_department/__openerp__.py'
11--- project_issue_department/__openerp__.py 2013-03-04 16:16:31 +0000
12+++ project_issue_department/__openerp__.py 1970-01-01 00:00:00 +0000
13@@ -1,37 +0,0 @@
14-# -*- coding: utf-8 -*-
15-##############################################################################
16-#
17-# Copyright (C) 2012 Daniel Reis
18-#
19-# This program is free software: you can redistribute it and/or modify
20-# it under the terms of the GNU Affero General Public License as
21-# published by the Free Software Foundation, either version 3 of the
22-# License, or (at your option) any later version.
23-#
24-# This program is distributed in the hope that it will be useful,
25-# but WITHOUT ANY WARRANTY; without even the implied warranty of
26-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27-# GNU Affero General Public License for more details.
28-#
29-# You should have received a copy of the GNU Affero General Public License
30-# along with this program. If not, see <http://www.gnu.org/licenses/>.
31-#
32-##############################################################################
33-{
34- 'name': 'Project Issue with Department',
35- 'version': '1',
36- "category": "Project Management",
37- 'description': """\
38-Add Department field to Project Issues.
39-""",
40- 'author': 'Daniel Reis',
41- 'website': 'daniel.reis@securitas.pt',
42- 'depends': ['project_issue', 'hr'],
43- 'update_xml': [
44- 'project_issue_view.xml',
45- 'security/ir.model.access.csv',
46- ],
47- 'installable': False,
48- 'application': False,
49-}
50-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
51
52=== removed file 'project_issue_department/project_issue.py'
53--- project_issue_department/project_issue.py 2012-11-22 13:17:40 +0000
54+++ project_issue_department/project_issue.py 1970-01-01 00:00:00 +0000
55@@ -1,45 +0,0 @@
56-# -*- coding: utf-8 -*-
57-##############################################################################
58-#
59-# Copyright (C) 2012 Daniel Reis
60-#
61-# This program is free software: you can redistribute it and/or modify
62-# it under the terms of the GNU Affero General Public License as
63-# published by the Free Software Foundation, either version 3 of the
64-# License, or (at your option) any later version.
65-#
66-# This program is distributed in the hope that it will be useful,
67-# but WITHOUT ANY WARRANTY; without even the implied warranty of
68-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
69-# GNU Affero General Public License for more details.
70-#
71-# You should have received a copy of the GNU Affero General Public License
72-# along with this program. If not, see <http://www.gnu.org/licenses/>.
73-#
74-##############################################################################
75-
76-from osv import fields, osv
77-
78-
79-class project_issue(osv.osv):
80- _inherit = 'project.issue'
81- _columns = {
82- 'department_id': fields.many2one('hr.department', 'Department'),
83- }
84-
85- def on_change_project(self, cr, uid, ids, proj_id=False, context=None):
86- """When Project is changed: copy it's Department to the issue."""
87- res = super(project_issue, self).on_change_project(cr, uid, ids, proj_id, context = context)
88- data = res.get('value', {})
89- if proj_id:
90- proj_obj = self.pool.get('project.project').browse(cr, uid, proj_id, context)
91- if proj_obj.department_id:
92- data.update( {'department_id': proj_obj.department_id.id} )
93- return {'value': data}
94-
95-project_issue()
96-
97-
98-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
99-
100-
101
102=== removed file 'project_issue_department/project_issue_view.xml'
103--- project_issue_department/project_issue_view.xml 2012-11-22 13:17:40 +0000
104+++ project_issue_department/project_issue_view.xml 1970-01-01 00:00:00 +0000
105@@ -1,81 +0,0 @@
106-<?xml version="1.0" encoding="utf-8"?>
107-<openerp>
108- <data>
109-
110- <!--PROJECT ISSUE FORM -->
111- <record id="project_issue_department_form_view" model="ir.ui.view">
112- <field name="name">project_issue_department_form_view</field>
113- <field name="model">project.issue</field>
114- <field name="inherit_id" ref="project_issue.project_issue_form_view"/>
115- <field name="arch" type="xml">
116- <field name="project_id" position="after">
117- <field name="department_id" required="True"/>
118- </field>
119- </field>
120- </record>
121-
122- <!--PROJECT ISSUE SEARCH -->
123- <record id="view_project_issue_filter_dreis" model="ir.ui.view">
124- <field name="name">Project Issue Tracker Search</field>
125- <field name="model">project.issue</field>
126- <field name="inherit_id" ref="project_issue.view_project_issue_filter"/>
127- <field name="arch" type="xml">
128- <field name="user_id" position="after">
129- <field name="department_id" widget="selection" operator="child_of"/>
130- </field>
131- <!-- GROUP BY -->
132- <filter string="Partner" position="after">
133- <filter string="Department" icon="terp-partner" domain="[]" context="{'group_by':'department_id'}"/>
134- </filter>
135- </field>
136- </record>
137-
138- <!--PROJECT ISSUE TREE -->
139- <record model="ir.ui.view" id="project_issue_tree_view_reis">
140- <field name="name">Project Issue Tracker Tree</field>
141- <field name="model">project.issue</field>
142- <field name="inherit_id" ref="project_issue.project_issue_tree_view"/>
143- <field name="arch" type="xml">
144- <data>
145- <field name="user_id" position="after">
146- <field name="department_id" groups="base.group_extended"/>
147- </field>
148- </data>
149- </field>
150- </record>
151-
152- <!-- PROJECT ISSUE MENU ACTION: [-]no default pressed buttons and user; [+] default department -->
153- <record model="ir.actions.act_window" id="project_issue.project_issue_categ_act0">
154- <field name="name">Issues</field>
155- <field name="res_model">project.issue</field>
156- <field name="view_type">form</field>
157- <field name="view_mode">kanban,tree,calendar</field>
158- <field name="view_id" eval="False"/>
159- <field name="domain" eval=""/>
160- <field name="context">{"search_default_project_id":project_id, "search_default_department_id":department_id}</field>
161- <field name="search_view_id" ref="project_issue.view_project_issue_filter"/>
162- <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>
163- </record>
164-
165- </data>
166-</openerp>
167-
168-
169-
170-
171-
172-
173-
174-
175-
176-
177-
178-
179-
180-
181-
182-
183-
184-
185-
186-
187
188=== removed directory 'project_issue_department/security'
189=== removed file 'project_issue_department/security/ir.model.access.csv'
190--- project_issue_department/security/ir.model.access.csv 2012-11-22 13:22:12 +0000
191+++ project_issue_department/security/ir.model.access.csv 1970-01-01 00:00:00 +0000
192@@ -1,3 +0,0 @@
193-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
194-"access_hr_department_project_manager","hr_department_project_manager","hr.model_hr_department","project.group_project_manager",1,0,0,0
195-"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