summaryrefslogtreecommitdiff
path: root/addons/mass_mailing_sms
diff options
context:
space:
mode:
authorMariska Archielli (ram) <ram@odoo.com>2020-09-17 14:23:41 +0000
committerMariska Archielli (ram) <ram@odoo.com>2020-11-05 15:26:05 +0000
commite6496af1ea31b2c699de9e41196a9ae3a07efb7f (patch)
treed5c44764ed199661cb1372921d652cc6cf532577 /addons/mass_mailing_sms
parent4f97641b40839330bc88d686b03d4b4072261c5c (diff)
[FIX] mass_mailing, mass_mailing_sms : fix bugs and incoherency
Fix traceback when creating a new contact by checking the id list is not empty Filter default reporting by name rather then by campaign (as campaign is an option) Group by Campaign only if the option is checked to enforce coherency. > This is unblocked with a group. Hide the 'replied' status from sms reports as it is not relevant for sms. Remove the preview message for sms as it is not relevant elsewhere then the object of mails. Warn the user if he's trying to send a sms with only white-space characters. > this causes an error because the plaintext-html conversion in mail_thread.py > consider a white-spaces-only text as empty. Mobile placeholder added for a better understanding of the field by the user. Task ID : 2302578 closes odoo/odoo#60426 Signed-off-by: Thibault Delavallee (tde) <tde@openerp.com>
Diffstat (limited to 'addons/mass_mailing_sms')
-rw-r--r--addons/mass_mailing_sms/report/mailing_trace_report_views.xml42
-rw-r--r--addons/mass_mailing_sms/views/mailing_mailing_views.xml3
2 files changed, 45 insertions, 0 deletions
diff --git a/addons/mass_mailing_sms/report/mailing_trace_report_views.xml b/addons/mass_mailing_sms/report/mailing_trace_report_views.xml
index a3a56aa25e2..84684aca456 100644
--- a/addons/mass_mailing_sms/report/mailing_trace_report_views.xml
+++ b/addons/mass_mailing_sms/report/mailing_trace_report_views.xml
@@ -1,5 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<odoo>
+ <record id="mailing_trace_report_sms_view_pivot" model="ir.ui.view">
+ <field name="name">mailing.sms.trace.report.view.pivot</field>
+ <field name="model">mailing.trace.report</field>
+ <field name="inherit_id" ref="mass_mailing.mailing_trace_report_view_pivot"/>
+ <field name="priority" eval="50"/>
+ <field name="mode">primary</field>
+ <field name="type">pivot</field>
+ <field name="arch" type="xml">
+ <xpath expr="//field[@name='replied']" position="attributes">
+ <attribute name="invisible">1</attribute>
+ </xpath>
+ </field>
+ </record>
+
+ <record id="mailing_trace_report_sms_view_graph" model="ir.ui.view">
+ <field name="name">mailing.sms.trace.report.view.graph</field>
+ <field name="model">mailing.trace.report</field>
+ <field name="inherit_id" ref="mass_mailing.mailing_trace_report_view_graph"/>
+ <field name="priority" eval="50"/>
+ <field name="mode">primary</field>
+ <field name="type">graph</field>
+ <field name="arch" type="xml">
+ <xpath expr="//field[@name='replied']" position="attributes">
+ <attribute name="invisible">1</attribute>
+ </xpath>
+ </field>
+ </record>
+
<!-- Actions and Menuitems -->
<record id="mailing_trace_report_action_sms" model="ir.actions.act_window">
<field name="name">SMS Marketing Analysis</field>
@@ -14,6 +42,20 @@
</field>
</record>
+ <record id="mailing_trace_report_action_sms_view_graph" model="ir.actions.act_window.view">
+ <field name="sequence">0</field>
+ <field name="view_mode">graph</field>
+ <field name="act_window_id" ref="mailing_trace_report_action_sms"/>
+ <field name="view_id" ref="mailing_trace_report_sms_view_graph"/>
+ </record>
+
+ <record id="mailing_trace_report_action_sms_view_pivot" model="ir.actions.act_window.view">
+ <field name="sequence">1</field>
+ <field name="view_mode">pivot</field>
+ <field name="act_window_id" ref="mailing_trace_report_action_sms"/>
+ <field name="view_id" ref="mailing_trace_report_sms_view_pivot"/>
+ </record>
+
<!-- SMS Marketing / Reporting -->
<record id="mass_mailing_sms_menu_reporting" model="ir.ui.menu">
<field name="action" ref="mailing_trace_report_action_sms"/>
diff --git a/addons/mass_mailing_sms/views/mailing_mailing_views.xml b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
index 570198797b9..c919400d1db 100644
--- a/addons/mass_mailing_sms/views/mailing_mailing_views.xml
+++ b/addons/mass_mailing_sms/views/mailing_mailing_views.xml
@@ -102,6 +102,9 @@
<xpath expr="//field[@name='subject']" position="after">
<field name="sms_subject" string="Title" attrs="{'invisible': [('mailing_type', '!=', 'sms')], 'readonly': [('state', 'in', ('sending', 'done'))], 'required': [('mailing_type', '=', 'sms')]}"/>
</xpath>
+ <xpath expr="//field[@name='preview']" position="attributes">
+ <attribute name="attrs">{'readonly': [('state', 'in', ('sending', 'done'))], 'invisible': [('mailing_type', '!=', 'mail')]}</attribute>
+ </xpath>
<xpath expr="//page[@name='mail_body']" position="attributes">
<attribute name="attrs">{'invisible': [('mailing_type', '!=', 'mail')]}</attribute>
</xpath>