Commit Graph

876 Commits

Author SHA1 Message Date
Sebastian Sieber
157ea9f554 Revert previous change.
Instead, calculate the total amounts on amounts with scale 2 to avoid errors in validation.
2020-12-08 15:52:43 +01:00
Sebastian Sieber
d97007d60f Sum the individual tax amounts to the total tax amount to avoid following error:
[BR-CO-14]-Invoice total VAT amount (BT-110) = ? VAT category tax amount (BT-117)
2020-12-08 14:36:06 +01:00
Sebastian Sieber
dcf7f82b01 Extract method to avoid duplicate code. 2020-12-07 16:31:58 +01:00
Sebastian Sieber
9e496f0f55 Merge remote-tracking branch 'remotes/fork/master' into Improvements 2020-12-07 08:26:05 +01:00
Sebastian Sieber
bb48fec1be Merge remote-tracking branch 'remotes/origin/master' into master 2020-12-07 08:24:56 +01:00
jstaerk
91837c7e14 [maven-release-plugin] prepare for next development iteration 2020-12-06 11:59:04 +01:00
jstaerk
e59be41348 [maven-release-plugin] prepare release core-2.0.3 2020-12-06 11:59:02 +01:00
jstaerk
71d6b34be8 removed old comparison 2020-12-06 11:56:13 +01:00
jstaerk
b09a469038 added release date 2020-12-06 11:55:08 +01:00
jstaerk
b3846b806a support credit notes, automatically switch from XR 1.2.2 to XR 2.0 on 2021-01-01 2020-12-05 18:11:42 +01:00
jstaerk
97112db615 added previous merge to history, reverted XR back to 1.2 because 2.0 is AFAIK not yet accepted by the ZRE 2020-12-04 19:16:05 +01:00
Jochen Staerk
ef0cfca154 Merge pull request #207 from weclapp-dev/Improvements
Improvements
2020-12-04 19:12:04 +01:00
Sebastian Sieber
8063d71fbf Merge branch 'master' into Improvements 2020-12-04 14:51:52 +01:00
Sebastian Sieber
3c401f2289 Merge remote-tracking branch 'remotes/origin/master' into master 2020-12-04 14:51:10 +01:00
Sebastian Sieber
60f71b54ec Merge remote-tracking branch 'remotes/origin/master' into Improvements
# Conflicts:
#	library/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDInvoiceImporter.java
#	library/src/test/java/org/mustangproject/ZUGFeRD/ZF2ZInvoiceImporterTest.java
2020-12-03 15:05:17 +01:00
Sebastian Sieber
812a22e901 Add property and method TradeParty to add debit details 2020-12-03 11:45:33 +01:00
Sebastian Sieber
54dccc188a Fix id of profile XRECHNUNG 2020-12-02 14:32:18 +01:00
Sebastian Sieber
5e71863f8b Improve handling of categoryCode
Charge returns the local field if is set.
IZUGFeRDExportableProduct: Use compareTo instead of equals to check the mathematical equality.
2020-12-02 11:28:09 +01:00
jstaerk
57d53af39f Don't write "null" as paymentDescription if no Bank account is specified 2020-12-01 18:32:46 +01:00
Sebastian Sieber
687d8f628c Use constants instead of magic numbers 2020-12-01 15:58:18 +01:00
Sebastian Sieber
1ab13e749d Merge branch 'master' into Improvements 2020-12-01 15:48:28 +01:00
Sebastian Sieber
2eee48fc46 Merge remote-tracking branch 'remotes/origin/master' into master 2020-12-01 15:47:28 +01:00
Jochen Staerk
744ffca12a Merge pull request #204 from tweimer/patch-1
Update sample MustangWriter for Mustangproject 2.0.2
2020-11-30 15:20:13 +01:00
Tobias Weimer
8c6166ed72 Update sample MustangWriter for Mustangproject 2.0.2
This fixes the compile errors that came up after trying to use the sample file.
Now it compiles fine and produces ZF
2020-11-30 10:35:41 +01:00
jstaerk
1de12c549f added an architecture 2020-11-28 17:36:28 +01:00
jstaerk
08b6d8b5fb making Transaction calculators getGrandTotal public 2020-11-28 10:59:50 +01:00
Sebastian Sieber
c2742c0e3a Merge remote-tracking branch 'remotes/origin/master' into Improvements 2020-11-27 12:53:01 +01:00
Sebastian Sieber
751d129def Add != null expression to prevent NPE 2020-11-27 12:51:10 +01:00
Jochen Staerk
4b25e7f155 Update README.md 2020-11-26 10:52:32 +01:00
jstaerk
d764fb4784 closes #201 2020-11-26 09:39:47 +01:00
jstaerk
2d4408902c v 2.0.2 2020-11-25 18:50:39 +01:00
jstaerk
2555b82b6a [maven-release-plugin] prepare for next development iteration 2020-11-25 18:38:34 +01:00
jstaerk
2e9bf5c55b [maven-release-plugin] prepare release core-2.0.2 2020-11-25 18:38:32 +01:00
jstaerk
e7e2141c04 support reverse charge 2020-11-25 18:34:48 +01:00
Sebastian Sieber
bd720e38f7 Merge branch 'master' into Improvements 2020-11-25 15:13:09 +01:00
Sebastian Sieber
0709a20e23 Merge remote-tracking branch 'remotes/origin/master' into master 2020-11-25 15:12:11 +01:00
Jochen Staerk
02e6f2f9a6 Merge pull request #202 from weclapp-dev/XRechnungImporter
XRechnung importer
2020-11-25 14:44:35 +01:00
Sebastian Sieber
197e18435c Merge remote-tracking branch 'remotes/origin/master' into Improvements 2020-11-25 12:59:40 +01:00
Sebastian Sieber
5db4c4479f Merge remote-tracking branch 'remotes/origin/master' into XRechnungImporter 2020-11-25 12:59:19 +01:00
Sebastian Sieber
e4fe42bdf8 Merge remote-tracking branch 'remotes/origin/master' into master 2020-11-25 12:58:01 +01:00
Sebastian Sieber
cc561a8f66 Revert all changes
This reverts commit 90b1d7c7aa,
95998b820a and
9af73473b7
2020-11-25 12:57:21 +01:00
Sebastian Sieber
451b249887 Create XRechnungImporter to import data from raw xml
The XRechnungImporter extends from ZUGFeRDImporter.
It simply sets the given raw xml and provides otherwise the same functionality as the parent class.
2020-11-25 12:50:36 +01:00
Sebastian Sieber
a1c4f4a2d6 Unify the values of taxes
Concerning ApplicableHeaderTradeSettlement:
The amount in ApplicableTradeTax.CalculatedAmount is different from SpecifiedTradeSettlementHeaderMonetarySummation.TaxTotalAmount. To avoid this I removed the rounding from totalAmount.
2020-11-25 12:47:31 +01:00
Sebastian Sieber
1e78866040 Import UnitCode of basisQuantity to product.
I don't know which node is the better one to read the unitCode:
grossPriceProductTradePrice or netPriceProductTradePrice. I have chosen the last one.
2020-11-25 12:46:19 +01:00
Sebastian Sieber
90b1d7c7aa Unify the values of taxes
Concerning ApplicableHeaderTradeSettlement:
The amount in ApplicableTradeTax.CalculatedAmount is different from SpecifiedTradeSettlementHeaderMonetarySummation.TaxTotalAmount. To avoid this I removed the rounding from totalAmount.
2020-11-25 12:34:15 +01:00
Sebastian Sieber
95998b820a Create XRechnungImporter to import data from raw xml
The XRechnungImporter extends from ZUGFeRDImporter.
It simply sets the given raw xml and provides otherwise the same functionality as the parent class.
2020-11-24 14:54:21 +01:00
jstaerk
df43d2f878 Merge branch 'master' of github.com:ZUGFeRD/mustangproject
# Conflicts:
#	History.md
2020-11-24 10:12:27 +01:00
jstaerk
e5d055aac5 history update 2020-11-24 10:10:54 +01:00
Sebastian Sieber
9af73473b7 Import UnitCode of basisQuantity to product.
I don't know which node is the better one to read the unitCode: grossPriceProductTradePrice or netPriceProductTradePrice. I have chosen the last one.
2020-11-24 09:46:12 +01:00
Sebastian Sieber
cda1cd1c24 Merge remote-tracking branch 'remotes/origin/master' into master 2020-11-24 08:43:03 +01:00