From 347d928aff3aef27bd0619073949ead2d06cbff9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Sat, 3 Apr 2021 23:30:21 +0200
Subject: [PATCH] Use explicit list of product types for stock move

issue10225
review361481002
---
 bom.py     | 10 ++++++----
 product.py | 20 ++++++++++++++------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/bom.py b/bom.py
index 75cedfb803..dc3faeb001 100644
--- a/bom.py
+++ b/bom.py
@@ -45,10 +45,7 @@ class BOMInput(ModelSQL, ModelView):
 
     bom = fields.Many2One('production.bom', 'BOM', required=True,
         select=1, ondelete='CASCADE')
-    product = fields.Many2One('product.product', 'Product',
-        required=True, domain=[
-            ('type', '!=', 'service'),
-        ])
+    product = fields.Many2One('product.product', 'Product', required=True)
     uom_category = fields.Function(fields.Many2One(
         'product.uom.category', 'Uom Category'), 'on_change_with_uom_category')
     uom = fields.Many2One('product.uom', 'Uom', required=True,
@@ -68,6 +65,7 @@ class BOMInput(ModelSQL, ModelView):
     @classmethod
     def __setup__(cls):
         super(BOMInput, cls).__setup__()
+        cls.product.domain = [('type', 'in', cls.get_product_types())]
         cls.__access__.add('bom')
         t = cls.__table__()
         cls._sql_constraints = [
@@ -75,6 +73,10 @@ class BOMInput(ModelSQL, ModelView):
                 'production.msg_product_bom_unique'),
             ]
 
+    @classmethod
+    def get_product_types(cls):
+        return ['goods', 'assets']
+
     @fields.depends('product', 'uom')
     def on_change_product(self):
         if self.product:
diff --git a/product.py b/product.py
index 97165c8703..3c2dc5e4f5 100644
--- a/product.py
+++ b/product.py
@@ -10,11 +10,19 @@ from trytond.pool import PoolMeta
 
 class Template(metaclass=PoolMeta):
     __name__ = 'product.template'
-    producible = fields.Boolean(
-        "Producible", states={
-            'invisible': Eval('type') == 'service',
-            },
-        depends=['type'])
+    producible = fields.Boolean("Producible")
+
+    @classmethod
+    def __setup__(cls):
+        super().__setup__()
+        cls.producible.states = {
+            'invisible': ~Eval('type').in_(cls.get_producible_types()),
+            }
+        cls.producible.depends = ['type']
+
+    @classmethod
+    def get_producible_types(cls):
+        return ['goods', 'assets']
 
     @classmethod
     def view_attributes(cls):
@@ -102,7 +110,7 @@ class ProductionLeadTime(sequence_ordered(), ModelSQL, ModelView, MatchMixin):
     product = fields.Many2One('product.product', 'Product',
         ondelete='CASCADE', select=True, required=True,
         domain=[
-            ('type', '!=', 'service'),
+            ('producible', '=', True),
             ])
     bom = fields.Many2One('production.bom', 'BOM', ondelete='CASCADE',
         domain=[