diff --git a/modules/purchase/purchase.xml b/modules/purchase/purchase.xml
index 33330b8..05f87d2 100755
--- a/modules/purchase/purchase.xml
+++ b/modules/purchase/purchase.xml
@@ -91,26 +91,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="view" ref="purchase_view_form"/>
             <field name="act_window" ref="act_purchase_form"/>
         </record>
-        <record model="ir.action.act_window.domain"
-            id="act_purchase_form_domain_service">
-            <field name="name">Services</field>
-            <field name="sequence" eval="10"/>
-            <field name="domain" eval="[('line_type', '=', 'service')]" pyson="1"/>
-            <field name="count" eval="True"/>
-            <field name="act_window" ref="act_purchase_form"/>
-        </record>
-        <record model="ir.action.act_window.domain"
-            id="act_purchase_form_domain_draft">
-            <field name="name">Draft</field>
-            <field name="sequence" eval="10"/>
-            <field name="domain" eval="['AND',('state', '=', 'draft'),('line_type', '=', 'goods')]" pyson="1"/>
-            <field name="count" eval="True"/>
-            <field name="act_window" ref="act_purchase_form"/>
-        </record>
         <record model="ir.action.act_window.domain"
             id="act_purchase_form_domain_quotation">
-            <field name="name">Validation</field>
-            <field name="sequence" eval="20"/>
+            <field name="name">Validated</field>
+            <field name="sequence" eval="10"/>
             <field name="domain" eval="['AND',('state', '=', 'quotation'),('line_type', '=', 'goods')]" pyson="1"/>
             <field name="count" eval="True"/>
             <field name="act_window" ref="act_purchase_form"/>
@@ -118,7 +102,7 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window.domain"
             id="act_purchase_form_domain_confirmed">
             <field name="name">Confirmed</field>
-            <field name="sequence" eval="30"/>
+            <field name="sequence" eval="20"/>
             <field name="domain" eval="['AND',('state', '=', 'confirmed'),('line_type', '=', 'goods')]" pyson="1"/>
             <field name="count" eval="True"/>
             <field name="act_window" ref="act_purchase_form"/>
@@ -126,15 +110,31 @@ this repository contains the full copyright notices and license terms. -->
         <record model="ir.action.act_window.domain"
             id="act_purchase_form_domain_processing">
             <field name="name">Processing</field>
-            <field name="sequence" eval="40"/>
+            <field name="sequence" eval="30"/>
             <field name="domain" eval="['AND',('state', '=', 'processing'),('line_type', '=', 'goods')]" pyson="1"/>
             <field name="count" eval="True"/>
             <field name="act_window" ref="act_purchase_form"/>
         </record>
+        <record model="ir.action.act_window.domain"
+            id="act_purchase_form_domain_draft">
+            <field name="name">Draft</field>
+            <field name="sequence" eval="40"/>
+            <field name="domain" eval="['AND',('state', '=', 'draft'),('line_type', '=', 'goods')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_purchase_form"/>
+        </record>
+        <record model="ir.action.act_window.domain"
+            id="act_purchase_form_domain_service">
+            <field name="name">Services</field>
+            <field name="sequence" eval="50"/>
+            <field name="domain" eval="[('line_type', '=', 'service')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_purchase_form"/>
+        </record>
         <record model="ir.action.act_window.domain"
             id="act_purchase_form_domain_exception">
             <field name="name">Exception</field>
-            <field name="sequence" eval="50"/>
+            <field name="sequence" eval="60"/>
             <field name="domain"
                 eval="['OR', ('invoice_state', '=', 'exception'), ('shipment_state', '=', 'exception')]"
                 pyson="1"/>
diff --git a/modules/purchase_trade/purchase.xml b/modules/purchase_trade/purchase.xml
index d4e0076..e6e6c93 100755
--- a/modules/purchase_trade/purchase.xml
+++ b/modules/purchase_trade/purchase.xml
@@ -62,8 +62,56 @@ this repository contains the full copyright notices and license terms. -->
             <field name="view" ref="purchase_line_view_form"/>
             <field name="act_window" ref="act_purchase_line_reporting"/>
         </record>
