[REM]: move smtpclient from addons->extra addons
bzr revid: mga@tinyerp.com-20100518053214-zdhvnr03rl804xe7
This commit is contained in:
parent
a8f570fc90
commit
aa6f8bdced
|
@ -332,7 +332,6 @@ class crm_case_section(osv.osv):
|
|||
'parent_id': fields.many2one('crm.case.section', 'Parent Team'),
|
||||
'child_ids': fields.one2many('crm.case.section', 'parent_id', 'Child Teams'),
|
||||
'resource_calendar_id': fields.many2one('resource.calendar', "Resource's Calendar"),
|
||||
'server_id':fields.many2one('email.smtpclient', 'Server ID'),
|
||||
'note': fields.text('Description'),
|
||||
}
|
||||
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
</group>
|
||||
<group col="2" colspan="1">
|
||||
<separator string="Contact Information" colspan="2"/>
|
||||
<field name="server_id" select="2"/>
|
||||
<field name="reply_to" select="2"/>
|
||||
</group>
|
||||
<group col="2" colspan="1">
|
||||
|
|
|
@ -115,28 +115,17 @@ class crm_send_new_email(osv.osv_memory):
|
|||
x_headers['References'] = "%s" % (message_id)
|
||||
|
||||
flag = False
|
||||
if case.section_id and case.section_id.server_id:
|
||||
flag = smtp_pool.send_email(
|
||||
cr=cr,
|
||||
uid=uid,
|
||||
server_id=case.section_id.server_id.id,
|
||||
emailto=emails,
|
||||
subject=obj.subject,
|
||||
body="<pre>%s</pre>" % body,
|
||||
attachments=attach,
|
||||
headers=x_headers
|
||||
)
|
||||
else:
|
||||
flag = tools.email_send(
|
||||
email_from,
|
||||
emails,
|
||||
obj.subject,
|
||||
body,
|
||||
attach=attach,
|
||||
reply_to=case.section_id.reply_to,
|
||||
openobject_id=str(case.id),
|
||||
x_headers=x_headers
|
||||
)
|
||||
|
||||
flag = tools.email_send(
|
||||
email_from,
|
||||
emails,
|
||||
obj.subject,
|
||||
body,
|
||||
attach=attach,
|
||||
reply_to=case.section_id.reply_to,
|
||||
openobject_id=str(case.id),
|
||||
x_headers=x_headers
|
||||
)
|
||||
|
||||
if flag:
|
||||
if obj.state == 'unchanged':
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
{
|
||||
"name" : "Fetchmail Server",
|
||||
"version" : "1.0",
|
||||
"depends" : ["base", "mail_gateway"],
|
||||
"depends" : ["base"],
|
||||
"author" : "Tiny",
|
||||
"description": """Fetchail:
|
||||
* Fetch email from Pop / IMAP server
|
||||
|
|
|
@ -74,9 +74,15 @@
|
|||
<field name="context">{'type':'pop'}</field>
|
||||
<field name="domain">[('type','=','pop')]</field>
|
||||
</record>
|
||||
|
||||
<menuitem
|
||||
parent="base.menu_config"
|
||||
id="menu_action_fetchmail_server_tree"
|
||||
name="Fetchmail Services"
|
||||
/>
|
||||
|
||||
<menuitem
|
||||
parent="smtpclient.menu_smtpclient_administration_server"
|
||||
parent="menu_action_fetchmail_server_tree"
|
||||
id="menu_action_email_server_tree"
|
||||
action="action_email_server_tree"
|
||||
/>
|
||||
|
@ -92,7 +98,7 @@
|
|||
</record>
|
||||
|
||||
<menuitem
|
||||
parent="smtpclient.menu_smtpclient_administration_server"
|
||||
parent="menu_action_fetchmail_server_tree"
|
||||
id="menu_action_email_server_tree_imap"
|
||||
action="action_email_server_tree_imap"
|
||||
/>
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
* Easy Integration with any Module""",
|
||||
'author': 'Tiny',
|
||||
'website': 'http://www.openerp.com',
|
||||
'depends': ['smtpclient'],
|
||||
'depends': ['base','fetchmail'],
|
||||
'init_xml': [],
|
||||
'update_xml': [
|
||||
"mail_gateway_view.xml"
|
||||
|
|
Loading…
Reference in New Issue