From cb21934e001a927226e6c53e370fbb0bde903111 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nim@odoo.com>
Date: Fri, 25 Aug 2017 10:45:31 +0200
Subject: [PATCH 1/2] [FIX] stock: inventory adjustment

Backport of commit c00267bc340090142ed6c8d62485a6825c657d1b

opw-767538
---
 addons/stock/stock.py       | 15 ++++++++++
 addons/stock/stock_view.xml | 58 +++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/addons/stock/stock.py b/addons/stock/stock.py
index a6eb97bc239..d95e34eca3b 100644
--- a/addons/stock/stock.py
+++ b/addons/stock/stock.py
@@ -3157,6 +3157,19 @@ class stock_inventory(osv.osv):
             to_clean['value']['package_id'] = False
         return to_clean
 
+    def action_inventory_line_tree(self, cr, uid, ids, context=None):
+        inv = self.browse(cr, uid, ids, context=context)
+        action = self.pool['ir.model.data'].xmlid_to_object(cr, uid, 'stock.action_inventory_line_tree', context=context).read()[0]
+        action['context'] = {
+            'default_location_id': inv.location_id.id,
+            'default_product_id': inv.product_id.id,
+            'default_prod_lot_id': inv.lot_id.id,
+            'default_package_id': inv.package_id.id,
+            'default_partner_id': inv.partner_id.id,
+            'default_inventory_id': inv.id,
+        }
+        return action
+
     _constraints = [
         (_check_filter_product, 'The selected inventory options are not coherent.',
             ['filter', 'product_id', 'lot_id', 'partner_id', 'package_id']),
@@ -3215,6 +3228,8 @@ class stock_inventory_line(osv.osv):
         'prodlot_name': fields.related('prod_lot_id', 'name', type='char', string='Serial Number Name', store={
                                                                                             'stock.production.lot': (_get_prodlot_change, ['name'], 20),
                                                                                             'stock.inventory.line': (lambda self, cr, uid, ids, c={}: ids, ['prod_lot_id'], 20),}),
+        'inventory_location_id': fields.related(
+            'inventory_id', 'location_id', type='many2one', relation='stock.location', string='Location'),
     }
 
     _defaults = {
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index f5d9b915a42..449cd99df9c 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -51,6 +51,40 @@
             </field>
         </record>
 
+        <record id="stock_inventory_line_tree2" model="ir.ui.view">
+            <field name="name">stock.inventory.line.tree2</field>
+            <field name="model">stock.inventory.line</field>
+            <field name="arch" type="xml">
+                <tree editable="top" string="Inventory Details" decoration-info="product_qty != theoretical_qty" decoration-danger="theoretical_qty &lt; 0">
+                    <field name="product_id"  domain="[('type','=','product')]" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)"/>
+                    <field name="product_uom_id" groups="product.group_uom" string="UoM" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)"/>
+                    <field name="location_id" domain="[('id', 'child_of', inventory_location_id)]" groups="stock.group_locations" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)"/>
+                    <field name="prod_lot_id" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)" domain="[('product_id', '=', product_id)]" context="{'default_product_id': product_id}"  groups="stock.group_production_lot"/>
+                    <field name="package_id" domain="['|', ('location_id','=', False), ('location_id', '=', location_id)]" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)" groups="stock.group_tracking_lot"/>
+                    <field name="partner_id" on_change="onchange_createline(location_id, product_id, product_uom_id, package_id, prod_lot_id, partner_id)" groups="stock.group_tracking_owner"/>
+                    <field name="theoretical_qty" readonly="1"/>
+                    <field name="product_qty" string="Real Quantity"/>
+                    <field name="state" invisible="True"/>
+                    <field name="inventory_id" invisible="1"/>
+                    <field name="inventory_location_id" invisible="1"/>
+                </tree>
+            </field>
+        </record>
+
+        <record id="stock_inventory_line_search" model="ir.ui.view">
+            <field name="name">stock.inventory.line.search</field>
+            <field name="model">stock.inventory.line</field>
+            <field name="arch" type="xml">
+                <search string="Search Inventory Lines">
+                    <field name="product_id"/>
+                    <field name="location_id" groups="stock.group_stock_multi_locations"/>
+                    <field name="prod_lot_id" groups="stock.group_production_lot"/>
+                    <field name="package_id" groups="stock.group_tracking_lot"/>
+                    <field name="partner_id" groups="stock.group_tracking_owner"/>
+                </search>
+            </field>
+        </record>
+
         <record id="view_inventory_filter" model="ir.ui.view">
             <field name="name">stock.inventory.filter</field>
             <field name="model">stock.inventory</field>
@@ -93,6 +127,19 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                 </header>
                 <sheet>
+                    <div class="oe_button_box" name="button_box">
+                        <button name="action_inventory_line_tree"
+                            class="oe_stat_button"
+                            icon="fa-building-o"
+                            type="object"
+                            help="List view of lines"
+                            groups="base.group_no_one"
+                            states="confirm">
+                            <div class="o_form_field o_stat_info">
+                                <span class="o_stat_text">Details</span>
+                            </div>
+                        </button>
+                    </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
                         <h1><field name="name" placeholder="e.g. Annual inventory"/></h1>
@@ -221,6 +268,17 @@
               </p>
             </field>
         </record>
+
+        <record id="action_inventory_line_tree" model="ir.actions.act_window">
+            <field name="name">Inventory Lines</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">stock.inventory.line</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="stock_inventory_line_tree2"/>
+            <field name="domain">[('inventory_id', '=', active_id)]</field>
+        </record>
+
         <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_inventory_control" sequence="30"/>
 
         <record id="view_production_lot_form" model="ir.ui.view">

From 6a5c1001d3cc0b7043cd621d11c5d4636916e69f Mon Sep 17 00:00:00 2001
From: Richard Mathot <rim@odoo.com>
Date: Wed, 30 Aug 2017 14:12:47 +0200
Subject: [PATCH 2/2] [FIX] mrp: stupid typo introduced at
 ccfc4e7026e2ab03a2adda526f890ca810e0da70

Sorry about that.
---
 addons/mrp/product.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/product.py b/addons/mrp/product.py
index 13f54e711ba..6902c9f0952 100644
--- a/addons/mrp/product.py
+++ b/addons/mrp/product.py
@@ -51,7 +51,7 @@ class product_product(osv.osv):
         Production = self.pool('mrp.production')
         res = dict.fromkeys(ids, 0)
         for g in Production.read_group(cr, uid, [('product_id', 'in', ids)], ['product_id'], ['product_id'], context=context):
-            res[g['partner_id'][0]] = g['partner_id_count']
+            res[g['product_id'][0]] = g['product_id_count']
         return res
 
     _columns = {