diff --git a/.hgignore b/.gitignore similarity index 88% rename from .hgignore rename to .gitignore index bb7a7a5..f5d0da5 100644 --- a/.hgignore +++ b/.gitignore @@ -1,4 +1,4 @@ -syntax: glob +*.pyc build/* dist/* mds_cashbook.egg-info/* diff --git a/README.rst b/README.rst index 23855fd..b2690e5 100644 --- a/README.rst +++ b/README.rst @@ -9,7 +9,7 @@ pip install mds-cashbook Requires ======== -- Tryton 6.8 +- Tryton 7.0 How to ====== @@ -153,35 +153,6 @@ currency are converted into the display currency of the parent cash book. Changes ======= -*6.8.35 - 01.06.2024* +*7.0.0 - 30.11.2023* -- add: config setting for fixate in booking-wizard - -*6.8.34 - 30.05.2024* - -- add: fixate of booking from booking-wizard - -*6.8.33 - 31.12.2023* - -- remove caching -- add worker-based precalculation of cashbook-values - -*6.8.32 - 06.12.2023* - -- columns optional - -*6.8.31 - 30.11.2023* - -- optimized ir.rule - -*6.8.30 - 25.07.2023* - -- updt: optimize code, add tests - -*6.8.29 - 24.07.2023* - -- fix: type of indexes - -*6.8.28 - 05.06.2023* - -- init +- compatibility to Tryton 7.0 diff --git a/__init__.py b/__init__.py index a2adccf..7be31cb 100644 --- a/__init__.py +++ b/__init__.py @@ -17,6 +17,7 @@ from .reconciliation import Reconciliation from .cbreport import ReconciliationReport from .currency import CurrencyRate from .valuestore import ValueStore +from .ir import Rule from .cron import Cron @@ -36,6 +37,7 @@ def register(): RunCbReportStart, EnterBookingStart, ValueStore, + Rule, Cron, module='cashbook', type_='model') Pool.register( diff --git a/book.xml b/book.xml index 4520409..b455f14 100644 --- a/book.xml +++ b/book.xml @@ -121,7 +121,7 @@ full copyright notices and license terms. --> diff --git a/ir.py b/ir.py new file mode 100644 index 0000000..0f81aec --- /dev/null +++ b/ir.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# This file is part of the cashbook-module from m-ds.de 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 + + +class Rule(metaclass=PoolMeta): + __name__ = 'ir.rule' + + @classmethod + def _context_modelnames(cls): + """ list of models to add 'user_id' to context + """ + result = super(Rule, cls)._context_modelnames() + return result | { + 'cashbook.book', + 'cashbook.line', + 'cashbook.recon', + 'cashbook.split' + } + +# end Rule diff --git a/line.xml b/line.xml index e618696..624fbfd 100644 --- a/line.xml +++ b/line.xml @@ -145,7 +145,7 @@ full copyright notices and license terms. --> diff --git a/locale/de.po b/locale/de.po index d882c09..c028703 100644 --- a/locale/de.po +++ b/locale/de.po @@ -466,10 +466,6 @@ msgctxt "view:cashbook.book:" msgid "Amount and Numbering" msgstr "Betrag und Nummerierung" -msgctxt "view:cashbook.book:" -msgid "Balance" -msgstr "Saldo" - msgctxt "view:cashbook.book:" msgid "Reconciliations" msgstr "Abstimmungen" @@ -794,14 +790,6 @@ msgctxt "model:cashbook.line,name:" msgid "Cashbook Line" msgstr "Kassenbuchzeile" -msgctxt "view:cashbook.line:" -msgid "Credit" -msgstr "Einnahme" - -msgctxt "view:cashbook.line:" -msgid "Debit" -msgstr "Ausgabe" - msgctxt "view:cashbook.line:" msgid "Cashbook Line" msgstr "Kassenbuchzeile" diff --git a/locale/en.po b/locale/en.po index 87d80cc..af4bc7a 100644 --- a/locale/en.po +++ b/locale/en.po @@ -426,10 +426,6 @@ msgctxt "view:cashbook.book:" msgid "Amount and Numbering" msgstr "Amount and Numbering" -msgctxt "view:cashbook.book:" -msgid "Balance" -msgstr "Balance" - msgctxt "view:cashbook.book:" msgid "Reconciliations" msgstr "Reconciliations" @@ -746,14 +742,6 @@ msgctxt "model:cashbook.line,name:" msgid "Cashbook Line" msgstr "Cashbook Line" -msgctxt "view:cashbook.line:" -msgid "Credit" -msgstr "Credit" - -msgctxt "view:cashbook.line:" -msgid "Debit" -msgstr "Debit" - msgctxt "view:cashbook.line:" msgid "Cashbook Line" msgstr "Cashbook Line" diff --git a/reconciliation.xml b/reconciliation.xml index ca2f603..530a1ca 100644 --- a/reconciliation.xml +++ b/reconciliation.xml @@ -96,7 +96,7 @@ full copyright notices and license terms. --> diff --git a/setup.py b/setup.py index d7a3bc9..1b9fa84 100644 --- a/setup.py +++ b/setup.py @@ -39,8 +39,8 @@ with open(path.join(here, 'versiondep.txt'), encoding='utf-8') as f: modversion[l2[0]] = {'min': l2[1], 'max': l2[2], 'prefix': l2[3]} # tryton-version -major_version = 6 -minor_version = 8 +major_version = 7 +minor_version = 0 requires = ['python-slugify'] for dep in info.get('depends', []): @@ -91,6 +91,7 @@ setup( '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 cashbook', diff --git a/splitline.xml b/splitline.xml index 4ab74c0..fefec00 100644 --- a/splitline.xml +++ b/splitline.xml @@ -80,7 +80,7 @@ full copyright notices and license terms. --> diff --git a/tryton.cfg b/tryton.cfg index 6799f77..be3f103 100644 --- a/tryton.cfg +++ b/tryton.cfg @@ -1,10 +1,11 @@ [tryton] -version=6.8.35 +version=7.0.0 depends: res currency party company + irrulecontext xml: icon.xml group.xml diff --git a/versiondep.txt b/versiondep.txt index 8b13789..d501ebb 100644 --- a/versiondep.txt +++ b/versiondep.txt @@ -1 +1 @@ - +irrulecontext;7.0.1;7.0.999;mds diff --git a/view/book_list.xml b/view/book_list.xml index 3e3220b..5644b9b 100644 --- a/view/book_list.xml +++ b/view/book_list.xml @@ -4,7 +4,7 @@ The COPYRIGHT file at the top level of this repository contains the full copyright notices and license terms. --> - + diff --git a/view/line_list.xml b/view/line_list.xml index 4ffa594..ab1ddde 100644 --- a/view/line_list.xml +++ b/view/line_list.xml @@ -9,8 +9,8 @@ full copyright notices and license terms. --> - - + +