diff --git a/mrp_stock_orderpoint_manual_procurement/README.rst b/mrp_stock_orderpoint_manual_procurement/README.rst
index 6a0070b0e..385ab99e9 100644
--- a/mrp_stock_orderpoint_manual_procurement/README.rst
+++ b/mrp_stock_orderpoint_manual_procurement/README.rst
@@ -25,15 +25,21 @@ MRP Stock Orderpoint Manual Procurement
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
 
-This module updates the value of the user_id field in a Manufacturing Order. In the case
-the MO has been created as a result of a manual procurement the user_id will show the user
-that triggered it.
+This module updates a new field *Requested by* in Manufacturing Orders
+in the case the MO has been created as a result of a manual procurement from
+an orderpoint.
 
 **Table of contents**
 
 .. contents::
    :local:
 
+Usage
+=====
+
+Go to an orderpoint an do a manual procurement for a manufactured product.
+Your user will be set as *Requeste by* in the newly created MO.
+
 Bug Tracker
 ===========
 
@@ -56,6 +62,7 @@ Contributors
 ~~~~~~~~~~~~
 
 * Adria Gil Sorribes <adria.gil@eficent.com>
+* Lois Rilo Antelo <lois.rilo@eficent.com>
 
 Maintainers
 ~~~~~~~~~~~
diff --git a/mrp_stock_orderpoint_manual_procurement/__manifest__.py b/mrp_stock_orderpoint_manual_procurement/__manifest__.py
index 7855b78eb..cd961da0a 100644
--- a/mrp_stock_orderpoint_manual_procurement/__manifest__.py
+++ b/mrp_stock_orderpoint_manual_procurement/__manifest__.py
@@ -9,12 +9,14 @@
     "author": "Eficent, "
               "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/manufacture",
-    "category": "MRP",
+    "category": "Manufacturing",
     "depends": [
         "mrp",
         "stock_orderpoint_manual_procurement",
     ],
-    "data": [],
+    "data": [
+        "views/mrp_production_view.xml",
+    ],
     "license": "AGPL-3",
     'installable': True,
     'application': False,
diff --git a/mrp_stock_orderpoint_manual_procurement/models/mrp_production.py b/mrp_stock_orderpoint_manual_procurement/models/mrp_production.py
index 189c96bcc..e4932a66d 100644
--- a/mrp_stock_orderpoint_manual_procurement/models/mrp_production.py
+++ b/mrp_stock_orderpoint_manual_procurement/models/mrp_production.py
@@ -1,11 +1,13 @@
-# Copyright 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2019 Eficent Business and IT Consulting Services S.L.
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 from odoo import fields, models
 
 
 class MrpProduction(models.Model):
-    """ Manufacturing Orders """
     _inherit = 'mrp.production'
 
-    user_id = fields.Many2one(track_visibility='always')
+    requested_by = fields.Many2one(
+        comodel_name='res.users',
+        track_visibility='always',
+    )
diff --git a/mrp_stock_orderpoint_manual_procurement/models/procurement.py b/mrp_stock_orderpoint_manual_procurement/models/procurement.py
index 08052069a..0379a4b42 100644
--- a/mrp_stock_orderpoint_manual_procurement/models/procurement.py
+++ b/mrp_stock_orderpoint_manual_procurement/models/procurement.py
@@ -1,4 +1,4 @@
-# Copyright 2017 Eficent Business and IT Consulting Services S.L.
+# Copyright 2019 Eficent Business and IT Consulting Services S.L.
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 from odoo import models
@@ -7,17 +7,12 @@ from odoo import models
 class ProcurementRule(models.Model):
     _inherit = 'procurement.rule'
 
-    def _prepare_mo_vals(self, product_id, product_qty,
-                         product_uom, location_id, name,
-                         origin, values, bom):
-
-        res = super(ProcurementRule, self)._prepare_mo_vals(product_id,
-                                                            product_qty,
-                                                            product_uom,
-                                                            location_id, name,
-                                                            origin, values,
-                                                            bom)
-        requested_uid = values.get('requested_uid', None)
+    def _prepare_mo_vals(self, product_id, product_qty, product_uom,
+                         location_id, name, origin, values, bom):
+        res = super(ProcurementRule, self)._prepare_mo_vals(
+            product_id, product_qty, product_uom, location_id, name,
+            origin, values, bom)
+        requested_uid = self.env.context.get('requested_uid')
         if requested_uid:
