From e2fc1e6f7d818b1001bdf81bd46028ead94145a0 Mon Sep 17 00:00:00 2001 From: Fanha Giang Date: Sat, 5 Dec 2020 00:54:13 +0700 Subject: [PATCH] [MIG] stock_quant_manual_assign: Migration to 14.0 --- stock_quant_manual_assign/__manifest__.py | 8 +++++-- .../security/ir.model.access.csv | 3 +++ .../tests/test_stock_quant_manual_assign.py | 4 +++- .../views/stock_move_view.xml | 2 +- .../wizard/assign_manual_quants.py | 22 ++++++++++++------- .../wizard/assign_manual_quants_view.xml | 17 +++++++------- 6 files changed, 36 insertions(+), 20 deletions(-) create mode 100644 stock_quant_manual_assign/security/ir.model.access.csv diff --git a/stock_quant_manual_assign/__manifest__.py b/stock_quant_manual_assign/__manifest__.py index 1e77d165f..c8e2a1904 100644 --- a/stock_quant_manual_assign/__manifest__.py +++ b/stock_quant_manual_assign/__manifest__.py @@ -7,7 +7,7 @@ { "name": "Stock - Manual Quant Assignment", - "version": "13.0.1.0.0", + "version": "14.0.1.0.0", "category": "Warehouse", "license": "AGPL-3", "author": "AvanzOSC, " @@ -17,6 +17,10 @@ "Odoo Community Association (OCA)", "website": "https://github.com/OCA/stock-logistics-warehouse", "depends": ["stock"], - "data": ["wizard/assign_manual_quants_view.xml", "views/stock_move_view.xml"], + "data": [ + "wizard/assign_manual_quants_view.xml", + "views/stock_move_view.xml", + "security/ir.model.access.csv", + ], "installable": True, } diff --git a/stock_quant_manual_assign/security/ir.model.access.csv b/stock_quant_manual_assign/security/ir.model.access.csv new file mode 100644 index 000000000..ab07fe00e --- /dev/null +++ b/stock_quant_manual_assign/security/ir.model.access.csv @@ -0,0 +1,3 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_assign_manual_quants_user,access_assign_manual_quants,model_assign_manual_quants,stock.group_stock_user,1,1,1,1 +access_assign_manual_quants_lines_user,access_assign_manual_quants_lines,model_assign_manual_quants_lines,stock.group_stock_user,1,1,1,1 diff --git a/stock_quant_manual_assign/tests/test_stock_quant_manual_assign.py b/stock_quant_manual_assign/tests/test_stock_quant_manual_assign.py index ed1fd61d0..c7ca1dbc0 100644 --- a/stock_quant_manual_assign/tests/test_stock_quant_manual_assign.py +++ b/stock_quant_manual_assign/tests/test_stock_quant_manual_assign.py @@ -132,7 +132,9 @@ class TestStockQuantManualAssign(TransactionCase): self.assertEqual(wizard.move_qty, 250.0) wizard.assign_quants() self.assertAlmostEqual( - len(self.move.move_line_ids), len(wizard.quants_lines.filtered("selected")) + len(self.move.move_line_ids), + 2, + "There are 2 quants selected", ) def test_quant_assign_wizard_after_availability_check(self): diff --git a/stock_quant_manual_assign/views/stock_move_view.xml b/stock_quant_manual_assign/views/stock_move_view.xml index 453fe13d2..695ce7e32 100644 --- a/stock_quant_manual_assign/views/stock_move_view.xml +++ b/stock_quant_manual_assign/views/stock_move_view.xml @@ -10,7 +10,7 @@ name="%(assign_manual_quants_action)d" type="action" icon="fa-tags" - string="Manual Quants" + title="Manual Quants" options='{"warn": true}' attrs="{'invisible':['|',('picking_code','=','incoming'),('state','not in',('confirmed','assigned','partially_available'))]}" /> diff --git a/stock_quant_manual_assign/wizard/assign_manual_quants.py b/stock_quant_manual_assign/wizard/assign_manual_quants.py index dad9e9d5d..0e3134b66 100644 --- a/stock_quant_manual_assign/wizard/assign_manual_quants.py +++ b/stock_quant_manual_assign/wizard/assign_manual_quants.py @@ -51,7 +51,10 @@ class AssignManualQuants(models.TransientModel): quants_lines = fields.One2many( "assign.manual.quants.lines", "assign_wizard", string="Quants" ) - move_id = fields.Many2one(comodel_name="stock.move", string="Move",) + move_id = fields.Many2one( + comodel_name="stock.move", + string="Move", + ) def assign_quants(self): move = self.move_id @@ -76,7 +79,7 @@ class AssignManualQuants(models.TransientModel): ("quantity", ">", 0), ] ) - quants_lines = [] + q_lines = [] for quant in available_quants: line = { "quant_id": quant.id, @@ -98,10 +101,8 @@ class AssignManualQuants(models.TransientModel): line["qty"] = sum(move_lines.mapped("product_uom_qty")) line["selected"] = bool(line["qty"]) line["reserved"] = quant.reserved_quantity - line["qty"] - quants_lines.append(line) - res.update( - {"quants_lines": [(0, 0, x) for x in quants_lines], "move_id": move.id} - ) + q_lines.append(line) + res.update({"quants_lines": [(0, 0, x) for x in q_lines], "move_id": move.id}) return res @@ -117,7 +118,10 @@ class AssignManualQuantsLines(models.TransientModel): ondelete="cascade", ) quant_id = fields.Many2one( - comodel_name="stock.quant", string="Quant", required=True, ondelete="cascade", + comodel_name="stock.quant", + string="Quant", + required=True, + ondelete="cascade", ) location_id = fields.Many2one( comodel_name="stock.location", @@ -145,7 +149,9 @@ class AssignManualQuantsLines(models.TransientModel): ) # This is not correctly shown as related or computed, so we make it regular on_hand = fields.Float( - readonly=True, string="On Hand", digits="Product Unit of Measure", + readonly=True, + string="On Hand", + digits="Product Unit of Measure", ) reserved = fields.Float(string="Others Reserved", digits="Product Unit of Measure") selected = fields.Boolean(string="Select") diff --git a/stock_quant_manual_assign/wizard/assign_manual_quants_view.xml b/stock_quant_manual_assign/wizard/assign_manual_quants_view.xml index 82917741a..aec2e8a78 100644 --- a/stock_quant_manual_assign/wizard/assign_manual_quants_view.xml +++ b/stock_quant_manual_assign/wizard/assign_manual_quants_view.xml @@ -8,6 +8,7 @@ + @@ -43,12 +44,12 @@ - + + + Manual assignment + assign.manual.quants + form + new + {} +