diff --git a/mrp_workorder_auto_final_lot/.gitignore b/mrp_workorder_auto_final_lot/.gitignore
new file mode 100644
index 000000000..e6b1919da
--- /dev/null
+++ b/mrp_workorder_auto_final_lot/.gitignore
@@ -0,0 +1,65 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+bin/
+build/
+develop-eggs/
+dist/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+
+# Pycharm
+.idea
+
+# Eclipse
+.settings/
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+
+# Rope
+.ropeproject
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# Backup files
+*~
+*.swp
+
+.settings/
+
diff --git a/mrp_workorder_auto_final_lot/.travis.yml b/mrp_workorder_auto_final_lot/.travis.yml
new file mode 100644
index 000000000..90bed8677
--- /dev/null
+++ b/mrp_workorder_auto_final_lot/.travis.yml
@@ -0,0 +1,37 @@
+language: python
+
+python:
+  - "3.5"
+
+sudo: false
+cache: pip
+
+addons:
+  postgresql: "9.6"
+  apt:
+    packages:
+      - expect-dev  # provides unbuffer utility
+      - python-lxml  # because pip installation is slow
+      - python-unidecode
+      - antiword  # document module
+      - cups
+      - libcups2-dev
+
+env:
+  global:
+  - VERSION="12.0" TESTS="0" LINT_CHECK="0" EXCLUDE="mrp_hook,mrp_production_custom_variants_inherited_attributes,product_variant_custom,product_variant_custom_dimensions,product_variant_custom_dimensions_purchase,product_variant_custom_purchase,product_variant_custom_sale,product_variant_custom_sale_mrp_link"
+  matrix:
+  - LINT_CHECK="1"
+  - TESTS="1" ODOO_REPO="OCA/OCB"
+  - TESTS="1" ODOO_REPO="odoo/odoo"
+
+install:
+  - git clone --depth=1 https://github.com/avanzosc/maintainer-quality-tools.git ${HOME}/maintainer-quality-tools
+  - export PATH=${HOME}/maintainer-quality-tools/travis:${PATH}
+  - travis_install_nightly
+
+script:
+  - travis_wait travis_run_tests
+
+after_success:
+  - travis_after_tests_success
diff --git a/mrp_workorder_auto_final_lot/README.rst b/mrp_workorder_auto_final_lot/README.rst
new file mode 100644
index 000000000..1b7ec798d
--- /dev/null
+++ b/mrp_workorder_auto_final_lot/README.rst
@@ -0,0 +1,43 @@
+==================
+Moves in workorder
+==================
+
+Adds the moves related to the operations
+
+.. |badge1| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png
+    :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+    :alt: License: AGPL-3
+
+|badge1|
+
+Adds a new level in products with the custom values specified in a order
+line, manufacturing order or a lot.
+
+**Table of contents**
+
+.. contents::
+   :local:
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues <https://github.com/avanzosc/odoo-addons/issues>`_.
+In case of trouble, please check there if your issue has already been reported.
+If you spotted it first, help us smashing it by providing a detailed and welcomed
+`feedback <https://github.com/avanzosc/odoo-addons/issues/new?body=module:%20mrp_workorder_moves_view%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Do not contact contributors directly about support or help with technical issues.
+
+Credits
+=======
+
+Authors
+~~~~~~~
+
+* AvanzOSC
+
+Contributors
+~~~~~~~~~~~~
+
+* Mikel Arregi <mikelarregi@avanzosc.es>
+* Ana Juaristi <anajuaristi@avanzosc.es>
diff --git a/mrp_workorder_auto_final_lot/__init__.py b/mrp_workorder_auto_final_lot/__init__.py
new file mode 100644
index 000000000..0650744f6
--- /dev/null
+++ b/mrp_workorder_auto_final_lot/__init__.py
@@ -0,0 +1 @@
+from . import models
diff --git a/mrp_workorder_auto_final_lot/__manifest__.py b/mrp_workorder_auto_final_lot/__manifest__.py
new file mode 100644
index 000000000..97d9d04e5
--- /dev/null
+++ b/mrp_workorder_auto_final_lot/__manifest__.py
@@ -0,0 +1,22 @@
+# Copyright 2020 Mikel Arregi Etxaniz - AvanzOSC
+# License AGPL-3 - See http://www.gnu.org/licenses/agpl-3.0.html
+{
+    "name": "Auto final lot",
+    "version": "12.0.1.0.0",
+    "license": "AGPL-3",
+    "depends": [
+        "mrp",
+    ],
+    "author": "AvanzOSC",
+    "website": "http://www.avanzosc.es",
+    "category": "Manufacturing",
+    "data": [
+        "views/mrp_workorder_view.xml",
+        "views/stock_production_lot_view.xml",
+        "views/mrp_production_view.xml",
+        "views/stock_move_line_view.xml",
+    ],
+    'demo': [],
+    'installable': True,
+    'auto_install': False,
+}
diff --git a/mrp_workorder_auto_final_lot/models/__init__.py b/mrp_workorder_auto_final_lot/models/__init__.py
new file mode 100644
index 000000000..7d9156d53
--- /dev/null
+++ b/mrp_workorder_auto_final_lot/models/__init__.py
@@ -0,0 +1,4 @@
+from . import mrp_workorder
+from . import mrp_production
+from . import mrp_production_lot
+from . import stock_location
diff --git a/mrp_workorder_auto_final_lot/models/mrp_production.py b/mrp_workorder_auto_final_lot/models/mrp_production.py
new file mode 100644
index 000000000..ff8ad805e
--- /dev/null
+++ b/mrp_workorder_auto_final_lot/models/mrp_production.py
@@ -0,0 +1,42 @@
+# Copyright 2020 Mikel Arregi Etxaniz - AvanzOSC
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+from odoo import api, fields, models
+from odoo.tools.safe_eval import safe_eval
+from odoo.models import expression
+
+
+class MrpProduction(models.Model):
+    _inherit = "mrp.production"
+
+
+    @api.multi
+    def button_open_lots(self):
+        self.ensure_one()
+        location_obj = self.env['stock.location']
+        physical_location = location_obj.search(
+            [('name', '=', 'Physical Locations')])
+        virtual_location = location_obj.search(
+                    [('name', '=', 'Virtual Locations')])
+        move_lines = self.env['stock.move.line']
+        for workorder in self.env['mrp.workorder'].search(
+                [('production_id', '=', self.id)]):
+            move_lines |= workorder.active_move_line_ids
+            move_lines |= workorder.move_line_ids
+        produce_lines = move_lines.filtered(
+            lambda x: x.location_id._has_parent(virtual_location) and
+            x.location_dest_id._has_parent(physical_location))
+        produce_lots = produce_lines.mapped('lot_id')
+        action = self.env.ref('stock.action_production_lot_form')
+        action_dict = action.read()[0] if action else {}
+        action_dict['context'] = safe_eval(
+            action_dict.get('context', '{}'))
+        action_dict['context'].pop('search_default_group_by_product', False)
+        action_dict['context'].update({
+            'default_workorder_id': self.id,
+        })
+        action_dict['ids'] = produce_lots
+        domain = expression.AND([
+            [('id', 'in', produce_lots.ids)],
+            safe_eval(action.domain or '[]')])
+        action_dict.update({'domain': domain})
+        return action_dict
diff --git a/mrp_workorder_auto_final_lot/models/mrp_production_lot.py b/mrp_workorder_auto_final_lot/models/mrp_production_lot.py
new file mode 100644
index 000000000..c7be2fe37
--- /dev/null
+++ b/mrp_workorder_auto_final_lot/models/mrp_production_lot.py
@@ -0,0 +1,34 @@
+# Copyright 2020 Mikel Arregi Etxaniz - AvanzOSC
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+from odoo import api, fields, models
+
+
+class StockProductionLot(models.Model):
+    _inherit = "stock.production.lot"
+
+    produce_move_line_ids = fields.One2many(
+        comodel_name="stock.move.line", inverse_name='lot_id',
+        string="Produced Lines")
+    consume_move_line_ids = fields.One2many(
+        comodel_name="stock.move.line", inverse_name='lot_produced_id',
+        string="Consumed Lines")
+    wo_produce_move_line_ids = fields.One2many(
+        comodel_name="stock.move.line", compute="_compute_lot_moves",
+        string="Produced Lines")
+    wo_consume_move_line_ids = fields.One2many(
+        comodel_name="stock.move.line", compute="_compute_lot_moves",
+        string="Consumed Lines")
+
+    def _compute_lot_moves(self):
+        for lot in self:
+            workorder_id = self._context.get('moves_workorder_id', False)
+            if workorder_id:
+                workorder_id = self._context.get('active_id', False)
+                workorder_moves = self.env['stock.move.line'].search([(
+                    'workorder_id', '=', workorder_id)])
+                lot.wo_produce_move_line_ids = \
+                    lot.produce_move_line_ids.filtered(
+                        lambda x: x.id in workorder_moves.ids)
+                lot.wo_consume_move_line_ids = \
+                    lot.consume_move_line_ids.filtered(
+                        lambda x: x.id in workorder_moves.ids)
diff --git a/mrp_workorder_auto_final_lot/models/mrp_workorder.py b/mrp_workorder_auto_final_lot/models/mrp_workorder.py
new file mode 100644
index 000000000..544082446
--- /dev/null
+++ b/mrp_workorder_auto_final_lot/models/mrp_workorder.py
@@ -0,0 +1,88 @@
+# Copyright 2020 Mikel Arregi Etxaniz - AvanzOSC
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+from odoo import api, models, _
+from odoo.tools.safe_eval import safe_eval
+from odoo.models import expression
+from odoo.exceptions import UserError
+from odoo.tools import float_compare, float_round
+
+
+class MrpWorkorder(models.Model):
+    _inherit = "mrp.workorder"
+
+    @api.multi
+    def generate_lot(self, suffix):
+        lot_name = "{}-{}".format(self.production_id.name, suffix)
+        lot_obj = self.env['stock.production.lot']
+        lot_id = lot_obj.search([("name", "=", lot_name)])
+        if lot_id:
+            return lot_id
+        return self.env['stock.production.lot'].create(
+            {'name': lot_name,
+             'product_id': self.production_id.product_id.id})
+
+    @api.multi
+    def button_start(self):
+        res = super().button_start()
+        if self.move_raw_ids and self.product_id.tracking != 'none':
+            self.final_lot_id = self.generate_lot(int(self.qty_produced))
+        return res
+
+    @api.multi
+    def record_production(self):
+        if not self.move_raw_ids:
+            self.qty_produced = self.production_id.product_qty
+            self.button_finish()
+            return True
+        super().record_production()
+        if self.state == 'progress' and self.product_id.tracking != 'none':
+            self.final_lot_id = self.generate_lot(int(self.qty_produced))
+
+    @api.multi
+    def button_open_active_move_lines(self):
+        self.ensure_one()
+        self = self.with_context(
+            default_workorder_id=self.id)
+        action = self.env.ref('stock.stock_move_line_action')
+        action_dict = action.read()[0] if action else {}
+        action_dict['context'] = safe_eval(
+            action_dict.get('context', '{}'))
+        action_dict['context'].pop('search_default_done', False)
+        action_dict['context'].pop('search_default_groupby_product_id', False)
+        action_dict['context'].update({
+            'default_workorder_id': self.id,
+            'search_default_groupby_lot_produced_id': 1,
+        })
+        domain = expression.AND([
+            [('workorder_id', '=', self.id)],
+            safe_eval(action.domain or '[]')])
+        action_dict.update({'domain': domain})
+        return action_dict
+
+    def button_open_lots(self):
+        self.ensure_one()
+        location_obj = self.env['stock.location']
+        physical_location = location_obj.search(
+            [('name', '=', 'Physical Locations')])
+        virtual_location = location_obj.search(
+                    [('name', '=', 'Virtual Locations')])
+        move_lines = self.active_move_line_ids | self.move_line_ids
+        produce_lines = move_lines.filtered(
+            lambda x: x.location_id._has_parent(virtual_location) and
+            x.location_dest_id._has_parent(physical_location))
+        produce_lots = produce_lines.mapped('lot_id')
+        action = self.env.ref('stock.action_production_lot_form')
+        action_dict = action.read()[0] if action else {}
+        action_dict['context'] = safe_eval(
+            action_dict.get('context', '{}'))
+        action_dict['context'].pop('search_default_group_by_product', False)
+        action_dict['context'].update({
+            'default_workorder_id': self.id,
+        })
+        action_dict['ids'] = produce_lots
+        domain = expression.AND([
+            [('id', 'in', produce_lots.ids)],
+            safe_eval(action.domain or '[]')])
+        action_dict.update({'domain': domain})
+        return action_dict
+
diff --git a/mrp_workorder_auto_final_lot/models/stock_location.py b/mrp_workorder_auto_final_lot/models/stock_location.py
new file mode 100644
index 000000000..b5794a927
--- /dev/null
+++ b/mrp_workorder_auto_final_lot/models/stock_location.py
@@ -0,0 +1,15 @@
+# Copyright 2020 Mikel Arregi Etxaniz - AvanzOSC
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+from odoo import api, models
+
+
+class StockLocation(models.Model):
+    _inherit = "stock.location"
+
+    def _has_parent(self, parent_location):
+        if not self.location_id:
+            return False
+        elif self.location_id == parent_location:
+            return True
+        else:
+            return self.location_id._has_parent(parent_location)
diff --git a/mrp_workorder_auto_final_lot/views/mrp_production_view.xml b/mrp_workorder_auto_final_lot/views/mrp_production_view.xml
new file mode 100644
index 000000000..ed92bd3bc
--- /dev/null
+++ b/mrp_workorder_auto_final_lot/views/mrp_production_view.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record model="ir.ui.view" id="mrp_production_produced_lots_form">
+        <field name="name">mrp.production.produced.lots.form</field>
+        <field name="model">mrp.production</field>
+        <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
+        <field name="arch" type="xml">
+            <button name="action_see_move_scrap"
+                    position="after">
+                <button class="oe_stat_button" name="button_open_lots" type="object" string="Produced Lots" icon="fa-arrows-v"/>
+            </button>
+        </field>
+    </record>
+</odoo>
diff --git a/mrp_workorder_auto_final_lot/views/mrp_workorder_view.xml b/mrp_workorder_auto_final_lot/views/mrp_workorder_view.xml
new file mode 100644
index 000000000..c7eae9c22
--- /dev/null
+++ b/mrp_workorder_auto_final_lot/views/mrp_workorder_view.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record model="ir.ui.view" id="mrp_workorder_moves_search">
+        <field name="name">mrp.workorder.moves.form</field>
+        <field name="model">stock.move.line</field>
+        <field name="inherit_id" ref="stock.stock_move_line_view_search" />
+        <field name="arch" type="xml">
+            <xpath expr="//filter[@name='groupby_product_id']" position="after">
+                <filter name="groupby_lot_produced_id" domain="[]" context="{'group_by': 'lot_produced_id'}"  />
+            </xpath>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="workorder_stock_move_form">
+        <field name="name">workorder.stock.move.form</field>
+        <field name="model">mrp.workorder</field>
+        <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
+        <field name="arch" type="xml">
+<!--            <button name="record_production" position="after">
+                <button name="button_execute_all_moves" type="object" string="Do All" class="btn-success" attrs="{'invisible': ['|', '|', '|', ('is_produced', '=', True), ('working_state', '=', 'blocked'), ('state', '!=', 'progress'), ('is_user_working', '=', False)]}"/>
+                <button name="button_create_all_moves" type="object" string="Create all moves" class="btn-success" attrs="{'invisible': ['|', '|', '|', ('is_produced', '=', True), ('working_state', '=', 'blocked'), ('state', '!=', 'progress'), ('is_user_working', '=', False)]}"/>
+            </button>-->
+            <button name="action_see_move_scrap"
+                    position="after">
+                <button class="oe_stat_button" name="button_open_active_move_lines" type="object" string="Moves" icon="fa-arrows-v">
+                    <!--<field string="Survey Responses" name="user_input_count"
+                           widget="statinfo" />-->
+                </button>
+                <button class="oe_stat_button" name="button_open_lots" type="object" string="Lots" icon="fa-arrows-v" context="{'moves_workorder_id': active_id}">
+                    <!--<field string="Survey Responses" name="user_input_count"
+                           widget="statinfo" />-->
+                </button>
+            </button>
+            <xpath expr="//field[@name='move_raw_ids']" position="attributes">
+                <attribute name="invisible"/>
+                <attribute name="attrs">{'invisible': [('move_raw_ids', '=', [])]}</attribute>
+            </xpath>
+            <xpath expr="//field[@name='active_move_line_ids']/tree/field[@name='lot_id']" position="after">
+                <field name="lot_produced_id"/>
+            </xpath>
+            <xpath expr="//field[@name='move_raw_ids']" position="after">
+                <field name="move_line_ids" attrs="{'invisible': [('move_line_ids', '=', [])]}">
+                    <tree editable="bottom" create="0" delete="0">
+                        <field name="product_id"/>
+                        <field name="product_uom_qty" readonly="1" invisible="1" string="To Consume"/>
+                        <field name="lot_id" domain="[('product_id', '=', product_id)]"
+                               context="{'default_product_id': product_id}"/>
+                        <field name="lot_produced_id"/>
+                        <field name="qty_done"/>
+                        <field name="product_uom_id" invisible="1"/>
+                        <field name="location_id" invisible="1"/>
+                        <field name="location_dest_id" invisible="1"/>
+                        <field name="move_id" invisible="1"/>
+                        <field name="done_wo" invisible="1"/>
+                    </tree>
+                </field>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/mrp_workorder_auto_final_lot/views/stock_move_line_view.xml b/mrp_workorder_auto_final_lot/views/stock_move_line_view.xml
new file mode 100644
index 000000000..64ca4d6ca
--- /dev/null
+++ b/mrp_workorder_auto_final_lot/views/stock_move_line_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record model="ir.ui.view" id="stock_move_line_production_lot_form">
+        <field name="name">stock.move.line.production.lot.form</field>
+        <field name="model">stock.move.line</field>
+        <field name="inherit_id" ref="stock.view_move_line_tree" />
+        <field name="arch" type="xml">
+            <xpath expr="/tree" position="attributes">
+                <attribute name="editable">top</attribute>
+            </xpath>
+            <xpath expr="//field[@name='location_id']" position="before">
+                <field name="lot_id" />
+                <field name="lot_produced_id" />
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/mrp_workorder_auto_final_lot/views/stock_production_lot_view.xml b/mrp_workorder_auto_final_lot/views/stock_production_lot_view.xml
new file mode 100644
index 000000000..4fc6d4a95
--- /dev/null
+++ b/mrp_workorder_auto_final_lot/views/stock_production_lot_view.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record model="ir.ui.view" id="stock_product_lot_moves_form">
+        <field name="name">stock.production.lot.moves.form</field>
+        <field name="model">stock.production.lot</field>
+        <field name="inherit_id" ref="stock.view_production_lot_form" />
+        <field name="arch" type="xml">
+            <xpath expr="//group[@name='main_group']" position="after">
+                <group name="moves" >
+                    <field name="produce_move_line_ids"/>
+                    <field name="consume_move_line_ids"/>
+                    <field name="wo_produce_move_line_ids"/>
+                    <field name="wo_consume_move_line_ids"/>
+                </group>
+            </xpath>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file