From bde7606b5b531526bde11e0124975f1836aec0b0 Mon Sep 17 00:00:00 2001 From: "Quentin (OpenERP)" Date: Fri, 15 Jun 2012 14:59:18 +0200 Subject: [REM] project: removal of warn_manager and warn_customer features that are now handled by the chatter bzr revid: qdp-launchpad@openerp.com-20120615125918-zaiickzw4yuudqkj --- addons/project/wizard/__init__.py | 1 - addons/project/wizard/mail_compose_message.py | 72 --------------------------- 2 files changed, 73 deletions(-) delete mode 100644 addons/project/wizard/mail_compose_message.py (limited to 'addons/project/wizard') diff --git a/addons/project/wizard/__init__.py b/addons/project/wizard/__init__.py index f5324d2b6aa..7a9a734b2bd 100644 --- a/addons/project/wizard/__init__.py +++ b/addons/project/wizard/__init__.py @@ -19,7 +19,6 @@ # ############################################################################## -import mail_compose_message import project_task_delegate import project_task_reevaluate diff --git a/addons/project/wizard/mail_compose_message.py b/addons/project/wizard/mail_compose_message.py deleted file mode 100644 index 1609cc04c1c..00000000000 --- a/addons/project/wizard/mail_compose_message.py +++ /dev/null @@ -1,72 +0,0 @@ -# -*- coding: utf-8 -*- -############################################################################## -# -# OpenERP, Open Source Management Solution -# Copyright (C) 2010-Today OpenERP SA () -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# -############################################################################## - -from osv import osv -from osv import fields -from tools.translate import _ - -class mail_compose_message(osv.osv_memory): - _inherit = 'mail.compose.message' - - def get_value(self, cr, uid, model, resource_id, context=None): - ''' - To get values of the resource_id for the model - @param model: Object - @param resource_id: id of a record for which values to be read - - @return: Returns a dictionary - ''' - result = super(mail_compose_message, self).get_value(cr, uid, model, resource_id, context=context) - if model == 'project.task' and resource_id: - task_pool = self.pool.get('project.task') - task_data = task_pool.browse(cr, uid, resource_id, context=context) - partner = task_data.partner_id or task_data.project_id.partner_id - if task_data.project_id.warn_manager and (not task_data.project_id.user_id or task_data.project_id.user_id and not task_data.project_id.user_id.user_email) : - raise osv.except_osv(_('Error'), _("Please specify the Project Manager or email address of Project Manager.")) - elif task_data.project_id.warn_customer and (not partner or (partner and not partner.email)): - raise osv.except_osv(_('Error'), _("Please specify the Customer or email address of Customer.")) - - result.update({'email_from': task_data.user_id and task_data.user_id.user_email or False}) - val = { - 'name': task_data.name, - 'user_id': task_data.user_id.name, - 'task_id': "%d/%d" % (task_data.project_id.id, task_data.id), - 'date_start': task_data.date_start, - 'date': task_data.date_end, - 'state': task_data.state - } - header = (task_data.project_id.warn_header or '') % val - footer = (task_data.project_id.warn_footer or '') % val - description = u'%s\n %s\n %s\n\n \n%s' % (header, task_data.description or '', footer, task_data.user_id and task_data.user_id.signature) - if partner : - result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + partner.email}) - result.update({ - 'body_text': description or False, - 'email_to': task_data.project_id.user_id and task_data.project_id.user_id.user_email or False, - 'subject': _("Task '%s' Closed") % task_data.name, - 'model': model, - 'res_id': resource_id, - }) - - return result - - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -- cgit v1.2.3 From 4311eaa121ac053f145ec41298717a6651d6631f Mon Sep 17 00:00:00 2001 From: "ajay javiya (OpenERP)" Date: Mon, 18 Jun 2012 14:42:36 +0530 Subject: [REM] : Remove cancel button from wizard bzr revid: aja@tinyerp.com-20120618091236-3e8vhdb4thokf72i --- addons/project/wizard/project_task_delegate_view.xml | 3 +-- addons/project/wizard/project_task_reevaluate_view.xml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'addons/project/wizard') diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml index 9ed920eb534..79b13c9e258 100644 --- a/addons/project/wizard/project_task_delegate_view.xml +++ b/addons/project/wizard/project_task_delegate_view.xml @@ -9,8 +9,7 @@
-
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml index 4a452bca3ab..80e2847b508 100644 --- a/addons/project/wizard/project_task_reevaluate_view.xml +++ b/addons/project/wizard/project_task_reevaluate_view.xml @@ -9,8 +9,7 @@
-
-- cgit v1.2.3 From 660cc67256df5caeffd208c3c1a5efabcb637a05 Mon Sep 17 00:00:00 2001 From: "Twinkle (OpenERP)" Date: Wed, 20 Jun 2012 16:19:23 +0530 Subject: [IMP]Added highlight button on wizard bzr revid: tch@tinyerp.com-20120620104923-z1hty740vn160fg9 --- addons/project/wizard/project_task_delegate_view.xml | 2 +- addons/project/wizard/project_task_reevaluate_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/project/wizard') diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml index 79b13c9e258..67500a0b7ed 100644 --- a/addons/project/wizard/project_task_delegate_view.xml +++ b/addons/project/wizard/project_task_delegate_view.xml @@ -9,7 +9,7 @@
-
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml index 80e2847b508..9504296e941 100644 --- a/addons/project/wizard/project_task_reevaluate_view.xml +++ b/addons/project/wizard/project_task_reevaluate_view.xml @@ -9,7 +9,7 @@
-
-- cgit v1.2.3 From 0e97cefe9e8247cac86a1c8342fb4f21ff8cb016 Mon Sep 17 00:00:00 2001 From: "Twinkle (OpenERP)" Date: Mon, 25 Jun 2012 15:39:01 +0530 Subject: [IMP]Improve wizard button bzr revid: tch@tinyerp.com-20120625100901-ucjbttxod55erqmf --- addons/project/wizard/project_task_delegate_view.xml | 2 +- addons/project/wizard/project_task_reevaluate_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/project/wizard') diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml index 67500a0b7ed..9a6ae405768 100644 --- a/addons/project/wizard/project_task_delegate_view.xml +++ b/addons/project/wizard/project_task_delegate_view.xml @@ -9,7 +9,7 @@
-
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml index 9504296e941..7f15a7905bd 100644 --- a/addons/project/wizard/project_task_reevaluate_view.xml +++ b/addons/project/wizard/project_task_reevaluate_view.xml @@ -9,7 +9,7 @@
-
-- cgit v1.2.3 From 471037495c7572c0b1aac2b069a67a7c0e1f56f5 Mon Sep 17 00:00:00 2001 From: "Twinkle (OpenERP)" Date: Tue, 26 Jun 2012 12:01:19 +0530 Subject: [IMP]Apply css class flow on wizards buttons bzr revid: tch@tinyerp.com-20120626063119-5i93di16milljxap --- addons/project/wizard/project_task_delegate_view.xml | 2 +- addons/project/wizard/project_task_reevaluate_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/project/wizard') diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml index 9a6ae405768..69d6b2c495e 100644 --- a/addons/project/wizard/project_task_delegate_view.xml +++ b/addons/project/wizard/project_task_delegate_view.xml @@ -9,7 +9,7 @@
-
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml index 7f15a7905bd..39e3427ff3b 100644 --- a/addons/project/wizard/project_task_reevaluate_view.xml +++ b/addons/project/wizard/project_task_reevaluate_view.xml @@ -9,7 +9,7 @@
-
-- cgit v1.2.3 From deefa50354a7a3b7d2a305dafa38a0510a35cf3f Mon Sep 17 00:00:00 2001 From: Jigar Amin - OpenERP Date: Wed, 27 Jun 2012 19:23:23 +0530 Subject: [FIX] project* buton cancel bzr revid: jam@tinyerp.com-20120627135323-r0v2agpm9rbghoao --- addons/project/wizard/project_task_delegate_view.xml | 4 +++- addons/project/wizard/project_task_reevaluate_view.xml | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'addons/project/wizard') diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml index 69d6b2c495e..0eb37be406d 100644 --- a/addons/project/wizard/project_task_delegate_view.xml +++ b/addons/project/wizard/project_task_delegate_view.xml @@ -9,7 +9,9 @@
-
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml index 39e3427ff3b..de94e0079b1 100644 --- a/addons/project/wizard/project_task_reevaluate_view.xml +++ b/addons/project/wizard/project_task_reevaluate_view.xml @@ -9,7 +9,9 @@
-
-- cgit v1.2.3 From 5133bee1d529722cd690188d61d51debd2d91968 Mon Sep 17 00:00:00 2001 From: Raphael Collet Date: Fri, 29 Jun 2012 10:30:24 +0200 Subject: [FIX] in form views, replace class 'oe_highlight_on_dirty' by 'oe_highlight' bzr revid: rco@openerp.com-20120629083024-rqhtbf9melkygg0m --- addons/project/wizard/project_task_delegate_view.xml | 2 +- addons/project/wizard/project_task_reevaluate_view.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'addons/project/wizard') diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml index 0eb37be406d..7dd1cdb9465 100644 --- a/addons/project/wizard/project_task_delegate_view.xml +++ b/addons/project/wizard/project_task_delegate_view.xml @@ -9,7 +9,7 @@
-
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml index de94e0079b1..066f15582b4 100644 --- a/addons/project/wizard/project_task_reevaluate_view.xml +++ b/addons/project/wizard/project_task_reevaluate_view.xml @@ -9,7 +9,7 @@
-
-- cgit v1.2.3