Merge lp:~unifield-team/unifield-server/US-3501-physical-inventory into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/stock/__init__.py'
--- bin/addons/stock/__init__.py	2011-01-14 00:11:01 +0000
+++ bin/addons/stock/__init__.py	2017-11-24 09:38:22 +0000
@@ -24,5 +24,6 @@
 import product
 import report
 import wizard
+import physical_inventory
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file

=== modified file 'bin/addons/stock/__openerp__.py'
--- bin/addons/stock/__openerp__.py	2017-09-28 14:05:02 +0000
+++ bin/addons/stock/__openerp__.py	2017-11-24 09:38:22 +0000
@@ -70,7 +70,13 @@
         "partner_view.xml",
         "report/report_stock_move_view.xml",
         "report/report_stock_view.xml",
-        "board_warehouse_view.xml"
+        "board_warehouse_view.xml",
+        "physical_inventory_view.xml",
+        "physical_inventory_data.xml",
+        "report/physical_inventory_view.xml",
+        "wizard/physical_inventory_select_products_view.xml",
+        "wizard/physical_inventory_generate_counting_sheet_view.xml",
+        "wizard/physical_inventory_import_view.xml",
     ],
     'installable': True,
     'active': False,

=== added file 'bin/addons/stock/physical_inventory.py'
--- bin/addons/stock/physical_inventory.py	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/physical_inventory.py	2017-11-24 09:38:22 +0000
@@ -0,0 +1,1345 @@
+# -*- coding: utf-8 -*-
+
+import base64
+import time
+from dateutil.parser import parse
+import math
+
+import decimal_precision as dp
+from spreadsheet_xml.spreadsheet_xml import SpreadsheetXML
+
+from osv import fields, osv
+from tools.misc import DEFAULT_SERVER_DATETIME_FORMAT, DEFAULT_SERVER_DATE_FORMAT
+from tools.translate import _
+
+
+PHYSICAL_INVENTORIES_STATES = (
+    ('draft', _('Draft')),
+    ('counting', _('Counting')),
+    ('counted', _('Counted')),
+    ('validated', _('Validated')),
+    ('confirmed', _('Confirmed')),
+    ('closed', _('Closed')),
+    ('cancel', _('Cancelled'))
+)
+
+
+class NegativeValueError(ValueError):
+    """Negative value Exception"""
+
+
+class PhysicalInventory(osv.osv):
+    _name = 'physical.inventory'
+    _description = 'Physical Inventory'
+
+    def _inventory_totals(self, cr, uid, ids, field_names, arg, context=None):
+        context = context is None and {} or context
+        def read_many(model, ids, columns):
+            return self.pool.get(model).read(cr, uid, ids, columns, context=context)
+        def search(model, domain):
+            return self.pool.get(model).search(cr, uid, domain, context=context)
+
+        inventories = read_many("physical.inventory", ids, ["discrepancy_line_ids",
+                                                            "counting_line_ids"])
+
+        totals = {}
+        for inventory in inventories:
+
+            counting_lines = read_many("physical.inventory.counting",
+                                       inventory["counting_line_ids"],
+                                       ["quantity", "standard_price"])
+
+            # Keep only non-ignored lines
+            discrepancy_line_ids = search("physical.inventory.discrepancy",
+                                          ['&',
+                                           ('ignored', '!=', True),
+                                           ("id", "in", inventory["discrepancy_line_ids"])])
+
+            discrepancy_lines = read_many("physical.inventory.discrepancy",
+                                          discrepancy_line_ids,
+                                          ["discrepancy_value"])
+
+            inventory_lines_value = 0
+            inventory_lines_absvalue = 0
+            for l in counting_lines:
+                try:
+                    inventory_lines_value += float(l["quantity"]) * float(l["standard_price"])
+                    inventory_lines_absvalue += abs(float(l["quantity"])) * float(l["standard_price"])
+                except:
+                    # Most likely we couldnt parse the quantity / price...
+                    pass
+
+            discrepancy_lines_value = 0
+            discrepancy_lines_absvalue = 0
+            for l in discrepancy_lines:
+                try:
+                    discrepancy_lines_value += float(l["discrepancy_value"])
+                    discrepancy_lines_absvalue += abs(float(l["discrepancy_value"]))
+                except:
+                    # Most likely we couldnt parse the quantity / price...
+                    pass
+
+            total = {
+                'inventory_lines_number': len(counting_lines),
+                'discrepancy_lines_number': len(discrepancy_lines),
+                'inventory_lines_value': inventory_lines_value,
+                'discrepancy_lines_value': discrepancy_lines_value,
+                'inventory_lines_absvalue': inventory_lines_absvalue,
+                'discrepancy_lines_absvalue':discrepancy_lines_absvalue
+            }
+
+            total['discrepancy_lines_percent'] = 100 * total['discrepancy_lines_number'] / total['inventory_lines_number'] if total['inventory_lines_number'] else 0.0
+            total['discrepancy_lines_percent_value'] = 100 * total['discrepancy_lines_value'] / total['inventory_lines_value'] if total['inventory_lines_value'] else 0.0
+            total['discrepancy_lines_percent_absvalue'] = 100 * total['discrepancy_lines_absvalue'] / total['inventory_lines_absvalue'] if total['inventory_lines_absvalue'] else 0.0
+
+            totals[inventory["id"]] = total
+
+        return totals
+
+
+    _columns = {
+        'ref': fields.char('Reference', size=64, readonly=True),
+        'name': fields.char('Name', size=64, required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'date': fields.datetime('Creation Date', required=True, readonly=True, states={'draft': [('readonly', False)]}),
+        'responsible': fields.char('Responsible', size=128, required=False),
+        'date_done': fields.datetime('Date done', readonly=True),
+        'product_ids': fields.many2many('product.product', 'physical_inventory_product_rel',
+                                        'product_id', 'inventory_id', string="Product selection"),
+        'discrepancy_line_ids': fields.one2many('physical.inventory.discrepancy', 'inventory_id', 'Discrepancy lines',
+                                    states={'closed': [('readonly', True)]}),
+        'counting_line_ids': fields.one2many('physical.inventory.counting', 'inventory_id', 'Counting lines',
+                                             states={'closed': [('readonly', True)]}),
+        'location_id': fields.many2one('stock.location', 'Location', required=True, readonly=True,
+                                       states={'draft': [('readonly', False)]}),
+        'move_ids': fields.many2many('stock.move', 'physical_inventory_move_rel', 'inventory_id', 'move_id',
+                                     'Created Moves', readonly=True),
+        'state': fields.selection(PHYSICAL_INVENTORIES_STATES, 'State', readonly=True, select=True),
+        'company_id': fields.many2one('res.company', 'Company', readonly=True, select=True, required=True,
+                                      states={'draft': [('readonly', False)]}),
+        'full_inventory': fields.boolean('Full inventory', readonly=True),
+        'file_to_import': fields.binary(string='File to import', filters='*.xml'),
+        'file_to_import2': fields.binary(string='File to import', filters='*.xml'),
+
+        # Total for product
+        'inventory_lines_number':             fields.function(_inventory_totals, multi="inventory_total", method=True, type='integer', string=_("Number of inventory lines")),
+        'discrepancy_lines_number':           fields.function(_inventory_totals, multi="inventory_total", method=True, type='integer', string=_("Number of discrepancy lines")),
+        'discrepancy_lines_percent':          fields.function(_inventory_totals, multi="inventory_total", method=True, type='float',   string=_("Percent of lines with discrepancies")),
+        'inventory_lines_value':              fields.function(_inventory_totals, multi="inventory_total", method=True, type='float',   string=_("Total value of inventory")),
+        'discrepancy_lines_value':            fields.function(_inventory_totals, multi="inventory_total", method=True, type='float',   string=_("Value of discrepancies")),
+        'discrepancy_lines_percent_value':    fields.function(_inventory_totals, multi="inventory_total", method=True, type='float',   string=_("Percent of value of discrepancies")),
+        'inventory_lines_absvalue':           fields.function(_inventory_totals, multi="inventory_total", method=True, type='float',   string=_("Absolute value of inventory")),
+        'discrepancy_lines_absvalue':         fields.function(_inventory_totals, multi="inventory_total", method=True, type='float',   string=_("Absolute value of discrepancies")),
+        'discrepancy_lines_percent_absvalue': fields.function(_inventory_totals, multi="inventory_total", method=True, type='float',   string=_("Percent of absolute value of discrepancies")),
+    }
+
+    _defaults = {
+        'ref': False,
+        'date': lambda *a: time.strftime(DEFAULT_SERVER_DATETIME_FORMAT),
+        'state': 'draft',
+        'full_inventory': False,
+        'company_id': lambda self, cr, uid,
+                             c: self.pool.get('res.company')._company_default_get(cr, uid, 'physical.inventory', context=c)
+    }
+
+    _order = "ref desc, date desc"
+
+    def create(self, cr, uid, values, context):
+        context = context is None and {} or context
+        values["ref"] = self.pool.get('ir.sequence').get(cr, uid, 'physical.inventory')
+
+        return super(PhysicalInventory, self).create(cr, uid, values, context=context)
+
+
+    def copy(self, cr, uid, id_, default=None, context=None):
+        default = default is None and {} or default
+        context = context is None and {} or context
+        default = default.copy()
+
+        default['state'] = 'draft'
+        default['date'] = time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)
+        fields_to_empty = ["ref",
+                           "full_inventory",
+                           "date_done",
+                           "file_to_import",
+                           "file_to_import2",
+                           "counting_line_ids",
+                           "discrepancy_line_ids",
+                           "move_ids"]
+
+        for field in fields_to_empty:
+            default[field] = False
+
+        return super(PhysicalInventory, self).copy(cr, uid, id_, default, context=context)
+
+
+    def perm_write(self, cr, user, ids, fields, context=None):
+        pass
+
+
+    def set_full_inventory(self, cr, uid, ids, context=None):
+        context = context is None and {} or context
+
+        # Set full inventory as true and unlink all products already selected
+        self.write(cr, uid, ids, {'full_inventory': True,
+                                  'product_ids': [(5)]}, context=context)
+        return {}
+
+
+    def action_select_products(self, cr, uid, ids, context=None):
+        """
+        Trigerred when clicking on the button "Products Select"
+
+        Open the wizard to select the products according to specific filters..
+        """
+        context = context is None and {} or context
+        def read_single(model, id_, column):
+            return self.pool.get(model).read(cr, uid, [id_], [column], context=context)[0][column]
+        def create(model, vals):
+            return self.pool.get(model).create(cr, uid, vals, context=context)
+        def view(module, view):
+            return self.pool.get('ir.model.data').get_object_reference(cr, uid, module, view)[1]
+
+        # Prepare values to feed the wizard with
+        assert len(ids) == 1
+        inventory_id = ids[0]
+
+        # Is it a full inventory ?
+        full_inventory = read_single(self._name, inventory_id, 'full_inventory')
+
+        # Create the wizard
+        wiz_model = 'physical.inventory.select.products'
+        wiz_values = {"inventory_id": inventory_id,
+                      "full_inventory": full_inventory }
+        wiz_id = create(wiz_model, wiz_values)
+        context['wizard_id'] = wiz_id
+
+        # Get the view reference
+        view_id = view('stock', 'physical_inventory_select_products')
+
+        # Return a description of the wizard view
+        return {'type': 'ir.actions.act_window',
+                'target': 'new',
+                'res_model': wiz_model,
+                'res_id': wiz_id,
+                'view_id': [view_id],
+                'view_type': 'form',
+                'view_mode': 'form',
+                'context': context}
+
+    def generate_counting_sheet(self, cr, uid, ids, context=None):
+        """
+        Trigerred when clicking on the button "Generate counting sheet"
+
+        Open the wizard to fill the counting sheet with selected products.
+        Choose to include batch numbers / expiry date or not
+        """
+        context = context is None and {} or context
+        def read_single(model, id_, column):
+            return self.pool.get(model).read(cr, uid, [id_], [column], context=context)[0][column]
+        def create(model, vals):
+            return self.pool.get(model).create(cr, uid, vals, context=context)
+        def view(module, view):
+            return self.pool.get('ir.model.data').get_object_reference(cr, uid, module, view)[1]
+
+        # Prepare values to feed the wizard with
+        assert len(ids) == 1
+        inventory_id = ids[0]
+
+        # Create the wizard
+        wiz_model = 'physical.inventory.generate.counting.sheet'
+        wiz_values = {"inventory_id": inventory_id}
+        wiz_id = create(wiz_model, wiz_values)
+        context['wizard_id'] = wiz_id
+
+        # Get the view reference
+        view_id = view('stock', 'physical_inventory_generate_counting_sheet')
+
+        # Return a description of the wizard view
+        return {'type': 'ir.actions.act_window',
+                'target': 'new',
+                'res_model': wiz_model,
+                'res_id': wiz_id,
+                'view_id': [view_id],
+                'view_type': 'form',
+                'view_mode': 'form',
+                'context': context}
+
+
+    def generate_discrepancies(self, cr, uid, inventory_ids, context=None):
+        """
+        Trigerred when clicking on the button "Finish counting"
+
+        Analyze the counted lines to look for discrepancy, and fill the
+        'discrepancy lines' accordingly.
+        """
+        context = context if context else {}
+        def read_single(model, id_, column):
+            return self.pool.get(model).read(cr, uid, [id_], [column], context=context)[0][column]
+        def read_many(model, ids, columns):
+            return self.pool.get(model).read(cr, uid, ids, columns, context=context)
+        def write(model, id_, vals):
+            return self.pool.get(model).write(cr, uid, [id_], vals, context=context)
+        def write_many(model, ids, vals):
+            return self.pool.get(model).write(cr, uid, ids, vals, context=context)
+
+        # Get this inventory...
+        assert len(inventory_ids) == 1
+        inventory_id = inventory_ids[0]
+
+        # Get the location and counting lines
+        inventory = read_many(self._name, [inventory_id], [ "location_id",
+                                                            "discrepancy_line_ids",
+                                                            "counting_line_ids" ])[0]
+
+        location_id = inventory["location_id"][0]
+        counting_line_ids = inventory["counting_line_ids"]
+
+        counting_lines = read_many('physical.inventory.counting',
+                                   counting_line_ids,
+                                   [ "line_no",
+                                     "product_id",
+                                     "product_uom_id",
+                                     "standard_price",
+                                     "currency_id",
+                                     "batch_number",
+                                     "expiry_date",
+                                     "quantity"])
+
+        # Extract the list of (unique) product ids
+        product_ids = [ line["product_id"][0] for line in counting_lines ]
+        product_ids = list(set(product_ids))
+
+        # Fetch the theoretical quantities
+        # This will be a dict like { (product_id_1, BN_string_1) : theo_qty_1,
+        #                            (product_id_2, BN_string_2) : theo_qty_2 }
+        theoretical_quantities = self.get_stock_for_products_at_location(cr, uid, product_ids, location_id, context=context)
+
+        # Create a similar dictionnary for counted quantities
+        counting_lines_per_product_batch_expirtydate = {}
+        counted_quantities = {}
+        for line in counting_lines:
+
+            product_batch_expirydate = (line["product_id"][0],
+                                        line["batch_number"] or False,
+                                        line["expiry_date"])
+
+            qty = float(line["quantity"]) if line["quantity"] else False
+            counted_quantities[product_batch_expirydate] = qty
+
+            counting_lines_per_product_batch_expirtydate[product_batch_expirydate] = {
+                "line_id": line["id"],
+                "line_no": line["line_no"]
+            }
+
+        # Create a similar dictionnary for existing discrepancies
+        previous_discrepancy_line_ids = inventory["discrepancy_line_ids"]
+        previous_discrepancy_lines = read_many('physical.inventory.discrepancy',
+                                                 previous_discrepancy_line_ids,
+                                                 [ "product_id",
+                                                   "batch_number",
+                                                   "expiry_date",
+                                                   "ignored" ])
+
+        previous_discrepancies = {}
+        for line in previous_discrepancy_lines:
+            product_batch_expirydate = (line["product_id"][0],
+                                        line["batch_number"] or False,
+                                        line["expiry_date"])
+            previous_discrepancies[product_batch_expirydate] = {
+                "id": line["id"],
+                "ignored": line["ignored"],
+                "todelete": True
+            }
+
+        ###################################################
+        # Now, compare theoretical and counted quantities #
+        ###################################################
+
+        # First, create a unique set containing all product/batches
+        all_product_batch_expirydate = set().union(theoretical_quantities,
+                                                   counted_quantities)
+
+        new_discrepancies = []
+        update_discrepancies = {}
+        counting_lines_with_no_discrepancy = []
+
+        # For each of them, compare the theoretical and counted qty
+        for product_batch_expirydate in all_product_batch_expirydate:
+
+            # If the key is not known, assume 0
+            theoretical_qty = theoretical_quantities.get(product_batch_expirydate, 0.0)
+            counted_qty = counted_quantities.get(product_batch_expirydate, -1.0)
+
+            # If no discrepancy, nothing to do
+            # (Use a continue to save 1 indentation level..)
+            if counted_qty == theoretical_qty:
+                if product_batch_expirydate in counting_lines_per_product_batch_expirtydate:
+                    counting_line_id = counting_lines_per_product_batch_expirtydate[product_batch_expirydate]["line_id"]
+                    counting_lines_with_no_discrepancy.append(counting_line_id)
+                continue
+
+            # If this product/batch is known in the counting line, use
+            # the existing line number
+            if product_batch_expirydate in counting_lines_per_product_batch_expirtydate:
+                this_product_batch_expirydate = counting_lines_per_product_batch_expirtydate[product_batch_expirydate]
+                line_no = this_product_batch_expirydate["line_no"]
+
+            # Otherwise, create additional line numbers starting from
+            # the total of existing lines
+            else:
+                # FIXME : propably does not guarrantee uniqueness and
+                # 'incremenctaliness' of line_no in some edge cases when
+                # discrepancy report is regenerated multiple times...
+                line_no = len(counted_quantities) + 1 + len(new_discrepancies)
+
+            if product_batch_expirydate in previous_discrepancies:
+                previous_discrepancies[product_batch_expirydate]["todelete"] = False
+                existing_id = previous_discrepancies[product_batch_expirydate]["id"]
+                update_discrepancies[existing_id] = {
+                  "line_no": line_no,
+                  "counted_qty": counted_qty
+                }
+            else:
+                new_discrepancies.append( \
+                { "inventory_id": inventory_id,
+                  "line_no": line_no,
+                  "product_id": product_batch_expirydate[0],
+                  "batch_number": product_batch_expirydate[1],
+                  "expiry_date": product_batch_expirydate[2],
+                  "theoretical_qty": theoretical_qty,
+                  "counted_qty": counted_qty
+                })
+
+        # Update discrepancy flags on counting lines
+        counting_lines_with_discrepancy = [ l["id"] for l in counting_lines if  not l["id"] in counting_lines_with_no_discrepancy ]
+        write_many("physical.inventory.counting", counting_lines_with_discrepancy,    {"discrepancy": True})
+        write_many("physical.inventory.counting", counting_lines_with_no_discrepancy, {"discrepancy": False})
+
+        # Sort discrepancies according to line number
+        new_discrepancies = sorted(new_discrepancies, key=lambda d: d["line_no"])
+
+        # Prepare the actual create/remove for discrepancy lines
+        # 0 is for addition/creation
+        # 1 is for update
+        # 2 is the code for removal/deletion
+
+        create_discrepancy_lines = [ (0,0,discrepancy) for discrepancy in new_discrepancies ]
+        update_discrepancy_lines = [ (1,id_,values) for id_, values in update_discrepancies.items() ]
+        delete_discrepancy_lines = [ (2,line["id"]) for line in previous_discrepancies.values() if line["todelete"] ]
+
+        todo = []
+        todo.extend(delete_discrepancy_lines)
+        todo.extend(update_discrepancy_lines)
+        todo.extend(create_discrepancy_lines)
+
+        # Do the actual write
+        write("physical.inventory", inventory_id, {'discrepancy_line_ids': todo})
+
+
+        self._update_total_product(cr, uid, inventory_id,
+                                            theoretical_quantities,
+                                            counted_quantities,
+                                            context=context)
+
+        return self.resolve_discrepancies_anomalies(cr, uid, inventory_id, context=context)
+
+
+    def resolve_discrepancies_anomalies(self, cr, uid, inventory_id, context=None):
+        context = context if context else {}
+        def read_single(model, id_, column):
+            return self.pool.get(model).read(cr, uid, [id_], [column], context=context)[0][column]
+        def read_many(model, ids, columns):
+            return self.pool.get(model).read(cr, uid, ids, columns, context=context)
+        def product_identity_str(line):
+            str_ = "product '%s'" % line["product_id"][1]
+            if line["batch_number"] or line["expiry_date"]:
+                str_ += " with Batch number '%s' and Expiry date '%s'"  % (line["batch_number"] or '', line["expiry_date"] or '')
+            else:
+                str_ += " (no batch number / expiry date)"
+            return str_
+
+        discrepancy_line_ids = read_single("physical.inventory", inventory_id, 'discrepancy_line_ids')
+
+        discrepancy_lines = read_many('physical.inventory.discrepancy',
+                                      discrepancy_line_ids,
+                                      [ "line_no",
+                                        "product_id",
+                                        "batch_number",
+                                        "expiry_date",
+                                        "counted_qty",
+                                        "ignored"])
+
+        anomalies = []
+        for line in discrepancy_lines:
+            if line["ignored"]:
+                continue
+            anomaly = False
+            if line["counted_qty"] == False:
+                anomaly = "Quantity for line %s, %s is incorrect." % (line["line_no"], product_identity_str(line))
+            if line["counted_qty"] < 0.0:
+                anomaly = "A line for %s was expected but not found." % product_identity_str(line)
+
+            if anomaly:
+                anomalies.append({"message": anomaly + " Ignore line or count as 0 ?",
+                                  "line_id": line["id"]})
+
+        if anomalies:
+            return self.pool.get('physical.inventory.import.wizard').action_box(cr, uid, 'Warning', anomalies)
+        else:
+            return {}
+
+
+    def _update_total_product(self, cr, uid, inventory_id, theoretical_qties, counted_qties, context=None):
+        """
+        theoretical_qties and counted_qties are indexed with (product_id, batchnumber, expirydate)
+        """
+        def read_single(model, id_, column):
+            return self.pool.get(model).read(cr, uid, [id_], [column], context=context)[0][column]
+        def read_many(model, ids, columns):
+            return self.pool.get(model).read(cr, uid, ids, columns, context=context)
+        def write(model, id_, vals):
+            return self.pool.get(model).write(cr, uid, [id_], vals, context=context)
+
+        discrepancy_line_ids = read_single("physical.inventory",
+                                           inventory_id,
+                                           'discrepancy_line_ids')
+
+        discrepancy_lines = read_many("physical.inventory.discrepancy",
+                                      discrepancy_line_ids,
+                                      ["product_id"])
+
+        all_product_ids = set([ l["product_id"][0] for l in discrepancy_lines ])
+
+        total_product_theoretical_qties = {}
+        total_product_counted_qties = {}
+        for product_id in all_product_ids:
+
+            # FIXME : how to not take into account ignored lines in the count ? :/
+            total_product_theoretical_qties[product_id] = sum([ qty for k, qty in theoretical_qties.items() if k[0] == product_id ])
+            total_product_counted_qties[product_id] = sum([ qty for k, qty in counted_qties.items() if k[0] == product_id ])
+
+        update_discrepancy_lines = {}
+        for line in discrepancy_lines:
+            id_ = line["id"]
+            product_id = line["product_id"][0]
+            update_discrepancy_lines[id_] = {
+                'total_product_theoretical_qty': total_product_theoretical_qties[product_id],
+                'total_product_counted_qty': total_product_counted_qties[product_id]
+            }
+
+        todo = [ (1,id_,values) for id_, values in update_discrepancy_lines.items() ]
+
+        write("physical.inventory", inventory_id, {'discrepancy_line_ids':todo})
+
+
+    def pre_process_discrepancies(self, cr, uid, items, context=None):
+        discrepancies = self.pool.get('physical.inventory.discrepancy')
+        ignore_ids = [item['line_id'] for item in items if item['action'] == 'ignore']
+        count_ids = [item['line_id'] for item in items if item['action'] == 'count']
+
+        if ignore_ids:
+            discrepancies.write(cr, uid, ignore_ids, {'counted_qty': 0.0, 'ignored': True})
+        if count_ids:
+            discrepancies.write(cr, uid, count_ids, {'counted_qty': 0.0, 'ignored': False})
+
+    def get_stock_for_products_at_location(self, cr, uid, product_ids, location_id, context=None):
+        context = context if context else {}
+
+        def read_many(model, ids, columns):
+            return self.pool.get(model).read(cr, uid, ids, columns, context=context)
+
+        def search(model, domain):
+            return self.pool.get(model).search(cr, uid, domain, context=context)
+
+        assert isinstance(product_ids, list)
+        assert isinstance(location_id, int)
+
+        # Get all the moves for in/out of that location for the products
+        move_for_products_at_location = ['&', '&', '|',
+                                        ('location_id', 'in', [location_id]),
+                                        ('location_dest_id', 'in', [location_id]),
+                                        ("product_id", 'in', product_ids),
+                                        ('state', '=', 'done')]
+
+        moves_at_location_ids = search("stock.move", move_for_products_at_location)
+        moves_at_location = read_many("stock.move",
+                                      moves_at_location_ids,
+                                      ["product_id",
+                                       "product_qty",
+                                       "prodlot_id",
+                                       "expired_date",
+                                       "location_id",
+                                       "location_dest_id"])
+
+        # Sum all lines to get a set of (product, batchnumber) -> qty
+        stocks = {}
+        for move in moves_at_location:
+
+            product_id = move["product_id"][0]
+            product_qty = move["product_qty"]
+            batch_number = move["prodlot_id"][1] if move["prodlot_id"] else False
+            expiry_date = move["expired_date"]
+
+            # Dirty hack to ignore/hide internal batch numbers ("MSFBN")
+            if batch_number and batch_number.startswith("MSFBN"):
+                batch_number = False
+
+            product_batch_expirydate = (product_id, batch_number, expiry_date)
+
+            # Init the quantity to 0 if batch is not present in dict yet
+            # (NB: batch_id can be None, but that's not an issue for dicts ;))
+            if not product_batch_expirydate in stocks.keys():
+                stocks[product_batch_expirydate] = 0.0
+
+            move_out = (move["location_id"][0] == location_id)
+            move_in = (move["location_dest_id"][0] == location_id)
+
+            if move_in:
+                stocks[product_batch_expirydate] += product_qty
+            elif move_out:
+                stocks[product_batch_expirydate] -= product_qty
+            else:
+                # This shouldnt happen
+                pass
+
+        return stocks
+
+    def export_xls_counting_sheet(self, cr, uid, ids, context=None):
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'physical_inventory_counting_sheet_xls',
+            'datas': {'ids': ids, 'target_filename': 'counting_sheet'},
+            'nodestroy': True,
+            'context': context,
+        }
+
+    def export_pdf_counting_sheet(self, cr, uid, ids, context=None):
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'physical_inventory_counting_sheet_pdf',
+            'datas': {'ids': ids, 'target_filename': 'counting_sheet'},
+            'nodestroy': True,
+            'context': context,
+        }
+
+    def import_counting_sheet(self, cr, uid, ids, context=None):
+        """
+        Import an exported counting sheet
+        """
+        if not context:
+            context = {}
+
+        counting_sheet_header = {}
+        counting_sheet_lines = []
+        counting_sheet_errors = []
+
+        def add_error(message, file_row, file_col=None):
+            if file_col is not None:
+                _msg = 'Cell %s%d: %s' % (chr(0x41 + file_col), file_row + 1, message)
+            else:
+                _msg = 'Line %d: %s' % (file_row + 1, message)
+            counting_sheet_errors.append(_msg)
+
+        inventory_rec = self.browse(cr, uid, ids, context=context)[0]
+        if not inventory_rec.file_to_import:
+            raise osv.except_osv(_('Error'), _('Nothing to import.'))
+        counting_sheet_file = SpreadsheetXML(xmlstring=base64.decodestring(inventory_rec.file_to_import))
+
+        product_obj = self.pool.get('product.product')
+        product_uom_obj = self.pool.get('product.uom')
+        counting_obj = self.pool.get('physical.inventory.counting')
+
+        line_list = []
+        line_items = []
+
+        for row_index, row in enumerate(counting_sheet_file.getRows()):
+
+            # === Process header ===
+
+            if row_index == 2:
+                counting_sheet_header.update({
+                    'inventory_counter_name': row.cells[2].data,  # Cell C3
+                    'inventory_date': row.cells[5].data  # Cell F3
+                })
+            elif row_index == 4:
+                inventory_reference = row.cells[2].data  # Cell C5
+                inventory_location = row.cells[5].data  # Cell F5
+                # Check location
+                if inventory_rec.location_id and inventory_rec.location_id.name != (inventory_location or '').strip():
+                    add_error(_('Location is different to inventory location'), row_index, 5)
+
+                # Check reference
+                if inventory_rec.ref != (inventory_reference or '').strip():
+                    add_error(_('Reference is different to inventory reference'), row_index, 2)
+                counting_sheet_header.update({
+                    'location_id': inventory_rec.location_id,
+                    'inventory_reference': inventory_reference
+                })
+            elif row_index == 6:
+                counting_sheet_header['inventory_name'] = row.cells[2].data  # Cell C7
+            if row_index < 9:
+                continue
+
+            # === Process lines ===
+
+            # Check number of columns
+            if len(row) != 10:
+                add_error(_("""_(Reference is different to inventory reference, You should have exactly 9 columns in this order:
+Line #, Product Code*, Product Description*, UoM*, Quantity*, Batch*, Expiry Date*, Specification*, BN Management*, , ED Management*"""), row_index)
+                break
+
+            # Check line number
+            line_no = row.cells[0].data
+            if line_no is not None:
+                try:
+                    line_no = int(line_no)
+                    if line_no in line_list:
+                        add_error("""Line number is duplicate. If you added a line, please keep the line number empty.""", row_index, 0)
+                    line_list.append(line_no)
+                except ValueError:
+                    line_no = None
+                    add_error("""Invalid line number""", row_index, 0)
+
+            # Check product_code
+            product_code = row.cells[1].data
+            product_ids = product_obj.search(cr, uid, [('default_code', '=like', product_code)], context=context)
+            product_id = False
+            if len(product_ids) == 1:
+                product_id = product_ids[0]
+            else:
+                add_error("""Product %s not found""" % product_code, row_index, 1)
+
+            # Check UoM
+            product_uom_id = False
+            product_uom = row.cells[3].data
+            product_uom_ids = product_uom_obj.search(cr, uid, [('name', '=like', product_uom)])
+            if len(product_uom_ids) == 1:
+                product_uom_id = product_uom_ids[0]
+            else:
+                add_error("""UoM %s unknown""" % product_uom, row_index, 3)
+
+            # Check quantity
+            quantity = row.cells[4].data
+            try:
+                quantity = counting_obj.quantity_validate(cr, quantity)
+            except NegativeValueError:
+                add_error('Quantity %s is negative' % quantity, row_index, 4)
+                quantity = 0.0
+            except ValueError:
+                quantity = 0.0
+                add_error('Quantity %s is not valide' % quantity, row_index, 4)
+
+            product_info = product_obj.read(cr, uid, product_id, ['batch_management', 'perishable'])
+
+            # Check batch number
+            batch_name = row.cells[5].data
+            if not batch_name and product_info['batch_management'] and float(quantity or 0) > 0:
+                add_error('Batch number is required', row_index, 5)
+
+            # Check expiry date
+            expiry_date = row.cells[6].data
+            if expiry_date:
+                expiry_date_type = row.cells[6].type
+                try:
+                    if expiry_date_type == 'datetime':
+                        expiry_date = expiry_date.strftime(DEFAULT_SERVER_DATE_FORMAT)
+                    elif expiry_date_type == 'str':
+                        expiry_date = parse(expiry_date).strftime(DEFAULT_SERVER_DATE_FORMAT)
+                    else:
+                        raise ValueError()
+                except ValueError:
+                    add_error("""Expiry date %s is not valide""" % expiry_date, row_index, 6)
+            if not expiry_date and product_info['perishable'] and float(quantity or 0) > 0:
+                add_error('Expiry date is required', row_index, 6)
+
+            # Check duplicate line (Same product_id, batch_number, expirty_date)
+            item = '%d-%s-%s' % (product_id or -1, batch_name or '', expiry_date or '')
+            if item in line_items:
+                add_error("""Duplicate line (same product, batch number and expiry date)""", row_index)
+            else:
+                line_items.append(item)
+
+            data = {
+                'line_no': line_no,
+                'product_id': product_id,
+                'batch_number': batch_name,
+                'expiry_date': expiry_date,
+                'quantity': quantity,
+                'product_uom_id': product_uom_id,
+            }
+
+            # Check if line exist
+            if line_no:
+                line_ids = counting_obj.search(cr, uid, [('inventory_id', '=', inventory_rec.id), ('line_no', '=', line_no)])
+            else:
+                line_ids = counting_obj.search(cr, uid, [('inventory_id', '=', inventory_rec.id),
+                                                         ('product_id', '=', product_id),
+                                                         ('batch_number', '=', batch_name),
+                                                         ('expiry_date', '=', expiry_date)])
+                if line_ids:
+                    del data["line_no"]
+
+            if len(line_ids) > 0:
+                counting_sheet_lines.append((1, line_ids[0], data))
+            else:
+                counting_sheet_lines.append((0, 0, data))
+
+        # endfor
+
+        context['import_in_progress'] = True
+        wizard_obj = self.pool.get('physical.inventory.import.wizard')
+        if counting_sheet_errors:
+            # Errors found, open message box for exlain
+            self.write(cr, uid, ids, {'file_to_import': False}, context=context)
+            result = wizard_obj.message_box(cr, uid, title='Importation errors', message='\n'.join(counting_sheet_errors))
+        else:
+            # No error found. Write counting lines on Inventory
+            vals = {
+                'file_to_import': False,
+                'responsible': counting_sheet_header.get('inventory_counter_name'),
+                'counting_line_ids': counting_sheet_lines
+            }
+            self.write(cr, uid, ids, vals, context=context)
+            result = wizard_obj.message_box(cr, uid, title='Information', message='Counting sheet succefully imported.')
+        context['import_in_progress'] = False
+
+        return result
+
+    def import_xls_discrepancy_report(self, cr, uid, ids, context=None):
+        """Import an exported discrepancy report"""
+        if not context:
+            context = {}
+
+        discrepancy_report_header = {}
+        discrepancy_report_lines = []
+        discrepancy_report_errors = []
+
+        def add_error(message, file_row, file_col):
+            discrepancy_report_errors.append('Cell %s%d: %s' % (chr(0x41 + file_col), file_row + 1, message))
+
+        inventory_rec = self.browse(cr, uid, ids, context=context)[0]
+        if not inventory_rec.file_to_import2:
+            raise osv.except_osv(_('Error'), _('Nothing to import.'))
+
+        discrepancy_report_file = SpreadsheetXML(xmlstring=base64.decodestring(inventory_rec.file_to_import2))
+
+        # product_obj = self.pool.get('product.product')
+        # product_uom_obj = self.pool.get('product.uom')
+        # counting_obj = self.pool.get('physical.inventory.counting')
+        reason_type_obj = self.pool.get('stock.reason.type')
+        discrepancy_obj = self.pool.get('physical.inventory.discrepancy')
+
+        for row_index, row in enumerate(discrepancy_report_file.getRows()):
+            if row_index < 10:
+                continue
+            adjustment_type = row.cells[18].data
+            if adjustment_type:
+                reason_ids = reason_type_obj.search(cr, uid, [('name', '=like', adjustment_type)], context=context)
+                if reason_ids:
+                    adjustment_type = reason_ids[0]
+                else:
+                    add_error('Unknown adjustment type %s' % adjustment_type, row_index, 18)
+                    adjustment_type = False
+
+            comment = row.cells[19].data
+
+            line_no = row.cells[0].data
+            line_ids = discrepancy_obj.search(cr, uid, [('inventory_id', '=', inventory_rec.id), ('line_no', '=', line_no)])
+            if line_ids:
+                line_no = line_ids[0]
+            else:
+                add_error('Unknown line no %s' % line_no, row_index, 0)
+                line_no = False
+
+            discrepancy_report_lines.append((1, line_no, {'reason_type_id': adjustment_type, 'comment': comment}))
+        # endfor
+
+        context['import_in_progress'] = True
+        wizard_obj = self.pool.get('physical.inventory.import.wizard')
+        if discrepancy_report_errors:
+            # Errors found, open message box for exlain
+            self.write(cr, uid, ids, {'file_to_import2': False}, context=context)
+            result = wizard_obj.message_box(cr, uid, title='Importation errors',
+                                            message='\n'.join(discrepancy_report_errors))
+        else:
+            # No error found. update comment and reason for discrepancies lines on Inventory
+            vals = {'file_to_import2': False, 'discrepancy_line_ids': discrepancy_report_lines}
+            self.write(cr, uid, ids, vals, context=context)
+            result = wizard_obj.message_box(cr, uid, title='Information',
+                                            message='Discrepancy report succefully imported.')
+        context['import_in_progress'] = False
+
+        return result
+
+    def export_xls_discrepancy_report(self, cr, uid, ids, context=None):
+        return {
+            'type': 'ir.actions.report.xml',
+            'report_name': 'physical_inventory_discrepancies_report_xls',
+            'datas': {'ids': ids, 'target_filename': 'discrepancies'},
+            'nodestroy': True,
+            'context': context,
+        }
+
+    def action_counted(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        self.write(cr, uid, ids, {'state': 'counted'}, context=context)
+        return {}
+
+    def action_done(self, cr, uid, ids, context=None):
+        """ Finish the inventory"""
+        if context is None:
+            context = {}
+        move_obj = self.pool.get('stock.move')
+        for inv in self.read(cr, uid, ids, ['move_ids'], context=context):
+            move_obj.action_done(cr, uid, inv['move_ids'], context=context)
+        self.write(cr, uid, ids, {'state': 'closed', 'date_done': time.strftime(DEFAULT_SERVER_DATETIME_FORMAT)},
+                   context=context)
+        return {}
+
+    def action_recount(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        self.write(cr, uid, ids, {'state': 'counting'}, context=context)
+        return {}
+
+    def action_validate(self, cr, uid, ids, context=None):
+        if context is None:
+            context = {}
+        self.write(cr, uid, ids, {'state': 'validated'}, context=context)
+        return {}
+
+    def action_confirm(self, cr, uid, ids, context=None):
+        """ Confirm the inventory and writes its finished date"""
+
+        if context is None:
+            context = {}
+
+        # to perform the correct inventory corrections we need analyze stock location by
+        # location, never recursively, so we use a special context
+        product_context = dict(context, compute_child=False)
+
+        # location_obj = self.pool.get('stock.location')
+        product_obj = self.pool.get('product.product')
+        product_tmpl_obj = self.pool.get('product.template')
+        prod_lot_obj = self.pool.get('stock.production.lot')
+        picking_obj = self.pool.get('stock.picking')
+
+        product_dict = {}
+        product_tmpl_dict = {}
+
+        for inv in self.read(cr, uid, ids, ['counting_line_ids',
+                                            'discrepancy_line_ids',
+                                            'date',
+                                            'name'], context=context):
+            move_ids = []
+
+            # gather all information needed for the lines treatment first to do less requests
+            counting_line_obj = self.pool.get('physical.inventory.counting')
+            inv_line_obj = self.pool.get('physical.inventory.discrepancy')
+
+
+            counting_lines_with_no_discrepancy_ids = counting_line_obj.search(cr, uid, [("inventory_id", '=', inv["id"]),
+                                                                                        ("discrepancy", '=', False)],
+                                                                                        context=context)
+
+            counting_lines_with_no_discrepancy = counting_line_obj.read(cr, uid, counting_lines_with_no_discrepancy_ids,
+                                                                                 ['product_id',
+                                                                                  'batch_number',
+                                                                                  'expiry_date'],
+                                                                                 context=context)
+
+            line_read = inv_line_obj.read(cr, uid, inv['discrepancy_line_ids'],
+                                          ['inventory_id', 'product_id', 'product_uom_id', 'batch_number', 'expiry_date', 'location_id',
+                                           'discrepancy_qty', 'reason_type_id', 'comment', 'ignored', 'line_no'], context=context)
+
+            product_id_list = [x['product_id'][0] for x in line_read if
+                               x['product_id'][0] not in product_dict]
+            product_id_list = list(set(product_id_list))
+            product_read = product_obj.read(cr, uid, product_id_list,
+                                            ['product_tmpl_id'], context=context)
+            for product in product_read:
+                product_id = product['id']
+                product_dict[product_id] = {}
+                product_dict[product_id]['p_tmpl_id'] = product['product_tmpl_id'][0]
+
+            tmpl_ids = [x['p_tmpl_id'] for x in product_dict.values()]
+
+            product_tmpl_id_list = [x for x in tmpl_ids if x not in product_tmpl_dict]
+            product_tmpl_id_list = list(set(product_tmpl_id_list))
+            product_tmpl_read = product_tmpl_obj.read(cr, uid,
+                                                      product_tmpl_id_list, ['property_stock_inventory'],
+                                                      context=context)
+            product_tmpl_dict = dict((x['id'], x['property_stock_inventory'][0]) for x in product_tmpl_read)
+
+            for product_id in product_id_list:
+                product_tmpl_id = product_dict[product_id]['p_tmpl_id']
+                stock_inventory = product_tmpl_dict[product_tmpl_id]
+                product_dict[product_id]['stock_inventory'] = stock_inventory
+
+            errors = []
+            for line in line_read:
+                if not line['ignored'] and not line['reason_type_id']:
+                    errors.append('Line %d: Adjustement type missing' % line['line_no'])
+
+            if errors:
+                # Errors found, open message box for exlain
+                wizard_obj = self.pool.get('physical.inventory.import.wizard')
+                return wizard_obj.message_box(cr, uid, title='Confirmation errors', message='\n'.join(errors))
+
+
+            def get_prodlot_id(bn, ed):
+                if not ed:
+                    return False
+                elif bn:
+                    return picking_obj.retrieve_batch_number(cr, uid, pid, {'name': bn, 'life_date': ed}, context=context)[0]
+                else:
+                    return prod_lot_obj._get_prodlot_from_expiry_date(cr, uid, ed, pid)
+
+            # For each counting lines which had no discrepancy, keep track of
+            # the real batch number id
+            for line in counting_lines_with_no_discrepancy:
+                line_id = line['id']
+                pid = line['product_id'][0]
+                bn = line['batch_number']
+                ed = line['expiry_date']
+
+                lot_id = get_prodlot_id(bn, ed)
+
+                counting_line_obj.write(cr, uid, [line_id], {"prod_lot_id": lot_id}, context=context)
+
+
+            discrepancy_to_move = {}
+            for line in line_read:
+                if line['ignored']:
+                    continue
+                line_id = line['id']
+                pid = line['product_id'][0]
+                bn = line['batch_number']
+                ed = line['expiry_date']
+
+                change = line['discrepancy_qty']  # - amount
+
+                # Ignore lines with no discrepancies (there shouldnt be any
+                # by definition/construction of the discrepancy lines)
+                if not change:
+                    continue
+
+                lot_id = get_prodlot_id(bn, ed)
+
+                # lot_id = line['prod_lot_id'] and line['prod_lot_id'][0] or False
+                product_context.update(uom=line['product_uom_id'][0],
+                                       date=inv['date'], prodlot_id=lot_id)
+
+                # amount = location_obj._product_get(cr, uid, line['location_id'][0], [pid], product_context)[pid]
+
+                location_id = product_dict[line['product_id'][0]]['stock_inventory']
+                value = {
+                    'name': 'INV:' + str(inv['id']) + ':' + inv['name'],
+                    'product_id': line['product_id'][0],
+                    'product_uom': line['product_uom_id'][0],
+                    'prodlot_id': lot_id,
+                    'date': inv['date'],
+                }
+                if change > 0:
+                    value.update({
+                        'product_qty': change,
+                        'location_id': location_id,
+                        'location_dest_id': line['location_id'][0],
+                    })
+                else:
+                    value.update({
+                        'product_qty': -change,
+                        'location_id': line['location_id'][0],
+                        'location_dest_id': location_id,
+                    })
+                value.update({
+                    'comment': line['comment'],
+                    'reason_type_id': line['reason_type_id'][0],
+                })
+                move_id = self.pool.get('stock.move').create(cr, uid, value)
+                move_ids.append(move_id)
+                discrepancy_to_move[line_id] = move_id
+
+            message = _('Inventory') + " '" + inv['name'] + "' " + _("is validated.")
+            self.log(cr, uid, inv['id'], message)
+            self.write(cr, uid, [inv['id']], {'state': 'confirmed', 'move_ids': [(6, 0, move_ids)]})
+            for line_id, move_id in discrepancy_to_move.items():
+                inv_line_obj.write(cr, uid, [line_id], {'move_id': move_id}, context=context)
+
+
+    def action_cancel_draft(self, cr, uid, ids, context=None):
+        """ Cancels the stock move and change inventory state to draft."""
+        for inv in self.read(cr, uid, ids, ['move_ids'], context=context):
+            self.pool.get('stock.move').action_cancel(cr, uid, inv['move_ids'], context=context)
+        self.write(cr, uid, ids, {'state': 'draft'}, context=context)
+        return {}
+
+    def action_cancel_inventary(self, cr, uid, ids, context=None):
+        """ Cancels both stock move and inventory"""
+        move_obj = self.pool.get('stock.move')
+        account_move_obj = self.pool.get('account.move')
+        for inv in self.browse(cr, uid, ids, context=context):
+            move_obj.action_cancel(cr, uid, [x.id for x in inv.move_ids], context=context)
+            for move in inv.move_ids:
+                account_move_ids = account_move_obj.search(cr, uid, [('name', '=', move.name)], order='NO_ORDER')
+                if account_move_ids:
+                    account_move_data_l = account_move_obj.read(cr, uid, account_move_ids, ['state'], context=context)
+                    for account_move in account_move_data_l:
+                        if account_move['state'] == 'posted':
+                            raise osv.except_osv(_('UserError'),
+                                                 _('You can not cancel inventory which has any account move with posted state.'))
+                        account_move_obj.unlink(cr, uid, [account_move['id']], context=context)
+            self.write(cr, uid, [inv.id], {'state': 'cancel'}, context=context)
+            self.infolog(cr, uid, "The Physical inventory id:%s (%s) has been cancelled" % (inv.id, inv.name))
+        return {}
+
+
+PhysicalInventory()
+
+
+class PhysicalInventoryCounting(osv.osv):
+    _name = 'physical.inventory.counting'
+    _description = 'Physical Inventory Counting Line'
+
+    _columns = {
+        # Link to inventory
+        'inventory_id': fields.many2one('physical.inventory', _('Inventory'), ondelete='cascade', select=True),
+
+        # Product
+        'product_id': fields.many2one('product.product', _('Product'), required=True, select=True,
+                                      domain=[('type', '<>', 'service')]),
+        'product_uom_id': fields.many2one('product.uom', _('Product UOM'), required=True),
+        'standard_price': fields.float(_("Unit Price"), readonly=True),
+        'currency_id': fields.many2one('res.currency', "Currency", readonly=True),
+        'is_bn': fields.related('product_id', 'batch_management', string='BN', type='boolean', readonly=True),
+        'is_ed': fields.related('product_id', 'perishable', string='ED', type='boolean', readonly=True),
+        'is_kc': fields.related('product_id', 'is_kc', string='KC', type='boolean', readonly=True),
+        'is_dg': fields.related('product_id', 'is_dg', string='DG', type='boolean', readonly=True),
+        'is_cs': fields.related('product_id', 'is_cs', string='CS', type='boolean', readonly=True),
+
+        # Batch / Expiry date
+        'batch_number': fields.char(_('Batch number'), size=30),
+        'expiry_date': fields.date(string=_('Expiry date')),
+
+        # Specific to inventory
+        'line_no': fields.integer(string=_('Line #'), readonly=True),
+        'quantity': fields.char(_('Quantity'), size=15),
+        'discrepancy': fields.boolean('Discrepancy found', readonly=True),
+
+        # Actual batch number id, filled after the inventory switches to done
+        'prod_lot_id': fields.many2one('stock.production.lot', 'Production Lot', readonly=True)
+    }
+
+    _sql_constraints = [
+        ('line_uniq', 'UNIQUE(inventory_id, product_id, batch_number, expiry_date)', _('The line product, batch number and expiry date must be unique!')),
+    ]
+
+    def create(self, cr, user, vals, context=None):
+        # Compute line number
+        if not vals.get('line_no'):
+            cr.execute("""SELECT MAX(line_no) FROM physical_inventory_counting WHERE inventory_id=%s""",
+                       (vals.get('inventory_id'),))
+            vals['line_no'] = (cr.fetchone()[0] or 0) + 1  # Last line number + 1
+
+        if (not vals.get('product_uom_id')
+        or  not vals.get('standard_price')
+        or  not vals.get('currency_id')):
+
+            product_id = vals.get('product_id')
+            product = self.pool.get("product.product").read(cr, user,
+                                                            [product_id],
+                                                            ["uom_id",
+                                                             "standard_price",
+                                                             "currency_id"],
+                                                             context=context)[0]
+
+            vals['product_uom_id'] = product['uom_id'][0]
+            vals['standard_price'] = product['standard_price']
+            vals['currency_id'] = product['currency_id'][0]
+
+        return super(PhysicalInventoryCounting, self).create(cr, user, vals, context)
+
+    @staticmethod
+    def quantity_validate(cr, quantity):
+        """Return a valide quantity or raise ValueError exception"""
+        if quantity:
+            float_width, float_prec = dp.get_precision('Product UoM')(cr)
+            quantity = float(quantity)
+            if quantity < 0:
+                raise NegativeValueError()
+            if math.isnan(quantity):
+                raise ValueError()
+            quantity = '%.*f' % (float_prec, quantity)
+        return quantity
+
+    def on_change_quantity(self, cr, uid, ids, quantity):
+        """Check and format quantity."""
+        if quantity:
+            try:
+                quantity = self.quantity_validate(cr, quantity)
+            except NegativeValueError:
+                return {'value': {'quantity': False},
+                        'warning': {'title': 'warning', 'message': 'Negative quantity is not permit.'}}
+            except ValueError:
+                return {'value': {'quantity': False},
+                        'warning': {'title': 'warning', 'message': 'Enter a valid quantity.'}}
+        return {'value': {'quantity': quantity}}
+
+    def on_change_product_id(self, cr, uid, ids, product_id, uom=False):
+        """Changes UoM and quantity if product_id changes."""
+        if product_id and not uom:
+            product_rec = self.pool.get('product.product').browse(cr, uid, product_id)
+            uom = product_rec.uom_id and product_rec.uom_id.id
+        return {'value': {'quantity': False, 'product_uom_id': product_id and uom}}
+
+    def perm_write(self, cr, user, ids, fields, context=None):
+        pass
+
+
+PhysicalInventoryCounting()
+
+
+class PhysicalInventoryDiscrepancy(osv.osv):
+    _name = 'physical.inventory.discrepancy'
+    _description = 'Physical Inventory Discrepancy Line'
+
+
+    def _discrepancy(self, cr, uid, ids, field_names, arg, context=None):
+        context = context is None and {} or context
+        def read_many(model, ids, columns):
+            return self.pool.get(model).read(cr, uid, ids, columns, context=context)
+
+        lines = read_many("physical.inventory.discrepancy", ids, ["theoretical_qty",
+                                                                  "counted_qty",
+                                                                  "standard_price"])
+
+        discrepancies = {}
+        for line in lines:
+            discrepancy_qty = line["counted_qty"] - line["theoretical_qty"]
+            discrepancy_value = discrepancy_qty * line["standard_price"]
+            discrepancies[line["id"]] = { "discrepancy_qty": discrepancy_qty,
+                                          "discrepancy_value": discrepancy_value }
+
+        return discrepancies
+
+
+    def _total_product_qty_and_values(self, cr, uid, ids, field_names, arg, context=None):
+        def search(model, domain):
+            return self.pool.get(model).search(cr, uid, domain, context=context)
+        def read_many(model, ids, columns):
+            return self.pool.get(model).read(cr, uid, ids, columns, context=context)
+
+        discrepancy_lines = read_many(self._name, ids, ["product_id",
+                                                        "standard_price",
+                                                        "total_product_theoretical_qty",
+                                                        "total_product_counted_qty" ])
+
+        total_product_qty_and_values = {}
+        for line in discrepancy_lines:
+            id_ = line["id"]
+            theo = line["total_product_theoretical_qty"]
+            counted = line["total_product_counted_qty"]
+            price = line["standard_price"]
+            total_product_qty_and_values[id_] = {
+                'total_product_counted_value': counted * price,
+                'total_product_discrepancy_qty': counted - theo,
+                'total_product_discrepancy_value': (counted - theo) * price
+            }
+
+        return total_product_qty_and_values
+
+
+    _columns = {
+        # Link to inventory
+        'inventory_id': fields.many2one('physical.inventory', 'Inventory', ondelete='cascade'),
+        'location_id': fields.related('inventory_id', 'location_id', type='many2one', relation='stock.location',  string='location_id', readonly=True),
+
+        # Product
+        'product_id': fields.many2one('product.product', 'Product', required=True),
+
+        'product_uom_id': fields.many2one('product.uom', 'UOM', required=True, readonly=True),
+
+        'nomen_manda_2': fields.related('product_id', 'nomen_manda_2', string="Family",
+                                         relation="product.nomenclature", type='many2one', readonly=True),
+
+        'standard_price': fields.float(_("Unit Price"), readonly=True),
+        'currency_id': fields.many2one('res.currency', "Currency", readonly=True),
+
+        # BN / ED
+        'batch_number': fields.char(_('Batch number'), size=30, readonly=True),
+        'expiry_date': fields.date(string=_('Expiry date')),
+
+        # Count
+        'line_no': fields.integer(string=_('Line #'), readonly=True),
+        'theoretical_qty': fields.float('Theoretical Quantity', digits_compute=dp.get_precision('Product UoM'), readonly=True),
+        'counted_qty': fields.float('Counted Quantity', digits_compute=dp.get_precision('Product UoM')),
+        'discrepancy_qty': fields.function(_discrepancy, multi="discrepancy", method=True, type='float', string=_("Discrepancy Quantity")),
+        'discrepancy_value': fields.function(_discrepancy, multi="discrepancy", method=True, type='float', string=_("Discrepancy Value")),
+
+        # Discrepancy analysis
+        'reason_type_id': fields.many2one('stock.reason.type', string='Adjustment type', select=True),
+        'comment': fields.char(size=128, string='Comment'),
+
+        # Total for product
+        'total_product_theoretical_qty': fields.float('Total Theoretical Quantity for product', digits_compute=dp.get_precision('Product UoM'), readonly=True),
+        'total_product_counted_qty': fields.float('Total Counted Quantity for product', digits_compute=dp.get_precision('Product UoM'), readonly=True),
+        'total_product_counted_value': fields.function(_total_product_qty_and_values, multi="total_product", method=True, type='float', string=_("Total Counted Value for product")),
+        'total_product_discrepancy_qty': fields.function(_total_product_qty_and_values, multi="total_product", method=True, type='float', string=_("Total Discrepancy for product")),
+        'total_product_discrepancy_value': fields.function(_total_product_qty_and_values, multi="total_product", method=True, type='float', string=_("Total Discrepancy Value for product")),
+        'ignored': fields.boolean('Ignored', readonly=True),
+        'move_id': fields.integer(readonly=True)
+    }
+
+    _order = "product_id asc, line_no asc"
+
+    def create(self, cr, user, vals, context=None):
+        context = context is None and {} or context
+
+        if (not vals.get('product_uom_id')
+        or  not vals.get('standard_price')
+        or  not vals.get('currency_id')):
+
+            product_id = vals.get('product_id')
+            product = self.pool.get("product.product").read(cr, user,
+                                                            [product_id],
+                                                            ["uom_id",
+                                                             "standard_price",
+                                                             "currency_id"],
+                                                             context=context)[0]
+
+            vals['product_uom_id'] = product['uom_id'][0]
+            vals['standard_price'] = product['standard_price']
+            vals['currency_id'] = product['currency_id'][0]
+
+        return super(PhysicalInventoryDiscrepancy, self).create(cr, user, vals, context)
+
+    def write(self, cr, uid, ids, vals, context=None):
+        context = context is None and {} or context
+
+        r = super(PhysicalInventoryDiscrepancy, self).write(cr, uid, ids, vals, context=context)
+        move_obj = self.pool.get("stock.move")
+
+        lines = self.read(cr, uid, ids, ["move_id", "comment"], context=context)
+
+        for line in lines:
+            if not line["move_id"]:
+                continue
+            reason_type_id = vals.get("reason_type_id", False)
+            comment = vals.get("comment", False)
+            to_update = {}
+            if reason_type_id:
+                to_update["reason_type_id"] = reason_type_id
+            if comment:
+                to_update["comment"] = comment
+            if to_update:
+                move_obj.write(cr, uid, [line["move_id"]], to_update, context=context)
+
+        return r
+
+
+    def perm_write(self, cr, user, ids, fields, context=None):
+        pass
+
+
+PhysicalInventoryDiscrepancy()

=== added file 'bin/addons/stock/physical_inventory_data.xml'
--- bin/addons/stock/physical_inventory_data.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/physical_inventory_data.xml	2017-11-24 09:38:22 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data noupdate="1">
+        <!-- Sequences for physical.inventory -->
+        <record id="seq_type_physical_inventory" model="ir.sequence.type">
+            <field name="name">Physical inventory</field>
+            <field name="code">physical.inventory</field>
+        </record>
+        <record id="seq_physical_inventory" model="ir.sequence">
+            <field name="name">Physical inventory</field>
+            <field name="code">physical.inventory</field>
+            <field name="prefix">%(y)s/%(hqcode)s/%(instance)s/PI</field>
+            <field name="padding">5</field>
+            <field name="implementation">psql</field>
+        </record>
+    </data>
+</openerp>
\ No newline at end of file

=== added file 'bin/addons/stock/physical_inventory_view.xml'
--- bin/addons/stock/physical_inventory_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/physical_inventory_view.xml	2017-11-24 09:38:22 +0000
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <!-- Formulary -->
+        <record id="view_physical_inventory_form" model="ir.ui.view">
+            <field name="name">physical.inventory.form</field>
+            <field name="model">physical.inventory</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Physical Inventory" hide_delete_button="1">
+                    <field name="name" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
+                    <field name="ref"/>
+                    <field name="location_id" domain="[('usage','=','internal')]"
+                           attrs="{'readonly': [('state', '!=', 'draft')]}"/>
+                    <field name="date" attrs="{'readonly': [('state', '!=', 'draft')]}"/>
+                    <field name="responsible"/>
+                    <field name="date_done"/>
+                    <field name="full_inventory"/>
+                    <button colspan="2" name="set_full_inventory" states="draft" string="Set as full inventory" type="object"
+                        icon="gtk-about" 
+                        confirm="Setting as 'full inventory' is irreversible. Do you confirm ?" 
+                        attrs="{'invisible': [('full_inventory', '=', True)]}"/>
+                    <notebook colspan="4">
+                        <page string="Products" attrs="{'readonly': [('state', 'not in', ['draft'])]}">
+                            <button name="action_select_products" states="draft" string="Products Selection" type="object"
+                                    icon="gtk-add"/>
+                                <field colspan="4" name="product_ids" nolabel="1" 
+                                       attrs="{'readonly': ['|', ('full_inventory', '=', True), ('state', 'not in', ['draft'])]}">
+                                <tree string="Products" noteditable="1">
+                                    <field name="default_code"/>
+                                    <field name="name"/>
+                                    <field name="uom_id"/>
+                                    <field name="batch_management" string="BN mandatory"/>
+                                    <field name="perishable" string="ED mandatory"/>
+                                    <field name="is_kc" string="KC"/>
+                                    <field name="is_dg" string="DG"/>
+                                    <field name="is_cs" string="CS"/>
+                                </tree>
+                            </field>
+                        </page>
+                        <page string="Counting sheet" attrs="{'invisible': [('state', 'in', ['draft'])], 'readonly': [('state', 'not in', ['counting', 'counted', 'validated'])]}">
+                            <group col="4" colspan="4"
+                                attrs="{'invisible': [('state', 'not in', ['counting', 'counted', 'validated'])]}">
+                                <button name="export_pdf_counting_sheet" string="Export pdf counting sheet"
+                                        type="object" colspan="2" icon="gtk-print"/>
+                                <button name="export_xls_counting_sheet" string="Export xls counting sheet"
+                                        type="object" colspan="2" icon="gtk-print"/>
+                                <field name="file_to_import" colspan="2"/>
+                                <button name="import_counting_sheet" string="Import xls counting sheet" type="object" colspan="2" icon="gtk-save"/>
+                            </group>
+                            <field colspan="4" name="counting_line_ids" nolabel="1" widget="one2many_list"
+                                attrs="{'readonly': [('state', 'not in', ['counting', 'counted', 'validated'])]}">
+                                <tree string="Counting lines" editable="bottom">
+                                    <field name="line_no"/>
+                                    <field name="product_id" on_change="on_change_product_id(product_id,product_uom)"/>
+                                    <field name="product_uom_id"/>
+                                    <field name="batch_number" attrs="{'readonly': [('is_bn', '=', False)],'required': [('is_bn', '=', True)] }"/>
+                                    <field name="expiry_date" attrs="{'readonly': [('is_ed', '=', False)],'required': [('is_ed', '=', True)] }"/>
+                                    <field name="quantity" on_change="on_change_quantity(quantity)"/>
+                                    <field name="is_bn" string="BN"/>
+                                    <field name="is_ed" string="ED"/>
+                                    <field name="is_kc" string="KC"/>
+                                    <field name="is_dg" string="DG"/>
+                                    <field name="is_cs" string="CS"/>
+                                </tree>
+                                <form string="Counting line">
+                                    <field name="line_no"/>
+                                    <field name="product_id" on_change="on_change_product_id(product_id,product_uom)"/>
+                                    <field name="product_uom_id"/>
+                                    <field name="batch_number" attrs="{'readonly': [('is_bn', '=', False)],'required': [('is_bn', '=', True)] }"/>
+                                    <field name="expiry_date" attrs="{'readonly': [('is_ed', '=', False)],'required': [('is_ed', '=', True)] }"/>
+                                    <field name="quantity" on_change="on_change_quantity(quantity)"/>
+                                    <field name="is_bn" string="BN"/>
+                                    <field name="is_ed" string="ED"/>
+                                    <field name="is_kc" string="KC"/>
+                                    <field name="is_dg" string="DG"/>
+                                    <field name="is_cs" string="CS"/>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Discrepancy report" attrs="{'invisible': [('state', 'in', ['draft','counting'])], 'readonly': [('state', 'not in', ['counted', 'validated', 'confirmed'])]}">
+                            <group col="4" colspan="4">
+                                <group col="4" colspan="4">
+                                    <label string="" />
+                                    <label string="Number of lines" />
+                                    <label string="Value" />
+                                    <label string="Absolute value" />
+                                </group>
+                                <group col="4" colspan="4">
+                                    <label string="Total at the end" />
+                                    <field name="inventory_lines_number" nolabel="1" />
+                                    <field name="inventory_lines_value" nolabel="1" />
+                                    <field name="inventory_lines_absvalue" nolabel="1" />
+                                </group>
+                                <group col="4" colspan="4">
+                                    <label string="With discrepancies" />
+                                    <field name="discrepancy_lines_number" nolabel="1" />
+                                    <field name="discrepancy_lines_value" nolabel="1" />
+                                    <field name="discrepancy_lines_absvalue" nolabel="1" />
+                                </group>
+                                <group col="4" colspan="4">
+                                    <label string="Percent" />
+                                    <field name="discrepancy_lines_percent" nolabel="1" />
+                                    <field name="discrepancy_lines_percent_value" nolabel="1" />
+                                    <field name="discrepancy_lines_percent_absvalue" nolabel="1" />
+                                </group>
+                            </group>
+                            <group col="4" colspan="4" attrs="{'invisible': [('state', 'not in', ['counted', 'validated'])]}">
+                                <button name="export_xls_discrepancy_report" string="Export XLS discrepancy report"
+                                    type="object" icon="gtk-print" colspan="4"/>
+                                <field name="file_to_import2" colspan="2"/>
+                                <button name="import_xls_discrepancy_report" string="Import XLS discrepancy report"
+                                    type="object" icon="gtk-save" colspan="2"/>
+                            </group>
+                            <field colspan="4" name="discrepancy_line_ids" nolabel="1" widget="one2many_list"
+                                   filter_selector="[('Hide ignored', ('ignored', '!=', True)), ('Show all', ''), ('Show ignored only', ('ignored', '=', True))]">
+                               <tree string="Discrepancies" editable="bottom" hide_delete_button="True" hide_new_button="True"
+                                     colors="grey:ignored==True">
+                                    <field name="line_no" />
+                                    <field name="nomen_manda_2" />
+                                    <field name="product_id" />
+                                    <field name="product_uom_id" />
+                                    <field name="standard_price" />
+                                    <field name="currency_id" />
+                                    <field name="theoretical_qty" />
+                                    <field name="counted_qty" readonly="1" />
+                                    <field name="batch_number" />
+                                    <field name="expiry_date" />
+                                    <field name="discrepancy_qty" />
+                                    <field name="discrepancy_value" />
+                                    <field name="total_product_theoretical_qty" />
+                                    <field name="total_product_counted_qty" />
+                                    <field name="total_product_counted_value" />
+                                    <field name="total_product_discrepancy_qty" />
+                                    <field name="total_product_discrepancy_value" />
+                                    <field name="reason_type_id" widget="selection" domain="[('is_inventory', '=', True)]" />
+                                    <field name="comment" />
+                                    <field name="ignored" invisible="True"/>
+                                </tree>
+                                <form string="Discrepancy line">
+                                    <field name="line_no" />
+                                    <field name="nomen_manda_2" />
+                                    <field name="product_id" />
+                                    <field name="product_uom_id" />
+                                    <field name="standard_price" />
+                                    <field name="currency_id" />
+                                    <field name="theoretical_qty" />
+                                    <field name="counted_qty" readonly="1" />
+                                    <field name="batch_number" />
+                                    <field name="expiry_date" />
+                                    <field name="discrepancy_qty" />
+                                    <field name="discrepancy_value" />
+                                    <field name="total_product_theoretical_qty" />
+                                    <field name="total_product_counted_qty" />
+                                    <field name="total_product_counted_value" />
+                                    <field name="total_product_discrepancy_qty" />
+                                    <field name="total_product_discrepancy_value" />
+                                    <field name="reason_type_id" widget="selection" domain="[('is_inventory', '=', True)]" />
+                                    <field name="comment" />
+                                    <field name="ignored" invisible="True"/>
+                                </form>
+                            </field>
+                        </page>
+                        <page string="Posted Inventory" attrs="{'invisible': [('state', 'not in', ['confirmed', 'closed'])]}">
+                            <field colspan="2" name="move_ids" nolabel="1" widget="one2many_list"
+                                   context="{'inventory_id':active_id}">
+                                <tree string="Stock Moves">
+                                    <field name="product_id"/>
+                                    <field name="product_qty"
+                                           on_change="onchange_quantity(product_id, product_qty, product_uom, product_uos)"/>
+                                    <field name="product_uom" string="UoM"/>
+                                    <field name="prodlot_id"/>
+                                    <field name="reason_type_id" widget="selection"
+                                           domain="[('is_inventory', '=', True)]"/>
+                                    <field name="tracking_id"/>
+                                    <field name="location_id"/>
+                                    <field name="location_dest_id"/>
+                                    <field name="date" string="Date"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                    <group col="2" colspan="2">
+                        <field name="state"/>
+                    </group>
+                    <group colspan="2">
+                        <button name="action_cancel_inventary" states="draft,counting,counted,validated" string="Cancel Inventory"
+                                type="object" icon="gtk-cancel" confirm="Do you confirm that you want to cancel the inventory ?"/>
+
+                        <button name="generate_counting_sheet" states="draft" string="Generate Counting Sheet"
+                                type="object" icon="gtk-go-forward"/>
+
+                        <button name="action_counted" states="counting" string="Finish Counting"
+                                type="object" icon="gtk-paste-v"/>
+
+                        <button name="generate_discrepancies" states="counted,validated" string="Generate discrepancies"
+                                type="object" icon="gtk-refresh"/>
+
+                        <button name="action_validate" states="counted" string="Finished"
+                                type="object" icon="gtk-apply" confirm="Do you confirm that you have finished the inventory ?"/>
+
+                        <button name="action_recount" states="validated" string="Recount"
+                                type="object" icon="gtk-undo"/>
+                        <button name="action_confirm" states="validated" string="Confirm Inventory"
+                                type="object" icon="gtk-jump-to" confirm="Do you confirm that you want confirm the inventory ?"/>
+
+                        <button name="action_done" states="confirmed" string="Close Inventory"
+                                type="object" icon="gtk-jump-to" confirm="Do you confirm that you want to close the inventory ?"/>
+
+                        <button name="action_cancel_draft" states="cancel" string="Set to Draft"
+                                type="object" icon="gtk-convert"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+        <!-- List -->
+        <record id="view_physical_inventory_tree" model="ir.ui.view">
+            <field name="name">physical.inventory.tree</field>
+            <field name="model">physical.inventory</field>
+            <field name="type">tree</field>
+            <field name="arch" type="xml">
+                <tree string="Physical Inventories" colors="grey:state in ('cancel')">
+                    <field name="ref"/>
+                    <field name="name"/>
+                    <field name="location_id"/>
+                    <field name="date"/>
+                    <field name="state"/>
+                </tree>
+            </field>
+        </record>
+        <!-- Search -->
+        <record id="view_physical_inventory_search" model="ir.ui.view">
+            <field name="name">physical.inventory.search</field>
+            <field name="model">physical.inventory</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <search string="Search Physical Inventory">
+                    <group col="10" colspan="4">
+                        <field name="name"/>
+                        <field name="date"/>
+                        <field name="location_id" domain="[('usage','=','internal')]"/>
+                        <field name="company_id" groups="base.group_multi_company" widget="selection"/>
+                    </group>
+                    <newline/>
+                    <group expand="0" string="Group By..." colspan="4" col="4" groups="base.group_extended">
+                        <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]"
+                                context="{'group_by':'state'}"/>
+                        <filter string="Date" icon="terp-go-month" domain="[]" context="{'group_by':'date'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+        <!-- Action -->
+        <record id="action_physical_inventory" model="ir.actions.act_window">
+            <field name="name">Physical Inventories</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">physical.inventory</field>
+            <field name="view_type">form</field>
+            <field name="view_id" ref="view_physical_inventory_tree"/>
+            <field name="context">{'full':'1'}</field>
+            <field name="search_view_id" ref="view_physical_inventory_search" />
+            <field name="help">Periodical Inventories are used to count the number of products available per location. You can use it once a year when you do the general inventory or whenever you need it, to correct the current stock level of a product.</field>
+        </record>
+        <!-- Menu -->
+        <menuitem action="action_physical_inventory" id="menu_action_physical_inventory" parent="menu_stock_inventory_control" sequence="23"/>
+    </data>
+</openerp>

=== modified file 'bin/addons/stock/report/__init__.py'
--- bin/addons/stock/report/__init__.py	2011-01-14 00:11:01 +0000
+++ bin/addons/stock/report/__init__.py	2017-11-24 09:38:22 +0000
@@ -27,4 +27,5 @@
 import report_stock_move
 import stock_inventory_move_report
 import lot_overview
-
+import physical_inventory_counting_sheet
+import physical_inventory_discrepancies_report

=== added file 'bin/addons/stock/report/physical_inventory_counting_sheet.py'
--- bin/addons/stock/report/physical_inventory_counting_sheet.py	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/report/physical_inventory_counting_sheet.py	2017-11-24 09:38:22 +0000
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+from report import report_sxw
+from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetReport
+
+
+class CountingSheetParser(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(CountingSheetParser, self).__init__(cr, uid, name, context=context)
+        self.counter = 0
+        self.localcontext.update({
+            'get_headers': self.get_headers,
+            'next_counter': self.get_next_counter,
+            'reset_counter': self.reset_counter,
+            'display_product_attributes': self.display_product_attributes,
+            'yesno': self.yesno,
+            'to_excel': self.to_excel,
+        })
+
+    @staticmethod
+    def to_excel(value):
+        if isinstance(value, report_sxw._dttime_format):
+            return value.format().replace(' ', 'T')
+        return value
+
+    @staticmethod
+    def display_product_attributes(item):
+        attributes = {'is_kc': 'KC', 'is_dg': 'DG', 'is_cs': 'CS'}
+        return ','.join([name for attribute, name in attributes.items() if getattr(item, attribute, False)])
+
+    @staticmethod
+    def yesno(value):
+        return 'Y' if value else 'N'
+
+    def get_next_counter(self):
+        self.counter += 1
+        return self.counter
+
+    def reset_counter(self):
+        self.counter = 0
+
+    def get_headers(self, objects):
+        #   return list of cols:
+            # Header Name
+            # col type (string, date, datetime, bool, number, float, int)
+            # method to compute the value, Parameters: record, index, objects
+        return [
+            # ['Line Number', 'int', lambda r, index, *a: index+1],
+            # ['Name', 'string', lambda r, *a: r.name or ''],
+            # ['Stock Valuation', 'float', self.compute_stock_value],
+        ]
+
+SpreadsheetReport('report.physical_inventory_counting_sheet_xls', 'physical.inventory', 'addons/stock/report/physical_inventory_counting_sheet.xml', parser=CountingSheetParser)
+
+report_sxw.report_sxw(
+    'report.physical_inventory_counting_sheet_pdf',
+    'physical.inventory',
+    'addons/stock/report/physical_inventory_counting_sheet.rml',
+    parser=CountingSheetParser,
+    header='internal'
+)
\ No newline at end of file

=== added file 'bin/addons/stock/report/physical_inventory_counting_sheet.rml'
--- bin/addons/stock/report/physical_inventory_counting_sheet.rml	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/report/physical_inventory_counting_sheet.rml	2017-11-24 09:38:22 +0000
@@ -0,0 +1,199 @@
+<?xml version="1.0"?>
+<document filename="counting_sheet.pdf">
+  <template pageSize="(29.7cm,21.0cm)" title="Stock Inventory" author="" allowSplitting="20" showBoundary="0">
+    <pageTemplate id="first">
+      <frame id="first" x1="0" y1="0" width="29.7cm" height="21.0cm"/>
+    </pageTemplate>
+  </template>
+  <stylesheet>
+    <blockTableStyle id="TableTitle">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+    <blockTableStyle id="TableHeader">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+    </blockTableStyle>
+     <blockTableStyle id="TableItem">
+      <blockAlignment value="LEFT"/>
+      <blockValign value="TOP"/>
+      <lineStyle kind="LINEBELOW" colorName="#000000" start="0,-1" stop="9,-1"/>
+    </blockTableStyle>
+    <initialize>
+      <paraStyle name="all" alignment="justify"/>
+    </initialize>
+    <paraStyle name="default" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="0.0" spaceAfter="0.0"/>" fontName="Helvetica" fontSize="12.0" leading="15" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="title" fontName="Helvetica-Bold" fontSize="12.0" leading="15" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="table_header_label" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>    <paraStyle name="tbl_header_left" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="table_header_value" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>    <paraStyle name="tbl_header_left" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="LEFT" spaceBefore="6.0" spaceAfter="6.0"/>
+    <paraStyle name="table_item_header" fontName="Helvetica-Bold" fontSize="8.0" leading="10" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+    <paraStyle name="table_item_data" rightIndent="0.0" leftIndent="0.0" fontName="Helvetica" fontSize="9.0" leading="11" alignment="CENTER" spaceBefore="0.0" spaceAfter="0.0"/>
+  </stylesheet>
+  <story>
+  <pto>
+  <pto_header>
+    <blockTable colWidths="1.5cm,2.0cm,7.5cm,2.0cm,2.0cm,2.0cm,2.0cm,2.5cm,2.0cm,2.0cm" style="TableItem">
+      <tr>
+        <td>
+          <para style="table_item_header">Line #</para>
+        </td>
+        <td>
+          <para style="table_item_header">Item code</para>
+        </td>
+        <td>
+          <para style="table_item_header">Description</para>
+        </td>
+        <td>
+          <para style="table_item_header">UoM</para>
+        </td>
+        <td>
+          <para style="table_item_header">Quantity counted</para>
+        </td>
+        <td>
+          <para style="table_item_header">Batch number</para>
+        </td>
+        <td>
+          <para style="table_item_header">Expiry date</para>
+        </td>
+        <td>
+          <para style="table_item_header">Specification</para>
+        </td>
+        <td>
+          <para style="table_item_header">BN managment</para>
+        </td>
+        <td>
+          <para style="table_item_header">ED managment</para>
+        </td>
+      </tr>
+    </blockTable>
+  </pto_header>
+    <para style="default">[[ repeatIn(objects,'o') ]] </para>
+    <blockTable colWidths="26.4cm" style="TableTitle">
+      <tr>
+        <td>
+          <para style="title">INVENTORY COUNTING SHEET</para>
+        </td>
+      </tr>
+    </blockTable>
+    <blockTable colWidths="7.0cm,7.0cm,7.0cm,7.0cm" style="TableHeader">
+      <tr>
+        <td>
+          <para style="table_header_label">Inventory counter name</para>
+        </td>
+        <td>
+          <para style="table_header_value">[[ o.responsible ]]</para>
+        </td>
+        <td>
+          <para style="table_header_label">Inventory date</para>
+        </td>
+        <td>
+          <para style="table_header_value">[[ formatLang(o.date,date_time=True) ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="table_header_label">Inventory reference</para>
+        </td>
+        <td>
+          <para style="table_header_value">[[ o.ref ]]</para>
+        </td>
+        <td>
+          <para style="table_header_label">Location</para>
+        </td>
+        <td>
+          <para style="table_header_value">[[ o.location_id.name ]]</para>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <para style="table_header_label">Inventory name</para>
+        </td>
+        <td>
+          <para style="table_header_value">[[ o.name ]]</para>
+        </td>
+        <td>
+        </td>
+        <td>
+        </td>
+      </tr>
+    </blockTable>
+    <para style="default">
+      <font color="white"> </font>
+    </para>
+    <blockTable colWidths="1.5cm,2.0cm,7.5cm,2.0cm,2.0cm,2.0cm,2.0cm,2.5cm,2.0cm,2.0cm" style="TableItem">
+      <tr>
+        <td>
+          <para style="table_item_header">Line #</para>
+        </td>
+        <td>
+          <para style="table_item_header">Item code</para>
+        </td>
+        <td>
+          <para style="table_item_header">Description</para>
+        </td>
+        <td>
+          <para style="table_item_header">UoM</para>
+        </td>
+        <td>
+          <para style="table_item_header">Quantity counted</para>
+        </td>
+        <td>
+          <para style="table_item_header">Batch number</para>
+        </td>
+        <td>
+          <para style="table_item_header">Expiry date</para>
+        </td>
+        <td>
+          <para style="table_item_header">Specification</para>
+        </td>
+        <td>
+          <para style="table_item_header">BN managment</para>
+        </td>
+        <td>
+          <para style="table_item_header">ED managment</para>
+        </td>
+      </tr>
+    </blockTable>
+    <section>
+      <para style="default">[[ repeatIn(o.counting_line_ids, 'p') ]]</para>
+      <blockTable colWidths="1.5cm,2.0cm,7.5cm,2.0cm,2.0cm,2.0cm,2.0cm,2.5cm,2.0cm,2.0cm" style="TableItem">
+        <tr>
+          <td>
+            <para style="table_item_data">[[ p.line_no ]]</para>
+          </td>
+          <td>
+            <para style="table_item_data">[[ p.product_id and p.product_id.code or '' ]]</para>
+          </td>
+          <td>
+            <para style="table_item_data">[[ p.product_id and p.product_id.name or '' ]]</para>
+          </td>
+          <td>
+            <para style="table_item_data">[[ p.product_uom_id and p.product_uom_id.name or '' ]]</para>
+          </td>
+          <td>
+            <para style="table_item_data">[[ p.quantity or '' ]]</para>
+          </td>
+          <td>
+            <para style="table_item_data">[[ p.batch_number or '' ]]</para>
+          </td>
+          <td>
+            <para style="table_item_data">[[ formatLang(p.expiry_date, date=True)  or '' ]]</para>
+          </td>
+          <td>
+            <para style="table_item_data">[[ display_product_attributes(p) ]]</para>
+          </td>
+          <td>
+            <para style="table_item_data">[[ yesno(p.is_bn) ]]</para>
+          </td>
+          <td>
+            <para style="table_item_data">[[ yesno(p.is_ed) ]]</para>
+          </td>
+        </tr>
+      </blockTable>
+    </section>
+    <para style="default">
+      <font color="white"> </font>
+    </para>
+  </pto>
+  </story>
+</document>
\ No newline at end of file

=== added file 'bin/addons/stock/report/physical_inventory_counting_sheet.xml'
--- bin/addons/stock/report/physical_inventory_counting_sheet.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/report/physical_inventory_counting_sheet.xml	2017-11-24 09:38:22 +0000
@@ -0,0 +1,530 @@
+<?xml version="1.0"?>
+<?mso-application progid="Excel.Sheet"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:x="urn:schemas-microsoft-com:office:excel"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:html="http://www.w3.org/TR/REC-html40">
+ <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+  <Author>Jean-Marc GUYON</Author>
+  <LastAuthor>Utilisateur Windows</LastAuthor>
+  <LastPrinted>2014-10-20T14:28:22Z</LastPrinted>
+  <Created>2014-06-02T15:56:39Z</Created>
+  <LastSaved>2017-09-27T08:25:31Z</LastSaved>
+  <Company>Microsoft</Company>
+  <Version>16.00</Version>
+ </DocumentProperties>
+ <OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
+  <AllowPNG/>
+ </OfficeDocumentSettings>
+ <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+  <WindowHeight>9660</WindowHeight>
+  <WindowWidth>17370</WindowWidth>
+  <WindowTopX>480</WindowTopX>
+  <WindowTopY>195</WindowTopY>
+  <TabRatio>147</TabRatio>
+  <ProtectStructure>False</ProtectStructure>
+  <ProtectWindows>False</ProtectWindows>
+ </ExcelWorkbook>
+ <Styles>
+  <Style ss:ID="Default" ss:Name="Normal">
+   <Alignment ss:Vertical="Bottom"/>
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection/>
+  </Style>
+  <Style ss:ID="m2667643071524">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="m2667643071544">
+   <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+   <Borders>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="m2667643071564">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <NumberFormat ss:Format="Short Date"/>
+  </Style>
+  <Style ss:ID="s16">
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s17">
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s18">
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s19">
+   <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s20">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s21">
+   <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s22">
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s23">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"
+    ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s24">
+   <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+   <Borders>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s25">
+   <Borders/>
+  </Style>
+  <Style ss:ID="s34">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s35">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s36">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s37">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s38">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s39">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s40">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#D9D9D9" ss:Pattern="Solid"/>
+  </Style>
+    <Style ss:ID="s41">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#D9D9D9" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s51">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+   <Borders>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="24" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s106">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Center"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <Interior/>
+  </Style>
+  <Style ss:ID="s107">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <Interior/>
+  </Style>
+  <Style ss:ID="s108">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s109">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s209">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s110">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <Interior/>
+  </Style>
+  <Style ss:ID="s111">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s112">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s113">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s114">
+   <Alignment ss:Vertical="Center"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s115">
+   <Alignment ss:Vertical="Center"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="short_date">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <NumberFormat ss:Format="Short Date"/>
+  </Style>
+ </Styles>
+ <Worksheet ss:Name="stock">
+  <Names>
+   <NamedRange ss:Name="_FilterDatabase" ss:RefersTo="=stock!R9C2:R17C5"
+    ss:Hidden="1"/>
+   <NamedRange ss:Name="Print_Titles" ss:RefersTo="=stock!R1:R9"/>
+   <NamedRange ss:Name="Print_Area" ss:RefersTo="=stock!C2:C5"/>
+  </Names>
+  <Table x:FullColumns="1"
+   x:FullRows="1" ss:DefaultColumnWidth="60.75" ss:DefaultRowHeight="15">
+   <Column ss:AutoFitWidth="0" ss:Width="75"/>
+   <Column ss:AutoFitWidth="0" ss:Width="87.75"/>
+   <Column ss:AutoFitWidth="0" ss:Width="210.75"/>
+   <Column ss:AutoFitWidth="0" ss:Width="63"/>
+   <Column ss:AutoFitWidth="0" ss:Width="69.75"/>
+   <Column ss:AutoFitWidth="0" ss:Width="66"/>
+   <Column ss:AutoFitWidth="0" ss:Width="82.5" ss:Span="1"/>
+   <Column ss:Index="9" ss:AutoFitWidth="0" ss:Width="75.75"/>
+   <Column ss:Index="10" ss:AutoFitWidth="0" ss:Width="75.75"/>
+   <Row ss:Height="31.5">
+    <Cell ss:Index="2" ss:MergeAcross="6" ss:StyleID="s51"><Data ss:Type="String">INVENTORY COUNTING SHEET</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="18.75" ss:StyleID="s16">
+    <Cell ss:Index="2" ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell ss:Index="2" ss:StyleID="s19"><Data ss:Type="String">Inventory counter Name</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s20"><Data ss:Type="String">${objects[0].responsible or ''}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><Data ss:Type="String">Inventory date</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:MergeAcross="1" ss:StyleID="m2667643071564"><NamedCell
+      ss:Name="Print_Titles"/><Data ss:Type="DateTime">${ to_excel(objects[0].date) }</Data></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="8.25">
+    <Cell ss:Index="2" ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s21"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s21"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/></Cell>
+   </Row>
+   <Row ss:Height="15.75">
+    <Cell ss:MergeAcross="1" ss:StyleID="m2667643071544"><Data ss:Type="String">Inventory reference</Data><NamedCell
+      ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s20"><Data ss:Type="String">${objects[0].ref}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s22"><Data ss:Type="String">Location</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:MergeAcross="1" ss:StyleID="m2667643071524"><Data ss:Type="String">${objects[0].location_id and objects[0].location_id.name or ''}</Data><NamedCell
+      ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="9">
+    <Cell ss:Index="2" ss:StyleID="s22"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/></Cell>
+   </Row>
+   <Row ss:Height="15.75">
+    <Cell ss:Index="2" ss:StyleID="s24"><Data ss:Type="String">Inventory name </Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s20"><Data ss:Type="String">${objects[0].name or ''}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s25"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s25"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s25"><NamedCell ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s25"><NamedCell ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s25"><NamedCell ss:Name="Print_Titles"/></Cell>
+   </Row>
+   <Row ss:Height="15.75">
+    <Cell ss:Index="2" ss:StyleID="s22"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="31.875" ss:StyleID="s23">
+    <Cell ss:StyleID="s34"><Data ss:Type="String">Line #</Data><NamedCell
+      ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s35"><Data ss:Type="String">Item  code</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="_FilterDatabase"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s35"><Data ss:Type="String">Description</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="_FilterDatabase"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s36"><Data ss:Type="String">UoM</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="_FilterDatabase"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s37"><Data ss:Type="String">Quantity counted</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="_FilterDatabase"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s38"><Data ss:Type="String">Batch number</Data><NamedCell
+      ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s39"><Data ss:Type="String">Expiry date</Data><NamedCell
+      ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s39"><Data ss:Type="String">Specification</Data><NamedCell
+      ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s40"><Data ss:Type="String">BN Management</Data><NamedCell
+      ss:Name="Print_Titles"/></Cell>
+    <Cell ss:StyleID="s41"><Data ss:Type="String">ED Management</Data><NamedCell
+      ss:Name="Print_Titles"/></Cell>
+   </Row>
+% for index,item in enumerate(objects[0].counting_line_ids):
+   <Row ss:AutoFitHeight="0" ss:Height="15.75">
+    <Cell ss:StyleID="s107"><Data ss:Type="Number">${item.line_no}</Data></Cell>
+    <Cell ss:StyleID="s106"><Data ss:Type="String">${item.product_id and item.product_id.code or ''}</Data><NamedCell
+      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s106"><Data ss:Type="String">${item.product_id and item.product_id.name or ''}</Data><NamedCell
+      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s107"><Data ss:Type="String">${item.product_uom_id and item.product_uom_id.name or ''}</Data><NamedCell
+      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s108"><Data ss:Type="String">${item.quantity or ''}</Data><NamedCell
+      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s108"><Data ss:Type="String">${item.batch_number or ''}</Data></Cell>
+    % if isDate(item.expiry_date):
+    <Cell ss:StyleID="short_date"><Data ss:Type="DateTime">${item.expiry_date|n}T00:00:00.000</Data></Cell>
+    % else:
+    <Cell ss:StyleID="s108"><Data ss:Type="String"></Data></Cell>
+    % endif
+    <Cell ss:StyleID="s108"><Data ss:Type="String">${display_product_attributes(item)}</Data></Cell>
+    <Cell ss:StyleID="s109"><Data ss:Type="String">${yesno(item.is_bn)}</Data></Cell>
+    <Cell ss:StyleID="s209"><Data ss:Type="String">${yesno(item.is_ed)}</Data></Cell>
+   </Row>
+% endfor
+   </Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <PageSetup>
+    <Header x:Margin="0.31496062992125984"/>
+    <Footer x:Margin="0.31496062992125984" x:Data="Page &amp;P de &amp;N"/>
+    <PageMargins x:Bottom="0.74803149606299213" x:Left="0.23622047244094491"
+     x:Right="0.23622047244094491" x:Top="0.74803149606299213"/>
+   </PageSetup>
+   <FitToPage/>
+   <Print>
+    <FitHeight>0</FitHeight>
+    <ValidPrinterInfo/>
+    <PaperSizeIndex>9</PaperSizeIndex>
+    <Scale>99</Scale>
+    <HorizontalResolution>1200</HorizontalResolution>
+    <VerticalResolution>1200</VerticalResolution>
+   </Print>
+   <Zoom>75</Zoom>
+   <Selected/>
+   <DoNotDisplayGridlines/>
+   <SplitHorizontal>9</SplitHorizontal>
+   <TopRowBottomPane>9</TopRowBottomPane>
+   <ActivePane>2</ActivePane>
+   <Panes>
+    <Pane>
+     <Number>3</Number>
+    </Pane>
+    <Pane>
+     <Number>2</Number>
+     <ActiveRow>8</ActiveRow>
+    </Pane>
+   </Panes>
+   <ProtectObjects>False</ProtectObjects>
+   <ProtectScenarios>False</ProtectScenarios>
+  </WorksheetOptions>
+ </Worksheet>
+</Workbook>

=== added file 'bin/addons/stock/report/physical_inventory_discrepancies_report.py'
--- bin/addons/stock/report/physical_inventory_discrepancies_report.py	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/report/physical_inventory_discrepancies_report.py	2017-11-24 09:38:22 +0000
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+from report import report_sxw
+from spreadsheet_xml.spreadsheet_xml_write import SpreadsheetReport
+
+
+class DiscrepanciesReportParser(report_sxw.rml_parse):
+
+    def __init__(self, cr, uid, name, context):
+        super(DiscrepanciesReportParser, self).__init__(cr, uid, name, context=context)
+        self.counter = 0
+        self.localcontext.update({
+            'get_headers': self.get_headers,
+            'next_counter': self.get_next_counter,
+            'reset_counter': self.reset_counter,
+            'to_excel': self.to_excel,
+        })
+
+    @staticmethod
+    def to_excel(value):
+        if isinstance(value, report_sxw._dttime_format):
+            return value.format().replace(' ', 'T')
+        return value
+
+    def get_next_counter(self):
+        self.counter += 1
+        return self.counter
+
+    def reset_counter(self):
+        self.counter = 0
+
+    def get_headers(self, objects):
+        #   return list of cols:
+            # Header Name
+            # col type (string, date, datetime, bool, number, float, int)
+            # method to compute the value, Parameters: record, index, objects
+        return [
+            # ['Line Number', 'int', lambda r, index, *a: index+1],
+            # ['Name', 'string', lambda r, *a: r.name or ''],
+            # ['Stock Valuation', 'float', self.compute_stock_value],
+        ]
+
+SpreadsheetReport('report.physical_inventory_discrepancies_report_xls', 'physical.inventory', 'addons/stock/report/physical_inventory_discrepancies_report.xml', parser=DiscrepanciesReportParser)

=== added file 'bin/addons/stock/report/physical_inventory_discrepancies_report.xml'
--- bin/addons/stock/report/physical_inventory_discrepancies_report.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/report/physical_inventory_discrepancies_report.xml	2017-11-24 09:38:22 +0000
@@ -0,0 +1,882 @@
+<?xml version="1.0"?>
+<?mso-application progid="Excel.Sheet"?>
+<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:o="urn:schemas-microsoft-com:office:office"
+ xmlns:x="urn:schemas-microsoft-com:office:excel"
+ xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
+ xmlns:html="http://www.w3.org/TR/REC-html40">
+ <DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
+  <Author>Jean-Marc GUYON</Author>
+  <LastAuthor>Utilisateur Windows</LastAuthor>
+  <LastPrinted>2017-11-07T15:35:42Z</LastPrinted>
+  <Created>2014-06-02T15:56:39Z</Created>
+  <LastSaved>2017-11-07T15:59:50Z</LastSaved>
+  <Company>Microsoft</Company>
+  <Version>16.00</Version>
+ </DocumentProperties>
+ <OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
+  <AllowPNG/>
+ </OfficeDocumentSettings>
+ <ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
+  <WindowHeight>9660</WindowHeight>
+  <WindowWidth>17370</WindowWidth>
+  <WindowTopX>480</WindowTopX>
+  <WindowTopY>195</WindowTopY>
+  <TabRatio>319</TabRatio>
+  <ProtectStructure>False</ProtectStructure>
+  <ProtectWindows>False</ProtectWindows>
+ </ExcelWorkbook>
+ <Styles>
+  <Style ss:ID="Default" ss:Name="Normal">
+   <Alignment ss:Vertical="Bottom"/>
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+   <Interior/>
+   <NumberFormat/>
+   <Protection/>
+  </Style>
+  <Style ss:ID="s16" ss:Name="Pourcentage">
+   <NumberFormat ss:Format="0%"/>
+  </Style>
+  <Style ss:ID="s17">
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s18">
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s19">
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s20">
+   <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s21">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+   <Interior/>
+   <NumberFormat ss:Format="Short Date"/>
+  </Style>
+  <Style ss:ID="s22">
+   <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s23">
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s24">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"
+    ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s25">
+   <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s26">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s27">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s28">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s29">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s30">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s31">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s32">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s33">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s34">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s35">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s36">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s37">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s38">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s39">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s40">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s41">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s42">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s43">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s44">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s45">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s46">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s47">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center" ss:WrapText="1"/>
+   <Borders>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s48">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s49">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s50">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s51">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Center"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s56">
+   <Borders/>
+  </Style>
+  <Style ss:ID="s57">
+   <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s58">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s59">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s60" ss:Parent="s16">
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s61">
+   <Borders>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s62">
+   <Borders>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s63">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s64">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s65">
+   <Alignment ss:Horizontal="Right" ss:Vertical="Bottom"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s66">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s67" ss:Parent="s16">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s68">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+  </Style>
+  <Style ss:ID="s69">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="24" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s70">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Center"/>
+   <Borders/>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="24" ss:Color="#000000"
+    ss:Bold="1"/>
+   <Interior ss:Color="#DCDEE2" ss:Pattern="Solid"/>
+  </Style>
+  <Style ss:ID="s71">
+   <Alignment ss:Horizontal="Left" ss:Vertical="Bottom"/>
+  </Style>
+  <Style ss:ID="s72">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"/>
+  </Style>
+  <Style ss:ID="s73">
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="2"/>
+   </Borders>
+   <NumberFormat ss:Format="Short Date"/>
+  </Style>
+  <Style ss:ID="s78">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+  </Style>
+  <Style ss:ID="s80">
+   <Alignment ss:Horizontal="Center" ss:Vertical="Bottom"/>
+   <Borders>
+    <Border ss:Position="Bottom" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Left" ss:LineStyle="Continuous" ss:Weight="2"/>
+    <Border ss:Position="Right" ss:LineStyle="Continuous" ss:Weight="1"/>
+    <Border ss:Position="Top" ss:LineStyle="Continuous" ss:Weight="1"/>
+   </Borders>
+   <Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="9" ss:Color="#000000"
+    ss:Bold="1"/>
+  </Style>
+ </Styles>
+ <Worksheet ss:Name="stock">
+  <Names>
+   <NamedRange ss:Name="_FilterDatabase" ss:RefersTo="=stock!R10C2:R10C9"
+    ss:Hidden="1"/>
+   <NamedRange ss:Name="Print_Titles" ss:RefersTo="=stock!R1:R10"/>
+   <NamedRange ss:Name="Print_Area" ss:RefersTo="=stock!R1C1:R11C20"/>
+  </Names>
+  <Table x:FullColumns="1"
+   x:FullRows="1" ss:DefaultColumnWidth="60.75" ss:DefaultRowHeight="15">
+   <Column ss:Index="2" ss:AutoFitWidth="0" ss:Width="54"/>
+   <Column ss:AutoFitWidth="0" ss:Width="69"/>
+   <Column ss:AutoFitWidth="0" ss:Width="210.75"/>
+   <Column ss:AutoFitWidth="0" ss:Width="63" ss:Span="3"/>
+   <Column ss:Index="9" ss:AutoFitWidth="0" ss:Width="60" ss:Span="6"/>
+   <Column ss:Index="16" ss:Width="67.5"/>
+   <Column ss:AutoFitWidth="0" ss:Width="78" ss:Span="2"/>
+   <Column ss:Index="20" ss:AutoFitWidth="0" ss:Width="273"/>
+   <Row ss:Height="31.5" ss:StyleID="s71">
+    <Cell ss:StyleID="s70"><Data ss:Type="String">INVENTORY REPORT</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s69"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="18.75" ss:StyleID="s17">
+    <Cell ss:Index="2" ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0">
+    <Cell ss:Index="2" ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s20"><Data ss:Type="String">Inventory Name </Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s72"><Data ss:Type="String">${ objects[0].name or '' }</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:Index="8" ss:StyleID="s20"><Data ss:Type="String">Inventory date</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s73"><NamedCell ss:Name="Print_Titles"/><Data ss:Type="DateTime">${ to_excel(objects[0].date) }</Data><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:Index="17" ss:StyleID="s20"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s20"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s20"><Data ss:Type="String">Location</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s21"><Data ss:Type="String">${ objects[0].location_id and objects[0].location_id.name or '' }</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="8.25">
+    <Cell ss:Index="2" ss:StyleID="s23"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s22"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s22"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s22"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s22"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s22"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+   </Row>
+   <Row>
+    <Cell ss:Index="5" ss:StyleID="s20"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s20"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s20"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s20"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:Index="16" ss:StyleID="s61"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s62"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s63"><Data ss:Type="String">Number of line</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s63"><Data ss:Type="String">Value (CHF)</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s64"><Data ss:Type="String">Total Absolute value</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+   </Row>
+   <Row ss:Height="15.75">
+    <Cell ss:Index="2" ss:StyleID="s23"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s23"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s20"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s20"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s20"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s20"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s20"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:Index="16" ss:MergeAcross="1" ss:StyleID="s78"><Data ss:Type="String">Total at the end</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s58"><NamedCell ss:Name="Print_Titles"/><Data ss:Type="String">${objects[0].inventory_lines_number}</Data><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s57"><NamedCell ss:Name="Print_Titles"/><Data ss:Type="String">${objects[0].inventory_lines_value}</Data><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s65"><NamedCell ss:Name="Print_Titles"/><Data ss:Type="String">${objects[0].inventory_lines_absvalue}</Data><NamedCell
+      ss:Name="Print_Area"/></Cell>
+   </Row>
+   <Row ss:Height="15.75">
+    <Cell ss:Index="3" ss:StyleID="s20"><Data ss:Type="String">Inventory resp Name</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s72"><Data ss:Type="String">${ objects[0].responsible or '' }</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:Index="8" ss:StyleID="s25"><Data ss:Type="String">Signature of responsible </Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s59"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s59"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s59"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s59"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s59"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s56"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s18"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:MergeAcross="1" ss:StyleID="s78"><Data ss:Type="String">With discrepencies</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s58"><Data ss:Type="String">${objects[0].discrepancy_lines_number}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s58"><Data ss:Type="String">${objects[0].discrepancy_lines_value}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s66"><Data ss:Type="String">${objects[0].discrepancy_lines_absvalue}</Data><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+   </Row>
+   <Row ss:Height="15.75">
+    <Cell ss:Index="2" ss:StyleID="s23"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s23"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:MergeAcross="1" ss:StyleID="s80"><Data ss:Type="String">%</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s67"><Data ss:Type="String">${objects[0].discrepancy_lines_percent}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s67"><Data ss:Type="String">${objects[0].discrepancy_lines_percent_value}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s68"><Data ss:Type="String">${objects[0].discrepancy_lines_percent_absvalue}</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+   </Row>
+   <Row ss:Height="15.75">
+    <Cell ss:Index="2" ss:StyleID="s23"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s23"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s19"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s20"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s60"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s60"><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s56"><NamedCell ss:Name="Print_Titles"/></Cell>
+   </Row>
+   <Row ss:AutoFitHeight="0" ss:Height="46.5" ss:StyleID="s24">
+    <Cell ss:StyleID="s26"><Data ss:Type="String">Line #</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s26"><Data ss:Type="String">Family</Data><NamedCell
+      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s27"><Data ss:Type="String">Item  code</Data><NamedCell
+      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s27"><Data ss:Type="String">Description</Data><NamedCell
+      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s37"><Data ss:Type="String">UoM</Data><NamedCell
+      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String">Unit price</Data><NamedCell
+      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s26"><Data ss:Type="String">currency (functional)</Data><NamedCell
+      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s26"><Data ss:Type="String">Quantity Theorical</Data><NamedCell
+      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s29"><Data ss:Type="String">Quantity counted</Data><NamedCell
+      ss:Name="_FilterDatabase"/><NamedCell ss:Name="Print_Titles"/><NamedCell
+      ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s47"><Data ss:Type="String">Batch no</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s28"><Data ss:Type="String">Expiry date</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s41"><Data ss:Type="String">Discrepancy</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s41"><Data ss:Type="String">Discrepancy value</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s41"><Data ss:Type="String">Total QTY  before INV</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s28"><Data ss:Type="String">Total QTY  after  INV</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s28"><Data ss:Type="String">Total Value after INV</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s28"><Data ss:Type="String">Discrepancy</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String">Discrepancy Value</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String">Adjustment type</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s45"><Data ss:Type="String">Comments / actions (in case of discrepancy)</Data><NamedCell
+      ss:Name="Print_Titles"/><NamedCell ss:Name="Print_Area"/></Cell>
+   </Row>
+   % for index,item in enumerate(objects[0].discrepancy_line_ids):
+   <Row>
+    <Cell ss:StyleID="s30"><Data ss:Type="String">${item.line_no}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s30"><Data ss:Type="String">${item.nomen_manda_2 and item.nomen_manda_2.name or ''}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s31"><Data ss:Type="String">${item.product_id and item.product_id.code or ''}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s31"><Data ss:Type="String">${item.product_id and item.product_id.name or ''}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s38"><Data ss:Type="String">${item.product_uom_id and item.product_uom_id.name or ''}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s43"><Data ss:Type="String">${item.standard_price}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s43"><Data ss:Type="String">${item.currency_id and item.currency_id.name or ''}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s30"><Data ss:Type="String">${item.theoretical_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s31"><Data ss:Type="String">${item.counted_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s38"><Data ss:Type="String">${item.batch_number or ''}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s32"><Data ss:Type="String">${item.expiry_date or ''}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s43"><Data ss:Type="String">${item.discrepancy_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s43"><Data ss:Type="String">${item.discrepancy_value}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s42"><Data ss:Type="String">${item.total_product_theoretical_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s36"><Data ss:Type="String">${item.total_product_counted_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s36"><Data ss:Type="String">${item.total_product_counted_value}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s36"><Data ss:Type="String">${item.total_product_discrepancy_qty}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s46"><Data ss:Type="String">${item.total_product_discrepancy_value}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s50"><Data ss:Type="String">${item.reason_type_id and item.reason_type_id.name or ''}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+    <Cell ss:StyleID="s48"><Data ss:Type="String">${item.comment or ''}</Data><NamedCell ss:Name="Print_Area"/></Cell>
+   </Row>
+   % endfor
+  </Table>
+  <WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
+   <PageSetup>
+    <Layout x:Orientation="Landscape"/>
+    <Header x:Margin="0.31496062992125984"/>
+    <Footer x:Margin="0.31496062992125984" x:Data="Page &amp;P de &amp;N"/>
+    <PageMargins x:Bottom="0.74803149606299213" x:Left="0.23622047244094491"
+     x:Right="0.23622047244094491" x:Top="0.74803149606299213"/>
+   </PageSetup>
+   <FitToPage/>
+   <Print>
+    <FitHeight>0</FitHeight>
+    <ValidPrinterInfo/>
+    <PaperSizeIndex>9</PaperSizeIndex>
+    <Scale>46</Scale>
+    <HorizontalResolution>1200</HorizontalResolution>
+    <VerticalResolution>1200</VerticalResolution>
+   </Print>
+   <Selected/>
+   <DoNotDisplayGridlines/>
+   <SplitHorizontal>10</SplitHorizontal>
+   <TopRowBottomPane>10</TopRowBottomPane>
+   <ActivePane>2</ActivePane>
+   <Panes>
+    <Pane>
+     <Number>3</Number>
+    </Pane>
+    <Pane>
+     <Number>2</Number>
+     <ActiveRow>0</ActiveRow>
+    </Pane>
+   </Panes>
+   <ProtectObjects>False</ProtectObjects>
+   <ProtectScenarios>False</ProtectScenarios>
+  </WorksheetOptions>
+ </Worksheet>
+</Workbook>

=== added file 'bin/addons/stock/report/physical_inventory_view.xml'
--- bin/addons/stock/report/physical_inventory_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/report/physical_inventory_view.xml	2017-11-24 09:38:22 +0000
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<openerp>
+    <data>
+        <report
+            id="physical_inventory_counting_sheet_xls"
+            string="Export xls counting sheet"
+            model="physical.inventory"
+            name="physical_inventory_counting_sheet_xls"
+            report_type="webkit"
+            menu="False"
+            />
+        <report
+            id="physical_inventory_counting_sheet_pdf"
+            string="Export pdf counting sheet"
+            model="physical.inventory"
+            name="physical_inventory_counting_sheet_pdf"
+            rml="addons/stock/report/physical_inventory_counting_sheet.rml"
+            header="False"
+            menu="False"
+        />
+        <report
+            id="physical_inventory_report_xls"
+            string="Export xls inventory report"
+            model="physical.inventory"
+            name="physical_inventory_discrepancies_report_xls"
+            report_type="webkit"
+            menu="False"
+            />
+    </data>
+</openerp>
\ No newline at end of file

=== modified file 'bin/addons/stock/stock_view.xml'
--- bin/addons/stock/stock_view.xml	2017-11-03 10:08:12 +0000
+++ bin/addons/stock/stock_view.xml	2017-11-24 09:38:22 +0000
@@ -190,7 +190,6 @@
             <field name="search_view_id" ref="view_inventory_filter" />
             <field name="help">Periodical Inventories are used to count the number of products available per location. You can use it once a year when you do the general inventory or whenever you need it, to correct the current stock level of a product.</field>
         </record>
-        <menuitem action="action_inventory_form" id="menu_action_inventory_form" parent="menu_stock_inventory_control" sequence="30"/>
 
         <record id="action_inventory_form_draft" model="ir.actions.act_window">
             <field name="name">Draft Physical Inventories</field>

=== modified file 'bin/addons/stock/wizard/__init__.py'
--- bin/addons/stock/wizard/__init__.py	2011-01-14 00:11:01 +0000
+++ bin/addons/stock/wizard/__init__.py	2017-11-24 09:38:22 +0000
@@ -34,5 +34,8 @@
 import stock_change_standard_price
 import stock_return_picking
 import stock_change_product_qty
+import physical_inventory_select_products
+import physical_inventory_generate_counting_sheet
+import physical_inventory_import
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
 

=== added file 'bin/addons/stock/wizard/physical_inventory_generate_counting_sheet.py'
--- bin/addons/stock/wizard/physical_inventory_generate_counting_sheet.py	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/wizard/physical_inventory_generate_counting_sheet.py	2017-11-24 09:38:22 +0000
@@ -0,0 +1,198 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+
+class physical_inventory_generate_counting_sheet(osv.osv_memory):
+    _name = "physical.inventory.generate.counting.sheet"
+    _description = "Generate counting sheet from selected products"
+
+    _columns = {
+        'inventory_id': fields.many2one('physical.inventory', 'Inventory', readonly=True),
+        'prefill_bn': fields.boolean('Prefill Batch Numbers'),
+        'prefill_ed': fields.boolean('Prefill Expiry Dates'),
+    }
+
+    _defaults = {
+        'prefill_bn': True,
+        'prefill_ed': True
+    }
+
+    def create(self, cr, user, vals, context=None):
+
+        context = context if context else {}
+
+        assert 'inventory_id' in vals
+
+        return super(physical_inventory_generate_counting_sheet, self).create(cr, user, vals, context=context)
+
+
+    def generate_counting_sheet(self, cr, uid, wizard_ids, context=None):
+        context = context if context else {}
+        def read_single(model, id_, column):
+            return self.pool.get(model).read(cr, uid, [id_], [column], context=context)[0][column]
+        def read_many(model, ids, columns):
+            return self.pool.get(model).read(cr, uid, ids, columns, context=context)
+        def write(model, id_, vals):
+            return self.pool.get(model).write(cr, uid, [id_], vals, context=context)
+
+        # Get this wizard...
+        assert len(wizard_ids) == 1
+        wizard_id = wizard_ids[0]
+
+        # Get the selected option
+        prefill_bn = read_single(self._name, wizard_id, 'prefill_bn')
+        prefill_ed = read_single(self._name, wizard_id, 'prefill_ed')
+
+        # Get location, products selected, and existing inventory lines
+        inventory_id = read_single(self._name, wizard_id, "inventory_id")
+        inventory = read_many("physical.inventory", [inventory_id], ['location_id',
+                                                                     'counting_line_ids',
+                                                                     'product_ids'])[0]
+
+        # Get relevant info for products to be able to create the inventory
+        # lines
+        location_id = inventory["location_id"][0]
+        product_ids = inventory["product_ids"]
+
+        bn_and_eds = self.get_BN_and_ED_for_products_at_location(cr, uid, location_id, product_ids, context=context)
+
+        # Prepare the inventory lines to be created
+
+        inventory_counting_lines_to_create = []
+        for product_id in product_ids:
+            bn_and_eds_for_this_product = bn_and_eds[product_id]
+            # If no bn / ed related to this product, create a single inventory
+            # line
+            if len(bn_and_eds_for_this_product) == 0:
+                values = { "line_no": len(inventory_counting_lines_to_create) + 1,
+                           "inventory_id": inventory_id,
+                           "product_id": product_id,
+                           "batch_number": False,
+                           "expiry_date": False
+                         }
+                inventory_counting_lines_to_create.append(values)
+            # Otherwise, create an inventory line for this product ~and~ for
+            # each BN/ED
+            else:
+                for bn_and_ed in bn_and_eds_for_this_product:
+                    values = { "line_no": len(inventory_counting_lines_to_create) + 1,
+                               "inventory_id": inventory_id,
+                               "product_id": product_id,
+                               "batch_number": bn_and_ed[0] if prefill_bn else False,
+                               "expiry_date":  bn_and_ed[1] if prefill_ed else False
+                             }
+                    inventory_counting_lines_to_create.append(values)
+
+        # Get the existing inventory counting lines (to be cleared)
+
+        existing_inventory_counting_lines = inventory["counting_line_ids"]
+
+        # Prepare the actual create/remove for inventory lines
+        # 2 is the code for removal/deletion, 0 is for addition/creation
+
+        delete_existing_inventory_counting_lines = [ (2,line_id) for line_id in existing_inventory_counting_lines ]
+
+        create_inventory_counting_lines = [ (0,0,line_values) for line_values in inventory_counting_lines_to_create ]
+
+        todo = []
+        todo.extend(delete_existing_inventory_counting_lines)
+        todo.extend(create_inventory_counting_lines)
+
+        # Do the actual write
+        # TODO : Test if Draft state here
+        write("physical.inventory", inventory_id, {'counting_line_ids': todo,
+                                                   'state': 'counting'})
+
+        return {'type': 'ir.actions.act_window_close'}
+
+
+    def get_BN_and_ED_for_products_at_location(self, cr, uid, location_id, product_ids, context=None):
+        context = context if context else {}
+        def read_many(model, ids, columns):
+            return self.pool.get(model).read(cr, uid, ids, columns, context=context)
+
+        # Get the moves at location, related to these products
+        moves_at_location = self.get_moves_at_location(cr, uid, location_id, context=context)
+
+        moves_at_location_for_products = [ m for m in moves_at_location
+                                           if m["product_id"][0] in product_ids ]
+
+        # Get the production lot associated to these moves
+        moves_at_location_for_products = read_many("stock.move",
+                                                   moves_at_location_for_products,
+                                                   ["product_id",
+                                                    "prodlot_id",
+                                                    "expired_date"])
+
+        # Init a dict with an empty set for each products
+        BN_and_ED = { product_id:set() for product_id in product_ids }
+
+        for move in moves_at_location_for_products:
+
+            product_id = move["product_id"][0]
+
+            batch_number = move["prodlot_id"][1] if isinstance(move["prodlot_id"], tuple) else False
+            expired_date = move["expired_date"]
+
+            # Dirty hack to ignore/hide internal batch numbers ("MSFBN")
+            if batch_number and batch_number.startswith("MSFBN"):
+                batch_number = False
+
+            BN_and_ED[product_id].add((batch_number, expired_date))
+
+        return BN_and_ED
+
+
+    # FIXME : this is copy/pasta from the other wizard ...
+    # Should be factorized, probably in physical inventory, or stock somewhere.
+    def get_moves_at_location(self, cr, uid, location_id, context=None):
+        context = context if context else {}
+
+        def read_many(model, ids, columns):
+            return self.pool.get(model).read(cr, uid, ids, columns, context=context)
+
+        def search(model, domain):
+            return self.pool.get(model).search(cr, uid, domain, context=context)
+
+        assert isinstance(location_id, int)
+
+        # Get all the moves for in/out of that location
+        from_or_to_location = ['&', '|',
+                               ('location_id', 'in', [location_id]),
+                               ('location_dest_id', 'in', [location_id]),
+                               ('state', '=', 'done')]
+
+        moves_at_location_ids = search("stock.move", from_or_to_location)
+        moves_at_location = read_many("stock.move",
+                                      moves_at_location_ids,
+                                      ["product_id",
+                                       "date",
+                                       "product_qty",
+                                       "location_id",
+                                       "location_dest_id"])
+
+        return moves_at_location
+
+physical_inventory_generate_counting_sheet()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/stock/wizard/physical_inventory_generate_counting_sheet_view.xml'
--- bin/addons/stock/wizard/physical_inventory_generate_counting_sheet_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/wizard/physical_inventory_generate_counting_sheet_view.xml	2017-11-24 09:38:22 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="physical_inventory_generate_counting_sheet" model="ir.ui.view">
+            <field name="name">Generate Counting Sheet</field>
+            <field name="model">physical.inventory.generate.counting.sheet</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Generate Counting Sheet">
+                    <field name="prefill_bn" colspan="4"/>
+                    <field name="prefill_ed" colspan="4"/>
+                    <button name="generate_counting_sheet" string="Generate counting sheet" icon="gtk-go-forward" colspan="4" type="object" />
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added file 'bin/addons/stock/wizard/physical_inventory_import.py'
--- bin/addons/stock/wizard/physical_inventory_import.py	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/wizard/physical_inventory_import.py	2017-11-24 09:38:22 +0000
@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+
+from osv import fields, osv
+
+
+class PhysicalInventoryImportWizard(osv.osv_memory):
+    _name = "physical.inventory.import.wizard"
+    _description = "Physical inventory import wizard"
+
+    _columns = {
+        'message': fields.text('Message', readonly=True),
+        'line_ids': fields.one2many('physical.inventory.import.line.wizard', 'parent_id', string='Details')
+    }
+
+    def action_close(self, cr, uid, ids, context=None):
+        return self.close_action()
+
+    def message_box(self, cr, uid, title, message, context=None):
+        return {
+            'name': title,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': self._name,
+            'res_id': self.create(cr, uid, {'message': message}, context=context),
+            'type': 'ir.actions.act_window',
+            'view_id': [self.get_view_by_name(cr, uid, 'physical_inventory_import_wizard_view')],
+            'target': 'new',
+            'context': context or {},
+        }
+
+    def _set_action_for_all(self, cr, uid, ids, action, context=None):
+        lines = self.pool.get('physical.inventory.import.line.wizard')
+        line_ids = lines.search(cr, uid, [('parent_id', 'in', ids)])
+        lines.write(cr, uid, line_ids, {'action': action}, context=context)
+
+    def action_ignore_all(self, cr, uid, ids, context=None):
+        self._set_action_for_all(cr, uid, ids, 'ignore', context)
+        return self.no_action()
+
+    def action_count_all(self, cr, uid, ids, context=None):
+        self._set_action_for_all(cr, uid, ids, 'count', context)
+        return self.no_action()
+
+    def action_validate(self, cr, uid, ids, context=None):
+        lines = self.pool.get('physical.inventory.import.line.wizard')
+        line_ids = lines.search(cr, uid, [('parent_id', 'in', ids)])
+        items = lines.read(cr, uid, line_ids, ['line_id', 'action'])
+        # Search for undefined actions
+        for row in items:
+            if not row['action']:
+                break
+        else:
+            # Not found, all actions are defined
+            self.pool.get('physical.inventory').pre_process_discrepancies(cr, uid, items, context=context)
+            return self.close_action()
+        # Found, an action is missing on a line
+        return self.no_action()
+
+    @staticmethod
+    def close_action():
+        return {'type': 'ir.actions.act_window_close'}
+
+    @staticmethod
+    def no_action():
+        return {}
+
+    def get_view_by_name(self, cr, uid, name):
+        return self.pool.get('ir.model.data').get_object_reference(cr, uid, 'stock', name)[1]
+
+    def action_box(self, cr, uid, title, items=None, context=None):
+        result = {
+            'name': title,
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': self._name,
+            'res_id': self.create(cr, uid, {'line_ids': [(0, 0, item) for item in items or []]}, context=context),
+            'type': 'ir.actions.act_window',
+            'view_id': [self.get_view_by_name(cr, uid, 'physical_inventory_action_box_wizard_view')],
+            'target': 'new',
+            'context': context or {},
+        }
+        return result
+
+
+PhysicalInventoryImportWizard()
+
+
+class PhysicalInventoryImportLineWizard(osv.osv_memory):
+    _name = "physical.inventory.import.line.wizard"
+    _description = "Physical inventory import line wizard"
+
+    ACTION_LIST = [
+        ('ignore', 'Ignore'),
+        ('count', 'Count as 0'),
+    ]
+
+    _columns = {
+        'parent_id': fields.many2one('physical.inventory.import.wizard', string='Parent'),
+        'line_id': fields.integer('Line ID', readonly=True),
+        'message': fields.text('Message', readonly=True),
+        'action': fields.selection(ACTION_LIST, string='Action')
+    }
+
+
+PhysicalInventoryImportLineWizard()

=== added file 'bin/addons/stock/wizard/physical_inventory_import_view.xml'
--- bin/addons/stock/wizard/physical_inventory_import_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/wizard/physical_inventory_import_view.xml	2017-11-24 09:38:22 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="physical_inventory_import_wizard_view" model="ir.ui.view">
+            <field name="name">Importation Report</field>
+            <field name="model">physical.inventory.import.wizard</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form>
+                    <field name="message" nolabel="1" colspan="4"/>
+                    <separator colspan="4"/>
+                    <button string="Close" icon="gtk-ok" colspan="4" name="action_close" type="object"/>
+                </form>
+            </field>
+        </record>
+        <record id="physical_inventory_action_box_wizard_view" model="ir.ui.view">
+            <field name="name">Importation Report</field>
+            <field name="model">physical.inventory.import.wizard</field>
+            <field name="type">form</field>
+            <field name="priority">17</field>
+            <field name="arch" type="xml">
+                <form>
+                    <field name="line_ids" nolabel="1" colspan="4">
+                        <tree editable="bottom" hide_new_button="True" hide_delete_button="True">
+                            <field name="message"/>
+                            <field name="action"/>
+                        </tree>
+                    </field>
+                    <button string="Count all as 0" icon="gtk-clear" colspan="2" name="action_count_all" type="object"/>
+                    <button string="Ignore all" icon="gtk-close" colspan="2" name="action_ignore_all" type="object"/>
+                    <separator colspan="4"/>
+                    <button string="Validate" icon="gtk-apply" colspan="2" name="action_validate" type="object"/>
+                    <button string="Cancel" icon="gtk-cancel" colspan="2" name="action_close" type="object"/>
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>

=== added file 'bin/addons/stock/wizard/physical_inventory_select_products.py'
--- bin/addons/stock/wizard/physical_inventory_select_products.py	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/wizard/physical_inventory_select_products.py	2017-11-24 09:38:22 +0000
@@ -0,0 +1,413 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
+
+from osv import fields, osv
+from tools.translate import _
+from datetime import datetime
+from dateutil.relativedelta import relativedelta
+
+# This will be a tuple ((1,"1 months" ), (2, "2 months"), ...)
+MOVED_IN_LAST_X_MONTHS = tuple([(i, "%s months" % str(i)) for i in range(1, 13)])
+
+
+class physical_inventory_select_products(osv.osv_memory):
+    _name = "physical.inventory.select.products"
+    _description = "Select product to consider for inventory, using filters"
+
+    _columns = {
+
+        'inventory_id': fields.many2one('physical.inventory', 'Inventory', readonly=True),
+        'full_inventory': fields.boolean('Full Inventory'),
+
+        # If this is a full inventory, we'll add products in stock at that
+        # location + products with recent moves at that location
+        'recent_moves_months_fullinvo': fields.selection(MOVED_IN_LAST_X_MONTHS, "Moved in the last", select=True),
+
+        # For partial inventories :
+
+        # First filter is to select products either in stock, or with recent
+        # moves at that location
+        'first_filter': fields.selection((('in_stock', "Products currently in stock at location"),
+                                          ('recent_movements', "Products with recent movement at location")),
+                                         "First filter", select=True),
+        'recent_moves_months': fields.selection(MOVED_IN_LAST_X_MONTHS, "Moved in the last", select=True),
+
+        # Second filter is to select a family / product list / 'special care' products
+        'second_filter': fields.selection((('all', "All"),
+                                           ('family', "All from a family"),
+                                           ('productlist', "All from a product list"),
+                                           ('specialcare', "KC/CS/DG")),
+                                          "Second filter", select=True),
+        'kc': fields.boolean('Keep cool items'),
+        'cs': fields.boolean('Controlled substances'),
+        'dg': fields.boolean('Dangerous goods'),
+        'product_list': fields.many2one('product.list', 'Product List', select=True),
+
+        # mandatory nomenclature levels
+        'nomen_manda_0': fields.many2one('product.nomenclature', 'Main Type', readonly=False, select=1),
+        'nomen_manda_1': fields.many2one('product.nomenclature', 'Group', readonly=False, select=1),
+        'nomen_manda_2': fields.many2one('product.nomenclature', 'Family', readonly=False, select=1),
+        'nomen_manda_3': fields.many2one('product.nomenclature', 'Root', readonly=False, select=1),
+
+        # Finally, we want to give the user some feedback about what's going
+        # to be imported
+        'products_preview': fields.many2many('product.product', 'products_preview_rel', 'product_id',
+                                             'physical_inventory_select_products_id', string="Products preview",
+                                             readonly=True),
+    }
+
+    def create(self, cr, user, vals, context=None):
+
+        context = context if context else {}
+
+        assert 'inventory_id' in vals
+        assert 'full_inventory' in vals
+
+        return super(physical_inventory_select_products, self).create(cr, user, vals, context=context)
+
+    #
+    # Nomenclature management
+    #
+    def onChangeSearchNomenclature(self, cr, uid, id, position, type,
+                                   nomen_manda_0,
+                                   nomen_manda_1,
+                                   nomen_manda_2,
+                                   nomen_manda_3,
+                                   num=True,
+                                   context=None):
+
+        context = context if context else {}
+
+        return self.pool.get('product.product') \
+            .onChangeSearchNomenclature(cr, uid, id, position, type,
+                                        nomen_manda_0,
+                                        nomen_manda_1,
+                                        nomen_manda_2,
+                                        nomen_manda_3,
+                                        num=num,
+                                        context=context)
+
+    def get_nomen(self, cr, uid, id, field):
+        return self.pool.get('product.nomenclature').get_nomen(cr, uid, self, id, field)
+
+    #
+    # END Nomenclature management
+    #
+
+
+    #
+    # When clicking 'Refresh'
+    #
+    def refresh_products(self, cr, uid, wizard_ids, context=None):
+        context = context if context else {}
+
+        def read_single(model, id_, column):
+            return self.pool.get(model).read(cr, uid, [id_], [column], context=context)[0][column]
+
+        def read_many(model, ids, columns):
+            return self.pool.get(model).read(cr, uid, ids, columns, context=context)
+
+        # Get this wizard...
+        assert len(wizard_ids) == 1
+        wizard_id = wizard_ids[0]
+
+        inventory_id = read_single(self._name, wizard_id, "inventory_id")
+
+        # Get the selected options
+        w = read_many(self._name, [wizard_id], ['inventory_id',
+                                                'full_inventory',
+                                                'recent_moves_months_fullinvo',
+                                                'first_filter',
+                                                'recent_moves_months',
+                                                'second_filter',
+                                                'kc',
+                                                'cs',
+                                                'dg',
+                                                'product_list',
+                                                'nomen_manda_0',
+                                                'nomen_manda_1',
+                                                'nomen_manda_2',
+                                                'nomen_manda_3'])[0]
+
+        # Find the location of the inventory
+        location_id = read_single('physical.inventory', w["inventory_id"], "location_id")[0]
+
+        # Full inventory case
+        if w["full_inventory"]:
+
+            # Get products in stock at that location, or recently moved
+            products_in_stock = self.get_products_in_stock_at_location(cr, uid, location_id, context=context)
+            products_recently_moved = self.get_products_with_recent_moves_at_location(cr, uid, location_id,
+                                                                                      w['recent_moves_months_fullinvo'],
+                                                                                      context=context)
+            products = products_in_stock.union(products_recently_moved)
+
+            # Show them in the preview
+            self.update_product_preview(cr, uid, wizard_id, products, context=context)
+
+        # Partial inventory case
+        else:
+
+            # Handle the first filter
+            if w["first_filter"] == "in_stock":
+                products = self.get_products_in_stock_at_location(cr, uid, location_id, context=context)
+            elif w["first_filter"] == "recent_movements":
+                products = self.get_products_with_recent_moves_at_location(cr, uid, location_id,
+                                                                           w['recent_moves_months'], context=context)
+            else:
+                # Does not happens
+                pass
+
+            # Handle the second filter
+            if w['second_filter'] == 'productlist':
+                product_list_id = read_single(self._name, wizard_id, "product_list")
+                products = self.filter_products_with_product_list(cr, uid, products, product_list_id, context=context)
+
+            elif w['second_filter'] == 'specialcare':
+                special_care_criterias = [c for c in ['kc', 'cs', 'dg'] if w[c]]
+                products = self.filter_products_with_special_care(cr, uid, products, special_care_criterias,
+                                                                  context=context)
+
+            elif w['second_filter'] == 'family':
+                nomenclature = {name: w[name] for name in ['nomen_manda_0',
+                                                           'nomen_manda_1',
+                                                           'nomen_manda_2',
+                                                           'nomen_manda_3'
+                                                           ] if w[name]}
+                products = self.filter_products_with_nomenclature(cr, uid, products, nomenclature, context=context)
+
+            else:
+                # Nothing to do, keep all the products found with first filter
+                pass
+
+            # Show them in the preview
+            self.update_product_preview(cr, uid, wizard_id, products, context=context)
+        return {}
+
+
+    def update_product_preview(self, cr, uid, wizard_id, product_ids, context=None):
+        context = context if context else {}
+
+        assert isinstance(wizard_id, int)
+        assert isinstance(product_ids, list) or isinstance(product_ids, set)
+
+        # '6' is the code for 'replace all'
+        vals = {"products_preview": [(6, 0, list(product_ids))]}
+
+        self.write(cr, uid, [wizard_id], vals, context=context)
+
+    def get_moves_at_location(self, cr, uid, location_id, context=None):
+        context = context if context else {}
+
+        def read_many(model, ids, columns):
+            return self.pool.get(model).read(cr, uid, ids, columns, context=context)
+
+        def search(model, domain):
+            return self.pool.get(model).search(cr, uid, domain, context=context)
+
+        assert isinstance(location_id, int)
+
+        # Get all the moves for in/out of that location
+        from_or_to_location = ['&', '|',
+                               ('location_id', 'in', [location_id]),
+                               ('location_dest_id', 'in', [location_id]),
+                               ('state', '=', 'done')]
+
+        moves_at_location_ids = search("stock.move", from_or_to_location)
+        moves_at_location = read_many("stock.move",
+                                      moves_at_location_ids,
+                                      ["product_id",
+                                       "date",
+                                       "product_qty",
+                                       "location_id",
+                                       "location_dest_id"])
+
+        return moves_at_location
+
+    def get_products_in_stock_at_location(self, cr, uid, location_id, context=None):
+        context = context if context else {}
+
+        assert isinstance(location_id, int)
+
+        moves_at_location = self.get_moves_at_location(cr, uid, location_id, context=None)
+
+        # Init stock at 0 for products
+        stocks = {}
+        for product_id in set([m["product_id"][0] for m in moves_at_location]):
+            stocks[product_id] = 0.0
+
+        # Sum all lines
+        for move in moves_at_location:
+
+            product_id = move["product_id"][0]
+            product_qty = move["product_qty"]
+
+            move_out = (move["location_id"][0] == location_id)
+            move_in = (move["location_dest_id"][0] == location_id)
+
+            if move_in:
+                stocks[product_id] += product_qty
+            elif move_out:
+                stocks[product_id] -= product_qty
+            else:
+                # This shouldnt happen
+                pass
+
+        # Keep only products for which stock != 0 (including negative ones)
+        products_in_stock = set([product_id
+                                 for product_id, stock in stocks.items()
+                                 if stock != 0.0])
+
+        return products_in_stock
+
+    def get_products_with_recent_moves_at_location(self, cr, uid, location_id, recent_moves_months, context=None):
+        context = context if context else {}
+
+        assert isinstance(location_id, int)
+        assert isinstance(recent_moves_months, int)
+
+        moves_at_location = self.get_moves_at_location(cr, uid, location_id, context=None)
+
+        several_months_ago = datetime.today() + relativedelta(months=-recent_moves_months)
+
+        # Keep only the product ids related to moves during the last few months
+        recently_moved_products = set()
+        for move in moves_at_location:
+            # Parse the move's date
+            move_date = datetime.strptime(move['date'], '%Y-%m-%d %H:%M:%S')
+            if move_date > several_months_ago:
+                product_id = move['product_id'][0]
+                recently_moved_products.add(product_id)
+
+        return recently_moved_products
+
+    def filter_products_with_special_care(self, cr, uid, product_ids, special_care_criterias, context=None):
+        context = context if context else {}
+
+        def search(model, domain):
+            return self.pool.get(model).search(cr, uid, domain, context=context)
+
+        assert isinstance(special_care_criterias, list)
+        assert isinstance(product_ids, list) or isinstance(product_ids, set)
+
+        domain_filter = [('id', 'in', list(product_ids))]
+
+        # To convert wizard option to column name in product.product
+        special_care_column_name = {'kc': 'is_kc',
+                                    'cs': 'is_cs',
+                                    'dg': 'is_dg'}
+
+        # Add special care criterias to the domain
+        for criteria in special_care_criterias:
+            column_name = special_care_column_name[criteria]
+            domain_filter = ['&'] + domain_filter + [(column_name, '=', True)]
+
+        # Perform the search/fitlering
+        products_filtered = search('product.product', domain_filter)
+
+        return products_filtered
+
+    def filter_products_with_nomenclature(self, cr, uid, product_ids, nomenclature, context=None):
+        context = context if context else {}
+
+        def search(model, domain):
+            return self.pool.get(model).search(cr, uid, domain, context=context)
+
+        assert isinstance(nomenclature, dict)
+        assert isinstance(product_ids, list) or isinstance(product_ids, set)
+
+        domain_filter = [('id', 'in', list(product_ids))]
+
+        # Add nomenclature to the domain
+        for name, value in nomenclature.items():
+            domain_filter = ['&'] + domain_filter + [(name, '=', value)]
+
+        # Perform the search/fitlering
+        products_filtered = search('product.product', domain_filter)
+
+        return products_filtered
+
+    def filter_products_with_product_list(self, cr, uid, product_ids, product_list_id, context=None):
+        context = context if context else {}
+
+        def search(model, domain):
+            return self.pool.get(model).search(cr, uid, domain, context=context)
+
+        def read_many(model, ids, columns):
+            return self.pool.get(model).read(cr, uid, ids, columns, context=context)
+
+        # Get all the product ids in the list
+        product_lines_in_list = search('product.list.line',
+                                       [('list_id', '=', product_list_id)])
+
+        product_ids_in_list = read_many('product.list.line',
+                                        product_lines_in_list,
+                                        ['name'])
+
+        product_ids_in_list = set([l['name'][0] for l in product_ids_in_list])
+
+        # Now use these products in list to filter the products in input
+        product_ids_in_list = product_ids_in_list.intersection(product_ids)
+
+        return product_ids_in_list
+
+    #
+    # When clicking 'Add product'
+    #
+    def add_products(self, cr, uid, wizard_ids, context=None):
+        context = context if context else {}
+
+        # Get this wizard...
+        assert len(wizard_ids) == 1
+        wizard_id = wizard_ids[0]
+
+        self.refresh_products(cr, uid, [wizard_id], context=context)
+        self.update_products_in_inventory(cr, uid, wizard_id, context=context)
+
+        return {'type': 'ir.actions.act_window_close'}
+
+    def update_products_in_inventory(self, cr, uid, wizard_id, context=None):
+        context = context if context else {}
+
+        def read_single(model, id_, column):
+            return self.pool.get(model).read(cr, uid, [id_], [column], context=context)[0][column]
+
+        def write(model, id_, vals):
+            return self.pool.get(model).write(cr, uid, [id_], vals, context=context)
+
+        assert isinstance(wizard_id, int)
+
+        inventory_id = read_single(self._name, wizard_id, "inventory_id")
+        product_ids = read_single(self._name, wizard_id, "products_preview")
+
+        # Redo a search to force order according to default order
+        previously_selected_product_ids = read_single("physical.inventory", inventory_id, "product_ids")
+        product_ids = previously_selected_product_ids + product_ids
+        product_ids = self.pool.get("product.product").search(cr, uid, [("id", 'in', product_ids)], context=context)
+
+        # '6' is the code for 'replace all'
+        vals = {'product_ids': [(6, 0, product_ids)]}
+        write('physical.inventory', inventory_id, vals)
+
+
+physical_inventory_select_products()
+
+# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

=== added file 'bin/addons/stock/wizard/physical_inventory_select_products_view.xml'
--- bin/addons/stock/wizard/physical_inventory_select_products_view.xml	1970-01-01 00:00:00 +0000
+++ bin/addons/stock/wizard/physical_inventory_select_products_view.xml	2017-11-24 09:38:22 +0000
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+        <record id="physical_inventory_select_products" model="ir.ui.view">
+            <field name="name">Select Products</field>
+            <field name="model">physical.inventory.select.products</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+                <form string="Select Products">
+                    <field name="full_inventory" invisible="1"/>
+                    <group col="4" colspan="4" attrs="{'invisible':[('full_inventory', '=', False)]}">
+                        <separator string="Full inventory" />
+                        <group col="1" colspan="4">
+                        <html>
+                            <h3 style="text-align: center; margin: 13px"><translate>This is a full inventory. All products currently in stock and all products with movements in the last X months will be added.</translate></h3>
+                        </html>
+                        </group>
+                        <field name="recent_moves_months_fullinvo" colspan="1" attrs="{'required':[('full_inventory','=',True)]}"/>
+                    </group>
+                    <group col="4" colspan="4" attrs="{'invisible':[('full_inventory', '=', True)]}">
+                    <separator string="Partial inventory" />
+                        <group col="2" colspan="2">
+                            <field name="first_filter"        attrs="{'required':[('full_inventory', '=', False)]}" />
+                            <field name="recent_moves_months" attrs="{'invisible':[('first_filter','!=','recent_movements')], 
+                                                                       'required':[('first_filter', '=','recent_movements')]}" colspan="2"/>
+                        </group>
+                        <group col="2" colspan="2">
+                            <field name="second_filter" attrs="{'required':[('full_inventory', '=', False)]}"/>
+                            <field name="product_list"  attrs="{'invisible':[('second_filter','!=','productlist')], 'required':[('second_filter','=','productlist')]}" />
+                            <field name="kc"            attrs="{'invisible':[('second_filter','!=','specialcare')]}" />
+                            <field name="cs"            attrs="{'invisible':[('second_filter','!=','specialcare')]}" />
+                            <field name="dg"            attrs="{'invisible':[('second_filter','!=','specialcare')]}" />
+                            <group col="2" colspan="2"  attrs="{'invisible':[('second_filter','!=','family')]   }">
+                            <field name="nomen_manda_0" widget="selection" 
+                                   domain="[('level', '=', '0'), ('type', '=', 'mandatory')]" 
+                                   on_change="onChangeSearchNomenclature(0, 'mandatory', nomen_manda_0, nomen_manda_1, nomen_manda_2, nomen_manda_3, False)" 
+                                   attrs="{'required':[('second_filter','=','family')]}"/>
+                            <field name="nomen_manda_1" widget="selection" get_selection="get_nomen" 
+                                   domain="[('level', '=', '1'), ('type', '=', 'mandatory')]" 
+                                   on_change="onChangeSearchNomenclature(1, 'mandatory', nomen_manda_0, nomen_manda_1, nomen_manda_2, nomen_manda_3, False)" 
+                                   />
+                            <field name="nomen_manda_2" widget="selection" get_selection="get_nomen" 
+                                   domain="[('level', '=', '2'), ('type', '=', 'mandatory'), ('category_id', '!=', False)]" 
+                                   on_change="onChangeSearchNomenclature(2, 'mandatory', nomen_manda_0, nomen_manda_1, nomen_manda_2, nomen_manda_3, False)" 
+                                   />
+                            <field name="nomen_manda_3" widget="selection" get_selection="get_nomen"
+                                   domain="[('level', '=', '3'), ('type', '=', 'mandatory')]" 
+                                   on_change="onChangeSearchNomenclature(3, 'mandatory', nomen_manda_0, nomen_manda_1, nomen_manda_2, nomen_manda_3, False)" 
+                                   />
+                            </group>
+                        </group>
+                    </group>
+                    <separator colspan="4" string="Preview" />
+                    <button name="refresh_products" string="Refresh" icon="gtk-refresh" colspan="4" type="object" />
+                    <field colspan="4" name="products_preview" nolabel="1">
+                        <tree string="Products">
+                            <field name="default_code" />
+                            <field name="name"         />
+                            <field name="uom_id"       />
+                            <field name="batch_management" string="BN mandatory" />
+                            <field name="perishable"       string="ED mandatory" />
+                            <field name="is_kc"            string="KC"           />
+                            <field name="is_dg"            string="DG"           />
+                            <field name="is_cs"            string="CS"           />
+                        </tree>
+                    </field>
+                    <separator colspan="4" string="Actions" />
+                    <button special="cancel" string="Cancel" icon="gtk-cancel" />
+                    <button name="add_products" string="Add products" icon="terp-check" colspan="3" type="object" />
+                </form>
+            </field>
+        </record>
+    </data>
+</openerp>

=== modified file 'bin/addons/stock_override/wizard/stock_card_wizard.py'
--- bin/addons/stock_override/wizard/stock_card_wizard.py	2017-08-23 14:10:02 +0000
+++ bin/addons/stock_override/wizard/stock_card_wizard.py	2017-11-24 09:38:22 +0000
@@ -97,7 +97,10 @@
         loc_obj = self.pool.get('stock.location')
         product_obj = self.pool.get('product.product')
         line_obj = self.pool.get('stock.card.wizard.line')
-        inv_line_obj = self.pool.get('stock.inventory.line')
+        pi_line_obj = self.pool.get('physical.inventory.counting')
+        # 'Old' physical inventories
+        oldinv_line_obj = self.pool.get('stock.inventory.line')
+
 
         if not context:
             context = {}
@@ -131,6 +134,7 @@
                   ('prodlot_id', '=', prodlot_id),
                   ('state', '=', 'done')]
 
+        # "Old" physical inventory
         inv_dom = [
             ('product_id', '=', product.id),
             ('prod_lot_id', '=', prodlot_id),
@@ -138,28 +142,38 @@
             ('inventory_id.state', '=', 'done')
         ]
 
+        pi_counting_dom = [
+            ('product_id', '=', product.id),
+            ('prod_lot_id', '=', prodlot_id),
+            ('discrepancy', '=', False),
+            ('inventory_id.state', 'in', ['confirmed', 'closed'])
+        ]
+
         if card.from_date:
             domain.append(('date', '>=', card.from_date))
             inv_dom.append(('inventory_id.date_done', '>=', card.from_date))
+            pi_counting_dom.append(('inventory_id.date_done', '>=', card.from_date))
 
         if card.to_date:
             domain.append(('date', '<=', card.to_date))
             inv_dom.append(('inventory_id.date_done', '<=', card.to_date + ' 23:59:00'))
+            pi_counting_dom.append(('inventory_id.date_done', '<=', card.to_date + ' 23:59:00'))
 
         if location_id:
             domain.extend(['|',
                            ('location_id', 'child_of', location_id),
                            ('location_dest_id', 'child_of', location_id)])
             inv_dom.append(('location_id', 'child_of', location_id))
+            pi_counting_dom.append(('inventory_id.location_id', 'child_of', location_id))
         else:
             domain.extend(['|',
                            ('location_id.usage', 'in', location_usage),
                            ('location_dest_id.usage', 'in', location_usage)])
 
-
-        inv_line_ids = inv_line_obj.search(cr, uid, inv_dom, context=context)
+        # Lines from "old" physical inventories
+        inv_line_ids = oldinv_line_obj.search(cr, uid, inv_dom, context=context)
         inv_line_to_add = {}
-        for line in inv_line_obj.browse(cr, uid, inv_line_ids, context=context):
+        for line in oldinv_line_obj.browse(cr, uid, inv_line_ids, context=context):
             inv_line_to_add.setdefault(line.inventory_id.date_done, []).append({
                 'card_id': ids[0],
                 'date_done': line.inventory_id.date_done,
@@ -172,10 +186,28 @@
                 'notes': '',
             })
 
-
         inv_line_dates = inv_line_to_add.keys()
         inv_line_dates.sort()
 
+        pi_counting_line_ids = pi_line_obj.search(cr, uid, pi_counting_dom, context=context)
+        pi_counting_line_to_add = {}
+        for line in pi_line_obj.browse(cr, uid, pi_counting_line_ids, context=context):
+            pi_counting_line_to_add.setdefault(line.inventory_id.date_done, []).append({
+                'card_id': ids[0],
+                'date_done': line.inventory_id.date_done,
+                'doc_ref': line.inventory_id.name,
+                'origin': False,
+                'qty_in': 0,
+                'qty_out': 0,
+                'balance': 0,
+                'src_dest': line.product_id.property_stock_inventory and line.product_id.property_stock_inventory.name or False,
+                'notes': '',
+            })
+
+        pi_counting_line_dates = pi_counting_line_to_add.keys()
+        pi_counting_line_dates.sort()
+
+
         # Create one line per stock move
         move_ids = move_obj.search(cr, uid, domain,order='date asc',
                                    context=context)
@@ -200,6 +232,11 @@
                     new_line['balance'] = initial_stock
                     line_obj.create(cr, uid, new_line, context=context)
 
+            while pi_counting_line_dates and pi_counting_line_dates[0] < move.date:
+                inv_data = pi_counting_line_dates.pop(0)
+                for new_line in pi_counting_line_to_add[inv_data]:
+                    new_line['balance'] = initial_stock
+                    line_obj.create(cr, uid, new_line, context=context)
 
             in_qty, out_qty = 0.00, 0.00
             move_location = False
@@ -252,6 +289,11 @@
                 new_line['balance'] = initial_stock
                 line_obj.create(cr, uid, new_line, context=context)
 
+        for pi_counting_date in pi_counting_line_dates:
+            for new_line in pi_counting_line_to_add[pi_counting_date]:
+                new_line['balance'] = initial_stock
+                line_obj.create(cr, uid, new_line, context=context)
+
         self.write(cr, uid, [ids[0]], {'available_stock': initial_stock},
                    context=context)
 

=== modified file 'bin/addons/useability_dashboard_and_menu/menu/warehouse_menu.xml'
--- bin/addons/useability_dashboard_and_menu/menu/warehouse_menu.xml	2017-05-22 14:32:14 +0000
+++ bin/addons/useability_dashboard_and_menu/menu/warehouse_menu.xml	2017-11-24 09:38:22 +0000
@@ -107,17 +107,16 @@
                   sequence="23"
                   action="mission_stock.mission_stock_wizard_action" />
 	              
-	    <menuitem name="Physical Inventories"
-	              action="stock.action_inventory_form" 
-	              id="stock.menu_action_inventory_form" 
-	              parent="stock.menu_stock_inventory_control" 
-	              sequence="24"/>
-	              
         <menuitem name="Last Product Inventories"
                   parent="stock.menu_stock_inventory_control" 
                   action="stock.action_stock_line_date" 
                   id="stock.menu_report_stock_line_date" 
                   sequence="25"/>
-                  
+
+        <menuitem name="Previous Physical Inventories"
+                  action="stock.action_inventory_form" 
+                  id="stock.menu_action_inventory_form" 
+                  parent="stock.menu_stock_inventory_control" 
+                  sequence="30"/>
     </data>
 </openerp>

=== modified file 'bin/osv/orm.py'
--- bin/osv/orm.py	2017-10-27 08:30:22 +0000
+++ bin/osv/orm.py	2017-11-24 09:38:22 +0000
@@ -3618,6 +3618,8 @@
                 res2 = self._columns[val[0]].get(cr, self, ids, val, user, context=context, values=res)
                 for pos in val:
                     for record in res:
+                        if not record['id'] in res2:
+                            raise Exception("Could not process key %s" % key)
                         if isinstance(res2[record['id']], str): res2[record['id']] = eval(res2[record['id']]) #TOCHECK : why got string instend of dict in python2.6
                         multi_fields = res2.get(record['id'],{})
                         if multi_fields:
@@ -3893,6 +3895,7 @@
         """
         if not ids:
             return True
+        assert isinstance(vals, dict), "orm.write() expects a dictionnary as 4th argument!"
         readonly = None
         for field in vals.copy():
             fobj = None