From 41be5fbcae7bef0a7a622959c0521b2428706038 Mon Sep 17 00:00:00 2001
From: "Andrea Grazioso (agr-odoo)" <agr@odoo.com>
Date: Fri, 10 Jan 2020 10:33:36 +0000
Subject: [PATCH] [FIX] point_of_sale: list price display after tax mapping

- In general settings:
    - Sales:
        - Activate discount
        - Activate Multiple Sale Prices with option computed from formula
    - Point of sale:
        - Activate Multiple Sale Prices with option computed from formula
    - Accounting:
        - Set show price tax-included
- Modify the Public Pricelist: Set to Global, price discount 50%
- Modify the sale tax to be included in price
- Create a 0% tax included in price
- Open fiscal position: Set auto-detect, replace sale 15% by 0%
- Open a product and set customer tax to sale 15%
- Open POS session configuration
    - Set fiscal position, tax included in price and public pricelist
- Add product "Pedal Bin"

You will see in strikethough text the original selling price with tax included,
while taxes should have been removed from the tax mapping.
Note that this is purely aesthetical, the total amount calculated is correct.
Fixing by calculating the price from the original selling price.

opw-2155779

closes odoo/odoo#43284

X-original-commit: 7de221c04133d37c23783fd6232eb23fd91cefe7
Signed-off-by: Nicolas Lempereur (nle) <nle@odoo.com>
---
 addons/point_of_sale/static/src/js/models.js | 42 +++++++++++---------
 addons/point_of_sale/static/src/xml/pos.xml  |  2 +-
 2 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/addons/point_of_sale/static/src/js/models.js b/addons/point_of_sale/static/src/js/models.js
index b592434f9921..b3cc74723f7a 100644
--- a/addons/point_of_sale/static/src/js/models.js
+++ b/addons/point_of_sale/static/src/js/models.js
@@ -2040,6 +2040,28 @@ exports.Orderline = Backbone.Model.extend({
     display_discount_policy: function(){
         return this.order.pricelist.discount_policy;
     },
+    compute_fixed_price: function (price) {
+        var order = this.order;
+        if(order.fiscal_position) {
+            var taxes = this.get_taxes();
+            var mapped_included_taxes = [];
+            var self = this;
+            _(taxes).each(function(tax) {
+                var line_taxes = self._map_tax_fiscal_position(tax);
+                if(tax.price_include && !_.contains(line_taxes, tax)){
+                    mapped_included_taxes.push(tax);
+                }
+            });
+
+            if (mapped_included_taxes.length > 0) {
+                return this.compute_all(mapped_included_taxes, price, 1, order.pos.currency.rounding, true).total_excluded;
+            }
+        }
+        return price;
+    },
+    get_fixed_lst_price: function(){
+        return this.compute_fixed_price(this.get_lst_price());
+    },
     get_lst_price: function(){
         return this.product.lst_price;
     },
@@ -2623,25 +2645,7 @@ exports.Order = Backbone.Model.extend({
     },
 
     fix_tax_included_price: function(line){
-        if(this.fiscal_position){
-            var unit_price = line.price;
-            var taxes = line.get_taxes();
-            var mapped_included_taxes = [];
-            _(taxes).each(function(tax) {
-                var line_taxes = line._map_tax_fiscal_position(tax);
-                if(tax.price_include && !_.contains(line_taxes, tax)){
-
-                    mapped_included_taxes.push(tax);
-                }
-            });
-
-            if (mapped_included_taxes.length > 0) {
-                unit_price = line.compute_all(mapped_included_taxes, unit_price, 1, this.pos.currency.rounding, true).total_excluded;
-            }
-
-            line.set_unit_price(unit_price);
-        }
-
+        line.set_unit_price(line.compute_fixed_price(line.price));
     },
 
     add_product: function(product, options){
diff --git a/addons/point_of_sale/static/src/xml/pos.xml b/addons/point_of_sale/static/src/xml/pos.xml
index 750d0fc5f64f..e0b3ea3bbb2a 100644
--- a/addons/point_of_sale/static/src/xml/pos.xml
+++ b/addons/point_of_sale/static/src/xml/pos.xml
@@ -1473,7 +1473,7 @@
                         <t t-if="line.display_discount_policy() == 'without_discount' &amp;&amp;
                             line.get_unit_display_price() != line.get_lst_price()">
                             <s>
-                                <t t-esc="widget.format_currency(line.get_lst_price(),'Product Price')" />
+                                <t t-esc="widget.format_currency(line.get_fixed_lst_price(),'Product Price')" />
                             </s>
                             <t t-esc="widget.format_currency(line.get_unit_display_price(),'Product Price')" />
                         </t>
-- 
GitLab