diff --git a/COPYRIGHT b/COPYRIGHT index 38bee72..8a21255 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -1,6 +1,5 @@ -Copyright (C) 2015-2025 Cédric Krier. -Copyright (C) 2015-2025 B2CK SPRL. -Copyright (C) 2021-2025 martin-data services. +Copyright (C) 2024-2025 martin-data services. +Copyright (C) 2025 Mathias Behrle This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/README.rst b/README.rst index 15cf365..c95392e 100644 --- a/README.rst +++ b/README.rst @@ -15,23 +15,6 @@ Requires Changes ======= -*7.0.4 - 29.01.2025* - -- add: Round unit_price + quantity to match the decimal places of the fields. - -*7.0.3 - 27.01.2025* - -- filter product-categories in configuration - -*7.0.2 - 24.01.2025* - -- fix: limit content-check to supplier-invoices - -*7.0.1 - 23.01.2025* - -- import of Factur-X (Basic, EN16931, Extended), CrossIndustryInvoice-D22 -- with/without PDF-Container - *7.0.0 - 19.12.2024* - init diff --git a/document.py b/document.py index a3bf0c9..39b1f00 100644 --- a/document.py +++ b/document.py @@ -101,15 +101,12 @@ class Incoming(metaclass=PoolMeta): UserError: if calculated values dont match with xml-values """ - pool = Pool() - Configuration = pool.get('account.configuration.tax_rounding') - configuration = Configuration(1) - totals = self.parsed_data.get('total', None) if not totals: raise UserError(gettext( 'msg_convert_error.msg_convert_error', msg='no totals-section in xml-data')) + for xfield, inv_field in [ ('taxbase', 'untaxed_amount'), ('taxtotal', 'tax_amount'), @@ -118,25 +115,15 @@ class Incoming(metaclass=PoolMeta): inv_val = getattr(invoice, inv_field) if xml_val != inv_val: - rounding = configuration.tax_rounding - field_name = 'tax_rounding' - selection_values = configuration.fields_get( - [field_name])[field_name]['selection'] - rounding_cfg = [ - i[1] for i in selection_values if i[0] == rounding][0] - msg = ' '.join([ + raise UserError(gettext( + 'document_incoming_invoice_xml.msg_convert_error', + msg=' '.join([ inv_field + ' mismatch', 'from-xml=' + Report.format_currency( xml_val, None, invoice.currency), 'calculated=' + Report.format_currency( inv_val, None, invoice.currency) - ]) - msg += '\n\n' + gettext( - 'document_incoming_invoice_xml.msg_tax_amount_mismatch', - rounding=rounding_cfg) - raise UserError(gettext( - 'document_incoming_invoice_xml.msg_convert_error', - msg=msg)) + ]))) def _readxml_xpath(self, tags): """ generate xpath diff --git a/locale/de.po b/locale/de.po index 84ba775..67a498c 100644 --- a/locale/de.po +++ b/locale/de.po @@ -46,9 +46,6 @@ msgctxt "model:ir.message,text:msg_unused_linevalues" msgid "The following data was not used to generate the invoice line:" msgstr "Die folgenden Daten wurden für die Erzeugung der Rechnungszeile nicht verwendet:" -msgctxt "model:ir.message,text:msg_tax_amount_mismatch" -msgid "You have configured tax rounding method '%(rounding)s' in the account configuration. Maybe try with a different method" -msgstr "In Rechnungswesen/Einstellungen ist die Steuerrundungsmethode '%(rounding)s' eingetragen. Versuchen Sie es u.U. mit einer anderen Methode' ################################### # document.incoming.configuration # diff --git a/message.xml b/message.xml index 0b743d1..e65f1a2 100644 --- a/message.xml +++ b/message.xml @@ -35,9 +35,6 @@ The following data was not used to generate the invoice line: - - You have configured tax rounding method '%(rounding)s' in the account configuration. Maybe try with a different method - diff --git a/setup.py b/setup.py index 06fd569..559ba9e 100644 --- a/setup.py +++ b/setup.py @@ -85,6 +85,8 @@ setup( 'Programming Language :: Python :: 3.8', 'Programming Language :: Python :: 3.9', 'Programming Language :: Python :: 3.10', + 'Programming Language :: Python :: 3.11', + 'Programming Language :: Python :: 3.12', ], keywords='tryton account invoice xrechnung edocument incoming', diff --git a/tryton.cfg b/tryton.cfg index 2d37146..fde7a46 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=7.0.4 +version=7.0.0 depends: document_incoming_invoice edocument_unece diff --git a/versiondep.txt b/versiondep.txt index fb5252c..e69de29 100644 --- a/versiondep.txt +++ b/versiondep.txt @@ -1 +0,0 @@ -sale_point_invoice;7.0.15;7.0.999;mds