Merge PR #76 into 14.0

Signed-off-by andhit-r
open-synergy · Aug 31, 2024 · f5051ae · f5051ae
2 parents 6815639 + cba6522
commit f5051ae
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 1 deletion.
diff --git a/ssi_stock_fixed_asset/models/stock_production_lot.py b/ssi_stock_fixed_asset/models/stock_production_lot.py
@@ -13,3 +13,8 @@ class StockProductionLot(models.Model):
         string="Fixed Assets",
         comodel_name="fixed.asset.asset",
     )
+    fixed_asset_state = fields.Selection(
+        string="Fixed Asset State",
+        related="fixed_asset_id.state",
+        store=True,
+    )
diff --git a/ssi_stock_fixed_asset/views/stock_production_lot_views.xml b/ssi_stock_fixed_asset/views/stock_production_lot_views.xml
@@ -9,8 +9,9 @@
     <field name="inherit_id" ref="stock.view_production_lot_tree" />
     <field name="arch" type="xml">
         <data>
-            <xpath expr="//field[@name='product_id']" position="after">
+            <xpath expr="//field[last()]" position="after">
                 <field name="fixed_asset_id" />
+                <field name="fixed_asset_state" />
             </xpath>
         </data>
     </field>
@@ -24,6 +25,32 @@
         <data>
             <xpath expr="//field[@name='product_id']" position="after">
                 <field name="fixed_asset_id" />
+                <field name="fixed_asset_state" />
+            </xpath>
+            <xpath expr="//group" position="before">
+                <filter
+                        name="dom_is_fixed_asset"
+                        string="Is Fixed Asset"
+                        domain="[('fixed_asset_id','!=',False)]"
+                    />
+                <filter
+                        name="dom_is_not_fixed_asset"
+                        string="Is Not Fixed Asset"
+                        domain="[('fixed_asset_id','=',False)]"
+                    />
+                <separator />
+            </xpath>
+            <xpath expr="//group" position="inside">
+                <filter
+                        name="grp_fixed_asset"
+                        string="Fixed Asset"
+                        context="{'group_by': 'fixed_asset_id'}"
+                    />
+                <filter
+                        name="grp_fixed_asset_state"
+                        string="Fixed Asset State"
+                        context="{'group_by': 'fixed_asset_state'}"
+                    />
             </xpath>
         </data>
     </field>
@@ -39,6 +66,7 @@
                 <page name="fixed_asset" string="Fixed Asset">
                     <group name="fixed_asset_1" colspan="4" col="2">
                         <field name="fixed_asset_id" />
+                        <field name="fixed_asset_state" />
                     </group>
                 </page>
             </xpath>