Skip to content

Commit 8984647

Browse files
OCA-git-botOCA-git-bot
committed
Merge PR #1034 into 16.0
Signed-off-by jbaudoux
2 parents 561c832 + 8a0bbd0 commit 8984647

File tree

5 files changed

+20
-12
lines changed

5 files changed

+20
-12
lines changed

‎base_wamas_ubl/lib/wamas/tests/samples/UBL2WAMAS-SAMPLE_WEAK_WEAP-DESPATCH_ADVICE.xml

+4
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@
6464
<cac:Shipment>
6565
<cbc:ID>130377</cbc:ID>
6666
<cac:Delivery>
67+
<cac:PromiseDeliveryPeriod>
68+
<cbc:EndDate>2023-05-02</cbc:EndDate>
69+
<cbc:EndTime>15:00:00</cbc:EndTime>
70+
</cac:PromiseDeliveryPeriod>
6771
<cac:EstimatedDeliveryPeriod>
6872
<cbc:EndDate>2023-05-01</cbc:EndDate>
6973
<cbc:EndTime>14:00:00</cbc:EndTime>

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
ODOO WAMAS 00000120230501020000WEAK00050000WH/IN/000377 ODOO PO001040 STDMAN0001040 MyCompany Department StreetName AdditionalStreetName 95380 Turlock US (623)-853-7197 wood.corner26@example.com 20230501160000
2-
ODOO WAMAS 00000220230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000010001151 00000 NDISPONIBLE 000001536000BOUT NORMAL 20230501020000 202305010200007910063 NNLG
3-
ODOO WAMAS 00000320230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000020001156 00000 NDISPONIBLE 000005184000PET NORMAL 20230501020000 202305010200007910105 NNLG
4-
ODOO WAMAS 00000420230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000030001160 00000 NDISPONIBLE 000003840000BOUT NORMAL 20230501020000 202305010200007910004 NNLG
5-
ODOO WAMAS 00000520230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000040001162 00000 NDISPONIBLE 000003072000PET NORMAL 20230501020000 2023050102000012156876 NNLG
6-
ODOO WAMAS 00000620230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000050001176 00000 NDISPONIBLE 000003024000XBO NORMAL 20230501020000 202305010200007910044 NNLG
1+
ODOO WAMAS 00000120230501020000WEAK00050000WH/IN/000377 ODOO PO001040 STDMAN0001040 MyCompany Department StreetName AdditionalStreetName 95380 Turlock US (623)-853-7197 wood.corner26@example.com 20230502170000
2+
ODOO WAMAS 00000220230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000010001151 00000 NDISPONIBLE 000001536000BOUT NORMAL 20230501020000 202305011600007910063 NNLG
3+
ODOO WAMAS 00000320230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000020001156 00000 NDISPONIBLE 000005184000PET NORMAL 20230501020000 202305011600007910105 NNLG
4+
ODOO WAMAS 00000420230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000030001160 00000 NDISPONIBLE 000003840000BOUT NORMAL 20230501020000 202305011600007910004 NNLG
5+
ODOO WAMAS 00000520230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000040001162 00000 NDISPONIBLE 000003072000PET NORMAL 20230501020000 2023050116000012156876 NNLG
6+
ODOO WAMAS 00000620230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000050001176 00000 NDISPONIBLE 000003024000XBO NORMAL 20230501020000 202305011600007910044 NNLG

‎base_wamas_ubl/lib/wamas/utils.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -299,9 +299,9 @@ def generate_wamas_dict(dict_item, grammar, **kwargs): # noqa: C901
299299
if isinstance(ubl_path, list):
300300
lst_val = []
301301
for _item in ubl_path:
302-
lst_val.append(dict_item.get(_item, ""))
302+
lst_val.append(dict_item.get(_item) or "")
303303
if lst_val:
304-
val = " ".join(lst_val)
304+
val = " ".join(lst_val).strip()
305305
elif isinstance(ubl_path, dict):
306306
for _key in ubl_path:
307307
if dict_item.get(_key, False):

‎base_wamas_ubl/lib/wamas/wamas_grammar/weak.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,9 @@
240240
"dp": False,
241241
"ubl_path": [
242242
"DespatchAdvice.cac:Shipment.cac:Delivery."
243-
"cac:EstimatedDeliveryPeriod.cbc:EndDate",
243+
"cac:PromiseDeliveryPeriod.cbc:EndDate",
244244
"DespatchAdvice.cac:Shipment.cac:Delivery."
245-
"cac:EstimatedDeliveryPeriod.cbc:EndTime",
245+
"cac:PromiseDeliveryPeriod.cbc:EndTime",
246246
],
247247
"df_val": False,
248248
"df_func": False,

‎base_wamas_ubl/lib/wamas/wamas_grammar/weap.py

+6-2
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,12 @@
210210
"type": "datetime",
211211
"length": 14,
212212
"dp": False,
213-
"ubl_path": "DespatchAdvice.cac:Shipment.cac:Delivery."
214-
"cac:EstimatedDeliveryPeriod.cbc:EndDate",
213+
"ubl_path": [
214+
"DespatchAdvice.cac:Shipment.cac:Delivery."
215+
"cac:EstimatedDeliveryPeriod.cbc:EndDate",
216+
"DespatchAdvice.cac:Shipment.cac:Delivery."
217+
"cac:EstimatedDeliveryPeriod.cbc:EndTime",
218+
],
215219
"df_val": False,
216220
"df_func": False,
217221
},

0 commit comments

Comments
 (0)