From 3ef47ce756d12fc03abf1e59ae1c4fda2f7e67d7 Mon Sep 17 00:00:00 2001
From: lreficent <lois.rilo@eficent.com>
Date: Mon, 9 Oct 2017 15:44:36 +0200
Subject: [PATCH 1/4] [9.0][IMP] stock_cycle_count: fix accuracy computation
 and store it

---
 stock_cycle_count/__openerp__.py              |  2 +-
 stock_cycle_count/models/stock_inventory.py   | 28 +++++++++++--------
 .../views/stock_location_view.xml             |  3 +-
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/stock_cycle_count/__openerp__.py b/stock_cycle_count/__openerp__.py
index c3704e08a..89bd88823 100644
--- a/stock_cycle_count/__openerp__.py
+++ b/stock_cycle_count/__openerp__.py
@@ -6,7 +6,7 @@
     "name": "Stock Cycle Count",
     "summary": "Adds the capability to schedule cycle counts in a "
                "warehouse through different rules defined by the user",
-    "version": "9.0.1.1.0",
+    "version": "9.0.1.2.0",
     "author": "Eficent, "
               "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/stock-logistics-warehouse",
diff --git a/stock_cycle_count/models/stock_inventory.py b/stock_cycle_count/models/stock_inventory.py
index ba548c3d0..c4d755518 100644
--- a/stock_cycle_count/models/stock_inventory.py
+++ b/stock_cycle_count/models/stock_inventory.py
@@ -12,23 +12,27 @@ PERCENT = 100.0
 class StockInventory(models.Model):
     _inherit = 'stock.inventory'
 
-    @api.one
+    @api.multi
+    @api.depends("state", "line_ids")
     def _compute_inventory_accuracy(self):
-        total_qty = sum(self.line_ids.mapped('theoretical_qty'))
-        abs_discrepancy = sum(self.line_ids.mapped(
-            lambda x: abs(x.discrepancy_qty)))
-        if total_qty:
-            self.inventory_accuracy = PERCENT * (
-                total_qty - abs_discrepancy) / total_qty
-        if not self.line_ids and self.state == 'done':
-            self.inventory_accuracy = 100.0
+        for inv in self:
+            theoretical = sum(inv.line_ids.mapped(
+                lambda x: abs(x.theoretical_qty)))
+            abs_discrepancy = sum(inv.line_ids.mapped(
+                lambda x: abs(x.discrepancy_qty)))
+            if theoretical:
+                inv.inventory_accuracy = max(
+                    PERCENT * (theoretical - abs_discrepancy) / theoretical,
+                    0.0)
+            if not inv.line_ids and inv.state == 'done':
+                inv.inventory_accuracy = PERCENT
 
     cycle_count_id = fields.Many2one(
         comodel_name='stock.cycle.count', string='Stock Cycle Count',
         ondelete='cascade', readonly=True)
-    inventory_accuracy = fields.Float(string='Accuracy',
-                                      compute=_compute_inventory_accuracy,
-                                      digits=(3, 2))
+    inventory_accuracy = fields.Float(
+        string='Accuracy', compute=_compute_inventory_accuracy,
+        digits=(3, 2), store=True)
 
     @api.multi
     def action_done(self):
diff --git a/stock_cycle_count/views/stock_location_view.xml b/stock_cycle_count/views/stock_location_view.xml
index 180adff21..eef47bbfd 100644
--- a/stock_cycle_count/views/stock_location_view.xml
+++ b/stock_cycle_count/views/stock_location_view.xml
@@ -6,11 +6,12 @@
 
     <record model="ir.actions.act_window" id="act_accuracy_stats">
         <field name="domain">[('location_id', '=', active_ids),
+            ('exclude_sublocation', '=', True),
             ('state', '=', 'done')]</field>
         <field name="name">Accuracy Stats</field>
         <field name="res_model">stock.inventory</field>
         <field name="view_type">form</field>
-        <field name="view_mode">tree,form</field>
+        <field name="view_mode">tree,form,pivot</field>
     </record>
 
     <record id="view_location_form" model="ir.ui.view">

