diff options
| -rw-r--r-- | addons/account_followup/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/base_action_rule/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/base_calendar/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/crm/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/crm/crm_lead_view.xml | 8 | ||||
| -rw-r--r-- | addons/crm/crm_opportunity_view.xml | 8 | ||||
| -rw-r--r-- | addons/crm/security/ir.model.access.csv | 8 | ||||
| -rw-r--r-- | addons/crm_claim/crm_claim_view.xml | 6 | ||||
| -rw-r--r-- | addons/crm_fundraising/crm_fundraising_view.xml | 6 | ||||
| -rw-r--r-- | addons/crm_helpdesk/crm_helpdesk_view.xml | 6 | ||||
| -rw-r--r-- | addons/email/__init__.py (renamed from addons/emails/__init__.py) | 1 | ||||
| -rw-r--r-- | addons/email/__openerp__.py (renamed from addons/emails/__openerp__.py) | 1 | ||||
| -rw-r--r-- | addons/email/email_data.xml (renamed from addons/emails/email_data.xml) | 0 | ||||
| -rw-r--r-- | addons/email/email_gateway.py (renamed from addons/email_gateway/email_gateway.py) | 0 | ||||
| -rw-r--r-- | addons/email/email_gateway_view.xml (renamed from addons/email_gateway/email_gateway_view.xml) | 0 | ||||
| -rw-r--r-- | addons/email/email_message.py (renamed from addons/emails/email_message.py) | 0 | ||||
| -rw-r--r-- | addons/email/email_smtp_server.py (renamed from addons/emails/email_smtp_server.py) | 0 | ||||
| -rw-r--r-- | addons/email/email_view.xml (renamed from addons/emails/email_view.xml) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/ca.po (renamed from addons/emails/i18n/ca.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/de.po (renamed from addons/emails/i18n/de.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/es.po (renamed from addons/emails/i18n/es.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/fr.po (renamed from addons/emails/i18n/fr.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/hu.po (renamed from addons/emails/i18n/hu.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/it.po (renamed from addons/emails/i18n/it.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/lt.po (renamed from addons/emails/i18n/lt.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/lv.po (renamed from addons/emails/i18n/lv.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/mail_gateway.pot (renamed from addons/emails/i18n/mail_gateway.pot) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/nl.po (renamed from addons/emails/i18n/nl.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/pl.po (renamed from addons/emails/i18n/pl.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/pt.po (renamed from addons/emails/i18n/pt.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/pt_BR.po (renamed from addons/emails/i18n/pt_BR.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/ro.po (renamed from addons/emails/i18n/ro.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/ru.po (renamed from addons/emails/i18n/ru.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/sl.po (renamed from addons/emails/i18n/sl.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/sr@latin.po (renamed from addons/emails/i18n/sr@latin.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/sv.po (renamed from addons/emails/i18n/sv.po) | 0 | ||||
| -rw-r--r-- | addons/email/i18n/zh_CN.po (renamed from addons/emails/i18n/zh_CN.po) | 0 | ||||
| -rw-r--r-- | addons/email/res_partner.py (renamed from addons/emails/res_partner.py) | 0 | ||||
| -rw-r--r-- | addons/email/res_partner_view.xml (renamed from addons/emails/res_partner_view.xml) | 0 | ||||
| -rw-r--r-- | addons/email/scripts/__init__.py (renamed from addons/email_gateway/scripts/__init__.py) | 0 | ||||
| -rw-r--r-- | addons/email/scripts/openerp_mailgate/__init__.py (renamed from addons/email_gateway/scripts/openerp_mailgate/__init__.py) | 0 | ||||
| -rw-r--r-- | addons/email/scripts/openerp_mailgate/openerp_mailgate.py (renamed from addons/email_gateway/scripts/openerp_mailgate/openerp_mailgate.py) | 0 | ||||
| -rw-r--r-- | addons/email/security/ir.model.access.csv (renamed from addons/emails/security/ir.model.access.csv) | 3 | ||||
| -rw-r--r-- | addons/email/wizard/__init__.py (renamed from addons/emails/wizard/__init__.py) | 0 | ||||
| -rw-r--r-- | addons/email/wizard/email_compose_message.py (renamed from addons/emails/wizard/email_compose_message.py) | 0 | ||||
| -rw-r--r-- | addons/email/wizard/email_compose_message_view.xml (renamed from addons/emails/wizard/email_compose_message_view.xml) | 0 | ||||
| -rw-r--r-- | addons/email_gateway/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/email_template/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/email_template/email_template.py | 2 | ||||
| -rw-r--r-- | addons/email_template/email_template_view.xml | 4 | ||||
| -rw-r--r-- | addons/email_template/wizard/email_compose_message_view.xml | 2 | ||||
| -rw-r--r-- | addons/event/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/event/event_view.xml | 6 | ||||
| -rw-r--r-- | addons/fetchmail/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/fetchmail/fetchmail_view.xml | 6 | ||||
| -rw-r--r-- | addons/hr_recruitment/hr_recruitment_view.xml | 6 | ||||
| -rw-r--r-- | addons/hr_recruitment/security/ir.model.access.csv | 2 | ||||
| -rw-r--r-- | addons/marketing_campaign/security/ir.model.access.csv | 4 | ||||
| -rw-r--r-- | addons/outlook/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/project/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/project_issue/project_issue_view.xml | 6 | ||||
| -rw-r--r-- | addons/project_issue/security/ir.model.access.csv | 4 | ||||
| -rw-r--r-- | addons/project_mailgate/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/project_mailgate/security/ir.model.access.csv | 4 | ||||
| -rw-r--r-- | addons/project_planning/project_planning_view.xml | 2 | ||||
| -rw-r--r-- | addons/project_scrum/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/project_scrum/project_scrum_view.xml | 2 | ||||
| -rw-r--r-- | addons/share/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/survey/__openerp__.py | 2 | ||||
| -rw-r--r-- | addons/thunderbird/__openerp__.py | 2 |
70 files changed, 65 insertions, 62 deletions
diff --git a/addons/account_followup/__openerp__.py b/addons/account_followup/__openerp__.py index 62624fa8801..c0c78ebae4f 100644 --- a/addons/account_followup/__openerp__.py +++ b/addons/account_followup/__openerp__.py @@ -43,7 +43,7 @@ """, 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'depends': ['account', 'emails'], + 'depends': ['account', 'email'], 'init_xml': [], 'update_xml': [ 'security/ir.model.access.csv', diff --git a/addons/base_action_rule/__openerp__.py b/addons/base_action_rule/__openerp__.py index 57818dddc5c..2611bcee042 100644 --- a/addons/base_action_rule/__openerp__.py +++ b/addons/base_action_rule/__openerp__.py @@ -26,7 +26,7 @@ 'description': "This module allows to implement action rules for any object.", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'depends': ['base', 'emails'], + 'depends': ['base', 'email'], 'init_xml': [ 'base_action_rule_data.xml' ], diff --git a/addons/base_calendar/__openerp__.py b/addons/base_calendar/__openerp__.py index 9c0e4857d13..4b6cceb5f9c 100644 --- a/addons/base_calendar/__openerp__.py +++ b/addons/base_calendar/__openerp__.py @@ -22,7 +22,7 @@ { "name" : "Basic Calendar Functionality", "version" : "1.0", - "depends" : ["base", "emails"], + "depends" : ["base", "email"], 'description': """Full featured calendar system that supports: - Calendar of events - Alerts (create requests) diff --git a/addons/crm/__openerp__.py b/addons/crm/__openerp__.py index a6e42dd211e..338870f5006 100644 --- a/addons/crm/__openerp__.py +++ b/addons/crm/__openerp__.py @@ -56,7 +56,7 @@ Create dashboard for CRM that includes: 'base', 'base_action_rule', 'process', - 'email_gateway', + 'email', 'base_calendar', 'resource', 'board' diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 02d0ad646d0..c019c451f53 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -107,7 +107,7 @@ <separator string="Communication" colspan="4" col="3"/> <field name="email_from" widget="email"/> <button string="Send Email" - name="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="description" colspan="4" nolabel="1" height="250"/> <button colspan="4" string="Reply" - name="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="%(emails.action_email_compose_message_wizard)d" + name="%(email.action_email_compose_message_wizard)d" context="{'email_model':'crm.lead', 'email_res_id': active_id}" icon="terp-mail-message-new" type="action"/> </page> diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml index fc8be9ae32a..46555021265 100644 --- a/addons/crm/crm_opportunity_view.xml +++ b/addons/crm/crm_opportunity_view.xml @@ -60,7 +60,7 @@ <group col="3" colspan="2"> <field name="email_from" string="Email" /> <button string="Send Email" - name="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="%(emails.action_email_compose_message_wizard)d" + name="%(email.action_email_compose_message_wizard)d" context="{'email_model': 'crm.lead', 'email_res_id': active_id}" icon="terp-mail-message-new" type="action"/> </page> diff --git a/addons/crm/security/ir.model.access.csv b/addons/crm/security/ir.model.access.csv index 0aadde440f2..142c5282bb2 100644 --- a/addons/crm/security/ir.model.access.csv +++ b/addons/crm/security/ir.model.access.csv @@ -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","emails.email.message.manager","emails.model_email_message","base.group_sale_manager",1,0,0,0 -"email_mailgate_thread_manager","email_gateway.mailgate.thread.manager","email_gateway.model_mailgate_thread","base.group_sale_manager",1,1,1,1 +"email_email_message_manager","email.email.message.manager","email.model_email_message","base.group_sale_manager",1,0,0,0 +"email_thread_manager","email.mailgate.thread.manager","email.model_mailgate_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_gateway_mailgate_thread","email_gateway.mailgate.thread","email_gateway.model_mailgate_thread","base.group_sale_salesman",1,1,1,1 -"email_gateway_email_message_user","emails.email.message.user","emails.model_email_message","base.group_sale_salesman",1,1,1,1 +"email_mailgate_thread","email.mailgate.thread","email.model_mailgate_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 "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 diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml index c10d1d8565e..b40c953b52d 100644 --- a/addons/crm_claim/crm_claim_view.xml +++ b/addons/crm_claim/crm_claim_view.xml @@ -177,7 +177,7 @@ <field name="display_text" string="History Information"/> <button string="Reply" attrs="{'invisible': [('history', '!=', True)]}" - name="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="%(emails.action_email_compose_message_wizard)d" + name="%(email.action_email_compose_message_wizard)d" context="{'email_model':'crm.claim', 'email_res_id': active_id}" icon="terp-mail-message-new" type="action"/> </page> diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml index 33e8037964b..159c3f361a6 100644 --- a/addons/crm_fundraising/crm_fundraising_view.xml +++ b/addons/crm_fundraising/crm_fundraising_view.xml @@ -168,7 +168,7 @@ <field name="history" invisible="1"/> <button string="Reply" attrs="{'invisible': [('history', '!=', True)]}" - name="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="%(emails.action_email_compose_message_wizard)d" + name="%(email.action_email_compose_message_wizard)d" context="{'email_model':'crm.fundraising', 'email_res_id': active_id}" icon="terp-mail-message-new" type="action"/> </page> diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml index ca8c0be1851..0613b1e2c78 100644 --- a/addons/crm_helpdesk/crm_helpdesk_view.xml +++ b/addons/crm_helpdesk/crm_helpdesk_view.xml @@ -102,7 +102,7 @@ <field name="history" invisible="1"/> <button string="Reply" attrs="{'invisible': [('history', '!=', True)]}" - name="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="%(emails.action_email_compose_message_wizard)d" + name="%(email.action_email_compose_message_wizard)d" context="{'email_model':'crm.helpdesk', 'email_res_id': active_id}" icon="terp-mail-message-new" type="action"/> </page> diff --git a/addons/emails/__init__.py b/addons/email/__init__.py index dd9a7e703d0..f038c9f6cab 100644 --- a/addons/emails/__init__.py +++ b/addons/email/__init__.py @@ -21,6 +21,7 @@ import email_smtp_server import email_message +import email_gateway import res_partner import wizard diff --git a/addons/emails/__openerp__.py b/addons/email/__openerp__.py index a6c24087055..80c5088e181 100644 --- a/addons/emails/__openerp__.py +++ b/addons/email/__openerp__.py @@ -34,6 +34,7 @@ 'update_xml': [ "wizard/email_compose_message_view.xml", "email_view.xml", + "email_gateway_view.xml", "res_partner_view.xml", 'security/ir.model.access.csv', 'email_data.xml', diff --git a/addons/emails/email_data.xml b/addons/email/email_data.xml index 76adcf62810..76adcf62810 100644 --- a/addons/emails/email_data.xml +++ b/addons/email/email_data.xml diff --git a/addons/email_gateway/email_gateway.py b/addons/email/email_gateway.py index 3de3f04141f..3de3f04141f 100644 --- a/addons/email_gateway/email_gateway.py +++ b/addons/email/email_gateway.py diff --git a/addons/email_gateway/email_gateway_view.xml b/addons/email/email_gateway_view.xml index 9fc708eac0f..9fc708eac0f 100644 --- a/addons/email_gateway/email_gateway_view.xml +++ b/addons/email/email_gateway_view.xml diff --git a/addons/emails/email_message.py b/addons/email/email_message.py index cf703a78788..cf703a78788 100644 --- a/addons/emails/email_message.py +++ b/addons/email/email_message.py diff --git a/addons/emails/email_smtp_server.py b/addons/email/email_smtp_server.py index 2af9030ca04..2af9030ca04 100644 --- a/addons/emails/email_smtp_server.py +++ b/addons/email/email_smtp_server.py diff --git a/addons/emails/email_view.xml b/addons/email/email_view.xml index 66c749f69ca..66c749f69ca 100644 --- a/addons/emails/email_view.xml +++ b/addons/email/email_view.xml diff --git a/addons/emails/i18n/ca.po b/addons/email/i18n/ca.po index 7704546c71f..7704546c71f 100644 --- a/addons/emails/i18n/ca.po +++ b/addons/email/i18n/ca.po diff --git a/addons/emails/i18n/de.po b/addons/email/i18n/de.po index b36d0701204..b36d0701204 100644 --- a/addons/emails/i18n/de.po +++ b/addons/email/i18n/de.po diff --git a/addons/emails/i18n/es.po b/addons/email/i18n/es.po index ac62ed0d864..ac62ed0d864 100644 --- a/addons/emails/i18n/es.po +++ b/addons/email/i18n/es.po diff --git a/addons/emails/i18n/fr.po b/addons/email/i18n/fr.po index 9bf4d2f5c2c..9bf4d2f5c2c 100644 --- a/addons/emails/i18n/fr.po +++ b/addons/email/i18n/fr.po diff --git a/addons/emails/i18n/hu.po b/addons/email/i18n/hu.po index f8236505f88..f8236505f88 100644 --- a/addons/emails/i18n/hu.po +++ b/addons/email/i18n/hu.po diff --git a/addons/emails/i18n/it.po b/addons/email/i18n/it.po index 275ec375c73..275ec375c73 100644 --- a/addons/emails/i18n/it.po +++ b/addons/email/i18n/it.po diff --git a/addons/emails/i18n/lt.po b/addons/email/i18n/lt.po index 01abfbc396d..01abfbc396d 100644 --- a/addons/emails/i18n/lt.po +++ b/addons/email/i18n/lt.po diff --git a/addons/emails/i18n/lv.po b/addons/email/i18n/lv.po index 58479400385..58479400385 100644 --- a/addons/emails/i18n/lv.po +++ b/addons/email/i18n/lv.po diff --git a/addons/emails/i18n/mail_gateway.pot b/addons/email/i18n/mail_gateway.pot index 42cb1443822..42cb1443822 100644 --- a/addons/emails/i18n/mail_gateway.pot +++ b/addons/email/i18n/mail_gateway.pot diff --git a/addons/emails/i18n/nl.po b/addons/email/i18n/nl.po index df8e58f3089..df8e58f3089 100644 --- a/addons/emails/i18n/nl.po +++ b/addons/email/i18n/nl.po diff --git a/addons/emails/i18n/pl.po b/addons/email/i18n/pl.po index 6e2a215b3dc..6e2a215b3dc 100644 --- a/addons/emails/i18n/pl.po +++ b/addons/email/i18n/pl.po diff --git a/addons/emails/i18n/pt.po b/addons/email/i18n/pt.po index 1daef2ae689..1daef2ae689 100644 --- a/addons/emails/i18n/pt.po +++ b/addons/email/i18n/pt.po diff --git a/addons/emails/i18n/pt_BR.po b/addons/email/i18n/pt_BR.po index 84fffb5aa8a..84fffb5aa8a 100644 --- a/addons/emails/i18n/pt_BR.po +++ b/addons/email/i18n/pt_BR.po diff --git a/addons/emails/i18n/ro.po b/addons/email/i18n/ro.po index d784550424c..d784550424c 100644 --- a/addons/emails/i18n/ro.po +++ b/addons/email/i18n/ro.po diff --git a/addons/emails/i18n/ru.po b/addons/email/i18n/ru.po index cd9c07fd77b..cd9c07fd77b 100644 --- a/addons/emails/i18n/ru.po +++ b/addons/email/i18n/ru.po diff --git a/addons/emails/i18n/sl.po b/addons/email/i18n/sl.po index 1cf8579fae2..1cf8579fae2 100644 --- a/addons/emails/i18n/sl.po +++ b/addons/email/i18n/sl.po diff --git a/addons/emails/i18n/sr@latin.po b/addons/email/i18n/sr@latin.po index 2ff1cda26cd..2ff1cda26cd 100644 --- a/addons/emails/i18n/sr@latin.po +++ b/addons/email/i18n/sr@latin.po diff --git a/addons/emails/i18n/sv.po b/addons/email/i18n/sv.po index e20a74bdc24..e20a74bdc24 100644 --- a/addons/emails/i18n/sv.po +++ b/addons/email/i18n/sv.po diff --git a/addons/emails/i18n/zh_CN.po b/addons/email/i18n/zh_CN.po index 549632042d5..549632042d5 100644 --- a/addons/emails/i18n/zh_CN.po +++ b/addons/email/i18n/zh_CN.po diff --git a/addons/emails/res_partner.py b/addons/email/res_partner.py index 655948d9d1c..655948d9d1c 100644 --- a/addons/emails/res_partner.py +++ b/addons/email/res_partner.py diff --git a/addons/emails/res_partner_view.xml b/addons/email/res_partner_view.xml index 21da7d735b7..21da7d735b7 100644 --- a/addons/emails/res_partner_view.xml +++ b/addons/email/res_partner_view.xml diff --git a/addons/email_gateway/scripts/__init__.py b/addons/email/scripts/__init__.py index 9d7f6bf56c9..9d7f6bf56c9 100644 --- a/addons/email_gateway/scripts/__init__.py +++ b/addons/email/scripts/__init__.py diff --git a/addons/email_gateway/scripts/openerp_mailgate/__init__.py b/addons/email/scripts/openerp_mailgate/__init__.py index 4f7fae0a190..4f7fae0a190 100644 --- a/addons/email_gateway/scripts/openerp_mailgate/__init__.py +++ b/addons/email/scripts/openerp_mailgate/__init__.py diff --git a/addons/email_gateway/scripts/openerp_mailgate/openerp_mailgate.py b/addons/email/scripts/openerp_mailgate/openerp_mailgate.py index 204cb2d5d03..204cb2d5d03 100644 --- a/addons/email_gateway/scripts/openerp_mailgate/openerp_mailgate.py +++ b/addons/email/scripts/openerp_mailgate/openerp_mailgate.py diff --git a/addons/emails/security/ir.model.access.csv b/addons/email/security/ir.model.access.csv index e6b6a1dff0f..bc1df5fbb54 100644 --- a/addons/emails/security/ir.model.access.csv +++ b/addons/email/security/ir.model.access.csv @@ -1,3 +1,4 @@ "id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink" "access_email_smtp_server","email.smtp_server","model_email_smtp_server",,1,0,0,0 -"access_email_message","email.message","model_email_message",,1,0,0,0
\ No newline at end of file +"access_email_message","email.message","model_email_message",,1,0,0,0 +"access_mailgate_thread","mailgate.thread","model_mailgate_thread",,1,0,0,0
\ No newline at end of file diff --git a/addons/emails/wizard/__init__.py b/addons/email/wizard/__init__.py index 16ba392b2d7..16ba392b2d7 100644 --- a/addons/emails/wizard/__init__.py +++ b/addons/email/wizard/__init__.py diff --git a/addons/emails/wizard/email_compose_message.py b/addons/email/wizard/email_compose_message.py index b198378ea8b..b198378ea8b 100644 --- a/addons/emails/wizard/email_compose_message.py +++ b/addons/email/wizard/email_compose_message.py diff --git a/addons/emails/wizard/email_compose_message_view.xml b/addons/email/wizard/email_compose_message_view.xml index a4984ff1ad8..a4984ff1ad8 100644 --- a/addons/emails/wizard/email_compose_message_view.xml +++ b/addons/email/wizard/email_compose_message_view.xml diff --git a/addons/email_gateway/__openerp__.py b/addons/email_gateway/__openerp__.py index efef4153d79..96a459b946e 100644 --- a/addons/email_gateway/__openerp__.py +++ b/addons/email_gateway/__openerp__.py @@ -28,7 +28,7 @@ * Easy Integration with any Module""", 'author': 'OpenERP SA', 'website': 'http://www.openerp.com', - 'depends': ['base','emails'], + 'depends': ['base','email'], 'init_xml': [], 'update_xml': [ "email_gateway_view.xml", diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py index 15ccec71ab7..6b2a3374434 100644 --- a/addons/email_template/__openerp__.py +++ b/addons/email_template/__openerp__.py @@ -26,7 +26,7 @@ "author" : "Openlabs", "website" : "http://openerp.com", "category" : "Added functionality", - "depends" : [ 'emails'], + "depends" : [ 'email'], "description": """ Email Template is extraction of Power Email basically just to send the emails. """, diff --git a/addons/email_template/email_template.py b/addons/email_template/email_template.py index ea09a7fff8b..b07a27e2abd 100644 --- a/addons/email_template/email_template.py +++ b/addons/email_template/email_template.py @@ -183,7 +183,7 @@ This is useful for CRM leads for example"), data_obj = self.pool.get('ir.model.data') for template in self.browse(cr, uid, ids, context=context): src_obj = template.model_id.model - model_data_id = data_obj._get_id(cr, uid, 'emails', 'email_compose_message_wizard_form') + model_data_id = data_obj._get_id(cr, uid, 'email', 'email_compose_message_wizard_form') res_id = data_obj.browse(cr, uid, model_data_id, context=context).res_id vals['ref_ir_act_window'] = action_obj.create(cr, uid, { 'name': template.name, diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml index b74666c27c3..e38a47756d5 100644 --- a/addons/email_template/email_template_view.xml +++ b/addons/email_template/email_template_view.xml @@ -153,14 +153,14 @@ </record> <menuitem name="Templates" id="menu_email_template_all_tools" - parent="emails.menu_email_message_tools" action="action_email_template_tree_all" /> + parent="email.menu_email_message_tools" action="action_email_template_tree_all" /> <!-- Inherit email.message view --> <record model="ir.ui.view" id="view_email_message_template_form"> <field name="name">email.message.template.form</field> <field name="model">email.message</field> - <field name="inherit_id" ref="emails.view_email_message_form"/> + <field name="inherit_id" ref="email.view_email_message_form"/> <field name="type">form</field> <field name="arch" type="xml"> <field name="debug" position="after"> diff --git a/addons/email_template/wizard/email_compose_message_view.xml b/addons/email_template/wizard/email_compose_message_view.xml index c7f2e5f37b9..249b4f16e63 100644 --- a/addons/email_template/wizard/email_compose_message_view.xml +++ b/addons/email_template/wizard/email_compose_message_view.xml @@ -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="emails.email_compose_message_wizard_form"/> + <field name="inherit_id" ref="email.email_compose_message_wizard_form"/> <field name="arch" type="xml"> <field name="res_id" position="replace"> <field name="template_id" colspan="4" diff --git a/addons/event/__openerp__.py b/addons/event/__openerp__.py index f7fe005c25f..370f31b3bce 100644 --- a/addons/event/__openerp__.py +++ b/addons/event/__openerp__.py @@ -39,7 +39,7 @@ Events / Reporting """, 'author': 'OpenERP SA', - 'depends': ['crm', 'base_contact', 'account', 'marketing', 'emails'], + 'depends': ['crm', 'base_contact', 'account', 'marketing', 'email'], 'init_xml': [], 'update_xml': [ 'security/event_security.xml', diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 321f919502c..e5533615a61 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -393,7 +393,7 @@ <field name="history" invisible="1"/> <button string="Reply" attrs="{'invisible': [('history', '!=', True)]}" - name="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="%(emails.action_email_compose_message_wizard)d" + name="%(email.action_email_compose_message_wizard)d" context="{'email_model':'event.registration', 'email_res_id': active_id}" icon="terp-mail-message-new" type="action"/> </page> diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py index eba4bb2ee67..c474edf6c95 100644 --- a/addons/fetchmail/__openerp__.py +++ b/addons/fetchmail/__openerp__.py @@ -24,7 +24,7 @@ { "name" : "Fetchmail Server", "version" : "1.0", - "depends" : ["base", 'email_gateway'], + "depends" : ["base", 'email'], "author" : "OpenERP SA", "description": """Fetchmail: * Fetch email from Pop / IMAP server diff --git a/addons/fetchmail/fetchmail_view.xml b/addons/fetchmail/fetchmail_view.xml index fec467083a7..be3b2184a3e 100644 --- a/addons/fetchmail/fetchmail_view.xml +++ b/addons/fetchmail/fetchmail_view.xml @@ -102,7 +102,7 @@ </record> <menuitem - parent="emails.menu_config_email" + parent="email.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="emails.view_email_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"/> @@ -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="emails.view_email_message_search"/> + <field name="inherit_id" ref="email.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'}"/> diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml index 6b65b0ee5f7..e6189cd8123 100644 --- a/addons/hr_recruitment/hr_recruitment_view.xml +++ b/addons/hr_recruitment/hr_recruitment_view.xml @@ -147,7 +147,7 @@ <field name="history" invisible="1"/> <button string="Reply" attrs="{'invisible': [('history', '!=', True)]}" - name="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="%(emails.action_email_compose_message_wizard)d" + name="%(email.action_email_compose_message_wizard)d" context="{'email_model': 'hr.applicant', 'email_res_id': active_id}" icon="terp-mail-message-new" type="action"/> </page> diff --git a/addons/hr_recruitment/security/ir.model.access.csv b/addons/hr_recruitment/security/ir.model.access.csv index 49ac8c76214..e5eb180f9ee 100644 --- a/addons/hr_recruitment/security/ir.model.access.csv +++ b/addons/hr_recruitment/security/ir.model.access.csv @@ -3,7 +3,7 @@ "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","emails.model_email_message","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 diff --git a/addons/marketing_campaign/security/ir.model.access.csv b/addons/marketing_campaign/security/ir.model.access.csv index f6663dfca82..3056b691b5f 100644 --- a/addons/marketing_campaign/security/ir.model.access.csv +++ b/addons/marketing_campaign/security/ir.model.access.csv @@ -7,7 +7,7 @@ "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","emails.account.user","emails.model_email_smtp_server","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 @@ -18,4 +18,4 @@ "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","emails.account.manager","emails.model_email_smtp_server","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 diff --git a/addons/outlook/__openerp__.py b/addons/outlook/__openerp__.py index 9362c706d14..fdf64ff0bd7 100644 --- a/addons/outlook/__openerp__.py +++ b/addons/outlook/__openerp__.py @@ -25,7 +25,7 @@ 'version' : '1.0', 'author' : 'OpenERP SA', 'website' : 'http://www.openerp.com/', - 'depends' : ['base', 'email_gateway'], + 'depends' : ['base', 'email'], 'category' : 'Generic Modules/Outlook interface', 'description': ''' This module provide the Outlook plug-in. diff --git a/addons/project/__openerp__.py b/addons/project/__openerp__.py index b32a9b86f74..6f35761fda2 100644 --- a/addons/project/__openerp__.py +++ b/addons/project/__openerp__.py @@ -26,7 +26,7 @@ "author": "OpenERP SA", "website": "http://www.openerp.com", "category": "Generic Modules/Projects & Services", - "depends": ["product", "analytic", "board", "emails"], + "depends": ["product", "analytic", "board", "email"], "description": """Project management module tracks multi-level projects, tasks, work done on tasks, eso. It is able to render planning, order tasks, eso. Dashboard for project members that includes: diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml index 894025df71e..5d4cba851cc 100644 --- a/addons/project_issue/project_issue_view.xml +++ b/addons/project_issue/project_issue_view.xml @@ -103,7 +103,7 @@ <field name="history" invisible="1"/> <button string="Reply" attrs="{'invisible': [('history', '!=', True)]}" - name="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="description" colspan="4" nolabel="1" height="250"/> <button colspan="4" string="Reply" - name="%(emails.action_email_compose_message_wizard)d" + name="%(email.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="%(emails.action_email_compose_message_wizard)d" + name="%(email.action_email_compose_message_wizard)d" context="{'email_model':'project.issue', 'email_res_id': active_id}" icon="terp-mail-message-new" type="action"/> </page> diff --git a/addons/project_issue/security/ir.model.access.csv b/addons/project_issue/security/ir.model.access.csv index fbb56803b89..59f67eda7e0 100644 --- a/addons/project_issue/security/ir.model.access.csv +++ b/addons/project_issue/security/ir.model.access.csv @@ -5,7 +5,7 @@ "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","emails.model_email_message","project.group_project_manager",1,1,1,1 +"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","emails.model_email_message","project.group_project_user",1,1,1,0 +"access_email_message_issue_project_user","project.mailgate.message.issue.user","email.model_email_message","project.group_project_user",1,1,1,0 diff --git a/addons/project_mailgate/__openerp__.py b/addons/project_mailgate/__openerp__.py index 065538a826a..33bf9bb162d 100644 --- a/addons/project_mailgate/__openerp__.py +++ b/addons/project_mailgate/__openerp__.py @@ -26,7 +26,7 @@ "author": "OpenERP SA", "website": "http://www.openerp.com", "category": "Generic Modules/Projects & Services", - "depends": ["project", "email_gateway"], + "depends": ["project", "email"], "description": """This module is an interface that synchronises mails with OpenERP Project Task. It allows creating tasks as soon as a new mail arrives in our configured mail server. diff --git a/addons/project_mailgate/security/ir.model.access.csv b/addons/project_mailgate/security/ir.model.access.csv index b19b82e84a2..72a4763c18f 100644 --- a/addons/project_mailgate/security/ir.model.access.csv +++ b/addons/project_mailgate/security/ir.model.access.csv @@ -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","emails.model_email_message","project.group_project_manager",1,1,1,0 -"access_email_message_project_user","project.mailgate.message.user","emails.model_email_message","project.group_project_user",1,1,1,0 +"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 diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml index ec380b0cc2c..5d23cdcbdbf 100644 --- a/addons/project_planning/project_planning_view.xml +++ b/addons/project_planning/project_planning_view.xml @@ -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="%(emails.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="%(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"/> </group> </page> <page groups="base.group_extended" string="Extra Info" attrs="{'readonly':[('state','=','done')]}"> diff --git a/addons/project_scrum/__openerp__.py b/addons/project_scrum/__openerp__.py index eb86798c493..96711e61f9a 100644 --- a/addons/project_scrum/__openerp__.py +++ b/addons/project_scrum/__openerp__.py @@ -47,7 +47,7 @@ * http://controlchaos.com """, 'author': 'OpenERP SA', - 'depends': ['project', 'process', 'emails'], + 'depends': ['project', 'process', 'email'], 'init_xml': [], 'update_xml': [ 'security/ir.model.access.csv', diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml index 88cec4e4f23..722bd9d6f96 100644 --- a/addons/project_scrum/project_scrum_view.xml +++ b/addons/project_scrum/project_scrum_view.xml @@ -394,7 +394,7 @@ <field name="date"/> <field name="sprint_id" domain="[('state', '=', 'open')]"/> <field name="user_id"/> - <button name="%(emails.action_email_compose_message_wizard)d" + <button name="%(email.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> diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py index 41923923a4c..fd9e104fc37 100644 --- a/addons/share/__openerp__.py +++ b/addons/share/__openerp__.py @@ -23,7 +23,7 @@ { "name" : "Sharing Tools", "version" : "1.3", - "depends" : ["base", "emails"], + "depends" : ["base", "email"], "author" : "OpenERP SA", "category": 'Generic Modules', "description": """ diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py index ad1fb7aaaea..349b83fbf32 100644 --- a/addons/survey/__openerp__.py +++ b/addons/survey/__openerp__.py @@ -30,7 +30,7 @@ Partners are also sent mails with user name and password for the invitation of the survey """, 'author': 'OpenERP SA', - 'depends': ['base_tools', 'emails'], + 'depends': ['base_tools', 'email'], 'update_xml': ['survey_report.xml', 'survey_data.xml', 'wizard/survey_selection.xml', diff --git a/addons/thunderbird/__openerp__.py b/addons/thunderbird/__openerp__.py index e36b186d637..ddea8167743 100644 --- a/addons/thunderbird/__openerp__.py +++ b/addons/thunderbird/__openerp__.py @@ -24,7 +24,7 @@ "version" : "1.0", "author" : "OpenERP SA & Axelor", "website" : "http://www.openerp.com/", - "depends" : ["base","email_gateway"], + "depends" : ["base","email"], "category" : "Generic Modules/Thunderbird interface", "description": """ This module is required for the thuderbird plug-in to work |