From 5dbea009c02d7783ce8757eec510b395353e96f0 Mon Sep 17 00:00:00 2001
From: snt <snt@esgaroth.criptomart.net>
Date: Mon, 30 Mar 2026 18:55:38 +0200
Subject: [PATCH] =?UTF-8?q?[FIX]=20website=5Fsale=5Faplicoop:=20evitar=20s?=
 =?UTF-8?q?obrec=C3=A1lculo=20en=20precio=20de=20env=C3=ADo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Ajusta _get_delivery_product_display_price para calcular envío con list_price + impuestos
- Evita aplicar reglas de pricelist al envío (recargos/descuentos no deseados)
- Mantiene fallback seguro a list_price ante errores

Resultado esperado: para PVP 5.74 con IVA 21% => 6.95
---
 .../controllers/website_sale.py               | 48 ++++++++++++++-----
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/website_sale_aplicoop/controllers/website_sale.py b/website_sale_aplicoop/controllers/website_sale.py
index b6019c7..2c4a02f 100644
--- a/website_sale_aplicoop/controllers/website_sale.py
+++ b/website_sale_aplicoop/controllers/website_sale.py
@@ -542,25 +542,49 @@ class AplicoopWebsiteSale(WebsiteSale):
         return product_supplier_info
 
     def _get_delivery_product_display_price(self, delivery_product, pricelist=None):
-        """Return delivery product price for display (tax included)."""
+        """Return delivery product price for display (list_price + taxes).
+
+        Important: delivery cost must be based on product list_price and taxes,
+        not on commercial pricelist rules (discounts/markups), to avoid inflating
+        shipping price unexpectedly.
+        """
         if not delivery_product:
             return 5.74
 
-        pricelist = pricelist or self._resolve_pricelist()
-        if not pricelist:
-            return float(delivery_product.list_price or 0.0)
-
         try:
-            pricing = self._get_pricing_info(
-                delivery_product,
-                pricelist,
-                quantity=1.0,
-                partner=request.env.user.partner_id,
+            base_price = float(delivery_product.list_price or 0.0)
+            website = request.website
+            partner = request.env.user.partner_id
+            company = (
+                website.company_id or delivery_product.company_id or request.env.company
             )
-            return float(pricing.get("price", delivery_product.list_price) or 0.0)
+
+            product_taxes = delivery_product.sudo().taxes_id._filter_taxes_by_company(
+                company
+            )
+            fiscal_position = website.fiscal_position_id.sudo()
+            taxes = (
+                fiscal_position.map_tax(product_taxes)
+                if product_taxes
+                else product_taxes
+            )
+
+            if not taxes:
+                return base_price
+
+            # Use website currency for display computation.
+            currency = website.currency_id
+            totals = taxes.compute_all(
+                base_price,
+                currency=currency,
+                quantity=1.0,
+                product=delivery_product,
+                partner=partner,
+            )
+            return float(totals.get("total_included", base_price) or 0.0)
         except Exception as e:
             _logger.warning(
-                "_get_delivery_product_display_price: Error getting delivery price for product %s (id=%s): %s. Using list_price fallback.",
+                "_get_delivery_product_display_price: Error computing delivery display price for product %s (id=%s): %s. Using list_price fallback.",
                 delivery_product.name,
                 delivery_product.id,
                 str(e),