diff --git a/stock_quantity_history_location/README.rst b/stock_quantity_history_location/README.rst index 0256f30..c0788ab 100644 --- a/stock_quantity_history_location/README.rst +++ b/stock_quantity_history_location/README.rst @@ -14,13 +14,13 @@ Stock Quantity History Location :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--reporting-lightgray.png?logo=github - :target: https://github.com/OCA/stock-logistics-reporting/tree/12.0/stock_quantity_history_location + :target: https://github.com/OCA/stock-logistics-reporting/tree/13.0/stock_quantity_history_location :alt: OCA/stock-logistics-reporting .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png - :target: https://translation.odoo-community.org/projects/stock-logistics-reporting-12-0/stock-logistics-reporting-12-0-stock_quantity_history_location + :target: https://translation.odoo-community.org/projects/stock-logistics-reporting-13-0/stock-logistics-reporting-13-0-stock_quantity_history_location :alt: Translate me on Weblate .. |badge5| image:: https://img.shields.io/badge/runbot-Try%20me-875A7B.png - :target: https://runbot.odoo-community.org/runbot/151/12.0 + :target: https://runbot.odoo-community.org/runbot/151/13.0 :alt: Try me on Runbot |badge1| |badge2| |badge3| |badge4| |badge5| @@ -49,7 +49,7 @@ Bug Tracker Bugs are tracked on `GitHub 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 `_. +`feedback `_. Do not contact contributors directly about support or help with technical issues. @@ -59,7 +59,7 @@ Credits Authors ~~~~~~~ -* Eficent +* ForgeFlow Maintainers ~~~~~~~~~~~ @@ -74,6 +74,6 @@ 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. -This module is part of the `OCA/stock-logistics-reporting `_ project on GitHub. +This module is part of the `OCA/stock-logistics-reporting `_ project on GitHub. You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/stock_quantity_history_location/__manifest__.py b/stock_quantity_history_location/__manifest__.py index 1b8c765..012495c 100644 --- a/stock_quantity_history_location/__manifest__.py +++ b/stock_quantity_history_location/__manifest__.py @@ -1,13 +1,13 @@ -# Copyright 2019 Eficent Business and IT Consulting Services, S.L. +# Copyright 2019 ForgeFlow S.L. # Copyright 2019 Aleph Objects, Inc. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). { "name": "Stock Quantity History Location", "summary": "Provides stock quantity by location on past date", - "version": "12.0.1.0.1", + "version": "13.0.1.0.1", "license": "AGPL-3", - "author": "Eficent," "Odoo Community Association (OCA)", + "author": "ForgeFlow," "Odoo Community Association (OCA)", "website": "https://github.com/OCA/stock-logistics-reporting", "depends": ["stock"], "data": ["wizards/stock_quantity_history.xml"], diff --git a/stock_quantity_history_location/i18n/stock_quantity_history_location.pot b/stock_quantity_history_location/i18n/stock_quantity_history_location.pot index ab92ce2..c3f33ea 100644 --- a/stock_quantity_history_location/i18n/stock_quantity_history_location.pot +++ b/stock_quantity_history_location/i18n/stock_quantity_history_location.pot @@ -1,12 +1,12 @@ # Translation of Odoo Server. # This file contains the translation of the following modules: -# * stock_quantity_history_location +# * stock_quantity_history_location # msgid "" msgstr "" -"Project-Id-Version: Odoo Server 12.0\n" +"Project-Id-Version: Odoo Server 13.0\n" "Report-Msgid-Bugs-To: \n" -"Last-Translator: <>\n" +"Last-Translator: \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,4 +27,3 @@ msgstr "" #: model:ir.model,name:stock_quantity_history_location.model_stock_quantity_history msgid "Stock Quantity History" msgstr "" - diff --git a/stock_quantity_history_location/static/description/index.html b/stock_quantity_history_location/static/description/index.html index 87088e3..ac0c72d 100644 --- a/stock_quantity_history_location/static/description/index.html +++ b/stock_quantity_history_location/static/description/index.html @@ -367,7 +367,7 @@ ul.auto-toc { !! This file is generated by oca-gen-addon-readme !! !! changes will be overwritten. !! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --> -

Beta License: AGPL-3 OCA/stock-logistics-reporting Translate me on Weblate Try me on Runbot

+

Beta License: AGPL-3 OCA/stock-logistics-reporting Translate me on Weblate Try me on Runbot

This module allows to run an Inventory report or Inventory Valuation report by location, for a past date or for current date.

Table of contents

@@ -404,7 +404,7 @@ report by location, for a past date or for current date.

Bugs are tracked on GitHub 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.

