Merge PR #1850 into 16.0

OCA-git-bot · OCA-git-bot · commit 587d0cda8096 · 2023-04-20T22:02:24.000Z
Signed-off-by pedrobaeza
diff --git a/purchase_allowed_product/__manifest__.py b/purchase_allowed_product/__manifest__.py
@@ -11,7 +11,7 @@
     "website": "https://github.com/OCA/purchase-workflow",
     "author": "Akretion, Odoo Community Association (OCA)",
     "license": "AGPL-3",
-    "depends": ["purchase"],
+    "depends": ["purchase", "base_view_inheritance_extension"],
     "data": [
         "views/res_partner_views.xml",
         "views/account_move_views.xml",
diff --git a/purchase_allowed_product/models/product.py b/purchase_allowed_product/models/product.py
@@ -27,7 +27,7 @@ def _search(
                 .commercial_partner_id
             )
             supplierinfos = self.env["product.supplierinfo"].search(
-                [("name", "=", seller.id)]
+                [("partner_id", "=", seller.id)]
             )
             args += [
                 "|",
diff --git a/purchase_allowed_product/tests/test_purchase_allowed_product.py b/purchase_allowed_product/tests/test_purchase_allowed_product.py
@@ -13,7 +13,7 @@ def setUp(self):
         self.product_model = self.env["product.product"]
         self.partner_4 = self.env.ref("base.res_partner_4")
         self.supplierinfo = self.supplierinfo_model.search(
-            [("name", "=", self.partner_4.id)]
+            [("partner_id", "=", self.partner_4.id)]
         )
         self.partner_4_supplied_products = self.product_model.search(
             [
diff --git a/purchase_allowed_product/views/purchase_order_views.xml b/purchase_allowed_product/views/purchase_order_views.xml
@@ -20,19 +20,19 @@
                 expr="//field[@name='order_line']/tree/field[@name='product_id']"
                 position="attributes"
             >
-                <attribute name="context">{
-                    'restrict_supplier_id': parent.partner_id,
-                    'use_only_supplied_product': parent.use_only_supplied_product
-                }</attribute>
+                <attribute name="context" operation="update">
+                    {'restrict_supplier_id': parent.partner_id,
+                    'use_only_supplied_product': parent.use_only_supplied_product}
+                </attribute>
             </xpath>
             <xpath
                 expr="//field[@name='order_line']/form//field[@name='product_id']"
                 position="attributes"
             >
-                <attribute name="context">{
-                    'restrict_supplier_id': parent.partner_id,
-                    'use_only_supplied_product': parent.use_only_supplied_product
-                }</attribute>
+                <attribute name="context" operation="update">
+                    {'restrict_supplier_id': parent.partner_id,
+                    'use_only_supplied_product': parent.use_only_supplied_product}
+                </attribute>
             </xpath>
         </field>
     </record>

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ def _search(`
`27`	`27`	`.commercial_partner_id`
`28`	`28`	`)`
`29`	`29`	`supplierinfos = self.env["product.supplierinfo"].search(`
`30`		`- [("name", "=", seller.id)]`
	`30`	`+ [("partner_id", "=", seller.id)]`
`31`	`31`	`)`
`32`	`32`	`args += [`
`33`	`33`	`"\|",`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ def setUp(self):`
`13`	`13`	`self.product_model = self.env["product.product"]`
`14`	`14`	`self.partner_4 = self.env.ref("base.res_partner_4")`
`15`	`15`	`self.supplierinfo = self.supplierinfo_model.search(`
`16`		`- [("name", "=", self.partner_4.id)]`
	`16`	`+ [("partner_id", "=", self.partner_4.id)]`
`17`	`17`	`)`
`18`	`18`	`self.partner_4_supplied_products = self.product_model.search(`
`19`	`19`	`[`