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 c3704e08a..8542d87a5 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",
@@ -26,7 +26,10 @@
'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',
+ 'reports/stock_cycle_count_report.xml',
+ 'security/ir.model.access.csv',
+ ],
"license": "AGPL-3",
'installable': True,
'application': False,
diff --git a/stock_cycle_count/models/stock_inventory.py b/stock_cycle_count/models/stock_inventory.py
index ba548c3d0..f4aad364a 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, 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/__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..6b14a2a2a
--- /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, models
+
+
+class LocationAccuracyReport(models.AbstractModel):
+ _name = "report.stock_location_accuracy"
+
+ @api.model
+ def _get_inventory_domain(self, loc_id, exclude_sublocation=True):
+ return [('location_id', '=', loc_id),
+ ('exclude_sublocation', '=', exclude_sublocation),
+ ('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_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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ | Cycle Count # |
+ Location |
+ Required Date |
+ Assigned to |
+ Status |
+
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+
+ Location:
+
+
+
+
+
+
+
+
+ | Inventory |
+ Date |
+ Accuracy |
+
+
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+
+
+
+
+
+
+