From 73d877eef248d1ec4e22a03e966f0d8b91012389 Mon Sep 17 00:00:00 2001
From: Pierre Masereel <pim@odoo.com>
Date: Tue, 27 Aug 2019 09:15:31 +0000
Subject: [PATCH] [FIX] point_of_sale, pos_restaurant: order sequence

WHen you are creating a draft order, the sequence is not saved on the
server, and when we load the orders from the server the session id is
not correct too.

This leads to having inconsistant sequence numbers in the POS, almost
when we are synchronizing orders through the pos restaurant.

We now show the orders sequence number prefixed by login number when the
order is synchronized and don't have the same login number as current.

TASK-ID: 2057436

closes odoo/odoo#36032

Signed-off-by: pimodoo <pimodoo@users.noreply.github.com>
---
 addons/point_of_sale/models/pos_order.py        |  1 +
 addons/pos_restaurant/models/pos_order.py       |  2 +-
 addons/pos_restaurant/static/src/xml/floors.xml | 13 +++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py
index 7d593f7a25e..e1bf52d8e88 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -39,6 +39,7 @@ class PosOrder(models.Model):
             'session_id':   ui_order['pos_session_id'],
             'lines':        [process_line(l) for l in ui_order['lines']] if ui_order['lines'] else False,
             'pos_reference': ui_order['name'],
+            'sequence_number': ui_order['sequence_number'],
             'partner_id':   ui_order['partner_id'] or False,
             'date_order':   ui_order['creation_date'].replace('T', ' ')[:19],
             'fiscal_position_id': ui_order['fiscal_position_id'],
diff --git a/addons/pos_restaurant/models/pos_order.py b/addons/pos_restaurant/models/pos_order.py
index 50220379b1a..e48a8b677ea 100644
--- a/addons/pos_restaurant/models/pos_order.py
+++ b/addons/pos_restaurant/models/pos_order.py
@@ -139,7 +139,7 @@ class PosOrder(models.Model):
         self._get_payment_lines(table_orders)
 
         for order in table_orders:
-            order['pos_session_id'] = order['session_id']
+            order['pos_session_id'] = order['session_id'][0]
             order['uid'] = order['pos_reference'].split(' ')[1]
             order['name'] = order['pos_reference']
             order['creation_date'] = order['create_date']
diff --git a/addons/pos_restaurant/static/src/xml/floors.xml b/addons/pos_restaurant/static/src/xml/floors.xml
index 677092ca42e..b3019a915d4 100644
--- a/addons/pos_restaurant/static/src/xml/floors.xml
+++ b/addons/pos_restaurant/static/src/xml/floors.xml
@@ -23,6 +23,19 @@
         </t>
     </t>
 
+    <t t-extend="OrderSelectorWidget">
+        <t t-jquery=".order-sequence" t-operation="replace">
+            <span class="order-sequence">
+                <t t-if="order.server_id &amp;&amp; widget.pos.pos_session.login_number != order.uid.split('-')[1]">
+                    <t t-esc="order.uid.substring(order.uid.indexOf('-') +1)"/>
+                </t>
+                <t t-else="">
+                    <t t-esc="order.sequence_number"/>
+                </t>
+            </span>
+        </t>
+    </t>
+
     <t t-name="TableGuestsButton">
         <div class='control-button'>
             <span class='control-button-number'>