mdsfred/cashbook_dataexchange
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

formatting

Browse source
This commit is contained in:
Frederik Jaeckel 2023-12-01 12:39:05 +01:00
parent 40d3a9e825
commit 900c2b975c
6 changed files with 63 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
__init__.py
View file

@ -7,9 +7,11 @@ from trytond.pool import Pool
from .category import Category
from .book import Book
from .qiftool import QifTool
from .qif_import_wiz import ImportQifWizard, ImportQifWizardStart, ImportQifWizardInfo
from .qif_import_wiz import (
ImportQifWizard, ImportQifWizardStart, ImportQifWizardInfo)
from .qif_export import QifCategoryExport, QifBookExport
def register():
Pool.register(
QifTool,

26
qif_import_wiz.py
View file

@ -24,8 +24,7 @@ class ImportQifWizardStart(ModelView):
string='Cashbook', readonly=True,
model_name='cashbook.book',
states={
'invisible': ~Bool(Eval('book')),
})
'invisible': ~Bool(Eval('book'))})
file_ = fields.Binary(
string="QIF-File", required=True,
help='Quicken Interchange Format')
@ -47,8 +46,7 @@ class ImportQifWizardInfo(ModelView):
book = fields.Many2One(
string='Cash Book', readonly=True, model_name='cashbook.book',
states={
'invisible': ~Bool(Eval('book')),
})
'invisible': ~Bool(Eval('book'))})
allowimport = fields.Boolean(
string='Import Enabled',
states={'invisible': True})
@ -69,8 +67,7 @@ class ImportQifWizard(Wizard):
Button(string='Cancel', state='end', icon='tryton-cancel'),
Button(
string='Read File', state='readf',
icon='tryton-forward', default=True),
])
icon='tryton-forward', default=True)])
showinfo = StateView(
model_name='cashbook_dataexchange.qif_imp_wiz.info',
view='cashbook_dataexchange.qif_imp_wiz_info_form',
@ -79,10 +76,7 @@ class ImportQifWizard(Wizard):
Button(
string='Import Data', state='importf',
icon='tryton-import', default=True,
states={
'readonly': Eval('allowimport', False) == False,
}),
])
states={'readonly': ~Eval('allowimport', False)})])
readf = StateTransition()
importf = StateTransition()
@ -94,8 +88,7 @@ class ImportQifWizard(Wizard):
values = {
'company': Transaction().context.get('company'),
'book': None,
}
'book': None}
model = context.get('active_model', '')
if model == 'cashbook.book':
@ -170,8 +163,7 @@ class ImportQifWizard(Wizard):
['%s (in)' % x for x in in_categories] +
[''] +
['%s (out)' % x for x in out_categories]
)
)
))
if len(to_create) > 0:
self.showinfo.allowimport = True
else:
@ -182,8 +174,7 @@ class ImportQifWizard(Wizard):
qif_content = QifTool.split_by_type(file_content)
if 'Bank' in qif_content.keys():
to_create = QifTool.convert_parties_to_create(
QifTool.qif_read_transactions(qif_content['Bank'])
)
QifTool.qif_read_transactions(qif_content['Bank']))
self.showinfo.info = gettext(
'cashbook_dataexchange.msg_wiz_parties_found',
numparties=len(to_create),
@ -266,8 +257,7 @@ class ImportQifWizard(Wizard):
Book.create_from_qif(self.showinfo.book, file_content)
lines = Line.search([
('cashbook.id', '=', self.showinfo.book.id),
('state', '=', 'edit'),
])
('state', '=', 'edit')])
if len(lines) > 0:
Line.wfcheck(lines)
elif model == 'party.party':

28
setup.py
View file

