Etikett ver 6.8.26 zum Änderungssatz c44e42da0955 hinzugefügt

README.rst

@@ -22,6 +22,14 @@ You can define the course sources yourself.
 Changes
 =======
 
+*6.8.26 - 06.12.2023*
+
+- add: columns optional
+
+*6.8.25 - 01.12.2023*
+
+- code/speed optimized
+
 *6.8.24 - 07.06.2023*
 
 - portet to Tryton 6.8

asset.py

@@ -15,6 +15,7 @@ from sql.functions import CurrentDate, CurrentTimestamp, Round, Extract
 from sql.conditionals import Case, Coalesce, NullIf
 from sql import Literal
 from .diagram import Concat2
+from .const import DEF_NONE
 
 
 digits_percent = 2
@@ -100,8 +101,8 @@ class Asset(SymbolMixin, ModelSQL, ModelView):
         string='URL',
         help='URL for data retrieval.',
         states={
-            'invisible': Eval('updturl_enable', False) == False,
+            'invisible': ~Eval('updturl_enable', False),
-            'required': Eval('updturl_enable', False) == True,
+            'required': Eval('updturl_enable', False),
         }, depends=['updturl_enable'])
     updturl_enable = fields.Function(fields.Boolean(
         string='URL required', readonly=True,
@@ -191,7 +192,7 @@ class Asset(SymbolMixin, ModelSQL, ModelView):
             query = tab_asset.select(
                     tab_asset.id,
                     tab_asset.updtsource,
-                    where=tab_asset.updtsource != None,
+                    where=tab_asset.updtsource != DEF_NONE,
                 )
             cursor.execute(*query)
             records = cursor.fetchall()
@@ -330,23 +331,24 @@ class Asset(SymbolMixin, ModelSQL, ModelView):
         """
         cursor = Transaction().connection.cursor()
 
-        (query, tab_asset) = cls.get_name_symbol_sql()
-        query.where = tab_asset.id.in_([x.id for x in assets])
-
-        cursor.execute(*query)
-        records = cursor.fetchall()
         result = {x: {y.id: None for y in assets} for x in names}
 
-        for record in records:
+        (query, tab_asset) = cls.get_name_symbol_sql()
-            values = {
+        if assets:
-                'name': record[1],
+            query.where = tab_asset.id.in_([x.id for x in assets])
-                'product_uom': record[2],
+            cursor.execute(*query)
-                'symbol': record[3],
+            records = cursor.fetchall()
-                'asset_symbol': record[0],
-                }
 
-            for name in names:
+            for record in records:
-                result[name][record[0]] = values[name]
+                values = {
+                    'name': record[1],
+                    'product_uom': record[2],
+                    'symbol': record[3],
+                    'asset_symbol': record[0],
+                    }
+
+                for name in names:
+                    result[name][record[0]] = values[name]
         return result
 
     @classmethod
@@ -384,32 +386,32 @@ class Asset(SymbolMixin, ModelSQL, ModelView):
     def get_rate_data(cls, assets, names):
         """ get date and rate of asset
         """
-        Asset2 = Pool().get('investment.asset')
-
         cursor = Transaction().connection.cursor()
-        (query, tab_asset) = cls.get_rate_data_sql()
-        query.where = tab_asset.id.in_([x.id for x in assets])
-
-        cursor.execute(*query)
-        records = cursor.fetchall()
 
         result = {x: {y.id: None for y in assets} for x in names}
 
-        for record in records:
+        if assets:
-            (id1, rate1, date1, id_rate) = record
+            (query, tab_asset) = cls.get_rate_data_sql()
+            query.where = tab_asset.id.in_([x.id for x in assets])
+            curr_digits = {x.id: x.currency_digits for x in assets}
 
-            asset = Asset2(id1)
+            cursor.execute(*query)
-            exp = Decimal(Decimal(1) / 10 ** (asset.currency_digits or 4))
+            records = cursor.fetchall()
 
-            values = {
+            for record in records:
-                'rate': record[1].quantize(exp),
+                (id1, rate1, date1, id_rate) = record
-                'date': record[2],
-                'change_symbol': id_rate,
-                }
 
-            for name in names:
+                curr_dig = curr_digits.get(id1, 4)
-                result[name][record[0]] = values[name]
+                exp = Decimal(Decimal(1) / 10 ** curr_dig)
 
+                values = {
+                    'rate': record[1].quantize(exp),
+                    'date': record[2],
+                    'change_symbol': id_rate,
+                    }
+
+                for name in names:
+                    result[name][record[0]] = values[name]
         return result
 
     @classmethod
@@ -472,8 +474,6 @@ class Asset(SymbolMixin, ModelSQL, ModelView):
         """
         pool = Pool()
         Rate = pool.get('investment.rate')
-        Asset2 = pool.get('investment.asset')
-        tab_asset = Asset2.__table__()
         tab_rate1 = Rate.__table__()
         tab_rate2 = Rate.__table__()
         context = Transaction().context
@@ -481,17 +481,14 @@ class Asset(SymbolMixin, ModelSQL, ModelView):
         query_date = context.get('qdate', CurrentDate())
         where_asset = tab_rate1.date <= query_date
         if isinstance(asset_ids, list):
-            where_asset &= tab_asset.id.in_(asset_ids)
+            where_asset &= tab_rate1.asset.in_(asset_ids)
 
-        tab_today = tab_asset.join(
+        tab_today = tab_rate1.select(
-                tab_rate1,
+                tab_rate1.asset.as_('id'),
-                condition=tab_asset.id == tab_rate1.asset,
-            ).select(
-                tab_asset.id,
                 tab_rate1.date,
                 tab_rate1.rate,
-                distinct_on=[tab_asset.id],
+                distinct_on=[tab_rate1.asset],
-                order_by=[tab_asset.id, tab_rate1.date.desc],
+                order_by=[tab_rate1.asset, tab_rate1.date.desc],
                 where=where_asset,
             )
 
@@ -612,23 +609,24 @@ class Asset(SymbolMixin, ModelSQL, ModelView):
         exp = Decimal(Decimal(1) / 10 ** digits_percent)
         asset_id_lst = [x.id for x in assets]
 
-        for x in names:
+        if asset_id_lst and names:
-            tab_percent = cls.get_percentage_sql(
+            for x in names:
-                days={
+                tab_percent = cls.get_percentage_sql(
-                    'change_day1': 0,
+                    days={
-                    'change_month1': 30,
+                        'change_day1': 0,
-                    'change_month3': 90,
+                        'change_month1': 30,
-                    'change_month6': 180,
+                        'change_month3': 90,
-                    'change_month12': 365,
+                        'change_month6': 180,
-                    }[x],
+                        'change_month12': 365,
-                asset_ids=asset_id_lst,
+                        }[x],
-                )
+                    asset_ids=asset_id_lst,
-            cursor.execute(*tab_percent)
+                    )
-            records = cursor.fetchall()
+                cursor.execute(*tab_percent)
+                records = cursor.fetchall()
 
-            for record in records:
+                for record in records:
-                result[x][record[0]] = record[3].quantize(exp) \
+                    result[x][record[0]] = record[3].quantize(exp) \
-                        if record[3] is not None else None
+                            if record[3] is not None else None
         return result
 
     @classmethod
@@ -841,7 +839,7 @@ class Asset(SymbolMixin, ModelSQL, ModelView):
             ).select(
                 tab_asset.id,
                 where=Operator(field_qu, clause[2]) &
-                (field_qu != None),
+                (field_qu != DEF_NONE),
             )
 
         return [('id', 'in', query)]
@@ -856,20 +854,19 @@ class Asset(SymbolMixin, ModelSQL, ModelView):
         cursor = Transaction().connection.cursor()
 
         result = {x: {y.id: None for y in assets} for x in names}
+        if assets:
+            query = cls.get_identifier_sql(tab_asset)
+            query.where = tab_asset.id.in_([x.id for x in assets])
 
-        query = cls.get_identifier_sql(tab_asset)
+            cursor.execute(*query)
-        query.where = tab_asset.id.in_([x.id for x in assets])
+            l1 = cursor.fetchall()
 
-        cursor.execute(*query)
+            for x in l1:
-        l1 = cursor.fetchall()
+                (id1, wkn, secsymb, isin) = x
-
+                r1 = {'wkn': wkn, 'secsymb': secsymb, 'isin': isin}
-        for x in l1:
-            (id1, wkn, secsymb, isin) = x
-            r1 = {'wkn': wkn, 'secsymb': secsymb, 'isin': isin}
-
-            for n in names:
-                result[n][id1] = r1[n]
 
+                for n in names:
+                    result[n][id1] = r1[n]
         return result
 
     def get_rec_name(self, name):

const.py

@@ -0,0 +1,8 @@
+# -*- 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.
+
+
+DEF_TRUE = True
+DEF_NONE = None

diagram.py

@@ -60,16 +60,16 @@ class GraphDef(metaclass=PoolMeta):
             return None
 
         if self.scaling == 'alldata':
-            query = [('asset.id', '=', self.asset.id)]
+            query = [('asset', '=', self.asset.id)]
         elif self.scaling == 'view':
             query = [
-                ('asset.id', '=', self.asset.id),
+                ('asset', '=', self.asset.id),
                 ('date', '>=', self.chart.used_start_date()),
                 ('date', '<=', self.chart.used_end_date()),
                 ]
         elif self.scaling == 'six':
             query = [
-                ('asset.id', '=', self.asset.id),
+                ('asset', '=', self.asset.id),
                 ('date', '>=', self.chart.used_start_date() -
                     timedelta(days=180)),
                 ('date', '<=', self.chart.used_end_date()),
@@ -104,12 +104,12 @@ class ChartPoint(metaclass=PoolMeta):
 
             before = Rate.search([
                 ('date', '<', query_date),
-                ('asset.id', '=', asset_id),
+                ('asset', '=', asset_id),
                 ], limit=1, order=[('date', 'DESC')])
 
             after = Rate.search([
                 ('date', '>', query_date),
-                ('asset.id', '=', asset_id),
+                ('asset', '=', asset_id),
                 ], limit=1, order=[('date', 'ASC')])
 
             if (len(before) == 1) and (len(after) == 1):

import_wiz.py

@@ -173,7 +173,8 @@ class ImportWizard(Wizard):
                         datefmt='dd%sdd' % dec_divider,
                         colnr='2'))
 
-                if isinstance(date_val, date) and isinstance(rate_val, Decimal):
+                if isinstance(date_val, date) and isinstance(
+                        rate_val, Decimal):
                     result.append({'date': date_val, 'rate': rate_val})
 
                     # date range

onlinesource.py

@@ -86,7 +86,8 @@ class OnlineSource(ModelSQL, ModelView):
         states=STATES_WEB, depends=DEPENDS_WEB)
     rgxdecimal = fields.Selection(
         string='Decimal Separator',
-        help='Decimal separator for converting the market value into a number.',
+        help='Decimal separator for converting the market ' +
+        'value into a number.',
         selection=sel_rgxdecimal, states=STATES_WEB, depends=DEPENDS_WEB)
     rgxident = fields.Char(
         string='Identifier',

rate.py

@@ -53,6 +53,13 @@ class Rate(SymbolMixin, ModelSQL, ModelView):
             Index(
                 t,
                 (t.rate, Index.Range())),
+            Index(
+                t,
+                (t.asset, Index.Equality())),
+            Index(
+                t,
+                (t.asset, Index.Equality()),
+                (t.date, Index.Range(order='DESC'))),
             })
 
     @classmethod

tryton.cfg

@@ -1,5 +1,5 @@
 [tryton]
-version=6.8.24
+version=6.8.26
 depends:
     ir
     res
@@ -21,3 +21,4 @@ xml:
     import_wiz.xml
     menu.xml
     cron.xml
+

view/asset_list.xml

@@ -4,12 +4,12 @@ The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
 <tree>
     <field name="name" expand="1"/>
-    <field name="change_day1" symbol="change_symbol"/>
+    <field name="change_day1" optional="0"/>
-    <field name="change_month1" symbol="change_symbol"/>
+    <field name="change_month1" optional="0"/>
-    <field name="change_month3" symbol="change_symbol"/>
+    <field name="change_month3" optional="0"/>
-    <field name="change_month6" symbol="change_symbol"/>
+    <field name="change_month6" optional="0"/>
-    <field name="date"/>
+    <field name="date" optional="0"/>
-    <field name="rate" symbol="asset_symbol"/>
+    <field name="rate" symbol="asset_symbol" optional="0"/>
-    <field name="isin"/>
+    <field name="isin" optional="0"/>
-    <field name="wkn" />
+    <field name="wkn" optional="0"/>
 </tree>