Fix TradeTemplate. If tradeId (TradeRepository) != NONREF, add it to output

src/main/scala/templates/TradeTemplate.scala

@@ -11,6 +11,10 @@ abstract class TradeTemplate(source: Node) extends RegiAmendTradeTemplate(source
         { /* Uses dictionary from PartyTemplate for identifier */ }
         <fpml:partyTradeIdentifier>
           <fpml:partyReference href={ parties("TradeRepository")._1 }/>
+          { val tradeId = get((source \\ "trade" \ "tradeHeader" \ "partyTradeIdentifier" \ "tradeId"))
+            if (tradeId != "NONREF")
+              <fpml:tradeId tradeIdScheme={ "REP" }>{ tradeId }</fpml:tradeId>
+          }
           <fpml:tradeId tradeIdScheme={ "UTI" }>{ get((source \\ "trade" \ "tradeHeader" \ "partyTradeIdentifier").filter(_.child.filter(_.attributes.nonEmpty).head.attributes("href").text.mkString == "UTIGeneratingParty") \ "tradeId") }</fpml:tradeId>
         </fpml:partyTradeIdentifier>
         { for { s <- source \\ "trade" \ "tradeHeader" \ "partyTradeIdentifier"