[REM] Removed a THIS file that had nothing to do here; removed temporary data for...

bzr revid: tde@openerp.com-20120711080802-2eakl0qztyxowa9x

diff --git a/addons/crm/wizard/mail_compose_message.py.THIS b/addons/crm/wizard/mail_compose_message.py.THIS
deleted file mode 100644 (file)
index 11d340b..0000000
--- a/addons/crm/wizard/mail_compose_message.py.THIS
+++ /dev/null
@@ -1,63 +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
-import tools
-
-SUPPORTED_MODELS = ['crm.lead',]
-
-class mail_compose_message(osv.osv_memory):
-    _inherit = 'mail.compose.message'
-
-    def get_value(self, cr, uid, model, res_id, context=None):
-        """Returns a defaults-like dict with initial values for the composition
-           wizard when sending an email related to the document record identified
-           by ``model`` and ``res_id``.
-
-           Overrides the default implementation to provide more default field values
-           related to the corresponding CRM case.
-
-           :param str model: model name of the document record this mail is related to.
-           :param int res_id: id of the document record this mail is related to.
-           :param dict context: several context values will modify the behavior
-                                of the wizard, cfr. the class description.
-        """
-        result = super(mail_compose_message, self).get_value(cr, uid,  model, res_id, context=context)
-        if model in SUPPORTED_MODELS and res_id:
-            model_obj = self.pool.get(model)
-            data = model_obj.browse(cr, uid , res_id, context)
-            user = self.pool.get('res.users').browse(cr, uid, uid, context=context)
-            result.update({
-                    'subject' : data.name or False,
-                    'email_to' : data.email_from or False,
-                    'email_from' : user.user_email or tools.config.get('email_from', False),
-                    'body_text' : '\n' + tools.ustr(user.signature or ''),
-                    'email_cc' : tools.ustr(data.email_cc or ''),
-                    'model': model,
-                    'res_id': res_id,
-                    'content_subtype': 'plain',
-                })
-            if hasattr(data, 'section_id'):
-                result.update({'reply_to' : data.section_id and data.section_id.reply_to or False})
-        return result
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --git a/addons/hr_recruitment/hr_recruitment_data.xml b/addons/hr_recruitment/hr_recruitment_data.xml
index 0b73d1a..6b64964 100644 (file)
--- a/addons/hr_recruitment/hr_recruitment_data.xml
+++ b/addons/hr_recruitment/hr_recruitment_data.xml
@@ -1,31 +1,6 @@
 <?xml version="1.0"?>
 <openerp>
-<!--
 <data noupdate="1">
--->
-<data>
-
-        <record id="outgoing_test" model="ir.mail_server">
-            <field name="smtp_host">smtp.openerp.com</field>
-            <field name="name">smtp.openerp.com</field>
-            <field name="smtp_encryption">starttls</field>
-            <field name="smtp_port">2525</field>
-            <field name="smtp_user">tde</field>
-            <field name="sequence">9</field>
-        </record>
-
-
-        <record id="fetchmail_hr_applicant_test" model="fetchmail.server">
-            <field name="object_id" ref="hr_recruitment.model_hr_applicant"/>
-            <field name="attach" eval="True"/>
-            <field name="original" eval="False"/>
-            <field name="server">imap.openerp.com</field>
-            <field name="name">imap.openerp.com</field>
-            <field name="user">tde</field>
-            <field name="is_ssl">True</field>
-            <field name="port">993</field>
-            <field name="type">imap</field>
-        </record>
 
     <!-- Meeting Types (for interview meetings) -->
     <record model="crm.meeting.type" id="categ_meet_interview">