[MERGE] rename module: email with mail due to conflicts python packages
bzr revid: hmo@tinyerp.com-20110404105639-147c1wj9c17lp4sk
This commit is contained in:
Harry (OpenERP)
@@ -44,7 +44,7 @@ Note that if you want to check the followup level for a given partner/account en
|
||||
'author': 'OpenERP SA',
|
||||
'website': 'http://www.openerp.com',
|
||||
'images': ['images/follow_ups.jpeg','images/send_followups.jpeg'],
|
||||
'depends': ['account', 'email'],
|
||||
'depends': ['account', 'mail'],
|
||||
'init_xml': [],
|
||||
'update_xml': [
|
||||
'security/ir.model.access.csv',
|
||||
|
||||
@@ -36,7 +36,7 @@ trigger an automatic reminder email.
|
||||
""",
|
||||
'author': 'OpenERP SA',
|
||||
'website': 'http://www.openerp.com',
|
||||
'depends': ['base', 'email'],
|
||||
'depends': ['base', 'mail'],
|
||||
'init_xml': [
|
||||
'base_action_rule_data.xml'
|
||||
],
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
{
|
||||
"name" : "Basic Calendar Functionality",
|
||||
"version" : "1.0",
|
||||
"depends" : ["base", "email"],
|
||||
"depends" : ["base", "mail"],
|
||||
'description': """
|
||||
This is a full-featured calendar system.
|
||||
========================================
|
||||
|
||||
@@ -57,7 +57,7 @@ Creates a dashboard for CRM that includes:
|
||||
'base',
|
||||
'base_action_rule',
|
||||
'process',
|
||||
'email',
|
||||
'mail',
|
||||
'base_calendar',
|
||||
'resource',
|
||||
'board'
|
||||
|
||||
@@ -325,6 +325,7 @@ class crm_lead(crm_case, osv.osv):
|
||||
@param self: The object pointer
|
||||
@param cr: the current row, from the database cursor,
|
||||
@param uid: the current user’s ID for security checks
|
||||
@param msg: dictionary object to contain email message data
|
||||
"""
|
||||
thread_pool = self.pool.get('email.thread')
|
||||
|
||||
@@ -343,7 +344,7 @@ class crm_lead(crm_case, osv.osv):
|
||||
if msg.get('priority', False):
|
||||
vals['priority'] = priority
|
||||
|
||||
res = thread_pool.get_partner(cr, uid, msg.get('from') or msg.get_unixfrom())
|
||||
res = thread_pool.get_partner(cr, uid, msg.get('from', False))
|
||||
if res:
|
||||
vals.update(res)
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@
|
||||
<separator string="Communication" colspan="4" col="3"/>
|
||||
<field name="email_from" widget="email"/>
|
||||
<button string="Send Email"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'email_model':'crm.lead', 'email_res_id': active_id}"
|
||||
icon="terp-mail-message-new" type="action" colspan="1"/>
|
||||
<newline/>
|
||||
@@ -189,7 +189,7 @@
|
||||
<field name="history" invisible="1"/>
|
||||
<button
|
||||
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action" />
|
||||
</tree>
|
||||
@@ -207,7 +207,7 @@
|
||||
<group attrs="{'invisible': [('history', '!=', True)]}">
|
||||
<field name="body" colspan="4" nolabel="1" height="250"/>
|
||||
<button colspan="4" string="Reply"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action"/>
|
||||
</group>
|
||||
@@ -226,7 +226,7 @@
|
||||
context="{'model': 'crm.lead' }"
|
||||
icon="terp-document-new" type="action" />
|
||||
<button string="Send New Email"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'email_model':'crm.lead', 'email_res_id': active_id}"
|
||||
icon="terp-mail-message-new" type="action"/>
|
||||
</page>
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
<group col="3" colspan="2">
|
||||
<field name="email_from" string="Email" />
|
||||
<button string="Send Email"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'email_model': 'crm.lead', 'email_res_id': active_id}"
|
||||
icon="terp-mail-message-new" type="action"/>
|
||||
</group>
|
||||
@@ -145,7 +145,7 @@
|
||||
<field name="display_text" string="History Information"/>
|
||||
<field name="history" invisible="1"/>
|
||||
<button string="Reply"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action"/>
|
||||
</tree>
|
||||
@@ -165,7 +165,7 @@
|
||||
<group attrs="{'invisible': [('history', '!=', True)]}">
|
||||
<button colspan="4"
|
||||
string="Reply"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action" />
|
||||
</group>
|
||||
@@ -182,7 +182,7 @@
|
||||
context="{'model': 'crm.lead' }"
|
||||
icon="terp-document-new" type="action" />
|
||||
<button string="Send New Email"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'email_model': 'crm.lead', 'email_res_id': active_id}"
|
||||
icon="terp-mail-message-new" type="action"/>
|
||||
</page>
|
||||
|
||||
@@ -27,15 +27,15 @@
|
||||
"access_res_partner_manager","res.partner.crm.manager","base.model_res_partner","base.group_sale_manager",1,0,0,0
|
||||
"access_res_partner_address_manager","res.partner.address.crm.user.manager","base.model_res_partner_address","base.group_sale_manager",1,0,0,0
|
||||
"access_res_partner_category_manager","res.partner.category.crm.manager","base.model_res_partner_category","base.group_sale_manager",1,0,0,0
|
||||
"email_email_message_manager","email.email.message.manager","email.model_email_message","base.group_sale_manager",1,0,0,0
|
||||
"email_thread_manager","email.thread.manager","email.model_email_thread","base.group_sale_manager",1,1,1,1
|
||||
"email_email_message_manager","mail.email.message.manager","mail.model_email_message","base.group_sale_manager",1,0,0,0
|
||||
"email_thread_manager","mail.thread.manager","mail.model_email_thread","base.group_sale_manager",1,1,1,1
|
||||
"access_calendar_attendee_crm_user","calendar.attendee.crm.user","model_calendar_attendee","base.group_sale_salesman",1,1,1,0
|
||||
"access_calendar_attendee_crm_manager","calendar.attendee.crm.manager","model_calendar_attendee","base.group_sale_manager",1,1,1,1
|
||||
"access_res_partner","res.partner.crm.user","base.model_res_partner","base.group_sale_salesman",1,1,1,0
|
||||
"access_res_partner_address","res.partner.address.crm.user","base.model_res_partner_address","base.group_sale_salesman",1,1,1,0
|
||||
"access_res_partner_category","res.partner.category.crm.user","base.model_res_partner_category","base.group_sale_salesman",1,1,1,0
|
||||
"email_mailgate_thread","email.thread","email.model_email_thread","base.group_sale_salesman",1,1,1,1
|
||||
"email_gateway_email_message_user","email.email.message.user","email.model_email_message","base.group_sale_salesman",1,1,1,1
|
||||
"email_mailgate_thread","email.thread","mail.model_email_thread","base.group_sale_salesman",1,1,1,1
|
||||
"email_gateway_email_message_user","mail.email.message.user","mail.model_email_message","base.group_sale_salesman",1,1,1,1
|
||||
"access_crm_case_categ_manager","crm.case.categ manager","model_crm_case_categ","base.group_sale_manager",1,1,1,1
|
||||
"access_base_action_rule_manager","base.action.rule manager","model_base_action_rule","base.group_sale_manager",1,1,1,1
|
||||
"access_crm_lead_report_user","crm.lead.report user","model_crm_lead_report","base.group_sale_salesman",1,1,1,1
|
||||
|
||||
|
@@ -179,6 +179,7 @@ class crm_claim(crm.crm_case, osv.osv):
|
||||
@param self: The object pointer
|
||||
@param cr: the current row, from the database cursor,
|
||||
@param uid: the current user’s ID for security checks
|
||||
@param msg: dictionary object to contain email message data
|
||||
"""
|
||||
thread_pool = self.pool.get('email.thread')
|
||||
|
||||
@@ -197,7 +198,7 @@ class crm_claim(crm.crm_case, osv.osv):
|
||||
if msg.get('priority', False):
|
||||
vals['priority'] = priority
|
||||
|
||||
res = thread_pool.get_partner(cr, uid, msg.get('from') or msg.get_unixfrom())
|
||||
res = thread_pool.get_partner(cr, uid, msg.get('from', False))
|
||||
if res:
|
||||
vals.update(res)
|
||||
|
||||
|
||||
@@ -177,7 +177,7 @@
|
||||
<field name="display_text" string="History Information"/>
|
||||
<button
|
||||
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action" />
|
||||
</tree>
|
||||
@@ -195,7 +195,7 @@
|
||||
<group attrs="{'invisible': [('history', '!=', True)]}">
|
||||
<field name="description" colspan="4" nolabel="1" height="250"/>
|
||||
<button colspan="4" string="Reply"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action"/>
|
||||
</group>
|
||||
@@ -214,7 +214,7 @@
|
||||
context="{'model': 'crm.lead' }"
|
||||
icon="terp-document-new" type="action" />
|
||||
<button string="Send New Email"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'email_model':'crm.claim', 'email_res_id': active_id}"
|
||||
icon="terp-mail-message-new" type="action"/>
|
||||
</page>
|
||||
|
||||
@@ -168,7 +168,7 @@
|
||||
<field name="history" invisible="1"/>
|
||||
<button
|
||||
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action" />
|
||||
</tree>
|
||||
@@ -186,7 +186,7 @@
|
||||
<group attrs="{'invisible': [('history', '!=', True)]}">
|
||||
<field name="description" colspan="4" nolabel="1" height="250"/>
|
||||
<button colspan="4" string="Reply"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action"/>
|
||||
</group>
|
||||
@@ -205,7 +205,7 @@
|
||||
context="{'model': 'crm.lead' }"
|
||||
icon="terp-document-new" type="action" />
|
||||
<button string="Send New Email"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'email_model':'crm.fundraising', 'email_res_id': active_id}"
|
||||
icon="terp-mail-message-new" type="action"/>
|
||||
</page>
|
||||
|
||||
@@ -103,6 +103,7 @@ class crm_helpdesk(crm.crm_case, osv.osv):
|
||||
@param self: The object pointer
|
||||
@param cr: the current row, from the database cursor,
|
||||
@param uid: the current user’s ID for security checks
|
||||
@param msg: dictionary object to contain email message data
|
||||
"""
|
||||
thread_pool = self.pool.get('email.thread')
|
||||
|
||||
@@ -121,7 +122,7 @@ class crm_helpdesk(crm.crm_case, osv.osv):
|
||||
if msg.get('priority', False):
|
||||
vals['priority'] = priority
|
||||
|
||||
res = thread_pool.get_partner(cr, uid, msg.get('from') or msg.get_unixfrom())
|
||||
res = thread_pool.get_partner(cr, uid, msg.get('from', False))
|
||||
if res:
|
||||
vals.update(res)
|
||||
|
||||
|
||||
@@ -102,7 +102,7 @@
|
||||
<field name="history" invisible="1"/>
|
||||
<button
|
||||
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action" />
|
||||
</tree>
|
||||
@@ -120,7 +120,7 @@
|
||||
<group attrs="{'invisible': [('history', '!=', True)]}">
|
||||
<field name="description" colspan="4" nolabel="1" height="250"/>
|
||||
<button colspan="4" string="Reply"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action"/>
|
||||
</group>
|
||||
@@ -139,7 +139,7 @@
|
||||
context="{'model': 'crm.lead' }"
|
||||
icon="terp-document-new" type="action" />
|
||||
<button string="Send New Email"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'email_model':'crm.helpdesk', 'email_res_id': active_id}"
|
||||
icon="terp-mail-message-new" type="action"/>
|
||||
</page>
|
||||
|
||||
@@ -26,7 +26,7 @@
|
||||
"author" : "Openlabs",
|
||||
"website" : "http://openerp.com",
|
||||
"category" : "Tools",
|
||||
"depends" : ['email'],
|
||||
"depends" : ['mail'],
|
||||
"description": """
|
||||
Email Template is extraction of Power Email basically just to send emails.
|
||||
==========================================================================
|
||||
|
||||
@@ -153,7 +153,7 @@
|
||||
</record>
|
||||
|
||||
<menuitem name="Templates" id="menu_email_template_all_tools"
|
||||
parent="email.menu_email_message_tools" action="action_email_template_tree_all" />
|
||||
parent="mail.menu_email_message_tools" action="action_email_template_tree_all" />
|
||||
|
||||
</data>
|
||||
</openerp>
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
<field name="name">email.compose.message.form</field>
|
||||
<field name="model">email.compose.message</field>
|
||||
<field name="type">form</field>
|
||||
<field name="inherit_id" ref="email.email_compose_message_wizard_form"/>
|
||||
<field name="inherit_id" ref="mail.email_compose_message_wizard_form"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="res_id" position="replace">
|
||||
<field name="template_id" colspan="4"
|
||||
|
||||
@@ -38,7 +38,7 @@ Note that:
|
||||
Association / Configuration / Types of Events
|
||||
""",
|
||||
'author': 'OpenERP SA',
|
||||
'depends': ['crm', 'base_contact', 'account', 'marketing', 'email'],
|
||||
'depends': ['crm', 'base_contact', 'account', 'marketing', 'mail'],
|
||||
'init_xml': [],
|
||||
'update_xml': [
|
||||
'security/event_security.xml',
|
||||
|
||||
@@ -393,7 +393,7 @@
|
||||
<field name="history" invisible="1"/>
|
||||
<button
|
||||
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action" />
|
||||
</tree>
|
||||
@@ -411,7 +411,7 @@
|
||||
<group attrs="{'invisible': [('history', '!=', True)]}">
|
||||
<field name="description" colspan="4" nolabel="1" height="250"/>
|
||||
<button colspan="4" string="Reply"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action"/>
|
||||
</group>
|
||||
@@ -430,7 +430,7 @@
|
||||
context="{'model': 'crm.lead' }"
|
||||
icon="terp-document-new" type="action" />
|
||||
<button string="Send New Email"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'email_model':'event.registration', 'email_res_id': active_id}"
|
||||
icon="terp-mail-message-new" type="action"/>
|
||||
</page>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
{
|
||||
"name" : "Fetchmail Server",
|
||||
"version" : "1.0",
|
||||
"depends" : ["base", 'email'],
|
||||
"depends" : ["base", 'mail'],
|
||||
"author" : "OpenERP SA",
|
||||
"category": 'Tools',
|
||||
"description": """
|
||||
|
||||
@@ -146,7 +146,7 @@ class email_server(osv.osv):
|
||||
if context.get('get_server',False):
|
||||
return ret_server
|
||||
except Exception, e:
|
||||
logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (e))
|
||||
logger.notifyChannel(server.type, netsvc.LOG_ERROR, '%s' % (e))
|
||||
return True
|
||||
|
||||
def button_fetch_mail(self, cr, uid, ids, context=None):
|
||||
@@ -183,7 +183,7 @@ class email_server(osv.osv):
|
||||
logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail fetch/process %s email(s) from %s' % (count, server.name))
|
||||
|
||||
except Exception, e:
|
||||
logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e)))
|
||||
logger.notifyChannel(server.type, netsvc.LOG_ERROR, '%s' % (tools.ustr(e)))
|
||||
finally:
|
||||
if imap_server:
|
||||
imap_server.close()
|
||||
@@ -203,7 +203,7 @@ class email_server(osv.osv):
|
||||
pop_server.dele(num)
|
||||
logger.notifyChannel(server.type, netsvc.LOG_INFO, 'fetchmail fetch %s email(s) from %s' % (numMsgs, server.name))
|
||||
except Exception, e:
|
||||
logger.notifyChannel(server.type, netsvc.LOG_WARNING, '%s' % (tools.ustr(e)))
|
||||
logger.notifyChannel(server.type, netsvc.LOG_ERROR, '%s' % (tools.ustr(e)))
|
||||
finally:
|
||||
if pop_server:
|
||||
pop_server.quit()
|
||||
|
||||
@@ -102,7 +102,7 @@
|
||||
</record>
|
||||
|
||||
<menuitem
|
||||
parent="email.menu_config_email"
|
||||
parent="mail.menu_config_email"
|
||||
id="menu_action_fetchmail_server_tree"
|
||||
action="action_email_server_tree"
|
||||
name="Incomming Servers"
|
||||
@@ -112,7 +112,7 @@
|
||||
<field name="name">email.message.tree</field>
|
||||
<field name="model">email.message</field>
|
||||
<field name="type">tree</field>
|
||||
<field name="inherit_id" ref="email.view_email_message_tree"/>
|
||||
<field name="inherit_id" ref="mail.view_email_message_tree"/>
|
||||
<field name="arch" type="xml">
|
||||
<field name="user_id" position="after">
|
||||
<field name="server_id" select="1"/>
|
||||
@@ -124,7 +124,7 @@
|
||||
<field name="name">email.message.inherit.search</field>
|
||||
<field name="model">email.message</field>
|
||||
<field name="type">search</field>
|
||||
<field name="inherit_id" ref="email.view_email_message_search"/>
|
||||
<field name="inherit_id" ref="mail.view_email_message_search"/>
|
||||
<field name="arch" type="xml">
|
||||
<xpath expr="/search/group/filter[@string='Thread']" position="before">
|
||||
<filter string="Mail Server" icon="terp-accessories-archiver" domain="[]" context="{'group_by':'server_id'}"/>
|
||||
@@ -141,7 +141,7 @@
|
||||
<field name="search_view_id" ref="email_message_search_view"/>
|
||||
</record>
|
||||
|
||||
<act_window
|
||||
<act_window
|
||||
context="{'search_default_server_id': [active_id], 'default_server_id': active_id}"
|
||||
id="act_server_history" name="Emails"
|
||||
res_model="email.message" src_model="email.server"/>
|
||||
|
||||
@@ -147,7 +147,7 @@
|
||||
<field name="history" invisible="1"/>
|
||||
<button
|
||||
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action" />
|
||||
</tree>
|
||||
@@ -165,7 +165,7 @@
|
||||
<group attrs="{'invisible': [('history', '!=', True)]}">
|
||||
<field name="description" colspan="4" nolabel="1" height="250"/>
|
||||
<button colspan="4" string="Reply"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action"/>
|
||||
</group>
|
||||
@@ -184,7 +184,7 @@
|
||||
context="{'model': 'crm.lead' }"
|
||||
icon="terp-document-new" type="action" />
|
||||
<button string="Send New Email"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'email_model': 'hr.applicant', 'email_res_id': active_id}"
|
||||
icon="terp-mail-message-new" type="action"/>
|
||||
</page>
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
|
||||
"access_hr_applicant_user","hr.applicant.user","model_hr_applicant","base.group_hr_user",1,1,1,1
|
||||
"access_hr_recruitment_report","hr.recruitment.report","model_hr_recruitment_report","base.group_hr_manager",1,1,1,1
|
||||
"access_hr_recruitment_stage_user","hr.recruitment.stage.user","model_hr_recruitment_stage","base.group_hr_user",1,1,1,1
|
||||
"access_hr_recruitment_degree","hr.recruitment.degree","model_hr_recruitment_degree","base.group_hr_user",1,1,1,1
|
||||
"access_email_message_user","email.message.user","email.model_email_message","base.group_hr_user",1,1,1,1
|
||||
"access_res_partner_hr_user","res.partner.user","base.model_res_partner","base.group_hr_user",1,1,1,1
|
||||
"access_res_partner_address_hr_user","res.partner.address.user","base.model_res_partner_address","base.group_hr_user",1,1,1,1
|
||||
"access_survey_hr_user","survey.hr.user","survey.model_survey","base.group_hr_user",1,1,1,0
|
||||
"access_crm_phonecall_hruser","crm.phonecall hruser","crm.model_crm_phonecall","base.group_hr_user",1,1,1,1
|
||||
"access_crm_meeting_hruser","crm.meeting.hruser","crm.model_crm_meeting","base.group_hr_user",1,1,1,1
|
||||
"id";"name";"model_id:id";"group_id:id";"perm_read";"perm_write";"perm_create";"perm_unlink"
|
||||
"access_hr_applicant_user";"hr.applicant.user";"model_hr_applicant";"base.group_hr_user";1;1;1;1
|
||||
"access_hr_recruitment_report";"hr.recruitment.report";"model_hr_recruitment_report";"base.group_hr_manager";1;1;1;1
|
||||
"access_hr_recruitment_stage_user";"hr.recruitment.stage.user";"model_hr_recruitment_stage";"base.group_hr_user";1;1;1;1
|
||||
"access_hr_recruitment_degree";"hr.recruitment.degree";"model_hr_recruitment_degree";"base.group_hr_user";1;1;1;1
|
||||
"access_email_message_user";"email.message.user";"mail.model_email_message";"base.group_hr_user";1;1;1;1
|
||||
"access_res_partner_hr_user";"res.partner.user";"base.model_res_partner";"base.group_hr_user";1;1;1;1
|
||||
"access_res_partner_address_hr_user";"res.partner.address.user";"base.model_res_partner_address";"base.group_hr_user";1;1;1;1
|
||||
"access_survey_hr_user";"survey.hr.user";"survey.model_survey";"base.group_hr_user";1;1;1;0
|
||||
"access_crm_phonecall_hruser";"crm.phonecall hruser";"crm.model_crm_phonecall";"base.group_hr_user";1;1;1;1
|
||||
"access_crm_meeting_hruser";"crm.meeting.hruser";"crm.model_crm_meeting";"base.group_hr_user";1;1;1;1
|
||||
|
||||
|
@@ -292,7 +292,7 @@ class email_thread(osv.osv):
|
||||
msg['content-type'] = msg_txt.get('Content-Type')
|
||||
|
||||
if 'From' in fields:
|
||||
msg['from'] = self._decode_header(msg_txt.get('From'))
|
||||
msg['from'] = self._decode_header(msg_txt.get('From') or msg_txt.get_unixfrom())
|
||||
|
||||
if 'Delivered-To' in fields:
|
||||
msg['to'] = self._decode_header(msg_txt.get('Delivered-To'))
|
||||
@@ -16,6 +16,7 @@
|
||||
<field name="date"/>
|
||||
<field name="user_id" string="User"/>
|
||||
<field name="partner_id" readonly="1" />
|
||||
<field name="priority"/>
|
||||
</group>
|
||||
<notebook colspan="4">
|
||||
<page string="Details">
|
||||
@@ -31,21 +32,20 @@
|
||||
<separator string="Message Details" colspan="4"/>
|
||||
<field name="model" readonly="1"/>
|
||||
<group col="3" colspan="2">
|
||||
<field name="res_id" readonly="1"/>
|
||||
<field name="res_id" readonly="1" groups="base.group_extended"/>
|
||||
<button name="open_document" string="Open Document" type="object" icon="gtk-jump-to"/>
|
||||
<field name="message_id"/>
|
||||
<button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
|
||||
context="{'mail':'reply', 'message_id':active_id}"/>
|
||||
<field name="message_id" groups="base.group_extended" colspan="4"/>
|
||||
</group>
|
||||
<field name="references" widget="char" size="4096"/>
|
||||
<field name="references" widget="char" size="4096" groups="base.group_extended"/>
|
||||
</group>
|
||||
<separator string="Description" colspan="4"/>
|
||||
<field name="body" nolabel="1" colspan="4"/>
|
||||
<group col="4" colspan="4">
|
||||
<separator string="" colspan="4"/>
|
||||
<field name="state"/>
|
||||
<button name="process_email_queue" string="Send" type="object" icon="gtk-execute" states='draft,waiting,sending'/>
|
||||
<button name="process_retry" string="Re-Try" type="object" icon="gtk-execute" states='exception'/>
|
||||
<field name="state" attrs="{'invisible': [('state', '==', False)]}"/>
|
||||
<button name="%(action_email_compose_message_wizard)d" string="Reply" type="action" icon="terp-mail-replied"
|
||||
context="{'mail':'reply', 'message_id':active_id}" colspan="2"/>
|
||||
<button name="process_email_queue" string="Force send" type="object" icon="gtk-execute" states='exception' colspan="2"/>
|
||||
</group>
|
||||
</page>
|
||||
<page string="Attachments">
|
||||
@@ -56,11 +56,11 @@
|
||||
<group col="4" colspan="4">
|
||||
<field name="smtp_server_id"/>
|
||||
<field name="sub_type"/>
|
||||
<field name="headers"/>
|
||||
<field name="priority"/>
|
||||
<field name="debug"/>
|
||||
<field name="debug" groups="base.group_extended"/>
|
||||
<field name="history"/>
|
||||
<field name="auto_delete"/>
|
||||
<separator string="xheaders" colspan="4"/>
|
||||
<field name="headers" colspan="4" nolabel="1" groups="base.group_extended"/>
|
||||
</group>
|
||||
</page>
|
||||
</notebook>
|
||||
@@ -130,12 +130,6 @@
|
||||
src_model="res.partner"
|
||||
view_id="view_email_message_tree"/>
|
||||
|
||||
<act_window
|
||||
id="act_res_partner_open_email" name="Attachments"
|
||||
res_model="ir.attachment"
|
||||
src_model="email.message"
|
||||
domain="[('res_id', '=', res_id),('res_model','=',model)]"/>
|
||||
|
||||
<menuitem name="Email" id="menu_email_message_tools"
|
||||
parent="base.menu_tools" />
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
|
||||
"access_marketing_campaign_admin","marketing.campaign","model_marketing_campaign","marketing.group_marketing_user",1,1,0,0
|
||||
"access_marketing_campaign_segment_campaignadmin","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_user",1,1,0,0
|
||||
"access_marketing_campaign_activity_campaignadmin","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_user",1,1,0,0
|
||||
"access_marketing_campaign_workitem_campaignadmin","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_user",1,1,0,0
|
||||
"access_marketing_campaign_transition_campaignadmin","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_user",1,1,0,0
|
||||
"access_marketing_campaign_analysis_campaignadmin","campaign.analysis","model_campaign_analysis","marketing.group_marketing_user",1,1,0,0
|
||||
"access_marketing_campaign_workitem_all","marketing.campaign.workitem","model_marketing_campaign_workitem","base.group_user",1,0,0,0
|
||||
"access_email_template_user","email.template","model_email_template","marketing.group_marketing_user",1,1,0,0
|
||||
"access_email_template_account_user","email.smtp_server","email.model_email_smtp_server","marketing.group_marketing_user",1,1,0,0
|
||||
"access_marketing_campaign_system","marketing.campaign system","model_marketing_campaign","base.group_system",1,0,0,0
|
||||
"access_marketing_campaign_segment_system","marketing.campaign.segment system","model_marketing_campaign_segment","base.group_system",1,0,0,0
|
||||
"access_marketing_campaign_workitem_system","marketing.campaign.workitem system","model_marketing_campaign_workitem","base.group_system",1,0,0,0
|
||||
"access_marketing_campaign_manager","marketing.campaign","model_marketing_campaign","marketing.group_marketing_manager",1,1,1,1
|
||||
"access_marketing_campaign_segment_campaign_manager","marketing.campaign.segment","model_marketing_campaign_segment","marketing.group_marketing_manager",1,1,1,1
|
||||
"access_marketing_campaign_activity_campaign_manager","marketing.campaign.activity","model_marketing_campaign_activity","marketing.group_marketing_manager",1,1,1,1
|
||||
"access_marketing_campaign_workitem_campaign_manager","marketing.campaign.workitem","model_marketing_campaign_workitem","marketing.group_marketing_manager",1,1,1,1
|
||||
"access_marketing_campaign_transition_campaign_manager","marketing.campaign.transition","model_marketing_campaign_transition","marketing.group_marketing_manager",1,1,1,1
|
||||
"access_marketing_campaign_analysis_campaign_manager","campaign.analysis","model_campaign_analysis","marketing.group_marketing_manager",1,1,1,1
|
||||
"access_email_template_manager","email.template","model_email_template","marketing.group_marketing_manager",1,1,1,1
|
||||
"access_email_template_account_manager","email.smtp_server","email.model_email_smtp_server","marketing.group_marketing_manager",1,1,1,1
|
||||
"id";"name";"model_id:id";"group_id:id";"perm_read";"perm_write";"perm_create";"perm_unlink"
|
||||
"access_marketing_campaign_admin";"marketing.campaign";"model_marketing_campaign";"marketing.group_marketing_user";1;1;0;0
|
||||
"access_marketing_campaign_segment_campaignadmin";"marketing.campaign.segment";"model_marketing_campaign_segment";"marketing.group_marketing_user";1;1;0;0
|
||||
"access_marketing_campaign_activity_campaignadmin";"marketing.campaign.activity";"model_marketing_campaign_activity";"marketing.group_marketing_user";1;1;0;0
|
||||
"access_marketing_campaign_workitem_campaignadmin";"marketing.campaign.workitem";"model_marketing_campaign_workitem";"marketing.group_marketing_user";1;1;0;0
|
||||
"access_marketing_campaign_transition_campaignadmin";"marketing.campaign.transition";"model_marketing_campaign_transition";"marketing.group_marketing_user";1;1;0;0
|
||||
"access_marketing_campaign_analysis_campaignadmin";"campaign.analysis";"model_campaign_analysis";"marketing.group_marketing_user";1;1;0;0
|
||||
"access_marketing_campaign_workitem_all";"marketing.campaign.workitem";"model_marketing_campaign_workitem";"base.group_user";1;0;0;0
|
||||
"access_email_template_user";"email.template";"model_email_template";"marketing.group_marketing_user";1;1;0;0
|
||||
"access_email_template_account_user";"ir.mail_server";"base.model_ir_mail_server";"marketing.group_marketing_user";1;1;0;0
|
||||
"access_marketing_campaign_system";"marketing.campaign system";"model_marketing_campaign";"base.group_system";1;0;0;0
|
||||
"access_marketing_campaign_segment_system";"marketing.campaign.segment system";"model_marketing_campaign_segment";"base.group_system";1;0;0;0
|
||||
"access_marketing_campaign_workitem_system";"marketing.campaign.workitem system";"model_marketing_campaign_workitem";"base.group_system";1;0;0;0
|
||||
"access_marketing_campaign_manager";"marketing.campaign";"model_marketing_campaign";"marketing.group_marketing_manager";1;1;1;1
|
||||
"access_marketing_campaign_segment_campaign_manager";"marketing.campaign.segment";"model_marketing_campaign_segment";"marketing.group_marketing_manager";1;1;1;1
|
||||
"access_marketing_campaign_activity_campaign_manager";"marketing.campaign.activity";"model_marketing_campaign_activity";"marketing.group_marketing_manager";1;1;1;1
|
||||
"access_marketing_campaign_workitem_campaign_manager";"marketing.campaign.workitem";"model_marketing_campaign_workitem";"marketing.group_marketing_manager";1;1;1;1
|
||||
"access_marketing_campaign_transition_campaign_manager";"marketing.campaign.transition";"model_marketing_campaign_transition";"marketing.group_marketing_manager";1;1;1;1
|
||||
"access_marketing_campaign_analysis_campaign_manager";"campaign.analysis";"model_campaign_analysis";"marketing.group_marketing_manager";1;1;1;1
|
||||
"access_email_template_manager";"email.template";"model_email_template";"marketing.group_marketing_manager";1;1;1;1
|
||||
"access_email_template_account_manager";"ir.mail_server";"base.model_ir_mail_server";"marketing.group_marketing_manager";1;1;1;1
|
||||
|
||||
|
@@ -25,7 +25,7 @@
|
||||
'version' : '1.0',
|
||||
'author' : 'OpenERP SA',
|
||||
'website' : 'http://www.openerp.com/',
|
||||
'depends' : ['base', 'email'],
|
||||
'depends' : ['base', 'mail'],
|
||||
'category' : 'Tools',
|
||||
'description': '''
|
||||
This module provides the Outlook Plug-in.
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
"website": "http://www.openerp.com",
|
||||
"category": "Project Management",
|
||||
"images": ["images/gantt.png", "images/project_dashboard.jpeg","images/project_task_tree.jpeg","images/project_task.jpeg","images/project.jpeg","images/task_analysis.jpeg"],
|
||||
"depends": ["product", "analytic", "board", "email"],
|
||||
"depends": ["product", "analytic", "board", "mail"],
|
||||
"description": """
|
||||
Project management module tracks multi-level projects, tasks, work done on tasks, eso.
|
||||
======================================================================================
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
<field name="history" invisible="1"/>
|
||||
<button
|
||||
string="Reply" attrs="{'invisible': [('history', '!=', True)]}"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action" />
|
||||
</tree>
|
||||
@@ -121,7 +121,7 @@
|
||||
<group attrs="{'invisible': [('history', '!=', True)]}">
|
||||
<field name="body" colspan="4" nolabel="1" height="250"/>
|
||||
<button colspan="4" string="Reply"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'mail':'reply', 'message_id':active_id}"
|
||||
icon="terp-mail-replied" type="action"/>
|
||||
</group>
|
||||
@@ -141,7 +141,7 @@
|
||||
context="{'model': 'crm.lead' }"
|
||||
icon="terp-document-new" type="action" />
|
||||
<button string="Send New Email"
|
||||
name="%(email.action_email_compose_message_wizard)d"
|
||||
name="%(mail.action_email_compose_message_wizard)d"
|
||||
context="{'email_model':'project.issue', 'email_res_id': active_id}"
|
||||
icon="terp-mail-message-new" type="action"/>
|
||||
</page>
|
||||
|
||||
@@ -1,11 +1,11 @@
|
||||
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
|
||||
"access_project_issue_all","project.issue","model_project_issue","project.group_project_manager",1,1,1,1
|
||||
"access_project_issue_user","project.issue","model_project_issue","project.group_project_user",1,1,1,1
|
||||
"access_project_issue_report_all","project.issue.report","model_project_issue_report","project.group_project_manager",1,1,1,1
|
||||
"access_crm_case_categ_id","crm.case.categ","crm.model_crm_case_categ","project.group_project_manager",1,1,1,1
|
||||
"access_project_issue_version_project","project_issue_version manager","model_project_issue_version","project.group_project_manager",1,1,1,1
|
||||
"access_project_issue_version_project_user","project_issue_version user","model_project_issue_version","project.group_project_user",1,0,0,0
|
||||
"access_email_message_project_manager","email.message.manager","email.model_email_message","project.group_project_manager",1,1,1,1
|
||||
"access_resource_calendar_project_manager","resource.calendar.project.manager","resource.model_resource_calendar","project.group_project_manager",1,1,1,1
|
||||
"access_project_issue_report_user","project.issue.report user","model_project_issue_report","project.group_project_user",1,0,0,0
|
||||
"access_email_message_issue_project_user","project.mailgate.message.issue.user","email.model_email_message","project.group_project_user",1,1,1,0
|
||||
"id";"name";"model_id:id";"group_id:id";"perm_read";"perm_write";"perm_create";"perm_unlink"
|
||||
"access_project_issue_all";"project.issue";"model_project_issue";"project.group_project_manager";1;1;1;1
|
||||
"access_project_issue_user";"project.issue";"model_project_issue";"project.group_project_user";1;1;1;1
|
||||
"access_project_issue_report_all";"project.issue.report";"model_project_issue_report";"project.group_project_manager";1;1;1;1
|
||||
"access_crm_case_categ_id";"crm.case.categ";"crm.model_crm_case_categ";"project.group_project_manager";1;1;1;1
|
||||
"access_project_issue_version_project";"project_issue_version manager";"model_project_issue_version";"project.group_project_manager";1;1;1;1
|
||||
"access_project_issue_version_project_user";"project_issue_version user";"model_project_issue_version";"project.group_project_user";1;0;0;0
|
||||
"access_email_message_project_manager";"email.message.manager";"mail.model_email_message";"project.group_project_manager";1;1;1;1
|
||||
"access_resource_calendar_project_manager";"resource.calendar.project.manager";"resource.model_resource_calendar";"project.group_project_manager";1;1;1;1
|
||||
"access_project_issue_report_user";"project.issue.report user";"model_project_issue_report";"project.group_project_user";1;0;0;0
|
||||
"access_email_message_issue_project_user";"email.message..user";"mail.model_email_message";"project.group_project_user";1;1;1;0
|
||||
|
||||
|
@@ -27,7 +27,7 @@
|
||||
"website": "http://www.openerp.com",
|
||||
"category": "Project Management",
|
||||
"images": ["images/project_mailgate_task.jpeg"],
|
||||
"depends": ["project", "email"],
|
||||
"depends": ["project", "mail"],
|
||||
"description": """
|
||||
This module is an interface that synchronises mails with OpenERP Project Task.
|
||||
==============================================================================
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
|
||||
"access_email_message_project_manager","project.mailgate.message.manager","email.model_email_message","project.group_project_manager",1,1,1,0
|
||||
"access_email_message_project_user","project.mailgate.message.user","email.model_email_message","project.group_project_user",1,1,1,0
|
||||
"id";"name";"model_id:id";"group_id:id";"perm_read";"perm_write";"perm_create";"perm_unlink"
|
||||
"access_email_message_project_manager";"project.email.message.manager";"mail.model_email_message";"project.group_project_manager";1;1;1;0
|
||||
"access_email_message_project_user";"project.email.message.user";"mail.model_email_message";"project.group_project_user";1;1;1;0
|
||||
|
||||
|
@@ -109,7 +109,7 @@
|
||||
<button name="do_reopen" states="done,cancelled" string="Reactivate" type="object" icon="gtk-convert"/>
|
||||
<button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
|
||||
<button groups="base.group_extended" name="%(project.action_project_task_delegate)d" states="pending,open" string="Delegate" type="action" icon="gtk-sort-descending"/>
|
||||
<button name="%(email.action_email_compose_message_wizard)d" context="{'email_model':'project.task', 'email_res_id': active_id}" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
|
||||
<button name="%(mail.action_email_compose_message_wizard)d" context="{'email_model':'project.task', 'email_res_id': active_id}" states="pending,open" string="Done" type="action" icon="gtk-jump-to"/>
|
||||
</group>
|
||||
</page>
|
||||
<page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}">
|
||||
|
||||
@@ -49,7 +49,7 @@ More information on the methodology:
|
||||
""",
|
||||
'author': 'OpenERP SA',
|
||||
'images': ['images/product_backlogs.jpeg', 'images/project_sprints.jpeg', 'images/scrum_dashboard.jpeg', 'images/scrum_meetings.jpeg'],
|
||||
'depends': ['project', 'process', 'email'],
|
||||
'depends': ['project', 'process', 'mail'],
|
||||
'init_xml': [],
|
||||
'update_xml': [
|
||||
'security/ir.model.access.csv',
|
||||
|
||||
@@ -302,7 +302,7 @@
|
||||
</notebook>
|
||||
<group col="8" colspan="4">
|
||||
<field name="state" readonly="1"/>
|
||||
<button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
|
||||
<button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
|
||||
string="Burndown Chart" type="action" icon="gtk-print"/>
|
||||
<button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
|
||||
<button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
|
||||
@@ -396,7 +396,7 @@
|
||||
<field name="date"/>
|
||||
<field name="sprint_id" domain="[('state', '=', 'open')]"/>
|
||||
<field name="user_id"/>
|
||||
<button name="%(email.action_email_compose_message_wizard)d"
|
||||
<button name="%(mail.action_email_compose_message_wizard)d"
|
||||
string="Send Email" type="action" icon="terp-mail-message-new"
|
||||
context="{'email_model': 'project.scrum.meeting', 'email_res_id': active_id}"/>
|
||||
</group>
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
{
|
||||
"name" : "Sharing Tools",
|
||||
"version" : "1.3",
|
||||
"depends" : ["base", "email"],
|
||||
"depends" : ["base", "mail"],
|
||||
"author" : "OpenERP SA",
|
||||
"category": 'Tools',
|
||||
"description": """
|
||||
|
||||
@@ -33,7 +33,7 @@ Different users may give different answers of question and according to that sur
|
||||
Partners are also sent mails with user name and password for the invitation of the survey
|
||||
""",
|
||||
'author': 'OpenERP SA',
|
||||
'depends': ['base_tools', 'email'],
|
||||
'depends': ['base_tools', 'mail'],
|
||||
'update_xml': ['survey_report.xml',
|
||||
'survey_data.xml',
|
||||
'wizard/survey_selection.xml',
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
"version" : "1.0",
|
||||
"author" : ['OpenERP SA', 'Axelor'],
|
||||
"website" : "http://www.openerp.com/",
|
||||
"depends" : ["base","email"],
|
||||
"depends" : ["base","mail"],
|
||||
"category" : "Tools",
|
||||
"description": """
|
||||
This module is required for the Thuderbird Plug-in to work properly.
|
||||
|
||||
Reference in New Issue
Block a user