diff --git a/ZUGFeRD2-invoice.xml b/ZUGFeRD2-invoice.xml index ae3a1a03..25d19521 100644 --- a/ZUGFeRD2-invoice.xml +++ b/ZUGFeRD2-invoice.xml @@ -4,7 +4,8 @@ xmlns:qdt="urn:un:unece:uncefact:data:Standard:QualifiedDataType:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100"> +--> + false @@ -12,7 +13,7 @@ Migrated by Mustangproject XSLT urn:ferd:CrossIndustryDocument:invoice:1p0:extended - + RE-20170509/505 RECHNUNG 380 @@ -20,16 +21,16 @@ Migrated by Mustangproject XSLT 20170509 - - - + + + 1 - + Künstlerische Gestaltung (Stunde): Einer Beispielrechnung - + 160.0000 1.0000 @@ -39,10 +40,10 @@ Migrated by Mustangproject XSLT 1.0000 - + 1.0000 - + VAT S @@ -52,16 +53,16 @@ Migrated by Mustangproject XSLT 160.00 - - - + + + 2 - + Luftballon: Bunt, ca. 500ml - + 0.7900 1.0000 @@ -71,10 +72,10 @@ Migrated by Mustangproject XSLT 1.0000 - + 400.0000 - + VAT S @@ -84,16 +85,16 @@ Migrated by Mustangproject XSLT 316.00 - - - + + + 3 - + Heiße Luft pro Liter - + 0.1000 1.0000 @@ -103,10 +104,10 @@ Migrated by Mustangproject XSLT 1.0000 - + 200.0000 - + VAT S @@ -116,8 +117,8 @@ Migrated by Mustangproject XSLT 20.00 - - + + Bei Spiel GmbH @@ -146,14 +147,14 @@ Migrated by Mustangproject XSLT - + 20170507 - + RE-20170509/505 EUR @@ -199,6 +200,6 @@ Migrated by Mustangproject XSLT 571.04 - + diff --git a/doc/MustangWriter.java b/doc/MustangWriter.java index 7be0e1c9..91c2cfe1 100644 --- a/doc/MustangWriter.java +++ b/doc/MustangWriter.java @@ -17,15 +17,15 @@ import org.mustangproject.ZUGFeRD.ZUGFeRDExporterFromA1Factory; public class MustangWriter implements IZUGFeRDExportableTransaction { public static void main(String[] args) { - MustangWriter m1=new MustangWriter(); + MustangWriter m1 = new MustangWriter(); m1.apply(); } private void apply() { try { System.out.println("Reading Blanko-PDF"); - ZUGFeRDExporter ze= - new ZUGFeRDExporterFromA1Factory().setProducer("My Application").setCreator(System.getProperty("user.name")).load("./MustangGnuaccountingBeispielRE-20171118_506blanko.pdf"); + ZUGFeRDExporter ze = + new ZUGFeRDExporterFromA1Factory().setProducer("My Application").setCreator(System.getProperty("user.name")).load("./MustangGnuaccountingBeispielRE-20171118_506blanko.pdf"); System.out.println("Generating and attaching ZUGFeRD-Data"); ze.PDFattachZugferdFile(this); System.out.println("Writing ZUGFeRD-PDF"); @@ -36,6 +36,7 @@ public class MustangWriter implements IZUGFeRDExportableTransaction { e.printStackTrace(); } } + @Override public String getCurrency() { // TODO Auto-generated method stub @@ -44,18 +45,18 @@ public class MustangWriter implements IZUGFeRDExportableTransaction { @Override public Date getDeliveryDate() { - return new GregorianCalendar(2017,Calendar.NOVEMBER,17).getTime(); + return new GregorianCalendar(2017, Calendar.NOVEMBER, 17).getTime(); } @Override public Date getDueDate() { - return new GregorianCalendar(2017,Calendar.DECEMBER,9).getTime(); + return new GregorianCalendar(2017, Calendar.DECEMBER, 9).getTime(); } @Override public Date getIssueDate() { - return new GregorianCalendar(2017,Calendar.NOVEMBER,18).getTime(); + return new GregorianCalendar(2017, Calendar.NOVEMBER, 18).getTime(); } @Override @@ -90,10 +91,10 @@ public class MustangWriter implements IZUGFeRDExportableTransaction { @Override public String getOwnOrganisationFullPlaintextInfo() { - return "Bei Spiel GmbH\n"+ - "Ecke 12\n"+ - "12345 Stadthausen\n"+ - "Geschäftsführer: Max Mustermann"; + return "Bei Spiel GmbH\n" + + "Ecke 12\n" + + "12345 Stadthausen\n" + + "Geschäftsführer: Max Mustermann"; } @Override @@ -160,15 +161,15 @@ public class MustangWriter implements IZUGFeRDExportableTransaction { @Override public IZUGFeRDExportableItem[] getZFItems() { - Item[] allItems=new Item[3]; - Product designProduct=new Product("", "Künstlerische Gestaltung (Stunde): Einer Beispielrechnung", "HUR", new BigDecimal("7.000000")); - Product balloonProduct=new Product("", "Luftballon: Bunt, ca. 500ml", "C62", new BigDecimal("19.000000")); - Product airProduct=new Product("", "Heiße Luft pro Liter", "LTR", new BigDecimal("19.000000")); + Item[] allItems = new Item[3]; + Product designProduct = new Product("", "Künstlerische Gestaltung (Stunde): Einer Beispielrechnung", "HUR", new BigDecimal("7.000000")); + Product balloonProduct = new Product("", "Luftballon: Bunt, ca. 500ml", "C62", new BigDecimal("19.000000")); + Product airProduct = new Product("", "Heiße Luft pro Liter", "LTR", new BigDecimal("19.000000")); - allItems[0]=new Item(new BigDecimal("160"), new BigDecimal("1"), designProduct); - allItems[1]=new Item(new BigDecimal("0.79"), new BigDecimal("400"), balloonProduct); - allItems[2]=new Item(new BigDecimal("0.10"), new BigDecimal("200"), airProduct); - return allItems; + allItems[0] = new Item(new BigDecimal("160"), new BigDecimal("1"), designProduct); + allItems[1] = new Item(new BigDecimal("0.79"), new BigDecimal("400"), balloonProduct); + allItems[2] = new Item(new BigDecimal("0.10"), new BigDecimal("200"), airProduct); + return allItems; } @Override diff --git a/src/main/resources/schema/ZUGFeRD1p0.xsd b/src/main/resources/schema/ZUGFeRD1p0.xsd index cc3075a4..41e2cc9c 100644 --- a/src/main/resources/schema/ZUGFeRD1p0.xsd +++ b/src/main/resources/schema/ZUGFeRD1p0.xsd @@ -1,20 +1,23 @@ - - - - - - - - - - - + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:12" + xmlns:ram="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:12" + xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:15" + targetNamespace="urn:ferd:CrossIndustryDocument:invoice:1p0" + elementFormDefault="qualified"> + + + + + + + + + + + diff --git a/src/main/resources/schema/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_QualifiedDataType_12.xsd b/src/main/resources/schema/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_QualifiedDataType_12.xsd index 42b66e81..77d4e7ed 100644 --- a/src/main/resources/schema/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_QualifiedDataType_12.xsd +++ b/src/main/resources/schema/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_QualifiedDataType_12.xsd @@ -1,76 +1,77 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:15" + targetNamespace="urn:un:unece:uncefact:data:standard:QualifiedDataType:12" + elementFormDefault="qualified" + version="12.0"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/schema/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_12.xsd b/src/main/resources/schema/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_12.xsd index d207ef0a..c2647960 100644 --- a/src/main/resources/schema/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_12.xsd +++ b/src/main/resources/schema/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_12.xsd @@ -1,352 +1,391 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:12" + xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:15" + targetNamespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:12" + elementFormDefault="qualified" + version="12.0"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/schema/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_15.xsd b/src/main/resources/schema/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_15.xsd index 49670142..9a8e41c4 100644 --- a/src/main/resources/schema/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_15.xsd +++ b/src/main/resources/schema/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_15.xsd @@ -1,95 +1,95 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + xmlns:xs="http://www.w3.org/2001/XMLSchema" + targetNamespace="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:15" + elementFormDefault="qualified" + version="15.0"> + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/test/resources/migration/input/ZUGFeRD1-invoice-adjusted.xml b/src/test/resources/migration/input/ZUGFeRD1-invoice-adjusted.xml index 70db824b..0240b509 100644 --- a/src/test/resources/migration/input/ZUGFeRD1-invoice-adjusted.xml +++ b/src/test/resources/migration/input/ZUGFeRD1-invoice-adjusted.xml @@ -15,7 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> - + false diff --git a/src/test/resources/migration/input/ZUGFeRD1-invoice.xml b/src/test/resources/migration/input/ZUGFeRD1-invoice.xml index 4b3ddba2..8f082f08 100644 --- a/src/test/resources/migration/input/ZUGFeRD1-invoice.xml +++ b/src/test/resources/migration/input/ZUGFeRD1-invoice.xml @@ -15,7 +15,10 @@ See the License for the specific language governing permissions and limitations under the License. --> - + false