audrius/suite
1
0
Fork 1
mirror of https://gitlab.com/hibou-io/hibou-odoo/suite.git synced 2025-01-20 12:37:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

[MIG] delivery_hibou: to Odoo 13.0

Browse Source
This commit is contained in:
Jared Kipe
2020-07-03 15:53:22 -07:00
parent a69c3f56f0
commit 7c6ddf7a08
3 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
delivery_hibou/__manifest__.py
View File

@@ -1,7 +1,7 @@
{ {
'name': 'Delivery Hibou', 'name': 'Delivery Hibou',
'summary': 'Adds underlying pinnings for things like "RMA Return Labels"', '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.", 'author': "Hibou Corp.",
'category': 'Stock', 'category': 'Stock',
'license': 'AGPL-3', 'license': 'AGPL-3',

2
delivery_hibou/models/stock.py
View File

@@ -12,7 +12,6 @@ class StockPicking(models.Model):
], string='Require Insurance', default='auto', ], string='Require Insurance', default='auto',
help='If your carrier supports it, auto should be calculated off of the "Automatic Insurance Value" field.') 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') @api.depends('move_lines.priority', 'carrier_id')
def _compute_priority(self): def _compute_priority(self):
if self.carrier_id.procurement_priority: if self.carrier_id.procurement_priority:
@@ -40,7 +39,6 @@ class StockPicking(models.Model):
return cost return cost
class StockMove(models.Model): class StockMove(models.Model):
_inherit = 'stock.move' _inherit = 'stock.move'

31
delivery_hibou/tests/test_delivery_hibou.py
View File

@@ -37,14 +37,20 @@ class TestDeliveryHibou(common.TransactionCase):
'partner_id': self.partner.id, 'partner_id': self.partner.id,
'partner_shipping_id': self.partner.id, 'partner_shipping_id': self.partner.id,
'partner_invoice_id': self.partner.id, 'partner_invoice_id': self.partner.id,
'carrier_id': self.carrier.id,
'shipping_account_id': self.shipping_account.id, 'shipping_account_id': self.shipping_account.id,
'order_line': [(0, 0, { 'order_line': [(0, 0, {
'product_id': self.product.id, 'product_id': self.product.id,
})] })]
}) })
sale_order.get_delivery_price() self.assertFalse(sale_order.carrier_id)
sale_order.set_delivery_line() 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() sale_order.action_confirm()
# Make sure 3rd party Shipping Account is set. # Make sure 3rd party Shipping Account is set.
self.assertEqual(sale_order.shipping_account_id, self.shipping_account) self.assertEqual(sale_order.shipping_account_id, self.shipping_account)
@@ -140,22 +146,3 @@ class TestDeliveryHibou(common.TransactionCase):
picking_in.partner_id) picking_in.partner_id)
self.assertEqual(picking_in.carrier_id.get_recipient(picking=picking_in), self.assertEqual(picking_in.carrier_id.get_recipient(picking=picking_in),
picking_in.picking_type_id.warehouse_id.partner_id) picking_in.picking_type_id.warehouse_id.partner_id)