[16.0][IMP] purchase_order_line_product_brand_info: Change compute fo…

…r onchange.
avanzosc · Dec 17, 2024 · 642bc95 · 642bc95
1 parent dcd79cd
commit 642bc95
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 59 deletions.
diff --git a/purchase_order_line_product_brand_info/__manifest__.py b/purchase_order_line_product_brand_info/__manifest__.py
@@ -8,11 +8,12 @@
     "website": "https://github.com/avanzosc/odoo-addons",
     "author": "Avanzosc",
     "license": "AGPL-3",
-    "depends": ["purchase", "product_brand_supplierinfo"],
+    "depends": ["purchase", "stock", "product_brand_supplierinfo"],
     "data": [
         "report/purchase_order_report.xml",
         "views/purchase_order_line_views.xml",
         "views/purchase_order_views.xml",
+        "views/stock_picking_view.xml",
     ],
     "installable": True,
 }
diff --git a/purchase_order_line_product_brand_info/i18n/es.po b/purchase_order_line_product_brand_info/i18n/es.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-27 11:05+0000\n"
-"PO-Revision-Date: 2024-05-27 11:05+0000\n"
+"POT-Creation-Date: 2024-12-13 11:39+0000\n"
+"PO-Revision-Date: 2024-12-13 11:39+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,16 +22,25 @@ msgid "<strong>Brand Code</strong>"
 msgstr "<strong>Código marca</strong>"
 
 #. module: purchase_order_line_product_brand_info
-#: model:ir.model.fields,field_description:purchase_order_line_product_brand_info.field_purchase_order_line__brand_fabricators
-msgid "Brand Fabricators"
-msgstr "Fabricantes marca"
+#: model:ir.model.fields,field_description:purchase_order_line_product_brand_info.field_purchase_order_line__product_brand_id
+#: model:ir.model.fields,field_description:purchase_order_line_product_brand_info.field_stock_move__product_brand_id
+#: model:ir.model.fields,field_description:purchase_order_line_product_brand_info.field_stock_reservation__product_brand_id
+msgid "Product Brand"
+msgstr "Marca"
 
 #. module: purchase_order_line_product_brand_info
 #: model:ir.model.fields,field_description:purchase_order_line_product_brand_info.field_purchase_order_line__product_brand_code
+#: model:ir.model.fields,field_description:purchase_order_line_product_brand_info.field_stock_move__product_brand_code
+#: model:ir.model.fields,field_description:purchase_order_line_product_brand_info.field_stock_reservation__product_brand_code
 msgid "Product Brand Code"
 msgstr "Código marca producto"
 
 #. module: purchase_order_line_product_brand_info
 #: model:ir.model,name:purchase_order_line_product_brand_info.model_purchase_order_line
 msgid "Purchase Order Line"
 msgstr "Línea de pedido de compra"
+
+#. module: purchase_order_line_product_brand_info
+#: model:ir.model,name:purchase_order_line_product_brand_info.model_stock_move
+msgid "Stock Move"
+msgstr "Movimiento de existencias"
diff --git a/purchase_order_line_product_brand_info/i18n/purchase_order_line_product_brand_info.pot b/purchase_order_line_product_brand_info/i18n/purchase_order_line_product_brand_info.pot
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Odoo Server 16.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-27 11:05+0000\n"
-"PO-Revision-Date: 2024-05-27 11:05+0000\n"
+"POT-Creation-Date: 2024-12-13 11:39+0000\n"
+"PO-Revision-Date: 2024-12-13 11:39+0000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -22,16 +22,25 @@ msgid "<strong>Brand Code</strong>"
 msgstr ""
 
 #. module: purchase_order_line_product_brand_info
-#: model:ir.model.fields,field_description:purchase_order_line_product_brand_info.field_purchase_order_line__brand_fabricators
-msgid "Brand Fabricators"
+#: model:ir.model.fields,field_description:purchase_order_line_product_brand_info.field_purchase_order_line__product_brand_id
+#: model:ir.model.fields,field_description:purchase_order_line_product_brand_info.field_stock_move__product_brand_id
+#: model:ir.model.fields,field_description:purchase_order_line_product_brand_info.field_stock_reservation__product_brand_id
+msgid "Product Brand"
 msgstr ""
 
 #. module: purchase_order_line_product_brand_info
 #: model:ir.model.fields,field_description:purchase_order_line_product_brand_info.field_purchase_order_line__product_brand_code
+#: model:ir.model.fields,field_description:purchase_order_line_product_brand_info.field_stock_move__product_brand_code
+#: model:ir.model.fields,field_description:purchase_order_line_product_brand_info.field_stock_reservation__product_brand_code
 msgid "Product Brand Code"
 msgstr ""
 
 #. module: purchase_order_line_product_brand_info
 #: model:ir.model,name:purchase_order_line_product_brand_info.model_purchase_order_line
 msgid "Purchase Order Line"
 msgstr ""
+
+#. module: purchase_order_line_product_brand_info
+#: model:ir.model,name:purchase_order_line_product_brand_info.model_stock_move
+msgid "Stock Move"
+msgstr ""
diff --git a/purchase_order_line_product_brand_info/models/__init__.py b/purchase_order_line_product_brand_info/models/__init__.py
@@ -1 +1,2 @@
 from . import purchase_order_line
+from . import stock_move
diff --git a/purchase_order_line_product_brand_info/models/purchase_order_line.py b/purchase_order_line_product_brand_info/models/purchase_order_line.py
@@ -6,46 +6,14 @@
 class PurchaseOrderLine(models.Model):
     _inherit = "purchase.order.line"
 
