Skip to content

Commit 843a189

Browse files
nilshamerlinckthienvh332
nilshamerlinck
authored and
thienvh332
committed
[FIX] base_wamas_ubl: addresses issues
1 parent 8b74a06 commit 843a189

File tree

3 files changed

+54
-6
lines changed

3 files changed

+54
-6
lines changed

‎base_wamas_ubl/lib/wamas/utils.py

+52-4
Original file line numberDiff line numberDiff line change
@@ -251,19 +251,67 @@ def get_Adrs_Name(a):
251251

252252

253253
def get_Adrs_Name2(a):
254-
return next(filter(None, [a["PartyName"], a["Department"], a["StreetName"]]), "")
254+
return next(
255+
iter(
256+
list(
257+
filter(
258+
None,
259+
[
260+
a["ContactName"],
261+
a["PartyName"],
262+
a["Department"],
263+
a["StreetName"],
264+
a["AdditionalStreetName"],
265+
],
266+
)
267+
)[1:-1]
268+
),
269+
"",
270+
)
255271

256272

257273
def get_Adrs_Name3(a):
258-
return next(filter(None, [a["Department"], a["StreetName"]]), "")
274+
return next(
275+
iter(
276+
list(
277+
filter(
278+
None,
279+
[
280+
a["ContactName"],
281+
a["PartyName"],
282+
a["Department"],
283+
a["StreetName"],
284+
a["AdditionalStreetName"],
285+
],
286+
)
287+
)[2:-1]
288+
),
289+
"",
290+
)
259291

260292

261293
def get_Adrs_Name4(a):
262-
return a["StreetName"]
294+
return next(
295+
iter(
296+
list(
297+
filter(
298+
None,
299+
[
300+
a["ContactName"],
301+
a["PartyName"],
302+
a["Department"],
303+
a["StreetName"],
304+
a["AdditionalStreetName"],
305+
],
306+
)
307+
)[3:-1]
308+
),
309+
"",
310+
)
263311

264312

265313
def get_Adrs_Adr(a):
266-
return a["AdditionalStreetName"] or a["StreetName"]
314+
return a["AdditionalStreetName"] or a["StreetName"] or a["Department"]
267315

268316

269317
def generate_wamas_line(dict_item, grammar, **kwargs): # noqa: C901

‎base_wamas_ubl/tests/samples/UBL2WAMAS-SAMPLE_AUSK_AUSP.wamas

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
ODOO WAMAS 00000120230501020000AUSK000560001673980/1700802 HOST 1700802 000 Name Name Department StreetName AdditionalStreetName Name Name Department StreetName AdditionalStreetName 94134 San Francisco California US (979)-904-8902 chester.reed79@example.com 20230413130000Quai-22 FRUEH FRUEHGE 2/120185 HOST 00000000000000000000000000 001 ST Def_Strat
1+
ODOO WAMAS 00000120230501020000AUSK000560001673980/1700802 HOST 1700802 000 Name Department StreetName AdditionalStreetName Name Department StreetName AdditionalStreetName 94134 San Francisco California US (979)-904-8902 chester.reed79@example.com 20230413130000Quai-22 FRUEH FRUEHGE 2/120185 HOST 00000000000000000000000000 001 ST Def_Strat
22
ODOO WAMAS 00000220230501020000AUSP000540001700802 HOST 10001 0000110007076 00000 DISPONIBLE 0000000000000000000000000000 000001500000PET 00000000000000 NN N 0000N

‎base_wamas_ubl/tests/samples/UBL2WAMAS-SAMPLE_WEAK_WEAP.wamas

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ODOO WAMAS 00000120230501020000WEAK00050000130377 ODOO STDMAN0001040 STDMAN0001040 Chester Reed YourCompany 250 Executive Park Blvd, Suite 3400 250 Executive Park Blvd, Suite 3400 250 Executive Park Blvd, Suite 3400 California 95380 Turlock US (623)-853-7197 wood.corner26@example.com 20230427020000
1+
ODOO WAMAS 00000120230501020000WEAK00050000130377 ODOO STDMAN0001040 STDMAN0001040 Chester Reed YourCompany 250 Executive Park Blvd, Suite 3400 California 95380 Turlock US (623)-853-7197 wood.corner26@example.com 20230427020000
22
ODOO WAMAS 00000220230501020000WEAP00045000130377 ODOO 0001 0000020001151 00000 NDISPONIBLE 000001536000BOUT NORMAL 20230501020000 202305010200007910063 NNLG
33
ODOO WAMAS 00000320230501020000WEAP00045000130377 ODOO 0002 0000030001156 00000 NDISPONIBLE 000005184000PET NORMAL 20230501020000 202305010200007910105 NNLG
44
ODOO WAMAS 00000420230501020000WEAP00045000130377 ODOO 0003 0000040001160 00000 NDISPONIBLE 000003840000BOUT NORMAL 20230501020000 202305010200007910004 NNLG

0 commit comments

Comments
 (0)