From 3db5ec1619acb169ef77e35472422419befd3ee8 Mon Sep 17 00:00:00 2001 From: Frederik Jaeckel Date: Fri, 30 Jun 2023 11:21:48 +0200 Subject: [PATCH] formatting --- __init__.py | 7 ++--- invoice.py | 6 ++--- setup.py | 62 ++++++++++++++++++++++++--------------------- tests/__init__.py | 17 +++++-------- wizard_runreport.py | 13 +++++----- xreport.py | 10 ++++---- 6 files changed, 58 insertions(+), 57 deletions(-) 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 05b5e6c..e3b23f1 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/setup.py b/setup.py index 01dbafc..a58ed01 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,7 +36,7 @@ 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 @@ -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..171049f 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,24 +1,19 @@ -# 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 +from .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)) + suite.addTests(unittest.TestLoader().loadTestsFromTestCase( + InvoiceTestCase)) return suite diff --git a/wizard_runreport.py b/wizard_runreport.py index a821963..fb88f54 100644 --- a/wizard_runreport.py +++ b/wizard_runreport.py @@ -26,12 +26,13 @@ class RunXRechnungReportStart(ModelView): 'eDocument Export' __name__ = 'account_invoice_xrechnung.runrep.start' - invoice = fields.Many2One(string='Invoice', readonly=True, + invoice = fields.Many2One( + string='Invoice', readonly=True, model_name='account.invoice', required=True) - state = fields.Char(string='State', readonly=True, - states={'invisible': True}) - edocument = fields.Selection(string='Type', required=True, - selection=sel_edocument) + state = fields.Char( + string='State', readonly=True, states={'invisible': True}) + edocument = fields.Selection( + string='Type', required=True, selection=sel_edocument) as_zip = fields.Boolean(string='ZIP-File') @classmethod @@ -84,7 +85,7 @@ class RunXRechnungReport(Wizard): if self.start.state != 'posted': raise UserError(gettext( 'account_invoice_xrechnung.msg_invoice_must_posted', - invname = self.start.invoice.rec_name, + invname=self.start.invoice.rec_name, )) return action, { 'invoice': self.start.invoice.id, diff --git a/xreport.py b/xreport.py index fa129b2..7a17b06 100644 --- a/xreport.py +++ b/xreport.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. import zipfile from io import BytesIO @@ -43,7 +43,7 @@ class XReport(Report): }, max_length=100, word_boundary=True, save_order=True) - if data['as_zip'] == True: + if data['as_zip'] is True: return ( 'zip', cls.compress_as_zip('%(fname)s.%(ext)s' % { @@ -52,7 +52,7 @@ class XReport(Report): }, invoice_string), False, file_name) - else : + else: return ('xml', invoice_string, False, file_name) # end XReport