From af5398bef013a2fe7bf54796e6eae250d4bef573 Mon Sep 17 00:00:00 2001 From: Kiko Peiro Date: Tue, 14 Nov 2017 17:24:13 +0100 Subject: [PATCH] [MIG] stock_available: Migration to 11.0 --- stock_available/README.rst | 6 +- stock_available/__init__.py | 1 - stock_available/__manifest__.py | 5 +- stock_available/models/__init__.py | 3 +- stock_available/models/product_product.py | 1 - stock_available/models/product_template.py | 1 - .../{res_config.py => res_config_settings.py} | 25 ++++--- stock_available/tests/__init__.py | 1 - stock_available/tests/test_stock_available.py | 15 ++-- .../views/res_config_settings_views.xml | 72 +++++++++++++++++++ stock_available/views/res_config_view.xml | 38 ---------- 11 files changed, 97 insertions(+), 71 deletions(-) rename stock_available/models/{res_config.py => res_config_settings.py} (78%) create mode 100644 stock_available/views/res_config_settings_views.xml delete mode 100644 stock_available/views/res_config_view.xml diff --git a/stock_available/README.rst b/stock_available/README.rst index f4085a78c..60406583c 100644 --- a/stock_available/README.rst +++ b/stock_available/README.rst @@ -35,7 +35,7 @@ chose to base the computation on. .. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas :alt: Try me on Runbot - :target: https://runbot.odoo-community.org/runbot/153/10.0 + :target: https://runbot.odoo-community.org/runbot/153/11.0 Bug Tracker =========== @@ -58,7 +58,7 @@ Contributors * Lionel Sausin (Numérigraphe) * Sodexis -* Cédric Pigeon +* Factor Libre - Kiko Peiro Maintainer ---------- @@ -73,4 +73,4 @@ 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. -To contribute to this module, please visit https://odoo-community.org. +To contribute to this module, please visit https://odoo-community.org. \ No newline at end of file diff --git a/stock_available/__init__.py b/stock_available/__init__.py index 1c7afe72c..2c1e277e2 100644 --- a/stock_available/__init__.py +++ b/stock_available/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2014 Numérigraphe # Copyright 2016 Sodexis # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/stock_available/__manifest__.py b/stock_available/__manifest__.py index a42fde78d..ea5963f16 100644 --- a/stock_available/__manifest__.py +++ b/stock_available/__manifest__.py @@ -1,11 +1,10 @@ -# -*- coding: utf-8 -*- # Copyright 2014 Numérigraphe # Copyright 2016 Sodexis # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). { 'name': 'Stock available to promise', - 'version': '10.0.1.0.1', + 'version': '11.0.1.0.0', "author": "Numérigraphe, Sodexis, Odoo Community Association (OCA)", 'category': 'Warehouse', 'depends': ['stock'], @@ -13,7 +12,7 @@ 'data': [ 'views/product_template_view.xml', 'views/product_product_view.xml', - 'views/res_config_view.xml', + 'views/res_config_settings_views.xml', ], 'installable': True, } diff --git a/stock_available/models/__init__.py b/stock_available/models/__init__.py index ee9f0d3ba..9eef7e687 100644 --- a/stock_available/models/__init__.py +++ b/stock_available/models/__init__.py @@ -1,8 +1,7 @@ -# -*- coding: utf-8 -*- # Copyright 2014 Numérigraphe # Copyright 2016 Sodexis # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). from . import product_template from . import product_product -from . import res_config +from . import res_config_settings diff --git a/stock_available/models/product_product.py b/stock_available/models/product_product.py index 196dff121..36a4b3ae7 100644 --- a/stock_available/models/product_product.py +++ b/stock_available/models/product_product.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2014 Numérigraphe # Copyright 2016 Sodexis # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/stock_available/models/product_template.py b/stock_available/models/product_template.py index 53be5c904..2f81fbff7 100644 --- a/stock_available/models/product_template.py +++ b/stock_available/models/product_template.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2014 Numérigraphe # Copyright 2016 Sodexis # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/stock_available/models/res_config.py b/stock_available/models/res_config_settings.py similarity index 78% rename from stock_available/models/res_config.py rename to stock_available/models/res_config_settings.py index 6e0afe2aa..870207baa 100644 --- a/stock_available/models/res_config.py +++ b/stock_available/models/res_config_settings.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2014 Numérigraphe # Copyright 2016 Sodexis # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -6,10 +5,10 @@ from odoo import api, models, fields -class StockConfig(models.TransientModel): +class ResConfigSettings(models.TransientModel): """Add options to easily install the submodules""" - _inherit = 'stock.config.settings' + _inherit = 'res.config.settings' @api.model def _get_stock_available_mrp_based_on(self): @@ -54,17 +53,17 @@ class StockConfig(models.TransientModel): ) @api.model - def get_default_stock_available_mrp_based_on(self, fields): - res = {} - icp = self.env['ir.config_parameter'] - res['stock_available_mrp_based_on'] = icp.get_param( - 'stock_available_mrp_based_on', 'qty_available' + def get_values(self): + res = super(ResConfigSettings, self).get_values() + res.update(stock_available_mrp_based_on=self.env[ + 'ir.config_parameter'].sudo().get_param( + 'stock_available_mrp_based_on', + 'qty_available') ) return res @api.multi - def set_stock_available_mrp_based_on(self): - if self.stock_available_mrp_based_on: - icp = self.env['ir.config_parameter'] - icp.set_param('stock_available_mrp_based_on', - self.stock_available_mrp_based_on) + def set_values(self): + super(ResConfigSettings, self).set_values() + self.env['ir.config_parameter'].sudo().set_param( + 'stock_available_mrp_based_on', self.stock_available_mrp_based_on) diff --git a/stock_available/tests/__init__.py b/stock_available/tests/__init__.py index 2e7403795..678c94ff7 100644 --- a/stock_available/tests/__init__.py +++ b/stock_available/tests/__init__.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2014 Numérigraphe # Copyright 2016 Sodexis # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). diff --git a/stock_available/tests/test_stock_available.py b/stock_available/tests/test_stock_available.py index 0d05e786c..40fae522d 100644 --- a/stock_available/tests/test_stock_available.py +++ b/stock_available/tests/test_stock_available.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Copyright 2014 Numérigraphe # Copyright 2016 Sodexis # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). @@ -9,13 +8,13 @@ from odoo.tests.common import TransactionCase class TestStockLogisticsWarehouse(TransactionCase): def test_res_config(self): """Test the config file""" - stock_setting = self.env['stock.config.settings'].create({}) + stock_setting = self.env['res.config.settings'].create({}) self.assertEquals( stock_setting.stock_available_mrp_based_on, 'qty_available') stock_setting.stock_available_mrp_based_on = 'immediately_usable_qty' - stock_setting.set_stock_available_mrp_based_on() + stock_setting.set_values() self.assertEquals( stock_setting.stock_available_mrp_based_on, 'immediately_usable_qty') @@ -104,20 +103,20 @@ class TestStockLogisticsWarehouse(TransactionCase): compare_product_usable_qty(productA, 0) compare_product_usable_qty(templateAB, 0) - stockMoveInA.action_confirm() + stockMoveInA._action_confirm() compare_product_usable_qty(productA, 2) compare_product_usable_qty(templateAB, 2) - stockMoveInA.action_assign() + stockMoveInA._action_assign() compare_product_usable_qty(productA, 2) compare_product_usable_qty(templateAB, 2) - stockMoveInA.action_done() + stockMoveInA._action_done() compare_product_usable_qty(productA, 2) compare_product_usable_qty(templateAB, 2) # will directly trigger action_done on productB - stockMoveInB.action_done() + stockMoveInB._action_done() compare_product_usable_qty(productA, 2) compare_product_usable_qty(productB, 3) compare_product_usable_qty(templateAB, 5) @@ -133,7 +132,7 @@ class TestStockLogisticsWarehouse(TransactionCase): 'state': 'confirmed', }) - stockMoveOutA.action_done() + stockMoveOutA._action_done() compare_product_usable_qty(productA, 1) compare_product_usable_qty(templateAB, 4) diff --git a/stock_available/views/res_config_settings_views.xml b/stock_available/views/res_config_settings_views.xml new file mode 100644 index 000000000..8a5834629 --- /dev/null +++ b/stock_available/views/res_config_settings_views.xml @@ -0,0 +1,72 @@ + + + + + + Stock settings: quantity available to promise + res.config.settings + + + + +

Stock available to promise

+
+
+
+ +
+
+
+
+
+
+ +
+
+
+
+ + + + + + +
+ + + + + diff --git a/stock_available/views/res_config_view.xml b/stock_available/views/res_config_view.xml deleted file mode 100644 index f270e06ae..000000000 --- a/stock_available/views/res_config_view.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - Stock settings: quantity available to promise - stock.config.settings - - - - - - - - - - -