From 2f3eb2ff3ba3b5ee40cf4843c6baf4402fdeeb01 Mon Sep 17 00:00:00 2001
From: lreficent <lois.rilo@eficent.com>
Date: Tue, 10 Oct 2017 11:52:25 +0200
Subject: [PATCH 2/4] [9.0][IMP] stock_cycle_count: basic_accuracy report

---
 stock_cycle_count/__init__.py                 |  1 +
 stock_cycle_count/__openerp__.py              |  4 +-
 stock_cycle_count/reports/__init__.py         |  4 +
 .../reports/report_stock_location_accuracy.py | 38 ++++++++++
 .../stock_location_accuracy_report.xml        | 73 +++++++++++++++++++
 5 files changed, 119 insertions(+), 1 deletion(-)
 create mode 100644 stock_cycle_count/reports/__init__.py
 create mode 100644 stock_cycle_count/reports/report_stock_location_accuracy.py
 create mode 100644 stock_cycle_count/reports/stock_location_accuracy_report.xml

diff --git a/stock_cycle_count/__init__.py b/stock_cycle_count/__init__.py
index 08f93b3a4..f1ca255e7 100644
--- a/stock_cycle_count/__init__.py
+++ b/stock_cycle_count/__init__.py
@@ -4,3 +4,4 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
 from . import models
+from . import reports
diff --git a/stock_cycle_count/__openerp__.py b/stock_cycle_count/__openerp__.py
index 89bd88823..9108ded83 100644
--- a/stock_cycle_count/__openerp__.py
+++ b/stock_cycle_count/__openerp__.py
@@ -26,7 +26,9 @@
         'views/stock_location_view.xml',
         'data/cycle_count_sequence.xml',
         'data/cycle_count_ir_cron.xml',
-        'security/ir.model.access.csv'],
+        'reports/stock_location_accuracy_report.xml',
+        'security/ir.model.access.csv',
+    ],
     "license": "AGPL-3",
     'installable': True,
     'application': False,
diff --git a/stock_cycle_count/reports/__init__.py b/stock_cycle_count/reports/__init__.py
new file mode 100644
index 000000000..97c997be9
--- /dev/null
+++ b/stock_cycle_count/reports/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from . import report_stock_location_accuracy
diff --git a/stock_cycle_count/reports/report_stock_location_accuracy.py b/stock_cycle_count/reports/report_stock_location_accuracy.py
new file mode 100644
index 000000000..f2807da1b
--- /dev/null
+++ b/stock_cycle_count/reports/report_stock_location_accuracy.py
@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+# Copyright 2017 Eficent Business and IT Consulting Services S.L.
+#   (http://www.eficent.com)
+# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
+
+from openerp import api, fields, models
+
+
+class LocationAccuracyReport(models.AbstractModel):
+    _name = "report.stock_location_accuracy"
+
+    @api.model
+    def _get_inventory_domain(self, loc_id):
+        return [('location_id', '=', loc_id),
+                ('exclude_sublocation', '=', True),
+                ('state', '=', 'done')]
+
+    @api.model
+    def _get_location_data(self, locations):
+        data = dict()
+        inventory_obj = self.env["stock.inventory"]
+        for loc in locations:
+            counts = inventory_obj.search(self._get_inventory_domain(loc.id))
+            data[loc] = counts
+        return data
+
+    @api.multi
+    def render_html(self, data=None):
+        report_obj = self.env["report"]
+        locs = self.env["stock.location"].browse(self._ids)
+        data = self._get_location_data(locs)
+        docargs = {
+            "doc_ids": locs._ids,
+            "docs": locs,
+            "data": data,
+        }
+        return report_obj.render(
+            "stock_cycle_count.stock_location_accuracy", docargs)
diff --git a/stock_cycle_count/reports/stock_location_accuracy_report.xml b/stock_cycle_count/reports/stock_location_accuracy_report.xml
new file mode 100644
index 000000000..2db18f471
--- /dev/null
+++ b/stock_cycle_count/reports/stock_location_accuracy_report.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+
+    <!-- Templates -->
+    <template id="stock_location_accuracy">
+        <t t-call="report.html_container">
+            <t t-foreach="docs" t-as="doc">
+                <t t-call="report.external_layout">
+                    <div class="page">
+                        <div class="oe_structure"/>
+                        <h3>
+                            <span>Location:</span>
+                            <span t-field="doc.name"/>
+                        </h3>
+
+                        <div class="row mt32 mb32" id="informations">
+                            <div class="col-xs-6">
+                                <strong>Complete name:</strong>
+                                <p t-field="doc.complete_name"/>
+                            </div>
+                            <div class="col-xs-3">
+                                <strong>Current Accuracy:</strong>
+                                <p t-field="doc.loc_accuracy"/>
+                            </div>
+                        </div>
+
+                        <table class="table table-condensed">
+                            <thead>
+                                <tr>
+                                    <th>Inventory</th>
+                                    <th class="text-right">Date</th>
+                                    <th class="text-right">Accuracy</th>
+
+                                </tr>
+                           </thead>
+                           <tbody class="sale_tbody">
+                                <t t-foreach="data[doc]" t-as="l">
+                                    <tr>
+                                        <td>
+                                           <span t-field="l.name"/>
+                                        </td>
+                                        <td class="text-right">
+                                            <span t-field="l.date"/>
+                                        </td>
+                                        <td class="text-right">
+                                            <span t-field="l.inventory_accuracy"/>
+                                        </td>
+
+
+                                    </tr>
+                                </t>
+                            </tbody>
+                        </table>
+
+                    </div>
+                </t>
+            </t>
+        </t>
+    </template>
+
+    <!-- Report action -->
+    <report
+        id="action_report_stock_location_accuracy"
+        model="stock.location"
+        name="stock_location_accuracy"
+        string="Accuracy report"
+        report_type="qweb-pdf"
+        groups="stock.group_stock_user"/>
+
+</odoo>

