From 81e947a02c2216bfb08aebdb558f8b25c341b158 Mon Sep 17 00:00:00 2001
From: Martin Forsberg <martin.forsberg@ecrucial.se>
Date: Thu, 15 Feb 2024 10:45:24 +0100
Subject: [PATCH 1/3] POACC-534 added code for non-returnable items

---
 structure/codelist/TransactionConditions.xml | 18 +++++-------------
 structure/syntax/ubl-catalogue.xml           | 12 +++++++-----
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/structure/codelist/TransactionConditions.xml b/structure/codelist/TransactionConditions.xml
index edde0262..e44f6563 100644
--- a/structure/codelist/TransactionConditions.xml
+++ b/structure/codelist/TransactionConditions.xml
@@ -7,21 +7,13 @@
     <Agency>OpenPEPPOL</Agency>
     <Subset>OpenPEPPOL</Subset>
 
-    <Code>
-        <Id>VQ</Id>
-        <Name>Variable measure indicator</Name>
-    </Code>
-    <Code>
-        <Id>RC</Id>
-        <Name>Returnable unit, indicator</Name>
-    </Code>
-    <Code>
-        <Id>SER</Id>
-        <Name>Trade item is a service</Name>
+	<Code>
+        <Id>CT</Id>
+        <Name>Contracted item</Name>
     </Code>
     <Code>
-        <Id>MTO</Id>
-        <Name>Trade item is produced after it has been ordered</Name>
+        <Id>NON_RETURNABLE</Id>
+        <Name>Non returnable item</Name>
     </Code>
 
 </CodeList>
diff --git a/structure/syntax/ubl-catalogue.xml b/structure/syntax/ubl-catalogue.xml
index 8eb04d46..e2cb756f 100644
--- a/structure/syntax/ubl-catalogue.xml
+++ b/structure/syntax/ubl-catalogue.xml
@@ -1612,16 +1612,18 @@
 
 					</Element>
 				</Element>
-				<Element cardinality="0..1">
+				<Element cardinality="0..n">
 					<Term>cac:TransactionConditions</Term>
-					<Name>Contracted item</Name>
+					<Name>Transaction condition</Name>
 					<Element>
 						<Term>cbc:ActionCode</Term>
-						<Name>Contracted item indicator</Name>
-						<Description>The code CT indicates that the item is offered in accordance to the referenced contract.</Description>
+						<Name>Contracted item indicator, Non-returnable item indicator</Name>
+						<Description>The code CT indicates that the item is offered in accordance to the referenced contract (tir19-p027). The code NON_RETURNABLE indicates that the item cannot be returned (tir19-p049).</Description>
 						<DataType>Code</DataType>
 						<Reference type="BUSINESS_TERM">tir19-p027</Reference>
-						<Value type="FIXED">CT</Value>
+						<Reference type="BUSINESS_TERM">tir19-p049</Reference>
+						<Reference type="CODE_LIST">TransactionCondition</Reference>
+						
 					</Element>
 				</Element>
 				<Element cardinality="0..n">

From 444e817219224f048f2a578bf4130c838e1ba473 Mon Sep 17 00:00:00 2001
From: Martin Forsberg <martin.forsberg@ecrucial.se>
Date: Thu, 15 Feb 2024 10:51:07 +0100
Subject: [PATCH 2/3] Updated project.xml to list the codelist

---
 project.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/project.xml b/project.xml
index c0905ed5..abbc7faf 100644
--- a/project.xml
+++ b/project.xml
@@ -278,6 +278,10 @@
         <Type>CodeList-1</Type>
         <Path>structure/codelist/UNECERec19.xml</Path>
     </Resource>
+	<Resource>
+        <Type>CodeList-1</Type>
+        <Path>structure/codelist/TransactionConditions.xml</Path>
+    </Resource>
 
     <Resource>
         <Type>CodeList-1</Type>

From 300eb45b090f2d81c072181df176a75f191ae571 Mon Sep 17 00:00:00 2001
From: Martin Forsberg <martin.forsberg@ecrucial.se>
Date: Thu, 15 Feb 2024 10:55:10 +0100
Subject: [PATCH 3/3] editorial fixes

---
 project.xml                                  | 9 ++++-----
 structure/codelist/TransactionConditions.xml | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/project.xml b/project.xml
index abbc7faf..a362fc8f 100644
--- a/project.xml
+++ b/project.xml
@@ -270,6 +270,10 @@
         <Type>CodeList-1</Type>
         <Path>structure/codelist/UNCL5387.xml</Path>
     </Resource>
+	<Resource>
+        <Type>CodeList-1</Type>
+        <Path>structure/codelist/TransactionConditions.xml</Path>
+    </Resource>	
     <Resource>
         <Type>CodeList-1</Type>
         <Path>structure/codelist/UNCL4219.xml</Path>
@@ -278,11 +282,6 @@
         <Type>CodeList-1</Type>
         <Path>structure/codelist/UNECERec19.xml</Path>
     </Resource>
-	<Resource>
-        <Type>CodeList-1</Type>
-        <Path>structure/codelist/TransactionConditions.xml</Path>
-    </Resource>
-
     <Resource>
         <Type>CodeList-1</Type>
         <Path>structure/codelist/UNECERec20-11e.xml</Path>
diff --git a/structure/codelist/TransactionConditions.xml b/structure/codelist/TransactionConditions.xml
index e44f6563..63399dd4 100644
--- a/structure/codelist/TransactionConditions.xml
+++ b/structure/codelist/TransactionConditions.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CodeList xmlns="urn:fdc:difi.no:2017:vefa:structure:CodeList-1">
 
-    <Title>Transaction condition code</Title>
+    <Title>Transaction condition code (OpenPEPPOL)</Title>
     <Identifier>TransactionCondition</Identifier>
     <Version>1.0</Version>
     <Agency>OpenPEPPOL</Agency>