add kto

src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableTransaction.java

@@ -101,6 +101,12 @@ public interface IZUGFeRDExportableTransaction {
 	 */
 	String getOwnIBAN();
 
+    /**
+     * IBAN of the sender
+     * @return  the Account Number of the invoice sender's bank account
+     */
+    String getOwnKto();
+
     /**
 	 * Tax ID (not VAT ID) of the sender
 	 * @return  Tax ID (not VAT ID) of the sender

src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java

@@ -344,9 +344,11 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
 					+ "				<ram:Information>Überweisung</ram:Information>\n" //$NON-NLS-1$
 					+ "				<ram:PayeePartyCreditorFinancialAccount>\n" //$NON-NLS-1$
 					+ "					<ram:IBANID>"+trans.getOwnIBAN()+"</ram:IBANID>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "					<ram:ProprietaryID>"+trans.getOwnKto()+"</ram:ProprietaryID>\n" //$NON-NLS-1$ //$NON-NLS-2$
 					+ "				</ram:PayeePartyCreditorFinancialAccount>\n" //$NON-NLS-1$
 					+ "				<ram:PayeeSpecifiedCreditorFinancialInstitution>\n" //$NON-NLS-1$
 					+ "					<ram:BICID>"+trans.getOwnBIC()+"</ram:BICID>\n" //$NON-NLS-1$ //$NON-NLS-2$
+					+ "					<ram:GermanBankleitzahlID>"+ trans.getOwnBLZ()+"</ram:GermanBankleitzahlID>\n" //$NON-NLS-1$ //$NON-NLS-2$
 //					+ "					<ram:Name>"+trans.getOwnBankName()+"</ram:Name>\n" //$NON-NLS-1$ //$NON-NLS-2$
 					+ "				</ram:PayeeSpecifiedCreditorFinancialInstitution>\n" //$NON-NLS-1$
 					+ "			</ram:SpecifiedTradeSettlementPaymentMeans>\n"; //$NON-NLS-1$

src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDImporter.java

@@ -66,6 +66,7 @@ public class ZUGFeRDImporter {
     private String BLZ;
 	private String BIC;
 	private String IBAN;
+	private String KTO;
 	private String holder;
 	private String amount;
 	private String dueDate;
@@ -284,6 +285,9 @@ public class ZUGFeRDImporter {
 				Node detail = bookingDetails.item(detailIndex);
 				if ((detail.getLocalName() != null) && (detail.getLocalName().equals("IBANID"))) { //$NON-NLS-1$
 					setIBAN(detail.getTextContent());
+				}
+                if ((detail.getLocalName() != null) && (detail.getLocalName().equals("ProprietaryID"))) { //$NON-NLS-1$
+                    setKTO(detail.getTextContent());
 
                 }
             }
@@ -455,6 +459,20 @@ public class ZUGFeRDImporter {
 		return IBAN;
 	}
 
+    /**
+     *
+     * @return the sender's KTO
+     */
+    public String getKTO() {
+        if (!parsed) {
+            throw new RuntimeException("use extract() before requesting a value");
+        }
+        if (KTO==null) {
+            parse();
+        }
+        return KTO;
+    }
+
     /**
 	 * 
 	 * @return the sender's bank name
@@ -473,6 +491,10 @@ public class ZUGFeRDImporter {
 		this.IBAN = IBAN;
 	}
 
+    private void setKTO(String KTO) {
+        this.KTO = KTO;
+    }
+
     /**
 	 * 
 	 * @return the name of the owner of the sender's bank account

src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDTransactionModelConverter.java

@@ -363,6 +363,9 @@ class ZUGFeRDTransactionModelConverter {
         IDType iban = xmlFactory.createIDType();
         iban.setValue(trans.getOwnIBAN());
         bankAccount.setIBANID(iban);
+        IDType kto = xmlFactory.createIDType();
+        kto.setValue(trans.getOwnKto());
+        bankAccount.setProprietaryID(kto);
         paymentData.setPayeePartyCreditorFinancialAccount(bankAccount);
 
         CreditorFinancialInstitutionType bankData = xmlFactory

src/test/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableTransactionImpl.java

@@ -30,6 +30,7 @@ public class IZUGFeRDExportableTransactionImpl implements IZUGFeRDExportableTran
     private IZUGFeRDAllowanceCharge[] zFLogisticsServiceCharges;
     private IZUGFeRDExportableItem[] zFItems;
     private IZUGFeRDExportableContact recipient;
+    private String ownKto;
     private String ownBLZ;
     private String ownBIC;
     private String ownBankName;
@@ -92,6 +93,11 @@ public class IZUGFeRDExportableTransactionImpl implements IZUGFeRDExportableTran
         return recipient;
     }
 
+    @Override
+    public String getOwnKto() {
+        return ownKto;
+    }
+
     @Override
     public String getOwnBLZ() {
         return ownBLZ;
@@ -232,6 +238,11 @@ public class IZUGFeRDExportableTransactionImpl implements IZUGFeRDExportableTran
         return this;
     }
 
+    public IZUGFeRDExportableTransactionImpl setOwnKto(String ownKto) {
+        this.ownKto = ownKto;
+        return this;
+    }
+
     public IZUGFeRDExportableTransactionImpl setOwnIBAN(String ownIBAN) {
         this.ownIBAN = ownIBAN;
         return this;

src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterCustomXMLTest.java

@@ -217,6 +217,7 @@ public class MustangReaderWriterCustomXMLTest extends TestCase {
 					"				<ram:Information>Überweisung</ram:Information>\n" + 
 					"				<ram:PayeePartyCreditorFinancialAccount>\n" + 
 					"					<ram:IBANID>DE88 2008 0000 0970 3757 00</ram:IBANID>\n" +
+					"					<ram:ProprietaryID>44421800</ram:ProprietaryID>\n" +
 					"				</ram:PayeePartyCreditorFinancialAccount>\n" +
 					"				<ram:PayeeSpecifiedCreditorFinancialInstitution>\n" + 
 					"					<ram:BICID>COBADEFFXXX</ram:BICID>\n" +
@@ -279,6 +280,7 @@ public class MustangReaderWriterCustomXMLTest extends TestCase {
 		String bic = null;
         String blz = null;
 		String iban = null;
+        String kto = null;
 		String holder = null;
 		String ref = null;
 
@@ -288,6 +290,7 @@ public class MustangReaderWriterCustomXMLTest extends TestCase {
             blz = zi.getBLZ();
 			bic = zi.getBIC();
 			iban = zi.getIBAN();
+            kto = zi.getKTO();
 			holder = zi.getHolder();
 			ref = zi.getForeignReference();
 		}
@@ -296,6 +299,7 @@ public class MustangReaderWriterCustomXMLTest extends TestCase {
         assertEquals(blz, "41441604");
 		assertEquals(bic, "COBADEFFXXX");
 		assertEquals(iban, "DE88 2008 0000 0970 3757 00");
+		assertEquals(kto, "44421800");
 		assertEquals(holder, "Bei Spiel GmbH");
 		assertEquals(ref, "RE-20171118/506");
 	}
@@ -354,6 +358,7 @@ public class MustangReaderWriterCustomXMLTest extends TestCase {
 					+ "<ram:SpecifiedTradeSettlementPaymentMeans>\n" + "<ram:TypeCode>42</ram:TypeCode>\n"
 					+ "<ram:Information>Überweisung</ram:Information>\n" + "<ram:PayeePartyCreditorFinancialAccount>\n"
 					+ "<ram:IBANID>DE88 2008 0000 0970 3757 00</ram:IBANID>\n"
+					+ "<ram:ProprietaryID>44421800</ram:ProprietaryID>\n"
 					+ "</ram:PayeePartyCreditorFinancialAccount>\n"
 					+ "<ram:PayeeSpecifiedCreditorFinancialInstitution>\n"
                     + "<ram:BICID>COBADEFFXXX</ram:BICID>\n"
@@ -476,6 +481,7 @@ public class MustangReaderWriterCustomXMLTest extends TestCase {
 		String bic = null;
         String blz = null;
 		String iban = null;
+		String kto = null;
 		String holder = null;
 		String ref = null;
 
@@ -485,6 +491,7 @@ public class MustangReaderWriterCustomXMLTest extends TestCase {
 			bic = zi.getBIC();
             blz = zi.getBLZ();
 			iban = zi.getIBAN();
+			kto = zi.getKTO();
 			holder = zi.getHolder();
 			ref = zi.getForeignReference();
 		}
@@ -493,6 +500,7 @@ public class MustangReaderWriterCustomXMLTest extends TestCase {
 		assertEquals(bic, "COBADEFFXXX");
         assertEquals(blz, "41441604");
 		assertEquals(iban, "DE88 2008 0000 0970 3757 00");
+		assertEquals(kto, "44421800");
 		assertEquals(holder, "Bei Spiel GmbH");
 		assertEquals(ref, "RE-20170509/505");
 	}

src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterEdgeTest.java

@@ -59,6 +59,12 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
     return "RE-20170509/505";
   }
 
+  @Override
+  public String getOwnKto()
+    {
+        return "44421800";
+    }
+
     @Override
   public String getOwnBLZ()
     {
@@ -370,7 +376,7 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
   // //////// TESTS //////////////////////////////////////////////////////////////////////////////////////////
 
   /**
-   * The importer test imports from ./src/test/MustangGnuaccountingBeispielRE-20151008_504.pdf to check the values.
+   * The importer test imports from ./src/test/MustangGnuaccountingBeispielRE-20170509_505.pdf to check the values.
    * --> as only Name Ascending is supported for Test Unit sequence, I renamed the this test-A-Export to run before
    * testZExport
    *
@@ -387,6 +393,7 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
     String bic = null;
     String blz = null;
     String iban = null;
+    String kto = null;
     String holder = null;
     String ref = null;
     String dueDate = null;
@@ -398,6 +405,7 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
       bic = zi.getBIC();
       blz = zi.getBLZ();
       iban = zi.getIBAN();
+      kto = zi.getKTO();
       holder = zi.getHolder();
       dueDate = zi.getDueDate();
       ref = zi.getForeignReference();
@@ -407,6 +415,7 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
     assertEquals(bic, getOwnBIC());
     assertEquals(blz, getOwnBLZ());
     assertEquals(iban, getOwnIBAN());
+    assertEquals(kto, getOwnKto());
     assertEquals(holder, getOwnOrganisationName());
 
     assertEquals(dueDate, "20170530");
@@ -450,6 +459,7 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
     String bic = null;
     String blz = null;
     String iban = null;
+    String kto = null;
     String holder = null;
     String ref = null;
 
@@ -460,6 +470,7 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
       bic = zi.getBIC();
       blz = zi.getBLZ();
       iban = zi.getIBAN();
+      kto = zi.getKTO();
       holder = zi.getHolder();
       ref = zi.getForeignReference();
     }
@@ -468,6 +479,7 @@ public class MustangReaderWriterEdgeTest extends TestCase implements IZUGFeRDExp
     assertEquals(bic, getOwnBIC());
     assertEquals(blz, getOwnBLZ());
     assertEquals(iban, getOwnIBAN());
+    assertEquals(kto, getOwnKto());
     assertEquals(holder, getOwnOrganisationName());
     assertEquals(ref, getNumber());
 

src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java

@@ -56,6 +56,11 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
 		return "RE-20171118/506";
 	}
 
+    @Override
+    public String getOwnKto() {
+        return "44421800";
+    }
+
     @Override
     public String getOwnBLZ() {
         return "41441604";
@@ -353,6 +358,7 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
         String blz = null;
 		String bic = null;
 		String iban = null;
+		String kto = null;
 		String holder = null;
 		String ref = null;
 
@@ -362,6 +368,7 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
             blz = zi.getBLZ();
 			bic = zi.getBIC();
 			iban = zi.getIBAN();
+			kto = zi.getKTO();
 			holder = zi.getHolder();
 			ref = zi.getForeignReference();
 		}
@@ -370,6 +377,7 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
 		assertEquals(blz, "41441604");
         assertEquals(bic, "COBADEFFXXX");
 		assertEquals(iban, "DE88 2008 0000 0970 3757 00");
+		assertEquals(kto, "44421800");
 		assertEquals(holder, "Bei Spiel GmbH");
 		assertEquals(ref, "RE-20170509/505");
 
@@ -522,6 +530,7 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
 		String amount = null;
 		String bic = null;
 		String iban = null;
+		String kto = null;
 		String holder = null;
 		String ref = null;
 		if (zi.canParse()) {
@@ -529,6 +538,7 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
 			amount = zi.getAmount();
 			bic = zi.getBIC();
 			iban = zi.getIBAN();
+			kto = zi.getKTO();
 			holder = zi.getHolder();
 			ref = zi.getForeignReference();
 		}
@@ -536,6 +546,7 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
 		assertEquals(amount, "571.04");
 		assertEquals(bic, getOwnBIC());
 		assertEquals(iban, getOwnIBAN());
+		assertEquals(kto, getOwnKto());
 		assertEquals(holder, getOwnOrganisationName());
 		assertEquals(ref, getNumber());
 

src/test/resources/migration/input/ZUGFeRD1-invoice-adjusted.xml

@@ -77,6 +77,7 @@
                 <ram:Information>Überweisung</ram:Information>
                 <ram:PayeePartyCreditorFinancialAccount>
                     <ram:IBANID>DE88 2008 0000 0970 3757 00</ram:IBANID>
+                    <ram:ProprietaryID>44421800</ram:ProprietaryID>
                 </ram:PayeePartyCreditorFinancialAccount>
                 <ram:PayeeSpecifiedCreditorFinancialInstitution>
                     <ram:BICID>COBADEFFXXX</ram:BICID>

src/test/resources/migration/input/ZUGFeRD1-invoice.xml

@@ -77,6 +77,7 @@
                 <ram:Information>Überweisung</ram:Information>
                 <ram:PayeePartyCreditorFinancialAccount>
                     <ram:IBANID>DE88 2008 0000 0970 3757 00</ram:IBANID>
+                    <ram:ProprietaryID>44421800</ram:ProprietaryID>
                 </ram:PayeePartyCreditorFinancialAccount>
                 <ram:PayeeSpecifiedCreditorFinancialInstitution>
                     <ram:BICID>COBADEFFXXX</ram:BICID>

src/test/resources/migration/reference/ZUGFeRD2-invoice.xml

@@ -177,6 +177,7 @@ Migrated by Mustangproject XSLT
                 <ram:Information>Überweisung</ram:Information>
                 <ram:PayeePartyCreditorFinancialAccount>
                     <ram:IBANID>DE88 2008 0000 0970 3757 00</ram:IBANID>
+                    <ram:ProprietaryID>44421800</ram:ProprietaryID>
                 </ram:PayeePartyCreditorFinancialAccount>
                 <ram:PayeeSpecifiedCreditorFinancialInstitution>
                     <ram:BICID>COBADEFFXXX</ram:BICID>