diff --git a/base_wamas_ubl/lib/wamas/utils.py b/base_wamas_ubl/lib/wamas/utils.py
index 83f1323baf..f1ba8f3ace 100644
--- a/base_wamas_ubl/lib/wamas/utils.py
+++ b/base_wamas_ubl/lib/wamas/utils.py
@@ -299,9 +299,9 @@ def generate_wamas_dict(dict_item, grammar, **kwargs):  # noqa: C901
             if isinstance(ubl_path, list):
                 lst_val = []
                 for _item in ubl_path:
-                    lst_val.append(dict_item.get(_item, ""))
+                    lst_val.append(dict_item.get(_item) or "")
                 if lst_val:
-                    val = " ".join(lst_val)
+                    val = " ".join(lst_val).strip()
             elif isinstance(ubl_path, dict):
                 for _key in ubl_path:
                     if dict_item.get(_key, 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 a47e8ae18d..dc57e0055e 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
@@ -65,8 +65,8 @@
 		<cbc:ID>130377</cbc:ID>
 		<cac:Delivery>
 			<cac:PromiseDeliveryPeriod>
-				<cbc:EndDate>2023-05-01</cbc:EndDate>
-				<cbc:EndTime>14:00:00</cbc:EndTime>
+				<cbc:EndDate>2023-05-02</cbc:EndDate>
+				<cbc:EndTime>15:00:00</cbc:EndTime>
 			</cac:PromiseDeliveryPeriod>
 			<cac:EstimatedDeliveryPeriod>
 				<cbc:EndDate>2023-05-01</cbc:EndDate>
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 7edbb53a9e..afecf084a6 100644
--- a/base_wamas_ubl/tests/samples/UBL2WAMAS-SAMPLE_WEAK_WEAP.wamas
+++ b/base_wamas_ubl/tests/samples/UBL2WAMAS-SAMPLE_WEAK_WEAP.wamas
@@ -1,4 +1,4 @@
-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     00000120230501020000WEAK00050000WH/IN/000377        ODOO PO001040            STDMAN0001040         MyCompany                               Department                              StreetName                                                                                     AdditionalStreetName                                                            95380     Turlock                                                                         US  (623)-853-7197                                                        wood.corner26@example.com                                                               20230502170000                                                                             
 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