Skip to content

Commit 6ccda3f

Browse files
[IMP] delivery_roulier_geodis_fr : fix tests + add maintainer
1 parent bfa283b commit 6ccda3f

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

delivery_roulier_geodis_fr/__manifest__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"version": "16.0.1.0.0",
66
"author": "Akretion, Odoo Community Association (OCA)",
77
"summary": "Generate Label for Geodis logistic",
8-
"maintainer": "Akretion, Odoo Community Association (OCA)",
8+
"maintainers": ["florian-dacosta"],
99
"category": "Warehouse",
1010
"depends": [
1111
"delivery_roulier",

delivery_roulier_geodis_fr/tests/test_geodis_labels.py

+11-6
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ def setUp(self, *args, **kwargs):
2828
"geodis_fr_customer_id": "787000",
2929
}
3030
)
31+
carrier = self.env.ref("delivery_roulier_geodis_fr.delivery_carrier_mes")
32+
carrier.carrier_account_id = self.account.id
3133
self.agency = self.env["delivery.carrier.agency"].create(
3234
{
3335
"name": "Lille Agency",
@@ -61,6 +63,13 @@ def _get_vcr_kwargs(self, **kwargs):
6163
"before_record_request": self._hide_sensitive_data,
6264
}
6365

66+
def _transfer_order_picking(self):
67+
for move in self.picking.move_ids:
68+
move.quantity_done = move.product_uom_qty
69+
move_lines = self.picking.move_line_ids
70+
self.picking._put_in_pack(move_lines)
71+
return super()._transfer_order_picking()
72+
6473
def _product_data(self):
6574
data = super()._product_data()
6675
data.update(
@@ -88,27 +97,23 @@ def _partner_data(self):
8897
)
8998
return data
9099

91-
def test_labels(self):
100+
def test_labels_and_edi(self):
92101
res = super().test_labels()
93102
self.assertTrue(self.picking.geodis_shippingid)
94-
return res
95-
96-
def test_edi(self):
97103
deposit = self.env["deposit.slip"].create(
98104
{
99105
"name": "test",
100106
"delivery_type": "geodis_fr",
101107
"picking_ids": [(6, 0, self.picking.ids)],
102108
}
103109
)
104-
# filled on label generation / simulate it
105-
self.picking.write({"geodis_shippingid": "0123456"})
106110
deposit.validate_deposit()
107111
attachment = self.env["ir.attachment"].search(
108112
[("res_id", "=", deposit.id), ("res_model", "=", "deposit.slip")]
109113
)
110114
self.assertEqual(len(attachment), 1)
111115
self.assertTrue(attachment.datas)
116+
return res
112117

113118
def test_addresses(self):
114119
addresses = self.picking._geodis_fr_get_address_proposition()

0 commit comments

Comments
 (0)