Skip to content

Commit 16502db

Browse files
committed
Merge PR #862 into 17.0
Signed-off-by gurneyalex
2 parents 068c238 + 5b9cd5a commit 16502db

File tree

1 file changed

+36
-30
lines changed

1 file changed

+36
-30
lines changed

base_delivery_carrier_label/tests/carrier_label_case.py

+36-30
Original file line numberDiff line numberDiff line change
@@ -10,75 +10,81 @@ class CarrierLabelCase(TransactionCase):
1010
to return the carrier you want to test"""
1111

1212
@classmethod
13-
def setUpClass(self):
14-
super().setUpClass(self)
15-
self._create_order_picking()
13+
def setUpClass(cls):
14+
super().setUpClass()
15+
cls._create_order_picking()
1616

1717
@property
1818
def transfer_in_setup(self):
1919
return True
2020

21-
def _create_order_picking(self):
21+
@classmethod
22+
def _create_order_picking(cls):
2223
"""Create a sale order and deliver the picking"""
23-
self.order = self.env["sale.order"].create(self._sale_order_data())
24-
for product in self.order.mapped("order_line.product_id"):
25-
self.env["stock.quant"].with_context(inventory_mode=True).create(
24+
cls.order = cls.env["sale.order"].create(cls._sale_order_data())
25+
for product in cls.order.mapped("order_line.product_id"):
26+
cls.env["stock.quant"].with_context(inventory_mode=True).create(
2627
{
2728
"product_id": product.id,
28-
"location_id": self.order.warehouse_id.lot_stock_id.id,
29+
"location_id": cls.order.warehouse_id.lot_stock_id.id,
2930
"inventory_quantity": sum(
30-
self.order.mapped("order_line.product_uom_qty")
31+
cls.order.mapped("order_line.product_uom_qty")
3132
),
3233
}
3334
)._apply_inventory()
34-
self.order.action_confirm()
35-
self.picking = self.order.picking_ids
36-
self.picking.write(self._picking_data())
37-
if self.transfer_in_setup:
38-
self._transfer_order_picking()
39-
40-
def _transfer_order_picking(self):
41-
self.env["stock.immediate.transfer"].create(
42-
{"pick_ids": [(6, 0, self.picking.ids)]}
35+
cls.order.action_confirm()
36+
cls.picking = cls.order.picking_ids
37+
cls.picking.write(cls._picking_data())
38+
if cls.transfer_in_setup:
39+
cls._transfer_order_picking()
40+
41+
@classmethod
42+
def _transfer_order_picking(cls):
43+
cls.env["stock.immediate.transfer"].create(
44+
{"pick_ids": [(6, 0, cls.picking.ids)]}
4345
).process()
4446

45-
def _get_carrier(self):
47+
@classmethod
48+
def _get_carrier(cls):
4649
"""Return the carrier to test"""
4750
raise NotImplementedError()
4851

49-
def _sale_order_data(self):
52+
@classmethod
53+
def _sale_order_data(cls):
5054
"""Return a values dict to create a sale order"""
5155
return {
52-
"partner_id": self.env["res.partner"].create(self._partner_data()).id,
53-
"order_line": [(0, 0, data) for data in self._order_line_data()],
54-
"carrier_id": self._get_carrier().id,
56+
"partner_id": cls.env["res.partner"].create(cls._partner_data()).id,
57+
"order_line": [(0, 0, data) for data in cls._order_line_data()],
58+
"carrier_id": cls._get_carrier().id,
5559
}
5660

57-
def _partner_data(self):
61+
@classmethod
62+
def _partner_data(cls):
5863
"""Return a values dict to create a partner"""
5964
return {
6065
"name": "Carrier label test customer",
6166
}
6267

63-
def _order_line_data(self):
68+
@classmethod
69+
def _order_line_data(cls):
6470
"""Return a list of value dicts to create order lines"""
6571
return [
6672
{
67-
"product_id": self.env["product.product"]
68-
.create(self._product_data())
69-
.id,
73+
"product_id": cls.env["product.product"].create(cls._product_data()).id,
7074
"product_uom_qty": 1,
7175
}
7276
]
7377

74-
def _product_data(self):
78+
@classmethod
79+
def _product_data(cls):
7580
"""Return a values dict to create a product"""
7681
return {
7782
"name": "Carrier test product",
7883
"type": "product",
7984
}
8085

81-
def _picking_data(self):
86+
@classmethod
87+
def _picking_data(cls):
8288
"""Return a values dict to be written to the picking in order to set
8389
carrier options"""
8490
return {}

0 commit comments

Comments
 (0)