From f3233348009d5c207781a44c3e0dbbda9dfe26ca Mon Sep 17 00:00:00 2001
From: Frederik Jaeckel <frederik.jaeckel@m-ds.de>
Date: Wed, 23 Nov 2022 22:22:22 +0100
Subject: [PATCH] bug in updtneeded-suche, online-quellen erweitert

---
 asset.py            |  2 +-
 onlinesource.py     |  1 +
 sources_def.xml     | 29 +++++++++++++++++++++++++++++
 view/asset_form.xml |  4 +++-
 4 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/asset.py b/asset.py
index d6429e1..a6feab2 100644
--- a/asset.py
+++ b/asset.py
@@ -242,7 +242,7 @@ class Asset(ModelSQL, ModelView):
                     ),
                     clause[2]),
             )
-        return [('id', '=', query)]
+        return [('id', 'in', query)]
 
     @classmethod
     def get_identifier_sql(cls, tab_asset):
diff --git a/onlinesource.py b/onlinesource.py
index cf9a858..125cf6b 100644
--- a/onlinesource.py
+++ b/onlinesource.py
@@ -30,6 +30,7 @@ sel_rgxdatefmt = [
         ('%d.%m.%Y', 'dd.mm.yyyy'),
         ('%m/%d/%Y', 'mm/dd/yyyy'),
         ('%Y-%m-%d', 'yyyy-mm-dd'),
+        ('%b %d %Y', 'mon dd yyyy'),
     ]
 
 fields_check = ['url', 'nsin', 'isin', 'symbol', 'text', 'http_state', \
diff --git a/sources_def.xml b/sources_def.xml
index 25e148c..2ff2d1d 100644
--- a/sources_def.xml
+++ b/sources_def.xml
@@ -16,6 +16,35 @@ full copyright notices and license terms. -->
             <field name="rgxident">WKN:.* ISIN: ([A-Z,0-9]+).*</field>
             <field name="rgxidtype">isin</field>
         </record>
+        <record model="investment.source" id="web_finanzen_fonds">
+            <field name="name">www.finanzen.net - Fonds</field>
+            <field name="url">https://www.finanzen.net/fonds/${isin}/tgt</field>
+            <field name="nohtml" eval="True"/>
+            <field name="rgxdate">\n\*\*Kursdatum\*\* (\d+\.\d+\.\d+).*\n</field>
+            <field name="rgxdatefmt">%d.%m.%Y</field>
+            <field name="rgxrate">\n\*\*Kurs\*\* (\d+,\d+) EUR.*\n</field>
+            <field name="rgxdecimal">,</field>
+            <field name="rgxident">WKN:.* ISIN: ([A-Z,0-9]+).*</field>
+            <field name="rgxidtype">isin</field>
+        </record>
+        <record model="investment.source" id="web_finanzen_rohstoffe">
+            <field name="name">www.finanzen.net - Rohstoffe</field>
+            <field name="url">https://www.finanzen.net/rohstoffe/${symbol}</field>
+            <field name="nohtml" eval="True"/>
+            <field name="rgxdate">\nKurszeit  (\d+\.\d+\.\d+) \d+:\d+:\d+.*\n</field>
+            <field name="rgxdatefmt">%d.%m.%Y</field>
+            <field name="rgxrate">\nKurs  ([\d+\.]*\d+,\d+) USD\n</field>
+            <field name="rgxdecimal">,</field>
+        </record>
+        <record model="investment.source" id="web_markets_ft_com">
+            <field name="name">Financial Times UK</field>
+            <field name="url">https://markets.ft.com/data/etfs/tearsheet/summary?s=${symbol}</field>
+            <field name="nohtml" eval="True"/>
+            <field name="rgxdate">Data delayed at least 15 minutes, as of (.*) \d+:\d+ GMT\.</field>
+            <field name="rgxdatefmt">%b %d %Y</field>
+            <field name="rgxrate">Price\D+([\d,]*\d+\.\d+)</field>
+            <field name="rgxdecimal">.</field>
+        </record>
 
     </data>
 </tryton>
diff --git a/view/asset_form.xml b/view/asset_form.xml
index 2c322c7..a64c6a3 100644
--- a/view/asset_form.xml
+++ b/view/asset_form.xml
@@ -4,9 +4,11 @@ The COPYRIGHT file at the top level of this repository contains the
 full copyright notices and license terms. -->
 <form col="6">
     <label name="product" />
-    <field name="product" />
+    <field name="product" colspan="3"/>
     <label name="rate" />
     <field name="rate" symbol="currency"/>
+
+    <label id="labdate" colspan="4" string=" "/>
     <label name="date" />
     <field name="date"/>