[FIX] point_of_sale, pos_sale: Ensure fp matches with sale order

When a sales order is imported into the PoS, the tax position does not
match if the sales order has a different tax position than the one
assigned to the partner.

This commit ensures that the tax position will always be the one
assigned to the sales order and not that of the partner.

closes odoo#220709

Taskid: 4963118
X-original-commit: 1309058
Signed-off-by: Stéphane Vanmeerhaeghe (stva) <stva@odoo.com>
Signed-off-by: David Monnom (moda) <moda@odoo.com>

Author: davidmonnom

addons/point_of_sale/static/tests/pos/tours/utils/product_screen_util.js

@@ -375,6 +375,18 @@ export function clickFiscalPosition(name, checkIsNeeded = false) {
 
     return [...step, { ...back(), isActive: ["mobile"] }];
 }
+export function checkFiscalPosition(name) {
+    return [
+        clickReview(),
+        ...clickControlButtonMore(),
+        {
+            content: `check fiscal position '${name}' is selected`,
+            trigger: `.o_fiscal_position_button:contains("${name}")`,
+            run: () => {},
+        },
+        Dialog.cancel(),
+    ];
+}
 export function closeWithCashAmount(val) {
     return [
         {

addons/pos_sale/models/sale_order.py

@@ -37,11 +37,14 @@ def load_sale_order_from_pos(self, config_id):
         sale_order_read = self.read(sale_order_fields, load=False)
         sale_order_line_fields = self.order_line._load_pos_data_fields(config_id)
         sale_order_line_read = self.order_line.read(sale_order_line_fields, load=False)
+        sale_order_fp_fields = self.env['account.fiscal.position']._load_pos_data_fields(config_id)
+        sale_order_fp_read = self.fiscal_position_id.read(sale_order_fp_fields, load=False)
         partner_fields = self.env['res.partner']._load_pos_data_fields(config_id)
 
         return {
             'sale.order': sale_order_read,
             'sale.order.line': sale_order_line_read,
+            'account.fiscal.position': sale_order_fp_read,
             'res.partner': self.partner_id.read(partner_fields, load=False),
             **product_tmpls,
         }

addons/pos_sale/static/src/app/services/pos_store.js

@@ -9,6 +9,7 @@ import { enhancedButtons } from "@point_of_sale/app/components/numpad/numpad";
 import { patch } from "@web/core/utils/patch";
 import { PosStore } from "@point_of_sale/app/services/pos_store";
 import { accountTaxHelpers } from "@account/helpers/account_tax";
+import { getTaxesAfterFiscalPosition } from "@point_of_sale/app/models/utils/tax_utils";
 
 patch(PosStore.prototype, {
     async onClickSaleOrder(clickedOrderId) {
@@ -49,17 +50,18 @@ patch(PosStore.prototype, {
                 this.notification.add(_t("A new order has been created."));
             }
         }
-        const orderFiscalPos =
-            sale_order.fiscal_position_id &&
-            this.models["account.fiscal.position"].find(
-                (position) => position.id === sale_order.fiscal_position_id
-            );
-        if (orderFiscalPos) {
-            this.getOrder().fiscal_position_id = orderFiscalPos;
-        }
         if (sale_order.partner_id) {
             this.getOrder().setPartner(sale_order.partner_id);
         }
+
+        // Fiscal position should be set after the partner is set
+        // to ensure that the fiscal position is correctly computed
+        // based on sale order.
+        const orderFiscalPos = sale_order.fiscal_position_id;
+        this.getOrder().update({
+            fiscal_position_id: orderFiscalPos,
+        });
+
         selectedOption == "settle"
             ? await this.settleSO(sale_order, orderFiscalPos)
             : await this.downPaymentSO(sale_order, selectedOption == "dpPercentage");
@@ -99,16 +101,14 @@ patch(PosStore.prototype, {
                 line.product_id = this.config.down_payment_product_id;
             }
 
+            const taxes = getTaxesAfterFiscalPosition(line.tax_ids, orderFiscalPos, this.models);
             const newLineValues = {
                 product_tmpl_id: line.product_id?.product_tmpl_id,
                 product_id: line.product_id,
                 qty: line.product_uom_qty,
                 price_unit: line.price_unit,
                 price_type: "automatic",
-                tax_ids:
-                    orderFiscalPos || !line.tax_ids
-                        ? undefined
-                        : line.tax_ids.map((t) => ["link", t]),
+                tax_ids: taxes.map((tax) => ["link", tax]),
                 sale_order_origin_id: sale_order,
                 sale_order_line_id: line,
                 customer_note: line.customer_note,

addons/pos_sale/static/tests/tours/pos_sale_tour.js

@@ -459,3 +459,27 @@ registry.category("web_tour.tours").add("test_down_payment_displayed", {
             }),
         ].flat(),
 });
+
+registry.category("web_tour.tours").add("test_sale_order_fp_different_from_partner_one", {
+    steps: () =>
+        [
+            Chrome.startPoS(),
+            Dialog.confirm("Open Register"),
+            PosSale.settleSaleOrderByPrice("20.00"),
+            ProductScreen.checkTaxAmount("10.00"),
+            ProductScreen.checkFiscalPosition("Partner FP"),
+            ProductScreen.clickPayButton(),
+            PaymentScreen.clickPaymentMethod("Bank"),
+            PaymentScreen.clickValidate(),
+            ReceiptScreen.receiptIsThere(),
+            ReceiptScreen.clickNextOrder(),
+            PosSale.settleSaleOrderByPrice("10.00"),
+            ProductScreen.checkTaxAmount("0.00"),
+            ProductScreen.checkFiscalPosition("Sale Order FP"),
+            ProductScreen.clickPayButton(),
+            PaymentScreen.clickPaymentMethod("Bank"),
+            PaymentScreen.clickValidate(),
+            ReceiptScreen.receiptIsThere(),
+            ReceiptScreen.clickNextOrder(),
+        ].flat(),
+});

addons/pos_sale/static/tests/tours/utils/pos_sale_utils.js

@@ -13,6 +13,22 @@ export function selectNthOrder(n) {
     ];
 }
 
+export function settleSaleOrderByPrice(price) {
+    return [
+        ...ProductScreen.clickControlButton("Quotation/Order"),
+        {
+            content: `select sale order with price ${price}`,
+            trigger: `.modal:not(.o_inactive_modal) table.o_list_table tbody tr.o_data_row td:contains('${price}')`,
+            run: "click",
+        },
+        {
+            content: `Choose to settle the order`,
+            trigger: `.modal:not(.o_inactive_modal) .selection-item:contains('Settle the order')`,
+            run: "click",
+        },
+    ];
+}
+
 export function settleNthOrder(n, options = {}) {
     const { loadSN } = options;
     const step = [

addons/pos_sale/tests/test_pos_sale_flow.py

@@ -1334,3 +1334,83 @@ def test_payment_terms_with_early_discount(self):
         pos_order_id = self.env['pos.order'].sync_from_ui([pos_order])['pos.order'][0]['id']
         pos_order = self.env['pos.order'].browse(pos_order_id)
         self.assertFalse(pos_order.account_move.invoice_payment_term_id)
+
+    def test_sale_order_fp_different_from_partner_one(self):
+        """
+        Tests that the fiscal position of the sale order is not the same as the partner's fiscal position.
+        The PoS should always use the fiscal position of the sale order when settling it.
+        """
+        self.env.user.group_ids += self.quick_ref('sales_team.group_sale_salesman')
+        tax = self.env['account.tax'].create({
+            'name': 'Base Tax',
+            'amount': 15,
+        })
+        fp_1 = self.env['account.fiscal.position'].create({
+            'name': "Partner FP",
+        })
+        fp_2 = self.env['account.fiscal.position'].create({
+            'name': "Sale Order FP",
+        })
+        tax_override_1 = self.env['account.tax'].create({
+            'name': 'Tax Override 1',
+            'amount': 100,
+            'amount_type': 'percent',
+            'fiscal_position_ids': [fp_1.id],
+            'original_tax_ids': [tax.id],
+        })
+        tax_override_2 = self.env['account.tax'].create({
+            'name': 'Tax Override 2',
+            'amount': 0,
+            'amount_type': 'percent',
+            'fiscal_position_ids': [fp_2.id],
+            'original_tax_ids': [tax.id],
+        })
+        product_a = self.env['product.product'].create({
+            'name': 'Product A',
+            'available_in_pos': True,
+            'lst_price': 10.0,
+            'taxes_id': [tax.id],
+        })
+        partner_test = self.env['res.partner'].create({
+            'name': 'Test Partner',
+            'property_account_position_id': fp_1.id,
+        })
+        sale_a = self.env['sale.order'].create({
+            'partner_id': partner_test.id,
+            'order_line': [(0, 0, {
+                'product_id': product_a.id,
+                'product_uom_qty': 1,
+                'price_unit': product_a.lst_price,
+            })]
+        })
+        sale_b = self.env['sale.order'].create({
+            'partner_id': partner_test.id,
+            'fiscal_position_id': fp_2.id,
+            'order_line': [(0, 0, {
+                'product_id': product_a.id,
+                'product_uom_qty': 1,
+                'price_unit': product_a.lst_price,
+            })]
+        })
+        # Disable fiscal position in POS, it should works anyway.
+        self.main_pos_config.write({
+            'tax_regime_selection': False,
+            'default_fiscal_position_id': False,
+            'fiscal_position_ids': [Command.clear()],
+        })
+        self.assertEqual(sale_a.fiscal_position_id, fp_1, "Sale order should have the fiscal position of the partner")
+        self.assertEqual(sale_a.amount_total, 20, "Sale order amount should be 20 with the tax override 1")
+        self.assertEqual(sale_a.amount_untaxed, 10, "Sale order untaxed amount should be 10 with the tax override 1")
+        self.assertEqual(sale_b.fiscal_position_id, fp_2, "Sale order should have the fiscal position set on the sale order")
+        self.assertEqual(sale_b.amount_total, 10, "Sale order amount should be 10 with the tax override 2")
+        self.assertEqual(sale_b.amount_untaxed, 10, "Sale order untaxed amount should be 10 with the tax override 2")
+        self.start_pos_tour("test_sale_order_fp_different_from_partner_one", login="accountman")
+
+        pos_order_a = self.env['pos.order'].search([('fiscal_position_id', '=', fp_1.id)], limit=1, order='id desc')
+        pos_order_b = self.env['pos.order'].search([('fiscal_position_id', '=', fp_2.id)], limit=1, order='id desc')
+        self.assertEqual(pos_order_a.amount_total, 20, "PoS order amount should be 20 with the tax override 1")
+        self.assertEqual(pos_order_a.amount_tax, 10, "PoS order untaxed amount should be 10 with the tax override 1")
+        self.assertEqual(pos_order_a.lines[0].tax_ids, tax_override_1, "PoS order should have the tax override 1")
+        self.assertEqual(pos_order_b.amount_total, 10, "PoS order amount should be 10 with the tax override 2")
+        self.assertEqual(pos_order_b.amount_tax, 0, "PoS order untaxed amount should be 10 with the tax override 2")
+        self.assertEqual(pos_order_b.lines[0].tax_ids, tax_override_2, "PoS order should have the tax override 2")