-    product_brand_code = fields.Char(
-        compute="_compute_brand_info",
-        store=True,
-        copy=False,
-    )
-    brand_fabricators = fields.Char(
-        compute="_compute_brand_info",
-        store=True,
-        copy=False,
-    )
+    product_brand_code = fields.Char()
+    product_brand_id = fields.Many2one(comodel_name="product.brand")
 
-    @api.depends(
-        "product_id",
-        "product_id.product_tmpl_id",
-        "product_id.product_tmpl_id.seller_ids",
-        "product_id.product_tmpl_id.seller_ids.partner_id",
-        "product_id.product_tmpl_id.seller_ids.product_brand_id",
-        "product_id.product_tmpl_id.seller_ids.product_brand_id.code",
-        "product_id.product_tmpl_id.seller_ids.product_brand_id",
-    )
-    def _compute_brand_info(self):
-        for move in self:
-            product_brand_code = ""
-            brand_fabricators = ""
-            if move.product_id:
-                sellers = move.product_id.seller_ids.filtered(
-                    lambda x: x.product_brand_id and x.product_brand_id.code
-                )
-                for seller in sellers:
-                    brand_code = seller.product_brand_id.code
-                    product_brand_code = (
-                        brand_code
-                        if not product_brand_code
-                        else "{}, {}".format(product_brand_code, brand_code)
-                    )
-                    partner_name = seller.partner_id.name
-                    brand_fabricators = (
-                        partner_name
-                        if not brand_fabricators
-                        else "{}, {}".format(brand_fabricators, partner_name)
-                    )
-            move.product_brand_code = product_brand_code
-            move.brand_fabricators = brand_fabricators
+    @api.onchange("seller_id")
+    def onchange_seller_id(self):
+        result = super().onchange_seller_id()
+        if self.seller_id.brand_code:
+            self.product_brand_code = self.seller_id.brand_code
+        if self.seller_id.product_brand_id:
+            self.product_brand_id = self.seller_id.product_brand_id.id
+        return result
diff --git a/purchase_order_line_product_brand_info/models/stock_move.py b/purchase_order_line_product_brand_info/models/stock_move.py
@@ -0,0 +1,17 @@
+# Copyright 2024 Berezi Amubieta - AvanzOSC
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+from odoo import fields, models
+
+
+class StockMove(models.Model):
+    _inherit = "stock.move"
+
+    product_brand_code = fields.Char(
+        related="purchase_line_id.product_brand_code",
+        store=True,
+    )
+    product_brand_id = fields.Many2one(
+        comodel_name="product.brand",
+        related="purchase_line_id.product_brand_id",
+        store=True,
+    )
diff --git a/purchase_order_line_product_brand_info/views/purchase_order_line_views.xml b/purchase_order_line_product_brand_info/views/purchase_order_line_views.xml
@@ -5,8 +5,18 @@
         <field name="inherit_id" ref="purchase.purchase_order_line_tree" />
         <field name="arch" type="xml">
             <field name="date_planned" position="after">
-                <field name="product_brand_code" optional="show" readonly="1" />
-                <field name="brand_fabricators" optional="show" readonly="1" />
+                <field
+          name="product_brand_code"
+          optional="show"
+          readonly="1"
+          force_save="1"
+        />
+                <field
+          name="product_brand_id"
+          optional="show"
+          readonly="1"
+          force_save="1"
+        />
             </field>
         </field>
     </record>
@@ -16,8 +26,8 @@
         <field name="inherit_id" ref="purchase.purchase_order_line_form2" />
         <field name="arch" type="xml">
             <field name="price_unit" position="after">
-                <field name="product_brand_code" readonly="1" />
-                <field name="brand_fabricators" readonly="1" />
+                <field name="product_brand_code" readonly="1" force_save="1" />
+                <field name="product_brand_id" readonly="1" force_save="1" />
             </field>
         </field>
     </record>
@@ -28,7 +38,7 @@
         <field name="arch" type="xml">
             <field name="partner_id" position="after">
                 <field name="product_brand_code" />
-                <field name="brand_fabricators" />
+                <field name="product_brand_id" />
             </field>
         </field>
     </record>

diff --git a/purchase_order_line_product_brand_info/views/purchase_order_views.xml b/purchase_order_line_product_brand_info/views/purchase_order_views.xml
@@ -8,8 +8,18 @@
         expr="//field[@name='order_line']/tree/field[@name='product_uom']"
         position="after"
       >
-                <field name="product_brand_code" optional="show" readonly="1" />
-                <field name="brand_fabricators" optional="show" readonly="1" />
+                <field
+          name="product_brand_code"
+          optional="show"
+          readonly="1"
+          force_save="1"
+        />
+                <field
+          name="product_brand_id"
+          optional="show"
+          readonly="1"
+          force_save="1"
+        />
             </xpath>
         </field>
     </record>

diff --git a/purchase_order_line_product_brand_info/views/stock_picking_view.xml b/purchase_order_line_product_brand_info/views/stock_picking_view.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record id="view_picking_form" model="ir.ui.view">
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form" />
+        <field name="arch" type="xml">
+            <xpath
+        expr="//field[@name='move_ids_without_package']//field[@name='product_id']"
+        position="after"
+      >
+                <field name="product_brand_code" optional="show" />
+                <field name="product_brand_id" optional="show" />
+            </xpath>
+        </field>
+    </record>
+</odoo>
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		from . import purchase_order_line
		from . import stock_move