Skip to content

Commit ba49a3d

Browse files
committed
Merge PR #3650 into 16.0
Signed-off-by rousseldenis
2 parents a2be70f + 21d4e78 commit ba49a3d

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

sale_manual_delivery/models/sale_order.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def _onchange_team_id(self):
3434

3535
def action_manual_delivery_wizard(self):
3636
self.ensure_one()
37-
action = self.env.ref("sale_manual_delivery.action_wizard_manual_delivery")
38-
[action] = action.read()
37+
xmlid = "sale_manual_delivery.action_wizard_manual_delivery"
38+
action = self.env["ir.actions.actions"]._for_xml_id(xmlid)
3939
action["context"] = {"default_carrier_id": self.carrier_id.id}
4040
return action
4141

sale_manual_delivery/tests/test_manual_delivery.py

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,20 @@
99

1010

1111
class TestSaleStock(TestSaleCommonBase):
12-
def setUp(self):
13-
super().setUp()
14-
self.partner = self.env.ref("base.res_partner_1")
15-
self.product = self.env.ref("product.product_delivery_01")
16-
self.product2 = self.env.ref("product.product_delivery_02")
17-
self.product3 = self.env.ref("product.product_order_01")
18-
self.carrier1 = self.env.ref("delivery.delivery_carrier")
19-
self.carrier2 = self.env.ref("delivery.delivery_local_delivery")
20-
self.stock_location = self.env.ref("stock.stock_location_stock")
21-
self.env["stock.quant"]._update_available_quantity(
22-
self.product, self.stock_location, 100
23-
)
12+
@classmethod
13+
def setUpClass(cls):
14+
super().setUpClass()
15+
cls.partner = cls.env.ref("base.res_partner_1")
16+
cls.product = cls.env.ref("product.product_delivery_01")
17+
cls.product2 = cls.env.ref("product.product_delivery_02")
18+
cls.product3 = cls.env.ref("product.product_order_01")
19+
cls.carrier1 = cls.env.ref("delivery.delivery_carrier")
20+
cls.carrier2 = cls.env.ref("delivery.delivery_local_delivery")
21+
cls.stock_location = cls.env.ref("stock.stock_location_stock")
22+
cls.env["stock.quant"]._update_available_quantity(
23+
cls.product, cls.stock_location, 100
24+
)
25+
cls.env.user_demo = cls.env.ref("base.user_demo")
2426

2527
def _manual_delivery_wizard(self, records, vals=None):
2628
if not vals:
@@ -36,9 +38,10 @@ def _manual_delivery_wizard(self, records, vals=None):
3638

3739
def test_00_sale_manual_delivery(self):
3840
"""
39-
Test SO's manual delivery
41+
Test SO's manual delivery; we do it with a user without admin rights
4042
"""
41-
order = self.env["sale.order"].create(
43+
model_user_order = self.env["sale.order"].with_user(self.env.user_demo)
44+
order = model_user_order.create(
4245
{
4346
"partner_id": self.partner.id,
4447
"partner_invoice_id": self.partner.id,

0 commit comments

Comments
 (0)