diff --git a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/receipt_header/receipt_header.xml b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/receipt_header/receipt_header.xml
index fe4b91f3486..5f5d35d0b48 100644
--- a/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/receipt_header/receipt_header.xml
+++ b/addons/point_of_sale/static/src/app/screens/receipt_screen/receipt/receipt_header/receipt_header.xml
@@ -3,7 +3,7 @@
     <t t-name="point_of_sale.ReceiptHeader">
         <img t-attf-src="/web/image?model=res.company&amp;id={{props.data.company.id}}&amp;field=logo" alt="Logo" class="pos-receipt-logo"/>
         <br/>
-        <h1 class="text-center" style="font-size: 100px" t-if="props.data.trackingNumber" t-esc="props.data.trackingNumber" />
+        <h1 class="text-center" style="font-size: 100px" t-if="props.data.trackingNumber and props.data.bigTrackingNumber" t-esc="props.data.trackingNumber" />
         <div class="pos-receipt-contact">
             <!-- contact address -->
             <div t-if="props.data.company.partner_id?.[1]" t-esc="props.data.company.partner_id[1]" />
@@ -17,8 +17,11 @@
             <div t-if="props.data.company.website" t-esc="props.data.company.website" />
             <div t-if="props.data.header" style="white-space:pre-line" t-esc="props.data.header" />
             <div t-if="props.data.cashier" class="cashier">
-                    <div>--------------------------------</div>
-                    <div>Served by <t t-esc="props.data.cashier" /></div>
+                <div>--------------------------------</div>
+                <div>Served by <t t-esc="props.data.cashier" /></div>
+            </div>
+            <div t-if="props.data.trackingNumber and !props.data.bigTrackingNumber">
+                Order: <t t-esc="props.data.trackingNumber" />
             </div>
         </div>
         <br /><br />
diff --git a/addons/point_of_sale/static/src/app/store/models.js b/addons/point_of_sale/static/src/app/store/models.js
index 818bb73170a..5f842cfaf1f 100644
--- a/addons/point_of_sale/static/src/app/store/models.js
+++ b/addons/point_of_sale/static/src/app/store/models.js
@@ -1530,7 +1530,10 @@ export class Order extends PosModel {
             // FIXME: isn't there a better way to handle this date?
             shippingDate:
                 this.shippingDate && formatDate(DateTime.fromJSDate(new Date(this.shippingDate))),
-            headerData: this.pos.getReceiptHeaderData(),
+            headerData: {
+                ...this.pos.getReceiptHeaderData(),
+                trackingNumber: this.trackingNumber,
+            },
         };
     }
     // This function send order change to printer
diff --git a/addons/point_of_sale/tests/test_point_of_sale_flow.py b/addons/point_of_sale/tests/test_point_of_sale_flow.py
index 972f0268f1d..ddaaa42a735 100644
--- a/addons/point_of_sale/tests/test_point_of_sale_flow.py
+++ b/addons/point_of_sale/tests/test_point_of_sale_flow.py
@@ -579,7 +579,7 @@ class TestPointOfSaleFlow(TestPointOfSaleCommon):
               'price_subtotal': 0.9,
               'price_subtotal_incl': 1.04,
               'qty': 1,
-              'tax_ids': [(6, 0, self.led_lamp.taxes_id.ids)]}]],
+              'tax_ids': [(6, 0, self.led_lamp.taxes_id.filtered(lambda t: t.company_id.id == self.env.company.id).ids)]}]],
            'name': 'Order 00042-003-0014',
            'partner_id': False,
            'pos_session_id': current_session.id,
@@ -610,7 +610,7 @@ class TestPointOfSaleFlow(TestPointOfSaleCommon):
               'price_subtotal': 1.2,
               'price_subtotal_incl': 1.38,
               'qty': 1,
-              'tax_ids': [(6, 0, self.whiteboard_pen.taxes_id.ids)]}]],
+              'tax_ids': [(6, 0, self.whiteboard_pen.taxes_id.filtered(lambda t: t.company_id.id == self.env.company.id).ids)]}]],
            'name': 'Order 00043-003-0014',
            'partner_id': self.partner1.id,
            'pos_session_id': current_session.id,
@@ -641,7 +641,7 @@ class TestPointOfSaleFlow(TestPointOfSaleCommon):
               'price_subtotal': 1.28,
               'price_subtotal_incl': 1.47,
               'qty': 1,
-              'tax_ids': [[6, False, self.newspaper_rack.taxes_id.ids]]}]],
+              'tax_ids': [[6, False, self.newspaper_rack.taxes_id.filtered(lambda t: t.company_id.id == self.env.company.id).ids]]}]],
            'name': 'Order 00044-003-0014',
            'partner_id': False,
            'pos_session_id': current_session.id,
diff --git a/addons/pos_self_order/models/pos_order.py b/addons/pos_self_order/models/pos_order.py
index b639b185db4..decf73b750d 100644
--- a/addons/pos_self_order/models/pos_order.py
+++ b/addons/pos_self_order/models/pos_order.py
@@ -47,7 +47,7 @@ class PosOrder(models.Model):
 
     def _compute_tax_details(self):
         self.ensure_one()
-        taxes = sum([line.tax_ids.compute_all(line.price_unit, quantity=line.qty, product=line.product_id)['taxes']
+        taxes = sum([line.tax_ids.with_company(self.company_id).compute_all(line.price_unit, quantity=line.qty, product=line.product_id)['taxes']
                for line in self.lines], [])
         tax_percetanges = {tax['id']: tax['amount'] for tax in self.env['account.tax'].search([]).read(['amount'])}
         merged_tax_details = {}
diff --git a/addons/pos_self_order/static/src/app/self_order_service.js b/addons/pos_self_order/static/src/app/self_order_service.js
index a6fae140b85..0b6eddc66dd 100644
--- a/addons/pos_self_order/static/src/app/self_order_service.js
+++ b/addons/pos_self_order/static/src/app/self_order_service.js
@@ -563,6 +563,7 @@ export class SelfOrder extends Reactive {
                 header: this.config.receipt_header,
                 company: this.company,
                 trackingNumber: order.trackingNumber,
+                bigTrackingNumber: true,
             },
             pos_qr_code:
                 this.company.point_of_sale_use_ticket_qr_code &&