From 9504b8364909e12baed80d22d04bb432bd4ad994 Mon Sep 17 00:00:00 2001
From: lreficent <lois.rilo@eficent.com>
Date: Tue, 10 Oct 2017 11:56:46 +0200
Subject: [PATCH 3/4] [9.0][IMP] stock_cycle_count: enhance views

---
 stock_cycle_count/models/stock_inventory.py   |  2 +-
 stock_cycle_count/models/stock_location.py    | 11 +++++
 .../reports/report_stock_location_accuracy.py |  6 +--
 .../views/stock_inventory_view.xml            | 49 +++++++++++++++++++
 .../views/stock_location_view.xml             | 15 ++----
 5 files changed, 67 insertions(+), 16 deletions(-)

diff --git a/stock_cycle_count/models/stock_inventory.py b/stock_cycle_count/models/stock_inventory.py
index c4d755518..f4aad364a 100644
--- a/stock_cycle_count/models/stock_inventory.py
+++ b/stock_cycle_count/models/stock_inventory.py
@@ -32,7 +32,7 @@ class StockInventory(models.Model):
         ondelete='cascade', readonly=True)
     inventory_accuracy = fields.Float(
         string='Accuracy', compute=_compute_inventory_accuracy,
-        digits=(3, 2), store=True)
+        digits=(3, 2), store=True, group_operator="avg")
 
     @api.multi
     def action_done(self):
diff --git a/stock_cycle_count/models/stock_location.py b/stock_cycle_count/models/stock_location.py
index a9b5730c0..bf040984a 100644
--- a/stock_cycle_count/models/stock_location.py
+++ b/stock_cycle_count/models/stock_location.py
@@ -91,3 +91,14 @@ class StockLocation(models.Model):
             'state': 'draft'
         })
         return True
