From 01be20d7d3a97361d51af7dbfbed4ccfd8f3a113 Mon Sep 17 00:00:00 2001 From: Lois Rilo Date: Tue, 12 Jun 2018 11:51:34 +0200 Subject: [PATCH] [11.0][FIX] multi_level_mrp: fix tests --- multi_level_mrp/tests/test_multi_level_mrp.py | 129 +++++++++++++----- multi_level_mrp/wizards/multi_level_mrp.py | 33 ++--- .../wizards/multi_level_mrp_view.xml | 2 +- 3 files changed, 115 insertions(+), 49 deletions(-) diff --git a/multi_level_mrp/tests/test_multi_level_mrp.py b/multi_level_mrp/tests/test_multi_level_mrp.py index c6424bb36..ee801aae9 100644 --- a/multi_level_mrp/tests/test_multi_level_mrp.py +++ b/multi_level_mrp/tests/test_multi_level_mrp.py @@ -2,59 +2,124 @@ # (http://www.eficent.com) # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl.html). -from odoo.tests.common import SavepointCase from datetime import datetime, timedelta +from odoo.tests.common import SavepointCase +from odoo import fields + class TestMultiLevelMRP(SavepointCase): - def setUp(self): - super(TestMultiLevelMRP, self).setUp() - self.wiz_multi_level_mrp_model = self.env['multi.level.mrp'] - self.stock_picking_model = self.env['stock.picking'] - self.mrp_inventory_model = self.env['mrp.inventory'] - self.fp_1 = self.env.ref('multi_level_mrp.product_product_fp_1') - self.fp_2 = self.env.ref('multi_level_mrp.product_product_fp_2') - self.sf_1 = self.env.ref('multi_level_mrp.product_product_sf_1') - self.sf_2 = self.env.ref('multi_level_mrp.product_product_sf_2') - self.pp_1 = self.env.ref('multi_level_mrp.product_product_pp_1') - self.pp_2 = self.env.ref('multi_level_mrp.product_product_pp_2') - self.wh = self.env.ref('stock.warehouse0') - self.stock_location = self.wh.lot_stock_id - self.customer_location = self.env.ref( + + @classmethod + def setUpClass(cls): + super(TestMultiLevelMRP, cls).setUpClass() + cls.wiz_multi_level_mrp_model = cls.env['multi.level.mrp'] + cls.stock_picking_model = cls.env['stock.picking'] + cls.mrp_inventory_model = cls.env['mrp.inventory'] + cls.fp_1 = cls.env.ref('multi_level_mrp.product_product_fp_1') + cls.fp_2 = cls.env.ref('multi_level_mrp.product_product_fp_2') + cls.sf_1 = cls.env.ref('multi_level_mrp.product_product_sf_1') + cls.sf_2 = cls.env.ref('multi_level_mrp.product_product_sf_2') + cls.pp_1 = cls.env.ref('multi_level_mrp.product_product_pp_1') + cls.pp_2 = cls.env.ref('multi_level_mrp.product_product_pp_2') + cls.wh = cls.env.ref('stock.warehouse0') + cls.stock_location = cls.wh.lot_stock_id + cls.customer_location = cls.env.ref( 'stock.stock_location_customers') date_move = datetime.today() + timedelta(days=7) - self.picking_1 = self.stock_picking_model.create({ - 'picking_type_id': self.ref('stock.picking_type_out'), - 'location_id': self.stock_location.id, - 'location_dest_id': self.customer_location.id, + cls.picking_1 = cls.stock_picking_model.create({ + 'picking_type_id': cls.env.ref('stock.picking_type_out').id, + 'location_id': cls.stock_location.id, + 'location_dest_id': cls.customer_location.id, 'move_lines': [ (0, 0, { 'name': 'Test move pf-1', - 'product_id': self.fp_1.id, + 'product_id': cls.fp_1.id, 'date_expected': date_move, 'date': date_move, - 'product_uom': self.fp_1.uom_id.id, + 'product_uom': cls.fp_1.uom_id.id, 'product_uom_qty': 100, - 'location_id': self.stock_location.id, - 'location_dest_id': self.customer_location.id + 'location_id': cls.stock_location.id, + 'location_dest_id': cls.customer_location.id }), (0, 0, { 'name': 'Test move fp-2', - 'product_id': self.fp_2.id, + 'product_id': cls.fp_2.id, 'date_expected': date_move, 'date': date_move, - 'product_uom': self.fp_2.uom_id.id, + 'product_uom': cls.fp_2.uom_id.id, 'product_uom_qty': 15, - 'location_id': self.stock_location.id, - 'location_dest_id': self.customer_location.id + 'location_id': cls.stock_location.id, + 'location_dest_id': cls.customer_location.id })] }) - self.picking_1.action_confirm() + cls.picking_1.action_confirm() + cls.wiz_multi_level_mrp_model.create({}).run_multi_level_mrp() - def test_mrp_1(self): - self.wiz_multi_level_mrp_model.create({}).run_multi_level_mrp() + def test_01_mrp_levels(self): + """Tests computation of MRP levels.""" + self.assertEqual(self.fp_1.llc, 0) + self.assertEqual(self.fp_2.llc, 0) + self.assertEqual(self.sf_1.llc, 1) + self.assertEqual(self.sf_2.llc, 1) + self.assertEqual(self.pp_1.llc, 2) + self.assertEqual(self.pp_2.llc, 2) + + def test_02_multi_level_mrp(self): + """Tests MRP inventories created.""" + # FP-1 + fp_1_inventory_lines = self.mrp_inventory_model.search( + [('mrp_product_id.product_id', '=', self.fp_1.id)]) + self.assertEqual(len(fp_1_inventory_lines), 1) + date_7 = fields.Date.to_string(datetime.today() + timedelta(days=7)) + self.assertEqual(fp_1_inventory_lines.date, date_7) + self.assertEqual(fp_1_inventory_lines.demand_qty, 100.0) + self.assertEqual(fp_1_inventory_lines.to_procure, 100.0) + # FP-2 + fp_2_inventory_lines = self.mrp_inventory_model.search( + [('mrp_product_id.product_id', '=', self.fp_2.id)]) + self.assertEqual(len(fp_2_inventory_lines), 1) + self.assertEqual(fp_2_inventory_lines.date, date_7) + self.assertEqual(fp_2_inventory_lines.demand_qty, 15.0) + self.assertEqual(fp_2_inventory_lines.to_procure, 15.0) + + # SF-1 + sf_1_inventory_lines = self.mrp_inventory_model.search( + [('mrp_product_id.product_id', '=', self.sf_1.id)]) + self.assertEqual(len(sf_1_inventory_lines), 1) + date_6 = fields.Date.to_string(datetime.today() + timedelta(days=6)) + self.assertEqual(sf_1_inventory_lines.date, date_6) + self.assertEqual(sf_1_inventory_lines.demand_qty, 30.0) + self.assertEqual(sf_1_inventory_lines.to_procure, 30.0) + # SF-2 + sf_2_inventory_lines = self.mrp_inventory_model.search( + [('mrp_product_id.product_id', '=', self.sf_2.id)]) + self.assertEqual(len(sf_2_inventory_lines), 1) + self.assertEqual(sf_2_inventory_lines.date, date_6) + self.assertEqual(sf_2_inventory_lines.demand_qty, 45.0) + self.assertEqual(sf_2_inventory_lines.to_procure, 30.0) + + # PP-1 pp_1_inventory_lines = self.mrp_inventory_model.search( [('mrp_product_id.product_id', '=', self.pp_1.id)]) self.assertEqual(len(pp_1_inventory_lines), 1) - self.assertEqual(pp_1_inventory_lines.demand_qty, 290) - self.assertEqual(pp_1_inventory_lines.to_procure, 250) + date_5 = fields.Date.to_string(datetime.today() + timedelta(days=5)) + self.assertEqual(pp_1_inventory_lines.date, date_5) + self.assertEqual(pp_1_inventory_lines.demand_qty, 290.0) + self.assertEqual(pp_1_inventory_lines.to_procure, 280.0) + # PP-2 + pp_2_line_1 = self.mrp_inventory_model.search([ + ('mrp_product_id.product_id', '=', self.pp_2.id), + ('date', '=', date_5)]) + self.assertEqual(len(pp_2_line_1), 1) + self.assertEqual(pp_2_line_1.demand_qty, 360.0) + self.assertEqual(pp_2_line_1.to_procure, 360.0) + date_3 = fields.Date.to_string(datetime.today() + timedelta(days=3)) + pp_2_line_2 = self.mrp_inventory_model.search([ + ('mrp_product_id.product_id', '=', self.pp_2.id), + ('date', '=', date_3)]) + self.assertEqual(len(pp_2_line_2), 1) + self.assertEqual(pp_2_line_2.demand_qty, 90.0) + self.assertEqual(pp_2_line_2.to_procure, 70.0) + + # TODO: test procure wizard: dates... diff --git a/multi_level_mrp/wizards/multi_level_mrp.py b/multi_level_mrp/wizards/multi_level_mrp.py index 70f407d14..23d2a383e 100644 --- a/multi_level_mrp/wizards/multi_level_mrp.py +++ b/multi_level_mrp/wizards/multi_level_mrp.py @@ -49,7 +49,7 @@ class MultiLevelMrp(models.TransientModel): 'name': product.name, 'supply_method': supply_method, 'main_supplier_id': main_supplier_id, - } + } @api.model def _prepare_mrp_move_data_from_forecast(self, fc, fc_id, mrpproduct): @@ -322,9 +322,9 @@ class MultiLevelMrp(models.TransientModel): # sql statements due to performance issues when the auditlog is # installed logger.info('START MRP CLEANUP') - self.env['mrp.move'].search([('id', '!=', 0)]).unlink() - self.env['mrp.product'].search([('id', '!=', 0)]).unlink() - self.env['mrp.inventory'].search([('id', '!=', 0)]).unlink() + self.env['mrp.move'].search([]).unlink() + self.env['mrp.product'].search([]).unlink() + self.env['mrp.inventory'].search([]).unlink() logger.info('END MRP CLEANUP') return True @@ -332,16 +332,15 @@ class MultiLevelMrp(models.TransientModel): def _low_level_code_calculation(self): logger.info('START LOW LEVEL CODE CALCULATION') counter = 999999 - self.env['product.product'].search([]).write({'llc': 0}) - products = self.env['product.product'].search([('llc', '=', 0)]) + llc = 0 + self.env['product.product'].search([]).write({'llc': llc}) + products = self.env['product.product'].search([('llc', '=', llc)]) if products: counter = len(products) log_msg = 'LOW LEVEL CODE 0 FINISHED - NBR PRODUCTS: %s' % counter logger.info(log_msg) - llc = 0 - # TODO: possibly replace condition to while counter != 0 - while counter != 999999: + while counter: llc += 1 products = self.env['product.product'].search( [('llc', '=', llc - 1)]) @@ -356,8 +355,7 @@ class MultiLevelMrp(models.TransientModel): log_msg = 'LOW LEVEL CODE %s FINISHED - NBR PRODUCTS: %s' % ( llc, counter) logger.info(log_msg) - if counter == 0: - counter = 999999 + mrp_lowest_llc = llc logger.info('END LOW LEVEL CODE CALCULATION') return mrp_lowest_llc @@ -365,6 +363,9 @@ class MultiLevelMrp(models.TransientModel): @api.model def _calculate_mrp_applicable(self): # TODO: Refactor all code here + self.env['product.product'].search([ + ('type', '=', 'product'), + ]).write({'mrp_applicable': True}) return True logger.info('CALCULATE MRP APPLICABLE') sql_stat = '''UPDATE product_product SET mrp_applicable = False;''' @@ -430,8 +431,8 @@ class MultiLevelMrp(models.TransientModel): @api.model def _init_mrp_product(self, product, mrp_area): - mrp_product_data = self._prepare_mrp_product_data(product, - mrp_area) + mrp_product_data = self._prepare_mrp_product_data( + product, mrp_area) return self.env['mrp.product'].create(mrp_product_data) @api.model @@ -699,8 +700,8 @@ class MultiLevelMrp(models.TransientModel): def _mrp_initialisation(self): logger.info('START MRP INITIALISATION') mrp_areas = self.env['mrp.area'].search([]) - products = self.env['product.product'].search([('mrp_applicable', - '=', True)]) + products = self.env['product.product'].search([ + ('mrp_applicable', '=', True)]) init_counter = 0 for mrp_area in mrp_areas: for product in products: @@ -965,7 +966,7 @@ class MultiLevelMrp(models.TransientModel): # self.env.cr.commit() logger.info('END MRP FINAL PROCESS') - @api.one + @api.multi def run_multi_level_mrp(self): self._mrp_cleanup() mrp_lowest_llc = self._low_level_code_calculation() diff --git a/multi_level_mrp/wizards/multi_level_mrp_view.xml b/multi_level_mrp/wizards/multi_level_mrp_view.xml index c13f0dc8e..1e53c1a90 100644 --- a/multi_level_mrp/wizards/multi_level_mrp_view.xml +++ b/multi_level_mrp/wizards/multi_level_mrp_view.xml @@ -5,7 +5,7 @@ Run MRP multi.level.mrp -
+