diff --git a/account_payment_sale/models/sale_order.py b/account_payment_sale/models/sale_order.py
index cd93e56d7..fa30ccf2d 100644
--- a/account_payment_sale/models/sale_order.py
+++ b/account_payment_sale/models/sale_order.py
@@ -44,7 +44,8 @@ class SaleOrder(models.Model):
     def _prepare_invoice(self, order, lines):
         """Copy bank partner from sale order to invoice"""
         vals = super(SaleOrder, self)._prepare_invoice(order, lines)
-        vals['payment_mode_id'] = order.payment_mode_id.id,
-        vals['partner_bank_id'] = (order.payment_mode_id and
-                                   order.payment_mode_id.bank_id.id)
+        if order.payment_mode_id:
+            vals['payment_mode_id'] = order.payment_mode_id.id,
+            vals['partner_bank_id'] = (order.payment_mode_id and
+                                       order.payment_mode_id.bank_id.id)
         return vals
diff --git a/account_payment_sale/models/stock_picking.py b/account_payment_sale/models/stock_picking.py
index f9d48f688..320952ac5 100644
--- a/account_payment_sale/models/stock_picking.py
+++ b/account_payment_sale/models/stock_picking.py
@@ -33,7 +33,7 @@ class StockPicking(models.Model):
             sale_order_obj = self.env['sale.order']
             sale_order = sale_order_obj.search(
                 [('picking_ids', 'in', picking.id)], limit=1)
-            if sale_order:
+            if sale_order and sale_order.payment_mode_id:
                 vals['partner_bank_id'] = sale_order.payment_mode_id.bank_id.id
                 vals['payment_mode_id'] = sale_order.payment_mode_id.id
         return super(StockPicking, self)._create_invoice_from_picking(picking,