From 79804719fec06d40da5d5203e03a2cf47a2283b4 Mon Sep 17 00:00:00 2001
From: clesgow <quwo@odoo.com>
Date: Wed, 1 Sep 2021 08:10:52 +0000
Subject: [PATCH] [FIX] stock_account: product_category_form inherit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Directly inheriting stock.product_category_form_view_inherit would raise
an error as group "account_property" wouldn't yet exist in the inherited
record.

Fixes 61d937f7d66c668c2809a07257a8cf188617b372

closes odoo/odoo#75822

Signed-off-by: Rémy Voet <ryv-odoo@users.noreply.github.com>
---
 addons/stock_account/views/product_views.xml | 22 +++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/addons/stock_account/views/product_views.xml b/addons/stock_account/views/product_views.xml
index 640764b9a29..a8d15b6c944 100644
--- a/addons/stock_account/views/product_views.xml
+++ b/addons/stock_account/views/product_views.xml
@@ -12,10 +12,24 @@
             </field>
         </record>
 
+        <record id="view_category_property_form_stock" model="ir.ui.view">
+            <field name="name">product.category.stock.property.form.inherit.stock</field>
+            <field name="model">product.category</field>
+            <field name="inherit_id" ref="stock.product_category_form_view_inherit"/>
+            <field name="arch" type="xml">
+                <group name="logistics" position="after">
+                    <group string="Inventory Valuation">
+                        <field name="property_cost_method"/>
+                        <field name="property_valuation" groups="account.group_account_readonly,stock.group_stock_manager"/>
+                    </group>
+                </group>
+            </field>
+        </record>
+
         <record id="view_category_property_form" model="ir.ui.view">
             <field name="name">product.category.stock.property.form.inherit</field>
             <field name="model">product.category</field>
-            <field name="inherit_id" ref="stock.product_category_form_view_inherit"/>
+            <field name="inherit_id" ref="account.view_category_property_form"/>
             <field name="arch" type="xml">
                 <group name="account_property" position="inside">
                     <group name="account_stock_property" string="Account Stock Properties" groups="account.group_account_readonly" attrs="{'invisible':[('property_valuation', '=', 'manual_periodic')]}">
@@ -28,12 +42,6 @@
                         </div>
                     </group>
                 </group>
-                <group name="logistics" position="after">
-                    <group string="Inventory Valuation">
-                        <field name="property_cost_method"/>
-                        <field name="property_valuation" groups="account.group_account_readonly,stock.group_stock_manager"/>
-                    </group>
-                </group>
             </field>
         </record>
    </data>