diff --git a/addons/point_of_sale/i18n/point_of_sale.pot b/addons/point_of_sale/i18n/point_of_sale.pot
index 3aed4df376c..79dd0609c85 100644
--- a/addons/point_of_sale/i18n/point_of_sale.pot
+++ b/addons/point_of_sale/i18n/point_of_sale.pot
@@ -2634,7 +2634,7 @@ msgstr ""
 #: code:addons/point_of_sale/static/src/js/models.js:0
 #: code:addons/point_of_sale/static/src/js/models.js:0
 #, python-format
-msgid "Order "
+msgid "Order %s"
 msgstr ""
 
 #. module: point_of_sale
diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index 76930d86bfb..b0f75a37a93 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -2267,7 +2267,7 @@ exports.Order = Backbone.Model.extend({
         } else {
             this.sequence_number = this.pos.pos_session.sequence_number++;
             this.uid  = this.generate_unique_id();
-            this.name = _t("Order ") + this.uid;
+            this.name = _.str.sprintf(_t("Order %s"), this.uid);
             this.validation_date = undefined;
             this.fiscal_position = _.find(this.pos.fiscal_positions, function(fp) {
                 return fp.id === self.pos.config.default_fiscal_position_id[0];
@@ -2316,7 +2316,7 @@ exports.Order = Backbone.Model.extend({
         }
         this.session_id = this.pos.pos_session.id;
         this.uid = json.uid;
-        this.name = _t("Order ") + this.uid;
+        this.name = _.str.sprintf(_t("Order %s"), this.uid);
         this.validation_date = json.creation_date;
         this.server_id = json.server_id ? json.server_id : false;
         this.user_id = json.user_id;
diff --git a/addons/pos_restaurant/models/pos_order.py b/addons/pos_restaurant/models/pos_order.py
index e48a8b677ea..fcb54583c82 100644
--- a/addons/pos_restaurant/models/pos_order.py
+++ b/addons/pos_restaurant/models/pos_order.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 from itertools import groupby
+from re import search
 
 from odoo import api, fields, models
 
@@ -140,7 +141,7 @@ class PosOrder(models.Model):
 
         for order in table_orders:
             order['pos_session_id'] = order['session_id'][0]
-            order['uid'] = order['pos_reference'].split(' ')[1]
+            order['uid'] = search(r"\d{5,}-\d{3,}-\d{4,}", order['pos_reference']).group(0)
             order['name'] = order['pos_reference']
             order['creation_date'] = order['create_date']
             order['server_id'] = order['id']