From 3c1d74181ae5230719aaf0bc13b4c1f4b5f4b463 Mon Sep 17 00:00:00 2001 From: vlst Date: Fri, 27 Oct 2023 14:53:02 +0200 Subject: [PATCH] [FIX] pos_restaurant,l10n_in_pos: fix receipt data 1. Install l10n_pos_in 2. Make an order 3. Observer traceback in receipt screen Similar problem in restaurant ( in bill screen ) closes odoo/odoo#140123 Signed-off-by: Joseph Caburnay (jcb) --- .../static/src/overrides/components/pos_receipt.xml | 2 +- .../static/src/app/bill_screen/bill_screen.xml | 2 +- .../receipt_screen/order_receipt/order_receipt.xml | 6 +++--- addons/pos_restaurant/static/src/overrides/models/models.js | 6 ++++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/addons/l10n_in_pos/static/src/overrides/components/pos_receipt.xml b/addons/l10n_in_pos/static/src/overrides/components/pos_receipt.xml index 95f70834d7a..ca9f1de5281 100644 --- a/addons/l10n_in_pos/static/src/overrides/components/pos_receipt.xml +++ b/addons/l10n_in_pos/static/src/overrides/components/pos_receipt.xml @@ -19,7 +19,7 @@ - +
HSN Code: diff --git a/addons/pos_restaurant/static/src/app/bill_screen/bill_screen.xml b/addons/pos_restaurant/static/src/app/bill_screen/bill_screen.xml index 97257d8233f..97d8fbfa74d 100644 --- a/addons/pos_restaurant/static/src/app/bill_screen/bill_screen.xml +++ b/addons/pos_restaurant/static/src/app/bill_screen/bill_screen.xml @@ -21,7 +21,7 @@
- +
diff --git a/addons/pos_restaurant/static/src/overrides/components/receipt_screen/order_receipt/order_receipt.xml b/addons/pos_restaurant/static/src/overrides/components/receipt_screen/order_receipt/order_receipt.xml index 1388b5e7a2b..46e767848b2 100644 --- a/addons/pos_restaurant/static/src/overrides/components/receipt_screen/order_receipt/order_receipt.xml +++ b/addons/pos_restaurant/static/src/overrides/components/receipt_screen/order_receipt/order_receipt.xml @@ -3,15 +3,15 @@ - +
PRO FORMA
- !isBill + !props.data.isBill - +
For convenience, we are providing the following gratuity calculations:
diff --git a/addons/pos_restaurant/static/src/overrides/models/models.js b/addons/pos_restaurant/static/src/overrides/models/models.js index da2c4ab47b7..63b5da1a751 100644 --- a/addons/pos_restaurant/static/src/overrides/models/models.js +++ b/addons/pos_restaurant/static/src/overrides/models/models.js @@ -47,6 +47,12 @@ patch(Order.prototype, { defaultTableNeeded(options) { return !this.tableId && !options.json && this.pos.table; }, + export_for_printing() { + return { + ...super.export_for_printing(...arguments), + set_tip_after_payment: this.pos.config.set_tip_after_payment, + }; + }, }); patch(Orderline.prototype, {