From 32e63f0cb610088aea2c2fa2a8c3b358a4875468 Mon Sep 17 00:00:00 2001
From: Robin Heinz <rhe@odoo.com>
Date: Mon, 31 May 2021 08:20:55 +0000
Subject: [PATCH] [FIX] point_of_sale: Couldn't load order in manage order in
 pos restaurant

Before it was impossible to use the order management screen in pos
restaurant if there wasn't any current order.

X-original-commit: be40ff84f7f86c30528e911cba387884e8ca9722
---
 .../js/Screens/OrderManagementScreen/OrderManagementScreen.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderManagementScreen.js b/addons/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderManagementScreen.js
index 429d4f91f83..6c6e80a7772 100644
--- a/addons/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderManagementScreen.js
+++ b/addons/point_of_sale/static/src/js/Screens/OrderManagementScreen/OrderManagementScreen.js
@@ -77,9 +77,9 @@ odoo.define('point_of_sale.OrderManagementScreen', function (require) {
             OrderFetcher.fetch();
         }
         _onClickOrder({ detail: clickedOrder }) {
-            if (!clickedOrder || clickedOrder.locked) {
+            let currentPOSOrder = this.env.pos.get_order();
+            if (currentPOSOrder && (!clickedOrder || clickedOrder.locked)) {
                 this.orderManagementContext.selectedOrder = clickedOrder;
-                let currentPOSOrder = this.env.pos.get_order();
                 if (clickedOrder.attributes.client){
                     currentPOSOrder.set_client(clickedOrder.attributes.client);
                 }