[MERGE] trunk

bzr revid: abo@openerp.com-20121002102915-424prxd74izb1szw

4 files changed, 31 insertions, 106 deletions

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 82d67ea9b92..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 (<http://www.openerp.com>)
-#
-#    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 <http://www.gnu.org/licenses/>
-#
-##############################################################################
-
-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 not len(partner.address) or (partner and len(partner.address) and not partner.address[0].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 and len(partner.address):
-                result.update({'email_to': result.get('email_to',False) and result.get('email_to') + ',' + partner.address[0].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:
diff --git a/addons/project/wizard/project_task_delegate_view.xml b/addons/project/wizard/project_task_delegate_view.xml
index 2b8ad646a8c..700740d12f3 100644
--- a/addons/project/wizard/project_task_delegate_view.xml
+++ b/addons/project/wizard/project_task_delegate_view.xml
@@ -5,31 +5,30 @@
         <record id="view_project_task_delegate" model="ir.ui.view">
             <field name="name">Project Task Delegate</field>
             <field name="model">project.task.delegate</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Project Task Delegate">
-                    <field name="project_id" on_change="onchange_project_id(project_id)"/>
-                    <field name="user_id"/>
-                    <group colspan="2" col="2">
-                        <separator string="Delegated Task" colspan="2"/>
-                        <field name="name"/>
-                        <field name="planned_hours"/>
-                        <separator string="New Task Description" colspan="2"/>
-                        <field name="new_task_description" colspan="2" nolabel="1"/>
-                    </group>
-                    <group colspan="2" col="2">
-                        <separator string="Validation Task" colspan="2"/>
-                        <field name="prefix" string="Validation Task Title"/>
-                        <field name="planned_hours_me"/>
-                        <field name="state"/>
-                    </group>
-                    <separator string="" colspan="4"/>
-                    <group colspan="2" col="2">
-                    </group>
-                    <group colspan="2" col="2">
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                        <button icon="gtk-ok" name="delegate" string="_Delegate" type="object"/>
+                <form string="Project Task Delegate" version="7.0">
+                    <group>
+                        <group>
+                            <field name="project_id" on_change="onchange_project_id(project_id)"/>
+                            <separator string="Delegated Task" colspan="2"/>
+                            <field name="name"/>
+                            <field name="planned_hours"/>
+                            <separator string="New Task Description" colspan="2"/>
+                            <field name="new_task_description" colspan="2" nolabel="1"/>
+                        </group>
+                        <group>
+                            <field name="user_id"/>
+                            <separator string="Validation Task" colspan="2"/>
+                            <field name="prefix" string="Validation Task Title"/>
+                            <field name="planned_hours_me"/>
+                            <field name="state"/>
+                        </group>
                     </group>
+                    <footer>
+                        <button name="delegate" string="_Delegate" type="object" class="oe_highlight"/>
+                         or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>
diff --git a/addons/project/wizard/project_task_reevaluate_view.xml b/addons/project/wizard/project_task_reevaluate_view.xml
index f0158631f51..6dfe58e8cfd 100644
--- a/addons/project/wizard/project_task_reevaluate_view.xml
+++ b/addons/project/wizard/project_task_reevaluate_view.xml
@@ -5,18 +5,17 @@
     <record id="view_project_task_reevaluate" model="ir.ui.view">
             <field name="name">Re-evaluate Task</field>
             <field name="model">project.task.reevaluate</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Reevaluate Task">
-                    <separator colspan="4" string="Reevaluation Task"/>
-                    <field name="remaining_hours" widget="float_time"/>
-                    <separator string="" colspan="4"/>
-                    <group col="2" colspan="2">
-                    </group>
-                    <group col="2" colspan="2">
-                        <button icon="gtk-cancel" special="cancel" string="_Cancel"/>
-                        <button icon="gtk-apply" name="compute_hours" string="_Evaluate" type="object" default_focus="1"/>
+                <form string="Reevaluate Task" version="7.0">
+                    <separator string="Reevaluation Task"/>
+                    <group>
+                        <field name="remaining_hours" widget="float_time"/>
                     </group>
+                    <footer>
+                        <button name="compute_hours" string="_Evaluate" type="object" default_focus="1" class="oe_highlight"/>
+                        or
+                        <button string="Cancel" class="oe_link" special="cancel" />
+                    </footer>
                 </form>
             </field>
         </record>