From 9a311d719e9ee180577a7ef9f74279b16683c2fd Mon Sep 17 00:00:00 2001 From: Telmo Santos Date: Mon, 2 Sep 2024 18:02:53 +0200 Subject: [PATCH] [IMP] base_wamas_ubl PromiseDeliveryPeriod --- base_wamas_ubl/lib/wamas/wamas_grammar/weak.py | 4 ++-- base_wamas_ubl/lib/wamas/wamas_grammar/weap.py | 8 ++++++-- .../UBL2WAMAS-SAMPLE_WEAK_WEAP-DESPATCH_ADVICE.xml | 4 ++++ .../tests/samples/UBL2WAMAS-SAMPLE_WEAK_WEAP.wamas | 10 +++++----- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/base_wamas_ubl/lib/wamas/wamas_grammar/weak.py b/base_wamas_ubl/lib/wamas/wamas_grammar/weak.py index 23aaacefa1..053049c180 100644 --- a/base_wamas_ubl/lib/wamas/wamas_grammar/weak.py +++ b/base_wamas_ubl/lib/wamas/wamas_grammar/weak.py @@ -240,9 +240,9 @@ "dp": False, "ubl_path": [ "DespatchAdvice.cac:Shipment.cac:Delivery." - "cac:EstimatedDeliveryPeriod.cbc:EndDate", + "cac:PromiseDeliveryPeriod.cbc:EndDate", "DespatchAdvice.cac:Shipment.cac:Delivery." - "cac:EstimatedDeliveryPeriod.cbc:EndTime", + "cac:PromiseDeliveryPeriod.cbc:EndTime", ], "df_val": False, "df_func": False, diff --git a/base_wamas_ubl/lib/wamas/wamas_grammar/weap.py b/base_wamas_ubl/lib/wamas/wamas_grammar/weap.py index 32b11f5b1b..b9adb0190a 100644 --- a/base_wamas_ubl/lib/wamas/wamas_grammar/weap.py +++ b/base_wamas_ubl/lib/wamas/wamas_grammar/weap.py @@ -210,8 +210,12 @@ "type": "datetime", "length": 14, "dp": False, - "ubl_path": "DespatchAdvice.cac:Shipment.cac:Delivery." - "cac:EstimatedDeliveryPeriod.cbc:EndDate", + "ubl_path": [ + "DespatchAdvice.cac:Shipment.cac:Delivery." + "cac:EstimatedDeliveryPeriod.cbc:EndDate", + "DespatchAdvice.cac:Shipment.cac:Delivery." + "cac:EstimatedDeliveryPeriod.cbc:EndTime", + ], "df_val": False, "df_func": False, }, diff --git a/base_wamas_ubl/tests/samples/UBL2WAMAS-SAMPLE_WEAK_WEAP-DESPATCH_ADVICE.xml b/base_wamas_ubl/tests/samples/UBL2WAMAS-SAMPLE_WEAK_WEAP-DESPATCH_ADVICE.xml index 88532bab4c..a47e8ae18d 100644 --- a/base_wamas_ubl/tests/samples/UBL2WAMAS-SAMPLE_WEAK_WEAP-DESPATCH_ADVICE.xml +++ b/base_wamas_ubl/tests/samples/UBL2WAMAS-SAMPLE_WEAK_WEAP-DESPATCH_ADVICE.xml @@ -64,6 +64,10 @@ 130377 + + 2023-05-01 + 14:00:00 + 2023-05-01 14:00:00 diff --git a/base_wamas_ubl/tests/samples/UBL2WAMAS-SAMPLE_WEAK_WEAP.wamas b/base_wamas_ubl/tests/samples/UBL2WAMAS-SAMPLE_WEAK_WEAP.wamas index bcd3bf18d5..7edbb53a9e 100644 --- a/base_wamas_ubl/tests/samples/UBL2WAMAS-SAMPLE_WEAK_WEAP.wamas +++ b/base_wamas_ubl/tests/samples/UBL2WAMAS-SAMPLE_WEAK_WEAP.wamas @@ -1,6 +1,6 @@ ODOO WAMAS 00000120230501020000WEAK00050000WH/IN/000377 ODOO PO001040 STDMAN0001040 MyCompany Department StreetName AdditionalStreetName 95380 Turlock US (623)-853-7197 wood.corner26@example.com 20230501160000 -ODOO WAMAS 00000220230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000010001151 00000 NDISPONIBLE 000001536000BOUT NORMAL 20230501020000 202305010200007910063 NNLG -ODOO WAMAS 00000320230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000020001156 00000 NDISPONIBLE 000005184000PET NORMAL 20230501020000 202305010200007910105 NNLG -ODOO WAMAS 00000420230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000030001160 00000 NDISPONIBLE 000003840000BOUT NORMAL 20230501020000 202305010200007910004 NNLG -ODOO WAMAS 00000520230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000040001162 00000 NDISPONIBLE 000003072000PET NORMAL 20230501020000 2023050102000012156876 NNLG -ODOO WAMAS 00000620230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000050001176 00000 NDISPONIBLE 000003024000XBO NORMAL 20230501020000 202305010200007910044 NNLG \ No newline at end of file +ODOO WAMAS 00000220230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000010001151 00000 NDISPONIBLE 000001536000BOUT NORMAL 20230501020000 202305011600007910063 NNLG +ODOO WAMAS 00000320230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000020001156 00000 NDISPONIBLE 000005184000PET NORMAL 20230501020000 202305011600007910105 NNLG +ODOO WAMAS 00000420230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000030001160 00000 NDISPONIBLE 000003840000BOUT NORMAL 20230501020000 202305011600007910004 NNLG +ODOO WAMAS 00000520230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000040001162 00000 NDISPONIBLE 000003072000PET NORMAL 20230501020000 2023050116000012156876 NNLG +ODOO WAMAS 00000620230501020000WEAP00045000WH/IN/000377 ODOO PO001040 0000050001176 00000 NDISPONIBLE 000003024000XBO NORMAL 20230501020000 202305011600007910044 NNLG \ No newline at end of file