diff --git a/issue6441002_20001.diff b/issue6441002_20001.diff
new file mode 100644
index 0000000..270f4e4
--- /dev/null
+++ b/issue6441002_20001.diff
@@ -0,0 +1,34 @@
+Index: trytond/trytond/modules/production/production.py
+===================================================================
+
+--- a/trytond/trytond/modules/production/production.py
++++ b/trytond/trytond/modules/production/production.py
+@@ -70,7 +70,8 @@
+             ('output_products', '=', Eval('product', 0)),
+             ],
+         states={
+-            'readonly': ~Eval('state').in_(['request', 'draft']),
++            'readonly': (~Eval('state').in_(['request', 'draft'])
++                | ~Eval('warehouse', 0) | ~Eval('location', 0)),
+             'invisible': ~Eval('product'),
+             },
+         depends=['product'])
+@@ -106,7 +107,7 @@
+             ],
+         states={
+             'readonly': (~Eval('state').in_(['request', 'draft', 'waiting'])
+-                | ~Eval('location')),
++                | ~Eval('warehouse') | ~Eval('location')),
+             },
+         depends=['warehouse', 'location'])
+     outputs = fields.One2Many('stock.move', 'production_output', 'Outputs',
+@@ -116,7 +117,7 @@
+             ],
+         states={
+             'readonly': (Eval('state').in_(['done', 'cancel'])
+-                | ~Eval('location')),
++                | ~Eval('warehouse') | ~Eval('location')),
+             },
+         depends=['warehouse', 'location'])
+     state = fields.Selection([
+
diff --git a/series b/series
index 2415b86..3997df7 100644
--- a/series
+++ b/series
@@ -27,3 +27,4 @@ issue13411002_1.diff
 issue9511002_1.diff
 issue8481003_1.diff
 issue7461002_1.diff
+issue6441002_20001.diff