@@ -112,24 +112,22 @@ def _roulier_parse_response(self, picking, response):
112
112
# find for which package the label is. tracking number will be updated on
113
113
# this pack later on (in base_delivery_carrier_label)
114
114
package_id = False
115
+ ref = parcel .get ("reference" )
115
116
if len (self ) == 1 :
116
117
package_id = self .id
117
118
else :
118
- pack = self .filtered (lambda p : p .name == parcel . get ( "reference" ) )
119
+ pack = self .filtered (lambda p , ref = ref : p .name == ref )
119
120
if len (pack ) == 1 :
120
121
package_id = pack .id
121
-
122
+ name_prefix = ref or tracking_number or label .get ("name" )
123
+ name_suffix = label .get ("type" , "" ).lower ()
122
124
parcels_data .append (
123
125
{
124
126
"tracking_number" : tracking_number ,
125
127
"parcel_tracking_uri" : parcel .get ("tracking" , {}).get ("url" , False ),
126
128
"package_id" : package_id ,
127
129
"file" : label .get ("data" ),
128
- "name" : "%s.%s"
129
- % (
130
- parcel .get ("reference" ) or tracking_number or label .get ("name" ),
131
- label .get ("type" , "" ).lower (),
132
- ),
130
+ "name" : f"{ name_prefix } .{ name_suffix } " ,
133
131
"file_type" : label .get ("type" ),
134
132
}
135
133
)
@@ -287,8 +285,7 @@ def _roulier_prepare_attachments(self, picking, response):
287
285
"res_model" : "stock.picking" ,
288
286
"datas" : attachment ["data" ],
289
287
"type" : "binary" ,
290
- "name" : "%s-%s.%s"
291
- % (self .name , attachment ["name" ], attachment ["type" ]),
288
+ "name" : f"{ self .name } -{ attachment ['name' ]} .{ attachment ['type' ]} " ,
292
289
}
293
290
for attachment in attachments
294
291
]
0 commit comments