Skip to content
Snippets Groups Projects
Commit 4f9a08ea authored by Johannes Goderbauer's avatar Johannes Goderbauer
Browse files

Merge branch '2020.1.0' into 2020.1

parents 2640b4bc 715dd51a
No related branches found
No related tags found
No related merge requests found
Showing
with 285 additions and 184 deletions
...@@ -63,29 +63,30 @@ ...@@ -63,29 +63,30 @@
<column name="ZIP" value="80807"/> <column name="ZIP" value="80807"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Eichenallee"/> <column name="ADDRESS" value="Freiberger Str."/>
<column name="ADDRESSID" value="1a20347c-ab56-41cb-a7dc-bd61de7e2106"/> <column name="ADDRESSID" value="1a20347c-ab56-41cb-a7dc-bd61de7e2106"/>
<column name="ADDR_TYPE" value="OFFICEADDR"/> <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="45"/> <column name="BUILDINGNO" value="45"/>
<column name="CITY" value="München"/> <column name="CITY" value="Dresden"/>
<column name="CONTACT_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/> <column name="CONTACT_ID" value="5a52304e-65e8-40ed-9aca-a76af6c8c3a0"/>
<column name="COUNTRY" value="DE"/> <column name="COUNTRY" value="DE"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:46:28"/> <column name="DATE_NEW" valueDate="2019-05-17T09:46:28"/>
<column name="PROVINCE" value="Bayern"/> <column name="PROVINCE" value="Bayern"/>
<column name="USER_NEW" value="Admin"/> <column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="80228"/> <column name="ZIP" value="01159"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Dotterblumenstrasse"/> <column name="ADDRESS" value="Regensburger Straße"/>
<column name="ADDRESSID" value="25360df5-104e-4903-8440-f848d025a24b"/> <column name="ADDRESSID" value="25360df5-104e-4903-8440-f848d025a24b"/>
<column name="ADDR_TYPE" value="OFFICEADDR"/> <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="45"/>
<column name="CITY" value="Ingolstadt"/> <column name="CITY" value="Ingolstadt"/>
<column name="CONTACT_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/> <column name="CONTACT_ID" value="e450d126-eab8-4517-ba7c-8b6804f8c859"/>
<column name="COUNTRY" value="DE"/> <column name="COUNTRY" value="DE"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:49:41"/> <column name="DATE_NEW" valueDate="2019-05-17T09:49:41"/>
<column name="PROVINCE" value="Bayern"/> <column name="PROVINCE" value="Bayern"/>
<column name="USER_NEW" value="Admin"/> <column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="85051"/> <column name="ZIP" value="85055"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Hildburghausen"/> <column name="ADDRESS" value="Hildburghausen"/>
...@@ -103,7 +104,7 @@ ...@@ -103,7 +104,7 @@
<column name="ZIP" value="84034"/> <column name="ZIP" value="84034"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Grassstraße"/> <column name="ADDRESS" value="Landshuter Str."/>
<column name="ADDRESSID" value="2a03d8cb-ffb7-4d04-b8b2-e55354380fb7"/> <column name="ADDRESSID" value="2a03d8cb-ffb7-4d04-b8b2-e55354380fb7"/>
<column name="ADDR_TYPE" value="OFFICEADDR"/> <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="32"/> <column name="BUILDINGNO" value="32"/>
...@@ -111,12 +112,12 @@ ...@@ -111,12 +112,12 @@
<column name="CONTACT_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/> <column name="CONTACT_ID" value="cabf6192-f9c3-4bd4-9366-ad2b073bdfa3"/>
<column name="COUNTRY" value="DE"/> <column name="COUNTRY" value="DE"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:42:01"/> <column name="DATE_NEW" valueDate="2019-05-17T09:42:01"/>
<column name="PROVINCE" value="Deutschland"/> <column name="PROVINCE" value="Bayern"/>
<column name="USER_NEW" value="Admin"/> <column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="84144"/> <column name="ZIP" value="84144"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Baustraße"/> <column name="ADDRESS" value="Bolzstraße"/>
<column name="ADDRESSID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/> <column name="ADDRESSID" value="35e93f95-d723-46d6-955f-9192e41e3d83"/>
<column name="ADDR_TYPE" value="OFFICEADDR"/> <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="64"/> <column name="BUILDINGNO" value="64"/>
...@@ -129,7 +130,7 @@ ...@@ -129,7 +130,7 @@
<column name="ZIP" value="70173"/> <column name="ZIP" value="70173"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Leasingstrasse"/> <column name="ADDRESS" value="Torstraße"/>
<column name="ADDRESSID" value="36723051-8a5f-47d3-8185-71c82d463eb3"/> <column name="ADDRESSID" value="36723051-8a5f-47d3-8185-71c82d463eb3"/>
<column name="ADDR_TYPE" value="OFFICEADDR"/> <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="78"/> <column name="BUILDINGNO" value="78"/>
...@@ -139,7 +140,7 @@ ...@@ -139,7 +140,7 @@
<column name="DATE_NEW" valueDate="2019-05-17T09:44:21"/> <column name="DATE_NEW" valueDate="2019-05-17T09:44:21"/>
<column name="PROVINCE" value="Deutschland"/> <column name="PROVINCE" value="Deutschland"/>
<column name="USER_NEW" value="Admin"/> <column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="10409"/> <column name="ZIP" value="10115"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Neustadt"/> <column name="ADDRESS" value="Neustadt"/>
...@@ -157,17 +158,17 @@ ...@@ -157,17 +158,17 @@
<column name="ZIP" value="84034"/> <column name="ZIP" value="84034"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Stahlstraße"/> <column name="ADDRESS" value="Königstraße"/>
<column name="ADDRESSID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/> <column name="ADDRESSID" value="4eb7039a-1515-4545-86b4-85426a67fcd5"/>
<column name="ADDR_TYPE" value="OFFICEADDR"/> <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="24"/> <column name="BUILDINGNO" value="4"/>
<column name="CITY" value="Hamburg"/> <column name="CITY" value="Hamburg"/>
<column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/> <column name="CONTACT_ID" value="dec94545-2487-46d5-978d-26ee0fcf0f5f"/>
<column name="COUNTRY" value="DE"/> <column name="COUNTRY" value="DE"/>
<column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/> <column name="DATE_NEW" valueDate="2019-05-15T03:21:35"/>
<column name="PROVINCE" value="Deutschland"/> <column name="PROVINCE" value="Hamburg"/>
<column name="USER_NEW" value="Admin"/> <column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="20095"/> <column name="ZIP" value="22767 "/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Büsingstrasse"/> <column name="ADDRESS" value="Büsingstrasse"/>
...@@ -184,22 +185,22 @@ ...@@ -184,22 +185,22 @@
<column name="ZIP" value="85230"/> <column name="ZIP" value="85230"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Muster-Straße"/> <column name="ADDRESS" value="Sandstraße"/>
<column name="ADDRESSID" value="6a3f6232-7a66-4a72-8d2d-66a3a9f1b9ea"/> <column name="ADDRESSID" value="6a3f6232-7a66-4a72-8d2d-66a3a9f1b9ea"/>
<column name="ADDRIDENTIFIER" value="Tor 1"/> <column name="ADDRIDENTIFIER" value="Tor 1"/>
<column name="ADDR_TYPE" value="OFFICEADDR"/> <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="3"/> <column name="BUILDINGNO" value="3"/>
<column name="CITY" value="München"/> <column name="CITY" value="Nürnberg"/>
<column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/> <column name="CONTACT_ID" value="e6da1393-f46b-41a4-826b-2c7d22de2246"/>
<column name="COUNTRY" value="DE"/> <column name="COUNTRY" value="DE"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/> <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
<column name="DISTRICT" value="Oberbayern"/> <column name="DISTRICT" value="Oberbayern"/>
<column name="PROVINCE" value="Bayern"/> <column name="PROVINCE" value="Bayern"/>
<column name="USER_NEW" value="Admin"/> <column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="80807"/> <column name="ZIP" value="90443"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Hafenstraße"/> <column name="ADDRESS" value="Friedrichshafen"/>
<column name="ADDRESSID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/> <column name="ADDRESSID" value="7d116e5e-0c6b-475b-91e7-7cae94b65321"/>
<column name="ADDR_TYPE" value="OFFICEADDR"/> <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="12"/> <column name="BUILDINGNO" value="12"/>
...@@ -209,7 +210,7 @@ ...@@ -209,7 +210,7 @@
<column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/> <column name="DATE_NEW" valueDate="2019-05-15T03:28:49"/>
<column name="PROVINCE" value="Deutschland"/> <column name="PROVINCE" value="Deutschland"/>
<column name="USER_NEW" value="Admin"/> <column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="88045"/> <column name="ZIP" value="88046"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Grosse Praesidenten Str."/> <column name="ADDRESS" value="Grosse Praesidenten Str."/>
...@@ -253,17 +254,17 @@ ...@@ -253,17 +254,17 @@
<column name="ZIP" value="18074"/> <column name="ZIP" value="18074"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Kronenstraße"/> <column name="ADDRESS" value="Fliederstraße"/>
<column name="ADDRESSID" value="8923fff3-4294-4892-b3f3-8470ae89555e"/> <column name="ADDRESSID" value="8923fff3-4294-4892-b3f3-8470ae89555e"/>
<column name="ADDR_TYPE" value="OFFICEADDR"/> <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="45"/> <column name="BUILDINGNO" value="4"/>
<column name="CITY" value="Landshut"/> <column name="CITY" value="Leonberg"/>
<column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/> <column name="CONTACT_ID" value="a3fd3c23-12e1-4820-b76e-2cd70103d94d"/>
<column name="COUNTRY" value="DE"/> <column name="COUNTRY" value="DE"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:40:30"/> <column name="DATE_NEW" valueDate="2019-05-17T09:40:30"/>
<column name="PROVINCE" value="Deutschland"/> <column name="PROVINCE" value="Baden-Württemberg"/>
<column name="USER_NEW" value="Admin"/> <column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="84028"/> <column name="ZIP" value="71229"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Hauptstraße"/> <column name="ADDRESS" value="Hauptstraße"/>
...@@ -308,19 +309,19 @@ ...@@ -308,19 +309,19 @@
<column name="ZIP" value="80456"/> <column name="ZIP" value="80456"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Rudower Strasse"/> <column name="ADDRESS" value="Oeder Weg"/>
<column name="ADDRESSID" value="90726b19-f23c-42dd-847a-7eacf4c71d18"/> <column name="ADDRESSID" value="90726b19-f23c-42dd-847a-7eacf4c71d18"/>
<column name="ADDRIDENTIFIER" value="Tor 1"/> <column name="ADDRIDENTIFIER" value="Tor 1"/>
<column name="ADDR_TYPE" value="OFFICEADDR"/> <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="6"/> <column name="BUILDINGNO" value="6"/>
<column name="CITY" value="München"/> <column name="CITY" value="Frankfurt am Main"/>
<column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/> <column name="CONTACT_ID" value="fd082db5-be43-4219-a705-588f9c06e59b"/>
<column name="COUNTRY" value="DE"/> <column name="COUNTRY" value="DE"/>
<column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/> <column name="DATE_NEW" valueDate="2019-05-13T01:16:38"/>
<column name="DISTRICT" value="Oberbayern"/> <column name="DISTRICT" value="Oberbayern"/>
<column name="PROVINCE" value="Bayern"/> <column name="PROVINCE" value="Bayern"/>
<column name="USER_NEW" value="Admin"/> <column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="54595"/> <column name="ZIP" value="60318"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Hildburghausen"/> <column name="ADDRESS" value="Hildburghausen"/>
...@@ -378,7 +379,7 @@ ...@@ -378,7 +379,7 @@
<column name="ZIP" value="84034"/> <column name="ZIP" value="84034"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Großstraße"/> <column name="ADDRESS" value="Am Alten Viehmarkt"/>
<column name="ADDRESSID" value="da05619e-47c6-4144-a698-f0f830d9f755"/> <column name="ADDRESSID" value="da05619e-47c6-4144-a698-f0f830d9f755"/>
<column name="ADDR_TYPE" value="DELIVERADDR"/> <column name="ADDR_TYPE" value="DELIVERADDR"/>
<column name="BUILDINGNO" value="6"/> <column name="BUILDINGNO" value="6"/>
...@@ -391,7 +392,7 @@ ...@@ -391,7 +392,7 @@
<column name="ZIP" value="84028"/> <column name="ZIP" value="84028"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Lagerstraße"/> <column name="ADDRESS" value="Karlstraße"/>
<column name="ADDRESSID" value="dd1a1831-b05a-41a7-a4e9-d73be9d77934"/> <column name="ADDRESSID" value="dd1a1831-b05a-41a7-a4e9-d73be9d77934"/>
<column name="ADDR_TYPE" value="OFFICEADDR"/> <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="2"/> <column name="BUILDINGNO" value="2"/>
...@@ -417,32 +418,32 @@ ...@@ -417,32 +418,32 @@
<column name="ZIP" value="28103"/> <column name="ZIP" value="28103"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Birkenstrasse"/> <column name="ADDRESS" value="Julius-Leber-Straße"/>
<column name="ADDRESSID" value="e1aef1b7-569b-46be-bc50-f02332a42ef1"/> <column name="ADDRESSID" value="e1aef1b7-569b-46be-bc50-f02332a42ef1"/>
<column name="ADDR_TYPE" value="OFFICEADDR"/> <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="78"/> <column name="BUILDINGNO" value="5"/>
<column name="CITY" value="Augsburg"/> <column name="CITY" value="Hamburg"/>
<column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/> <column name="CONTACT_ID" value="019651a4-503e-4e06-aefd-e7e631bf3144"/>
<column name="COUNTRY" value="DE"/> <column name="COUNTRY" value="DE"/>
<column name="DATE_NEW" valueDate="2019-05-17T09:50:42"/> <column name="DATE_NEW" valueDate="2019-05-17T09:50:42"/>
<column name="PROVINCE" value="Bayern"/> <column name="PROVINCE" value="Hamburg"/>
<column name="USER_NEW" value="Admin"/> <column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="86130"/> <column name="ZIP" value="22765"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Grabweg"/> <column name="ADDRESS" value="Blumenstraße"/>
<column name="ADDRESSID" value="ea50cb02-7d4d-433d-9cd3-c262d5a0bb27"/> <column name="ADDRESSID" value="ea50cb02-7d4d-433d-9cd3-c262d5a0bb27"/>
<column name="ADDR_TYPE" value="OFFICEADDR"/> <column name="ADDR_TYPE" value="OFFICEADDR"/>
<column name="BUILDINGNO" value="17a"/> <column name="BUILDINGNO" value="11"/>
<column name="CITY" value="Neumünster"/> <column name="CITY" value="Regensburg"/>
<column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/> <column name="CONTACT_ID" value="449080f6-b714-4189-a261-37439d0d4010"/>
<column name="COUNTRY" value="DE"/> <column name="COUNTRY" value="DE"/>
<column name="DATE_EDIT" valueDate="2019-06-07T02:49:33"/> <column name="DATE_EDIT" valueDate="2019-06-07T02:49:33"/>
<column name="DATE_NEW" valueDate="2019-05-17T10:04:16"/> <column name="DATE_NEW" valueDate="2019-05-17T10:04:16"/>
<column name="PROVINCE" value="Deutschland"/> <column name="PROVINCE" value="Bayern"/>
<column name="USER_EDIT" value="Admin"/> <column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/> <column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="24534"/> <column name="ZIP" value="93055"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Spresstrasse"/> <column name="ADDRESS" value="Spresstrasse"/>
...@@ -459,7 +460,7 @@ ...@@ -459,7 +460,7 @@
<column name="ZIP" value="33739"/> <column name="ZIP" value="33739"/>
</insert> </insert>
<insert tableName="address"> <insert tableName="address">
<column name="ADDRESS" value="Lützowplatz"/> <column name="ADDRESS" value="Gotthardstraße"/>
<column name="ADDRESSID" value="f54606ee-ecdd-4859-ad7d-aa096c5e9596"/> <column name="ADDRESSID" value="f54606ee-ecdd-4859-ad7d-aa096c5e9596"/>
<column name="ADDRIDENTIFIER" value="Tor 4"/> <column name="ADDRIDENTIFIER" value="Tor 4"/>
<column name="ADDR_TYPE" value="OFFICEADDR"/> <column name="ADDR_TYPE" value="OFFICEADDR"/>
...@@ -473,7 +474,7 @@ ...@@ -473,7 +474,7 @@
<column name="PROVINCE" value="Bayern"/> <column name="PROVINCE" value="Bayern"/>
<column name="USER_EDIT" value="Admin"/> <column name="USER_EDIT" value="Admin"/>
<column name="USER_NEW" value="Admin"/> <column name="USER_NEW" value="Admin"/>
<column name="ZIP" value="80807"/> <column name="ZIP" value="80689"/>
</insert> </insert>
</changeSet> </changeSet>
</databaseChangeLog> </databaseChangeLog>
\ No newline at end of file
FCC: imap://daniel.tran%40mailbox.org@imap.mailbox.org/Sent
X-Identity-Key: id1 X-Identity-Key: id1
X-Account-Key: account1 X-Account-Key: account1
To: test@test.de
From: Daniel Tran <daniel.tran@mailbox.org>
Subject: Angebotsanfrage Subject: Angebotsanfrage
Message-ID: <7a91719a-d935-2527-39b9-af1bd6f2279d@mailbox.org> From: Johannes Goderbauer <j.goderbauer@adito.de>
Date: Mon, 23 Mar 2020 15:32:05 +0100 Message-ID: <c23553b0-50b9-baf7-00e4-ff7e1170e6cd@adito.de>
Date: Tue, 26 May 2020 10:47:18 +0200
X-Mozilla-Draft-Info: internal/draft; vcard=0; receipt=0; DSN=0; uuencode=0; X-Mozilla-Draft-Info: internal/draft; vcard=0; receipt=0; DSN=0; uuencode=0;
attachmentreminder=0; deliveryformat=4 attachmentreminder=0; deliveryformat=4
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101
Thunderbird/68.4.1 Thunderbird/68.2.2
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: multipart/related; Content-Type: multipart/mixed;
boundary="------------00BB79588E3CE6482B5F269C" boundary="----=_Part_6533_1502248680.1571231060707"
Content-Language: de-DE
This is a multi-part message in MIME format. ------=_Part_6533_1502248680.1571231060707
--------------00BB79588E3CE6482B5F269C Content-Type: multipart/alternative;
Content-Type: text/html; charset=utf-8 boundary="----=_Part_6534_297348878.1571231060707"
Content-Transfer-Encoding: 8bit
------=_Part_6534_297348878.1571231060707
Content-Type: multipart/related;
boundary="----=_Part_6535_946016905.1571231060707"
------=_Part_6535_946016905.1571231060707
Content-Type: text/html; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
<html> <html>
<head> <head>
...@@ -29,113 +34,151 @@ Content-Transfer-Encoding: 8bit ...@@ -29,113 +34,151 @@ Content-Transfer-Encoding: 8bit
<div dir="ltr" style="font-size:12pt; color:#000000; <div dir="ltr" style="font-size:12pt; color:#000000;
background-color:#FFFFFF; background-color:#FFFFFF;
font-family:Calibri,Arial,Helvetica,sans-serif"> font-family:Calibri,Arial,Helvetica,sans-serif">
<p>{@letterSalutation@}</p> {@letterSalutation@},
besten Dank für Ihre Anfrage.<br> <p/>
Im Folgenden bieten wir Ihnen gerne die gewünschten besten Dank f=C3=BCr Ihre Anfrage.<br>
Im Folgenden bieten wir Ihnen gerne die gew=C3=BCnschten
Produkte/Dienstleistungen an.<br> Produkte/Dienstleistungen an.<br>
Wir freuen uns auf Ihre Bestätigung des Angebots und stehen Ihnen Wir freuen uns auf Ihre Best=C3=A4tigung des Angebots und stehen Ihnen
bei Rückfragen gerne zur Verfügung. bei R=C3=BCckfragen gerne zur Verf=C3=BCgung.
<p>Mit freundlichen Grüßen</p> <br/>
<div>{@senderName@}</div> <br>Mit freundlichen Gr=C3=BC=C3=9Fen=20
<div><br> <br>{@senderName@}
{@senderFullAddress@}</div> <br/><br/>
<div><br> <p>
FON: {@senderPhone@}</div> <b>{@senderOrgname@}</b>
<div>E-Mail: {@senderEmail@}</div> <br/>{@senderFullAddress@}
<div>Web: <span lang="EN-US"><a href="https://www.adito.de" <br/>
target="_blank"><span lang="DE">www.adito.de</span></a></span> <br/>FON: {@senderPhone@}
<br> <br/>E-Mail: {@senderEmail@}
</div> <br/>Web:&nbsp;<a href=3D"https://www.meineFirma.de">www.meineFirma.de</a>
</p>
<div><span lang="EN-US"><a <br/><br/>
href="https://www.adito.de/?utm_source=signatur_startseite_logo" <a href=3D"https://www.adito.de/?utm_source=3Dsignatur_startseite_logo">
target="_blank"><span style="color:windowtext; <img border=3D0 width=3D206 height=3D81 style=3D'width:2.1458in;height:.843=
text-decoration:none" lang="DE"><img 7in' id=3D"Grafik_x0020_1" src=3D"cid:image001.png@01D5842B.05639490">
src="cid:part2.55E5AA4F.D41229A8@mailbox.org" </a>
id="Bild_x0020_1" class="ms-rte-paste-setimagesize" <br/><br/>
style="width:2.0833in; height:.5in" width="200" <p>{@senderOrgname@}| Gesch=C3=A4ftsf=C3=BChrer: Harold Smith
height="48" border="0"></span><span lang="DE"><br> <br>Amtsgericht Landshut HRB 182038
</span></a></span><br> <br>
ADITO Software GmbH | Geschäftsführer: Heinz Boesl, Johannes <br>
Boesl, Tobias Mirwald<br>
Registergericht AG Landshut HRB 2403 | Ust-IdNr. DE 128946565 <br> </span>
<br>
<span lang="EN-US"><a <a href=3D"https://www.adito.de/knowhow/blog/?utm_source=3Dsignatur_blog" t=
href="https://www.adito.de/knowhow/blog/?utm_source=signatur_blog" arget=3D"_blank">
target="_blank"><span lang="DE">CRM Blog</span></a></span> |
<span lang="EN-US"><a <span lang=3DDE style=3D'color:blue'>CRM Blog
href="https://www.adito.de/crm-akademie/webinar.html?utm_source=signatur_webinare"
target="_blank"><span lang="DE">Webinare</span></a></span> | </span>
<span lang="EN-US"><a
href="https://www.adito.de/crm-anbieter/crm-messen-veranstaltungen.html?utm_source=signatur_events" </a>
target="_blank"><span lang="DE">Events</span></a> </span></div>
<div><span style="color:white">@@SPNR</span></div> <span lang=3DDE> |=20
<p><br>
</span>
<a href=3D"https://www.adito.de/crm-akademie/webinar.html?utm_source=3Dsign=
atur_webinare" target=3D"_blank">
<span lang=3DDE style=3D'color:blue'>Webinare
</span>
</a>
<span lang=3DDE> |=20</span>
<a href=3D"https://www.adito.de/crm-anbieter/crm-messen-veranstaltungen.htm=
l?utm_source=3Dsignatur_events" target=3D"_blank">
<span lang=3DDE style=3D'color:blue'>Events
</span>
</a>=20
</p> </p>
</div>
</body> </body>
</html>
--------------00BB79588E3CE6482B5F269C </html>
Content-Type: image/png; ------=_Part_6535_946016905.1571231060707
name="elploafdhcnceakm.png" Content-Type: image/png; name=image001.png
Content-Transfer-Encoding: base64 Content-Transfer-Encoding: base64
Content-ID: <part2.55E5AA4F.D41229A8@mailbox.org> Content-Disposition: inline; filename=image001.png
Content-Disposition: inline; Content-ID: <image001.png@01D5842B.05639490>
filename="elploafdhcnceakm.png"
iVBORw0KGgoAAAANSUhEUgAAAM4AAABRCAYAAACaL5lSAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJ
iVBORw0KGgoAAAANSUhEUgAAAMgAAAAwCAYAAABUmTXqAAAK/klEQVR4nO2de2wcxR3Hh4ZH bWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdp
S4CQECtg381viGibCCiUpLSIAGlwExzw+eY3gVIeKhQqCJQQEAWKqgYq0QeoUNJSexdCRapC bj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6
cXkUmdh7COSGhDo8pCqt0qa1jjh3O8MjBAItEJLA9Q/n3LOzs7uz57tLYD7ST/5nd36Pme/O eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0
7uzOmZDq2Y84uTxxvXdHmZP72zi0bbHs43T1thM3VwqwtxsdmsXSeFzvEY1AXml0aBZLY1ne MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJo
20Tc3AdWIBZLEE7fEo04SpNczwrE8inHya3TCcTOIJZPN519LEQcJXLfaisQy6cYJ3dzqEAe dHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlw
GPg3IYQUyYLb1HTxkmL4wh4G4iUFor+fzN2/0elYLOOL420IFcj9f9lICCE+aXtWMVEKMx/w dGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAv
h41Ox2IZP+59amaoONxcidw/8C9CCJFk4UNRAlGAOwdJ20GNTstiGR8c7/ZxFYidRSyfKFxv IiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RS
aLwFopjY0U3IhEanZrFUR2fvqZHiSCaQkmT480anZ7FUh5v7Y60Eopgoqeb2qY1O0WJJhuMc ZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpD
QJzc+zUVCBWdjU7TYklGV++iWOKoEIhP2v5gJBAmSn4LP6LRqVos5ri5VbEFsmJdWSC9avoi cmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNl
I4FIECsanarFYsadKycS19sVXyBr84QQ4pOzl6pmNBKIYqKUn9w6qdEpWyzx6eq7LLY43FyJ SUQ9InhtcC5paWQ6MDA4QzAyM0IwREIwMTFFNEFGMDREM0VEMjExRjlBRTIiIHhtcE1NOkRvY3Vt
3N+/qXyqJJn/mgpEgniokelaLGa4Xr+RQNynXy+fWiTn3GgqEMVEqZjKHNPIlC2WeNzlTTET ZW50SUQ9InhtcC5kaWQ6MDA4QzAyM0MwREIwMTFFNEFGMDREM0VEMjExRjlBRTIiPiA8eG1wTU06
R65EHO/FyiYUiFcTzCI9jUrZYomPm7vBWCBdT19U2YRP8Qo7i1g+mcT5tGSUebvIvd2HjG1G RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMDhDMDIzOTBEQjAxMUU0QUYw
gthqPIsw8adGpGyxxMPxTjKePVwv8NYo6SwyBHxmvdO2WOLheHcbC6Sz7xJdc4qJbcYiAXyq NEQzRUQyMTFGOUFFMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowMDhDMDIzQTBEQjAxMUU0
jhlbLAY4njK+vVree5iuOUnxmiSziKR4aj3Ttliiifvl7mhbFdWsAlTms4h4qR4p6/CBz/Np QUYwNEQzRUQyMTFGOUFFMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1w
9swoM223mFowJU67UVZI4+kq3XGaonyOAjxpE8uyqny3YKoi91PGI8YwU83tdGx8g1PaDiuk bWV0YT4gPD94cGFja2V0IGVuZD0iciI/PhF3nYoAAAlvSURBVHja7J1fjBXVHcfPJQJRoe1urQYJ
M7OLwFEx/IEPeLti6EjABxTgSgn4uALxWKVJwCck4MMS8AEJwpXA75AUlyngFyrK51TmFcQQ RBYlMUJisqwvGNjY3WgEUtN2CeWBIGb3Ju6LElsW+gA8AHe1UfuwTcBASB/Q7CZNG0tjw2pWU15k
tB89BO1HF9L8uOjtF67nmq9eeWdFdYwCvCDJLOIDPyWq7VqgAC+PHSPl3zZpuwhiYZJaxLyo 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
AElFTkSuQmCC rdnTuSNcPqRBDEISLRyjDfWSKUdzMCV6o+edQagcF2hPmOzf4UAyJByn8R405bsMMCU6ZneO+8bQ
--------------00BB79588E3CE6482B5F269C-- f5nyfXSnzdznawhJhXAcxtQQL8fszpioNurnefCMEB53wJ3bvDpOMiEch7NqGHNgotpOU54+MOw7
DPCOgHMqSjyEdpmHjmRROA6X1YZ07IPpAzETGqJwmJ8GU21g1gAnpI1QMt6wiZcF4r1niJLhbTQf
cfxCkkQuyFwghJDZLOAuIITCIYTCIYTCIYTCIYTCIYRQOIRQOIRQOIRQOIRQOISQWvi/AAMA9Ucz
DEaG0p8AAAAASUVORK5CYII=
------=_Part_6535_946016905.1571231060707--
------=_Part_6534_297348878.1571231060707
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
herzlichen Dank f=C3=BCr Ihre Anfrage und Ihr Interesse an unserem Produkt.=
Gerne sende ich Ihnen schon einmal die wichtigsten Informationen zu:
------=_Part_6534_297348878.1571231060707--
------=_Part_6533_1502248680.1571231060707--
...@@ -87,6 +87,12 @@ ...@@ -87,6 +87,12 @@
<fieldName>Activities</fieldName> <fieldName>Activities</fieldName>
<isConsumer v="false" /> <isConsumer v="false" />
</entityDependency> </entityDependency>
<entityDependency>
<name>262fe53d-7358-40ff-8641-e08add14528a</name>
<entityName>Object_entity</entityName>
<fieldName>Activities</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies> </dependencies>
</entityProvider> </entityProvider>
<entityField> <entityField>
......
import("system.vars");
import("system.neon"); import("system.neon");
neon.setFieldValue("$field.AddressSearch", ""); //in some cases, the field does not exist yet/not anymore when the afterOperatingState process is called
\ No newline at end of file if (vars.exists("$field.AddressSearch"))
neon.setFieldValue("$field.AddressSearch", "");//why is this needed?
\ No newline at end of file
...@@ -8,7 +8,7 @@ import("system.result"); ...@@ -8,7 +8,7 @@ import("system.result");
*/ */
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param")) if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
{ {
var event = JSON.parse(vars.getString("$param.Entry_param")); let event = JSON.parse(vars.getString("$param.Entry_param"));
if(vars.get("$this.value")) if(vars.get("$this.value"))
result.string(vars.get("$this.value")); result.string(vars.get("$this.value"));
...@@ -21,6 +21,6 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para ...@@ -21,6 +21,6 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para
*/ */
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param")) if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
{ {
var event = JSON.parse(vars.getString("$param.Entry_param")); let event = JSON.parse(vars.getString("$param.Entry_param"));
result.string(event[calendars.DTSTART]); result.string(event[calendars.DTSTART]);
} }
\ No newline at end of file
...@@ -8,7 +8,7 @@ import("system.result"); ...@@ -8,7 +8,7 @@ import("system.result");
*/ */
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param")) if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.Entry_param"))
{ {
var event = JSON.parse(vars.getString("$param.Entry_param")); let event = JSON.parse(vars.getString("$param.Entry_param"));
if(vars.get("$this.value")) if(vars.get("$this.value"))
result.string(vars.get("$this.value")); result.string(vars.get("$this.value"));
...@@ -21,6 +21,6 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para ...@@ -21,6 +21,6 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$para
*/ */
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param")) if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.exists("$param.Entry_param"))
{ {
var event = JSON.parse(vars.getString("$param.Entry_param")); let event = JSON.parse(vars.getString("$param.Entry_param"));
result.string(event[calendars.DTEND]); result.string(event[calendars.DTEND]);
} }
\ No newline at end of file
...@@ -323,6 +323,8 @@ ...@@ -323,6 +323,8 @@
<isObjectAction v="false" /> <isObjectAction v="false" />
<isSelectionAction v="true" /> <isSelectionAction v="true" />
<iconId>VAADIN:FILE_TREE_SMALL</iconId> <iconId>VAADIN:FILE_TREE_SMALL</iconId>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attributeactions/children/newchildattribute/stateProcess.js</stateProcess>
</entityActionField> </entityActionField>
</children> </children>
</entityActionGroup> </entityActionGroup>
......
import("Attribute_lib");
import("system.result");
import("system.vars");
import("system.neon");
if(vars.get("$sys.selection").length == 1 && vars.get("$field.ATTRIBUTE_TYPE") == $AttributeTypes.GROUP.toString())
result.string(neon.COMPONENTSTATE_EDITABLE)
else
result.string(neon.COMPONENTSTATE_DISABLED)
\ No newline at end of file
...@@ -410,6 +410,10 @@ ...@@ -410,6 +410,10 @@
<name>REPLACEMENTNAME.value</name> <name>REPLACEMENTNAME.value</name>
<recordfield>DOCUMENTTEMPLATE.REPLACEMENTNAME</recordfield> <recordfield>DOCUMENTTEMPLATE.REPLACEMENTNAME</recordfield>
</dbRecordFieldMapping> </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>KIND.displayValue</name>
<expression>%aditoprj%/entity/DocumentTemplate_entity/recordcontainers/db/recordfieldmappings/kind.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
</recordFieldMappings> </recordFieldMappings>
</dbRecordContainer> </dbRecordContainer>
</recordContainers> </recordContainers>
......
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.documentTemplateType(), "DOCUMENTTEMPLATE.KIND");
result.string(sql);
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<majorModelMode>DISTRIBUTED</majorModelMode> <majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/DuplicateScanner_entity/documentation.adoc</documentation> <documentation>%aditoprj%/entity/DuplicateScanner_entity/documentation.adoc</documentation>
<title>Duplicate Configuration</title> <title>Duplicate Configuration</title>
<iconId>VAADIN:DATABASE</iconId> <iconId>VAADIN:COG_O</iconId>
<titlePlural>Configurations</titlePlural> <titlePlural>Configurations</titlePlural>
<recordContainer>DBRecordContainer</recordContainer> <recordContainer>DBRecordContainer</recordContainer>
<entityFields> <entityFields>
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<siblings> <siblings>
<element>DuplicatesUnrelated_entity</element> <element>DuplicatesUnrelated_entity</element>
</siblings> </siblings>
<iconId>VAADIN:DATABASE</iconId>
<recordContainer>recordContainer</recordContainer> <recordContainer>recordContainer</recordContainer>
<entityFields> <entityFields>
<entityProvider> <entityProvider>
......
...@@ -255,6 +255,22 @@ ...@@ -255,6 +255,22 @@
</entityParameter> </entityParameter>
</children> </children>
</entityConsumer> </entityConsumer>
<entityConsumer>
<name>Activities</name>
<dependency>
<name>dependency</name>
<entityName>Activity_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
<entityConsumer>
<name>Tasks</name>
<dependency>
<name>dependency</name>
<entityName>Task_entity</entityName>
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
</entityFields> </entityFields>
<recordContainers> <recordContainers>
<jDitoRecordContainer> <jDitoRecordContainer>
......
...@@ -5,7 +5,7 @@ import("Context_lib"); ...@@ -5,7 +5,7 @@ import("Context_lib");
// NOTE THAT THIS ENTITY USES THE TARGET_CONSUMER_PROCESSES OF THE PROVIDERS // NOTE THAT THIS ENTITY USES THE TARGET_CONSUMER_PROCESSES OF THE PROVIDERS
// --> THIS PROCESS WON'T NOT BE EXECUTED IN SOME CASES. // --> THIS PROCESS WON'T BE EXECUTED IN SOME CASES.
if (vars.get("$param.ObjectType_param")) if (vars.get("$param.ObjectType_param"))
{ {
......
...@@ -1153,17 +1153,6 @@ ...@@ -1153,17 +1153,6 @@
<entityName>Person_entity</entityName> <entityName>Person_entity</entityName>
<fieldName>SelfDuplicatesProvider</fieldName> <fieldName>SelfDuplicatesProvider</fieldName>
</dependency> </dependency>
<children>
<entityParameter>
<name>OnlyShowContactIds_param</name>
</entityParameter>
<entityParameter>
<name>DuplicateCurrentContactId_param</name>
</entityParameter>
<entityParameter>
<name>DuplicateActionsControl_param</name>
</entityParameter>
</children>
</entityConsumer> </entityConsumer>
<entityProvider> <entityProvider>
<name>SelfDuplicatesProvider</name> <name>SelfDuplicatesProvider</name>
...@@ -1217,6 +1206,7 @@ ...@@ -1217,6 +1206,7 @@
<title>New Weekplanentry</title> <title>New Weekplanentry</title>
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newvisitplanentry/onActionProcess.js</onActionProcess> <onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newvisitplanentry/onActionProcess.js</onActionProcess>
<iconId>VAADIN:CAR</iconId> <iconId>VAADIN:CAR</iconId>
<stateProcess>%aditoprj%/entity/Person_entity/entityfields/newvisitplanentry/stateProcess.js</stateProcess>
</entityActionField> </entityActionField>
<entityProvider> <entityProvider>
<name>IdFilteredActiveContacts</name> <name>IdFilteredActiveContacts</name>
......
...@@ -3,15 +3,15 @@ import("system.vars"); ...@@ -3,15 +3,15 @@ import("system.vars");
import("system.neon"); import("system.neon");
import("DuplicateScanner_lib"); import("DuplicateScanner_lib");
let sourceContactId = vars.get("$param.DuplicateCurrentContactId_param"); var sourceContactId = vars.get("$param.DuplicateCurrentContactId_param");
let targetContactId = vars.get("$sys.selection"); var targetContactId = vars.get("$sys.selection")[0];
//todo the actual merge ought to happen in a separate view where the contact infos can be merged manually by the user. //todo the actual merge ought to happen in a separate view where the contact infos can be merged manually by the user.
let mergeSuccess = DuplicateScannerUtils.MergePerson(sourceContactId, targetContactId); var mergeSuccess = DuplicateScannerUtils.MergePerson(sourceContactId, targetContactId);
if(mergeSuccess) if(mergeSuccess)
{ {
let currentContactId = EmployeeUtils.getCurrentContactId(); var currentContactId = EmployeeUtils.getCurrentContactId();
if(currentContactId == null) if(currentContactId == null)
currentContactId = ""; currentContactId = "";
DuplicateScannerUtils.CreateMergeSuccessActivity(sourceContactId, targetContactId, currentContactId, "Person"); DuplicateScannerUtils.CreateMergeSuccessActivity(sourceContactId, targetContactId, currentContactId, "Person");
......
import("system.result");
import("system.neon");
import("system.vars");
import("KeywordRegistry_basic");
if (vars.get("$field.STATUS") == $KeywordRegistry.contactStatus$inactive())
result.string(neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
<entityField> <entityField>
<name>SORT</name> <name>SORT</name>
<title>Sorting</title> <title>Sorting</title>
<valueProcess>%aditoprj%/entity/Salutation_entity/entityfields/sort/valueProcess.js</valueProcess>
</entityField> </entityField>
<entityField> <entityField>
<name>TITLE</name> <name>TITLE</name>
......
...@@ -3,7 +3,7 @@ import("system.vars"); ...@@ -3,7 +3,7 @@ import("system.vars");
import("KeywordRegistry_basic"); import("KeywordRegistry_basic");
import("system.result"); import("system.result");
/*if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && vars.get("$this.value") == null) if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && vars.get("$this.value") == null)
{ {
result.string($KeywordRegistry.personGender$other()); result.string($KeywordRegistry.personGender$other());
}*/ }
\ No newline at end of file \ No newline at end of file
import("system.neon");
import("Sql_lib");
import("system.vars");
import("system.result");
if ((vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) && vars.get("$this.value") == null)
{
var res = newSelect("max(SALUTATION.SORT)+1")
.from("SALUTATION")
.cell()
result.string(res);
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment