diff --git a/sale_stock_usability/__init__.py b/sale_stock_usability/__init__.py
index 7aa13ee..6554732 100644
--- a/sale_stock_usability/__init__.py
+++ b/sale_stock_usability/__init__.py
@@ -1,3 +1,4 @@
 # -*- coding: utf-8 -*-
 
 from . import sale_stock
+from . import wizard
diff --git a/sale_stock_usability/wizard/__init__.py b/sale_stock_usability/wizard/__init__.py
new file mode 100644
index 0000000..0da2565
--- /dev/null
+++ b/sale_stock_usability/wizard/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import stock_return_picking
diff --git a/sale_stock_usability/wizard/stock_return_picking.py b/sale_stock_usability/wizard/stock_return_picking.py
new file mode 100644
index 0000000..48edc23
--- /dev/null
+++ b/sale_stock_usability/wizard/stock_return_picking.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# © 2017 Akretion (Alexis de Lattre <alexis.delattre@akretion.com>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo import models, api
+
+
+class StockReturnPicking(models.TransientModel):
+    _inherit = 'stock.return.picking'
+
+    @api.model
+    def default_get(self, fields):
+        res = super(StockReturnPicking, self).default_get(fields)
+        if res.get('product_return_moves'):
+            for line in res['product_return_moves']:
+                if len(line) == 3:
+                    line[2]['to_refund_so'] = True
+        return res