-
-        <record model="ir.action.wizard" id="act_bi">
+        <record model="ir.action.act_window.domain" id="act_purchase_line_reporting_domain_validated">
+            <field name="name">Validated</field>
+            <field name="sequence" eval="10"/>
+            <field name="domain" eval="[('purchase.state', '=', 'quotation'), ('product.type', '!=', 'service')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_purchase_line_reporting"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_purchase_line_reporting_domain_confirmed">
+            <field name="name">Confirmed</field>
+            <field name="sequence" eval="20"/>
+            <field name="domain" eval="[('purchase.state', '=', 'confirmed'), ('product.type', '!=', 'service')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_purchase_line_reporting"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_purchase_line_reporting_domain_processing">
+            <field name="name">Processing</field>
+            <field name="sequence" eval="30"/>
+            <field name="domain" eval="[('purchase.state', '=', 'processing'), ('product.type', '!=', 'service')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_purchase_line_reporting"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_purchase_line_reporting_domain_draft">
+            <field name="name">Draft</field>
+            <field name="sequence" eval="40"/>
+            <field name="domain" eval="[('purchase.state', '=', 'draft'), ('product.type', '!=', 'service')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_purchase_line_reporting"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_purchase_line_reporting_domain_service">
+            <field name="name">Services</field>
+            <field name="sequence" eval="50"/>
+            <field name="domain" eval="[('product.type', '=', 'service')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_purchase_line_reporting"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_purchase_line_reporting_domain_exception">
+            <field name="name">Exception</field>
+            <field name="sequence" eval="60"/>
+            <field name="domain" eval="['OR', ('purchase.invoice_state', '=', 'exception'), ('purchase.shipment_state', '=', 'exception')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_purchase_line_reporting"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_purchase_line_reporting_domain_all">
+            <field name="name">All</field>
+            <field name="sequence" eval="9999"/>
+            <field name="domain"></field>
+            <field name="act_window" ref="act_purchase_line_reporting"/>
+        </record>
+
+        <record model="ir.action.wizard" id="act_bi">
             <field name="name">🧠 Go to BI</field>
             <field name="wiz_name">purchase.bi</field>
             <field name="model">purchase.purchase</field>
diff --git a/modules/purchase_trade/sale.xml b/modules/purchase_trade/sale.xml
index 4072871..2a233dd 100755
--- a/modules/purchase_trade/sale.xml
+++ b/modules/purchase_trade/sale.xml
@@ -38,8 +38,56 @@ this repository contains the full copyright notices and license terms. -->
             <field name="view" ref="sale_line_view_form"/>
             <field name="act_window" ref="act_sale_line_reporting"/>
         </record>
-
-        <record model="ir.ui.view" id="sale_lot_view_tree_sequence">
+        <record model="ir.action.act_window.domain" id="act_sale_line_reporting_domain_validated">
+            <field name="name">Validated</field>
+            <field name="sequence" eval="10"/>
+            <field name="domain" eval="[('sale.state', '=', 'quotation'), ('product.type', '!=', 'service')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_sale_line_reporting"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_sale_line_reporting_domain_confirmed">
+            <field name="name">Confirmed</field>
+            <field name="sequence" eval="20"/>
+            <field name="domain" eval="[('sale.state', '=', 'confirmed'), ('product.type', '!=', 'service')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_sale_line_reporting"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_sale_line_reporting_domain_processing">
+            <field name="name">Processing</field>
+            <field name="sequence" eval="30"/>
+            <field name="domain" eval="[('sale.state', '=', 'processing'), ('product.type', '!=', 'service')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_sale_line_reporting"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_sale_line_reporting_domain_draft">
+            <field name="name">Draft</field>
+            <field name="sequence" eval="40"/>
+            <field name="domain" eval="[('sale.state', '=', 'draft'), ('product.type', '!=', 'service')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_sale_line_reporting"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_sale_line_reporting_domain_service">
+            <field name="name">Services</field>
+            <field name="sequence" eval="50"/>
+            <field name="domain" eval="[('product.type', '=', 'service')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_sale_line_reporting"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_sale_line_reporting_domain_exception">
+            <field name="name">Exception</field>
+            <field name="sequence" eval="60"/>
+            <field name="domain" eval="['OR', ('sale.invoice_state', '=', 'exception'), ('sale.shipment_state', '=', 'exception')]" pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_sale_line_reporting"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_sale_line_reporting_domain_all">
+            <field name="name">All</field>
+            <field name="sequence" eval="9999"/>
+            <field name="domain"></field>
+            <field name="act_window" ref="act_sale_line_reporting"/>
+        </record>
+
+        <record model="ir.ui.view" id="sale_lot_view_tree_sequence">
             <field name="model">lot.lot</field>
             <field name="inherit" ref="lot.lot_view_tree_sequence"/>
             <field name="name">sale_lot_tree_sequence</field>
