diff --git a/stock_picking_variant_mgmt/README.rst b/stock_picking_variant_mgmt/README.rst
new file mode 100644
index 000000000..53ae43d7f
--- /dev/null
+++ b/stock_picking_variant_mgmt/README.rst
@@ -0,0 +1,90 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+=================================================
+Handle easily multiple variants on Stock Pickings
+=================================================
+
+This module allows to add/modify of all the variants of a product in a direct
+screen without the need of handling them one by one.
+
+It also adds a convenient way of handling the transfer of the products in a
+2D matrix with all the values of the first attribute in columns, and the
+rest of the combinations in rows.
+
+Configuration
+=============
+
+#. Configure your user to have any permission from "Inventory" group.
+#. Create a product with 2 attributes and several values.
+
+Usage
+=====
+
+#. Go to Inventory > Dashboard.
+#. Create a new picking from one of the existing picking types.
+#. Press "Add variants" button located in the upper right corner of the
+   "Initial Demand" tab.
+#. A new screen will appear allowing you to select the products that have
+   variants.
+#. Once you select the product, a 2D matrix will appear with the first
+   attribute values as columns and the second one (if any) as rows.
+#. If there are already order lines for the product variants, the current
+   quantity will be pre-filled in the matrix.
+#. Change the quantities for the variant you want and click on "Transfer to
+   picking"
+#. Move lines for the variants will be created/removed to comply with the
+   input you have done.
+
+As extra feature for saving steps, there's also a button on each existing line
+that corresponds to a variant that opens the dialog directly with the product
+selected.
+
+You are also able to manage variants on 1 dimension in the transfer:
+
+#. Go to the "Operations" page.
+#. Press on "Manage Variants Transfer" button in the upper right corner of the
+   tab.
+#. Change the quantities to transfer.
+#. Click on "Transfer to picking" button.
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/137/9.0
+
+Known issues / Roadmap
+======================
+
+* The inline button for modifying quantities for an existing line won't
+  work correctly until these 2 PRs are merged in Odoo:
+
+  * https://github.com/odoo/odoo/pull/13557
+  * https://github.com/odoo/odoo/pull/13635
+
+  The patches are already integrated on OCB.
+
+* Make this work with product with more than 1 attribute.
+
+Credits
+=======
+
+Contributors
+------------
+
+* Pedro M. Baeza <pedro.baeza@tecnativa.com>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit https://odoo-community.org.
diff --git a/stock_picking_variant_mgmt/__init__.py b/stock_picking_variant_mgmt/__init__.py
new file mode 100644
index 000000000..2eb723313
--- /dev/null
+++ b/stock_picking_variant_mgmt/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import models
+from . import wizard
diff --git a/stock_picking_variant_mgmt/__openerp__.py b/stock_picking_variant_mgmt/__openerp__.py
new file mode 100644
index 000000000..9d0c0f1e3
--- /dev/null
+++ b/stock_picking_variant_mgmt/__openerp__.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Copyright 2017 Pedro M. Baeza <pedro.baeza@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+{
+    'name': 'Handle easily multiple variants on Stock Pickings',
+    'summary': 'Handle the addition/removal of multiple variants and the '
+               'quantities transferred in the Pickings.',
+    'version': '9.0.1.0.0',
+    'author': 'Tecnativa,'
+              'Odoo Community Association (OCA)',
+    'category': 'Inventory, Logistics, Warehousing',
+    'license': 'AGPL-3',
+    'website': 'https://www.tecnativa.com',
+    'depends': [
+        'stock',
+        'web_widget_x2many_2d_matrix',
+    ],
+    'demo': [],
+    'data': [
+        'wizard/stock_manage_variant_view.xml',
+        'wizard/stock_transfer_manage_variant_view.xml',
+        'views/stock_picking_view.xml',
+    ],
+    'installable': True,
+}
diff --git a/stock_picking_variant_mgmt/models/__init__.py b/stock_picking_variant_mgmt/models/__init__.py
new file mode 100644
index 000000000..e8798b9ce
--- /dev/null
+++ b/stock_picking_variant_mgmt/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import stock_move
diff --git a/stock_picking_variant_mgmt/models/stock_move.py b/stock_picking_variant_mgmt/models/stock_move.py
new file mode 100644
index 000000000..943651b44
--- /dev/null
+++ b/stock_picking_variant_mgmt/models/stock_move.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+# Copyright 2017 Pedro M. Baeza <pedro.baeza@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from openerp import models, fields
+
+
+class StockMove(models.Model):
+    _inherit = 'stock.move'
+
+    product_attribute_value_ids = fields.Many2many(
+        comodel_name='product.attribute.value',
+        related="product_id.attribute_value_ids",
+        readonly=True,
+    )
diff --git a/stock_picking_variant_mgmt/static/description/icon.png b/stock_picking_variant_mgmt/static/description/icon.png
new file mode 100644
index 000000000..3a0328b51
Binary files /dev/null and b/stock_picking_variant_mgmt/static/description/icon.png differ
diff --git a/stock_picking_variant_mgmt/tests/__init__.py b/stock_picking_variant_mgmt/tests/__init__.py
new file mode 100644
index 000000000..c8b913281
--- /dev/null
+++ b/stock_picking_variant_mgmt/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import test_stock_picking_variant_mgmt
diff --git a/stock_picking_variant_mgmt/tests/test_stock_picking_variant_mgmt.py b/stock_picking_variant_mgmt/tests/test_stock_picking_variant_mgmt.py
new file mode 100644
index 000000000..a489082eb
--- /dev/null
+++ b/stock_picking_variant_mgmt/tests/test_stock_picking_variant_mgmt.py
@@ -0,0 +1,161 @@
+# -*- coding: utf-8 -*-
+# Copyright 2017 Pedro M. Baeza <pedro.baeza@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from openerp.tests import common
+
+
+@common.at_install(False)
+@common.post_install(True)
+class TestStockPickingVariantMgmt(common.SavepointCase):
+    @classmethod
+    def setUpClass(cls):
+        super(TestStockPickingVariantMgmt, cls).setUpClass()
+        cls.partner = cls.env['res.partner'].create({'name': 'Test partner'})
+        cls.attribute1 = cls.env['product.attribute'].create({
+            'name': 'Test Attribute 1',
+            'value_ids': [
+                (0, 0, {'name': 'Value 1'}),
+                (0, 0, {'name': 'Value 2'}),
+                (0, 0, {'name': 'Value 3'}),
+                (0, 0, {'name': 'Value 4'}),
+            ],
+        })
+        cls.product_tmpl = cls.env['product.template'].create({
+            'name': 'Test template',
+            'attribute_line_ids': [
+                (0, 0, {
+                    'attribute_id': cls.attribute1.id,
+                    'value_ids': [(6, 0, cls.attribute1.value_ids.ids)],
+                }),
+            ],
+        })
+        assert len(cls.product_tmpl.product_variant_ids) == 4
+        cls.warehouse = cls.env['stock.warehouse'].search([], limit=1)
+        cls.picking_type = cls.env['stock.picking.type'].search([
+            ('warehouse_id', '=', cls.warehouse.id),
+            ('code', '=', 'incoming'),
+        ], limit=1)
+        cls.picking = cls.env['stock.picking'].create({
+            'partner_id': cls.partner.id,
+            'picking_type_id': cls.picking_type.id,
+            'location_id': cls.partner.property_stock_supplier.id,
+            'location_dest_id': cls.picking_type.default_location_dest_id.id,
+        })
+        cls.Move = cls.env['stock.move']
+        cls.product1 = cls.product_tmpl.product_variant_ids[0]
+        move_vals = cls.Move.onchange_product_id(
+            prod_id=cls.product1.id,
+            loc_id=cls.picking.location_id.id,
+            loc_dest_id=cls.picking.location_dest_id.id,
+            partner_id=cls.picking.partner_id.id,
+        ).get('value', {})
+        move_vals.update({
+            'product_id': cls.product1.id,
+            'picking_id': cls.picking.id,
+            'product_uom_qty': 1,
+        })
+        cls.move1 = cls.Move.create(move_vals)
+        cls.product2 = cls.product_tmpl.product_variant_ids[1]
+        move_vals = cls.Move.onchange_product_id(
+            prod_id=cls.product2.id,
+            loc_id=cls.picking.location_id.id,
+            loc_dest_id=cls.picking.location_dest_id.id,
+            partner_id=cls.picking.partner_id.id,
+        ).get('value', {})
+        move_vals.update({
+            'product_id': cls.product2.id,
+            'picking_id': cls.picking.id,
+            'product_uom_qty': 2,
+        })
+        cls.move2 = cls.Move.create(move_vals)
+        cls.Wizard = cls.env['stock.manage.variant'].with_context(
+            active_ids=cls.picking.ids, active_id=cls.picking.id,
+            active_model=cls.picking._name,
+        )
+        cls.product_single = cls.env['product.product'].create({
+            'name': 'Product without variants',
+        })
+        move_vals = cls.Move.onchange_product_id(
+            prod_id=cls.product_single.id,
+            loc_id=cls.picking.location_id.id,
+            loc_dest_id=cls.picking.location_dest_id.id,
+            partner_id=cls.picking.partner_id.id,
+        ).get('value', {})
+        move_vals.update({
+            'product_id': cls.product_single.id,
+            'picking_id': cls.picking.id,
+            'product_uom_qty': 2,
+        })
+        cls.move3 = cls.Move.create(move_vals)
+
+    def test_add_variants(self):
+        self.move1.unlink()
+        self.move2.unlink()
+        self.move3.unlink()
+        wizard = self.Wizard.new({'product_tmpl_id': self.product_tmpl.id})
+        wizard._onchange_product_tmpl_id()
+        wizard = wizard.create(wizard._convert_to_write(wizard._cache))
+        self.assertEqual(len(wizard.variant_line_ids), 4)
+        wizard.variant_line_ids[0].product_uom_qty = 1
+        wizard.variant_line_ids[1].product_uom_qty = 2
+        wizard.variant_line_ids[2].product_uom_qty = 3
+        wizard.variant_line_ids[3].product_uom_qty = 4
+        wizard.button_transfer_to_picking()
+        self.assertEqual(len(self.picking.move_lines), 4,
+                         "There should be 4 lines in the picking")
+        self.assertEqual(self.picking.move_lines[0].product_uom_qty, 1)
+        self.assertEqual(self.picking.move_lines[1].product_uom_qty, 2)
+        self.assertEqual(self.picking.move_lines[2].product_uom_qty, 3)
+        self.assertEqual(self.picking.move_lines[3].product_uom_qty, 4)
+
+    def test_modify_variants(self):
+        Wizard2 = self.Wizard.with_context(
+            default_product_tmpl_id=self.product_tmpl.id,
+            active_model='stock.move',
+            active_id=self.move1.id, active_ids=self.move1.ids
+        )
+        wizard = Wizard2.create({})
+        wizard._onchange_product_tmpl_id()
+        self.assertEqual(
+            len(wizard.variant_line_ids.filtered('product_uom_qty')), 2,
+            "There should be two fields with any quantity in the wizard."
+        )
+        wizard.variant_line_ids.filtered(
+            lambda x: x.product_id == self.product1).product_uom_qty = 0
+        wizard.variant_line_ids.filtered(
+            lambda x: x.product_id == self.product2).product_uom_qty = 10
+        wizard.button_transfer_to_picking()
+        self.assertFalse(self.move1.exists(), "Move not removed.")
+        self.assertEqual(
+            self.move2.product_uom_qty, 10, "Move not changed quantity.",
+        )
+
+    def test_variant_transfer(self):
+        self.picking.action_confirm()
+        self.picking.action_assign()
+        self.assertEqual(len(self.picking.pack_operation_ids), 3)
+        wizard = self.env['stock.transfer.manage.variant'].with_context(
+            active_model='stock.picking', active_ids=self.picking.ids,
+            active_id=self.picking.id,
+        ).create({})
+        self.assertEqual(len(wizard.variant_line_ids), 6)
+        wizard.variant_line_ids.filtered(
+            lambda x: x.product_id == self.product1
+        ).qty_done = 1
+        wizard.variant_line_ids.filtered(
+            lambda x: x.product_id == self.product2
+        ).qty_done = 2
+        wizard.variant_line_ids.filtered(
+            lambda x: x.product_id == self.product_single
+        ).qty_done = 3
+        wizard.button_transfer_to_picking()
+        self.assertEqual(self.picking.pack_operation_ids.filtered(
+            lambda x: x.product_id == self.product1
+        ).qty_done, 1)
+        self.assertEqual(self.picking.pack_operation_ids.filtered(
+            lambda x: x.product_id == self.product2
+        ).qty_done, 2)
+        self.assertEqual(self.picking.pack_operation_ids.filtered(
+            lambda x: x.product_id == self.product_single
+        ).qty_done, 3)
diff --git a/stock_picking_variant_mgmt/views/stock_picking_view.xml b/stock_picking_variant_mgmt/views/stock_picking_view.xml
new file mode 100644
index 000000000..b9cdd4335
--- /dev/null
+++ b/stock_picking_variant_mgmt/views/stock_picking_view.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 Pedro M. Baeza <pedro.baeza@tecnativa.com>
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record id="view_picking_form" model="ir.ui.view">
+        <field name="model">stock.picking</field>
+        <field name="inherit_id" ref="stock.view_picking_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='pack_operation_product_ids']" position="before">
+                <div class="oe_button_box" name="button_box_transfer_variant_mgmt">
+                    <button name="%(action_stock_transfer_manage_variant)d"
+                            type="action"
+                            string="Manage Variants Transfer"
+                    />
+                </div>
+            </xpath>
+            <xpath expr="//field[@name='move_lines']" position="before">
+                <div class="oe_button_box" name="button_box_variant_mgmt">
+                    <button name="%(action_stock_manage_variant)d"
+                            type="action"
+                            string="Add or Modify Variants"
+                            states="draft,confirmed,assigned"
+                    />
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_move_picking_tree" model="ir.ui.view">
+        <field name="model">stock.move</field>
+        <field name="inherit_id" ref="stock.view_move_picking_tree"/>
+        <field name="arch" type="xml">
+            <field name="state" position="after">
+                <field name="product_tmpl_id" invisible="1"/>
+                <field name="product_attribute_value_ids" invisible="1"/>
+                <!-- Not working until https://github.com/odoo/odoo/pull/13558 -->
+                <!-- Also https://github.com/odoo/odoo/pull/13635 is needed for correct template selection -->
+                <button name="%(action_stock_manage_variant)d"
+                        type="action"
+                        string="Modify Variants"
+                        icon="fa-th"
+                        class="oe_edit_only"
+                        context="{'default_product_tmpl_id': product_tmpl_id}"
+                        attrs="{'invisible': ['|', ('state', 'not in', ('draft', 'confirmed', 'assigned')), ('product_attribute_value_ids', '=', [])]}"
+                />
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/stock_picking_variant_mgmt/wizard/__init__.py b/stock_picking_variant_mgmt/wizard/__init__.py
new file mode 100644
index 000000000..96c3ac72d
--- /dev/null
+++ b/stock_picking_variant_mgmt/wizard/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from . import stock_manage_variant
+from . import stock_transfer_manage_variant
diff --git a/stock_picking_variant_mgmt/wizard/stock_manage_variant.py b/stock_picking_variant_mgmt/wizard/stock_manage_variant.py
new file mode 100644
index 000000000..71c8eb23a
--- /dev/null
+++ b/stock_picking_variant_mgmt/wizard/stock_manage_variant.py
@@ -0,0 +1,125 @@
+# -*- coding: utf-8 -*-
+# Copyright 2017 Pedro M. Baeza <pedro.baeza@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+import openerp.addons.decimal_precision as dp
+from openerp import api, models, fields
+
+
+class StockManageVariant(models.TransientModel):
+    _name = 'stock.manage.variant'
+
+    product_tmpl_id = fields.Many2one(
+        comodel_name='product.template', string="Template", required=True,
+    )
+    variant_line_ids = fields.Many2many(
+        comodel_name='stock.manage.variant.line', string="Variant Lines",
+    )
+
+    # HACK: https://github.com/OCA/server-tools/pull/492#issuecomment-237594285
+    @api.multi
+    def onchange(self, values, field_name, field_onchange):  # pragma: no cover
+        if "variant_line_ids" in field_onchange:
+            for sub in ("product_id", "disabled", "value_x", "value_y",
+                        "product_uom_qty"):
+                field_onchange.setdefault("variant_line_ids." + sub, u"")
+        return super(StockManageVariant, self).onchange(
+            values, field_name, field_onchange)
+
+    @api.onchange('product_tmpl_id')
+    def _onchange_product_tmpl_id(self):
+        self.variant_line_ids = [(6, 0, [])]
+        template = self.product_tmpl_id
+        context = self.env.context
+        record = self.env[context['active_model']].browse(
+            context['active_id'],
+        )
+        if context['active_model'] == 'stock.move':
+            picking = record.picking_id
+        else:
+            picking = record
+        num_attrs = len(template.attribute_line_ids)
+        if not template or not num_attrs:  # pragma: no cover
+            return
+        line_x = template.attribute_line_ids[0]
+        line_y = False if num_attrs == 1 else template.attribute_line_ids[1]
+        lines = []
+        for value_x in line_x.value_ids:
+            for value_y in line_y and line_y.value_ids or [False]:
+                # Filter the corresponding product for that values
+                values = value_x
+                if value_y:  # pragma: no cover
+                    values += value_y
+                product = template.product_variant_ids.filtered(
+                    lambda x: not(values - x.attribute_value_ids)
+                )[:1]
+                move = picking.move_lines.filtered(
+                    lambda x: x.product_id == product
+                )[:1]
+                lines.append((0, 0, {
+                    'product_id': product,
+                    'disabled': not bool(product),
+                    'value_x': value_x,
+                    'value_y': value_y,
+                    'product_uom_qty': move.product_uom_qty,
+                }))
+        self.variant_line_ids = lines
+
+    @api.multi
+    def button_transfer_to_picking(self):
+        context = self.env.context
+        record = self.env[context['active_model']].browse(
+            context['active_id'],
+        )
+        if context['active_model'] == 'stock.move':
+            picking = record.picking_id
+        else:
+            picking = record
+        Move = self.env['stock.move']
+        moves2unlink = Move
+        for line in self.variant_line_ids:
+            move = picking.move_lines.filtered(
+                lambda x: x.product_id == line.product_id
+            )
+            if move:
+                if not line.product_uom_qty:
+                    # Done this way because there's a side effect removing here
+                    moves2unlink |= move
+                else:
+                    move.product_uom_qty = line.product_uom_qty
+                    move.do_unreserve()
+                    move.action_assign()
+            elif line.product_uom_qty:
+                move_vals = {
+                    'product_id': line.product_id.id,
+                    'picking_id': picking.id,
+                }
+                move_vals.update(
+                    Move.onchange_product_id(
+                        prod_id=line.product_id.id,
+                        loc_id=picking.location_id.id,
+                        loc_dest_id=picking.location_dest_id.id,
+                        partner_id=picking.partner_id.id,
+                    ).get('value', {})
+                )
+                move_vals['product_uom_qty'] = line.product_uom_qty
+                Move.create(move_vals)
+        # With this we assure integrity
+        if picking.state != 'draft':  # pragma: no cover
+            picking.do_prepare_partial()
+        moves2unlink.unlink()
+
+
+class StockManageVariantLine(models.TransientModel):
+    _name = 'stock.manage.variant.line'
+
+    product_id = fields.Many2one(
+        comodel_name='product.product', string="Variant", readonly=True,
+    )
+    disabled = fields.Boolean()
+    value_x = fields.Many2one(comodel_name='product.attribute.value')
+    value_y = fields.Many2one(comodel_name='product.attribute.value')
+    product_uom_qty = fields.Float(
+        string="Quantity",
+        digits_compute=dp.get_precision('Product Unit of Measure'),
+    )
diff --git a/stock_picking_variant_mgmt/wizard/stock_manage_variant_view.xml b/stock_picking_variant_mgmt/wizard/stock_manage_variant_view.xml
new file mode 100644
index 000000000..f1093af83
--- /dev/null
+++ b/stock_picking_variant_mgmt/wizard/stock_manage_variant_view.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 Pedro M. Baeza <pedro.baeza@tecnativa.com>
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record model="ir.ui.view" id="stock_manage_variant_form">
+        <field name="model">stock.manage.variant</field>
+        <field name="arch" type="xml">
+            <form string="Manage Product Variants">
+                <group>
+                    <field name="product_tmpl_id"
+                           domain="[('attribute_line_ids', '!=', False)]"
+                           options="{'no_create': True}"
+                    />
+                </group>
+                <field name="variant_line_ids"
+                       widget="x2many_2d_matrix"
+                       field_x_axis="value_x"
+                       field_y_axis="value_y"
+                       field_value = "product_uom_qty"
+                       field_att_disabled="disabled"
+                       x_axis_clickable="0"
+                       y_axis_clickable="0"
+                />
+                <footer>
+                    <button name="button_transfer_to_picking"
+                            type="object"
+                            string="Transfer to picking"
+                            class="oe_highlight"
+                    />
+                    <button class="oe_link"
+                            special="cancel"
+                            string="Cancel"
+                    />
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_stock_manage_variant">
+        <field name="name">Manage variants</field>
+        <field name="res_model">stock.manage.variant</field>
+        <field name="view_mode">form</field>
+        <field name="view_type">form</field>
+        <field name="target">new</field>
+    </record>
+
+</odoo>
diff --git a/stock_picking_variant_mgmt/wizard/stock_transfer_manage_variant.py b/stock_picking_variant_mgmt/wizard/stock_transfer_manage_variant.py
new file mode 100644
index 000000000..be2754730
--- /dev/null
+++ b/stock_picking_variant_mgmt/wizard/stock_transfer_manage_variant.py
@@ -0,0 +1,89 @@
+# -*- coding: utf-8 -*-
+# Copyright 2017 Pedro M. Baeza <pedro.baeza@tecnativa.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+import openerp.addons.decimal_precision as dp
+from openerp import _, api, models, fields
+
+
+class StockTransferManageVariant(models.TransientModel):
+    _name = 'stock.transfer.manage.variant'
+
+    def _default_variant_line_ids(self):
+        context = self.env.context
+        picking = self.env['stock.picking'].browse(context['active_id'])
+        pack_ops = picking.pack_operation_ids.filtered(
+            lambda x: len(
+                x.product_id.product_tmpl_id.attribute_line_ids
+            ) < 2
+        )
+        if not pack_ops:  # pragma: no cover
+            return False
+        has_single_variant = bool(pack_ops.filtered(
+            lambda x: not x.product_id.attribute_line_ids
+        ))
+        columns = [
+            x for x in pack_ops.mapped('product_id.attribute_value_ids')
+        ]
+        if has_single_variant:
+            columns.append(False)
+        rows = pack_ops.mapped('product_id.product_tmpl_id')
+        lines = []
+        for product_tmpl in rows:
+            for value in columns:
+                # Filter the corresponding product for that value
+                if not value:
+                    variants = product_tmpl.product_variant_ids
+                    prod = variants[0] if len(variants) == 1 else False
+                else:
+                    prod = product_tmpl.product_variant_ids.filtered(
+                        lambda x: not(value - x.attribute_value_ids)
+                    )[:1]
+                pack_op = pack_ops.filtered(lambda x: x.product_id == prod)[:1]
+                # We add plain char fields because web client doesn't resolve
+                # correctly the name_get of the many2one fields
+                lines.append((0, 0, {
+                    'product_id': prod.id if prod else False,
+                    'disabled': not bool(prod),
+                    'value_x': value,
+                    'value_x_label': (
+                        _('N/D') if not value else value.name_get()[0][1]
+                    ),
+                    'value_y': product_tmpl,
+                    'value_y_label': product_tmpl.name_get()[0][1],
+                    'qty_done': pack_op.qty_done,
+                }))
+        return lines
+
+    variant_line_ids = fields.Many2many(
+        comodel_name='stock.transfer.manage.variant.line', string="Lines",
+        default=_default_variant_line_ids,
+        relation="stock_transfer_manage_variant_line_rel",
+    )
+
+    @api.multi
+    def button_transfer_to_picking(self):
+        context = self.env.context
+        picking = self.env['stock.picking'].browse(context['active_id'])
+        for line in self.variant_line_ids.filtered('product_id'):
+            pack_op = picking.pack_operation_ids.filtered(
+                lambda x: x.product_id == line.product_id
+            )
+            pack_op.qty_done = line.qty_done
+
+
+class StockTransferManageVariantLine(models.TransientModel):
+    _name = 'stock.transfer.manage.variant.line'
+
+    product_id = fields.Many2one(
+        comodel_name='product.product', string="Variant", readonly=True,
+    )
+    disabled = fields.Boolean()
+    value_x = fields.Many2one(comodel_name='product.attribute.value')
+    value_x_label = fields.Char()
+    value_y = fields.Many2one(comodel_name='product.template')
+    value_y_label = fields.Char()
+    qty_done = fields.Float(
+        string="Quantity",
+        digits_compute=dp.get_precision('Product Unit of Measure'),
+    )
diff --git a/stock_picking_variant_mgmt/wizard/stock_transfer_manage_variant_view.xml b/stock_picking_variant_mgmt/wizard/stock_transfer_manage_variant_view.xml
new file mode 100644
index 000000000..c2cf1da22
--- /dev/null
+++ b/stock_picking_variant_mgmt/wizard/stock_transfer_manage_variant_view.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 Pedro M. Baeza <pedro.baeza@tecnativa.com>
+     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record model="ir.ui.view" id="stock_transfer_manage_variant_form">
+        <field name="model">stock.transfer.manage.variant</field>
+        <field name="arch" type="xml">
+            <form string="Manage Variants Transfer">
+                <field name="variant_line_ids"
+                       widget="x2many_2d_matrix"
+                       field_x_axis="value_x"
+                       field_label_x_axis="value_x_label"
+                       field_y_axis="value_y"
+                       field_label_y_axis="value_y_label"
+                       field_value = "qty_done"
+                       field_att_disabled="disabled"
+                       x_axis_clickable="0"
+                       y_axis_clickable="0"
+                />
+                <footer>
+                    <button name="button_transfer_to_picking"
+                            type="object"
+                            string="Transfer to picking"
+                            class="oe_highlight"
+                    />
+                    <button class="oe_link"
+                            special="cancel"
+                            string="Cancel"
+                    />
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_stock_transfer_manage_variant">
+        <field name="name">Manage Variants Transfer</field>
+        <field name="res_model">stock.transfer.manage.variant</field>
+        <field name="view_mode">form</field>
+        <field name="view_type">form</field>
+        <field name="target">new</field>
+    </record>
+
+</odoo>