diff --git a/modules/sale_payment/sale.py b/modules/sale_payment/sale.py
index b7c70c1946..861d6f571f 100644
--- a/modules/sale_payment/sale.py
+++ b/modules/sale_payment/sale.py
@@ -31,9 +31,12 @@ class Sale(metaclass=PoolMeta):
                 ('kind', '=', 'receivable'),
                 ('kind', '=', 'payable'),
                 ),
-            ('party', '=', If(Bool(Eval('invoice_party')),
-                    Eval('invoice_party'), Eval('party'))),
-            ('currency', '=', Eval('currency')),
+            ['OR',
+                ('party', '=', If(Bool(Eval('invoice_party')),
+                        Eval('invoice_party', -1), Eval('party', -1))),
+                ('state', '!=', 'draft'),
+                ],
+            ('currency', '=', Eval('currency', -1)),
             ],
         states={
             'readonly': Eval('state') != 'quotation',