From e0e09ae2308913648a36cd46db0a3bb474baf7ff Mon Sep 17 00:00:00 2001
From: Paul Donohoe <paul.donohoe@ext.publications.europa.eu>
Date: Tue, 30 Apr 2024 15:39:34 +0200
Subject: [PATCH 1/2] Improved link between LotResult and Lot

---
 development-notices/eforms-xml/19-318420-001-EXP.xml | 2 +-
 xslt/functions-and-data.xslt                         | 2 ++
 xslt/notice-result.xslt                              | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/development-notices/eforms-xml/19-318420-001-EXP.xml b/development-notices/eforms-xml/19-318420-001-EXP.xml
index 9eceb98..ef913ef 100644
--- a/development-notices/eforms-xml/19-318420-001-EXP.xml
+++ b/development-notices/eforms-xml/19-318420-001-EXP.xml
@@ -50,7 +50,7 @@
                      </efac:SettledContract>
                      <!--Result Lot Identifier (BT-13713)-->
                      <efac:TenderLot>
-                        <cbc:ID schemeName="Lot">1</cbc:ID>
+                        <cbc:ID schemeName="Lot">LOT-0000</cbc:ID>
                      </efac:TenderLot>
                   </efac:LotResult>
                   <efac:LotTender><!--Tender Technical Identifier (OPT-321)-->
diff --git a/xslt/functions-and-data.xslt b/xslt/functions-and-data.xslt
index e6c184e..03bff93 100644
--- a/xslt/functions-and-data.xslt
+++ b/xslt/functions-and-data.xslt
@@ -145,9 +145,11 @@ exclude-result-prefixes="xlink xs xsi fn functx doc opfun ted ted-1 ted-2 gc n20
 		<xsl:for-each select="$ted-form-main-element/*:OBJECT_CONTRACT/*:OBJECT_DESCR">
 			<lot>
 				<xsl:variable name="lot-no"><xsl:value-of select="*:LOT_NO"/></xsl:variable>
+				<xsl:variable name="item-no"><xsl:value-of select="@ITEM"/></xsl:variable>
 				<xsl:variable name="lot-no-is-convertible" select="(($lot-no eq '') or (fn:matches($lot-no, '^[1-9][0-9]{0,3}$')))"/>
 				<path><xsl:value-of select="functx:path-to-node-with-pos(.)"/></path>
 				<lot-no><xsl:value-of select="$lot-no"/></lot-no>
+				<item-no><xsl:value-of select="$item-no"/></item-no>
 				<xsl:if test="$lot-no-is-convertible"><is-convertible/></xsl:if>
 				<lot-id>
 					<xsl:choose>
diff --git a/xslt/notice-result.xslt b/xslt/notice-result.xslt
index f480f25..b11fb33 100644
--- a/xslt/notice-result.xslt
+++ b/xslt/notice-result.xslt
@@ -281,10 +281,14 @@ These instructions can be un-commented to show the variables
 			<xsl:variable name="result-lot-identifier">
 				<xsl:variable name="lot-no" select="@lot-number"/>
 				<xsl:variable name="lotid" select="$lot-numbers-map//lot[lot-no = $lot-no][1]/fn:string(lot-id)"/>
+				<xsl:variable name="lotidfromitem" select="$lot-numbers-map//lot[item-no = $lot-no][1]/fn:string(lot-id)"/>
 				<xsl:choose>
 					<xsl:when test="$lotid">
 						<xsl:value-of select="$lotid"/>
 					</xsl:when>
+					<xsl:when test="$lotidfromitem">
+						<xsl:value-of select="$lotidfromitem"/>
+					</xsl:when>
 					<xsl:otherwise>
 						<xsl:value-of select="$lot-no"/>
 					</xsl:otherwise>

From 5a9b47b2a1f7a26813e91945b5d500b7f5cbb62a Mon Sep 17 00:00:00 2001
From: Paul Donohoe <paul.donohoe@ext.publications.europa.eu>
Date: Tue, 30 Apr 2024 15:50:13 +0200
Subject: [PATCH 2/2] Updated CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6544b48..1ac3e49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ This is a bugfix release of the TED XML Data Converter. Some cosmetic changes ar
 ## Bug fixes
 
 * Fatal error in "lot-results" template
+* Improved link between LotResult and Lot
 
 ## Mapping changes