[12.0][MIG] stock_cycle_count: Migration to 12.0

OCA · Jun 24, 2019 · 3a1aeb2 · 3a1aeb2
1 parent 0a6461c
commit 3a1aeb2
Show file tree

Hide file tree

Showing 11 changed files with 80 additions and 73 deletions.
diff --git a/oca_dependencies.txt b/oca_dependencies.txt
@@ -3,3 +3,5 @@
 product-attribute
 server-ux
 web
+stock_inventory_discrepancy https://github.com/ursais/stock-logistics-warehouse bodedra_12.0-mig-stock_inventory_discrepancy
+stock_inventory_exclude_sublocation https://github.com/ursais/stock-logistics-warehouse bodedra_12.0-mig-stock_inventory_exclude_sublocation
diff --git a/stock_cycle_count/README.rst b/stock_cycle_count/README.rst
@@ -14,13 +14,13 @@ Stock Cycle Count
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github
-    :target: https://github.com/OCA/stock-logistics-warehouse/tree/11.0/stock_cycle_count
+    :target: https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_cycle_count
     :alt: OCA/stock-logistics-warehouse
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-11-0/stock-logistics-warehouse-11-0-stock_cycle_count
+    :target: https://translation.odoo-community.org/projects/stock-logistics-warehouse-12-0/stock-logistics-warehouse-12-0-stock_cycle_count
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png
-    :target: https://runbot.odoo-community.org/runbot/153/11.0
+    :target: https://runbot.odoo-community.org/runbot/153/12.0
     :alt: Try me on Runbot
 
 |badge1| |badge2| |badge3| |badge4| |badge5| 
@@ -104,6 +104,12 @@ Known issues / Roadmap
 Changelog
 =========
 
+12.0.1.0.0 (2019-06-24)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [MIG] Migrated to v12.
+
+
 11.0.1.0.0 (2018-09-19)
 ~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -115,7 +121,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/stock-logistics-warehouse/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_cycle_count%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_cycle_count%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -132,6 +138,7 @@ Contributors
 
 * Lois Rilo <lois.rilo@eficent.com>
 * Jordi Ballester Alomar <jordi.ballester@eficent.com>
+* Bhavesh Odedra <bodedra@opensourceintegrators.com>
 
 Maintainers
 ~~~~~~~~~~~
@@ -154,6 +161,6 @@ Current `maintainer <https://odoo-community.org/page/maintainer-role>`__:
 
 |maintainer-lreficent| 
 
-This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/11.0/stock_cycle_count>`_ project on GitHub.
+This module is part of the `OCA/stock-logistics-warehouse <https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_cycle_count>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/stock_cycle_count/models/stock_inventory.py b/stock_cycle_count/models/stock_inventory.py
@@ -40,8 +40,8 @@ def _update_cycle_state(self):
         return True
 
     @api.multi
-    def action_done(self):
-        res = super(StockInventory, self).action_done()
+    def action_validate(self):
+        res = super(StockInventory, self).action_validate()
         self._update_cycle_state()
         return res
 

diff --git a/stock_cycle_count/models/stock_warehouse.py b/stock_cycle_count/models/stock_warehouse.py
@@ -40,8 +40,7 @@ def get_horizon_date(self):
     @api.model
     def _get_cycle_count_locations_search_domain(
             self, parent):
