[IMP] replace mailgate_message to email_message in crm, fetchamil and project_issue module.

bzr revid: ysa@tinyerp.com-20110207053304-yak3ruc2os2lah7t

8 files changed, 45 insertions, 43 deletions

diff --git a/addons/crm/report/crm_lead_report.py b/addons/crm/report/crm_lead_report.py
index 4d96fee642e..4fd69c72287 100644
--- a/addons/crm/report/crm_lead_report.py
+++ b/addons/crm/report/crm_lead_report.py
@@ -107,9 +107,9 @@ class crm_lead_report(osv.osv):
                     c.partner_id,
                     c.country_id,
                     c.planned_revenue,
-                    c.planned_revenue*(c.probability/100) as probable_revenue, 
+                    c.planned_revenue*(c.probability/100) as probable_revenue,
                     1 as nbr,
-                    (SELECT count(id) FROM mailgate_message WHERE model='crm.lead' AND res_id=c.id AND history=True) AS email,
+                    (SELECT count(id) FROM email_message WHERE model='crm.lead' AND res_id=c.id AND history=True) AS email,
                     date_trunc('day',c.create_date) as create_date,
                     extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
                     abs(extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24)) as  delay_expected,
diff --git a/addons/crm_claim/report/crm_claim_report.py b/addons/crm_claim/report/crm_claim_report.py
index aed3233976e..61be41fcbba 100644
--- a/addons/crm_claim/report/crm_claim_report.py
+++ b/addons/crm_claim/report/crm_claim_report.py
@@ -60,7 +60,7 @@ class crm_claim_report(osv.osv):
                                   ('11', 'November'), ('12', 'December')], 'Month', readonly=True),
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'create_date': fields.datetime('Create Date', readonly=True, select=True),
-        'day': fields.char('Day', size=128, readonly=True), 
+        'day': fields.char('Day', size=128, readonly=True),
         'delay_close': fields.float('Delay to close', digits=(16,2),readonly=True, group_operator="avg",help="Number of Days to close the case"),
         'stage_id': fields.many2one ('crm.case.stage', 'Stage', readonly=True, domain="[('type','=','claim')]"),
         'categ_id': fields.many2one('crm.case.categ', 'Category',\
@@ -71,8 +71,8 @@ class crm_claim_report(osv.osv):
         'company_id': fields.many2one('res.company', 'Company', readonly=True),
         'priority': fields.selection(AVAILABLE_PRIORITIES, 'Priority'),
         'type_action': fields.selection([('correction','Corrective Action'),('prevention','Preventive Action')], 'Action Type'),
-        'date_closed': fields.date('Close Date', readonly=True, select=True), 
-        'date_deadline': fields.date('Deadline', readonly=True, select=True), 
+        'date_closed': fields.date('Close Date', readonly=True, select=True),
+        'date_deadline': fields.date('Deadline', readonly=True, select=True),
         'delay_expected': fields.float('Overpassed Deadline',digits=(16,2),readonly=True, group_operator="avg"),
         'email': fields.integer('# Emails', size=128, readonly=True),
          'probability': fields.float('Probability',digits=(16,2),readonly=True, group_operator="avg")
@@ -106,7 +106,7 @@ class crm_claim_report(osv.osv):
                     c.type_action as type_action,
                     date_trunc('day',c.create_date) as create_date,
                     avg(extract('epoch' from (c.date_closed-c.create_date)))/(3600*24) as  delay_close,
-                    (SELECT count(id) FROM mailgate_message WHERE model='crm.claim' AND res_id=c.id AND history=True) AS email,
+                    (SELECT count(id) FROM email_message WHERE model='crm.claim' AND res_id=c.id AND history=True) AS email,
                     (SELECT avg(probability) FROM crm_case_stage WHERE type='claim' AND id=c.stage_id) AS probability,
                     extract('epoch' from (c.date_deadline - c.date_closed))/(3600*24) as  delay_expected
                 from
diff --git a/addons/crm_helpdesk/report/crm_helpdesk_report.py b/addons/crm_helpdesk/report/crm_helpdesk_report.py
index 0d1d97c6905..56fe2dddd72 100644
--- a/addons/crm_helpdesk/report/crm_helpdesk_report.py
+++ b/addons/crm_helpdesk/report/crm_helpdesk_report.py
@@ -56,7 +56,7 @@ class crm_helpdesk_report(osv.osv):
         'date_deadline': fields.date('Deadline', select=True),
         'priority': fields.selection([('5', 'Lowest'), ('4', 'Low'), \
                     ('3', 'Normal'), ('2', 'High'), ('1', 'Highest')], 'Priority'),
-        'canal_id': fields.many2one('res.partner.canal', 'Channel'), 
+        'canal_id': fields.many2one('res.partner.canal', 'Channel'),
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="[('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.helpdesk')]"),
@@ -97,7 +97,7 @@ class crm_helpdesk_report(osv.osv):
                     c.planned_cost,
                     count(*) as nbr,
                     extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