+feedback.

Do not contact contributors directly about support or help with technical issues.

@@ -412,7 +412,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

Authors

    -
  • Eficent
    • +
  • ForgeFlow
@@ -422,7 +422,7 @@ If you spotted it first, help us smashing it by providing a detailed and welcome

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.

-

This module is part of the OCA/stock-logistics-reporting project on GitHub.

+

This module is part of the OCA/stock-logistics-reporting project on GitHub.

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

diff --git a/stock_quantity_history_location/tests/test_stock_quantity_history_location.py b/stock_quantity_history_location/tests/test_stock_quantity_history_location.py index 2d70039..83d86b4 100644 --- a/stock_quantity_history_location/tests/test_stock_quantity_history_location.py +++ b/stock_quantity_history_location/tests/test_stock_quantity_history_location.py @@ -1,4 +1,4 @@ -# Copyright 2019 Eficent Business and IT Consulting Services, S.L. +# Copyright 2019 ForgeFlow S.L. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). from odoo.tests.common import SavepointCase @@ -49,11 +49,10 @@ class TestStockQuantityHistoryLocation(SavepointCase): { "location_id": self.test_stock_loc.id, "include_child_locations": True, - "compute_at_date": 1, - "date": "2019-08-12", + "inventory_datetime": "2019-08-12 00:00:00", } ) - action = wizard.with_context(company_owned=True).open_table() + action = wizard.with_context(company_owned=True).open_at_date() self.assertEquals( self.product.with_context(action["context"]).qty_available, 100.0 ) @@ -66,24 +65,14 @@ class TestStockQuantityHistoryLocation(SavepointCase): def test_wizard_current(self): wizard = self.env["stock.quantity.history"].create( - { - "location_id": self.test_stock_loc.id, - "include_child_locations": False, - "compute_at_date": 0, - } - ) - action = wizard.with_context().open_table() - self.assertEquals( - action["domain"], [("location_id", "=", self.test_stock_loc.id)] + {"location_id": self.test_stock_loc.id, "include_child_locations": False} ) + action = wizard.with_context().open_at_date() + self.assertEquals(action["context"]["compute_child"], False) + self.assertEquals(action["context"]["location"], self.test_stock_loc.id) wizard = self.env["stock.quantity.history"].create( - { - "location_id": self.test_stock_loc.id, - "include_child_locations": True, - "compute_at_date": 0, - } - ) - action = wizard.with_context().open_table() - self.assertEquals( - action["domain"], [("location_id", "child_of", self.test_stock_loc.id)] + {"location_id": self.test_stock_loc.id, "include_child_locations": True} ) + action = wizard.with_context().open_at_date() + self.assertEquals(action["context"]["compute_child"], True) + self.assertEquals(action["context"]["location"], self.test_stock_loc.id) diff --git a/stock_quantity_history_location/wizards/stock_quantity_history.py b/stock_quantity_history_location/wizards/stock_quantity_history.py index 5b9dd80..3ea6436 100644 --- a/stock_quantity_history_location/wizards/stock_quantity_history.py +++ b/stock_quantity_history_location/wizards/stock_quantity_history.py @@ -1,4 +1,4 @@ -# Copyright 2019 Eficent Business and IT Consulting Services, S.L. +# Copyright 2019 ForgeFlow S.L. # Copyright 2019 Aleph Objects, Inc. # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl). import ast @@ -14,22 +14,13 @@ class StockQuantityHistory(models.TransientModel): ) include_child_locations = fields.Boolean("Include child locations", default=True) - def open_table(self): - action = super(StockQuantityHistory, self).open_table() + def open_at_date(self): + action = super(StockQuantityHistory, self).open_at_date() ctx = action["context"] if isinstance(ctx, str): ctx = ast.literal_eval(ctx) # If we are opening the current quants, filter by domain - if ( - self.location_id - and not self.compute_at_date - and not self.env.context.get("valuation") - ): - if self.include_child_locations: - action["domain"] = [("location_id", "child_of", self.location_id.id)] - else: - action["domain"] = [("location_id", "=", self.location_id.id)] - elif self.location_id: + if self.location_id: ctx["location"] = self.location_id.id ctx["compute_child"] = self.include_child_locations if ctx.get("company_owned", False): diff --git a/stock_quantity_history_location/wizards/stock_quantity_history.xml b/stock_quantity_history_location/wizards/stock_quantity_history.xml index 97329f9..12aa036 100644 --- a/stock_quantity_history_location/wizards/stock_quantity_history.xml +++ b/stock_quantity_history_location/wizards/stock_quantity_history.xml @@ -5,7 +5,7 @@ stock.quantity.history - +