+
+    @api.multi
+    def action_accuracy_stats(self):
+        self.ensure_one()
+        action = self.env.ref('stock_cycle_count.act_accuracy_stats')
+        result = action.read()[0]
+        result['context'] = {"search_default_location_id": self.id}
+        new_domain = result['domain'][:-1] + \
+            ", ('location_id', 'child_of', active_ids)]"
+        result['domain'] = new_domain
+        return result
diff --git a/stock_cycle_count/reports/report_stock_location_accuracy.py b/stock_cycle_count/reports/report_stock_location_accuracy.py
index f2807da1b..6b14a2a2a 100644
--- a/stock_cycle_count/reports/report_stock_location_accuracy.py
+++ b/stock_cycle_count/reports/report_stock_location_accuracy.py
@@ -3,16 +3,16 @@
 #   (http://www.eficent.com)
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html).
 
-from openerp import api, fields, models
+from openerp import api, models
 
 
 class LocationAccuracyReport(models.AbstractModel):
     _name = "report.stock_location_accuracy"
 
     @api.model
-    def _get_inventory_domain(self, loc_id):
+    def _get_inventory_domain(self, loc_id, exclude_sublocation=True):
         return [('location_id', '=', loc_id),
-                ('exclude_sublocation', '=', True),
+                ('exclude_sublocation', '=', exclude_sublocation),
                 ('state', '=', 'done')]
 
     @api.model
diff --git a/stock_cycle_count/views/stock_inventory_view.xml b/stock_cycle_count/views/stock_inventory_view.xml
index 6bdf9c266..dbc84f4c6 100644
--- a/stock_cycle_count/views/stock_inventory_view.xml
+++ b/stock_cycle_count/views/stock_inventory_view.xml
@@ -10,6 +10,7 @@
         <field name="inherit_id" ref="stock.view_inventory_tree"/>
         <field name="arch" type="xml">
             <field name="date" position="after">
+                <field name="location_id"/>
                 <field name="cycle_count_id"/>
                 <field name="inventory_accuracy"/>
             </field>
@@ -31,4 +32,52 @@
         </field>
     </record>
 
+    <record id="view_inventory_filter" model="ir.ui.view">
+        <field name="name">stock.inventory.filter - stock_cycle_count</field>
+        <field name="model">stock.inventory</field>
+        <field name="inherit_id" ref="stock.view_inventory_filter"/>
+        <field name="arch" type="xml">
+            <field name="company_id" position="after">
+                <field name="location_id"/>
+            </field>
+        </field>
+    </record>
+
+    <record id="view_inventory_graph" model="ir.ui.view">
+        <field name="name">stock.inventory.graph</field>
+        <field name="model">stock.inventory</field>
+        <field name="arch" type="xml">
+            <graph string="Inventory accuracy evolution" type="line">
+                <field name="cycle_count_id" type="col"/>
+                <field name="inventory_accuracy" type="measure"/>
+            </graph>
+        </field>
+    </record>
+
+    <record id="view_inventory_pivot" model="ir.ui.view">
+        <field name="name">stock.inventory.pivot</field>
+        <field name="model">stock.inventory</field>
+        <field name="arch" type="xml">
+            <pivot string="Inventory Accuracy">
+                <field name="date" type="col"/>
+                <field name="location_id" type="row"/>
+                <field name="inventory_accuracy" type="measure"/>
+            </pivot>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="act_accuracy_stats">
+        <field name="domain">[('exclude_sublocation', '=', True),
+            ('state', '=', 'done')]</field>
+        <field name="name">Accuracy Stats</field>
+        <field name="res_model">stock.inventory</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">pivot,tree,form,graph</field>
+    </record>
+
+    <menuitem id="menu_report_accuracy_stats"
+              name="Cycle Count Accuracy"
+              parent="stock.menu_warehouse_report"
+              action="act_accuracy_stats" />
+
 </odoo>
diff --git a/stock_cycle_count/views/stock_location_view.xml b/stock_cycle_count/views/stock_location_view.xml
index eef47bbfd..71ef6cced 100644
--- a/stock_cycle_count/views/stock_location_view.xml
+++ b/stock_cycle_count/views/stock_location_view.xml
@@ -4,16 +4,6 @@
 
 <odoo>
 