diff --git a/modules/sale/sale.xml b/modules/sale/sale.xml
index 2725563..93e6568 100755
--- a/modules/sale/sale.xml
+++ b/modules/sale/sale.xml
@@ -112,43 +112,52 @@ this repository contains the full copyright notices and license terms. -->
         </record>
         <record model="ir.action.act_window.domain" id="act_sale_form_domain_draft">
             <field name="name">Draft</field>
-            <field name="sequence" eval="10"/>
+            <field name="sequence" eval="40"/>
             <field name="domain"
-                eval="[('state', '=', 'draft')]"
+                eval="[('state', '=', 'draft'), ('lines.product.type', '!=', 'service')]"
                 pyson="1"/>
             <field name="count" eval="True"/>
             <field name="act_window" ref="act_sale_form"/>
         </record>
         <record model="ir.action.act_window.domain" id="act_sale_form_domain_quotation">
-            <field name="name">Validation</field>
-            <field name="sequence" eval="20"/>
+            <field name="name">Validated</field>
+            <field name="sequence" eval="10"/>
             <field name="domain"
-                eval="[('state', '=', 'quotation')]"
+                eval="[('state', '=', 'quotation'), ('lines.product.type', '!=', 'service')]"
                 pyson="1"/>
             <field name="count" eval="True"/>
             <field name="act_window" ref="act_sale_form"/>
         </record>
         <record model="ir.action.act_window.domain" id="act_sale_form_domain_confirmed">
             <field name="name">Confirmed</field>
-            <field name="sequence" eval="30"/>
+            <field name="sequence" eval="20"/>
             <field name="domain"
-                eval="[('state', '=', 'confirmed')]"
+                eval="[('state', '=', 'confirmed'), ('lines.product.type', '!=', 'service')]"
                 pyson="1"/>
             <field name="count" eval="True"/>
             <field name="act_window" ref="act_sale_form"/>
         </record>
         <record model="ir.action.act_window.domain" id="act_sale_form_domain_processing">
             <field name="name">Processing</field>
-            <field name="sequence" eval="40"/>
+            <field name="sequence" eval="30"/>
             <field name="domain"
-                eval="[('state', '=', 'processing')]"
+                eval="[('state', '=', 'processing'), ('lines.product.type', '!=', 'service')]"
+                pyson="1"/>
+            <field name="count" eval="True"/>
+            <field name="act_window" ref="act_sale_form"/>
+        </record>
+        <record model="ir.action.act_window.domain" id="act_sale_form_domain_service">
+            <field name="name">Services</field>
+            <field name="sequence" eval="50"/>
+            <field name="domain"
+                eval="[('lines.product.type', '=', 'service')]"
                 pyson="1"/>
             <field name="count" eval="True"/>
             <field name="act_window" ref="act_sale_form"/>
         </record>
         <record model="ir.action.act_window.domain" id="act_sale_form_domain_exception">
             <field name="name">Exception</field>
-            <field name="sequence" eval="50"/>
+            <field name="sequence" eval="60"/>
             <field name="domain"
                 eval="['OR', ('invoice_state', '=', 'exception'), ('shipment_state', '=', 'exception')]"
                 pyson="1"/>