Merge pull request #1362 from OCA/15.0

Syncing from upstream OCA/purchase-workflow (15.0)
brain-tec · Feb 10, 2024 · 2d40d38 · 2d40d38
2 parents e35a762 + 8a31c2c
commit 2d40d38
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -113,7 +113,7 @@ addon | version | maintainers | summary
 [purchase_work_acceptance_invoice_plan](purchase_work_acceptance_invoice_plan/) | 15.0.1.0.1 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Purchase Work Acceptance Invoice Plan
 [purchase_work_acceptance_late_fines](purchase_work_acceptance_late_fines/) | 15.0.1.1.0 | [![Saran440](https://github.com/Saran440.png?size=30px)](https://github.com/Saran440) | Purchase Work Acceptance - Late Delivery Fines
 [purchase_work_acceptance_tier_validation](purchase_work_acceptance_tier_validation/) | 15.0.1.0.0 | [![kittiu](https://github.com/kittiu.png?size=30px)](https://github.com/kittiu) | Extends the functionality of Work Acceptance to support a tier validation process.
-[sale_purchase_force_vendor](sale_purchase_force_vendor/) | 15.0.1.0.3 | [![victoralmau](https://github.com/victoralmau.png?size=30px)](https://github.com/victoralmau) | Sale Purchase Force Vendor
+[sale_purchase_force_vendor](sale_purchase_force_vendor/) | 15.0.1.1.0 | [![victoralmau](https://github.com/victoralmau.png?size=30px)](https://github.com/victoralmau) | Sale Purchase Force Vendor
 [sale_purchase_secondary_unit](sale_purchase_secondary_unit/) | 15.0.1.0.1 |  | Propagate sale secondary uom to purchase orders
 [subcontracted_service](subcontracted_service/) | 15.0.1.0.0 | [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | Subcontracted service
 [supplier_calendar](supplier_calendar/) | 15.0.1.0.0 | [![LoisRForgeFlow](https://github.com/LoisRForgeFlow.png?size=30px)](https://github.com/LoisRForgeFlow) | Supplier Calendar

diff --git a/sale_purchase_force_vendor/README.rst b/sale_purchase_force_vendor/README.rst
@@ -7,7 +7,7 @@ Sale Purchase Force Vendor
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:aa4a6ace21a7c23a303f3163b0b9f3c6ad3589336bd6e4a5f6d6965850d171c0
+   !! source digest: sha256:b5b2864605300b0eb276c468ea0414a879d83ca99a3689bf074baef4b1bfbcd3
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png

diff --git a/sale_purchase_force_vendor/__manifest__.py b/sale_purchase_force_vendor/__manifest__.py
@@ -2,7 +2,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 {
     "name": "Sale Purchase Force Vendor",
-    "version": "15.0.1.0.3",
+    "version": "15.0.1.1.0",
     "category": "Purchase Management",
     "website": "https://github.com/OCA/purchase-workflow",
     "author": "Tecnativa, Odoo Community Association (OCA)",

diff --git a/sale_purchase_force_vendor/static/description/index.html b/sale_purchase_force_vendor/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">Sale Purchase Force Vendor</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:aa4a6ace21a7c23a303f3163b0b9f3c6ad3589336bd6e4a5f6d6965850d171c0
+!! source digest: sha256:b5b2864605300b0eb276c468ea0414a879d83ca99a3689bf074baef4b1bfbcd3
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <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/15.0/sale_purchase_force_vendor"><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-15-0/purchase-workflow-15-0-sale_purchase_force_vendor"><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=15.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows you to select a vendor at the sale order line level when a route is defined.</p>

diff --git a/sale_purchase_force_vendor/views/sale_order_view.xml b/sale_purchase_force_vendor/views/sale_order_view.xml
@@ -16,6 +16,7 @@
                 <field
                     name="vendor_id"
                     domain="vendor_id_domain"
+                    attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))]}"
                     options='{"no_create": True}'
                     optional="hide"
                 />
@@ -26,7 +27,7 @@
                     <field
                         name="vendor_id"
                         domain="vendor_id_domain"
-                        attrs="{'readonly': [('state', 'in', ('done', 'cancel'))]}"
+                        attrs="{'readonly': [('state', 'in', ('sale', 'done', 'cancel'))]}"
                         options='{"no_create": True}'
                     />
                 </group>