diff --git a/device.py b/device.py
index eaadd7d..910b4c8 100644
--- a/device.py
+++ b/device.py
@@ -19,7 +19,7 @@ class SaleDevice(ModelSQL, ModelView):
     journals = fields.Many2Many('sale.device.account.statement.journal',
         'device', 'journal', 'Journals', depends=['company'],
         domain=[
-            ('company', '=', Eval('company')),
+            ('company', '=', Eval('company', -1)),
             ]
         )
     journal = fields.Many2One('account.statement.journal', "Default Journal",
diff --git a/sale.py b/sale.py
index fc003cf..5ce3dec 100644
--- a/sale.py
+++ b/sale.py
@@ -30,7 +30,7 @@ class Sale(metaclass=PoolMeta):
                                       'get_residual_amount',
                                       searcher='search_residual_amount')
     sale_device = fields.Many2One('sale.device', 'Sale Device',
-                                  domain=[('shop', '=', Eval('shop'))],
+                                  domain=[('shop', '=', Eval('shop', -1))],
                                   depends=['shop'], states={
                                       'readonly': Eval('state') != 'draft',
                                   })
@@ -225,7 +225,7 @@ class ChangePaymentMethodForm(ModelView):
                                  'Allowed Statement', readonly=True)
     payment = fields.Many2One(
         'account.statement.line', "Payment", required=True,
-        domain=[('sale', '=', Eval('sale'))])
+        domain=[('sale', '=', Eval('sale', -1))])
 
 
 class ChangePaymentMethod(Wizard):
diff --git a/sale.xml b/sale.xml
index 96b5561..6ed0297 100644
--- a/sale.xml
+++ b/sale.xml
@@ -13,7 +13,7 @@ copyright notices and license terms. -->
         <record model="ir.action.act_window" id="act_payment_form">
             <field name="name">Payments</field>
             <field name="res_model">account.statement.line</field>
-            <field name="domain" eval="[If(Eval('active_ids', []) == [Eval('active_id')], ('sale', '=', Eval('active_id')), ('sale', 'in', Eval('active_ids')))]" pyson="1"/>
+            <field name="domain" eval="[If(Eval('active_ids', []) == [Eval('active_id'), -1], ('sale', '=', Eval('active_id', -1)), ('sale', 'in', Eval('active_ids', [])))]" pyson="1"/>
         </record>
         <record model="ir.action.keyword" id="act_open_payment_keyword1">
             <field name="keyword">form_relate</field>
@@ -31,7 +31,7 @@ copyright notices and license terms. -->
             <field name="name">sale_payment_form</field>
         </record>
 
-	<record model="ir.action.wizard" id="wizard_sale_change_payment_method">
+	    <record model="ir.action.wizard" id="wizard_sale_change_payment_method">
             <field name="name">Change Payment Method</field>
             <field name="wiz_name">sale.change_payment_method</field>
         </record>
diff --git a/user.py b/user.py
index 0f4cfd1..6881564 100644
--- a/user.py
+++ b/user.py
@@ -14,7 +14,7 @@ class User(metaclass=PoolMeta):
     __name__ = "res.user"
     sale_device = fields.Many2One(
         'sale.device', 'Sale Device', domain=[
-            ('shop', '=', Eval('shop'))
+            ('shop', '=', Eval('shop', -1))
         ], depends=['shop'])
 
     @classmethod