odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] mass_mailing: deferenciate action buttons behaviour 

The 5 buttons were actually executing the same action, make them filter
according to the label of the button.
Fixes #6147
This commit is contained in:
Pedro M. Baeza 2015-04-04 10:42:50 +02:00 committed by Martin Trigaux
parent ec9702d7ff
commit ab00527f07
3 changed files with 45 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
addons/mass_mailing/i18n/es.po
View File

@ -420,6 +420,7 @@ msgid "From"
msgstr "De"
#. module: mass_mailing
#: view:mail.mail.statistics:mass_mailing.view_mail_mail_statistics_search
#: view:mail.mass_mailing:mass_mailing.view_mail_mass_mailing_search
#: view:mail.mass_mailing.campaign:mass_mailing.view_mail_mass_mailing_campaign_search
#: view:mail.mass_mailing.contact:mass_mailing.view_mail_mass_mailing_contact_search
@ -726,6 +727,11 @@ msgstr "Boletín de noticias"
msgid "Number of Contacts"
msgstr "Número de contactos"
#. module: mass_mailing
#: view:mail.mail.statistics:mass_mailing.view_mail_mail_statistics_search
msgid "Open Date"
msgstr "Fecha de apertura"
#. module: mass_mailing
#: model:ir.actions.client,name:mass_mailing.action_client_marketing_menu
msgid "Open Marketing Menu"
@ -738,6 +744,7 @@ msgid "Open with Visual Editor"
msgstr "Abrir con el editor visual"
#. module: mass_mailing
#: view:mail.mail.statistics:mass_mailing.view_mail_mail_statistics_search
#: field:mail.mail.statistics,opened:0
#: view:mail.mass_mailing:mass_mailing.view_mail_mass_mailing_form
#: view:mail.mass_mailing:mass_mailing.view_mail_mass_mailing_kanban
@ -793,6 +800,7 @@ msgid "Preview"
msgstr "Previsualización"
#. module: mass_mailing
#: view:mail.mail.statistics:mass_mailing.view_mail_mail_statistics_search
#: view:mail.mass_mailing:mass_mailing.view_mail_mass_mailing_form
#: view:mail.mass_mailing.campaign:mass_mailing.view_mail_mass_mailing_campaign_form
msgid "Received"
@ -823,6 +831,7 @@ msgid "Related Mailing(s)"
msgstr "Envío(s) relacionado(s)"
#. module: mass_mailing
#: view:mail.mail.statistics:mass_mailing.view_mail_mail_statistics_search
#: field:mail.mail.statistics,replied:0
#: view:mail.mass_mailing:mass_mailing.view_mail_mass_mailing_form
#: view:mail.mass_mailing:mass_mailing.view_mail_mass_mailing_kanban
@ -850,6 +859,11 @@ msgstr "Proporción de respondidos"
msgid "Reply To"
msgstr "Responder a"
#. module: mass_mailing
#: view:mail.mail.statistics:mass_mailing.view_mail_mail_statistics_search
msgid "Reply Date"
msgstr "Fecha de respuesta"
#. module: mass_mailing
#: field:mail.mass_mailing,reply_to_mode:0
msgid "Reply-To Mode"

14
addons/mass_mailing/i18n/mass_mailing.pot
View File