@ -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
@ -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']))
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']))
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, < %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 import/export to cashbook.',
long_description=long_description,
@ -91,19 +93,17 @@ setup(name='%s_%s' % (PREFIX, MODULE),
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
],
keywords='tryton cashbook import export',
package_dir={'trytond.modules.%s' % MODULE: '.'},
packages=[
'trytond.modules.%s' % MODULE,
],
package_data={
'trytond.modules.%s' % MODULE: (info.get('xml', [])
+ ['tryton.cfg', 'locale/*.po', 'tests/*.py',
'trytond.modules.%s' % MODULE: (info.get('xml', []) + [
'tryton.cfg', 'locale/*.po', 'tests/*.py',
'report/*.fods', 'view/*.xml',
'versiondep.txt', 'README.rst']),
},
install_requires=requires,
zip_safe=False,
entry_points="""

9
tests/category.py
View file

@ -21,7 +21,8 @@ class CategoryTestCase(object):
"""
pool = Pool()
Category = pool.get('cashbook.category')
ImportWiz = pool.get('cashbook_dataexchange.qif_imp_wiz', type='wizard')
ImportWiz = pool.get(
'cashbook_dataexchange.qif_imp_wiz', type='wizard')
company = self.prep_company()
with Transaction().set_context({
@ -358,7 +359,8 @@ I
'bookingtype': 'mvout',
'booktransf': books[1].id,
'description':
'GA NR00002168 BLZ10000000 0; 05.12/06.42UHR TT TELTOW',
'GA NR00002168 BLZ10000000 0; 05.12/06.42UHR ' +
'TT TELTOW',
}, {
'date': date(2013, 12, 5),
'amount': Decimal('56.37'),
@ -475,7 +477,8 @@ I
result = QifTool.qif_read_categories(
'NGehalt\nI\n^\nNGehalt:Zulagen\nI\n^' +
'NTelekommunikation\nE\n^\nNTelekommunikation:Online-Dienste\nE\n^')
'NTelekommunikation\nE\n^\nNTelekommunikation:' +
'Online-Dienste\nE\n^')
self.assertEqual(result, {
'in': {
'Gehalt': {

9
tests/party.py
View file

@ -19,7 +19,8 @@ class PartyTestCase(object):
"""
pool = Pool()
Party = pool.get('party.party')
ImportWiz = pool.get('cashbook_dataexchange.qif_imp_wiz', type='wizard')
ImportWiz = pool.get(
'cashbook_dataexchange.qif_imp_wiz', type='wizard')
company = self.prep_company()
with Transaction().set_context({
@ -45,7 +46,8 @@ class PartyTestCase(object):
self.assertEqual(list(result.keys()), ['view'])
self.assertEqual(result['view']['defaults']['company'], company.id)
self.assertEqual(result['view']['defaults']['info'],
self.assertEqual(
result['view']['defaults']['info'],
"""The following 3 parties are now imported:\n
Opening Balance
GA NR00002168 BLZ10000000 0
@ -61,7 +63,8 @@ Foodshop Zehlendorf""")
self.assertEqual(len(records), 4)
self.assertEqual(records[0].rec_name, 'Foodshop Zehlendorf')
self.assertEqual(records[1].rec_name, 'GA NR00002168 BLZ10000000 0')
self.assertEqual(
records[1].rec_name, 'GA NR00002168 BLZ10000000 0')
self.assertEqual(records[2].rec_name, 'm-ds')
self.assertEqual(records[3].rec_name, 'Opening Balance')

6
tests/transaction.py
View file

@ -84,7 +84,8 @@ class TransactionTestCase(object):
Party = pool.get('party.party')
Category = pool.get('cashbook.category')
Book = pool.get('cashbook.book')
ImportWiz = pool.get('cashbook_dataexchange.qif_imp_wiz', type='wizard')
ImportWiz = pool.get(
'cashbook_dataexchange.qif_imp_wiz', type='wizard')
company = self.prep_company()
with Transaction().set_context({
@ -223,7 +224,8 @@ Mreturn of bottles
Party = pool.get('party.party')
Category = pool.get('cashbook.category')
Book = pool.get('cashbook.book')
ImportWiz = pool.get('cashbook_dataexchange.qif_imp_wiz', type='wizard')
ImportWiz = pool.get(
'cashbook_dataexchange.qif_imp_wiz', type='wizard')
company = self.prep_company()
with Transaction().set_context({