summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorThibault Delavallée <tde@odoo.com>2020-07-30 10:01:39 +0000
committerThibault Delavallée <tde@odoo.com>2020-07-31 15:38:48 +0000
commitc2627e1615ec8c2bc17795d3b7911378e4acaaf2 (patch)
treef90e9a3599b88d6902f3f3f89881d9b8725360e3 /addons
parentcd162f522b27413cf2914de878f2f522d85e1932 (diff)
[REF] event(_sale): improve backend views to ease daily use of events
RATIONALE Even will soon gain a major update called Event Online, allowing to better support full-online events. In order to prepare its merge, preparatory merge are done to lessen the final diff. PURPOSE Prepare Event Online support by providing fixes in registration and event frontend flows. Also provide a quick back2basic in backend views to prepare addition of Online sub modules. SPECIFICATIONS: IMPROVE BACKEND VIEWS Registrations * list view: show by default creation date which is Registration Date; * list view: by default show email and phone, still optional; * list view: by default, hide partner as other information is present; * list view: hide event when being in context of a specific event to lessen number of displayed columns; * rename Source Sales Order to Sales Order, better for users. Make it optional; Tickets * list view: description and start / end sales date are now optional to lessen number of columns; * list view: rename Reserved to Confirmed to match registration state naming; Event * form view: move organizer, responsible and company information on the right with address. That way all address-related information are on the right while timing information are on the left; * kanban view: display 'confirmed' only if no auto confirm on event. Otherwise both numbers are the same; LINKS Community PR odoo/odoo#55197 Enterprise PR odoo/enterprise#12113 Task ID-2309702 (Event Preparatory Merge 4) Prepares Task ID-2252655 (Main Online Event task) Prepares Task ID-2283796 (Event B2Basics / Registration Flow)
Diffstat (limited to 'addons')
-rw-r--r--addons/event/i18n/event.pot12
-rw-r--r--addons/event/views/event_ticket_views.xml8
-rw-r--r--addons/event/views/event_views.xml21
-rw-r--r--addons/event_sale/i18n/event_sale.pot6
-rw-r--r--addons/event_sale/models/event_registration.py2
-rw-r--r--addons/event_sale/views/event_registration_views.xml2
6 files changed, 20 insertions, 31 deletions
diff --git a/addons/event/i18n/event.pot b/addons/event/i18n/event.pot
index e0a20e33ecc..e64fccffdd0 100644
--- a/addons/event/i18n/event.pot
+++ b/addons/event/i18n/event.pot
@@ -865,6 +865,7 @@ msgstr ""
#. module: event
#: model:ir.model.fields.selection,name:event.selection__event_registration__state__open
+#: model_terms:ir.ui.view,arch_db:event.event_event_ticket_view_tree_from_event
#: model_terms:ir.ui.view,arch_db:event.view_event_kanban
#: model_terms:ir.ui.view,arch_db:event.view_registration_search
msgid "Confirmed"
@@ -1922,6 +1923,7 @@ msgstr ""
#. module: event
#: model:ir.model.fields,field_description:event.field_event_registration__date_open
+#: model_terms:ir.ui.view,arch_db:event.view_event_registration_tree
#: model_terms:ir.ui.view,arch_db:event.view_registration_search
msgid "Registration Date"
msgstr ""
@@ -1990,11 +1992,6 @@ msgid "Reporting"
msgstr ""
#. module: event
-#: model_terms:ir.ui.view,arch_db:event.event_event_ticket_view_tree_from_event
-msgid "Reserved"
-msgstr ""
-
-#. module: event
#: model:ir.model.fields,field_description:event.field_event_event__seats_reserved
#: model:ir.model.fields,field_description:event.field_event_event_ticket__seats_reserved
msgid "Reserved Seats"
@@ -2052,11 +2049,6 @@ msgid "Seats Limit"
msgstr ""
#. module: event
-#: model:event.type,name:event.event_type_data_ticket
-msgid "Sell Online"
-msgstr ""
-
-#. module: event
#: model_terms:ir.ui.view,arch_db:event.res_config_settings_view_form
msgid "Sell tickets on your website"
msgstr ""
diff --git a/addons/event/views/event_ticket_views.xml b/addons/event/views/event_ticket_views.xml
index 1a9acb5efaf..51db5ed396b 100644
--- a/addons/event/views/event_ticket_views.xml
+++ b/addons/event/views/event_ticket_views.xml
@@ -71,11 +71,11 @@
<field name="arch" type="xml">
<tree string="Tickets" editable="bottom">
<field name="name"/>
- <field name="description"/>
- <field name="start_sale_date"/>
- <field name="end_sale_date"/>
+ <field name="description" optional="hide"/>
+ <field name="start_sale_date" optional="show"/>
+ <field name="end_sale_date" optional="show"/>
<field name="seats_max" sum="Total" width="105px" string="Maximum"/>
- <field name="seats_reserved" sum="Total" width="105px" string="Reserved"/>
+ <field name="seats_reserved" sum="Total" width="105px" string="Confirmed"/>
<field name="seats_unconfirmed" sum="Total" width="110px" string="Unconfirmed"/>
</tree>
</field>
diff --git a/addons/event/views/event_views.xml b/addons/event/views/event_views.xml
index 964342cf176..c367df894ce 100644
--- a/addons/event/views/event_views.xml
+++ b/addons/event/views/event_views.xml
@@ -231,22 +231,22 @@
<field name="date_end" widget="daterange" nolabel="1" class="oe_inline" options="{'related_start_date': 'date_begin'}"/>
</div>
<field name="date_tz"/>
- <field name="organizer_id"/>
- <field name="user_id" domain="[('share', '=', False)]"/>
- <field name="company_id" groups="base.group_multi_company"/>
<field name="event_type_id" string="Template" options="{'no_create':True}"/>
<field name="tag_ids" widget="many2many_tags" options="{'no_quick_create': True}"/>
</group>
<group>
+ <field name="organizer_id"/>
+ <field name="user_id" domain="[('share', '=', False)]"/>
+ <field name="company_id" groups="base.group_multi_company"/>
<field name="address_id"
context="{'show_address': 1}"
options='{"always_reload": True}'/>
- <field name="auto_confirm"/>
<label for="seats_limited" string="Limit Registrations"/>
<div>
<field name="seats_limited"/>
<span attrs="{'invisible': [('seats_limited', '=', False)], 'required': [('seats_limited', '=', False)]}">to <field name="seats_max" class="oe_inline"/> Attendees</span>
</div>
+ <field name="auto_confirm"/>
</group>
</group>
<notebook>
@@ -337,6 +337,7 @@
<field name="address_id"/>
<field name="date_begin"/>
<field name="date_end"/>
+ <field name="auto_confirm"/>
<field name="seats_unconfirmed"/>
<field name="seats_reserved"/>
<field name="seats_used"/>
@@ -374,7 +375,7 @@
<t t-esc="record.seats_expected.raw_value"/> Expected attendees
</a>
<t t-set="total_seats" t-value="record.seats_reserved.raw_value + record.seats_used.raw_value"/>
- <div class="pt-2 pt-md-0" t-if="total_seats > 0">
+ <div class="pt-2 pt-md-0" t-if="total_seats > 0 and ! record.auto_confirm.raw_value"><br/>
<a class="pl-2" name="%(act_event_registration_from_event)d" type="action" context="{'search_default_confirmed': True}">
<i class="fa fa-level-up fa-rotate-90" title="Confirmed"/><span class="pl-2"><t t-esc="total_seats"/> Confirmed</span>
</a>
@@ -505,14 +506,14 @@
<field name="model">event.registration</field>
<field name="arch" type="xml">
<tree string="Registration" multi_edit="1" sample="1">
- <field name="create_date" optional="hide"/>
+ <field name="create_date" optional="show" string="Registration Date"/>
<field name="date_open" optional="hide"/>
- <field name="partner_id"/>
<field name="name"/>
- <field name="email" optional="hide"/>
- <field name="phone" optional="hide"/>
+ <field name="partner_id" optional="hide"/>
+ <field name="email" optional="show"/>
+ <field name="phone" optional="show"/>
<field name="mobile" optional="hide"/>
- <field name="event_id"/>
+ <field name="event_id" invisible="context.get('default_event_id')"/>
<field name="event_ticket_id" domain="[('event_id', '=', event_id)]"/>
<field name="state" readonly="0"/>
<field name="company_id" groups="base.group_multi_company" optional="hide"/>
diff --git a/addons/event_sale/i18n/event_sale.pot b/addons/event_sale/i18n/event_sale.pot
index 5657912fddf..5013a5dd6bf 100644
--- a/addons/event_sale/i18n/event_sale.pot
+++ b/addons/event_sale/i18n/event_sale.pot
@@ -362,6 +362,7 @@ msgstr ""
#. module: event_sale
#: model:ir.model,name:event_sale.model_sale_order
+#: model:ir.model.fields,field_description:event_sale.field_event_registration__sale_order_id
#: model:ir.model.fields,field_description:event_sale.field_registration_editor__sale_order_id
msgid "Sales Order"
msgstr ""
@@ -389,11 +390,6 @@ msgid "Source"
msgstr ""
#. module: event_sale
-#: model:ir.model.fields,field_description:event_sale.field_event_registration__sale_order_id
-msgid "Source Sales Order"
-msgstr ""
-
-#. module: event_sale
#: model_terms:ir.ui.view,arch_db:event_sale.event_event_report_template_badge
msgid "Ticket Type"
msgstr ""
diff --git a/addons/event_sale/models/event_registration.py b/addons/event_sale/models/event_registration.py
index cd35ff5d2e4..f7b6d79a395 100644
--- a/addons/event_sale/models/event_registration.py
+++ b/addons/event_sale/models/event_registration.py
@@ -10,7 +10,7 @@ class EventRegistration(models.Model):
is_paid = fields.Boolean('Is Paid')
# TDE FIXME: maybe add an onchange on sale_order_id
- sale_order_id = fields.Many2one('sale.order', string='Source Sales Order', ondelete='cascade', copy=False)
+ sale_order_id = fields.Many2one('sale.order', string='Sales Order', ondelete='cascade', copy=False)
sale_order_line_id = fields.Many2one('sale.order.line', string='Sales Order Line', ondelete='cascade', copy=False)
payment_status = fields.Selection(string="Payment Status", selection=[
('to_pay', 'Not Paid'),
diff --git a/addons/event_sale/views/event_registration_views.xml b/addons/event_sale/views/event_registration_views.xml
index fcaf61ebfbf..eb091bd011f 100644
--- a/addons/event_sale/views/event_registration_views.xml
+++ b/addons/event_sale/views/event_registration_views.xml
@@ -7,7 +7,7 @@
<field name="inherit_id" ref="event.view_event_registration_tree" />
<field name="arch" type="xml">
<field name="event_id" position="after">
- <field name="sale_order_id"/>
+ <field name="sale_order_id" optional="hide"/>
</field>
</field>
</record>