@ -415,6 +415,7 @@ msgid "From"
msgstr ""
#. module: mass_mailing
#: view:mail.mail.statistics:mass_mailing.view_mail_mail_statistics_search
#: view:mail.mass_mailing:mass_mailing.view_mail_mass_mailing_search
#: view:mail.mass_mailing.campaign:mass_mailing.view_mail_mass_mailing_campaign_search
#: view:mail.mass_mailing.contact:mass_mailing.view_mail_mass_mailing_contact_search
@ -717,6 +718,11 @@ msgstr ""
msgid "Number of Contacts"
msgstr ""
#. module: mass_mailing
#: view:mail.mail.statistics:mass_mailing.view_mail_mail_statistics_search
msgid "Open Date"
msgstr ""
#. module: mass_mailing
#: model:ir.actions.client,name:mass_mailing.action_client_marketing_menu
msgid "Open Marketing Menu"
@ -729,6 +735,7 @@ msgid "Open with Visual Editor"
msgstr ""
#. module: mass_mailing
#: view:mail.mail.statistics:mass_mailing.view_mail_mail_statistics_search
#: field:mail.mail.statistics,opened:0
#: view:mail.mass_mailing:mass_mailing.view_mail_mass_mailing_form
#: view:mail.mass_mailing:mass_mailing.view_mail_mass_mailing_kanban
@ -783,6 +790,7 @@ msgid "Preview"
msgstr ""
#. module: mass_mailing
#: view:mail.mail.statistics:mass_mailing.view_mail_mail_statistics_search
#: view:mail.mass_mailing:mass_mailing.view_mail_mass_mailing_form
#: view:mail.mass_mailing.campaign:mass_mailing.view_mail_mass_mailing_campaign_form
msgid "Received"
@ -813,6 +821,7 @@ msgid "Related Mailing(s)"
msgstr ""
#. module: mass_mailing
#: view:mail.mail.statistics:mass_mailing.view_mail_mail_statistics_search
#: field:mail.mail.statistics,replied:0
#: view:mail.mass_mailing:mass_mailing.view_mail_mass_mailing_form
#: view:mail.mass_mailing:mass_mailing.view_mail_mass_mailing_kanban
@ -841,6 +850,11 @@ msgstr ""
msgid "Reply To"
msgstr ""
#. module: mass_mailing
#: view:mail.mail.statistics:mass_mailing.view_mail_mail_statistics_search
msgid "Reply Date"
msgstr ""
#. module: mass_mailing
#: field:mail.mass_mailing,reply_to_mode:0
msgid "Reply-To Mode"

22
addons/mass_mailing/views/mass_mailing.xml
View File

@ -28,6 +28,13 @@
<field name="mail_mail_id_int"/>
<field name="message_id"/>
<field name="mass_mailing_id"/>
<filter string="Received" name="filter_received" domain="[('sent', '!=', False), ('bounced', '=', False)]"/>
<filter string="Opened" name="filter_opened" domain="[('opened', '!=', False)]"/>
<filter string="Replied" name="filter_replied" domain="[('replied', '!=', False)]"/>
<group expand="0" string="Group By">
<filter string="Open Date" name="group_open_date" context="{'group_by': 'opened:day'}"/>
<filter string="Reply Date" name="group_reply_date" context="{'group_by': 'replied:day'}"/>
</group>
</search>
</field>
</record>
@ -289,23 +296,28 @@
<sheet>
<div class="oe_button_box pull-right" attrs="{'invisible': [('state', 'in', ('draft','test'))]}">
<button name="%(action_view_mail_mail_statistics_mailing)d"
type="action" class="oe_stat_button">
context="{'search_default_filter_received': True}"
type="action" class="oe_stat_button">
<field name="received_ratio" string="Received" widget="percentpie"/>
</button>
<button name="%(action_view_mail_mail_statistics_mailing)d"
type="action" class="oe_stat_button">
context="{'search_default_filter_opened': True}"
type="action" class="oe_stat_button">
<field name="opened_ratio" string="Opened" widget="percentpie"/>
</button>
<button name="%(action_view_mail_mail_statistics_mailing)d"
type="action" class="oe_stat_button">
context="{'search_default_filter_replied': True}"
type="action" class="oe_stat_button">
<field name="replied_ratio" string="Replied" widget="percentpie"/>
</button>
<button name="%(action_view_mail_mail_statistics_mailing)d"
type="action" class="oe_stat_button oe_inline">
context="{'search_default_filter_opened': True, 'search_default_group_open_date': True}"
type="action" class="oe_stat_button oe_inline">
<field name="opened_daily" string="Opened Daily" widget="barchart"/>
</button>
<button name="%(action_view_mail_mail_statistics_mailing)d"
type="action" class="oe_stat_button oe_inline">
context="{'search_default_filter_replied': True, 'search_default_group_reply_date': True}"
type="action" class="oe_stat_button oe_inline">
<field name="replied_daily" string="Replied Daily" widget="barchart"/>
</button>
</div>