Merge branch 'master' into user-works

app/Exports/Purchases/Vendors.php

@@ -35,7 +35,6 @@ class Vendors extends Export
             'currency_code',
             'reference',
             'enabled',
-            'user_id',
         ];
     }
 }

app/Exports/Sales/Customers.php

@@ -35,7 +35,6 @@ class Customers extends Export
             'currency_code',
             'reference',
             'enabled',
-            'user_id',
         ];
     }
 }

app/Imports/Purchases/Vendors.php

@@ -21,6 +21,7 @@ class Vendors extends Import
 
         $row['type'] = 'vendor';
         $row['country'] = !empty($country) ? $country : null;
+        $row['user_id'] = null;
 
         return $row;
     }

app/Imports/Sales/Customers.php

@@ -21,6 +21,7 @@ class Customers extends Import
 
         $row['type'] = 'customer';
         $row['country'] = !empty($country) ? $country : null;
+        $row['user_id'] = null;
 
         return $row;
     }