diff --git a/delivery_hibou/__manifest__.py b/delivery_hibou/__manifest__.py index e53e01b9..4897f03c 100644 --- a/delivery_hibou/__manifest__.py +++ b/delivery_hibou/__manifest__.py @@ -1,7 +1,7 @@ { 'name': 'Delivery Hibou', 'summary': 'Adds underlying pinnings for things like "RMA Return Labels"', - 'version': '11.0.1.0.0', + 'version': '13.0.1.0.0', 'author': "Hibou Corp.", 'category': 'Stock', 'license': 'AGPL-3', diff --git a/delivery_hibou/models/stock.py b/delivery_hibou/models/stock.py index c1a6a792..68a48e83 100644 --- a/delivery_hibou/models/stock.py +++ b/delivery_hibou/models/stock.py @@ -12,7 +12,6 @@ class StockPicking(models.Model): ], string='Require Insurance', default='auto', help='If your carrier supports it, auto should be calculated off of the "Automatic Insurance Value" field.') - @api.one @api.depends('move_lines.priority', 'carrier_id') def _compute_priority(self): if self.carrier_id.procurement_priority: @@ -40,7 +39,6 @@ class StockPicking(models.Model): return cost - class StockMove(models.Model): _inherit = 'stock.move' diff --git a/delivery_hibou/tests/test_delivery_hibou.py b/delivery_hibou/tests/test_delivery_hibou.py index da8c4de4..7b47b750 100644 --- a/delivery_hibou/tests/test_delivery_hibou.py +++ b/delivery_hibou/tests/test_delivery_hibou.py @@ -37,14 +37,20 @@ class TestDeliveryHibou(common.TransactionCase): 'partner_id': self.partner.id, 'partner_shipping_id': self.partner.id, 'partner_invoice_id': self.partner.id, - 'carrier_id': self.carrier.id, 'shipping_account_id': self.shipping_account.id, 'order_line': [(0, 0, { 'product_id': self.product.id, })] }) - sale_order.get_delivery_price() - sale_order.set_delivery_line() + self.assertFalse(sale_order.carrier_id) + action = sale_order.action_open_delivery_wizard() + form = common.Form(self.env[action['res_model']].with_context(**action.get('context', {}))) + form.carrier_id = self.carrier + wizard = form.save() + wizard.button_confirm() + + #sale_order.set_delivery_line() + self.assertEqual(sale_order.carrier_id, self.carrier) sale_order.action_confirm() # Make sure 3rd party Shipping Account is set. self.assertEqual(sale_order.shipping_account_id, self.shipping_account) @@ -140,22 +146,3 @@ class TestDeliveryHibou(common.TransactionCase): picking_in.partner_id) self.assertEqual(picking_in.carrier_id.get_recipient(picking=picking_in), picking_in.picking_type_id.warehouse_id.partner_id) - - - - - - - - - - - - - - - - - - -