diff options
Diffstat (limited to 'addons/mass_mailing/views/mailing_mailing_views.xml')
| -rw-r--r-- | addons/mass_mailing/views/mailing_mailing_views.xml | 85 |
1 files changed, 46 insertions, 39 deletions
diff --git a/addons/mass_mailing/views/mailing_mailing_views.xml b/addons/mass_mailing/views/mailing_mailing_views.xml index 0242e7e193b..fdcaf0bd4f2 100644 --- a/addons/mass_mailing/views/mailing_mailing_views.xml +++ b/addons/mass_mailing/views/mailing_mailing_views.xml @@ -7,6 +7,7 @@ <field name="arch" type="xml"> <search string="Mailings"> <field name="name" string="Mailings"/> + <field name="mailing_type" invisible="1"/> <field name="campaign_id"/> <filter string="My Mailings" name="assigned_to_me" domain="[('user_id', '=', uid)]" @@ -32,6 +33,7 @@ <field name="arch" type="xml"> <tree string="Mailings"> <field name="name"/> + <field name="mailing_type" invisible="1"/> <field name="sent"/> <field name="delivered"/> <field name="opened"/> @@ -48,55 +50,52 @@ <field name="arch" type="xml"> <form string="Mailing"> <header style="min-height:31px;"> - <button name="put_in_queue" type="object" attrs="{'invisible': [('state', 'in', ('in_queue', 'done'))]}" class="oe_highlight" string="Send Now" + <button name="action_put_in_queue" type="object" attrs="{'invisible': [('state', 'in', ('in_queue', 'done'))]}" class="oe_highlight" string="Send Now" confirm="This will send the email to all recipients. Do you still want to proceed ?"/> - <button name="action_schedule_date" type="object" attrs="{'invisible': [('state', 'in', ('in_queue', 'done'))]}" class="btn-secondary" string="Schedule"/> - <button name="action_test_mailing" type="object" class="btn-secondary" string="Test"/> - <button name="cancel_mass_mailing" type="object" attrs="{'invisible': [('state', '!=', 'in_queue')]}" class="btn-secondary" string="Cancel"/> - <button name="retry_failed_mail" type="object" attrs="{'invisible': ['|', ('state', '!=', 'done'), ('failed', '=', 0)]}" class="oe_highlight" string="Retry"/> + <button name="action_schedule" type="object" attrs="{'invisible': [('state', 'in', ('in_queue', 'done'))]}" class="btn-secondary" string="Schedule"/> + <button name="action_test" type="object" class="btn-secondary" string="Test"/> + <button name="action_cancel" type="object" attrs="{'invisible': [('state', '!=', 'in_queue')]}" class="btn-secondary" string="Cancel"/> + <button name="action_retry_failed" type="object" attrs="{'invisible': ['|', ('state', '!=', 'done'), ('failed', '=', 0)]}" class="oe_highlight" string="Retry"/> <field name="state" readonly="1" widget="statusbar"/> </header> - <div class="oe_form_box_info bg-info oe_text_center" attrs="{'invisible': [('ignored', '=', 0)]}"> + <div class="alert alert-info text-center" attrs="{'invisible': [('ignored', '=', 0)]}" role="alert"> <p> <button class="btn-link" - name="%(action_view_mail_mail_statistics_mailing_list)d" - type="action" - context="{'search_default_filter_ignored': True}"> + name="action_view_traces_ignored" + type="object"> <strong> - <field name="ignored" class="oe_inline"/> - email(s) have been ignored and will not be sent. + <field name="ignored" class="oe_inline mr-2"/> + <span name="ignored_text">emails have been ignored and will not be sent.</span> </strong> </button> </p> </div> - <div class="oe_form_box_info bg-info oe_text_center" attrs="{'invisible': ['|', ('scheduled', '=', 0), ('ignored','!=',0)]}"> + <div class="alert alert-info text-center" attrs="{'invisible': [('scheduled', '=', 0)]}" role="alert"> <p> <button class="btn-link" - name="%(action_view_mail_mail_statistics_mailing_list)d" - type="action" - context="{'search_default_filter_scheduled': True}"> + name="action_view_traces_scheduled" + type="object"> <strong> - <field name="scheduled" class="oe_inline"/> - email(s) are in queue and will be sent soon. + <field name="scheduled" class="oe_inline mr-2"/> + <span name="scheduled_text">emails are in queue and will be sent soon.</span> </strong> </button> </p> </div> - <div class="oe_form_box_info bg-info oe_text_center alert-info" attrs="{'invisible': ['|', ('state', '!=', 'done'), ('failed', '=', 0)]}" role="alert"> + <div class="alert alert-info text-center" attrs="{'invisible': ['|', ('state', '!=', 'done'), ('failed', '=', 0)]}" role="alert"> <p> <button class="btn-link" - name="%(action_view_mail_mail_statistics_mailing_list)d" - type="action" - context="{'search_default_filter_failed': True}"> + name="action_view_traces_failed" + type="object"> <strong> - <field name="failed" class="oe_inline"/> - email(s) could not be sent. + <field name="failed" class="oe_inline mr-2"/> + <span name="failed_text">emails could not be sent.</span> </strong> </button> </p> </div> - <div class="oe_form_box_info bg-info oe_text_center" attrs="{'invisible': [('state', '!=', 'in_queue')]}"> + <div class="alert alert-info text-center" attrs="{'invisible': [('state', '!=', 'in_queue')]}" role="alert"> <p><strong> This mailing is scheduled for <field name="next_departure" class="oe_inline"/>. @@ -106,15 +105,16 @@ <widget name="web_ribbon" text="Archived" bg_color="bg-danger" attrs="{'invisible': [('active', '=', True)]}"/> <div class="oe_button_box" name="button_box"> <button name="action_view_sent" + id="button_view_sent" type="object" context="{'search_default_filter_sent': True}" - icon="fa-envelope-o" class="oe_stat_button o_mass_mailing_button" - attrs="{'invisible': ['&', ('sent', '=', 0), ('state', 'in', ('draft','test'))]}" > - <field name="sent" string="Emails Sent" widget="statinfo"/> + icon="fa-envelope-o" class="oe_stat_button" + attrs="{'invisible': ['&', ('sent', '=', 0), ('state', 'in', ('draft', 'test'))]}" > + <field name="sent" string="Sent" widget="statinfo"/> </button> <button name="action_view_delivered" type="object" - context="{'search_default_filter_received': True}" + context="{'search_default_filter_delivered': True}" attrs="{'invisible': [('state', 'in', ('draft','test'))]}" class="oe_stat_button"> <field name="received_ratio" string="Received" widget="percentpie"/> @@ -144,8 +144,9 @@ <group> <field name="active" invisible="1"/> - <field name="subject" string="Subject"/> <field name="name" required="1" string="Mailing Name"/> + <field name="mailing_type" widget="radio" options="{'horizontal': true}" invisible="1"/> + <field name="subject" string="Subject"/> <label for="mailing_model_id" string="Recipients"/> <div> <field name="mailing_model_id" widget="selection" required="1"/> @@ -163,7 +164,7 @@ </div> </group> <notebook> - <page string="Mail Body"> + <page string="Mail Body" name="mail_body"> <field name="body_html" class="oe_read_only" widget="html" options="{ 'cssReadonly': 'mass_mailing.iframe_css_assets_readonly', }"/> @@ -180,14 +181,14 @@ <field name="unique_ab_testing" groups="base.group_no_one"/> <field name="email_from"/> <label for="reply_to"/> - <div> + <div name="reply_to_details"> <field name="reply_to_mode" widget="radio" attrs="{'invisible': [('mailing_model_name', 'in', ['mailing.contact', 'res.partner', 'mailing.list'])]}"/> <field name="reply_to" attrs="{'required': [('reply_to_mode', '=', 'email')], 'invisible': [('reply_to_mode', '=', 'thread')]}"/> </div> <label for="attachment_ids"/> - <div> + <div name="attachment_ids_details"> <field name="attachment_ids" widget="many2many_binary" string="Attach a file" class="oe_inline"/> </div> <field name="mail_server_id" groups="base.group_no_one" options="{'no_create': True, 'no_open': True}"/> @@ -256,6 +257,7 @@ <div class="o_kanban_record_top"> <div class="o_kanban_record_headings"> <h3 class="mt4 mb4"><field name="name"/></h3> + <field name="mailing_type" invisible="1"/> <div class="o_kanban_record_subtitle" attrs="{'invisible': [('sent_date', '=', False)]}"> <h5 style="display: inline;"><field name="campaign_id" groups="mass_mailing.group_mass_mailing_campaign"/></h5> <t t-if="record.campaign_id.raw_value" groups="mass_mailing.group_mass_mailing_campaign"> - </t><field name="sent_date"/> @@ -264,7 +266,7 @@ </div> <div class="o_kanban_record_body" t-if="!selection_mode" attrs="{'invisible': [('sent_date', '=', False)]}"> <t t-if="record.sent_date"> - <div class="row"> + <div class="row" name="stat_opened"> <div class="col-8"> <a name="%(action_view_mail_mail_statistics_mailing)d" context="{'search_default_filter_opened': True}" @@ -274,7 +276,7 @@ <field name="opened_ratio"/> % </div> </div> - <div class="row"> + <div class="row" name="stat_replied"> <div class="col-8"> <a name="%(action_view_mail_mail_statistics_mailing)d" context="{'search_default_filter_replied': True}" @@ -284,7 +286,7 @@ <field name="replied_ratio"/> % </div> </div> - <div class="row"> + <div class="row" name="stat_clicks"> <div class="col-8"> <a name="%(link_tracker_action_mass_mailing)d" type="action">Clicks</a> @@ -293,7 +295,7 @@ <field name="clicks_ratio"/> % </div> </div> - <div class='o_kanban_primary_bottom'> + <div class='o_kanban_primary_bottom' name="stat_delivered"> <field name="delivered" widget="progressbar" title="Delivered" options="{'current_value': 'delivered', 'max_value': 'expected', 'editable': false}"/> </div> </t> @@ -317,13 +319,15 @@ </field> </record> - <record id="action_view_mass_mailings" model="ir.actions.act_window"> + <record id="mailing_mailing_action_mail" model="ir.actions.act_window"> <field name="name">Mailings</field> <field name="res_model">mailing.mailing</field> <field name="view_mode">kanban,tree,form,graph</field> + <field name="domain">[('mailing_type', '=', 'mail')]</field> <field name="context">{ 'search_default_assigned_to_me': 1, 'default_user_id': uid, + 'default_mailing_type': 'mail', }</field> <field name="help" type="html"> <p class="o_view_nocontent_smiling_face"> @@ -399,7 +403,10 @@ </field> </record> - <menuitem name="Mailings" id="mass_mailing_menu" parent="mass_mailing_menu_root" - sequence="1" action="action_view_mass_mailings" groups="mass_mailing.group_mass_mailing_user"/> + <menuitem name="Mailings" id="mass_mailing_menu" + parent="mass_mailing_menu_root" + sequence="1" + action="mailing_mailing_action_mail" + groups="mass_mailing.group_mass_mailing_user"/> </odoo> |