-    <record model="ir.actions.act_window" id="act_accuracy_stats">
-        <field name="domain">[('location_id', '=', active_ids),
-            ('exclude_sublocation', '=', True),
-            ('state', '=', 'done')]</field>
-        <field name="name">Accuracy Stats</field>
-        <field name="res_model">stock.inventory</field>
-        <field name="view_type">form</field>
-        <field name="view_mode">tree,form,pivot</field>
-    </record>
-
     <record id="view_location_form" model="ir.ui.view">
         <field name="name">Location form - cycle count extension</field>
         <field name="model">stock.location</field>
@@ -21,8 +11,9 @@
         <field name="arch" type="xml">
             <xpath expr="//div[@name='button_box']" position="inside">
                 <button string="Accuracy Stats" class="oe_stat_button"
-                        icon="fa-line-chart" name="%(act_accuracy_stats)d"
-                        type="action"/>
+                        icon="fa-line-chart" name="action_accuracy_stats"
+                        context="{'location_id': active_ids}"
+                        type="object"/>
             </xpath>
             <field name="active" position="after">
                 <field name="zero_confirmation_disabled"/>

From 3b5b485277131568a469b9f8c1b747965b6ccf2d Mon Sep 17 00:00:00 2001
From: lreficent <lois.rilo@eficent.com>
Date: Wed, 15 Nov 2017 10:35:40 +0100
Subject: [PATCH 4/4] [9.0][IMP] stock_cycle_count: cycle counts report

---
 stock_cycle_count/__openerp__.py              |  1 +
 .../reports/stock_cycle_count_report.xml      | 59 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 stock_cycle_count/reports/stock_cycle_count_report.xml

diff --git a/stock_cycle_count/__openerp__.py b/stock_cycle_count/__openerp__.py
index 9108ded83..8542d87a5 100644
--- a/stock_cycle_count/__openerp__.py
+++ b/stock_cycle_count/__openerp__.py
@@ -27,6 +27,7 @@
         'data/cycle_count_sequence.xml',
         'data/cycle_count_ir_cron.xml',
         'reports/stock_location_accuracy_report.xml',
+        'reports/stock_cycle_count_report.xml',
         'security/ir.model.access.csv',
     ],
     "license": "AGPL-3",
diff --git a/stock_cycle_count/reports/stock_cycle_count_report.xml b/stock_cycle_count/reports/stock_cycle_count_report.xml
new file mode 100644
index 000000000..9c1db2ac5
--- /dev/null
+++ b/stock_cycle_count/reports/stock_cycle_count_report.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2017 Eficent Business and IT Consulting Services S.L.
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+
+<odoo>
+
+    <template id="report_cyclecount">
+        <t t-call="report.html_container">
+            <t t-call="report.internal_layout">
+                <div class="page">
+
+                    <table class="table table-condensed">
+                        <thead>
+                            <tr>
+                                <th>Cycle Count #</th>
+                                <th>Location</th>
+                                <th>Required Date</th>
+                                <th>Assigned to</th>
+                                <th>Status</th>
+                            </tr>
+                       </thead>
+                       <tbody class="sale_tbody">
+                            <t t-foreach="docs" t-as="doc">
+                                <tr>
+                                    <td>
+                                       <span t-field="doc.name"/>
+                                    </td>
+                                    <td>
+                                        <span t-field="doc.location_id"/>
+                                    </td>
+                                    <td>
+                                        <span t-field="doc.date_deadline"/>
+                                    </td>
+                                    <td>
+                                        <span t-field="doc.responsible_id"/>
+                                    </td>
+                                    <td class="text-right">
+                                        <span t-field="doc.state"/>
+                                    </td>
+                                </tr>
+                            </t>
+                        </tbody>
+                    </table>
+
+                </div>
+            </t>
+        </t>
+    </template>
+
+    <!-- Report action -->
+    <report
+        id="action_report_stock_cycle_count"
+        model="stock.cycle.count"
+        name="stock_cycle_count.report_cyclecount"
+        string="Cycle Count"
+        report_type="qweb-pdf"
+        groups="stock.group_stock_user"/>
+
+</odoo>