summaryrefslogtreecommitdiff
path: root/addons/event_sale
diff options
context:
space:
mode:
authorOdoo's Mergebot <robodoo@odoo.com>2020-12-21 18:31:44 +0100
committerGitHub <noreply@github.com>2020-12-21 18:31:44 +0100
commitcde5aa70bfa2592364a2126ef281552046f98ce9 (patch)
tree2d45a1b3e0652ce944a0e0906293f5e4c8318fb5 /addons/event_sale
parentf5c0990c6af2f44f503de1cc50cc5b094e31976a (diff)
parent171260006af954245cde3f53b6eaa2d230316529 (diff)
[MERGE] hr_timesheet: Fix global UX
### Goal of the PR This PR is in the continuity of odoo#62360. ### Details - Display remaining hours in task sales_line_id (name_get + task form view) - Remove internal reference from services demo data - Display sol in project timesheets list if project is billable - Remove use of non_allow_billable in timesheets as it has been removed from project and task in previous PR (see above) - Only recompute planned_hours for service product - Determine the correct SOL for timesheet - Set the last SOL of customer on timesheet if none is set on task or project - Allow edition of so_line in timesheet - Restrict SOL on project to sale lines with a service product - Use same widget on partner_id many2One than in sale.order (using ranking) - Remove timesheets table in SO and invoice portal.They were added in previous PR (see above). This introduces the use of links to /my/timesheets/. - Review portal timesheets (my/timesheets/ and link from orders and invoices) - Activate group_uom "Units of Measure" on sale_timesheet install - Hide partner phone number in task form view - Only determine SOL of task and timesheet if allow_billable=True - Filter SOL in task so that it matches the SOL of the project SO - Display red label if remaining hours is negative - Change SO compute behavior - Only open SO for salesman on project overview task-2409761 -- I confirm I have signed the CLA and read the PR guidelines at www.odoo.com/submit-pr closes odoo/odoo#62900 Signed-off-by: Yannick Tivisse (yti) <yti@odoo.com>
Diffstat (limited to 'addons/event_sale')
-rw-r--r--addons/event_sale/data/event_sale_data.xml1
-rw-r--r--addons/event_sale/models/event_ticket.py2
-rw-r--r--addons/event_sale/static/tests/tours/event_configurator_ui.js6
3 files changed, 3 insertions, 6 deletions
diff --git a/addons/event_sale/data/event_sale_data.xml b/addons/event_sale/data/event_sale_data.xml
index bf8bc78249e..725bc51f757 100644
--- a/addons/event_sale/data/event_sale_data.xml
+++ b/addons/event_sale/data/event_sale_data.xml
@@ -14,7 +14,6 @@
<field name="uom_po_id" ref="uom.product_uom_unit"/>
<field name="name">Event Registration</field>
<field name="description_sale" eval="False"/>
- <field name="default_code">EVENT_REG</field>
<field name="categ_id" ref="event_sale.product_category_events"/>
<field name="type">service</field>
</record>
diff --git a/addons/event_sale/models/event_ticket.py b/addons/event_sale/models/event_ticket.py
index 7759a547d84..da142f973c9 100644
--- a/addons/event_sale/models/event_ticket.py
+++ b/addons/event_sale/models/event_ticket.py
@@ -72,8 +72,6 @@ class EventTemplateTicket(models.Model):
'list_price': 0,
'standard_price': 0,
'type': 'service',
- 'default_code': 'EVENT_REG',
- 'type': 'service',
}).id
self.env['ir.model.data'].create({
'name': 'product_product_event',
diff --git a/addons/event_sale/static/tests/tours/event_configurator_ui.js b/addons/event_sale/static/tests/tours/event_configurator_ui.js
index 1170a142a09..a7419871bbe 100644
--- a/addons/event_sale/static/tests/tours/event_configurator_ui.js
+++ b/addons/event_sale/static/tests/tours/event_configurator_ui.js
@@ -20,10 +20,10 @@ tour.register('event_configurator_tour', {
}, {
trigger: 'div[name="product_id"] input, div[name="product_template_id"] input',
run: function (actions) {
- actions.text('EVENT');
+ actions.text('Event');
}
}, {
- trigger: 'ul.ui-autocomplete a:contains("EVENT")',
+ trigger: 'ul.ui-autocomplete a:contains("Event")',
run: 'click'
}, {
trigger: 'div[name="event_id"] input',
@@ -56,7 +56,7 @@ tour.register('event_configurator_tour', {
trigger: 'ul.nav a:contains("Order Lines")',
run: 'click'
}, {
- trigger: 'td:contains("EVENT")',
+ trigger: 'td:contains("Event")',
run: 'click'
}, {
trigger: '.o_edit_product_configuration'