louisdevie/mustangproject
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1002 from meparis/fix/issue-1000-support-ItemSellerTradeParty-in-line-level

Browse Source 
Fix #1000 : support ItemSellerTradeParty in line level
This commit is contained in:
Jochen Staerk
2025-12-30 12:32:13 +01:00
committed by GitHub
parent 53623cf356 1efc525dae
commit 6c5f84b55b
4 changed files with 138 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
library/src/main/java/org/mustangproject/Item.java
View File

@@ -45,6 +45,7 @@ public class Item implements IZUGFeRDExportableItem {
protected String accountingReference;
protected String parentLineID = null;
protected String lineStatusReasonCode = null;
protected TradeParty lineSeller;
//protected HashMap<String, String> attributes = new HashMap<>();
/***
@@ -681,4 +682,19 @@ public class Item implements IZUGFeRDExportableItem {
this.lineStatusReasonCode = lineStatusReasonCode;
return this;
}
/***
* For line seller
* @param seller The line seller
* @return fluent setter
*/
public Item setLineSeller(TradeParty seller) {
this.lineSeller = seller;
return this;
}
@Override
public TradeParty getLineSeller() {
return this.lineSeller;
}
}

10
library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportableItem.java
View File

@@ -32,6 +32,7 @@ import java.util.List;
import org.mustangproject.IncludedNote;
import org.mustangproject.Item;
import org.mustangproject.TradeParty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
@@ -237,4 +238,13 @@ public interface IZUGFeRDExportableItem extends IAbsoluteValueProvider{
}
default LineCalculator getCalculation() {return new LineCalculator(this); };
/***
* For line seller
* @return the seller
*/
default TradeParty getLineSeller() {
return null;
}
}

9
library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRD2PullProvider.java
View File

@@ -525,8 +525,13 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
+ "</ram:ChargeAmount>" // currencyID=\"EUR\"
+ "<ram:BasisQuantity unitCode=\"" + XMLTools.encodeXML(currentItem.getProduct().getUnit())
+ "\">" + quantityFormat(currentItem.getBasisQuantity()) + "</ram:BasisQuantity>"
+ "</ram:NetPriceProductTradePrice>"
+ "</ram:SpecifiedLineTradeAgreement>"
+ "</ram:NetPriceProductTradePrice>";
if(currentItem.getLineSeller()!=null) {
xml += "<ram:ItemSellerTradeParty>" + getTradePartyAsXML(currentItem.getLineSeller(), true, false) + "</ram:ItemSellerTradeParty>";
}
xml += "</ram:SpecifiedLineTradeAgreement>"
+ "<ram:SpecifiedLineTradeDelivery>"
+ "<ram:BilledQuantity unitCode=\"" + XMLTools.encodeXML(currentItem.getProduct().getUnit()) + "\">"
+ quantityFormat(currentItem.getQuantity()) + "</ram:BilledQuantity>"

105
library/src/test/java/org/mustangproject/ZUGFeRD/ItemSellerTradePartyTest.java Normal file
View File

@@ -0,0 +1,105 @@
package org.mustangproject.ZUGFeRD;
import org.junit.Test;
import org.mustangproject.Invoice;
import org.mustangproject.Item;
import org.mustangproject.Product;
import org.mustangproject.TradeParty;
import java.math.BigDecimal;
import java.nio.charset.StandardCharsets;
import java.util.Date;
import static org.xmlunit.assertj.XmlAssert.assertThat;
public class ItemSellerTradePartyTest {
/**
* Item de test qui force un ItemSellerTradeParty au niveau ligne
* via la nouvelle méthode IZUGFeRDExportableItem#getItemSellerTradeParty().
*/
private static class ItemWithItemSellerTradeParty extends Item {
private final TradeParty itemSeller;
ItemWithItemSellerTradeParty(Product product, BigDecimal price, BigDecimal quantity, TradeParty itemSeller) {
super(product, price, quantity);
this.itemSeller = itemSeller;
}
@Override
public TradeParty getLineSeller() {
return itemSeller;
}
}
@Test
public void testLineLevelItemSellerTradePartyIsExportedOnlyWhenProvided() {
// Header seller = vendeur contractuel (collectivité émettrice)
TradeParty contractualSeller = new TradeParty("Mairie A", "1 rue A", "75001", "Paris", "FR");
// Line-level "actual service provider" (autre collectivité)
TradeParty actualServiceProvider = new TradeParty("Mairie B", "2 rue B", "69001", "Lyon", "FR");
// Buyer
TradeParty buyer = new TradeParty("Client X", "3 rue C", "33000", "Bordeaux", "FR");
Product service = new Product("Prestation", "Service intercommunal", "C62", new BigDecimal("20.00"));
// Ligne 1 : avec ItemSellerTradeParty
Item line1 = new ItemWithItemSellerTradeParty(
service,
new BigDecimal("100.00"),
new BigDecimal("1"),
actualServiceProvider
);
// Ligne 2 : sans ItemSellerTradeParty (null via default getter)
Item line2 = new Item(
service,
new BigDecimal("50.00"),
new BigDecimal("1")
);
Invoice inv = new Invoice()
.setNumber("INV-ITEM-SELLER-001")
.setIssueDate(new Date())
.setDeliveryDate(new Date())
.setDueDate(new Date())
.setSender(contractualSeller)
.setRecipient(buyer)
.setCurrency("EUR")
.addItem(line1)
.addItem(line2);
ZUGFeRD2PullProvider provider = new ZUGFeRD2PullProvider();
provider.setProfile(Profiles.getByName("EXTENDED"));
provider.generateXML(inv);
String xml = new String(provider.getXML(), StandardCharsets.UTF_8);
// 1) Le Seller header doit rester "Mairie A"
assertThat(xml)
.valueByXPath("//*[local-name()='ApplicableHeaderTradeAgreement']" +
"/*[local-name()='SellerTradeParty']" +
"/*[local-name()='Name']")
.isEqualTo("Mairie A");
// 2) Ligne 1 : ItemSellerTradeParty présent, et correspond à "Mairie B"
assertThat(xml)
.nodesByXPath("(//*[local-name()='IncludedSupplyChainTradeLineItem'])[1]" +
"//*[local-name()='SpecifiedLineTradeAgreement']" +
"/*[local-name()='ItemSellerTradeParty']")
.exist();
assertThat(xml)
.valueByXPath("(//*[local-name()='IncludedSupplyChainTradeLineItem'])[1]" +
"//*[local-name()='ItemSellerTradeParty']" +
"/*[local-name()='Name']")
.isEqualTo("Mairie B");
// 3) Ligne 2 : ItemSellerTradeParty absent
assertThat(xml)
.nodesByXPath("(//*[local-name()='IncludedSupplyChainTradeLineItem'])[2]" +
"//*[local-name()='SpecifiedLineTradeAgreement']" +
"/*[local-name()='ItemSellerTradeParty']").isEmpty();
}
}