diff --git a/addons/point_of_sale/models/pos_order.py b/addons/point_of_sale/models/pos_order.py
index bd680c6e472..878ef61bc3b 100644
--- a/addons/point_of_sale/models/pos_order.py
+++ b/addons/point_of_sale/models/pos_order.py
@@ -401,8 +401,6 @@ class PosOrder(models.Model):
             'invoice_line_ids': [(0, None, self._prepare_invoice_line(line)) for line in self.lines],
             'invoice_cash_rounding_id': self.config_id.rounding_method.id if self.config_id.cash_rounding else False
         }
-        if self.crm_team_id:
-            vals['team_id'] = self.crm_team_id.id
         return vals
 
     def action_pos_order_invoice(self):
diff --git a/addons/pos_sale/models/pos_order.py b/addons/pos_sale/models/pos_order.py
index 4e65541d597..eb16cd7272a 100644
--- a/addons/pos_sale/models/pos_order.py
+++ b/addons/pos_sale/models/pos_order.py
@@ -22,7 +22,7 @@ class PosOrder(models.Model):
             date_order = order.date_order or fields.Datetime.now()
             order.currency_rate = self.env['res.currency']._get_conversion_rate(order.company_id.currency_id, order.pricelist_id.currency_id, order.company_id, date_order)
 
-    def _prepare_invoice(self):
-        invoice_vals = super(PosOrder, self)._prepare_invoice()
+    def _prepare_invoice_vals(self):
+        invoice_vals = super(PosOrder, self)._prepare_invoice_vals()
         invoice_vals['team_id'] = self.crm_team_id
         return invoice_vals