Etikett ver 6.0.14 zum Änderungssatz 17e045a24b9c hinzugefügt

speedup: indexes, caching

README.rst

@@ -9,7 +9,7 @@ pip install mds-cashbook-investment
 
 Requires
 ========
-- Tryton 7.0
+- Tryton 6.0
 
 How to
 ======
@@ -23,6 +23,68 @@ You can monitor trading fees, dividends and sales profits.
 Changes
 =======
 
-*7.0.0 - 06.12.2023*
+*6.0.14 - 19.01.2024*
 
-- compatibility to Tryton 7.0
+- the amounts of the view cash books now include the amounts
+  of the generic cash books
+
+*6.0.13 - 03.01.2024*
+
+- fix: sorting/searcher of field yield-balance
+
+*6.0.12 - 31.12.2023*
+
+- remove caching
+- add worker-based precalculation of cashbook-values
+
+*6.0.11 - 06.12.2023*
+
+- code optimized
+
+*6.0.10 - 08.06.2023*
+
+- code optimized
+
+*6.0.9 - 19.04.2023*
+
+- fix: line - exception if add split-lines
+
+*6.0.8 - 17.04.2023*
+
+- fix: line - selection of digits for quantity
+
+*6.0.7 - 05.03.2023*
+
+- updt: optimize queries for speed, optimize caching
+- add: trytond.conf-settings
+
+*6.0.6 - 27.02.2023*
+
+- add: caching
+- add: performance and yield info
+
+*6.0.5 - 05.02.2023*
+
+- fix: line rewrite values
+
+*6.0.4 - 01.02.2023*
+
+- fix: selection of quantity-uom/digits on line/spitline
+
+*6.0.3 - 30.01.2023*
+
+- add: performance-tab to line-form
+- fix: digits of start/end-quantity in reconciliation
+
+*6.0.2 - 28.01.2023*
+
+- fix: transfer between cash-/asset-book with zero quantity
+- add: view value/percent on chasbooks with btype=None
+
+*6.0.1 - 21.01.2023*
+
+- works
+
+*6.0.0 - 20.12.2022*
+
+- init

book.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 fields, SymbolMixin, Index
+from trytond.model import fields, SymbolMixin
 from trytond.pool import PoolMeta, Pool
 from trytond.pyson import Eval, Or, Bool, If
 from trytond.modules.cashbook.book import STATES2, DEPENDS2
@@ -25,7 +25,7 @@ class Book(SymbolMixin, metaclass=PoolMeta):
     __name__ = 'cashbook.book'
 
     asset = fields.Many2One(
-        string='Asset',
+        string='Asset', select=True,
         model_name='investment.asset', ondelete='RESTRICT',
         states={
             'required': Eval('feature', '') == 'asset',
@@ -51,7 +51,7 @@ class Book(SymbolMixin, metaclass=PoolMeta):
         model_name='product.uom.category',
         states={'invisible': True}), 'on_change_with_asset_uomcat')
     quantity_uom = fields.Many2One(
-        string='UOM',
+        string='UOM', select=True,
         model_name='product.uom', ondelete='RESTRICT',
         domain=[('category.id', '=', Eval('asset_uomcat', -1))],
         states={
@@ -181,19 +181,6 @@ class Book(SymbolMixin, metaclass=PoolMeta):
         depends=['currency_digits', 'feature']),
         'get_yield_balance_data', searcher='search_asset_quantity')
 
