diff --git a/addons/event_booth/data/mail_templates.xml b/addons/event_booth/data/mail_templates.xml
index 149ab0e7441..5471d54ce1a 100644
--- a/addons/event_booth/data/mail_templates.xml
+++ b/addons/event_booth/data/mail_templates.xml
@@ -19,19 +19,19 @@
-
- Name:
+ Renter Name:
-
- Email:
+ Renter Email:
-
- Mobile:
+ Renter Mobile:
-
- Phone:
+ Renter Phone:
diff --git a/addons/event_booth/tests/test_event_internals.py b/addons/event_booth/tests/test_event_internals.py
index 66fceda2142..70b5d9fedbf 100644
--- a/addons/event_booth/tests/test_event_internals.py
+++ b/addons/event_booth/tests/test_event_internals.py
@@ -78,14 +78,13 @@ class TestEventData(TestEventBoothCommon):
self.assertEqual(event.event_booth_ids[1].message_partner_ids, self.env['res.partner'])
# change event type to one using booths: include event type booths and keep reserved booths
- event_form = Form(event)
- event_form.event_type_id = event_type_wbooths
- self.assertEqual(event_form.event_booth_count, 3)
+ with Form(event) as event_form:
+ event_form.event_type_id = event_type_wbooths
+ self.assertEqual(event.event_booth_count, 3)
self.assertEqual(
- set(r['name'] for r in event_form.event_booth_ids._records),
+ set(r['name'] for r in event.event_booth_ids),
set(('Custom Standard Booth 2', 'Standard Booth', 'Premium Booth')),
'Should keep booths with reservation, remove unused ones and add type ones'
)
- event_form.save()
self.assertEqual(event.event_booth_count_available, 2)
self.assertEqual(event.event_booth_category_ids, self.event_booth_category_1 + self.event_booth_category_2)
diff --git a/addons/event_booth/views/event_booth_views.xml b/addons/event_booth/views/event_booth_views.xml
index 3e55ceeb092..d8f29a7d0e0 100644
--- a/addons/event_booth/views/event_booth_views.xml
+++ b/addons/event_booth/views/event_booth_views.xml
@@ -23,9 +23,9 @@
-
-
-
+
+
+
diff --git a/addons/event_booth/views/event_event_views.xml b/addons/event_booth/views/event_event_views.xml
index 9116c78fe3d..5a17cc55dcb 100644
--- a/addons/event_booth/views/event_event_views.xml
+++ b/addons/event_booth/views/event_event_views.xml
@@ -21,16 +21,6 @@
-
-
-
-
-
-
diff --git a/addons/event_booth_sale/models/event_booth_category.py b/addons/event_booth_sale/models/event_booth_category.py
index 67d0a531070..b4f6df65c8b 100644
--- a/addons/event_booth_sale/models/event_booth_category.py
+++ b/addons/event_booth_sale/models/event_booth_category.py
@@ -18,6 +18,7 @@ class EventBoothCategory(models.Model):
'product.product', string='Product', required=True,
domain=[('detailed_type', '=', 'event_booth')], default=_default_product_id)
price = fields.Float(string='Price', compute='_compute_price', digits='Product Price', readonly=False, store=True)
+ currency_id = fields.Many2one(related='product_id.currency_id')
price_reduce = fields.Float(
string='Price Reduce', compute='_compute_price_reduce',
compute_sudo=True, digits='Product Price')
diff --git a/addons/event_booth_sale/models/event_type_booth.py b/addons/event_booth_sale/models/event_type_booth.py
index c5318e29611..38f6b559d61 100644
--- a/addons/event_booth_sale/models/event_type_booth.py
+++ b/addons/event_booth_sale/models/event_type_booth.py
@@ -9,6 +9,7 @@ class EventTypeBooth(models.Model):
product_id = fields.Many2one(related='booth_category_id.product_id')
price = fields.Float(related='booth_category_id.price')
+ currency_id = fields.Many2one(related='booth_category_id.currency_id')
@api.model
def _get_event_booth_fields_whitelist(self):
diff --git a/addons/event_booth_sale/tests/test_event_internals.py b/addons/event_booth_sale/tests/test_event_internals.py
index e745e2eafff..6da8f1c8c47 100644
--- a/addons/event_booth_sale/tests/test_event_internals.py
+++ b/addons/event_booth_sale/tests/test_event_internals.py
@@ -82,14 +82,13 @@ class TestEventData(TestEventBoothSaleCommon):
]})
# change event type to one using booths: include event type booths and keep reserved booths
- event_form = Form(event)
- event_form.event_type_id = event_type_wbooths
- self.assertEqual(event_form.event_booth_count, 3)
+ with Form(event) as event_form:
+ event_form.event_type_id = event_type_wbooths
+ self.assertEqual(event.event_booth_count, 3)
self.assertEqual(
- set(r['name'] for r in event_form.event_booth_ids._records),
+ set(r['name'] for r in event.event_booth_ids),
set(('Custom Standard Booth 2', 'Standard Booth', 'Premium Booth')),
'Should keep booths with reservation, remove unused ones and add type ones'
)
- event_form.save()
self.assertEqual(event.event_booth_count_available, 2)
self.assertEqual(event.event_booth_category_ids, self.event_booth_category_1 + self.event_booth_category_2)
diff --git a/addons/event_booth_sale/views/event_booth_category_views.xml b/addons/event_booth_sale/views/event_booth_category_views.xml
index 4aa0ce568b5..ea7a1a2d8a7 100644
--- a/addons/event_booth_sale/views/event_booth_category_views.xml
+++ b/addons/event_booth_sale/views/event_booth_category_views.xml
@@ -9,8 +9,9 @@
+
-
+
@@ -23,8 +24,9 @@
3
+
-
+
diff --git a/addons/event_booth_sale/views/event_booth_views.xml b/addons/event_booth_sale/views/event_booth_views.xml
index a1f47fcfcf7..ef08a3769e6 100644
--- a/addons/event_booth_sale/views/event_booth_views.xml
+++ b/addons/event_booth_sale/views/event_booth_views.xml
@@ -18,8 +18,10 @@
+
-
+
-
+
+
diff --git a/addons/event_booth_sale/views/event_type_booth_views.xml b/addons/event_booth_sale/views/event_type_booth_views.xml
index 00a20ed3fa6..f6dde071a79 100644
--- a/addons/event_booth_sale/views/event_type_booth_views.xml
+++ b/addons/event_booth_sale/views/event_type_booth_views.xml
@@ -7,8 +7,9 @@
+
-
+
@@ -19,8 +20,9 @@
+
-
+
diff --git a/addons/event_booth_sale/wizard/event_booth_configurator_views.xml b/addons/event_booth_sale/wizard/event_booth_configurator_views.xml
index 0dee2313286..b720a7e4de3 100644
--- a/addons/event_booth_sale/wizard/event_booth_configurator_views.xml
+++ b/addons/event_booth_sale/wizard/event_booth_configurator_views.xml
@@ -35,7 +35,7 @@
- Configure an event booth
+ Select an event booth
event.booth.configurator
form
new
diff --git a/addons/website_event_booth_sale/models/sale_order.py b/addons/website_event_booth_sale/models/sale_order.py
index cae42990e31..47d980cb24b 100644
--- a/addons/website_event_booth_sale/models/sale_order.py
+++ b/addons/website_event_booth_sale/models/sale_order.py
@@ -53,6 +53,6 @@ class SaleOrder(models.Model):
product = self.env['product.product'].browse(product_id)
if product.type == 'event_booth' and set_qty > 1:
set_qty = 1
- values['warning'] = _('Sorry, you can\'t modify quantity to an Event Booth product.')
+ values['warning'] = _('You cannot manually change the quantity of an Event Booth product.')
values.update(super(SaleOrder, self)._cart_update(product_id, line_id, add_qty, set_qty, **kwargs))
return values