Merge branch 'master' into issues/503-ubl
This commit is contained in:
jstaerk
@@ -24,21 +24,25 @@ package org.mustangproject.ZUGFeRD;
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import junit.framework.TestCase;
|
||||
import org.junit.Assert;
|
||||
import org.junit.FixMethodOrder;
|
||||
import org.junit.runners.MethodSorters;
|
||||
import org.mustangproject.*;
|
||||
import org.mustangproject.ZUGFeRD.model.EventTimeCodeTypeConstants;
|
||||
|
||||
import javax.xml.xpath.XPathExpressionException;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.math.BigDecimal;
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.nio.file.Files;
|
||||
import java.text.ParseException;
|
||||
import java.text.SimpleDateFormat;
|
||||
import java.util.Date;
|
||||
|
||||
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
|
||||
public class DeSerializationTest extends ResourceCase {
|
||||
public class DeSerializationTest extends ResourceCase {
|
||||
public void testJackson() throws JsonProcessingException {
|
||||
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
@@ -68,7 +72,7 @@ public class DeSerializationTest extends ResourceCase {
|
||||
hasExceptions = true;
|
||||
}
|
||||
|
||||
CalculatedInvoice ci=new CalculatedInvoice();
|
||||
CalculatedInvoice ci = new CalculatedInvoice();
|
||||
try {
|
||||
zii.extractInto(ci);
|
||||
} catch (XPathExpressionException e) {
|
||||
@@ -154,14 +158,57 @@ public class DeSerializationTest extends ResourceCase {
|
||||
" }\n" +
|
||||
" ]\n" +
|
||||
"}", Invoice.class);
|
||||
TransactionCalculator tc=new TransactionCalculator(fromJSON);
|
||||
assertEquals(tc.getGrandTotal(),new BigDecimal("234.43"));
|
||||
TransactionCalculator tc = new TransactionCalculator(fromJSON);
|
||||
assertEquals(tc.getGrandTotal(), new BigDecimal("234.43"));
|
||||
assertEquals(fromJSON.getNumber(), fromJSON.getNumber());
|
||||
assertEquals(fromJSON.getZFItems().length, fromJSON.getZFItems().length);
|
||||
|
||||
}
|
||||
|
||||
|
||||
public void testIssuerAssignedIDRoundtrip() {
|
||||
String occurrenceFrom = "20201001";
|
||||
String occurrenceTo = "20201005";
|
||||
String contractID = "376zreurzu0983";
|
||||
|
||||
String orgID = "0009845";
|
||||
String orgname = "Test company";
|
||||
String number = "123";
|
||||
String priceStr = "1.00";
|
||||
String taxID = "9990815";
|
||||
BigDecimal price = new BigDecimal(priceStr);
|
||||
Invoice newInvoiceFromJSON = null;
|
||||
boolean hasExceptions = false;
|
||||
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
|
||||
try {
|
||||
SchemedID gtin = new SchemedID("0160", "2001015001325");
|
||||
SchemedID gln = new SchemedID("0088", "4304171000002");
|
||||
Invoice i = new Invoice().setCurrency("CHF").addNote("document level 1/2").addNote("document level 2/2").setDueDate(new Date()).setIssueDate(new Date()).setDeliveryDate(new Date())
|
||||
.setSellerOrderReferencedDocumentID("9384").setBuyerOrderReferencedDocumentID("28934")
|
||||
.setDetailedDeliveryPeriod(new SimpleDateFormat("yyyyMMdd").parse(occurrenceFrom), new SimpleDateFormat("yyyyMMdd").parse(occurrenceTo))
|
||||
.setSender(new TradeParty(orgname, "teststr", "55232", "teststadt", "DE").addTaxID(taxID).setEmail("sender@test.org").setID(orgID).addVATID("DE0815"))
|
||||
.setDeliveryAddress(new TradeParty("just the other side of the street", "teststr.12a", "55232", "Entenhausen", "DE").addVATID("DE47110"))
|
||||
.setContractReferencedDocument(contractID)
|
||||
.setRecipient(new TradeParty("Franz Müller", "teststr.12", "55232", "Entenhausen", "DE").addGlobalID(gln).setEmail("recipient@test.org").addVATID("DE4711")
|
||||
.setContact(new Contact("Franz Müller", "01779999999", "franz@mueller.de", "teststr. 12", "55232", "Entenhausen", "DE").setFax("++49555123456")).setAdditionalAddress("Hinterhaus 3"))
|
||||
.addItem(new Item(new Product("Testprodukt", "", "H87", new BigDecimal(16)).addGlobalID(gtin).setSellerAssignedID("4711"), price, new BigDecimal(1.0)).setId("a123").addReferencedLineID("xxx").addNote("item level 1/1").addAllowance(new Allowance(new BigDecimal(0.02)).setReason("item discount").setTaxPercent(new BigDecimal(16))).setDetailedDeliveryPeriod(sdf.parse("2020-01-13"), sdf.parse("2020-01-15")))
|
||||
.addCharge(new Charge(new BigDecimal(0.5)).setReason("quick delivery charge").setTaxPercent(new BigDecimal(16)))
|
||||
.addAllowance(new Allowance(new BigDecimal(0.2)).setReason("discount").setTaxPercent(new BigDecimal(16)))
|
||||
.addCashDiscount(new CashDiscount(new BigDecimal(2), 14))
|
||||
.setDeliveryDate(sdf.parse("2020-11-02")).setNumber(number).setVATDueDateTypeCode(EventTimeCodeTypeConstants.PAYMENT_DATE);
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
String json = mapper.writeValueAsString(i);
|
||||
newInvoiceFromJSON = mapper.readValue(json, Invoice.class);
|
||||
} catch (ParseException e) {
|
||||
hasExceptions = true;
|
||||
} catch (JsonProcessingException e) {
|
||||
hasExceptions = true;
|
||||
}
|
||||
assertEquals(newInvoiceFromJSON.getBuyerOrderReferencedDocumentID(), "28934");
|
||||
assertFalse(hasExceptions);
|
||||
|
||||
|
||||
}
|
||||
|
||||
public void testDueDateRoundtrip() throws JsonProcessingException {
|
||||
|
||||
@@ -219,4 +266,389 @@ public class DeSerializationTest extends ResourceCase {
|
||||
}
|
||||
|
||||
|
||||
public void testDirectDebit() throws JsonProcessingException {
|
||||
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
|
||||
// [{"stringValue":"a","intValue":1,"booleanValue":true},
|
||||
// {"stringValue":"bc","intValue":3,"booleanValue":false}]
|
||||
|
||||
boolean exceptions = false;
|
||||
String theXML = "";
|
||||
try {
|
||||
Invoice fromJSON = mapper.readValue("\n" +
|
||||
"\t{\n" +
|
||||
"\t\t\"documentCode\": \"380\",\n" +
|
||||
"\t\t\"number\": \"F20220031\",\n" +
|
||||
"\t\t\"referenceNumber\": \"SERVEXEC\",\n" +
|
||||
"\t\t\"buyerOrderReferencedDocumentID\": \"PO201925478\",\n" +
|
||||
"\t\t\"ownOrganisationName\": \"LE FOURNISSEUR\",\n" +
|
||||
"\t\t\"currency\": \"EUR\",\n" +
|
||||
"\t\t\"issueDate\": \"2022-01-30T23:00:00.000+00:00\",\n" +
|
||||
"\t\t\"dueDate\": \"2022-03-01T23:00:00.000+00:00\",\n" +
|
||||
"\t\t\"deliveryDate\": \"2022-01-27T23:00:00.000+00:00\",\n" +
|
||||
"\t\t\"sender\": {\n" +
|
||||
"\t\t\"name\": \"LE FOURNISSEUR\",\n" +
|
||||
"\t\t\t\"zip\": \"75018\",\n" +
|
||||
"\t\t\t\"street\": \"35 rue d'ici\",\n" +
|
||||
"\t\t\t\"location\": \"PARIS\",\n" +
|
||||
"\t\t\t\"country\": \"FR\",\n" +
|
||||
"\t\t\t\"vatID\": \"FR11123456782\",\n" +
|
||||
"\t\t\t\"additionalAddress\": \"Seller line 2\",\n" +
|
||||
"\t\t\t\"additionalAddressExtension\": \"Seller line 3\",\n" +
|
||||
"\t\t\t\"bankDetails\": [\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"accountName\": null,\n" +
|
||||
"\t\t\t\"iban\": \"FR20 1254 2547 2569 8542 5874 698\",\n" +
|
||||
"\t\t\t\"bic\": \"BIC_MONCOMPTE\"\n" +
|
||||
"\t\t}\n" +
|
||||
" ],\n" +
|
||||
"\t\t\"debitDetails\": [\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"mandate\": \"MANDATE PT\",\n" +
|
||||
"\t\t\t\"iban\": \"FR20 1254 2547 2569 8542 5874 698\"\n" +
|
||||
"\t\t}\n" +
|
||||
" ],\n" +
|
||||
"\t\t\"contact\": {\n" +
|
||||
"\t\t\t\"name\": \"M. CONTACT\",\n" +
|
||||
"\t\t\t\t\"phone\": \"01 02 03 54 87\",\n" +
|
||||
"\t\t\t\t\"email\": \"seller@seller.com\",\n" +
|
||||
"\t\t\t\t\"zip\": null,\n" +
|
||||
"\t\t\t\t\"street\": null,\n" +
|
||||
"\t\t\t\t\"location\": null,\n" +
|
||||
"\t\t\t\t\"country\": null,\n" +
|
||||
"\t\t\t\t\"fax\": null,\n" +
|
||||
"\t\t\t\t\"vatid\": null,\n" +
|
||||
"\t\t\t\t\"id\": null,\n" +
|
||||
"\t\t\t\t\"additionalAddress\": null\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t\"email\": \"moi@seller.com\",\n" +
|
||||
"\t\t\t\"vatid\": \"FR11123456782\",\n" +
|
||||
"\t\t\t\"id\": \"123\",\n" +
|
||||
"\t\t\t\"legalOrganisation\": {\n" +
|
||||
"\t\t\t\"schemedID\": null,\n" +
|
||||
"\t\t\t\t\"tradingBusinessName\": \"SELLER TRADE NAME\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t\"globalID\": \"587451236587\",\n" +
|
||||
"\t\t\t\"globalIDScheme\": \"0088\"\n" +
|
||||
"\t},\n" +
|
||||
"\t\t\"recipient\": {\n" +
|
||||
"\t\t\"name\": \"LE CLIENT\",\n" +
|
||||
"\t\t\t\"zip\": \"06000\",\n" +
|
||||
"\t\t\t\"street\": \"MON ADRESSE LIGNE 1\",\n" +
|
||||
"\t\t\t\"location\": \"MA VILLE\",\n" +
|
||||
"\t\t\t\"country\": \"FR\",\n" +
|
||||
"\t\t\t\"vatID\": \"FR 05 987 654 321\",\n" +
|
||||
"\t\t\t\"additionalAddress\": \"Buyer line 2\",\n" +
|
||||
"\t\t\t\"additionalAddressExtension\": \"Buyer line 3\",\n" +
|
||||
"\t\t\t\"contact\": {\n" +
|
||||
"\t\t\t\"name\": \"Buyer contact name\",\n" +
|
||||
"\t\t\t\t\"phone\": \"01 01 25 45 87\",\n" +
|
||||
"\t\t\t\t\"email\": \"buyer@buyer.com\",\n" +
|
||||
"\t\t\t\t\"zip\": null,\n" +
|
||||
"\t\t\t\t\"street\": null,\n" +
|
||||
"\t\t\t\t\"location\": null,\n" +
|
||||
"\t\t\t\t\"country\": null,\n" +
|
||||
"\t\t\t\t\"fax\": null,\n" +
|
||||
"\t\t\t\t\"vatid\": null,\n" +
|
||||
"\t\t\t\t\"id\": null,\n" +
|
||||
"\t\t\t\t\"additionalAddress\": null\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t\"email\": \"me@buyer.com\",\n" +
|
||||
"\t\t\t\"vatid\": \"FR 05 987 654 321\",\n" +
|
||||
"\t\t\t\"legalOrganisation\": {\n" +
|
||||
"\t\t\t\"schemedID\": null,\n" +
|
||||
"\t\t\t\t\"tradingBusinessName\": null\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t\"globalID\": \"3654789851\",\n" +
|
||||
"\t\t\t\"globalIDScheme\": \"0088\"\n" +
|
||||
"\t},\n" +
|
||||
"\t\t\"deliveryAddress\": {\n" +
|
||||
"\t\t\"name\": \"DEL Name\",\n" +
|
||||
"\t\t\t\"zip\": \"06000\",\n" +
|
||||
"\t\t\t\"street\": \"DEL ADRESSE LIGNE 1\",\n" +
|
||||
"\t\t\t\"location\": \"NICE\",\n" +
|
||||
"\t\t\t\"country\": \"FR\",\n" +
|
||||
"\t\t\t\"additionalAddress\": \"DEL line 2\",\n" +
|
||||
"\t\t\t\"id\": \"PRIVATE_ID_DEL\"\n" +
|
||||
"\t},\n" +
|
||||
"\t\t\"payee\": {\n" +
|
||||
"\t\t\"name\": \"PAYEE NAME\",\n" +
|
||||
"\t\t\t\"legalOrganisation\": {\n" +
|
||||
"\t\t\t\"schemedID\": null,\n" +
|
||||
"\t\t\t\t\"tradingBusinessName\": null\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t\"globalID\": \"587451236586\",\n" +
|
||||
"\t\t\t\"globalIDScheme\": \"0088\"\n" +
|
||||
"\t},\n" +
|
||||
"\t\t\"sellerOrderReferencedDocumentID\": \"SALES REF 2547\",\n" +
|
||||
"\t\t\"despatchAdviceReferencedDocumentID\": \"DESPADV002\",\n" +
|
||||
"\t\t\"grandTotal\": 107.82,\n" +
|
||||
"\t\t\"detailedDeliveryPeriodFrom\": \"2021-12-31T23:00:00.000+00:00\",\n" +
|
||||
"\t\t\"detailedDeliveryPeriodTo\": \"2022-12-30T23:00:00.000+00:00\",\n" +
|
||||
"\t\t\"notesWithSubjectCode\": [\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"content\": \"FOURNISSEUR F SARL au capital de 50 000 EUR\",\n" +
|
||||
"\t\t\t\"subjectCode\": \"REG\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"content\": \"RCS MAVILLE 123 456 782\",\n" +
|
||||
"\t\t\t\"subjectCode\": \"ABL\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"content\": \"35 ma rue a moi, code postal Ville Pays – contact@masociete.fr - www.masociete.fr – N° TVA : FR32 123 456 789\",\n" +
|
||||
"\t\t\t\"subjectCode\": \"AAI\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"content\": \"Tout retard de paiement engendre une pénalité exigible à compter de la date d'échéance, calculée sur la base de trois fois le taux d'intérêt légal.\",\n" +
|
||||
"\t\t\t\"subjectCode\": null\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"content\": \"Indemnité forfaitaire pour frais de recouvrement en cas de retard de paiement : 40 €.\",\n" +
|
||||
"\t\t\t\"subjectCode\": null\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"content\": \"Les réglements reçus avant la date d'échéance ne donneront pas lieu à escompte.\",\n" +
|
||||
"\t\t\t\"subjectCode\": null\n" +
|
||||
"\t\t}\n" +
|
||||
" ],\n" +
|
||||
"\t\t\"zfallowances\": [\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 1,\n" +
|
||||
"\t\t\t\"taxPercent\": null,\n" +
|
||||
"\t\t\t\"reason\": \"REMISE VOLUME\",\n" +
|
||||
"\t\t\t\"reasonCode\": \"71\",\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 1,\n" +
|
||||
"\t\t\t\"taxPercent\": null,\n" +
|
||||
"\t\t\t\"reason\": \"REMISE VOLUME\",\n" +
|
||||
"\t\t\t\"reasonCode\": \"71\",\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 1,\n" +
|
||||
"\t\t\t\"taxPercent\": null,\n" +
|
||||
"\t\t\t\"reason\": \"REMISE VOLUME\",\n" +
|
||||
"\t\t\t\"reasonCode\": \"71\",\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 1,\n" +
|
||||
"\t\t\t\"taxPercent\": null,\n" +
|
||||
"\t\t\t\"reason\": null,\n" +
|
||||
"\t\t\t\"reasonCode\": \"100\",\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 2,\n" +
|
||||
"\t\t\t\"taxPercent\": null,\n" +
|
||||
"\t\t\t\"reason\": \"REMISE VOLUME\",\n" +
|
||||
"\t\t\t\"reasonCode\": \"71\",\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 1,\n" +
|
||||
"\t\t\t\"taxPercent\": null,\n" +
|
||||
"\t\t\t\"reason\": \"REMISE VOLUME\",\n" +
|
||||
"\t\t\t\"reasonCode\": \"71\",\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 1,\n" +
|
||||
"\t\t\t\"taxPercent\": null,\n" +
|
||||
"\t\t\t\"reason\": \"REMISE VOLUME\",\n" +
|
||||
"\t\t\t\"reasonCode\": \"71\",\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 1,\n" +
|
||||
"\t\t\t\"taxPercent\": null,\n" +
|
||||
"\t\t\t\"reason\": null,\n" +
|
||||
"\t\t\t\"reasonCode\": \"100\",\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 1.4,\n" +
|
||||
"\t\t\t\"taxPercent\": 20,\n" +
|
||||
"\t\t\t\"reason\": \"REMISE COMMERCIALE\",\n" +
|
||||
"\t\t\t\"reasonCode\": \"100\",\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 1.2,\n" +
|
||||
"\t\t\t\"taxPercent\": 10,\n" +
|
||||
"\t\t\t\"reason\": \"REMISE COMMERCIALE\",\n" +
|
||||
"\t\t\t\"reasonCode\": \"100\",\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t}\n" +
|
||||
" ],\n" +
|
||||
"\t\t\"zfcharges\": [\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 1,\n" +
|
||||
"\t\t\t\"taxPercent\": null,\n" +
|
||||
"\t\t\t\"reason\": \"FRAIS PALETTE\",\n" +
|
||||
"\t\t\t\"reasonCode\": null,\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 1,\n" +
|
||||
"\t\t\t\"taxPercent\": null,\n" +
|
||||
"\t\t\t\"reason\": \"FRAIS PALETTE\",\n" +
|
||||
"\t\t\t\"reasonCode\": null,\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 1,\n" +
|
||||
"\t\t\t\"taxPercent\": null,\n" +
|
||||
"\t\t\t\"reason\": \"FRAIS PALETTE\",\n" +
|
||||
"\t\t\t\"reasonCode\": null,\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 1,\n" +
|
||||
"\t\t\t\"taxPercent\": null,\n" +
|
||||
"\t\t\t\"reason\": \"FRAIS PALETTE\",\n" +
|
||||
"\t\t\t\"reasonCode\": null,\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 1,\n" +
|
||||
"\t\t\t\"taxPercent\": null,\n" +
|
||||
"\t\t\t\"reason\": null,\n" +
|
||||
"\t\t\t\"reasonCode\": \"ADL\",\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 1,\n" +
|
||||
"\t\t\t\"taxPercent\": null,\n" +
|
||||
"\t\t\t\"reason\": \"FRAIS PALETTE\",\n" +
|
||||
"\t\t\t\"reasonCode\": null,\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 1,\n" +
|
||||
"\t\t\t\"taxPercent\": null,\n" +
|
||||
"\t\t\t\"reason\": \"FRAIS PALETTE\",\n" +
|
||||
"\t\t\t\"reasonCode\": null,\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 2.8,\n" +
|
||||
"\t\t\t\"taxPercent\": 20,\n" +
|
||||
"\t\t\t\"reason\": \"FRAIS DEPLACEMENT\",\n" +
|
||||
"\t\t\t\"reasonCode\": \"FC\",\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"percent\": null,\n" +
|
||||
"\t\t\t\"totalAmount\": 0.6,\n" +
|
||||
"\t\t\t\"taxPercent\": 10,\n" +
|
||||
"\t\t\t\"reason\": \"FRAIS DEPLACEMENT\",\n" +
|
||||
"\t\t\t\"reasonCode\": \"ADR\",\n" +
|
||||
"\t\t\t\"categoryCode\": \"S\"\n" +
|
||||
"\t\t}\n" +
|
||||
" ],\n" +
|
||||
"\t\t\"tradeSettlement\": [\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"accountName\": null,\n" +
|
||||
"\t\t\t\"iban\": \"FR20 1254 2547 2569 8542 5874 698\",\n" +
|
||||
"\t\t\t\"bic\": \"BIC_MONCOMPTE\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"mandate\": \"MANDATE PT\",\n" +
|
||||
"\t\t\t\"iban\": \"FR20 1254 2547 2569 8542 5874 698\"\n" +
|
||||
"\t\t}\n" +
|
||||
" ],\n" +
|
||||
"\t\t\"zfitems\": [\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"price\": 60,\n" +
|
||||
"\t\t\t\"quantity\": 1,\n" +
|
||||
"\t\t\t\"basisQuantity\": 1,\n" +
|
||||
"\t\t\t\"product\": {\n" +
|
||||
"\t\t\t\"unit\": \"C62\",\n" +
|
||||
"\t\t\t\t\"name\": \"REMBOURSEMENT AFFRANCHISSEMENT\",\n" +
|
||||
"\t\t\t\t\"description\": \"Description\",\n" +
|
||||
"\t\t\t\t\"taxCategoryCode\": \"Z\",\n" +
|
||||
"\t\t\t\t\"vatpercent\": 0,\n" +
|
||||
"\t\t\t\t\"reverseCharge\": false,\n" +
|
||||
"\t\t\t\t\"intraCommunitySupply\": false,\n" +
|
||||
"\t\t\t\t\"globalID\": \"598785412598745\",\n" +
|
||||
"\t\t\t\t\"globalIDScheme\": \"0160\"\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t\t\"buyerOrderReferencedDocumentLineID\": \"1\",\n" +
|
||||
"\t\t\t\"value\": 60\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"price\": 30,\n" +
|
||||
"\t\t\t\"quantity\": 3,\n" +
|
||||
"\t\t\t\"basisQuantity\": 3,\n" +
|
||||
"\t\t\t\"product\": {\n" +
|
||||
"\t\t\t\"unit\": \"C62\",\n" +
|
||||
"\t\t\t\t\"name\": \"FOURNITURES DIVERSES\",\n" +
|
||||
"\t\t\t\t\"description\": \"Description\",\n" +
|
||||
"\t\t\t\t\"taxCategoryCode\": \"S\",\n" +
|
||||
"\t\t\t\t\"vatpercent\": 20,\n" +
|
||||
"\t\t\t\t\"reverseCharge\": false,\n" +
|
||||
"\t\t\t\t\"intraCommunitySupply\": false\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t\t\"buyerOrderReferencedDocumentLineID\": \"3\",\n" +
|
||||
"\t\t\t\"value\": 30\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t{\n" +
|
||||
"\t\t\t\"price\": 12,\n" +
|
||||
"\t\t\t\"quantity\": 1,\n" +
|
||||
"\t\t\t\"basisQuantity\": 1,\n" +
|
||||
"\t\t\t\"product\": {\n" +
|
||||
"\t\t\t\"unit\": \"C62\",\n" +
|
||||
"\t\t\t\t\"name\": \"APPEL\",\n" +
|
||||
"\t\t\t\t\"description\": \"Description\",\n" +
|
||||
"\t\t\t\t\"taxCategoryCode\": \"S\",\n" +
|
||||
"\t\t\t\t\"vatpercent\": 10,\n" +
|
||||
"\t\t\t\t\"reverseCharge\": false,\n" +
|
||||
"\t\t\t\t\"intraCommunitySupply\": false\n" +
|
||||
"\t\t},\n" +
|
||||
"\t\t\t\"buyerOrderReferencedDocumentLineID\": \"2\",\n" +
|
||||
"\t\t\t\"value\": 12\n" +
|
||||
"\t\t}\n" +
|
||||
" ],\n" +
|
||||
"\t\t\"ownStreet\": \"35 rue d'ici\",\n" +
|
||||
"\t\t\"ownCountry\": \"FR\",\n" +
|
||||
"\t\t\"ownZIP\": \"75018\",\n" +
|
||||
"\t\t\"ownLocation\": \"PARIS\",\n" +
|
||||
"\t\t\"ownVATID\": \"FR11123456782\",\n" +
|
||||
"\t\t\"valid\": false\n" +
|
||||
"\t}\n", Invoice.class);
|
||||
ZUGFeRD2PullProvider zf2p = new ZUGFeRD2PullProvider();
|
||||
zf2p.setProfile(Profiles.getByName("XRechnung"));
|
||||
zf2p.generateXML(fromJSON);
|
||||
theXML = new String(zf2p.getXML());
|
||||
} catch (Exception e) {
|
||||
exceptions = true;
|
||||
}
|
||||
assertTrue(theXML.contains("pour frais de recouvrement en cas de retard de paiement"));
|
||||
assertFalse(exceptions);
|
||||
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -461,11 +461,14 @@ this would test if for all elements/attributes
|
||||
assertTrue(isBD);
|
||||
BigDecimal expectedPrepaid=new BigDecimal(50);
|
||||
BigDecimal expectedLineTotal=new BigDecimal("180.76");
|
||||
BigDecimal expectedDue=new BigDecimal("147.65");
|
||||
if (isBD) {
|
||||
BigDecimal amread=invoice.getTotalPrepaidAmount();
|
||||
BigDecimal amline=invoice.getLineTotalAmount();
|
||||
BigDecimal importedLineTotal=invoice.getLineTotalAmount();
|
||||
BigDecimal importedDuePayable=invoice.getDuePayable();
|
||||
assertTrue(amread.compareTo(expectedPrepaid) == 0);
|
||||
assertTrue(amline.compareTo(expectedLineTotal) == 0);
|
||||
assertTrue(importedLineTotal.compareTo(expectedLineTotal) == 0);
|
||||
assertTrue(importedDuePayable.compareTo(expectedDue) == 0);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user