Version 6.0.33

remove unused imports

.hgignore

@@ -1,8 +1,6 @@
-*.pyc
+syntax: glob
 build/*
 dist/*
 mds_cashbook.egg-info/*
 locale/convert_de2en.py
 __pycache__/*
-.pytest_cache/*
-.env

README.rst

@@ -9,7 +9,7 @@ pip install mds-cashbook
 
 Requires
 ========
-- Tryton 7.0
+- Tryton 6.0
 
 How to
 ======
@@ -153,6 +153,140 @@ currency are converted  into the display currency of the parent cash book.
 Changes
 =======
 
-*7.0.0 - 30.11.2023*
+*6.0.33 - 31.12.2023*
 
-- compatibility to Tryton 7.0
+- remove caching
+- add worker-based precalculation of cashbook-values
+
+*6.0.31 - 30.11.2023*
+
+- optimized ir.rule
+
+*6.0.30 - 25.07.2023*
+
+- updt: optimize code, add tests
+
+*6.0.28 - 05.06.2023*
+
+- code optimized
+
+*6.0.27 - 05.03.2023*
+
+- updt: optimize caching
+- add: settings for trytond.conf
+
+*6.0.26 - 27.02.2023*
+
+- updt: cashbook-form optimized
+- add: caching
+
+*6.0.25 - 14.02.2023*
+
+- fix: possible exception by invalid date in context
+- updt: optimize table + icon
+
+*6.0.24 - 05.02.2023*
+
+- fix: rewrite of line-values
+
+*6.0.23 - 28.01.2023*
+
+- fix: selection of subordinate cash books for calculations
+
+*6.0.22 - 21.01.2023*
+
+- add: enable extension by investment-module
+- updt: optimize form/list-views
+
+*6.0.21 - 29.11.2022*
+
+- updt: remove 'reconcile' button from line-form
+- add: how to
+
+*6.0.20 - 16.11.2022*
+
+- add: new state 'reconciled' at line
+
+*6.0.19 - 19.10.2022*
+
+- fix: delete()
+
+*6.0.18 - 11.10.2022*
+
+- updt: optimized open/view of cashbook
+
+*6.0.17 - 10.10.2022*
+
+- add: colors for cashbook-lines
+- add: client stores tree-state of cashbook
+
+*6.0.16 - 07.10.2022*
+
+- add: open cashbook-lines from cashbook
+
+*6.0.15 - 04.10.2022*
+
+- updt: second-currency support optimized
+
+*6.0.14 - 30.09.2022*
+
+- fix: parameter
+
+*6.0.13 - 28.09.2022*
+
+- hierarchical ordering for cashbook
+- forms optimzed
+
+*6.0.12 - 18.09.2022*
+
+- add: selected cashbooks in 'enter-booking-dialog'
+
+*6.0.11 - 16.09.2022*
+
+- add: hierarchy for cashbooks
+
+*6.0.10 - 13.09.2022*
+
+- add: split-booking with transfer
+
+*6.0.9 - 08.09.2022*
+
+- updt: allow negative amounts
+
+*6.0.8 - 07.09.2022*
+
+- updt: enter-booking form optimized
+
+*6.0.7 - 07.09.2022*
+
+- add: enter-booking-wizard
+
+*6.0.6 - 06.09.2022*
+
+- updt: optimized form - line, line-context
+- updt: extended search in cashbook-lines
+
+*6.0.5 - 05.09.2022*
+
+- updt: view of book + line optimized
+
+*6.0.4 - 05.09.2022*
+
+- fix: write number at state-change 'check' -> 'done'
+- updt: speedup transaction view
+
+*6.0.3 - 31.08.2022*
+
+- updt: checks, sorting
+
+*6.0.2 - 25.08.2022*
+
+- add: split-booking
+
+*6.0.1 - 23.08.2022*
+
+- works
+
+*6.0.0 - 05.08.2022*
+
+- init

__init__.py

@@ -17,7 +17,6 @@ from .reconciliation import Reconciliation
 from .cbreport import ReconciliationReport
 from .currency import CurrencyRate
 from .valuestore import ValueStore
-from .ir import Rule
 from .cron import Cron
 
 
@@ -37,7 +36,6 @@ def register():
         RunCbReportStart,
         EnterBookingStart,
         ValueStore,
-        Rule,
         Cron,
         module='cashbook', type_='model')
     Pool.register(

book.py

@@ -3,8 +3,7 @@
 # The COPYRIGHT file at the top level of this repository contains the
 # full copyright notices and license terms.
 
-from trytond.model import (
-    Workflow, ModelView, ModelSQL, fields, Check, tree, Index)
+from trytond.model import Workflow, ModelView, ModelSQL, fields, Check, tree
 from trytond.pyson import Eval, Or, Bool, Id
 from trytond.exceptions import UserError
 from trytond.i18n import gettext
@@ -50,13 +49,13 @@ class Book(tree(separator='/'), Workflow, ModelSQL, ModelView):
 
     company = fields.Many2One(
         string='Company', model_name='company.company',
-        required=True, ondelete="RESTRICT")
+        required=True, select=True, ondelete="RESTRICT")
     name = fields.Char(
         string='Name', required=True, states=STATES, depends=DEPENDS)
     description = fields.Text(
         string='Description', states=STATES, depends=DEPENDS)
     btype = fields.Many2One(
-        string='Type',
+        string='Type', select=True,
         help='A cash book with type can contain postings. ' +
         'Without type is a view.',
         model_name='cashbook.type', ondelete='RESTRICT',
@@ -69,16 +68,16 @@ class Book(tree(separator='/'), Workflow, ModelSQL, ModelView):
         string='Feature', readonly=True,
         states={'invisible': True}), 'on_change_with_feature')
     owner = fields.Many2One(
-        string='Owner', required=True,
+        string='Owner', required=True, select=True,
         model_name='res.user', ondelete='SET NULL',
         states=STATES, depends=DEPENDS)
     reviewer = fields.Many2One(
-        string='Reviewer',
+        string='Reviewer', select=True,
         help='Group of users who have write access to the cashbook.',
         model_name='res.group', ondelete='SET NULL',
         states=STATES, depends=DEPENDS)
     observer = fields.Many2One(
-        string='Observer',
+        string='Observer', select=True,
         help='Group of users who have read-only access to the cashbook.',
         model_name='res.group', ondelete='SET NULL',
         states=STATES, depends=DEPENDS)
@@ -153,7 +152,7 @@ class Book(tree(separator='/'), Workflow, ModelSQL, ModelView):
         'on_change_with_currency_digits')
 
     currency = fields.Many2One(
-        string='Currency',
+        string='Currency', select=True,
         model_name='currency.currency',
         states={
             'readonly': Or(
@@ -190,29 +189,6 @@ class Book(tree(separator='/'), Workflow, ModelSQL, ModelView):
         cls._order.insert(0, ('rec_name', 'ASC'))
         cls._order.insert(0, ('state', 'ASC'))
         t = cls.__table__()
-        cls._sql_indexes.update({
-            Index(
-                t,
-                (t.btype, Index.Equality())),
-            Index(
-                t,
-                (t.company, Index.Equality())),
-            Index(
-                t,
-                (t.currency, Index.Equality())),
-            Index(
-                t,
-                (t.state, Index.Equality())),
-            Index(
-                t,
-                (t.owner, Index.Equality())),
-            Index(
-                t,
-                (t.reviewer, Index.Equality())),
-            Index(
-                t,
-                (t.observer, Index.Equality())),
-            })
         cls._sql_constraints.extend([
             ('state_val',
                 Check(t, t.state.in_(['open', 'closed', 'archive'])),

book.xml

@@ -121,7 +121,7 @@ full copyright notices and license terms. -->
         </record>
         <record model="ir.rule" id="rg_book_rw_owner-1">
             <field name="domain" eval="[
-                ('owner.id', '=', Eval('user_id', -1)),
+                ('owner.id', '=', Eval('user', {}).get('id', -1)),
                 ]" pyson="1"/>
             <field name="rule_group" ref="rg_book_rw_owner"/>
         </record>

configuration.py

@@ -71,8 +71,6 @@ class Configuration(ModelSingleton, ModelSQL, ModelView, UserMultiValueMixin):
         help='Cash book available in selection dialog.',
         model_name='cashbook.book', ondelete='SET NULL',
         domain=[('btype', '!=', None), ('state', '=', 'open')]))
-    fixate = fields.MultiValue(fields.Boolean(
-        string='Fixate', help='Fixating of the booking is activated.'))
 
     @classmethod
     def multivalue_model(cls, field):
@@ -83,7 +81,7 @@ class Configuration(ModelSingleton, ModelSQL, ModelView, UserMultiValueMixin):
         if field in [
                 'date_from', 'date_to', 'checked', 'done',
                 'catnamelong', 'defbook', 'book1', 'book2',
-                'book3', 'book4', 'book5', 'fixate']:
+                'book3', 'book4', 'book5']:
             return pool.get('cashbook.configuration_user')
         return super(Configuration, cls).multivalue_model(field)
 
@@ -99,10 +97,6 @@ class Configuration(ModelSingleton, ModelSQL, ModelView, UserMultiValueMixin):
     def default_catnamelong(cls, **pattern):
         return cls.multivalue_model('catnamelong').default_catnamelong()
 
-    @classmethod
-    def default_fixate(cls, **pattern):
-        return cls.multivalue_model('fixate').default_fixate()
-
 # end Configuration
 
 
@@ -181,9 +175,6 @@ class UserConfiguration(ModelSQL, UserValueMixin):
             ('owner.id', '=', Eval('iduser', -1))
         ], depends=['iduser'])
 
-    fixate = fields.Boolean(
-        string='Fixate', help='Fixating of the booking is activated.')
-
     @classmethod
     def default_checked(cls):
         return True
@@ -196,8 +187,4 @@ class UserConfiguration(ModelSQL, UserValueMixin):
     def default_done(cls):
         return False
 
-    @classmethod
-    def default_fixate(cls):
-        return False
-
 # end UserConfiguration

ir.py

@@ -1,24 +0,0 @@
-# -*- 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

line.py

@@ -3,7 +3,7 @@
 # The COPYRIGHT file at the top level of this repository contains the
 # full copyright notices and license terms.
 
-from trytond.model import ModelView, ModelSQL, Workflow, fields, Check, Index
+from trytond.model import ModelView, ModelSQL, Workflow, fields, Check
 from trytond.pool import Pool
 from trytond.pyson import Eval, If, Or, Bool, Date
 from trytond.transaction import Transaction
@@ -54,24 +54,24 @@ class Line(SecondCurrencyMixin, Workflow, ModelSQL, ModelView):
     __name__ = 'cashbook.line'
 
     cashbook = fields.Many2One(
-        string='Cashbook', required=True,
+        string='Cashbook', required=True, select=True,
         model_name='cashbook.book', ondelete='CASCADE', readonly=True,
         domain=[('btype', '!=', None)])
     date = fields.Date(
-        string='Date', required=True,
+        string='Date', required=True, select=True,
         states=STATES, depends=DEPENDS)
     month = fields.Function(fields.Integer(
         string='Month', readonly=True),
         'on_change_with_month', searcher='search_month')
     number = fields.Char(string='Number', readonly=True)
     description = fields.Text(
-        string='Description',
+        string='Description', select=True,
         states=STATES, depends=DEPENDS)
     descr_short = fields.Function(fields.Char(
         string='Description', readonly=True),
         'on_change_with_descr_short', searcher='search_descr_short')
     category = fields.Many2One(
-        string='Category',
+        string='Category', select=True,
         model_name='cashbook.category', ondelete='RESTRICT',
         states={
             'readonly': Or(
@@ -98,7 +98,7 @@ class Line(SecondCurrencyMixin, Workflow, ModelSQL, ModelView):
 
     bookingtype = fields.Selection(
         string='Type', required=True,
-        help='Type of Booking', selection=sel_bookingtype,
+        help='Type of Booking', selection=sel_bookingtype, select=True,
         states=STATES, depends=DEPENDS)
     bookingtype_string = bookingtype.translated('bookingtype')
     amount = fields.Numeric(
@@ -145,7 +145,7 @@ class Line(SecondCurrencyMixin, Workflow, ModelSQL, ModelView):
 
     # link to lines created by this record
     reference = fields.Many2One(
-        string='Reference', readonly=True,
+        string='Reference', readonly=True, select=True,
         states={
             'invisible': ~Bool(Eval('reference')),
         }, model_name='cashbook.line', ondelete='CASCADE',
@@ -198,7 +198,7 @@ class Line(SecondCurrencyMixin, Workflow, ModelSQL, ModelView):
 
     state = fields.Selection(
         string='State', required=True, readonly=True,
-        selection=sel_linestate)
+        select=True, selection=sel_linestate)
     state_string = state.translated('state')
     state_cashbook = fields.Function(fields.Selection(
         string='State of Cashbook',
@@ -224,27 +224,6 @@ class Line(SecondCurrencyMixin, Workflow, ModelSQL, ModelView):
         cls._order.insert(0, ('date', 'ASC'))
         cls._order.insert(0, ('state', 'ASC'))
         t = cls.__table__()
-
-        cls._sql_indexes.update({
-            Index(
-                t,
-                (t.date, Index.Range(order='ASC'))),
-            Index(
-                t,
-                (t.description, Index.Similarity())),
-            Index(
-                t,
-                (t.category, Index.Equality())),
-            Index(
-                t,
-                (t.bookingtype, Index.Equality())),
-            Index(
-                t,
-                (t.state, Index.Equality())),
-            Index(
-                t,
-                (t.reference, Index.Equality())),
-            })
         cls._sql_constraints.extend([
             ('state_val2',
                 Check(t, t.state.in_(['edit', 'check', 'done', 'recon'])),
@@ -679,7 +658,7 @@ class Line(SecondCurrencyMixin, Workflow, ModelSQL, ModelView):
 
     @fields.depends('category')
     def on_change_with_category_view(self, name=None):
-        """ show optimized form of category for list-view
+        """ show optimizef form of category for list-view
         """
         Configuration = Pool().get('cashbook.configuration')
 

line.xml

@@ -145,7 +145,7 @@ full copyright notices and license terms. -->
         </record>
         <record model="ir.rule" id="rg_line_write-1">
             <field name="domain" eval="['OR',
-                    ('cashbook.owner.id', '=', Eval('user_id', -1)),
+                    ('cashbook.owner.id', '=', Eval('user', {}).get('id', -1)),
                     ('cashbook.reviewer.id', 'in', Eval('groups', [])),
                 ]" pyson="1"/>
             <field name="rule_group" ref="rg_line_write"/>

locale/de.po

@@ -466,6 +466,10 @@ 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"
@@ -790,6 +794,14 @@ 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"
@@ -1258,14 +1270,6 @@ msgctxt "help:cashbook.configuration,book5:"
 msgid "Cash book available in selection dialog."
 msgstr "in Auswahldialog verfügbares Kassenbuch."
 
-msgctxt "field:cashbook.configuration,fixate:"
-msgid "Fixate"
-msgstr "Festschreiben"
-
-msgctxt "help:cashbook.configuration,fixate:"
-msgid "Fixating of the booking is activated."
-msgstr "Die Festschreiben der Buchung ist aktiviert."
-
 msgctxt "field:cashbook.configuration,date_from:"
 msgid "Start Date"
 msgstr "Beginndatum"
@@ -1386,14 +1390,6 @@ msgctxt "help:cashbook.configuration_user,book5:"
 msgid "Cash book available in selection dialog."
 msgstr "in Auswahldialog verfügbares Kassenbuch."
 
-msgctxt "field:cashbook.configuration_user,fixate:"
-msgid "Fixate"
-msgstr "Festschreiben"
-
-msgctxt "help:cashbook.configuration_user,fixate:"
-msgid "Fixating of the booking is activated."
-msgstr "Die Festschreiben der Buchung ist aktiviert."
-
 
 ##################
 # cashbook.recon #
@@ -1662,18 +1658,6 @@ msgctxt "field:cashbook.enterbooking.start,party:"
 msgid "Party"
 msgstr "Partei"
 
-msgctxt "field:cashbook.enterbooking.start,description:"
-msgid "Description"
-msgstr "Beschreibung"
-
-msgctxt "field:cashbook.enterbooking.start,fixate:"
-msgid "Fixate"
-msgstr "Festschreiben"
-
-msgctxt "help:cashbook.enterbooking.start,fixate:"
-msgid "The booking is fixed immediately."
-msgstr "Die Buchung wird sofort festgeschrieben."
-
 
 #########################
 # cashbook.enterbooking #

locale/en.po

@@ -426,6 +426,10 @@ 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"
@@ -742,6 +746,14 @@ 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"
@@ -1186,14 +1198,6 @@ msgctxt "help:cashbook.configuration,book5:"
 msgid "Cash book available in selection dialog."
 msgstr "Cash book available in selection dialog."
 
-msgctxt "field:cashbook.configuration,fixate:"
-msgid "Fixate"
-msgstr "Fixate"
-
-msgctxt "help:cashbook.configuration,fixate:"
-msgid "Fixating of the booking is activated."
-msgstr "Fixating of the booking is activated."
-
 msgctxt "field:cashbook.configuration,date_from:"
 msgid "Start Date"
 msgstr "Start Date"
@@ -1310,14 +1314,6 @@ msgctxt "help:cashbook.configuration_user,book5:"
 msgid "Cash book available in selection dialog."
 msgstr "Cash book available in selection dialog."
 
-msgctxt "field:cashbook.configuration_user,fixate:"
-msgid "Fixate"
-msgstr "Fixate"
-
-msgctxt "help:cashbook.configuration_user,fixate:"
-msgid "Fixating of the booking is activated."
-msgstr "Fixating of the booking is activated."
-
 msgctxt "model:cashbook.recon,name:"
 msgid "Cashbook Reconciliation"
 msgstr "Cashbook Reconciliation"
@@ -1570,18 +1566,6 @@ msgctxt "field:cashbook.enterbooking.start,party:"
 msgid "Party"
 msgstr "Party"
 
-msgctxt "field:cashbook.enterbooking.start,description:"
-msgid "Description"
-msgstr "Description"
-
-msgctxt "field:cashbook.enterbooking.start,fixate:"
-msgid "Fixate"
-msgstr "Fixate"
-
-msgctxt "help:cashbook.enterbooking.start,fixate:"
-msgid "The booking is fixed immediately."
-msgstr "The booking is fixed immediately."
-
 msgctxt "model:cashbook.enterbooking,name:"
 msgid "Enter Booking"
 msgstr "Enter Booking"

model.py

@@ -3,8 +3,7 @@
 # The COPYRIGHT file at the top level of this repository contains the
 # full copyright notices and license terms.
 
-from trytond.model import (
-    MultiValueMixin, ValueMixin, fields, Unique, Index)
+from trytond.model import MultiValueMixin, ValueMixin, fields, Unique, Model
 from trytond.transaction import Transaction
 from trytond.pool import Pool
 from sql import With
@@ -123,17 +122,12 @@ def order_name_hierarchical(model_name, tables):
 class UserValueMixin(ValueMixin):
     iduser = fields.Many2One(
         model_name='res.user', string="User",
-        ondelete='CASCADE', required=True)
+        select=True, ondelete='CASCADE', required=True)
 
     @classmethod
     def __setup__(cls):
         super(UserValueMixin, cls).__setup__()
         tab_val = cls.__table__()
-        cls._sql_indexes.update({
-            Index(
-                tab_val,
-                (tab_val.iduser, Index.Equality())),
-            })
         cls._sql_constraints.extend([
             ('val_uniq',
                 Unique(tab_val, tab_val.iduser),

reconciliation.py

@@ -3,7 +3,7 @@
 # The COPYRIGHT file at the top level of this repository contains the
 # full copyright notices and license terms.
 
-from trytond.model import Workflow, ModelView, ModelSQL, fields, Index
+from trytond.model import Workflow, ModelView, ModelSQL, fields
 from trytond.pyson import Eval, If, Or
 from trytond.pool import Pool
 from trytond.report import Report
@@ -34,10 +34,10 @@ class Reconciliation(Workflow, ModelSQL, ModelView):
     __name__ = 'cashbook.recon'
 
     cashbook = fields.Many2One(
-        string='Cashbook', required=True,
+        string='Cashbook', required=True, select=True,
         model_name='cashbook.book', ondelete='CASCADE', readonly=True)
     date = fields.Date(
-        string='Date', required=True,
+        string='Date', required=True, select=True,
         states=STATES, depends=DEPENDS)
     feature = fields.Function(fields.Char(
         string='Feature', readonly=True,
@@ -54,7 +54,7 @@ class Reconciliation(Workflow, ModelSQL, ModelView):
         states=STATES, depends=DEPENDS+['date_to'])
     date_to = fields.Date(
         string='End Date',
-        required=True,
+        required=True, select=True,
         domain=[
             If(Eval('date_to') & Eval('date_from'),
                 ('date_from', '<=', Eval('date_to')),
@@ -98,7 +98,7 @@ class Reconciliation(Workflow, ModelSQL, ModelView):
 
     state = fields.Selection(
         string='State', required=True, readonly=True,
-        selection=sel_reconstate)
+        select=True, selection=sel_reconstate)
     state_string = state.translated('state')
     state_cashbook = fields.Function(fields.Selection(
         string='State of Cashbook',
@@ -109,7 +109,6 @@ class Reconciliation(Workflow, ModelSQL, ModelView):
     def __setup__(cls):
         super(Reconciliation, cls).__setup__()
         cls._order.insert(0, ('date_from', 'DESC'))
-        t = cls.__table__()
         cls._transitions |= set((
                 ('edit', 'check'),
                 ('check', 'done'),
@@ -129,23 +128,6 @@ class Reconciliation(Workflow, ModelSQL, ModelView):
                 'depends': ['state'],
                 },
             })
-        cls._sql_indexes.update({
-            Index(
-                t,
-                (t.cashbook, Index.Equality())),
-            Index(
-                t,
-                (t.date, Index.Range())),
-            Index(
-                t,
-                (t.date_to, Index.Range())),
-            Index(
-                t,
-                (t.date_from, Index.Range(order='DESC'))),
-            Index(
-                t,
-                (t.state, Index.Equality())),
-            })
 
     def check_overlap_dates(self):
         """ deny overlap of date_from/date_to between records of same cashbook

reconciliation.xml

@@ -96,7 +96,7 @@ full copyright notices and license terms. -->
         </record>
         <record model="ir.rule" id="rg_recon_write-1">
             <field name="domain" eval="['OR',
-                    ('cashbook.owner.id', '=', Eval('user_id', -1)),
+                    ('cashbook.owner.id', '=', Eval('user', {}).get('id', -1)),
                     ('cashbook.reviewer.id', 'in', Eval('groups', [])),
                 ]" pyson="1"/>
             <field name="rule_group" ref="rg_recon_write"/>

setup.py

@@ -39,7 +39,7 @@ 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 = 7
+major_version = 6
 minor_version = 0
 
 requires = ['python-slugify']
@@ -91,7 +91,6 @@ 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',

splitline.py

@@ -4,7 +4,7 @@
 # full copyright notices and license terms.
 
 
-from trytond.model import ModelView, ModelSQL, fields, Index
+from trytond.model import ModelView, ModelSQL, fields
 from trytond.pool import Pool
 from trytond.pyson import Eval, If
 from trytond.report import Report
@@ -31,16 +31,16 @@ class SplitLine(SecondCurrencyMixin, ModelSQL, ModelView):
 
     line = fields.Many2One(
         string='Line', required=True,
-        ondelete='CASCADE', model_name='cashbook.line',
+        select=True, ondelete='CASCADE', model_name='cashbook.line',
         readonly=True)
     description = fields.Text(
         string='Description', states=STATES, depends=DEPENDS)
     splittype = fields.Selection(
         string='Type', required=True,
         help='Type of split booking line', selection=sel_linetype,
-        states=STATES, depends=DEPENDS)
+        states=STATES, depends=DEPENDS, select=True)
     category = fields.Many2One(
-        string='Category',
+        string='Category', select=True,
         model_name='cashbook.category', ondelete='RESTRICT',
         states={
             'readonly': STATES['readonly'],
@@ -63,7 +63,7 @@ class SplitLine(SecondCurrencyMixin, ModelSQL, ModelView):
             ('owner.id', '=', Eval('owner_cashbook', -1)),
             ('id', '!=', Eval('cashbook', -1)),
             ('btype', '!=', None),
-            ],
+            ], select=True,
         states={
             'readonly': STATES['readonly'],
             'invisible': Eval('splittype', '') != 'tr',
@@ -110,25 +110,6 @@ class SplitLine(SecondCurrencyMixin, ModelSQL, ModelView):
         states={'invisible': True}, model_name='res.user'),
         'on_change_with_owner_cashbook')
 
-    @classmethod
-    def __setup__(cls):
-        super(SplitLine, cls).__setup__()
-        t = cls.__table__()
-        cls._sql_indexes.update({
-            Index(
-                t,
-                (t.line, Index.Equality())),
-            Index(
-                t,
-                (t.splittype, Index.Equality())),
-            Index(
-                t,
-                (t.category, Index.Equality())),
-            Index(
-                t,
-                (t.booktransf, Index.Equality())),
-            })
-
     @classmethod
     def default_splittype(cls):
         """ default category

splitline.xml

@@ -80,7 +80,7 @@ full copyright notices and license terms. -->
         </record>
         <record model="ir.rule" id="rg_split_write-1">
             <field name="domain" eval="['OR',
-                    ('line.cashbook.owner.id', '=', Eval('user_id', -1)),
+                    ('line.cashbook.owner.id', '=', Eval('user', {}).get('id', -1)),
                     ('line.cashbook.reviewer.id', 'in', Eval('groups', [])),
                 ]" pyson="1"/>
             <field name="rule_group" ref="rg_split_write"/>

tests/__init__.py

@@ -1,4 +1,16 @@
-# -*- 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 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 .test_module import CashbookTestCase
+
+
+__all__ = ['suite']
+
+
+def suite():
+    suite = trytond.tests.test_tryton.suite()
+    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(CashbookTestCase))
+    return suite

tests/bookingwiz.py

@@ -24,7 +24,6 @@ class BookingWizardTestCase(object):
         Category = pool.get('cashbook.category')
         Party = pool.get('party.party')
         IrDate = pool.get('ir.date')
-        Config = pool.get('cashbook.configuration')
 
         company = self.prep_company()
         with Transaction().set_context({
@@ -52,10 +51,6 @@ class BookingWizardTestCase(object):
                     'cattype': 'out',
                 }])
 
-            cfg1 = Config()
-            cfg1.fixate = True
-            cfg1.save()
-
             (sess_id, start_state, end_state) = BookingWiz.create()
             w_obj = BookingWiz(sess_id)
             self.assertEqual(start_state, 'start')
@@ -70,7 +65,6 @@ class BookingWizardTestCase(object):
             self.assertEqual(result['view']['defaults']['booktransf'], None)
             self.assertEqual(result['view']['defaults']['description'], None)
             self.assertEqual(result['view']['defaults']['category'], None)
-            self.assertEqual(result['view']['defaults']['fixate'], True)
 
             self.assertEqual(len(book.lines), 0)
 
@@ -81,7 +75,7 @@ class BookingWizardTestCase(object):
                 'description': 'Test 1',
                 'category': categories[1].id,
                 'bookingtype': 'out',
-                'fixate': True}
+                }
             for x in r1.keys():
                 setattr(w_obj.start, x, r1[x])
 
@@ -94,7 +88,6 @@ class BookingWizardTestCase(object):
             self.assertEqual(
                 book.lines[0].rec_name,
                 '05/01/2022|Exp|-10.00 usd|Test 1 [Food]')
-            self.assertEqual(book.lines[0].state, 'check')
 
     @with_transaction()
     def test_bookwiz_transfer(self):
@@ -154,7 +147,6 @@ class BookingWizardTestCase(object):
             self.assertEqual(result['view']['defaults']['booktransf'], None)
             self.assertEqual(result['view']['defaults']['description'], None)
             self.assertEqual(result['view']['defaults']['category'], None)
-            self.assertEqual(result['view']['defaults']['fixate'], False)
 
             self.assertEqual(len(books[0].lines), 0)
             self.assertEqual(len(books[1].lines), 0)
@@ -165,7 +157,7 @@ class BookingWizardTestCase(object):
                 'description': 'Test 1',
                 'booktransf': books[1].id,
                 'bookingtype': 'mvout',
-                'fixate': False}
+                }
             for x in r1.keys():
                 setattr(w_obj.start, x, r1[x])
 

tests/category.py

@@ -119,8 +119,8 @@ class CategoryTestCase(object):
 
         self.assertRaisesRegex(
             UserError,
-            'The value "out" for field "Type" in "Level 1/Level 2" of ' +
-            '"Category" is not valid according to its domain.',
+            'The value for field "Type" in "Category" is not valid ' +
+            'according to its domain.',
             Category.write,
             *[
                 [category.childs[0]],

tests/config.py

@@ -178,12 +178,10 @@ class ConfigTestCase(object):
                 self.assertEqual(cfg2.date_to, None)
                 self.assertEqual(cfg2.checked, True)
                 self.assertEqual(cfg2.done, False)
-                self.assertEqual(cfg2.fixate, False)
 
                 cfg2.date_from = date(2022, 4, 1)
                 cfg2.date_to = date(2022, 5, 30)
                 cfg2.checked = False
-                cfg2.fixate = True
                 cfg2.save()
 
             # change to user 'diego'
@@ -196,7 +194,6 @@ class ConfigTestCase(object):
                 self.assertEqual(cfg2.date_to, None)
                 self.assertEqual(cfg2.checked, True)
                 self.assertEqual(cfg2.done, False)
-                self.assertEqual(cfg2.fixate, False)
 
                 cfg2.date_from = date(2022, 4, 15)
                 cfg2.date_to = date(2022, 5, 15)
@@ -212,6 +209,5 @@ class ConfigTestCase(object):
                 self.assertEqual(cfg2.date_to, date(2022, 5, 30))
                 self.assertEqual(cfg2.checked, False)
                 self.assertEqual(cfg2.done, False)
-                self.assertEqual(cfg2.fixate, True)
 
 # end ConfigTestCase

tests/line.py

@@ -895,8 +895,8 @@ class LineTestCase(object):
 
         self.assertRaisesRegex(
             UserError,
-            r'The value "Book 1" for field "Cashbook" in "\d+" of ' +
-            r'"Cashbook Line" is not valid according to its domain.',
+            'The value for field "Cashbook" in "Cashbook Line" is not ' +
+            'valid according to its domain.',
             Line.create,
             [{
                 'cashbook': book.id,

tests/valuestore.py

@@ -267,10 +267,10 @@ class ValuestoreTestCase(object):
                 # check write of too much digits
                 self.assertRaisesRegex(
                     UserError,
-                    r'The number of digits in the value ' +
-                    r'"' + r"'12.345'" +
-                    r'" for field "Value" in "[Book 1 | 10\.00 usd | ' +
-                    r'Open]|balance|12\.35|2" of "Value Store" exceeds ' +
+                    r"The number of digits in the value " +
+                    r'"Decimal\(' +
+                    r"'12\.345'\)" +
+                    r'" for field "Value" in "Value Store" exceeds ' +
                     r'the limit of "2".',
                     ValueStore.write,
                     *[

tryton.cfg

@@ -1,11 +1,10 @@
 [tryton]
-version=7.0.0
+version=6.0.33
 depends:
     res
     currency
     party
     company
-    irrulecontext
 xml:
     icon.xml
     group.xml

types.py

@@ -3,7 +3,7 @@
 # The COPYRIGHT file at the top level of this repository contains the
 # full copyright notices and license terms.
 
-from trytond.model import ModelView, ModelSQL, fields, Unique, Index
+from trytond.model import ModelView, ModelSQL, fields, Unique
 from trytond.transaction import Transaction
 from trytond.i18n import gettext
 
@@ -19,7 +19,7 @@ class Type(ModelSQL, ModelView):
         required=True, ondelete="RESTRICT")
     feature = fields.Selection(
         string='Feature', required=True,
-        selection='get_sel_feature',
+        selection='get_sel_feature', select=True,
         help='Select feature set of the Cashbook.')
 
     @classmethod
@@ -32,11 +32,6 @@ class Type(ModelSQL, ModelView):
                 Unique(t, t.short),
                 'cashbook.msg_type_short_unique'),
             ])
-        cls._sql_indexes.update({
-            Index(
-                t,
-                (t.feature, Index.Equality())),
-            })
 
     @classmethod
     def default_feature(cls):

valuestore.py

@@ -7,7 +7,7 @@
 from sql.functions import CurrentTimestamp, DateTrunc
 from sql.aggregate import Count
 from sql.conditionals import Coalesce
-from trytond.model import ModelSQL, fields, Unique, Index
+from trytond.model import ModelSQL, fields, Unique
 from trytond.pool import Pool
 from trytond.transaction import Transaction
 from trytond.pyson import Eval, PYSON, PYSONEncoder, PYSONDecoder
@@ -22,7 +22,7 @@ class ValueStore(ModelSQL):
     cashbook = fields.Many2One(
         string='Cashbook', required=True, model_name='cashbook.book',
         ondelete='CASCADE')
-    field_name = fields.Char(string='Field Name', required=True)
+    field_name = fields.Char(string='Field Name', required=True, select=True)
     numvalue = fields.Numeric(
         string='Value', digits=(16, Eval('valuedigits', 6)),
         depends=['valuedigits'])
@@ -30,16 +30,6 @@ class ValueStore(ModelSQL):
         string='Digits', readonly=True),
         'on_change_with_valuedigits')
 
-    @classmethod
-    def __register__(cls, module_name):
-        super(ValueStore, cls).__register__(module_name)
-
-        # clear value-store, re-calc
-        records = cls.search([])
-        if records:
-            cls.delete(records)
-        cls.maintenance_values()
-
     @classmethod
     def __setup__(cls):
         super(ValueStore, cls).__setup__()
@@ -49,11 +39,6 @@ class ValueStore(ModelSQL):
                 Unique(t, t.cashbook, t.field_name),
                 'cashbook.msg_value_exists_in_store'),
             ])
-        cls._sql_indexes.update({
-            Index(
-                t,
-                (t.field_name, Index.Equality())),
-            })
 
     def get_rec_name(self, name):
         """ name, balance, state

versiondep.txt

@@ -1 +1 @@
-irrulecontext;7.0.1;7.0.999;mds
+

view/book_list.xml

@@ -4,8 +4,6 @@ The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
 <tree keyword_open="1">
     <field name="rec_name" expand="1"/>
-    <field name="balance" sum="1" symbol="currency"/>
-    <field name="balance_all" symbol="currency" optional="1"/>
-    <field name="balance_ref" symbol="company_currency" optional="1"/>
-    <field name="state" optional="0"/>
+    <field name="balance" sum="Balance" symbol="currency"/>
+    <field name="state"/>
 </tree>

view/book_tree.xml

@@ -5,9 +5,7 @@ full copyright notices and license terms. -->
 <tree keyword_open="1" tree_state="1">
     <field name="name" expand="1"/>
     <field name="balance" symbol="currency"/>
-    <field name="balance_all" symbol="currency" optional="1"/>
-    <field name="balance_ref" symbol="company_currency" optional="1"/>
-    <field name="state" optional="0"/>
+    <field name="state"/>
     <field name="parent" tree_invisible="1"/>
     <field name="childs" tree_invisible="1"/>
 </tree>

view/configuration_form.xml

@@ -28,10 +28,6 @@ this repository contains the full copyright notices and license terms. -->
     <label name="book5"/>
     <field name="book5"/>
 
-    <label name="fixate"/>
-    <field name="fixate"/>
-    <newline/>
-
     <separator id="sepcb" colspan="4" string="Cashbook"/>
     <label name="catnamelong"/>
     <field name="catnamelong"/>

view/enterbooking_start_form.xml

@@ -22,10 +22,6 @@ full copyright notices and license terms. -->
         <page id="descr" string="Description" col="1">
             <field name="description"/>
         </page>
-        <page name="fixate" col="2">
-            <label name="fixate"/>
-            <field name="fixate"/>
-        </page>
     </notebook>
 
     <field name="cashbooks"/>
@@ -33,3 +29,4 @@ full copyright notices and license terms. -->
     <field name="currency"/>
     <field name="owner_cashbook"/>
 </form>
+

view/line_list.xml

@@ -4,14 +4,14 @@ The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
 <tree>
     <field name="cashbook" tree_invisible="1"/>
-    <field name="number" optional="0"/>
+    <field name="number"/>
     <field name="date"/>
     <field name="payee"/>
     <field name="category_view"/>
     <field name="descr_short" expand="1"/>
-    <field name="credit" sum="1" optional="0"/>
-    <field name="debit" sum="1" optional="0"/>
-    <field name="balance" optional="0"/>
-    <field name="state" optional="0"/>
+    <field name="credit" sum="Credit"/>
+    <field name="debit" sum="Debit"/>
+    <field name="balance"/>
+    <field name="state"/>
     <button name="wfcheck"/>
 </tree>

view/line_recon_list.xml

@@ -4,13 +4,13 @@ The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
 <tree>
     <field name="cashbook" tree_invisible="1"/>
-    <field name="number" optional="0"/>
-    <field name="date" optional="0"/>
-    <field name="payee" optional="0"/>
-    <field name="category_view" optional="0"/>
-    <field name="descr_short" expand="1" optional="0"/>
-    <field name="credit" sum="1" optional="0"/>
-    <field name="debit" sum="1" optional="0"/>
-    <field name="state" optional="0"/>
+    <field name="number"/>
+    <field name="date"/>
+    <field name="payee"/>
+    <field name="category_view"/>
+    <field name="descr_short" expand="1"/>
+    <field name="credit" sum="Credit"/>
+    <field name="debit" sum="Debit"/>
+    <field name="state"/>
     <button name="wfrecon"/>
 </tree>

view/recon_list.xml

@@ -4,11 +4,11 @@ The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
 <tree>
     <field name="cashbook"/>
-    <field name="date" optional="0"/>
-    <field name="date_from" optional="0"/>
-    <field name="date_to" optional="0"/>
-    <field name="start_amount" optional="0"/>
-    <field name="end_amount" optional="0"/>
-    <field name="lines" optional="0"/>
-    <field name="state" optional="0"/>
+    <field name="date"/>
+    <field name="date_from"/>
+    <field name="date_to"/>
+    <field name="start_amount"/>
+    <field name="end_amount"/>
+    <field name="lines"/>
+    <field name="state"/>
 </tree>

view/split_list.xml

@@ -8,7 +8,7 @@ full copyright notices and license terms. -->
     <field name="splittype"/>
     <field name="category"/>
     <field name="booktransf"/>
-    <field name="description" expand="1" optional="0"/>
-    <field name="amount" sum="1" symbol="currency" optional="0"/>
-    <field name="amount_2nd_currency" symbol="currency2nd" optional="0"/>
+    <field name="description" expand="1"/>
+    <field name="amount" sum="Amount" symbol="currency"/>
+    <field name="amount_2nd_currency" symbol="currency2nd"/>
 </tree>

wizard_booking.py

@@ -7,7 +7,7 @@ from trytond.model import ModelView, fields
 from trytond.wizard import Wizard, StateView, StateTransition, Button
 from trytond.pool import Pool
 from trytond.transaction import Transaction
-from trytond.pyson import Eval, Bool, If, And
+from trytond.pyson import Eval, Bool, If
 from decimal import Decimal
 from .line import sel_bookingtype
 
@@ -45,9 +45,7 @@ class EnterBookingStart(ModelView):
         depends=['currency_digits', 'bookingtype'],
         digits=(16, Eval('currency_digits', 2)), required=True,
         domain=[('amount', '>=', Decimal('0.0'))])
-    description = fields.Text(
-        string='Description', states={'required': Bool(Eval('fixate'))},
-        depends=['fixate'])
+    description = fields.Text(string='Description')
     category = fields.Many2One(
         string='Category',
         model_name='cashbook.category', depends=['bookingtype'],
@@ -62,8 +60,6 @@ class EnterBookingStart(ModelView):
                 ('cattype', '=', 'in'),
                 ('cattype', '=', 'out'),
             )])
-    fixate = fields.Boolean(
-        string='Fixate', help='The booking is fixed immediately.')
 
     # party or cashbook as counterpart
     booktransf = fields.Many2One(
@@ -81,10 +77,7 @@ class EnterBookingStart(ModelView):
         string='Party', model_name='party.party',
         states={
             'invisible': ~Eval('bookingtype', '').in_(['in', 'out']),
-            'required': And(
-                Bool(Eval('fixate')),
-                Eval('bookingtype', '').in_(['in', 'out']))},
-        depends=['bookingtype', 'fixate'])
+        }, depends=['bookingtype'])
 
     @fields.depends('bookingtype', 'category')
     def on_change_bookingtype(self):
@@ -157,8 +150,6 @@ class EnterBookingWizard(Wizard):
                 book_ids.append(getattr(cfg1, x, None).id)
 
         result = {
-            'fixate': cfg1.fixate
-            if cfg1 and cfg1.fixate is not None else False,
             'cashbooks': [x.id for x in Cashbook.search([
                     ('state', '=', 'open'),
                     ('btype', '!=', None),
@@ -196,9 +187,7 @@ class EnterBookingWizard(Wizard):
         elif self.start.bookingtype in ['mvin', 'mvout']:
             query['booktransf'] = self.start.booktransf.id
 
-        lines = Line.create([query])
-        if self.start.fixate:
-            Line.wfcheck(lines)
+        Line.create([query])
         return 'end'
 
     def transition_savenext_(self):