summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--addons/crm_iap_lead/__manifest__.py10
-rw-r--r--addons/crm_iap_lead/models/crm_iap_lead_mining_request.py2
-rw-r--r--addons/crm_iap_lead/views/assets.xml (renamed from addons/crm_iap_lead/views/crm_iap_lead_templates.xml)0
-rw-r--r--addons/crm_iap_lead/views/mail_templates.xml (renamed from addons/crm_iap_lead/data/message_template.xml)2
-rw-r--r--addons/crm_iap_lead_enrich/__manifest__.py4
-rw-r--r--addons/crm_iap_lead_enrich/models/crm_lead.py2
-rw-r--r--addons/crm_iap_lead_website/__manifest__.py8
-rw-r--r--addons/crm_iap_lead_website/models/crm_reveal_rule.py2
-rw-r--r--addons/iap_mail/__manifest__.py21
-rw-r--r--addons/iap_mail/views/mail_templates.xml (renamed from addons/partner_autocomplete/views/additional_info_template.xml)3
-rw-r--r--addons/partner_autocomplete/__manifest__.py8
-rw-r--r--addons/partner_autocomplete/models/res_partner.py2
-rw-r--r--addons/sms/__manifest__.py10
-rw-r--r--addons/snailmail/__manifest__.py7
-rw-r--r--odoo/addons/base/__manifest__.py2
15 files changed, 64 insertions, 19 deletions
diff --git a/addons/crm_iap_lead/__manifest__.py b/addons/crm_iap_lead/__manifest__.py
index a59d254a678..f28486212b9 100644
--- a/addons/crm_iap_lead/__manifest__.py
+++ b/addons/crm_iap_lead/__manifest__.py
@@ -5,19 +5,23 @@
'name': 'Lead Generation',
'summary': 'Create Leads/Opportunities based on country, industries, size, etc.',
'category': 'Sales/CRM',
- 'depends': ['iap', 'crm', 'partner_autocomplete'],
+ 'version': '1.1',
+ 'depends': [
+ 'iap_mail',
+ 'crm',
+ ],
'data': [
'data/crm.iap.lead.industry.csv',
'data/crm.iap.lead.role.csv',
'data/crm.iap.lead.seniority.csv',
- 'data/message_template.xml',
'data/crm_iap_lead_data.xml',
'data/ir_sequence_data.xml',
'security/ir.model.access.csv',
+ 'views/assets.xml',
'views/crm_lead_view.xml',
'views/crm_iap_lead_views.xml',
'views/res_config_settings_views.xml',
- 'views/crm_iap_lead_templates.xml',
+ 'views/mail_templates.xml',
],
'qweb': [
'static/src/xml/leads_tree_generate_leads_views.xml',
diff --git a/addons/crm_iap_lead/models/crm_iap_lead_mining_request.py b/addons/crm_iap_lead/models/crm_iap_lead_mining_request.py
index 4179861e343..ede89baaf54 100644
--- a/addons/crm_iap_lead/models/crm_iap_lead_mining_request.py
+++ b/addons/crm_iap_lead/models/crm_iap_lead_mining_request.py
@@ -204,7 +204,7 @@ class CRMLeadMiningRequest(models.Model):
leads = self.env['crm.lead'].create(lead_vals_list)
for lead in leads:
if messages_to_post.get(lead.reveal_id):
- lead.message_post_with_view('partner_autocomplete.enrich_service_information', values=messages_to_post[lead.reveal_id], subtype_id=self.env.ref('mail.mt_note').id)
+ lead.message_post_with_view('iap_mail.enrich_company', values=messages_to_post[lead.reveal_id], subtype_id=self.env.ref('mail.mt_note').id)
# Methods responsible for format response data into valid odoo lead data
@api.model
diff --git a/addons/crm_iap_lead/views/crm_iap_lead_templates.xml b/addons/crm_iap_lead/views/assets.xml
index 107a1140026..107a1140026 100644
--- a/addons/crm_iap_lead/views/crm_iap_lead_templates.xml
+++ b/addons/crm_iap_lead/views/assets.xml
diff --git a/addons/crm_iap_lead/data/message_template.xml b/addons/crm_iap_lead/views/mail_templates.xml
index 7b7667479a6..dbb4fa1a569 100644
--- a/addons/crm_iap_lead/data/message_template.xml
+++ b/addons/crm_iap_lead/views/mail_templates.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <template id="enrich_service_information" inherit_id="partner_autocomplete.enrich_service_information">
+ <template id="enrich_company" inherit_id="iap_mail.enrich_company">
<xpath expr="//div[hasclass('o_partner_autocomplete_enrich_info')]" position="inside">
<t t-if="people_data">
<div style="font-size:16px; margin: 9px 0;">
diff --git a/addons/crm_iap_lead_enrich/__manifest__.py b/addons/crm_iap_lead_enrich/__manifest__.py
index e31676329d1..55398d00cdd 100644
--- a/addons/crm_iap_lead_enrich/__manifest__.py
+++ b/addons/crm_iap_lead_enrich/__manifest__.py
@@ -5,10 +5,10 @@
'name': 'Lead Enrichment',
'summary': 'Enrich Leads/Opportunities using email address domain',
'category': 'Sales/CRM',
+ 'version': '1.1',
'depends': [
- 'iap',
+ 'iap_mail',
'crm',
- 'partner_autocomplete'
],
'data': [
'data/ir_cron.xml',
diff --git a/addons/crm_iap_lead_enrich/models/crm_lead.py b/addons/crm_iap_lead_enrich/models/crm_lead.py
index e03f82771e8..d6953cc0bdd 100644
--- a/addons/crm_iap_lead_enrich/models/crm_lead.py
+++ b/addons/crm_iap_lead_enrich/models/crm_lead.py
@@ -114,7 +114,7 @@ class Lead(models.Model):
template_values = iap_data
template_values['flavor_text'] = _("Lead enriched based on email address")
lead.message_post_with_view(
- 'partner_autocomplete.enrich_service_information',
+ 'iap_mail.enrich_company',
values=template_values,
subtype_id=self.env.ref('mail.mt_note').id
)
diff --git a/addons/crm_iap_lead_website/__manifest__.py b/addons/crm_iap_lead_website/__manifest__.py
index 13d3e1c0890..0fc11bfdb27 100644
--- a/addons/crm_iap_lead_website/__manifest__.py
+++ b/addons/crm_iap_lead_website/__manifest__.py
@@ -4,8 +4,14 @@
{
'name': 'Lead Generation From Website Visits',
'summary': 'Create Leads/Opportunities from your website\'s traffic',
+ 'version': '1.1',
'category': 'Sales/CRM',
- 'depends': ['iap', 'crm', 'website_form', 'crm_iap_lead'],
+ 'depends': [
+ 'iap_mail',
+ 'crm',
+ 'crm_iap_lead',
+ 'website_form',
+ ],
'data': [
'data/reveal_data.xml',
'security/ir.model.access.csv',
diff --git a/addons/crm_iap_lead_website/models/crm_reveal_rule.py b/addons/crm_iap_lead_website/models/crm_reveal_rule.py
index aadab777881..698a7c64ce4 100644
--- a/addons/crm_iap_lead_website/models/crm_reveal_rule.py
+++ b/addons/crm_iap_lead_website/models/crm_reveal_rule.py
@@ -365,7 +365,7 @@ class CRMRevealRule(models.Model):
'people_data': result.get('people_data'),
})
lead.message_post_with_view(
- 'partner_autocomplete.enrich_service_information',
+ 'iap_mail.enrich_company',
values=template_values,
subtype_id=self.env.ref('mail.mt_note').id
)
diff --git a/addons/iap_mail/__manifest__.py b/addons/iap_mail/__manifest__.py
new file mode 100644
index 00000000000..aa4f60b867a
--- /dev/null
+++ b/addons/iap_mail/__manifest__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+
+{
+ 'name': "IAP / Mail",
+ 'summary': """Bridge between IAP and mail""",
+ 'description': """Bridge between IAP and mail""",
+ 'category': 'Hidden/Tools',
+ 'version': '1.0',
+ 'depends': [
+ 'iap',
+ 'mail',
+ ],
+ 'application': False,
+ 'installable': True,
+ 'auto_install': True,
+ 'data': [
+ 'views/mail_templates.xml',
+ ],
+}
diff --git a/addons/partner_autocomplete/views/additional_info_template.xml b/addons/iap_mail/views/mail_templates.xml
index 970e10edcf9..4d4daad4dec 100644
--- a/addons/partner_autocomplete/views/additional_info_template.xml
+++ b/addons/iap_mail/views/mail_templates.xml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
- <template id="enrich_service_information">
+
+ <template id="enrich_company">
<p t-esc="flavor_text" />
<div class="o_partner_autocomplete_enrich_info bg-white p-3 mt-3 mb-3 mr-5">
<div class="col-12 row p-0 m-0">
diff --git a/addons/partner_autocomplete/__manifest__.py b/addons/partner_autocomplete/__manifest__.py
index 4f898adc995..e4ff3294ef9 100644
--- a/addons/partner_autocomplete/__manifest__.py
+++ b/addons/partner_autocomplete/__manifest__.py
@@ -1,7 +1,10 @@
# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
{
'name': "Partner Autocomplete",
'summary': "Auto-complete partner companies' data",
+ 'version': '1.1',
'description': """
Auto-complete partner companies' data
""",
@@ -9,11 +12,12 @@
'category': 'Hidden/Tools',
'version': '1.0',
- 'depends': ['web', 'mail', 'iap'],
+ 'depends': [
+ 'iap_mail',
+ ],
'data': [
'security/ir.model.access.csv',
'views/partner_autocomplete_assets.xml',
- 'views/additional_info_template.xml',
'views/res_partner_views.xml',
'views/res_company_views.xml',
'views/res_config_settings_views.xml',
diff --git a/addons/partner_autocomplete/models/res_partner.py b/addons/partner_autocomplete/models/res_partner.py
index 1c27a6b91ba..d53fcf2dfc9 100644
--- a/addons/partner_autocomplete/models/res_partner.py
+++ b/addons/partner_autocomplete/models/res_partner.py
@@ -187,7 +187,7 @@ class ResPartner(models.Model):
template_values = json.loads(partners.additional_info)
template_values['flavor_text'] = _("Partner created by Odoo Partner Autocomplete Service")
partners.message_post_with_view(
- 'partner_autocomplete.enrich_service_information',
+ 'iap_mail.enrich_company',
values=template_values,
subtype_id=self.env.ref('mail.mt_note').id,
)
diff --git a/addons/sms/__manifest__.py b/addons/sms/__manifest__.py
index bb68d2fec7b..086087b5c2d 100644
--- a/addons/sms/__manifest__.py
+++ b/addons/sms/__manifest__.py
@@ -1,8 +1,9 @@
# -*- coding: utf-8 -*-
# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
{
'name': 'SMS gateway',
- 'version': '2.0',
+ 'version': '2.1',
'category': 'Hidden/Tools',
'summary': 'SMS Text Messaging',
'description': """
@@ -11,7 +12,12 @@ This module gives a framework for SMS text messaging
The service is provided by the In App Purchase Odoo platform.
""",
- 'depends': ['base', 'iap', 'mail', 'phone_validation'],
+ 'depends': [
+ 'base',
+ 'iap_mail',
+ 'mail',
+ 'phone_validation'
+ ],
'data': [
'data/ir_cron_data.xml',
'wizard/sms_cancel_views.xml',
diff --git a/addons/snailmail/__manifest__.py b/addons/snailmail/__manifest__.py
index 20976fe25d2..dd86463f0ff 100644
--- a/addons/snailmail/__manifest__.py
+++ b/addons/snailmail/__manifest__.py
@@ -6,8 +6,11 @@ Allows users to send documents by post
=====================================================
""",
'category': 'Hidden/Tools',
- 'version': '0.2',
- 'depends': ['iap', 'mail'],
+ 'version': '0.3',
+ 'depends': [
+ 'iap_mail',
+ 'mail'
+ ],
'data': [
'data/snailmail_data.xml',
'views/report_assets.xml',
diff --git a/odoo/addons/base/__manifest__.py b/odoo/addons/base/__manifest__.py
index aed63a8501d..46962db9c2e 100644
--- a/odoo/addons/base/__manifest__.py
+++ b/odoo/addons/base/__manifest__.py
@@ -4,7 +4,7 @@
{
'name': 'Base',
- 'version': '1.3',
+ 'version': '1.4',
'category': 'Hidden',
'description': """
The kernel of Odoo, needed for all installation.