diff --git a/sale.py b/sale.py
index 1fd6d71..d5ee3f5 100644
--- a/sale.py
+++ b/sale.py
@@ -177,11 +177,12 @@ class Sale(metaclass=PoolMeta):
         User = Pool().get('res.user')
         context = Transaction().context
         today = date.today()
+        user_id = context.get('user')
+        user = User(user_id)
+
         if context.get('shop'):
             shop = Shop(context['shop'])
         else:
-            user_id = context.get('user')
-            user = User(user_id)
             shop = user.shop
         context['price_list'] = shop.price_list
         for v in args['lines']:
@@ -204,13 +205,15 @@ class Sale(metaclass=PoolMeta):
             'shop': shop.id,
             'party': party.id,
             'invoice_type':'P',
-            'table_assigned': args['table_assigned']['id'],
+            'table_assigned': args['table_assigned']['id'] if args.get('table_asigned') else None,
             'shipment_address': party.addresses[0].id,
             'invoice_address': party.addresses[0].id,
             'company': shop.company.id,
             'kind': 'to_table',
             'sale_date': today,
             'shipment_date': today,
+            'salesman': user.employee,
+            'sale_device': user.sale_device,
             'price_list': shop.price_list,
             'payment_term': shop.payment_term.id,
             'state': 'draft',