Commit Graph

650 Commits

Author SHA1 Message Date
Alexander Berndt
3bb2a951d9 Added getInvoiceID() to ZUGFeRDImporter.java
Added Test
2020-06-18 09:56:20 +02:00
Dominik Vogt
0cab494755 Merge pull request #1 from ZUGFeRD/master
Merge
2020-06-17 12:07:37 +02:00
Jochen Stärk
c6486a0a62 no message 2020-06-16 15:37:36 +02:00
Jochen Stärk
b9efc21492 addressing #159 gross price. removing jaxb from zf1. 2020-06-14 11:40:27 +02:00
Jochen Stärk
5dbb3a72cc first attempt to remove jaxb from zfv1 2020-06-11 15:22:40 +02:00
Jochen Stärk
c28d0cb652 add zf schematron files 2020-06-07 11:58:30 +02:00
Jochen Stärk
b574f7a7f2 generate ZF XSLTs from schematron when building 2020-06-07 11:47:14 +02:00
Jochen Stärk
61db60a719 no message 2020-06-07 11:46:30 +02:00
Jochen Stärk
c92b9dd0b2 dropped orphaned migration feature 2020-06-07 10:36:02 +02:00
Jochen Stärk
86b1cc0606 correcting total directory validity output 2020-06-06 13:57:00 +02:00
Jochen Stärk
34fea04501 improvements on directory validation 2020-06-06 13:53:09 +02:00
Jochen Staerk
aa8af9536a Merge pull request #163 from ZUGFeRD/dependabot/maven/library/org.dom4j-dom4j-2.1.3
Bump dom4j from 2.1.1 to 2.1.3 in /library
2020-06-06 12:56:14 +02:00
Jochen Staerk
88a8fe4b5d Merge pull request #162 from ZUGFeRD/dependabot/maven/validator/org.dom4j-dom4j-2.1.3
Bump dom4j from 2.1.1 to 2.1.3 in /validator
2020-06-06 12:55:58 +02:00
Jochen Stärk
1982aed5f4 working on directory validation 2020-06-06 10:23:05 +02:00
dependabot[bot]
429914e564 Bump dom4j from 2.1.1 to 2.1.3 in /library
Bumps [dom4j](https://github.com/dom4j/dom4j) from 2.1.1 to 2.1.3.
- [Release notes](https://github.com/dom4j/dom4j/releases)
- [Commits](https://github.com/dom4j/dom4j/compare/version-2.1.1...version-2.1.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-06 06:02:01 +00:00
dependabot[bot]
b7896e329f Bump dom4j from 2.1.1 to 2.1.3 in /validator
Bumps [dom4j](https://github.com/dom4j/dom4j) from 2.1.1 to 2.1.3.
- [Release notes](https://github.com/dom4j/dom4j/releases)
- [Commits](https://github.com/dom4j/dom4j/compare/version-2.1.1...version-2.1.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-06-06 06:00:20 +00:00
Jochen Staerk
feaa6a0ee5 Merge pull request #161 from heisej/bugfixes_and_new_export_props
Bugfixes and new export props
2020-06-03 20:20:44 +02:00
Jens Heise
74900ebe69 ZUGFeRD2PullProvider: Added several properties to be written to the ZUGFeRD-XML
and if necessary corresponding methods in the IZUGFeRDExportable... interface
objects of Transaction, Item and Product:

Properties with new methods:
- SubjectNote for 'ExchangedDocument.IncludedNote' (human readable
  document subject)
- RebateAgreementExists for 'ExchangedDocument.IncludedNote'
  (Note that there are rebate agreements)
- BasisQuantity (number of item units per price)
- SellerAssignedID (seller identification of product)
- BuyerAssignedID (buyer identification of product)
- TaxExemptionReason (explanatory statement why no tax gets applied)
  enhancement to support other exemptions than "IC-supply"

Properties for existing methods that did not get written to the XML
up to now:
- SellerTradeParty.ID (buyer assigned ID of seller)
- SellerTradeParty.GlobalID of seller (e.g. DUNS)
- BuyerOrderReferencedDocumentID (order number of buyer)
2020-06-03 11:17:23 +02:00
Jens Heise
1efd4ee9ae Bugfix in ZF2ZInvoiceImporterTest: Make test work on case sensitive file systems
The generated file is named "testout-ZF2new.pdf" not "testout-ZF2New.pdf"
which will make the test fail on case sensitive file systems as can be
found on many unix like systems.
2020-06-03 11:17:23 +02:00
Jens Heise
371cbb67a1 Bugfix in ZUGFeRD2PullProvider.generateXML(): Only Debit payment information is part of 'SpecifiedTradePaymentTerms'
so test for 'payment' being an instance of 'IZUGFeRDTradeSettlementDebit' as
'IZUGFeRDTradeSettlement' and 'IZUGFeRDTradeSettlementPayment' return 'null' for
'getPaymentXML()' which is not allowed to be written to the XML file.
2020-06-03 11:17:23 +02:00
Jens Heise
d1200a8dcd Bugfix in ZUGFeRD2PullProvider.generateXML(): Test for valid value of getDueDate() before using it
or a NullPointerException might happen as 'hasDueDate==true' is not the result
of a test to ensure that 'trans' overwrites 'getDueDate()' at all, so the default
implementation from 'IZUGFeRDExportableTransaction' might get used which returns
the unusable result 'null'.
2020-06-03 11:17:23 +02:00
Jochen Stärk
6e9c0e8903 Merge branch 'master' of github.com:ZUGFeRD/mustangproject 2020-06-03 05:43:56 +02:00
Jochen Stärk
63dc406ffb Merge branch 'aberndt-hub-add_extraction_methods' 2020-06-03 05:42:08 +02:00
Jochen Stärk
1d4ed498c1 Merge branch 'add_extraction_methods' of https://github.com/aberndt-hub/mustangproject into aberndt-hub-add_extraction_methods 2020-06-03 05:41:52 +02:00
Alexander Berndt
4643371038 FIX: Moved propterties "SellerAssignedID" and "BuyerAssignedID" from "Item" to "Product"
Altered Tests
2020-06-02 08:39:14 +02:00
Jochen Staerk
dce37f5e17 cli method for validatoion walk 2020-06-01 10:14:04 +02:00
Jochen Staerk
e2d501036c deleted redundant files (had been moved from library/extended to validator). Corrected commandline import. 2020-05-31 20:04:53 +02:00
Jochen Staerk
35a1e11c42 corrected POM 2020-05-31 19:53:28 +02:00
Jochen Staerk
49168fcd58 Merge branch 'aberndt-hub-add_extraction_methods' 2020-05-31 19:44:01 +02:00
Jochen Staerk
32223d2ef7 Merge branch 'add_extraction_methods' of https://github.com/aberndt-hub/mustangproject into aberndt-hub-add_extraction_methods 2020-05-31 19:43:44 +02:00
Jochen Staerk
f86aae8982 Merge branch 'master' of github.com:ZUGFeRD/mustangproject
# Conflicts:
#	validator/src/main/resources/ZUGFeRD_1p0.sch
#	validator/src/main/resources/iso_abstract_expand.xsl
#	validator/src/main/resources/iso_dsdl_include.xsl
#	validator/src/main/resources/iso_schematron_message.xsl
#	validator/src/main/resources/iso_schematron_skeleton_for_xslt1.xsl
#	validator/src/main/resources/iso_svrl_for_xslt1.xsl
#	validator/src/main/resources/schema/ad/basic/additional_data_base_schema.xsd
#	validator/src/main/resources/schema/zf1/ZUGFeRD1p0.xsd
#	validator/src/main/resources/schema/zf1/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_QualifiedDataType_12.xsd
#	validator/src/main/resources/schema/zf1/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_12.xsd
#	validator/src/main/resources/schema/zf1/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_15.xsd
#	validator/src/main/resources/schema/zf2/BASIC-WL/FACTUR-X_BASIC-WL.xsd
#	validator/src/main/resources/schema/zf2/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
#	validator/src/main/resources/schema/zf2/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
#	validator/src/main/resources/schema/zf2/BASIC-WL/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
#	validator/src/main/resources/schema/zf2/BASIC/FACTUR-X_BASIC.xsd
#	validator/src/main/resources/schema/zf2/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
#	validator/src/main/resources/schema/zf2/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
#	validator/src/main/resources/schema/zf2/BASIC/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
#	validator/src/main/resources/schema/zf2/EN16931/FACTUR-X_EN16931.xsd
#	validator/src/main/resources/schema/zf2/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
#	validator/src/main/resources/schema/zf2/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
#	validator/src/main/resources/schema/zf2/EN16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
#	validator/src/main/resources/schema/zf2/EXTENDED/FACTUR-X_EXTENDED.xsd
#	validator/src/main/resources/schema/zf2/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
#	validator/src/main/resources/schema/zf2/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
#	validator/src/main/resources/schema/zf2/EXTENDED/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
#	validator/src/main/resources/schema/zf2/MINIMUM/FACTUR-X_MINIMUM.xsd
#	validator/src/main/resources/schema/zf2/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd
#	validator/src/main/resources/schema/zf2/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd
#	validator/src/main/resources/schema/zf2/MINIMUM/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd
#	validator/src/main/resources/schematron/CII/XRechnung-CII-model.sch
#	validator/src/main/resources/schematron/XRechnung-CII-validation.sch
#	validator/src/main/resources/schematron/abstract/XRechnung-model.sch
#	validator/src/main/resources/xslt/EN16931-CII-validation.xslt
#	validator/src/main/resources/xslt/FACTUR-X_BASIC-WL_codedb.xml
#	validator/src/main/resources/xslt/FACTUR-X_BASIC_codedb.xml
#	validator/src/main/resources/xslt/FACTUR-X_EN16931_codedb.xml
#	validator/src/main/resources/xslt/FACTUR-X_EXTENDED_codedb.xml
#	validator/src/main/resources/xslt/FACTUR-X_MINIMUM_codedb.xml
#	validator/src/main/resources/xslt/zugferd2p0_basicwl_minimum_codedb.xml
#	validator/src/main/resources/xslt/zugferd2p0_en16931_codedb.xml
#	validator/src/main/resources/xslt/zugferd2p0_extended_codedb.xml
#	validator/src/main/resources/zugferd2p0_basicwl_minimum.sch
#	validator/src/main/resources/zugferd2p0_en16931.sch
#	validator/src/main/resources/zugferd2p0_extended.sch
#	validator/src/test/resources/ZUGFeRD-invoice_rabatte_3_abschlag_duepayableamount.xml
#	validator/src/test/resources/ZUGFeRD-invoice_rabatte_4_abschlag_taxbasistotalamount.xml
#	validator/src/test/resources/attributeBasedXMP_zugferd_2p0_EN16931_Einfach_corrected.xml
#	validator/src/test/resources/invalidV1.xml
#	validator/src/test/resources/invalidV1TooMinimal.xml
#	validator/src/test/resources/validZREtestZugferd.xml
2020-05-31 18:32:43 +02:00
Jochen Staerk
4760554eb3 no message 2020-05-31 18:26:46 +02:00
Jochen Stärk
fc7c5fba28 added a comment 2020-05-30 10:05:51 +02:00
Jochen Stärk
29a6af4c15 added ph-schematron-maven-plugin so that xrechnung xslt can be generated 2020-05-30 10:04:42 +02:00
Alexander Berndt
ffb7a36500 FIX: ZUGFeRDImporter.java -> Deleted output of Stacktrace if tryBigDecimal fails, as Exceptions are catched 2020-05-28 15:21:15 +02:00
Alexander Berndt
02a6958865 Updated ZUGFeRDImporter.java -> created getLineItemList() for reading LineItems from ZUGFeRD XML
Added Test

Added fields Item.java -> tax, grossPrice, lineTotalAmount, id, sellerAssignedID and buyerAssignedID, all with Getter&Setter

Added field in VATAmount.java -> applicablePercent with Getter&Setter
2020-05-28 15:03:27 +02:00
Jochen Stärk
dbdcdbe75f corrected tests 2020-05-24 19:49:05 +02:00
Jochen Stärk
b8fa899f60 no message 2020-05-24 18:57:02 +02:00
Jochen Stärk
5d2cdf227f Now all actions are invoked using --action. 2020-05-24 18:29:37 +02:00
Jochen Stärk
ff7b51c9ff updated history 2020-05-24 10:49:07 +02:00
Jochen Stärk
9c9474907b Merge branch 'master' of github.com:ZUGFeRD/mustangproject
# Conflicts:
#	library/src/main/java/org/mustangproject/ZUGFeRD/IZUGFeRDExportablePostalTradeAddress.java
#	library/src/main/java/org/mustangproject/ZUGFeRD/PostalTradeAddress.java
2020-05-24 10:45:44 +02:00
Jochen Stärk
fed2d08dc9 Removed server. Moved libraryBasic to library and libraryExtended to validator to prevent confusion with profiles. 2020-05-24 10:45:04 +02:00
Alexander Berndt
566ead3c67 Updated ZUGFeRDImporter.java -> getReference() to fit ZUGFeRD 1.0
Added Test
2020-05-22 15:25:18 +02:00
Alexander Berndt
0cde732e43 Updated ZUGFeRDImporter.java -> getDocumentCode() to fit ZUGFeRD 2.1
Added Test
2020-05-22 15:16:56 +02:00
Jochen Staerk
6268f69c09 Merge pull request #157 from aberndt-hub/add_extraction_methods
thanks
2020-05-20 10:43:41 +02:00
Alexander Berndt
5d72156bf0 Implemented method "getSellerTradePartyAddress" to ZUGFeRDImporter.java which gets an instance of PostalTradeAddress.
Removed method "getISODate" from last Commit due lack of implementation - will be implemented at a later time.
Also Added Tests for "getSellerTradePartyAddress" to match ZF1 and ZF2
2020-05-20 09:38:34 +02:00
Jochen Stärk
40c9065b3d added potential 2.0 todos 2020-05-19 09:23:14 +02:00
Alexander Berndt
3a01efbded Added ISO-Date Getter function
Added Wrapper method for protected extractString method, for easy extension of ZUGFeRDImporter.java
2020-05-19 08:31:53 +02:00
jstaerk
82fc009fb3 Removed lots of dependencies which are now in library extended 2020-05-18 21:39:29 +02:00
jstaerk
45913b5639 Moving file alphabetically behind its dependencies which create the file to import 2020-05-18 21:28:47 +02:00