diff --git a/README.rst b/README.rst index 0b8f8f0..810963b 100644 --- a/README.rst +++ b/README.rst @@ -9,11 +9,15 @@ pip install mds-account-invoice-xrechnung Requires ======== -- Tryton 6.0 +- Tryton 6.6 Changes ======= -*6.0.0 - 18.10.2022* +*6.6.3 - 30.06.2023* + +- add: credit-note + +*6.6.2 - 04.04.2023* - init diff --git a/__init__.py b/__init__.py index 8676653..cb86728 100644 --- a/__init__.py +++ b/__init__.py @@ -1,13 +1,14 @@ # -*- coding: utf-8 -*- -# This file is part of Tryton. -# The COPYRIGHT file at the top level of this repository contains the -# full copyright notices and license terms. +# This file is part of the account-invoice-xrechnung-module +# from m-ds for Tryton. The COPYRIGHT file at the top level of +# this repository contains the full copyright notices and license terms. from trytond.pool import Pool from .wizard_runreport import RunXRechnungReport, RunXRechnungReportStart from .invoice import InvoiceLine from .xreport import XReport + def register(): Pool.register( InvoiceLine, diff --git a/invoice.py b/invoice.py index b2ae950..108d7b0 100644 --- a/invoice.py +++ b/invoice.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# This file is part of the cashbook-module from m-ds for Tryton. -# The COPYRIGHT file at the top level of this repository contains the -# full copyright notices and license terms. +# This file is part of the account-invoice-xrechnung-module +# from m-ds for Tryton. The COPYRIGHT file at the top level of +# this repository contains the full copyright notices and license terms. from trytond.pool import PoolMeta from trytond.pyson import Eval, And, Or diff --git a/message.xml b/message.xml index 6df4deb..25b841f 100644 --- a/message.xml +++ b/message.xml @@ -1,7 +1,7 @@ - + diff --git a/setup.py b/setup.py index 01dbafc..df4868e 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ """ # Always prefer setuptools over distutils -from setuptools import setup, find_packages +from setuptools import setup # To use a consistent encoding from codecs import open from os import path @@ -36,11 +36,11 @@ with open(path.join(here, 'versiondep.txt'), encoding='utf-8') as f: l2 = i.strip().split(';') if len(l2) < 4: continue - modversion[l2[0]] = {'min':l2[1], 'max':l2[2], 'prefix':l2[3]} + modversion[l2[0]] = {'min': l2[1], 'max': l2[2], 'prefix': l2[3]} # tryton-version major_version = 6 -minor_version = 0 +minor_version = 6 requires = ['python-slugify'] for dep in info.get('depends', []): @@ -51,19 +51,21 @@ for dep in info.get('depends', []): prefix = modversion[dep]['prefix'] if len(modversion[dep]['max']) > 0: - requires.append('%s_%s >= %s, <= %s' % - (prefix, dep, modversion[dep]['min'], modversion[dep]['max'])) - else : - requires.append('%s_%s >= %s' % - (prefix, dep, modversion[dep]['min'])) - else : - requires.append('%s_%s >= %s.%s, < %s.%s' % - ('trytond', dep, major_version, minor_version, + requires.append('%s_%s >= %s, <= %s' % ( + prefix, dep, modversion[dep]['min'], + modversion[dep]['max'])) + else: + requires.append('%s_%s >= %s' % ( + prefix, dep, modversion[dep]['min'])) + else: + requires.append('%s_%s >= %s.%s, < %s.%s' % ( + 'trytond', dep, major_version, minor_version, major_version, minor_version + 1)) -requires.append('trytond >= %s.%s, < %s.%s' % - (major_version, minor_version, major_version, minor_version + 1)) +requires.append('trytond >= %s.%s, < %s.%s' % ( + major_version, minor_version, major_version, minor_version + 1)) -setup(name='%s_%s' % (PREFIX, MODULE), +setup( + name='%s_%s' % (PREFIX, MODULE), version=info.get('version', '0.0.1'), description='Tryton module to add xrechnung-export to invoice.', long_description=long_description, @@ -72,21 +74,22 @@ setup(name='%s_%s' % (PREFIX, MODULE), author_email='service@m-ds.de', license='GPL-3', classifiers=[ - 'Development Status :: 5 - Production/Stable', - 'Environment :: Plugins', - 'Framework :: Tryton', - 'Intended Audience :: Developers', - 'Intended Audience :: Customer Service', - 'Intended Audience :: Information Technology', - 'Intended Audience :: Financial and Insurance Industry', - 'Topic :: Office/Business', - 'Topic :: Office/Business :: Financial :: Accounting', - 'Natural Language :: German', - 'Natural Language :: English', - 'Operating System :: OS Independent', - 'License :: OSI Approved :: GNU General Public License (GPL)', - 'Programming Language :: Python :: 3.7', - 'Programming Language :: Python :: 3.8', + 'Development Status :: 5 - Production/Stable', + 'Environment :: Plugins', + 'Framework :: Tryton', + 'Intended Audience :: Developers', + 'Intended Audience :: Customer Service', + 'Intended Audience :: Information Technology', + 'Intended Audience :: Financial and Insurance Industry', + 'Topic :: Office/Business', + 'Topic :: Office/Business :: Financial :: Accounting', + 'Natural Language :: German', + 'Natural Language :: English', + 'Operating System :: OS Independent', + 'License :: OSI Approved :: GNU General Public License (GPL)', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', + 'Programming Language :: Python :: 3.9', ], keywords='tryton account invoice xrechnung edocument', @@ -95,7 +98,8 @@ setup(name='%s_%s' % (PREFIX, MODULE), 'trytond.modules.%s' % MODULE, ], package_data={ - 'trytond.modules.%s' % MODULE: (info.get('xml', []) + 'trytond.modules.%s' % MODULE: ( + info.get('xml', []) + ['tryton.cfg', 'locale/*.po', 'tests/*.py', 'view/*.xml', 'report/*.fodt', 'versiondep.txt', 'README.rst']), diff --git a/tests/__init__.py b/tests/__init__.py index b936445..5256907 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,24 +1,4 @@ -# This file is part of Tryton. The COPYRIGHT file at the top level of +# -*- coding: utf-8 -*- +# This file is part of the account-invoice-xrechnung-module +# from m-ds for Tryton. The COPYRIGHT file at the top level of # this repository contains the full copyright notices and license terms. - -import trytond.tests.test_tryton -import unittest - -from trytond.modules.account_invoice_xrechnung.tests.test_invoice import InvoiceTestCase - - -__all__ = ['suite'] - - -class XRechnungTestCase(\ - InvoiceTestCase,\ - ): - 'Test xrechnung module' - module = 'account_invoice_xrechnung' - -# end XRechnungTestCase - -def suite(): - suite = trytond.tests.test_tryton.suite() - suite.addTests(unittest.TestLoader().loadTestsFromTestCase(XRechnungTestCase)) - return suite diff --git a/tests/test_invoice.py b/tests/test_invoice.py index 55b6051..a30b98f 100644 --- a/tests/test_invoice.py +++ b/tests/test_invoice.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- -# This file is part of the cashbook-module from m-ds for Tryton. -# The COPYRIGHT file at the top level of this repository contains the -# full copyright notices and license terms. +# This file is part of the account-invoice-xrechnung-module +# from m-ds for Tryton. The COPYRIGHT file at the top level of +# this repository contains the full copyright notices and license terms. from trytond.tests.test_tryton import ModuleTestCase, with_transaction @@ -18,4 +18,5 @@ class InvoiceTestCase(ModuleTestCase): # end InvoiceTestCase + del ModuleTestCase diff --git a/tryton.cfg b/tryton.cfg index 27e058c..d4e51f7 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,5 +1,5 @@ [tryton] -version=6.0.0 +version=6.6.3 depends: account_invoice bank diff --git a/view/wizard_form.xml b/view/wizard_form.xml index 9ed0b0c..684a77f 100644 --- a/view/wizard_form.xml +++ b/view/wizard_form.xml @@ -1,7 +1,7 @@ - +