-            res.update({'user_id': requested_uid.id})
+            res.update({'requested_by': requested_uid.id})
         return res
diff --git a/mrp_stock_orderpoint_manual_procurement/readme/CONTRIBUTORS.rst b/mrp_stock_orderpoint_manual_procurement/readme/CONTRIBUTORS.rst
index b7a7d159e..76e4c541c 100644
--- a/mrp_stock_orderpoint_manual_procurement/readme/CONTRIBUTORS.rst
+++ b/mrp_stock_orderpoint_manual_procurement/readme/CONTRIBUTORS.rst
@@ -1 +1,2 @@
-* Adria Gil Sorribes <adria.gil@eficent.com>
\ No newline at end of file
+* Adria Gil Sorribes <adria.gil@eficent.com>
+* Lois Rilo Antelo <lois.rilo@eficent.com>
diff --git a/mrp_stock_orderpoint_manual_procurement/readme/DESCRIPTION.rst b/mrp_stock_orderpoint_manual_procurement/readme/DESCRIPTION.rst
index e645a5398..a6b7f9bfe 100644
--- a/mrp_stock_orderpoint_manual_procurement/readme/DESCRIPTION.rst
+++ b/mrp_stock_orderpoint_manual_procurement/readme/DESCRIPTION.rst
@@ -1,3 +1,3 @@
-This module updates the value of the user_id field in a Manufacturing Order. In the case
-the MO has been created as a result of a manual procurement the user_id will show the user
-that triggered it.
\ No newline at end of file
+This module updates a new field *Requested by* in Manufacturing Orders
+in the case the MO has been created as a result of a manual procurement from
+an orderpoint.
\ No newline at end of file
diff --git a/mrp_stock_orderpoint_manual_procurement/readme/USAGE.rst b/mrp_stock_orderpoint_manual_procurement/readme/USAGE.rst
index e69de29bb..7967b7304 100644
--- a/mrp_stock_orderpoint_manual_procurement/readme/USAGE.rst
+++ b/mrp_stock_orderpoint_manual_procurement/readme/USAGE.rst
@@ -0,0 +1,2 @@
+Go to an orderpoint an do a manual procurement for a manufactured product.
+Your user will be set as *Requeste by* in the newly created MO.
diff --git a/mrp_stock_orderpoint_manual_procurement/static/description/icon.png b/mrp_stock_orderpoint_manual_procurement/static/description/icon.png
new file mode 100644
index 000000000..3a0328b51
Binary files /dev/null and b/mrp_stock_orderpoint_manual_procurement/static/description/icon.png differ
diff --git a/mrp_stock_orderpoint_manual_procurement/static/description/index.html b/mrp_stock_orderpoint_manual_procurement/static/description/index.html
index 1183647c6..213e1435b 100644
--- a/mrp_stock_orderpoint_manual_procurement/static/description/index.html
+++ b/mrp_stock_orderpoint_manual_procurement/static/description/index.html
@@ -3,13 +3,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
 <title>MRP Stock Orderpoint Manual Procurement</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7614 2013-02-21 15:55:51Z milde $
+:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
@@ -37,6 +37,14 @@ table.borderless td, table.borderless th {
 .hidden {
   display: none }
 
+.subscript {
+  vertical-align: sub;
+  font-size: smaller }
+
+.superscript {
+  vertical-align: super;
+  font-size: smaller }
+
 a.toc-backref {
   text-decoration: none ;
   color: black }
@@ -161,12 +169,12 @@ h2.subtitle {
 hr.docutils {
   width: 75% }
 
-img.align-left, .figure.align-left, object.align-left {
+img.align-left, .figure.align-left, object.align-left, table.align-left {
   clear: left ;
   float: left ;
   margin-right: 1em }
 
-img.align-right, .figure.align-right, object.align-right {
+img.align-right, .figure.align-right, object.align-right, table.align-right {
   clear: right ;
   float: right ;
   margin-left: 1em }
@@ -177,6 +185,11 @@ img.align-center, .figure.align-center, object.align-center {
   margin-right: auto;
 }
 
+table.align-center {
+  margin-left: auto;
+  margin-right: auto;
+}
+
 .align-left {
   text-align: left }
 
@@ -194,6 +207,15 @@ div.align-right {
 /* div.align-center * { */
 /*   text-align: left } */
 
+.align-top    {
+  vertical-align: top }
+
+.align-middle {
+  vertical-align: middle }
+
+.align-bottom {
+  vertical-align: bottom }
+
 ol.simple, ul.simple {
   margin-bottom: 1em }
 
@@ -346,23 +368,29 @@ ul.auto-toc {
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/manufacture/tree/11.0/mrp_stock_orderpoint_manual_procurement"><img alt="OCA/manufacture" src="https://img.shields.io/badge/github-OCA%2Fmanufacture-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/manufacture-11-0/manufacture-11-0-mrp_stock_orderpoint_manual_procurement"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/129/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
-<p>This module updates the value of the user_id field in a Manufacturing Order. In the case
-the MO has been created as a result of a manual procurement the user_id will show the user
-that triggered it.</p>
+<p>This module updates a new field <em>Requested by</em> in Manufacturing Orders
+in the case the MO has been created as a result of a manual procurement from
+an orderpoint.</p>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#bug-tracker" id="id1">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id2">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id3">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id4">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id5">Maintainers</a></li>
+<li><a class="reference internal" href="#usage" id="id1">Usage</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id2">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id3">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id4">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id5">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id6">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
+<div class="section" id="usage">
+<h1><a class="toc-backref" href="#id1">Usage</a></h1>
+<p>Go to an orderpoint an do a manual procurement for a manufactured product.
+Your user will be set as <em>Requeste by</em> in the newly created MO.</p>
+</div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id1">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#id2">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/manufacture/issues">GitHub Issues</a>.
 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
@@ -370,21 +398,22 @@ If you spotted it first, help us smashing it by providing a detailed and welcome
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#id2">Credits</a></h1>
+<h1><a class="toc-backref" href="#id3">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id3">Authors</a></h2>
+<h2><a class="toc-backref" href="#id4">Authors</a></h2>
 <ul class="simple">
 <li>Eficent</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id4">Contributors</a></h2>
+<h2><a class="toc-backref" href="#id5">Contributors</a></h2>
 <ul class="simple">
 <li>Adria Gil Sorribes &lt;<a class="reference external" href="mailto:adria.gil&#64;eficent.com">adria.gil&#64;eficent.com</a>&gt;</li>
+<li>Lois Rilo Antelo &lt;<a class="reference external" href="mailto:lois.rilo&#64;eficent.com">lois.rilo&#64;eficent.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id5">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#id6">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
diff --git a/mrp_stock_orderpoint_manual_procurement/tests/__init__.py b/mrp_stock_orderpoint_manual_procurement/tests/__init__.py
new file mode 100644
index 000000000..7f20332cc
--- /dev/null
+++ b/mrp_stock_orderpoint_manual_procurement/tests/__init__.py
@@ -0,0 +1 @@
+from . import test_mrp_manual_procurement
diff --git a/mrp_stock_orderpoint_manual_procurement/tests/test_mrp_manual_procurement.py b/mrp_stock_orderpoint_manual_procurement/tests/test_mrp_manual_procurement.py
new file mode 100644
index 000000000..fec62474d
--- /dev/null
+++ b/mrp_stock_orderpoint_manual_procurement/tests/test_mrp_manual_procurement.py
@@ -0,0 +1,123 @@
+# Copyright 2019 Eficent Business and IT Consulting Services S.L.
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+
+from odoo.tests.common import TransactionCase
+
+
+class TestMrpManualProcurement(TransactionCase):
+
+    def setUp(self, *args, **kwargs):
+        super(TestMrpManualProcurement, self).setUp(*args, **kwargs)
+
+        self.production_model = self.env['mrp.production']
+        self.product_model = self.env['product.product']
+        self.orderpoint_model = self.env['stock.warehouse.orderpoint']
+        self.loc_model = self.env['stock.location']
+        self.route_model = self.env['stock.location.route']
+        self.manual_procurement_wiz = self.env['make.procurement.orderpoint']
+        self.bom_model = self.env['mrp.bom']
+        self.boml_model = self.env['mrp.bom.line']
+
+        self.warehouse = self.env.ref('stock.warehouse0')
+        self.stock_loc = self.env.ref('stock.stock_location_stock')
+        route_manuf = self.env.ref('mrp.route_warehouse0_manufacture')
+
+        # Create a new location and route:
+        self.secondary_loc = self.loc_model.create({
+            'name': 'Test location',
+            'usage': 'internal',
+            'location_id': self.warehouse.view_location_id.id,
+        })
+        test_route = self.route_model.create({
+            'name': 'Stock -> Test',
+            'product_selectable': True,
+            'pull_ids': [(0, 0, {
+                'name': 'stock to test',
+                'action': 'move',
+                'location_id': self.secondary_loc.id,
+                'location_src_id': self.stock_loc.id,
+                'procure_method': 'make_to_order',
+                'picking_type_id': self.env.ref(
+                    'stock.picking_type_internal').id,
+                'propagate': True
+            })]
+        })
+
+        # Prepare Products:
+        routes = route_manuf + test_route
+        self.product = self.product_model.create({
+            'name': 'Test Product',
+            'route_ids': [(6, 0, routes.ids)],
+        })
+        component = self.product_model.create({
+            'name': 'Test component',
+        })
+
+        # Create Bill of Materials:
+        self.bom_1 = self.bom_model.create({
+            'product_id': self.product.id,
+            'product_tmpl_id': self.product.product_tmpl_id.id,
+            'product_uom_id': self.product.uom_id.id,
+            'product_qty': 1.0,
+        })
+        self.boml_model.create({
+            'bom_id': self.bom_1.id,
+            'product_id': component.id,
+            'product_qty': 1.0,
+        })
+
+        # Create Orderpoint:
+        self.orderpoint_stock = self.orderpoint_model.create({
+            'warehouse_id': self.warehouse.id,
+            'location_id': self.warehouse.lot_stock_id.id,
+            'product_id': self.product.id,
+            'product_min_qty': 10.0,
+            'product_max_qty': 50.0,
+            'product_uom': self.product.uom_id.id,
+        })
+        self.orderpoint_secondary_loc = self.orderpoint_model.create({
+            'warehouse_id': self.warehouse.id,
+            'location_id': self.secondary_loc.id,
+            'product_id': self.product.id,
+            'product_min_qty': 10.0,
+            'product_max_qty': 20.0,
+            'product_uom': self.product.uom_id.id,
+        })
+
+        # Create User:
+        self.test_user = self.env['res.users'].create({
+            'name': 'John',
+            'login': 'test',
+        })
+
+    def manual_procurement(self, orderpoint, user):
+        """Make Procurement from Reordering Rule"""
+        context = {
+            'active_model': 'stock.warehouse.orderpoint',
+            'active_ids': orderpoint.ids,
+            'active_id': orderpoint.id
+        }
+        wizard = self.manual_procurement_wiz.sudo(user).\
+            with_context(context).create({})
+        wizard.make_procurement()
+        return wizard
+
+    def test_01_manual_procurement_requested_by(self):
+        """Tests manual procurement fills requested_by field.
+        Direct MO creation."""
+        self.manual_procurement(self.orderpoint_stock, self.test_user)
+        mo = self.production_model.search([
+            ('requested_by', '=', self.test_user.id)])
+        self.assertTrue(mo)
+        self.assertEqual(mo.product_id, self.product)
+        self.assertEqual(mo.product_qty, 50.0)
+
+    def test_02_manual_procurement_requested_by_indirect(self):
+        """Tests manual procurement fills requested_by field.
+        Indirect MO creation (transfer -> MO)."""
+        self.manual_procurement(self.orderpoint_secondary_loc, self.test_user)
+        mo = self.production_model.search([
+            ('requested_by', '=', self.test_user.id)])
+        self.assertTrue(mo)
+        self.assertEqual(mo.product_id, self.product)
+        self.assertEqual(mo.product_qty, 20.0)
diff --git a/mrp_stock_orderpoint_manual_procurement/views/mrp_production_view.xml b/mrp_stock_orderpoint_manual_procurement/views/mrp_production_view.xml
new file mode 100644
index 000000000..2371d2297
--- /dev/null
+++ b/mrp_stock_orderpoint_manual_procurement/views/mrp_production_view.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2019 Eficent Business and IT Consulting Services S.L.
+     License LGPL-3.0 or later (http://www.gnu.org/licenses/lgpl-3.0) -->
+<odoo>
+
+    <record id="mrp_production_form_view" model="ir.ui.view">
+        <field name="name">mrp.production.form - mrp_stock_orderpoint_manual_procurement</field>
+        <field name="model">mrp.production</field>
+        <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
+        <field name="arch" type="xml">
+            <field name="availability" position="after">
+                <field name="requested_by"/>
+            </field>
+        </field>
+    </record>
+
+</odoo>