-    @classmethod
-    def __setup__(cls):
-        super(Book, cls).__setup__()
-        t = cls.__table__()
-        cls._sql_indexes.update({
-            Index(
-                t,
-                (t.asset, Index.Equality())),
-            Index(
-                t,
-                (t.quantity_uom, Index.Equality())),
-            })
-
     @classmethod
     def view_attributes(cls):
         return super(Book, cls).view_attributes() + [

line.py

@@ -14,9 +14,10 @@ from trytond.i18n import gettext
 from trytond.report import Report
 from trytond.transaction import Transaction
 from trytond.modules.cashbook.line import STATES, DEPENDS
-from trytond.modules.cashbook.const import DEF_NONE
 from .mixin import SecondUomMixin
 
+DEF_NONE = None
+
 STATESQ1 = {
     'invisible': And(
         Eval('feature', '') != 'asset',

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 = []
@@ -92,7 +92,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 investment',

tests/__init__.py

@@ -1,2 +1,17 @@
 # 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 CashbookInvestmentTestCase
+
+
+__all__ = ['suite']
+
+
+def suite():
+    suite = trytond.tests.test_tryton.suite()
+    suite.addTests(unittest.TestLoader().loadTestsFromTestCase(
+        CashbookInvestmentTestCase))
+    return suite

tests/book.py

@@ -828,8 +828,7 @@ class CbInvTestCase(object):
 
             self.assertRaisesRegex(
                 UserError,
-                'A value is required for field "Asset" in ' +
-                '"Book 1 | 0.00 usd | Open | 0.0000 u" of "Cashbook".',
+                'A value is required for field "Asset" in "Cashbook".',
                 Book.write,
                 *[
                     [book],

tryton.cfg

@@ -1,5 +1,5 @@
 [tryton]
-version=7.0.0
+version=6.0.14
 depends:
     cashbook
     investment

versiondep.txt

@@ -1,2 +1,2 @@
-cashbook;7.0.32;7.0.999;mds
-investment;7.0.26;7.0.999;mds
+cashbook;6.0.33;6.0.999;mds
+investment;6.0.26;6.0.999;mds

view/book_list.xml

@@ -5,20 +5,9 @@ full copyright notices and license terms. -->
 <data>
 
     <xpath expr="/tree/field[@name='balance']" position="after">
-        <field name="current_value" symbol="currency" optional="0"/>
-        <field name="current_value_ref" symbol="company_currency" optional="1"/>
-        <field name="purchase_amount" symbol="currency" optional="1"/>
-        <field name="diff_amount" symbol="currency" optional="0"/>
-        <field name="yield_balance" symbol="currency" optional="1"/>
-        <field name="diff_percent" optional="0"/>
-        <field name="quantity" symbol="quantity_uom" optional="0"/>
-        <field name="quantity_all" symbol="quantity_uom" optional="1"/>
-        <field name="yield_sales" symbol="currency" optional="1"/>
-        <field name="yield_sales_12m" symbol="currency" optional="1"/>
-        <field name="yield_dividend_total" symbol="currency" optional="1"/>
-        <field name="yield_dividend_12m" symbol="currency" optional="1"/>
-        <field name="yield_fee_total" symbol="currency" optional="1"/>
-        <field name="yield_fee_12m" symbol="currency" optional="1"/>
+        <field name="current_value" symbol="currency"/>
+        <field name="diff_percent"/>
+        <field name="quantity" symbol="quantity_uom"/>
     </xpath>
 
 </data>

view/book_tree.xml

@@ -5,20 +5,7 @@ full copyright notices and license terms. -->
 <data>
 
     <xpath expr="/tree/field[@name='balance']" position="after">
-        <field name="current_value" symbol="currency" optional="1"/>
-        <field name="current_value_ref" symbol="company_currency" optional="1"/>
-        <field name="purchase_amount" symbol="currency" optional="1"/>
-        <field name="diff_amount" symbol="currency" optional="0"/>
-        <field name="yield_balance" symbol="currency" optional="1"/>
-        <field name="diff_percent" optional="0"/>
-        <field name="quantity" symbol="quantity_uom" optional="1"/>
-        <field name="quantity_all" symbol="quantity_uom" optional="1"/>
-        <field name="yield_sales" symbol="currency" optional="1"/>
-        <field name="yield_sales_12m" symbol="currency" optional="1"/>
-        <field name="yield_dividend_total" symbol="currency" optional="1"/>
-        <field name="yield_dividend_12m" symbol="currency" optional="1"/>
-        <field name="yield_fee_total" symbol="currency" optional="1"/>
-        <field name="yield_fee_12m" symbol="currency" optional="1"/>
+        <field name="diff_amount" symbol="currency"/>
     </xpath>
 
 </data>

view/line_list.xml

@@ -5,9 +5,9 @@ full copyright notices and license terms. -->
 <data>
 
     <xpath expr="/tree/field[@name='balance']" position="after">
-        <field name="quantity_credit" optional="0"/>
-        <field name="quantity_debit" optional="0"/>
-        <field name="quantity_balance" optional="0"/>
+        <field name="quantity_credit"/>
+        <field name="quantity_debit"/>
+        <field name="quantity_balance"/>
     </xpath>
 
 </data>

view/recon_list.xml

@@ -5,7 +5,7 @@ full copyright notices and license terms. -->
 <data>
 
     <xpath expr="/tree/field[@name='end_amount']" position="after">
-        <field name="start_quantity" optional="0"/>
-        <field name="end_quantity" optional="0"/>
+        <field name="start_quantity"/>
+        <field name="end_quantity"/>
     </xpath>
 </data>

view/split_list.xml

@@ -5,8 +5,8 @@ full copyright notices and license terms. -->
 <data>
 
     <xpath expr="/tree/field[@name='amount_2nd_currency']" position="after">
-        <field name="quantity" symbol="quantity_uom" optional="0"/>
-        <field name="quantity_2nd_uom" symbol="quantity2nd" optional="0"/>
+        <field name="quantity" symbol="quantity_uom"/>
+        <field name="quantity_2nd_uom" symbol="quantity2nd"/>
     </xpath>
 
 </data>