From b931b05bb902efca78fa0df363dda1ff29d5bf3a Mon Sep 17 00:00:00 2001 From: "Yogesh (OpenERP)" Date: Mon, 7 Feb 2011 11:03:04 +0530 Subject: [PATCH] [IMP] replace mailgate_message to email_message in crm, fetchamil and project_issue module. bzr revid: ysa@tinyerp.com-20110207053304-yak3ruc2os2lah7t --- addons/crm/report/crm_lead_report.py | 4 +- addons/crm_claim/report/crm_claim_report.py | 8 ++-- .../report/crm_helpdesk_report.py | 4 +- addons/email/email_message.py | 1 + addons/email/email_view.xml | 1 + addons/fetchmail/fetchmail.py | 16 +++---- addons/fetchmail/fetchmail_view.xml | 48 +++++++++---------- .../report/project_issue_report.py | 6 +-- 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 @@ +