Merge pull request #1358 from OCA/13.0

Syncing from upstream OCA/purchase-workflow (13.0)
brain-tec · Feb 8, 2024 · cd7d225 · cd7d225
2 parents 6b9a0a7 + e7aad37
commit cd7d225
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ addon | version | maintainers | summary
 [purchase_commercial_partner](purchase_commercial_partner/) | 13.0.1.0.0 |  | Add stored related field 'Commercial Supplier' on POs
 [purchase_delivery_split_date](purchase_delivery_split_date/) | 13.0.1.0.5 |  | Allows Purchase Order you confirm to generate one Incoming Shipment for each expected date indicated in the Purchase Order Lines
 [purchase_deposit](purchase_deposit/) | 13.0.1.0.1 |  | Option to create deposit from purchase order
-[purchase_discount](purchase_discount/) | 13.0.1.1.1 |  | Purchase order lines with discounts
+[purchase_discount](purchase_discount/) | 13.0.1.1.2 |  | Purchase order lines with discounts
 [purchase_exception](purchase_exception/) | 13.0.1.0.0 |  | Custom exceptions on purchase order
 [purchase_force_invoiced](purchase_force_invoiced/) | 13.0.1.0.1 |  | Allows to force the billing status of the purchase order to "Invoiced"
 [purchase_invoice_plan](purchase_invoice_plan/) | 13.0.1.0.0 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Add to purchases order, ability to manage future invoice plan

diff --git a/purchase_discount/README.rst b/purchase_discount/README.rst
@@ -7,7 +7,7 @@ Purchase order lines with discounts
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:e3fb9db2fba7a0836c291b92ce810ae3ca7e8be2695ae04dd13e536035ff79c5
+   !! source digest: sha256:69da69791acc920f5d78aa528dea056ba59570a6fd102606f7396b0bca134137
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/purchase_discount/__manifest__.py b/purchase_discount/__manifest__.py
@@ -10,7 +10,7 @@
     "ACSONE SA/NV,"
     "GRAP,"
     "Odoo Community Association (OCA)",
-    "version": "13.0.1.1.1",
+    "version": "13.0.1.1.2",
     "category": "Purchase Management",
     "website": "https://github.com/OCA/purchase-workflow",
     "depends": ["purchase_stock"],

diff --git a/purchase_discount/models/stock_rule.py b/purchase_discount/models/stock_rule.py
@@ -16,7 +16,7 @@ def _prepare_purchase_order_line(
         date = None
         if po.date_order:
             date = po.date_order.date()
-        seller = product_id._select_seller(
+        seller = product_id.with_context(force_company=company_id.id)._select_seller(
             partner_id=values["supplier"].name,
             quantity=product_qty,
             date=date,

diff --git a/purchase_discount/static/description/index.html b/purchase_discount/static/description/index.html
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
@@ -367,7 +366,7 @@ <h1 class="title">Purchase order lines with discounts</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:e3fb9db2fba7a0836c291b92ce810ae3ca7e8be2695ae04dd13e536035ff79c5
+!! source digest: sha256:69da69791acc920f5d78aa528dea056ba59570a6fd102606f7396b0bca134137
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/purchase-workflow/tree/13.0/purchase_discount"><img alt="OCA/purchase-workflow" src="https://img.shields.io/badge/github-OCA%2Fpurchase--workflow-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/purchase-workflow-13-0/purchase-workflow-13-0-purchase_discount"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/purchase-workflow&amp;target_branch=13.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows to define a discount per line in the purchase orders. This