Merge 81bdf5a into 0a52254

OCA · Jan 29, 2016 · 3807f8d · 3807f8d
2 parents 0a52254 + 81bdf5a
commit 3807f8d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/sale_order_type/models/stock_picking.py b/sale_order_type/models/stock_picking.py
@@ -13,7 +13,9 @@ class StockPicking(models.Model):
     def _create_invoice_from_picking(self, picking, vals):
         if picking and picking.sale_id:
             sale = picking.sale_id
-            if sale.type_id and sale.type_id.journal_id:
-                vals['journal_id'] = sale.type_id.journal_id.id
+            if sale.type_id:
+                vals['journal_id'] = (sale.type_id.journal_id.id if
+                                      vals['type'] == 'out_invoice' else
+                                      sale.type_id.refund_journal_id.id)
         return super(StockPicking, self)._create_invoice_from_picking(picking,
                                                                       vals)