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

Merge branch 'master' of github.com:ZUGFeRD/mustangproject

Browse Source
This commit is contained in:
jstaerk
2024-04-21 15:25:16 +02:00
parent fb50f616f7 170c20800e
commit e3ed176008
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,19 +404,23 @@ public class ZUGFeRD2PullProvider implements IXMLProvider {
+ "<ram:LineID>" + XMLTools.encodeXML(currentItem.getBuyerOrderReferencedDocumentLineID()) + "</ram:LineID>" + "<ram:LineID>" + XMLTools.encodeXML(currentItem.getBuyerOrderReferencedDocumentLineID()) + "</ram:LineID>"
+ "</ram:BuyerOrderReferencedDocument>"; + "</ram:BuyerOrderReferencedDocument>";
} }
xml += "<ram:GrossPriceProductTradePrice>"
+ "<ram:ChargeAmount>" + priceFormat(lc.getPriceGross()) if (!allowanceChargeStr.isBlank()) {
+ "</ram:ChargeAmount>" //currencyID=\"EUR\" xml += "<ram:GrossPriceProductTradePrice>"
+ "<ram:BasisQuantity unitCode=\"" + XMLTools.encodeXML(currentItem.getProduct().getUnit()) + "<ram:ChargeAmount>" + priceFormat(lc.getPriceGross())
+ "\">" + quantityFormat(currentItem.getBasisQuantity()) + "</ram:BasisQuantity>" + "</ram:ChargeAmount>" //currencyID=\"EUR\"
+ allowanceChargeStr + "<ram:BasisQuantity unitCode=\"" + XMLTools.encodeXML(currentItem.getProduct().getUnit())
// + " <AppliedTradeAllowanceCharge>" + "\">" + quantityFormat(currentItem.getBasisQuantity()) + "</ram:BasisQuantity>"
// + " <ChargeIndicator>false</ChargeIndicator>" + allowanceChargeStr
// + " <ActualAmount currencyID=\"EUR\">0.6667</ActualAmount>" // + " <AppliedTradeAllowanceCharge>"
// + " <Reason>Rabatt</Reason>" // + " <ChargeIndicator>false</ChargeIndicator>"
// + " </AppliedTradeAllowanceCharge>" // + " <ActualAmount currencyID=\"EUR\">0.6667</ActualAmount>"
+ "</ram:GrossPriceProductTradePrice>" // + " <Reason>Rabatt</Reason>"
+ "<ram:NetPriceProductTradePrice>" // + " </AppliedTradeAllowanceCharge>"
+ "</ram:GrossPriceProductTradePrice>";
}
xml += "<ram:NetPriceProductTradePrice>"
+ "<ram:ChargeAmount>" + priceFormat(lc.getPrice()) + "<ram:ChargeAmount>" + priceFormat(lc.getPrice())
+ "</ram:ChargeAmount>" // currencyID=\"EUR\" + "</ram:ChargeAmount>" // currencyID=\"EUR\"
+ "<ram:BasisQuantity unitCode=\"" + XMLTools.encodeXML(currentItem.getProduct().getUnit()) + "<ram:BasisQuantity unitCode=\"" + XMLTools.encodeXML(currentItem.getProduct().getUnit())