From dc7678ea15afad16b9eafc49a809c0972de44c39 Mon Sep 17 00:00:00 2001 From: Goffin Simon Date: Thu, 1 Jul 2021 12:23:41 +0000 Subject: [PATCH] [FIX] point_of_sale: Language not in en_US When the user is not in en_US language, unit_name is always different of Unit opw:2581462 closes odoo/odoo#73847 X-original-commit: 2da20136988afaa93f472da4726091452c61cd37 Signed-off-by: pimodoo --- .../static/src/js/Screens/ReceiptScreen/OrderReceipt.js | 2 +- addons/point_of_sale/static/src/js/models.js | 9 +++++++++ .../src/xml/Screens/ReceiptScreen/OrderReceipt.xml | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/addons/point_of_sale/static/src/js/Screens/ReceiptScreen/OrderReceipt.js b/addons/point_of_sale/static/src/js/Screens/ReceiptScreen/OrderReceipt.js index b7c5db5c456..c06b63399f4 100644 --- a/addons/point_of_sale/static/src/js/Screens/ReceiptScreen/OrderReceipt.js +++ b/addons/point_of_sale/static/src/js/Screens/ReceiptScreen/OrderReceipt.js @@ -30,7 +30,7 @@ odoo.define('point_of_sale.OrderReceipt', function(require) { isSimple(line) { return ( line.discount === 0 && - line.unit_name === 'Units' && + line.is_in_unit && line.quantity === 1 && !( line.display_discount_policy == 'without_discount' && diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js index fc32606c068..323cafeeac2 100644 --- a/addons/point_of_sale/static/src/js/models.js +++ b/addons/point_of_sale/static/src/js/models.js @@ -68,6 +68,7 @@ exports.PosModel = Backbone.Model.extend({ this.config = null; this.units = []; this.units_by_id = {}; + this.uom_unit_id = null; this.default_pricelist = null; this.order_sequence = 1; window.posmodel = this; @@ -210,6 +211,13 @@ exports.PosModel = Backbone.Model.extend({ self.units_by_id[unit.id] = unit; }); } + },{ + model: 'ir.model.data', + fields: ['res_id'], + domain: function(){ return [['name', '=', 'product_uom_unit']]; }, + loaded: function(self,unit){ + self.uom_unit_id = unit[0].res_id; + } },{ model: 'res.partner', label: 'load_partners', @@ -1905,6 +1913,7 @@ exports.Orderline = Backbone.Model.extend({ id: this.id, quantity: this.get_quantity(), unit_name: this.get_unit().name, + is_in_unit: this.get_unit().id == this.pos.uom_unit_id, price: this.get_unit_display_price(), discount: this.get_discount(), product_name: this.get_product().display_name, diff --git a/addons/point_of_sale/static/src/xml/Screens/ReceiptScreen/OrderReceipt.xml b/addons/point_of_sale/static/src/xml/Screens/ReceiptScreen/OrderReceipt.xml index 1fbb7c17181..379b360d26d 100644 --- a/addons/point_of_sale/static/src/xml/Screens/ReceiptScreen/OrderReceipt.xml +++ b/addons/point_of_sale/static/src/xml/Screens/ReceiptScreen/OrderReceipt.xml @@ -82,7 +82,7 @@
- + x