diff --git a/stock_delivery_planner/__manifest__.py b/stock_delivery_planner/__manifest__.py index a0f55a2c..0878a4ab 100644 --- a/stock_delivery_planner/__manifest__.py +++ b/stock_delivery_planner/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Stock Delivery Planner', 'summary': 'Get rates and choose carrier for delivery.', - 'version': '13.0.1.0.0', + 'version': '14.0.1.0.0', 'author': "Hibou Corp.", 'category': 'Warehouse', 'license': 'AGPL-3', diff --git a/stock_delivery_planner/tests/test_stock_delivery_planner.py b/stock_delivery_planner/tests/test_stock_delivery_planner.py index c0a5c431..917be6af 100644 --- a/stock_delivery_planner/tests/test_stock_delivery_planner.py +++ b/stock_delivery_planner/tests/test_stock_delivery_planner.py @@ -114,11 +114,11 @@ class TestStockDeliveryPlanner(TransactionCase): self.assertEqual(self.picking.shipping_weight, 0.0) self.picking.move_line_ids.filtered(lambda ml: ml.product_id == self.product).qty_done = 5.0 - packing_action = self.picking.put_in_pack() + packing_action = self.picking.action_put_in_pack() packing_wizard = Form(self.env[packing_action['res_model']].with_context(packing_action['context'])) packing_wizard.delivery_packaging_id = self.fedex_package choose_delivery_package = packing_wizard.save() - choose_delivery_package.put_in_pack() + choose_delivery_package.action_put_in_pack() self.assertEqual(self.picking.shipping_weight, 5.0) action = self.picking.action_plan_delivery() diff --git a/stock_delivery_planner/wizard/stock_delivery_planner.py b/stock_delivery_planner/wizard/stock_delivery_planner.py index 448cb475..65f84852 100644 --- a/stock_delivery_planner/wizard/stock_delivery_planner.py +++ b/stock_delivery_planner/wizard/stock_delivery_planner.py @@ -1,4 +1,5 @@ -from odoo import api, fields, models, tools +from odoo import api, fields, models +from odoo.tools import safe_eval import logging _logger = logging.getLogger(__name__) @@ -16,7 +17,7 @@ class StockDeliveryPlanner(models.TransientModel): base_carriers = self.env['delivery.carrier'] carrier_domain = self.env['ir.config_parameter'].sudo().get_param('stock.delivery.planner.carrier_domain') if carrier_domain: - base_carriers = base_carriers.search(tools.safe_eval(carrier_domain)) + base_carriers = base_carriers.search(safe_eval.safe_eval(carrier_domain)) for carrier in base_carriers: rates = carrier.rate_shipment_multi(picking=planner.picking_id)