[IMP] base_wamas_ubl PromiseDeliveryPeriod

OCA · Sep 5, 2024 · 37aa086 · 37aa086
1 parent c77b2a0
commit 37aa086
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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
@@ -64,6 +64,10 @@
 	<cac:Shipment>
 		<cbc:ID>130377</cbc:ID>
 		<cac:Delivery>
+			<cac:PromiseDeliveryPeriod>
+				<cbc:EndDate>2023-05-01</cbc:EndDate>
+				<cbc:EndTime>14:00:00</cbc:EndTime>
+			</cac:PromiseDeliveryPeriod>
 			<cac:EstimatedDeliveryPeriod>
 				<cbc:EndDate>2023-05-01</cbc:EndDate>
 				<cbc:EndTime>14:00:00</cbc:EndTime>