summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Tuyls <alt@odoo.com>2019-03-19 15:57:46 +0000
committerAlex Tuyls <alt@odoo.com>2019-03-19 15:57:46 +0000
commitf7acbf6466a712dd086d13b14a69f415afe7dc13 (patch)
tree2ba368e8a666f100fe0240cee4102f60ddbe6137
parent577333f5485723636c81db7e13bfab3af7d95620 (diff)
[FIX] website_event,website_event_sale: correction pricelist in event register
A recent fix c41d1d2 was made to select the related pricelist to show the correct price of an event product. This fix creates another bug in case of Ecommerce app not installed, because the method get_current_pricelist is defined in website_sale module. We need to move the fix from website_event to website_event_sale module. closes odoo/odoo#31953 Signed-off-by: Jorge Pinna Puissant (jpp) <jpp@odoo.com>
-rw-r--r--addons/website_event/controllers/main.py5
-rw-r--r--addons/website_event_sale/controllers/main.py4
2 files changed, 5 insertions, 4 deletions
diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py
index 9e86e2ddeba..acff56f9321 100644
--- a/addons/website_event/controllers/main.py
+++ b/addons/website_event/controllers/main.py
@@ -181,10 +181,7 @@ class WebsiteEventController(http.Controller):
def event_register(self, event, **post):
if not event.can_access_from_current_website():
raise werkzeug.exceptions.NotFound()
- if not request.context.get('pricelist'):
- pricelist = request.website.get_current_pricelist()
- if pricelist:
- event = event.with_context(pricelist=pricelist.id)
+
values = {
'event': event,
'main_object': event,
diff --git a/addons/website_event_sale/controllers/main.py b/addons/website_event_sale/controllers/main.py
index 689fe5cdc81..acf5f58be2d 100644
--- a/addons/website_event_sale/controllers/main.py
+++ b/addons/website_event_sale/controllers/main.py
@@ -11,6 +11,10 @@ class WebsiteEventSaleController(WebsiteEventController):
@http.route()
def event_register(self, event, **post):
event = event.with_context(pricelist=request.website.id)
+ if not request.context.get('pricelist'):
+ pricelist = request.website.get_current_pricelist()
+ if pricelist:
+ event = event.with_context(pricelist=pricelist.id)
return super(WebsiteEventSaleController, self).event_register(event, **post)
def _process_tickets_details(self, data):