-                    (SELECT count(id) FROM mailgate_message WHERE model='crm.helpdesk' AND res_id=c.id AND history=True) AS email,
+                    (SELECT count(id) FROM email_message WHERE model='crm.helpdesk' AND res_id=c.id AND history=True) AS email,
                     abs(avg(extract('epoch' from (c.date_deadline - c.date_closed)))/(3600*24)) as delay_expected
                 from
                     crm_helpdesk c
diff --git a/addons/email/email_message.py b/addons/email/email_message.py
index 960c08d1b65..d8952bfaf46 100644
--- a/addons/email/email_message.py
+++ b/addons/email/email_message.py
@@ -174,6 +174,7 @@ class email_message(osv.osv):
         'x_headers': fields.char('x_headers',size=256, readonly=True),
         'priority':fields.integer('Priority', readonly=True),
         'debug':fields.boolean('Debug', readonly=True),
+        'history': fields.boolean('History'),
         #I like GMAIL which allows putting same mail in many folders
         #Lets plan it for 0.9
         'folder':fields.selection([
diff --git a/addons/email/email_view.xml b/addons/email/email_view.xml
index 4f598b7fced..703ac366a7c 100644
--- a/addons/email/email_view.xml
+++ b/addons/email/email_view.xml
@@ -48,6 +48,7 @@
                             <field name="x_headers"/>
                             <field name="priority"/>
                             <field name="debug"/>
+                            <field name="history"/>
                             <button name="process_queue" string="Process Queue" type="object" icon="gtk-execute"/>
                         </page>
                     </notebook>
diff --git a/addons/fetchmail/fetchmail.py b/addons/fetchmail/fetchmail.py
index a1209492490..3fae834b045 100644
--- a/addons/fetchmail/fetchmail.py
+++ b/addons/fetchmail/fetchmail.py
@@ -110,7 +110,7 @@ class email_server(osv.osv):
     def set_draft(self, cr, uid, ids, context=None):
         self.write(cr, uid, ids , {'state':'draft'})
         return True
-    
+
     def button_confirm_login(self, cr, uid, ids, context=None):
         if context is None:
             context = {}
@@ -127,7 +127,7 @@ class email_server(osv.osv):
 
                     imap_server.login(server.user, server.password)
                     ret_server = imap_server
-                    
+
                 elif server.type == 'pop':
                     pop_server = None
                     if server.is_ssl:
@@ -140,7 +140,7 @@ class email_server(osv.osv):
                     pop_server.user(server.user)
                     pop_server.pass_(server.password)
                     ret_server = pop_server
-                    
+
                 self.write(cr, uid, [server.id], {'state':'done'})
                 if context.get('get_server',False):
                     return ret_server
@@ -207,9 +207,9 @@ class email_server(osv.osv):
 
 email_server()
 
-class mailgate_message(osv.osv):
+class email_message(osv.osv):
 
-    _inherit = "mailgate.message"
+    _inherit = "email.message"
 
     _columns = {
         'server_id': fields.many2one('email.server', "Mail Server", readonly=True, select=True),
@@ -229,7 +229,7 @@ class mailgate_message(osv.osv):
             values['server_id'] = server_id
         if server_type:
             values['server_type'] = server_type
-        res = super(mailgate_message,self).create(cr, uid, values, context=context)
+        res = super(email_message,self).create(cr, uid, values, context=context)
         return res
 
     def write(self, cr, uid, ids, values, context=None):
@@ -241,9 +241,9 @@ class mailgate_message(osv.osv):
             values['server_id'] = server_id
         if server_type:
             values['server_type'] = server_type
-        res = super(mailgate_message,self).write(cr, uid, ids, values, context=context)
+        res = super(email_message,self).write(cr, uid, ids, values, context=context)
         return res
 
-mailgate_message()
+email_message()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml
index 7d55f9f5a7a..d029ab5b97a 100644
--- a/addons/fetchmail/fetchmail_view.xml
+++ b/addons/fetchmail/fetchmail_view.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <openerp>
     <data>
-    
+
         <record model="ir.ui.view" id="view_email_server_tree">
             <field name="name">email.server.tree</field>
             <field name="model">email.server</field>
@@ -18,7 +18,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_email_server_form">
             <field name="name">email.server.form</field>
             <field name="model">email.server</field>
@@ -68,7 +68,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record model="ir.ui.view" id="view_email_server_search">
             <field name="name">email.server.search</field>
             <field name="model">email.server</field>
@@ -91,7 +91,7 @@
                 </search>
             </field>
         </record>
-        
+
         <record model="ir.actions.act_window" id="action_email_server_tree">
             <field name="name">Email Servers</field>
             <field name="res_model">email.server</field>
@@ -101,18 +101,18 @@
             <field name="search_view_id" ref="view_email_server_search"/>
         </record>
 
-        <menuitem 
-            parent="base.menu_mail_gateway" 
+        <menuitem
+            parent="base.menu_mail_gateway"
             id="menu_action_fetchmail_server_tree"
-            action="action_email_server_tree" 
+            action="action_email_server_tree"
             name="Email Servers"
         />
-        
-      <record model="ir.ui.view" id="mailgate_message_tree_view">
-	      <field name="name">mailgate.message.tree</field>
-	      <field name="model">mailgate.message</field>
+
+      <record model="ir.ui.view" id="email_message_tree_view">
+	      <field name="name">email.message.tree</field>
+	      <field name="model">email.message</field>
 	      <field name="type">tree</field>
-	      <field name="inherit_id" ref="mail_gateway.view_mailgate_message_tree"/>
+	      <field name="inherit_id" ref="email.view_email_message_tree"/>
 	      <field name="arch" type="xml">
 	          <field name="user_id" position="after">
 	              <field name="server_id" select="1"/>
@@ -120,12 +120,12 @@
 	          </field>
 	      </field>
       </record>
-      
-      <record model="ir.ui.view" id="mailgate_message_search_view">
-	      <field name="name">mailgate.message.inherit.search</field>
-	      <field name="model">mailgate.message</field>
+
+      <record model="ir.ui.view" id="email_message_search_view">
+	      <field name="name">email.message.inherit.search</field>
+	      <field name="model">email.message</field>
 	      <field name="type">search</field>
-	      <field name="inherit_id" ref="mail_gateway.view_mailgate_message_search"/>
+	      <field name="inherit_id" ref="email.view_email_message_search"/>
 	      <field name="arch" type="xml">
 			<xpath expr="/search/field[@name='name']" position="before">
 			     <filter string="Emails" name="emails" domain="[('server_id','!=',False)]" icon="terp-mail-message-new"/>
@@ -136,24 +136,24 @@
             </xpath>
 	      </field>
       </record>
-      
+
       <record id="action_view_mail_message_emails" model="ir.actions.act_window">
             <field name="name">Messages</field>
-            <field name="res_model">mailgate.message</field>
+            <field name="res_model">email.message</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="context">{'search_default_emails': 1}</field>
-            <field name="search_view_id" ref="mailgate_message_search_view"/>
+            <field name="search_view_id" ref="email_message_search_view"/>
       </record>
-        
+
       <menuitem id="base.menu_email_gateway_form"
                parent="base.menu_mail_gateway" action="action_view_mail_message_emails" />
 
-      <act_window 
+      <act_window
             context="{'server_id': active_id}"
             domain="[('server_id', '=', active_id)]"
             id="act_server_history" name="Emails"
-            res_model="mailgate.message" src_model="email.server"/>
-            
+            res_model="email.message" src_model="email.server"/>
+
     </data>
 </openerp>
diff --git a/addons/project_issue/report/project_issue_report.py b/addons/project_issue/report/project_issue_report.py
index b66963569e7..7d702b0e5f8 100644
--- a/addons/project_issue/report/project_issue_report.py
+++ b/addons/project_issue/report/project_issue_report.py
@@ -1,7 +1,7 @@
 
 # -*- coding: utf-8 -*-
 ##############################################################################
-#    
+#
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
 #
@@ -16,7 +16,7 @@
 #    GNU Affero General Public License for more details.
 #
 #    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.     
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
 
@@ -102,7 +102,7 @@ class project_issue_report(osv.osv):
                     date_trunc('day',c.create_date) as create_date,
                     extract('epoch' from (c.date_open-c.create_date))/(3600*24) as  delay_open,
                     extract('epoch' from (c.date_closed-c.create_date))/(3600*24) as  delay_close,
-                    (SELECT count(id) FROM mailgate_message WHERE model='project.issue' AND res_id=c.id) AS email
+                    (SELECT count(id) FROM email_message WHERE model='project.issue' AND res_id=c.id) AS email
                 FROM
                     project_issue c
             )""")