From 0350366edb6ddfe7387e207d53e04e5052730c52 Mon Sep 17 00:00:00 2001 From: Alexis de Lattre Date: Wed, 24 Jul 2019 23:35:31 +0200 Subject: [PATCH] Update Factur-X XSD to the final version of Factur-X v1.0.4 Bump version number to v1.4 --- MANIFEST.in | 32 +- README.rst | 9 +- facturx/_version.py | 2 +- facturx/facturx.py | 18 +- ...ct_data_standard_QualifiedDataType_100.xsd | 89 - ...ct_data_standard_QualifiedDataType_100.xsd | 105 - facturx/xsd/facturx-basic/FACTUR-X_BASIC.xsd | 20 + ...ct_data_standard_QualifiedDataType_100.xsd | 1664 ++++++++++++++++ ...AggregateBusinessInformationEntity_100.xsd | 318 +++ ..._data_standard_UnqualifiedDataType_100.xsd | 85 + .../FACTUR-X_BASIC-WL.xsd | 0 ...ct_data_standard_QualifiedDataType_100.xsd | 786 ++++++++ ...AggregateBusinessInformationEntity_100.xsd | 96 +- ..._data_standard_UnqualifiedDataType_100.xsd | 6 +- .../FACTUR-X_EN16931.xsd | 0 ...ct_data_standard_QualifiedDataType_100.xsd | 1735 +++++++++++++++++ ...AggregateBusinessInformationEntity_100.xsd | 126 +- ..._data_standard_UnqualifiedDataType_100.xsd | 18 +- .../FACTUR-X_EXTENDED.xsd | 0 ...ct_data_standard_QualifiedDataType_100.xsd | 428 ++-- ...AggregateBusinessInformationEntity_100.xsd | 0 ..._data_standard_UnqualifiedDataType_100.xsd | 0 .../xsd/facturx-minimum/FACTUR-X_MINIMUM.xsd | 20 + ...ct_data_standard_QualifiedDataType_100.xsd | 786 ++++++++ ...AggregateBusinessInformationEntity_100.xsd | 194 ++ ..._data_standard_UnqualifiedDataType_100.xsd | 54 + 26 files changed, 6084 insertions(+), 507 deletions(-) delete mode 100644 facturx/xsd/factur-x/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd delete mode 100644 facturx/xsd/factur-x/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd create mode 100644 facturx/xsd/facturx-basic/FACTUR-X_BASIC.xsd create mode 100644 facturx/xsd/facturx-basic/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd create mode 100644 facturx/xsd/facturx-basic/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd create mode 100644 facturx/xsd/facturx-basic/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd rename facturx/xsd/{factur-x => facturx-basicwl}/FACTUR-X_BASIC-WL.xsd (100%) create mode 100644 facturx/xsd/facturx-basicwl/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd rename facturx/xsd/{factur-x => facturx-basicwl}/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd (80%) rename facturx/xsd/{factur-x => facturx-basicwl}/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd (85%) rename facturx/xsd/{factur-x => facturx-en16931}/FACTUR-X_EN16931.xsd (100%) create mode 100644 facturx/xsd/facturx-en16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd rename facturx/xsd/{factur-x => facturx-en16931}/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd (79%) rename facturx/xsd/{factur-x => facturx-en16931}/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd (75%) rename facturx/xsd/{factur-x => facturx-extended}/FACTUR-X_EXTENDED.xsd (100%) rename facturx/xsd/{factur-x => facturx-extended}/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd (94%) rename facturx/xsd/{factur-x => facturx-extended}/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd (100%) rename facturx/xsd/{factur-x => facturx-extended}/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd (100%) create mode 100644 facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM.xsd create mode 100644 facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd create mode 100644 facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd create mode 100644 facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd diff --git a/MANIFEST.in b/MANIFEST.in index 5eb4292..c0533e3 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -4,17 +4,25 @@ include facturx/xsd/zugferd/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_Reusa include facturx/xsd/zugferd/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_QualifiedDataType_12.xsd include facturx/xsd/zugferd/ZUGFeRD1p0_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_15.xsd include facturx/xsd/zugferd/ZUGFeRD1p0.xsd -include facturx/xsd/factur-x/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd -include facturx/xsd/factur-x/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd -include facturx/xsd/factur-x/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd -include facturx/xsd/factur-x/FACTUR-X_BASIC-WL.xsd -include facturx/xsd/factur-x/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd -include facturx/xsd/factur-x/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd -include facturx/xsd/factur-x/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd -include facturx/xsd/factur-x/FACTUR-X_EN16931.xsd -include facturx/xsd/factur-x/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd -include facturx/xsd/factur-x/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd -include facturx/xsd/factur-x/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd -include facturx/xsd/factur-x/FACTUR-X_EXTENDED.xsd +include facturx/xsd/facturx-en16931/FACTUR-X_EN16931.xsd +include facturx/xsd/facturx-en16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd +include facturx/xsd/facturx-en16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd +include facturx/xsd/facturx-en16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd +include facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd +include facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd +include facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM.xsd +include facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd +include facturx/xsd/facturx-extended/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd +include facturx/xsd/facturx-extended/FACTUR-X_EXTENDED.xsd +include facturx/xsd/facturx-extended/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd +include facturx/xsd/facturx-extended/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd +include facturx/xsd/facturx-basicwl/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd +include facturx/xsd/facturx-basicwl/FACTUR-X_BASIC-WL.xsd +include facturx/xsd/facturx-basicwl/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd +include facturx/xsd/facturx-basicwl/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd +include facturx/xsd/facturx-basic/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd +include facturx/xsd/facturx-basic/FACTUR-X_BASIC.xsd +include facturx/xsd/facturx-basic/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd +include facturx/xsd/facturx-basic/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd include facturx/xmp/ZUGFeRD_extension_schema.xmp include facturx/xmp/Factur-X_extension_schema.xmp diff --git a/README.rst b/README.rst index 3267e0f..a16c05f 100644 --- a/README.rst +++ b/README.rst @@ -34,9 +34,9 @@ Usage .. code:: - from facturx import generate_facturx + from facturx import generate_facturx_from_file - facturx_pdf_invoice = generate_facturx(regular_pdf_invoice, facturx_xml_file) + facturx_pdf_invoice = generate_facturx_from_file(regular_pdf_invoice, facturx_xml_file) To have more examples, look at the source code of the command line tools located in the *bin* subdirectory. @@ -65,6 +65,11 @@ Contributors Changelog ========= +* Version 1.4 dated 2019-07-24 + + * Update Factur-X XSD to the final version of Factur-X v1.0.4 + * Support XML extraction with ZUGFeRD invoices using 'zugferd-invoice.xml' filename (instead of the filename 'ZUGFeRD-invoice.xml' specified by the standard) + * Version 1.3 dated 2019-06-12 * Add XSD files for Extended profile in the Python package diff --git a/facturx/_version.py b/facturx/_version.py index 6f4fa58..0f66308 100644 --- a/facturx/_version.py +++ b/facturx/_version.py @@ -1 +1 @@ -__version__ = '1.3' +__version__ = '1.4' diff --git a/facturx/facturx.py b/facturx/facturx.py index 9dde536..157fa68 100644 --- a/facturx/facturx.py +++ b/facturx/facturx.py @@ -55,13 +55,13 @@ logger = logging.getLogger('factur-x') logger.setLevel(logging.INFO) FACTURX_FILENAME = 'factur-x.xml' -FACTURX_FILENAME_PATTERN = ['factur-x.xml', 'zugferd-invoice.xml', 'ZUGFeRD-invoice.xml'] +ZUGFERD_FILENAMES = ['zugferd-invoice.xml', 'ZUGFeRD-invoice.xml'] FACTURX_LEVEL2xsd = { - 'minimum': 'FACTUR-X_EN16931.xsd', - 'basicwl': 'FACTUR-X_EN16931.xsd', - 'basic': 'FACTUR-X_EN16931.xsd', - 'en16931': 'FACTUR-X_EN16931.xsd', # comfort - 'extended': 'FACTUR-X_EXTENDED.xsd', + 'minimum': 'facturx-minimum/FACTUR-X_MINIMUM.xsd', + 'basicwl': 'facturx-basicwl/FACTUR-X_BASIC-WL.xsd', + 'basic': 'facturx-basic/FACTUR-X_BASIC.xsd', + 'en16931': 'facturx-en16931/FACTUR-X_EN16931.xsd', # comfort + 'extended': 'facturx-extended/FACTUR-X_EXTENDED.xsd', } FACTURX_LEVEL2xmp = { 'minimum': 'MINIMUM', @@ -83,7 +83,7 @@ def check_facturx_xsd( :param facturx_level: the level of the Factur-X XML file. Default value is 'autodetect'. The only advantage to specifiy a particular value instead of using the autodetection is for a small perf improvement. - Possible values: minimum, basicwl, basic, en16931. + Possible values: minimum, basicwl, basic, en16931, extended. :return: True if the XML is valid against the XSD raise an error if it is not valid against the XSD """ @@ -132,7 +132,7 @@ def check_facturx_xsd( "Wrong level '%s' for Factur-X invoice." % facturx_level) xsd_filename = FACTURX_LEVEL2xsd[facturx_level] xsd_file = resource_filename( - __name__, 'xsd/factur-x/%s' % xsd_filename) + __name__, 'xsd/%s' % xsd_filename) elif flavor == 'zugferd': xsd_file = resource_filename( __name__, 'xsd/zugferd/ZUGFeRD1p0.xsd') @@ -275,7 +275,7 @@ def get_facturx_xml_from_pdf(pdf_invoice, check_xsd=True): try: for (filename, file_obj) in embeddedfiles_by_two: logger.debug('found filename=%s', filename) - if filename in (FACTURX_FILENAME_PATTERN): + if filename in [FACTURX_FILENAME] + ZUGFERD_FILENAMES: xml_file_dict = file_obj.getObject() logger.debug('xml_file_dict=%s', xml_file_dict) tmp_xml_string = xml_file_dict['/EF']['/F'].getData() diff --git a/facturx/xsd/factur-x/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/facturx/xsd/factur-x/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd deleted file mode 100644 index b31349b..0000000 --- a/facturx/xsd/factur-x/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/facturx/xsd/factur-x/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/facturx/xsd/factur-x/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd deleted file mode 100644 index 976a309..0000000 --- a/facturx/xsd/factur-x/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/facturx/xsd/facturx-basic/FACTUR-X_BASIC.xsd b/facturx/xsd/facturx-basic/FACTUR-X_BASIC.xsd new file mode 100644 index 0000000..dc31919 --- /dev/null +++ b/facturx/xsd/facturx-basic/FACTUR-X_BASIC.xsd @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + diff --git a/facturx/xsd/facturx-basic/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/facturx/xsd/facturx-basic/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd new file mode 100644 index 0000000..146d6c8 --- /dev/null +++ b/facturx/xsd/facturx-basic/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd @@ -0,0 +1,1664 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/facturx/xsd/facturx-basic/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/facturx/xsd/facturx-basic/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd new file mode 100644 index 0000000..631e5c5 --- /dev/null +++ b/facturx/xsd/facturx-basic/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd @@ -0,0 +1,318 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/facturx/xsd/facturx-basic/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/facturx/xsd/facturx-basic/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd new file mode 100644 index 0000000..b318b17 --- /dev/null +++ b/facturx/xsd/facturx-basic/FACTUR-X_BASIC_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/facturx/xsd/factur-x/FACTUR-X_BASIC-WL.xsd b/facturx/xsd/facturx-basicwl/FACTUR-X_BASIC-WL.xsd similarity index 100% rename from facturx/xsd/factur-x/FACTUR-X_BASIC-WL.xsd rename to facturx/xsd/facturx-basicwl/FACTUR-X_BASIC-WL.xsd diff --git a/facturx/xsd/facturx-basicwl/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/facturx/xsd/facturx-basicwl/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd new file mode 100644 index 0000000..4677b9a --- /dev/null +++ b/facturx/xsd/facturx-basicwl/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd @@ -0,0 +1,786 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/facturx/xsd/factur-x/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/facturx/xsd/facturx-basicwl/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd similarity index 80% rename from facturx/xsd/factur-x/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd rename to facturx/xsd/facturx-basicwl/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd index 35a58d1..39b8db6 100644 --- a/facturx/xsd/factur-x/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd +++ b/facturx/xsd/facturx-basicwl/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd @@ -4,8 +4,7 @@ xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" targetNamespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" - elementFormDefault="qualified" - version="100.D16B"> + elementFormDefault="qualified"> @@ -16,7 +15,7 @@ - + @@ -26,29 +25,23 @@ - - + + - + - - - - - - - - + + @@ -56,6 +49,7 @@ + @@ -63,14 +57,15 @@ - - + + - + + - - + + @@ -81,12 +76,24 @@ - + - - + + + + + + + + + + + + + + @@ -101,7 +108,7 @@ - + @@ -116,63 +123,64 @@ - + + - + - + - + - + - + - + - - - - - - - - + + + + + + + + - + - - + + - - + + @@ -180,7 +188,7 @@ - + diff --git a/facturx/xsd/factur-x/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/facturx/xsd/facturx-basicwl/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd similarity index 85% rename from facturx/xsd/factur-x/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd rename to facturx/xsd/facturx-basicwl/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd index baa9c12..3e2545e 100644 --- a/facturx/xsd/factur-x/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd +++ b/facturx/xsd/facturx-basicwl/FACTUR-X_BASIC-WL_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -32,7 +32,7 @@ - + diff --git a/facturx/xsd/factur-x/FACTUR-X_EN16931.xsd b/facturx/xsd/facturx-en16931/FACTUR-X_EN16931.xsd similarity index 100% rename from facturx/xsd/factur-x/FACTUR-X_EN16931.xsd rename to facturx/xsd/facturx-en16931/FACTUR-X_EN16931.xsd diff --git a/facturx/xsd/facturx-en16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/facturx/xsd/facturx-en16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd new file mode 100644 index 0000000..6a4280b --- /dev/null +++ b/facturx/xsd/facturx-en16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd @@ -0,0 +1,1735 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/facturx/xsd/factur-x/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/facturx/xsd/facturx-en16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd similarity index 79% rename from facturx/xsd/factur-x/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd rename to facturx/xsd/facturx-en16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd index e0cc3c1..8641805 100644 --- a/facturx/xsd/factur-x/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd +++ b/facturx/xsd/facturx-en16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd @@ -4,8 +4,7 @@ xmlns:qdt="urn:un:unece:uncefact:data:standard:QualifiedDataType:100" xmlns:udt="urn:un:unece:uncefact:data:standard:UnqualifiedDataType:100" targetNamespace="urn:un:unece:uncefact:data:standard:ReusableAggregateBusinessInformationEntity:100" - elementFormDefault="qualified" - version="100.D16B"> + elementFormDefault="qualified"> @@ -17,12 +16,12 @@ - + - + @@ -32,20 +31,20 @@ - - + + - - + + - + @@ -53,8 +52,8 @@ - - + + @@ -74,18 +73,18 @@ - + - + - + - - + + - + @@ -98,27 +97,27 @@ - + - + - + - - - + + + - + @@ -130,13 +129,13 @@ - - + + - + @@ -145,8 +144,8 @@ - - + + @@ -165,15 +164,15 @@ - - + + - + @@ -181,13 +180,12 @@ - + - @@ -197,8 +195,8 @@ - - + + @@ -206,10 +204,10 @@ - + - + @@ -222,7 +220,7 @@ - + @@ -230,26 +228,26 @@ - + - + - + - + - + - + - + @@ -257,7 +255,7 @@ - + @@ -266,32 +264,32 @@ - + - - - - - - - - - + + + + + + + + + - + - - + + @@ -300,11 +298,11 @@ - - + + - - + + diff --git a/facturx/xsd/factur-x/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/facturx/xsd/facturx-en16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd similarity index 75% rename from facturx/xsd/factur-x/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd rename to facturx/xsd/facturx-en16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd index 5a20d87..b318b17 100644 --- a/facturx/xsd/factur-x/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd +++ b/facturx/xsd/facturx-en16931/FACTUR-X_EN16931_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd @@ -7,23 +7,23 @@ - + - - + + - - + + @@ -33,7 +33,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -73,7 +73,7 @@ - + diff --git a/facturx/xsd/factur-x/FACTUR-X_EXTENDED.xsd b/facturx/xsd/facturx-extended/FACTUR-X_EXTENDED.xsd similarity index 100% rename from facturx/xsd/factur-x/FACTUR-X_EXTENDED.xsd rename to facturx/xsd/facturx-extended/FACTUR-X_EXTENDED.xsd diff --git a/facturx/xsd/factur-x/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/facturx/xsd/facturx-extended/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd similarity index 94% rename from facturx/xsd/factur-x/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd rename to facturx/xsd/facturx-extended/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd index 1845610..d25fd9b 100644 --- a/facturx/xsd/factur-x/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd +++ b/facturx/xsd/facturx-extended/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd @@ -24,167 +24,183 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -623,6 +639,7 @@ + @@ -1440,14 +1457,87 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/facturx/xsd/factur-x/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/facturx/xsd/facturx-extended/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd similarity index 100% rename from facturx/xsd/factur-x/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd rename to facturx/xsd/facturx-extended/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd diff --git a/facturx/xsd/factur-x/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/facturx/xsd/facturx-extended/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd similarity index 100% rename from facturx/xsd/factur-x/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd rename to facturx/xsd/facturx-extended/FACTUR-X_EXTENDED_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd diff --git a/facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM.xsd b/facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM.xsd new file mode 100644 index 0000000..e51acb3 --- /dev/null +++ b/facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM.xsd @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + diff --git a/facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd b/facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd new file mode 100644 index 0000000..d1bd911 --- /dev/null +++ b/facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_QualifiedDataType_100.xsd @@ -0,0 +1,786 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd b/facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd new file mode 100644 index 0000000..e3df3f4 --- /dev/null +++ b/facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_ReusableAggregateBusinessInformationEntity_100.xsd @@ -0,0 +1,194 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd b/facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd new file mode 100644 index 0000000..3e2545e --- /dev/null +++ b/facturx/xsd/facturx-minimum/FACTUR-X_MINIMUM_urn_un_unece_uncefact_data_standard_UnqualifiedDataType_100.xsd @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +