From 745de7c17186573745a88b99b5fb2b70ce93ef69 Mon Sep 17 00:00:00 2001
From: cyrilmanuel <cyriljeanneret@gmail.com>
Date: Thu, 14 Nov 2024 08:08:57 +0100
Subject: [PATCH] Fix ubl_template picking, always return DeliveredQuantity

---
 .../lib/wamas/ubl_template/picking.xml        | 12 ++-----
 ...LE_AUSKQ_WATEKQ_WATEPQ-DESPATCH_ADVICE.xml | 32 +++++++++++++++++--
 ...WAMAS2UBL-SAMPLE_AUSKQ_WATEKQ_WATEPQ.wamas |  1 +
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/base_wamas_ubl/lib/wamas/ubl_template/picking.xml b/base_wamas_ubl/lib/wamas/ubl_template/picking.xml
index 2b6a7a2387..705ed49ba3 100644
--- a/base_wamas_ubl/lib/wamas/ubl_template/picking.xml
+++ b/base_wamas_ubl/lib/wamas/ubl_template/picking.xml
@@ -139,18 +139,12 @@
 		</cac:Shipment>
 		<cbc:ID><t t-raw="line.IvAusp_HostPosNr" /></cbc:ID>
 		<cbc:DeliveredQuantity
-            t-if="line.Mngs_Mng"
             t-att-unitCode="line.IvArt_Bestand_Einheit"
             unitCodeListAgencyName="WAMAS"
         >
-		<t t-raw="line.Mngs_Mng" />
-		</cbc:DeliveredQuantity>
-		<cbc:DeliveredQuantity
-            t-if="line.IvAusp_LiefMngsWamas_Mng"
-            t-att-unitCode="line.IvArt_Bestand_Einheit"
-            unitCodeListAgencyName="WAMAS"
-        >
-		<t t-raw="line.IvAusp_LiefMngsWamas_Mng" />
+		<t
+                t-raw="hasattr(line,'Mngs_Mng') and line.Mngs_Mng or (hasattr(line, 'IvAusp_LiefMngsWamas_Mng') and line.IvAusp_LiefMngsWamas_Mng) or 0.0"
+            />
 		</cbc:DeliveredQuantity>
 		<cac:OrderLineReference>
 			<cbc:LineID />
diff --git a/base_wamas_ubl/tests/samples/WAMAS2UBL-SAMPLE_AUSKQ_WATEKQ_WATEPQ-DESPATCH_ADVICE.xml b/base_wamas_ubl/tests/samples/WAMAS2UBL-SAMPLE_AUSKQ_WATEKQ_WATEPQ-DESPATCH_ADVICE.xml
index a2531894f6..deb5595e9e 100644
--- a/base_wamas_ubl/tests/samples/WAMAS2UBL-SAMPLE_AUSKQ_WATEKQ_WATEPQ-DESPATCH_ADVICE.xml
+++ b/base_wamas_ubl/tests/samples/WAMAS2UBL-SAMPLE_AUSKQ_WATEKQ_WATEPQ-DESPATCH_ADVICE.xml
@@ -84,7 +84,6 @@
 		<cbc:DeliveredQuantity unitCode="TETRA" unitCodeListAgencyName="WAMAS">
 		7.0
 		</cbc:DeliveredQuantity>
-		
 		<cac:OrderLineReference>
 			<cbc:LineID/>
 		</cac:OrderLineReference>
@@ -115,7 +114,36 @@
 		<cbc:DeliveredQuantity unitCode="TETRA" unitCodeListAgencyName="WAMAS">
 		8.0
 		</cbc:DeliveredQuantity>
-		
+		<cac:OrderLineReference>
+			<cbc:LineID/>
+		</cac:OrderLineReference>
+		<cac:Item>
+			<cac:BuyersItemIdentification>
+				<cbc:ID/>
+			</cac:BuyersItemIdentification>
+			<cac:SellersItemIdentification>
+				<cbc:ID>
+					15455
+				</cbc:ID>
+				
+			</cac:SellersItemIdentification>
+		</cac:Item>
+	</cac:DespatchLine><cac:DespatchLine>
+		<cac:Shipment>
+			<cac:TransportHandlingUnit>
+				<cac:ActualPackage>
+					<cbc:ID>376401426411929180</cbc:ID>
+				</cac:ActualPackage>
+				<cbc:TransportHandlingUnitTypeCode>PE</cbc:TransportHandlingUnitTypeCode>
+			</cac:TransportHandlingUnit>
+			<cac:GrossWeightMeasure>
+				<cbc:Measure>314.7</cbc:Measure>
+			</cac:GrossWeightMeasure>
+		</cac:Shipment>
+		<cbc:ID>103</cbc:ID>
+		<cbc:DeliveredQuantity unitCode="TETRA" unitCodeListAgencyName="WAMAS">
+		0.0
+		</cbc:DeliveredQuantity>
 		<cac:OrderLineReference>
 			<cbc:LineID/>
 		</cac:OrderLineReference>
diff --git a/base_wamas_ubl/tests/samples/WAMAS2UBL-SAMPLE_AUSKQ_WATEKQ_WATEPQ.wamas b/base_wamas_ubl/tests/samples/WAMAS2UBL-SAMPLE_AUSKQ_WATEKQ_WATEPQ.wamas
index 8481022bda..9e97c5c2f9 100644
--- a/base_wamas_ubl/tests/samples/WAMAS2UBL-SAMPLE_AUSKQ_WATEKQ_WATEPQ.wamas
+++ b/base_wamas_ubl/tests/samples/WAMAS2UBL-SAMPLE_AUSKQ_WATEKQ_WATEPQ.wamas
@@ -2,3 +2,4 @@ WAMAS     ODOO      00005620230413110200AUSKQ00520001673982/1701778     HOST 167
 WAMAS     ODOO      00000120230413110200WATEKQ054376401426411929180QUAI-22       000000000000000000000000                  0000GE 2/120185         HOST PE        000740ST9016000000314700                    
 WAMAS     ODOO      00000220230413110200WATEPQ050                    20240413                    12    eCAM  008610  NN20240413000001TETRA     0001673982/1701778     HOST 00010100015455               00000000000007000000000000000DISPONIBLE          376401426411929180
 WAMAS     ODOO      00000320230413110200WATEPQ050                    20240413                    12    eCAM  008610  NN20240413000001TETRA     0001673982/1701778     HOST 00010200015455               00000000000008000000000000000DISPONIBLE          376401426411929180
+WAMAS     ODOO      00000420230413110200WATEPQ050                    20240413                    12    eCAM  008610  NN20240413000001TETRA     0001673982/1701778     HOST 00010300015455               00000000000000000000000000000DISPONIBLE          376401426411929180