-        domain = [('parent_left', '>=', parent.parent_left),
-                  ('parent_right', '<=', parent.parent_right),
+        domain = [('parent_path', '=like', parent.parent_path + '%'),
                   ('cycle_count_disabled', '=', False)]
         return domain
 
@@ -104,19 +103,22 @@ def action_compute_cycle_count_rules(self):
                     if existing_cycle_counts:
                         existing_earliest_date = sorted(
                             existing_cycle_counts.mapped('date_deadline'))[0]
-                        if (cycle_count_proposed['date'] <
+                        existing_earliest_date = fields.Date.from_string(
+                            existing_earliest_date)
+                        cycle_count_proposed_date = fields.Date.from_string(
+                            cycle_count_proposed['date'])
+                        if (cycle_count_proposed_date <
                                 existing_earliest_date):
                             cc_to_update = existing_cycle_counts.search([
                                 ('date_deadline', '=', existing_earliest_date)
                             ])
                             cc_to_update.write({
-                                'date_deadline': cycle_count_proposed['date'],
+                                'date_deadline': cycle_count_proposed_date,
                                 'cycle_count_rule_id': cycle_count_proposed[
                                     'rule_type'].id,
                             })
-                    delta = datetime.strptime(
-                        cycle_count_proposed['date'],
-                        DEFAULT_SERVER_DATETIME_FORMAT) - datetime.today()
+                    delta = (fields.Datetime.from_string(
+                        cycle_count_proposed['date']) - datetime.today())
                     if not existing_cycle_counts and \
                             delta.days < rec.cycle_count_planning_horizon:
                         cc_vals = self._prepare_cycle_count(

diff --git a/stock_cycle_count/readme/CONTRIBUTORS.rst b/stock_cycle_count/readme/CONTRIBUTORS.rst
@@ -1,2 +1,3 @@
 * Lois Rilo <lois.rilo@eficent.com>
 * Jordi Ballester Alomar <jordi.ballester@eficent.com>
+* Bhavesh Odedra <bodedra@opensourceintegrators.com>
diff --git a/stock_cycle_count/readme/HISTORY.rst b/stock_cycle_count/readme/HISTORY.rst
@@ -1,3 +1,9 @@
+12.0.1.0.0 (2019-06-24)
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* [MIG] Migrated to v12.
+
+
 11.0.1.0.0 (2018-09-19)
 ~~~~~~~~~~~~~~~~~~~~~~~
 

diff --git a/stock_cycle_count/reports/stock_cycle_count_report.xml b/stock_cycle_count/reports/stock_cycle_count_report.xml
@@ -5,8 +5,8 @@
 <odoo>
 
     <template id="report_cyclecount">
-        <t t-call="report.html_container">
-            <t t-call="report.internal_layout">
+        <t t-call="web.html_container">
+            <t t-call="web.internal_layout">
                 <div class="page">
 
                     <table class="table table-condensed">

diff --git a/stock_cycle_count/reports/stock_location_accuracy_report.xml b/stock_cycle_count/reports/stock_location_accuracy_report.xml
@@ -6,9 +6,9 @@
 
     <!-- Templates -->
     <template id="stock_location_accuracy">
-        <t t-call="report.html_container">
+        <t t-call="web.html_container">
             <t t-foreach="docs" t-as="doc">
-                <t t-call="report.external_layout">
+                <t t-call="web.external_layout">
                     <div class="page">
                         <div class="oe_structure"/>
                         <h3>

diff --git a/stock_cycle_count/static/description/index.html b/stock_cycle_count/static/description/index.html
@@ -3,13 +3,13 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.14: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.12: http://docutils.sourceforge.net/" />
 <title>Stock Cycle Count</title>
 <style type="text/css">
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 7952 2016-07-26 18:15:59Z milde $
+:Id: $Id: html4css1.css 7614 2013-02-21 15:55:51Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
@@ -37,14 +37,6 @@
 .hidden {
   display: none }
 
-.subscript {
-  vertical-align: sub;
-  font-size: smaller }
-
-.superscript {
-  vertical-align: super;
-  font-size: smaller }
-
 a.toc-backref {
   text-decoration: none ;
   color: black }
@@ -169,12 +161,12 @@
 hr.docutils {
   width: 75% }
 
-img.align-left, .figure.align-left, object.align-left, table.align-left {
+img.align-left, .figure.align-left, object.align-left {
   clear: left ;
   float: left ;
   margin-right: 1em }
 
-img.align-right, .figure.align-right, object.align-right, table.align-right {
+img.align-right, .figure.align-right, object.align-right {
   clear: right ;
   float: right ;
   margin-left: 1em }
@@ -185,11 +177,6 @@
   margin-right: auto;
 }
 
-table.align-center {
-  margin-left: auto;
-  margin-right: auto;
-}
-
 .align-left {
   text-align: left }
 
@@ -207,15 +194,6 @@
 /* div.align-center * { */
 /*   text-align: left } */
 
-.align-top    {
-  vertical-align: top }
-
-.align-middle {
-  vertical-align: middle }
-
-.align-bottom {
-  vertical-align: bottom }
-
 ol.simple, ul.simple {
   margin-bottom: 1em }
 
@@ -367,7 +345,7 @@ <h1 class="title">Stock Cycle Count</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Mature" src="https://img.shields.io/badge/maturity-Mature-brightgreen.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/11.0/stock_cycle_count"><img alt="OCA/stock-logistics-warehouse" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-11-0/stock-logistics-warehouse-11-0-stock_cycle_count"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/11.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external" href="https://odoo-community.org/page/development-status"><img alt="Mature" src="https://img.shields.io/badge/maturity-Mature-brightgreen.png" /></a> <a class="reference external" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_cycle_count"><img alt="OCA/stock-logistics-warehouse" src="https://img.shields.io/badge/github-OCA%2Fstock--logistics--warehouse-lightgray.png?logo=github" /></a> <a class="reference external" href="https://translation.odoo-community.org/projects/stock-logistics-warehouse-12-0/stock-logistics-warehouse-12-0-stock_cycle_count"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external" href="https://runbot.odoo-community.org/runbot/153/12.0"><img alt="Try me on Runbot" src="https://img.shields.io/badge/runbot-Try%20me-875A7B.png" /></a></p>
 <p>This module provides the capability to execute a cycle count strategy in a
 warehouse through different rules defined by the user. Cycle count is an
 alternative to full wall-to-wall physical inventories in which little
@@ -387,35 +365,36 @@ <h1 class="title">Stock Cycle Count</h1>
 <p><strong>Table of contents</strong></p>
 <div class="contents local topic" id="contents">
 <ul class="simple">
-<li><a class="reference internal" href="#installation" id="id2">Installation</a><ul>
-<li><a class="reference internal" href="#recommendations" id="id3">Recommendations</a></li>
+<li><a class="reference internal" href="#installation" id="id3">Installation</a><ul>
+<li><a class="reference internal" href="#recommendations" id="id4">Recommendations</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#configuration" id="id4">Configuration</a></li>
-<li><a class="reference internal" href="#usage" id="id5">Usage</a></li>
-<li><a class="reference internal" href="#known-issues-roadmap" id="id6">Known issues / Roadmap</a></li>
-<li><a class="reference internal" href="#changelog" id="id7">Changelog</a><ul>
-<li><a class="reference internal" href="#id1" id="id8">11.0.1.0.0 (2018-09-19)</a></li>
+<li><a class="reference internal" href="#configuration" id="id5">Configuration</a></li>
+<li><a class="reference internal" href="#usage" id="id6">Usage</a></li>
+<li><a class="reference internal" href="#known-issues-roadmap" id="id7">Known issues / Roadmap</a></li>
+<li><a class="reference internal" href="#changelog" id="id8">Changelog</a><ul>
+<li><a class="reference internal" href="#id1" id="id9">12.0.1.0.0 (2019-06-24)</a></li>
+<li><a class="reference internal" href="#id2" id="id10">11.0.1.0.0 (2018-09-19)</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#bug-tracker" id="id9">Bug Tracker</a></li>
-<li><a class="reference internal" href="#credits" id="id10">Credits</a><ul>
-<li><a class="reference internal" href="#authors" id="id11">Authors</a></li>
-<li><a class="reference internal" href="#contributors" id="id12">Contributors</a></li>
-<li><a class="reference internal" href="#maintainers" id="id13">Maintainers</a></li>
+<li><a class="reference internal" href="#bug-tracker" id="id11">Bug Tracker</a></li>
+<li><a class="reference internal" href="#credits" id="id12">Credits</a><ul>
+<li><a class="reference internal" href="#authors" id="id13">Authors</a></li>
+<li><a class="reference internal" href="#contributors" id="id14">Contributors</a></li>
+<li><a class="reference internal" href="#maintainers" id="id15">Maintainers</a></li>
 </ul>
 </li>
 </ul>
 </div>
 <div class="section" id="installation">
-<h1><a class="toc-backref" href="#id2">Installation</a></h1>
+<h1><a class="toc-backref" href="#id3">Installation</a></h1>
 <p>To install this module, you need to:</p>
 <ul class="simple">
 <li>Download this module to your addons path.</li>
 <li>Install the module in your database.</li>
 </ul>
 <div class="section" id="recommendations">
-<h2><a class="toc-backref" href="#id3">Recommendations</a></h2>
+<h2><a class="toc-backref" href="#id4">Recommendations</a></h2>
 <p>It is highly recommended to use this module in conjunction with:</p>
 <ul class="simple">
 <li><tt class="docutils literal">stock_inventory_verification_request</tt>: Adds the capability to request Slot
@@ -425,7 +404,7 @@ <h2><a class="toc-backref" href="#id3">Recommendations</a></h2>
 </div>
 </div>
 <div class="section" id="configuration">
-<h1><a class="toc-backref" href="#id4">Configuration</a></h1>
+<h1><a class="toc-backref" href="#id5">Configuration</a></h1>
 <p>You can configure the rules to compute the cycle count, acting as follow:</p>
 <ol class="arabic simple">
 <li>Go to <em>Inventory &gt; Configuration &gt; Cycle Count Rules</em>.</li>
@@ -437,7 +416,7 @@ <h1><a class="toc-backref" href="#id4">Configuration</a></h1>
 </ol>
 </div>
 <div class="section" id="usage">
-<h1><a class="toc-backref" href="#id5">Usage</a></h1>
+<h1><a class="toc-backref" href="#id6">Usage</a></h1>
 <p>Once you have some rules configured for your warehouses, you can proceed as
 is described below.</p>
 <ol class="arabic simple">
@@ -454,55 +433,62 @@ <h1><a class="toc-backref" href="#id5">Usage</a></h1>
 </ol>
 </div>
 <div class="section" id="known-issues-roadmap">
-<h1><a class="toc-backref" href="#id6">Known issues / Roadmap</a></h1>
+<h1><a class="toc-backref" href="#id7">Known issues / Roadmap</a></h1>
 <ul class="simple">
 <li>Assess the possibility to refactor <cite>action_compute_cycle_count_rules</cite> method
 converting some of the searches to actual fields. E.g.
 <cite>inventory_history_ids</cite> for all the inventories done in a location.</li>
 </ul>
 </div>
 <div class="section" id="changelog">
-<h1><a class="toc-backref" href="#id7">Changelog</a></h1>
+<h1><a class="toc-backref" href="#id8">Changelog</a></h1>
 <div class="section" id="id1">
-<h2><a class="toc-backref" href="#id8">11.0.1.0.0 (2018-09-19)</a></h2>
+<h2><a class="toc-backref" href="#id9">12.0.1.0.0 (2019-06-24)</a></h2>
+<ul class="simple">
+<li>[MIG] Migrated to v12.</li>
+</ul>
+</div>
+<div class="section" id="id2">
+<h2><a class="toc-backref" href="#id10">11.0.1.0.0 (2018-09-19)</a></h2>
 <ul class="simple">
 <li>[MIG] Migrated to v11. Start of history.</li>
 </ul>
 </div>
 </div>
 <div class="section" id="bug-tracker">
-<h1><a class="toc-backref" href="#id9">Bug Tracker</a></h1>
+<h1><a class="toc-backref" href="#id11">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us smashing it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_cycle_count%0Aversion:%2011.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/issues/new?body=module:%20stock_cycle_count%0Aversion:%2012.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
-<h1><a class="toc-backref" href="#id10">Credits</a></h1>
+<h1><a class="toc-backref" href="#id12">Credits</a></h1>
 <div class="section" id="authors">
-<h2><a class="toc-backref" href="#id11">Authors</a></h2>
+<h2><a class="toc-backref" href="#id13">Authors</a></h2>
 <ul class="simple">
 <li>Eficent</li>
 </ul>
 </div>
 <div class="section" id="contributors">
-<h2><a class="toc-backref" href="#id12">Contributors</a></h2>
+<h2><a class="toc-backref" href="#id14">Contributors</a></h2>
 <ul class="simple">
 <li>Lois Rilo &lt;<a class="reference external" href="mailto:lois.rilo&#64;eficent.com">lois.rilo&#64;eficent.com</a>&gt;</li>
 <li>Jordi Ballester Alomar &lt;<a class="reference external" href="mailto:jordi.ballester&#64;eficent.com">jordi.ballester&#64;eficent.com</a>&gt;</li>
+<li>Bhavesh Odedra &lt;<a class="reference external" href="mailto:bodedra&#64;opensourceintegrators.com">bodedra&#64;opensourceintegrators.com</a>&gt;</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
-<h2><a class="toc-backref" href="#id13">Maintainers</a></h2>
+<h2><a class="toc-backref" href="#id15">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
 <a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainer</a>:</p>
 <p><a class="reference external" href="https://github.com/lreficent"><img alt="lreficent" src="https://github.com/lreficent.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/11.0/stock_cycle_count">OCA/stock-logistics-warehouse</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/stock-logistics-warehouse/tree/12.0/stock_cycle_count">OCA/stock-logistics-warehouse</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

diff --git a/stock_cycle_count/tests/test_stock_cycle_count.py b/stock_cycle_count/tests/test_stock_cycle_count.py
@@ -219,7 +219,7 @@ def test_cycle_count_workflow(self):
             ('cycle_count_id', '=', self.cycle_count_1.id)])
         self.assertTrue(inventory, 'Inventory not created.')
         inventory.action_start()
-        inventory.action_done()
+        inventory.action_validate()
         self.assertEqual(self.cycle_count_1.state, 'done',
                          'Cycle count not set as done.')
         self.cycle_count_1.do_cancel()