diff --git a/.liquibase/Data_alias/basic/2022.0.0/Currency/changelog.xml b/.liquibase/Data_alias/basic/2022.0.0/Currency/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d4727aff97689528a5c483440b4ba9fd454d98ca
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2022.0.0/Currency/changelog.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include file="create_ab_currency.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2022.0.0/Currency/create_ab_currency.xml b/.liquibase/Data_alias/basic/2022.0.0/Currency/create_ab_currency.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6a801e9ead381f15a1016d5e3ab14c4e2506b294
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2022.0.0/Currency/create_ab_currency.xml
@@ -0,0 +1,18 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="2a1de93a-cc08-4b16-8aa5-6ff5ed15253e">
+ <createTable tableName="AB_CURRENCY">
+ <column name="NUMBERCODE" type="INTEGER(3)"/>
+ <column name="ISO4" type="CHAR(3)">
+ <constraints primaryKey="true" primaryKeyName="PK_AB_CURRENCY_ISO4"/>
+ </column>
+ <column name="NAME" type="NVARCHAR(100)">
+ <constraints nullable="false"/>
+ </column>
+ <column name="SIGN" type="NVARCHAR(100)"/>
+ <column name="ISACTIVE" type="TINYINT">
+ <constraints nullable="false"/>
+ </column>
+ </createTable>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Advertising.xml b/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Advertising.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8671248c5236f270b3188217e3528cbcc6aaebf8
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Advertising.xml
@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="6d9c8928-3fe0-4093-aebc-a4ff54e96904">
+ <addColumn tableName="ADVERTISING">
+ <column name ="CURRENCYRATE_ID" type="VARCHAR(36)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Forecast.xml b/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Forecast.xml
new file mode 100644
index 0000000000000000000000000000000000000000..00199eaebe0805dc0505b02ceabdf5ba18fcfcf8
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Forecast.xml
@@ -0,0 +1,22 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet dbms="derby" author="b.ulrich" id="062f385c-fa7e-4890-9529-602044f3ac25">
+ <sql>
+ ALTER TABLE FORECAST ADD VOLUME_NEW NUMERIC(14,2);
+ UPDATE FORECAST SET VOLUME_NEW = CAST ( VOLUME as NUMERIC(14,2));
+ ALTER TABLE FORECAST DROP COLUMN VOLUME;
+ RENAME COLUMN FORECAST.VOLUME_NEW TO VOLUME;
+ </sql>
+ </changeSet>
+
+ <changeSet author="b.ulrich" id="6cb184f3-d010-438c-a1fc-3077cff3cd67">
+ <preConditions onFail="CONTINUE">
+ <not>
+ <dbms type="derby" />
+ </not>
+ </preConditions>
+ <modifyDataType columnName="VOLUME" newDataType="NUMERIC(14,2)" tableName="FORECAST"/>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Offer.xml b/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Offer.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b6ba5e663bf452d9fc551d88b82dc1d9525d8e11
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Offer.xml
@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="491b21d1-1dee-4afe-8310-df5abaa33e1d">
+ <addColumn tableName="OFFER">
+ <column name ="CURRENCYRATE_ID" type="VARCHAR(36)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Productprice.xml b/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Productprice.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5441d2e46ad6de01d1f103c2eb9e980b351b92c4
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Productprice.xml
@@ -0,0 +1,14 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="368d9124-281b-4c80-a417-9a55157f99b8">
+ <addColumn tableName="PRODUCTPRICE">
+ <column name ="CURRENCYRATE_ID" type="VARCHAR(36)"/>
+ </addColumn>
+ <dropNotNullConstraint
+ columnDataType="VARCHAR(36)"
+ columnName="CURRENCY"
+ tableName="PRODUCTPRICE"/>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Salesorder.xml b/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Salesorder.xml
new file mode 100644
index 0000000000000000000000000000000000000000..073cf650bb8688fdabb93e5df8ad8a95a3b3dbbc
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Salesorder.xml
@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="c24e37d0-9f13-421e-a1e0-167bd2efbd88">
+ <addColumn tableName="SALESORDER">
+ <column name ="CURRENCYRATE_ID" type="VARCHAR(36)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Salesproject.xml b/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Salesproject.xml
new file mode 100644
index 0000000000000000000000000000000000000000..bb53c6dd44e68210cffe66d9ab92ed6ce20d0a7c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/alter_Salesproject.xml
@@ -0,0 +1,10 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="344f2b8e-1805-40e2-b27a-ed3054d2b354">
+ <addColumn tableName="SALESPROJECT">
+ <column name ="CURRENCYRATE_ID" type="VARCHAR(36)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/changelog.xml b/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..b040944505cac7ac8f004a298cd5e30e1cc484d3
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/changelog.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include file="create_CurrencyRate.xml" relativeToChangelogFile="true"/>
+ <include file="alter_Salesproject.xml" relativeToChangelogFile="true"/>
+ <include file="alter_Forecast.xml" relativeToChangelogFile="true"/>
+ <include file="alter_Advertising.xml" relativeToChangelogFile="true"/>
+ <include file="alter_Offer.xml" relativeToChangelogFile="true"/>
+ <include file="alter_Productprice.xml" relativeToChangelogFile="true"/>
+ <include file="alter_Salesorder.xml" relativeToChangelogFile="true"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/create_CurrencyRate.xml b/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/create_CurrencyRate.xml
new file mode 100644
index 0000000000000000000000000000000000000000..0b474f7f87a5af2c918c4d1acfb6846ec9bc99ab
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2022.0.0/CurrencyRate/create_CurrencyRate.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="ba924567-e017-40ac-af64-3595fbc8daa1">
+ <createTable tableName="CURRENCYRATE">
+ <column name="CURRENCYRATEID" type="CHAR(36)">
+ <constraints primaryKey="true" primaryKeyName="PK_CURRENCYRATE_CURRENCYRATEID"/>
+ </column>
+ <column name="CURRENCYRATE" type="FLOAT"/>
+ <column name="SOURCECURRENCYISO" type="CHAR(3)"/>
+ <column name="TARGETCURRENCYISO" type="CHAR(3)"/>
+ <column name="VALID_FROM" type="DATETIME"/>
+
+ <column name="USER_NEW" type="NVARCHAR(50)" />
+ <column name="DATE_NEW" type="DATETIME" />
+ </createTable>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2022.0.0/changelog.xml b/.liquibase/Data_alias/basic/2022.0.0/changelog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3e2729fa180792dd514b0efbe184a5974eb0e15c
--- /dev/null
+++ b/.liquibase/Data_alias/basic/2022.0.0/changelog.xml
@@ -0,0 +1,6 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include relativeToChangelogFile="true" file="CurrencyRate/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="Currency/changelog.xml"/>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/changelog.xml b/.liquibase/Data_alias/basic/_demoData/changelog.xml
index ebd427e3c534201d835be542a46ae4fc08d8ceff..f52338fe9509f83fa396e7ecc0673d7bd9d8ae95 100644
--- a/.liquibase/Data_alias/basic/_demoData/changelog.xml
+++ b/.liquibase/Data_alias/basic/_demoData/changelog.xml
@@ -1,5 +1,6 @@
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <include file="generatedData/ab_currency.xml" relativeToChangelogFile="true"/>
<include file="generatedData/ab_appointmentlink.xml" relativeToChangelogFile="true"/>
<include file="generatedData/ab_attributerelation.xml" relativeToChangelogFile="true"/>
<include file="generatedData/ab_ctilog.xml" relativeToChangelogFile="true"/>
@@ -122,11 +123,11 @@
<include file="generatedData/topictreerelation.xml" relativeToChangelogFile="true"/>
<include file="generatedData/unrelatedduplicates.xml" relativeToChangelogFile="true"/>
<include file="generatedData/visitplanemployeeweek.xml" relativeToChangelogFile="true"/>
- <include file="generatedData/visitplanentry.xml" relativeToChangelogFile="true"/>
+ <!--<include file="generatedData/visitplanentry.xml" relativeToChangelogFile="true"/>-->
<include file="generatedData/visitrecommendation.xml" relativeToChangelogFile="true"/>
<include file="generatedData/weblink.xml" relativeToChangelogFile="true"/>
<include file="generatedData/weblinktag.xml" relativeToChangelogFile="true"/>
<include file="generatedData/weblink_click.xml" relativeToChangelogFile="true"/>
<include file="generatedData/workflowsignal.xml" relativeToChangelogFile="true"/>
<include file="generatedData/workflowstartconfig.xml" relativeToChangelogFile="true"/>
-</databaseChangeLog>
\ No newline at end of file
+</databaseChangeLog>
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/ab_currency.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_currency.xml
new file mode 100644
index 0000000000000000000000000000000000000000..335f0418c9b84c53ff0814f88e05f1049ffe50d4
--- /dev/null
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/ab_currency.xml
@@ -0,0 +1,40 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="b.ulrich" id="4ce0e969-a543-45ea-b668-f29710b6dc73">
+ <insert tableName="AB_CURRENCY">
+ <column name="NUMBERCODE" valueNumeric="978"/>
+ <column name="ISO4" value="EUR"/>
+ <column name="NAME" value="Euro"/>
+ <column name="SIGN" value="€"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_CURRENCY">
+ <column name="NUMBERCODE" valueNumeric="840"/>
+ <column name="ISO4" value="USD"/>
+ <column name="NAME" value="US-Dollar"/>
+ <column name="SIGN" value="$"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_CURRENCY">
+ <column name="NUMBERCODE" valueNumeric="756"/>
+ <column name="ISO4" value="CHF"/>
+ <column name="NAME" value="Swiss Franc"/>
+ <column name="SIGN" value="Fr"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_CURRENCY">
+ <column name="NUMBERCODE" valueNumeric="124"/>
+ <column name="ISO4" value="CAD"/>
+ <column name="NAME" value="Canadian Dollar"/>
+ <column name="SIGN" value="$"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ </insert>
+ <insert tableName="AB_CURRENCY">
+ <column name="NUMBERCODE" valueNumeric="826"/>
+ <column name="ISO4" value="GPD"/>
+ <column name="NAME" value="British Pound Sterling"/>
+ <column name="SIGN" value="£"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ </insert>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
index 571a4489a807e1581709dcced953f52352c9a928..2f5a2758f730037ad35989e124478cab99f5b5db 100644
--- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
+++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml
@@ -15,6 +15,7 @@
<column name="SALESPROJECTID" value="438537db-0dc6-4aed-b1d1-813011baf88c"/>
<column name="PROJECTTITLE" value="Erstprojekt"/>
<column name="STATUS" value="SALPROJSTATOPEN"/>
+ <column name="CURRENCYRATE_ID" value=""/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASELEAD"/>
@@ -29,6 +30,7 @@
<column name="SALESPROJECTID" value="6d3d16cd-733e-41d1-ab6c-8a6cba63ba4a"/>
<column name="PROJECTTITLE" value="Skyscraper / Pilotprojekt"/>
<column name="STATUS" value="SALPROJSTATOPEN"/>
+ <column name="CURRENCYRATE_ID" value=""/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASELEAD"/>
@@ -41,6 +43,7 @@
<column name="SALESPROJECTID" value="7683f92d-a949-4b76-ba6f-57344d730f40"/>
<column name="PROJECTTITLE" value="Meister Messebau/ Umsetzung"/>
<column name="STATUS" value="SALPROJSTATOPEN"/>
+ <column name="CURRENCYRATE_ID" value=""/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASEOFFER"/>
@@ -55,6 +58,7 @@
<column name="SALESPROJECTID" value="7e2680f6-a438-45aa-956a-787363f85923"/>
<column name="PROJECTTITLE" value="Kronen Pilotprojekt"/>
<column name="STATUS" value="SALPROJSTATOPEN"/>
+ <column name="CURRENCYRATE_ID" value=""/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASELEAD"/>
@@ -83,6 +87,7 @@
<column name="SALESPROJECTID" value="cdaa7f90-6e3d-4199-974b-0847b867a419"/>
<column name="PROJECTTITLE" value="Meister Messebau "/>
<column name="STATUS" value="SALPROJSTATPARTIAL"/>
+ <column name="CURRENCYRATE_ID" value=""/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASELEAD"/>
@@ -97,6 +102,7 @@
<column name="SALESPROJECTID" value="d422ad81-717f-42b0-bd64-fc892744aac7"/>
<column name="PROJECTTITLE" value="Transatlantik Initialprojekt"/>
<column name="STATUS" value="SALPROJSTATOPEN"/>
+ <column name="CURRENCYRATE_ID" value=""/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASEPROS"/>
@@ -110,6 +116,7 @@
<column name="SALESPROJECTID" value="e1d29d7a-744b-412d-8b29-11810a592139"/>
<column name="PROJECTTITLE" value="FSA Projekteinführung"/>
<column name="STATUS" value="SALPROJSTATOPEN"/>
+ <column name="CURRENCYRATE_ID" value=""/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASECONTACT"/>
@@ -123,6 +130,7 @@
<column name="SALESPROJECTID" value="ebb04ae2-d1f9-4ef3-bdfa-e9f562d215ba"/>
<column name="PROJECTTITLE" value="Projekt 123"/>
<column name="STATUS" value="SALPROJSTATOPEN"/>
+ <column name="CURRENCYRATE_ID" value=""/>
</insert>
<insert tableName="salesproject">
<column name="PHASE" value="SALPROJPHASENEGO"/>
diff --git a/.liquibase/Data_alias/changelog.xml b/.liquibase/Data_alias/changelog.xml
index 016d430cf95592e23f9d9fb70a64d13fa2a8304a..47a9d252a83796eeceb96f1a04c59ab5d7a0e9a5 100644
--- a/.liquibase/Data_alias/changelog.xml
+++ b/.liquibase/Data_alias/changelog.xml
@@ -30,6 +30,7 @@
<include relativeToChangelogFile="true" file="basic/2021.2.0/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2021.2.1/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/2021.2.2/changelog.xml"/>
+ <include relativeToChangelogFile="true" file="basic/2022.0.0/changelog.xml"/>
<include relativeToChangelogFile="true" file="basic/workflows/changelog.xml" context="workflow"/>
<include relativeToChangelogFile="true" file="basic/_demoData/changelog.xml" context="example"/>
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 77ff068e8e1c869f02f818e815c42b8ff6c47638..859aea401601e5937363e570257bc3ce9d4738cd 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -2305,6 +2305,20 @@
<title>Product price Id</title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CURRENCYRATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -3221,6 +3235,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CURRENCYRATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -3569,6 +3597,20 @@
</customBooleanProperty>
</customProperties>
</entityFieldDb>
+ <entityFieldDb>
+ <name>SHOWPRICE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="5" />
+ <size v="5" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -3913,6 +3955,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CURRENCYRATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -5069,6 +5125,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CURRENCYRATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -10398,9 +10468,9 @@
<name>VOLUME</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="2" />
+ <size v="14" />
+ <scale v="2" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -22464,6 +22534,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CURRENCYRATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -24799,6 +24883,216 @@
</entityFieldDb>
</entityFields>
</entityDb>
+ <entityDb>
+ <name>AB_CURRENCY</name>
+ <category></category>
+ <dbName></dbName>
+ <idColumn>ISO4</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>NUMBERCODE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SIGN</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="100" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ISACTIVE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="5" />
+ <size v="5" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ISO4</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="3" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>NAME</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="100" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>CURRENCYRATE</name>
+ <category></category>
+ <dbName></dbName>
+ <idColumn>CURRENCYRATEID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>CURRENCYRATEID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>TARGETCURRENCYISO</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="3" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CURRENCYRATE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="8" />
+ <size v="52" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SOURCECURRENCYISO</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="3" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>VALID_FROM</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="29" />
+ <scale v="9" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
</entities>
</entityGroup>
</aliasDefDb>
diff --git a/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod b/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
index 330076bb4dcfbdedefc2c99bbf41680b9218dde8..7e4ace02479c4e7f671fe5549d3209bcfd08194a 100644
--- a/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
+++ b/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod
@@ -2613,6 +2613,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CURRENCYRATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -3323,6 +3337,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CURRENCYRATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -3553,6 +3581,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>SHOWPRICE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="-7" />
+ <size v="3" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -4777,20 +4819,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>TEMPLATECONTENT</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="-1" />
- <size v="2147483647" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -5640,7 +5668,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -5668,7 +5696,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -5682,7 +5710,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -5738,7 +5766,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -6532,7 +6560,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -7893,9 +7921,9 @@
<name>VOLUME</name>
<dbName></dbName>
<primaryKey v="false" />
- <columnType v="4" />
- <size v="10" />
- <scale v="0" />
+ <columnType v="3" />
+ <size v="14" />
+ <scale v="2" />
<notNull v="false" />
<isUnique v="false" />
<index v="false" />
@@ -11774,7 +11802,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -11844,7 +11872,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -11900,7 +11928,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -13085,6 +13113,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CURRENCYRATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -15637,6 +15679,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CURRENCYRATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -17262,7 +17318,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -17512,7 +17568,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -17540,7 +17596,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -17742,7 +17798,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -18096,7 +18152,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -18674,7 +18730,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -19356,7 +19412,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -19605,6 +19661,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>CURRENCYRATE_ID</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -19634,7 +19704,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -19676,7 +19746,7 @@
<scale v="0" />
<notNull v="true" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -19850,7 +19920,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -19912,7 +19982,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -20430,7 +20500,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -20458,7 +20528,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -20570,7 +20640,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -20584,7 +20654,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -20738,7 +20808,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -20766,7 +20836,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -20801,7 +20871,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -20829,7 +20899,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -20920,7 +20990,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -20962,7 +21032,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -21256,7 +21326,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -21298,7 +21368,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -21312,7 +21382,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -21354,7 +21424,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -21634,7 +21704,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -21711,7 +21781,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -21725,7 +21795,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -21774,7 +21844,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -21851,7 +21921,7 @@
<scale v="0" />
<notNull v="false" />
<isUnique v="false" />
- <index v="false" />
+ <index v="true" />
<documentation></documentation>
<title></title>
<description></description>
@@ -21942,6 +22012,216 @@
</entityFieldDb>
</entityFields>
</entityDb>
+ <entityDb>
+ <name>AB_CURRENCY</name>
+ <category></category>
+ <dbName></dbName>
+ <idColumn>ISO4</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>NUMBERCODE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SIGN</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="100" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ISACTIVE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="-7" />
+ <size v="3" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>ISO4</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="3" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>NAME</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="100" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
+ <entityDb>
+ <name>CURRENCYRATE</name>
+ <category></category>
+ <dbName></dbName>
+ <idColumn>CURRENCYRATEID</idColumn>
+ <idGeneratorType v="0" />
+ <idGeneratorInterval v="1" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ <auditSyncConfig>
+ <name>auditSyncConfig</name>
+ <auditMode v="0" />
+ <syncActive v="false" />
+ <syncComplete v="true" />
+ <syncDirection v="1" />
+ <syncIds></syncIds>
+ </auditSyncConfig>
+ <entityFields>
+ <entityFieldDb>
+ <name>CURRENCYRATEID</name>
+ <dbName></dbName>
+ <primaryKey v="true" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="true" />
+ <isUnique v="true" />
+ <index v="true" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>TARGETCURRENCYISO</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="3" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>CURRENCYRATE</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="6" />
+ <size v="12" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DATE_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>SOURCECURRENCYISO</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="3" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>USER_NEW</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="50" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>VALID_FROM</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="93" />
+ <size v="19" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ </entityFields>
+ </entityDb>
</entities>
</entityGroup>
</aliasDefDb>
diff --git a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
index 398dbbf9241d918d6a018d63ef044619687c9029..8dd4b719edcc1f11027a50cca4b16f8b7cf34a3b 100644
--- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
+++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod
@@ -472,6 +472,10 @@
<name>TopicTree</name>
<kind v="10077" />
</entityNode>
+ <entityNode>
+ <name>CurrencyRate</name>
+ <kind v="10077" />
+ </entityNode>
</childNodes>
</entityNode>
<entityNode>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index a3c17c8064b98fd4a73bceb41680965c36379a41..c59bcfd64d275fd112cbfee6aaf607fe650d350e 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -669,6 +669,10 @@
<name>AdvertisingId_param</name>
<valueProcess>%aditoprj%/entity/Activity_entity/entityfields/advertisingitems/children/advertisingid_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>CurrencyAndCurrencyRate_param</name>
+ <valueProcess>%aditoprj%/entity/Activity_entity/entityfields/advertisingitems/children/currencyandcurrencyrate_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityField>
diff --git a/entity/Activity_entity/entityfields/advertisingitems/children/currencyandcurrencyrate_param/valueProcess.js b/entity/Activity_entity/entityfields/advertisingitems/children/currencyandcurrencyrate_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b48b58701ca58124900c44ef314d2e35ff1d688c
--- /dev/null
+++ b/entity/Activity_entity/entityfields/advertisingitems/children/currencyandcurrencyrate_param/valueProcess.js
@@ -0,0 +1,21 @@
+import("system.entities");
+import("Util_lib");
+import("Currency_lib");
+import("system.result");
+import("system.vars");
+
+var conf = entities.createConfigForLoadingConsumerRows();
+conf.consumer("AdvertisingInformationConsumer");
+conf.fields(["CURRENCYRATE_ID"]);
+
+var advertising = entities.getRows(conf);
+var res = "";
+if(!Utils.isNotNullOrEmptyString(advertising[0]))
+{
+ var currencyAndRate = CurrencyRateUtils.getCurrencyRateById(advertising[0]["CURRENCYRATE_ID"], true);
+ res = JSON.stringify({
+ currency: currencyAndRate[1]
+ , currencyRate: currencyAndRate[0]
+ })
+}
+result.string(res);
diff --git a/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod b/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod
index 36f2c6a32b7ac269256871976cf25f2680ed8069..69caf9a126ec1289761f130668acef31d08ee08f 100644
--- a/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod
+++ b/entity/AdvertisingItem_entity/AdvertisingItem_entity.aod
@@ -21,7 +21,6 @@
<state>READONLY</state>
<titleProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/actualamount/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/actualamount/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/actualamount/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
@@ -64,10 +63,10 @@
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<mandatory v="true" />
+ <mandatoryProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/price/mandatoryProcess.js</mandatoryProcess>
<stateProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/price/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/price/titleProcess.js</titleProcess>
- <valueProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/price/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/price/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/AdvertisingItem_entity/entityfields/price/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>PRODUCT_ID</name>
@@ -85,6 +84,7 @@
<mandatory v="true" />
<stateProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/quantity/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/quantity/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/AdvertisingItem_entity/entityfields/quantity/onValueChange.js</onValueChange>
<onValidation>%aditoprj%/entity/AdvertisingItem_entity/entityfields/quantity/onValidation.js</onValidation>
</entityField>
<entityField>
@@ -107,15 +107,15 @@
<inputFormat>#,##0.00</inputFormat>
<mandatory v="false" />
<state>READONLY</state>
+ <stateProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/targetamount/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/targetamount/titleProcess.js</titleProcess>
- <valueProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/targetamount/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/targetamount/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>UNIT</name>
<title>Unit</title>
<consumer>KeywordUnit</consumer>
<mandatory v="true" />
+ <state>READONLY</state>
<displayValueProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/unit/displayValueProcess.js</displayValueProcess>
</entityField>
<entityProvider>
@@ -177,20 +177,6 @@
<entityField>
<name>ADVERTISINGITEMID</name>
</entityField>
- <entityConsumer>
- <name>KeywordCurrencies</name>
- <dependency>
- <name>dependency</name>
- <entityName>KeywordEntry_entity</entityName>
- <fieldName>SpecificContainerKeywords</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>ContainerName_param</name>
- <valueProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
<entityParameter>
<name>ProductObject_param</name>
<valueProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/productobject_param/valueProcess.js</valueProcess>
@@ -239,6 +225,37 @@
<fieldName>BasicInfoAdvertising</fieldName>
</dependency>
</entityConsumer>
+ <entityParameter>
+ <name>CurrencyAndCurrencyRate_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityField>
+ <name>priceForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <mandatoryProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/priceforeigncurrency/mandatoryProcess.js</mandatoryProcess>
+ <stateProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/priceforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/priceforeigncurrency/titleProcess.js</titleProcess>
+ <onValueChange>%aditoprj%/entity/AdvertisingItem_entity/entityfields/priceforeigncurrency/onValueChange.js</onValueChange>
+ </entityField>
+ <entityField>
+ <name>targetAmountForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/targetamountforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/targetamountforeigncurrency/titleProcess.js</titleProcess>
+ <onValueChange>%aditoprj%/entity/AdvertisingItem_entity/entityfields/targetamountforeigncurrency/onValueChange.js</onValueChange>
+ </entityField>
+ <entityField>
+ <name>actualAmountForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/actualamountforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/AdvertisingItem_entity/entityfields/actualamountforeigncurrency/titleProcess.js</titleProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -314,15 +331,12 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>actualAmount.displayValue</name>
- <expression>%aditoprj%/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/actualamount.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PRICE.displayValue</name>
- <expression>%aditoprj%/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/price.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>TARGETAMOUNT.displayValue</name>
- <expression>%aditoprj%/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/targetamount.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>UNIT.displayValue</name>
@@ -336,6 +350,18 @@
<name>ADVERTISING_ID.displayValue</name>
<expression>%aditoprj%/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/advertising_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>actualAmountForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/actualamountforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>priceForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/priceforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>targetAmountForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/targetamountforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/AdvertisingItem_entity/entityfields/actualamount/displayValueProcess.js b/entity/AdvertisingItem_entity/entityfields/actualamount/displayValueProcess.js
deleted file mode 100644
index 911ec54d138da1366c86c6037a04f15254174b68..0000000000000000000000000000000000000000
--- a/entity/AdvertisingItem_entity/entityfields/actualamount/displayValueProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.vars");
-import("Util_lib");
-import("system.result");
-
-var price = vars.get("$this.value");
-if(price)
-{
- var currency = vars.get("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- result.string(NumberUtils.formatWithCurrency(price, "#,##0.00", currency));
-}
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/actualamount/titleProcess.js b/entity/AdvertisingItem_entity/entityfields/actualamount/titleProcess.js
index cd701d9cab03895fd84c96c446d85242df961faa..a7c4e6d1931445bef55494040d8b32a079b876e9 100644
--- a/entity/AdvertisingItem_entity/entityfields/actualamount/titleProcess.js
+++ b/entity/AdvertisingItem_entity/entityfields/actualamount/titleProcess.js
@@ -1,5 +1,5 @@
+import("Currency_lib");
import("system.result");
-import("system.vars");
import("system.translate");
-result.string(translate.withArguments("Actual Amount in %0", [vars.get("$param.Currency_param")]));
\ No newline at end of file
+result.string(translate.withArguments("Actual Amount (%0)", [CurrencyUtils.getLocalCurrency()]));
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/actualamountforeigncurrency/stateProcess.js b/entity/AdvertisingItem_entity/entityfields/actualamountforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1f4474fa1d23c8102fd56af65e3ae6e14310421d
--- /dev/null
+++ b/entity/AdvertisingItem_entity/entityfields/actualamountforeigncurrency/stateProcess.js
@@ -0,0 +1,9 @@
+import("system.neon");
+import("Currency_lib");
+import("system.result");
+
+var res = CurrencyRateUtils.getFieldStateChildEntity("CurrencyAndCurrencyRate_param", true);
+if(res == neon.COMPONENTSTATE_INVISIBLE)
+{
+ result.string(neon.COMPONENTSTATE_READONLY)
+}
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/actualamountforeigncurrency/titleProcess.js b/entity/AdvertisingItem_entity/entityfields/actualamountforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b826c8ab4def8ef6b2edf244b324fb701b11da9d
--- /dev/null
+++ b/entity/AdvertisingItem_entity/entityfields/actualamountforeigncurrency/titleProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.result");
+import("Context_lib");
+import("system.vars");
+
+var currencyParam = JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"));
+var currency = ContextUtils.loadContentTitle("Currency_entity", currencyParam["currency"]);
+
+result.string(translate.withArguments("Actual Amount (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/currency_param/valueProcess.js b/entity/AdvertisingItem_entity/entityfields/currency_param/valueProcess.js
index a49cb0e8cfea5d52d2ca7f80f5c1c12e29b9721f..24f24da20f5f0bdd70b528f6206d9650b6aa37dc 100644
--- a/entity/AdvertisingItem_entity/entityfields/currency_param/valueProcess.js
+++ b/entity/AdvertisingItem_entity/entityfields/currency_param/valueProcess.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("system.result");
import("Sql_lib");
import("Util_lib");
@@ -7,9 +8,9 @@ var currency = vars.get("$this.value");
if(!Utils.toBoolean(currency))
{
- currency = newSelect("ADVERTISING.CURRENCY")
+ currency = newSelect("ADVERTISING.CURRENCYRATE_ID")
.from("ADVERTISING")
.where("ADVERTISING.ADVERTISINGID", vars.get("$field.ADVERTISING_ID"), SqlBuilder.EQUAL())
.cell();
}
-result.string(currency);
\ No newline at end of file
+result.string(CurrencyRateUtils.getCurrencyRateById(currency, true)[1]);
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/free/onValueChange.js b/entity/AdvertisingItem_entity/entityfields/free/onValueChange.js
index 13bf387f06b4b74ad477200832ad3bb31216d0e9..3aeefecfffcaf641e3ad60329da2137100c8aba9 100644
--- a/entity/AdvertisingItem_entity/entityfields/free/onValueChange.js
+++ b/entity/AdvertisingItem_entity/entityfields/free/onValueChange.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("system.neon");
import("system.vars");
@@ -14,6 +15,12 @@ if(free == "0" && vars.get("$field.PRODUCT_ID"))
price = productObject.PriceListToUse.price;
}
}
+var field = "PRICE";
+
+if(JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"))["currency"] != $CurrencyRate.LOCALCURRENCY())
+{
+ field = "priceForeignCurrency";
+}
-neon.setFieldValue("$field.PRICE", price);
-neon.refresh(["$field.PRICE"]);
+neon.setFieldValue("$field." + field, price);
+neon.refresh(["$field." + field]);
diff --git a/entity/AdvertisingItem_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js b/entity/AdvertisingItem_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js
deleted file mode 100644
index b50dc76b773ab7747979427ddacd7542f305594d..0000000000000000000000000000000000000000
--- a/entity/AdvertisingItem_entity/entityfields/keywordcurrencies/children/containername_param/valueProcess.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import("system.result");
-import("KeywordRegistry_basic");
-
-result.string($KeywordRegistry.currency());
diff --git a/entity/AdvertisingItem_entity/entityfields/price/displayValueProcess.js b/entity/AdvertisingItem_entity/entityfields/price/displayValueProcess.js
deleted file mode 100644
index 7b2a8585a138104d70add2a275833f1106373d0c..0000000000000000000000000000000000000000
--- a/entity/AdvertisingItem_entity/entityfields/price/displayValueProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.vars");
-import("Util_lib");
-import("system.result");
-
-var price = vars.get("$field.PRICE");
-if(Utils.toBoolean(price))
-{
- var currency = vars.get("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- result.string(NumberUtils.formatWithCurrency(price, "#,##0.00", currency));
-}
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/price/mandatoryProcess.js b/entity/AdvertisingItem_entity/entityfields/price/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4f59184f342c35f2fd25505c6435527d52169014
--- /dev/null
+++ b/entity/AdvertisingItem_entity/entityfields/price/mandatoryProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.getFieldMandatoryChildEntity("CurrencyAndCurrencyRate_param", false));
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/price/onValueChange.js b/entity/AdvertisingItem_entity/entityfields/price/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..14ef1eb6e46ac7838669d3857d47a8a054bea15a
--- /dev/null
+++ b/entity/AdvertisingItem_entity/entityfields/price/onValueChange.js
@@ -0,0 +1,10 @@
+import("system.neon");
+import("Util_lib");
+import("system.vars");
+
+var free = vars.get("$field.free");
+var quantity = vars.get("$field.QUANTITY");
+var price = vars.get("$this.value");
+
+var targetAmount = (Utils.toBoolean(free)) ? 0 : price * quantity;
+neon.setFieldValue("$field.actualAmountForeignCurrency", targetAmount);
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/price/stateProcess.js b/entity/AdvertisingItem_entity/entityfields/price/stateProcess.js
index 275b3b6d140b066e9ce645abb91f6962b7ef7890..a494bfc57950a5b80130edc3efe54ae28ce4c624 100644
--- a/entity/AdvertisingItem_entity/entityfields/price/stateProcess.js
+++ b/entity/AdvertisingItem_entity/entityfields/price/stateProcess.js
@@ -1,6 +1,17 @@
-import("system.result");
-import("Util_lib");
import("system.neon");
import("system.vars");
+import("Util_lib");
+import("Currency_lib");
+import("system.result");
+
+var state;
+if(Utils.toBoolean(vars.get("$field.free")))
+{
+ state = neon.COMPONENTSTATE_READONLY;
+}
+else
+{
+ state = CurrencyRateUtils.getFieldStateChildEntity("CurrencyAndCurrencyRate_param");
+}
-result.string(Utils.toBoolean(vars.get("$field.free")) ? neon.COMPONENTSTATE_READONLY : neon.COMPONENTSTATE_EDITABLE);
\ No newline at end of file
+result.string(state);
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/price/titleProcess.js b/entity/AdvertisingItem_entity/entityfields/price/titleProcess.js
index c410b5945d975ab2ce29495ac5292e8edab3466e..0b0c529f999fd771359c8f742e2ee986706765f2 100644
--- a/entity/AdvertisingItem_entity/entityfields/price/titleProcess.js
+++ b/entity/AdvertisingItem_entity/entityfields/price/titleProcess.js
@@ -1,5 +1,5 @@
+import("Currency_lib");
import("system.result");
-import("system.vars");
import("system.translate");
-result.string(translate.withArguments("Price in %0", [vars.get("$param.Currency_param")]));
\ No newline at end of file
+result.string(translate.withArguments("Price (%0)", [CurrencyUtils.getLocalCurrency()]));
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/price/valueProcess.js b/entity/AdvertisingItem_entity/entityfields/price/valueProcess.js
deleted file mode 100644
index abfeadee880de187ca3bef2ec0ffa689b40d211f..0000000000000000000000000000000000000000
--- a/entity/AdvertisingItem_entity/entityfields/price/valueProcess.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import("system.neon");
-import("system.result");
-import("Util_lib");
-import("system.vars");
-
-
-if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
-{
- if(vars.get("$field.PRODUCT_ID") && vars.exists("$param.ProductObject_param") && !vars.get("$this.value"))
- {
- var quantity = vars.get("$field.QUANTITY");
-
- var productObj = JSON.parse(vars.get("$param.ProductObject_param"));
- var price = (productObj.PriceListToUse != null) ? productObj.PriceListToUse.price : vars.get("$field.PRICE");
-
- result.string(price);
- }
-}
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/priceforeigncurrency/mandatoryProcess.js b/entity/AdvertisingItem_entity/entityfields/priceforeigncurrency/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4623ee6caab4371c4c7dd3bbdace2016a8b508b7
--- /dev/null
+++ b/entity/AdvertisingItem_entity/entityfields/priceforeigncurrency/mandatoryProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.getFieldMandatoryChildEntity("CurrencyAndCurrencyRate_param", true));
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/priceforeigncurrency/onValueChange.js b/entity/AdvertisingItem_entity/entityfields/priceforeigncurrency/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..67d83c0b57d189dc78eb34cc07c64ee3b4b9eeda
--- /dev/null
+++ b/entity/AdvertisingItem_entity/entityfields/priceforeigncurrency/onValueChange.js
@@ -0,0 +1,12 @@
+import("system.neon");
+import("Util_lib");
+import("system.vars");
+import("Currency_lib");
+
+CurrencyRateUtils.setOtherValueFieldChildEntity("CurrencyAndCurrencyRate_param", "PRICE");
+var free = vars.get("$field.free");
+var quantity = vars.get("$field.QUANTITY");
+var price = vars.get("$this.value");
+
+var targetAmount = (Utils.toBoolean(free)) ? 0 : price * quantity;
+neon.setFieldValue("$field.actualAmountForeignCurrency", targetAmount);
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/priceforeigncurrency/stateProcess.js b/entity/AdvertisingItem_entity/entityfields/priceforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5fad86d76113549ff31a6a53e4a0dbad7fd4f84f
--- /dev/null
+++ b/entity/AdvertisingItem_entity/entityfields/priceforeigncurrency/stateProcess.js
@@ -0,0 +1,15 @@
+import("system.neon");
+import("system.vars");
+import("Util_lib");
+import("Currency_lib");
+import("system.result");
+
+var state = CurrencyRateUtils.getFieldStateChildEntity("CurrencyAndCurrencyRate_param", true);
+if(Utils.toBoolean(vars.get("$field.free")) && state != neon.COMPONENTSTATE_INVISIBLE)
+{
+ result.string(neon.COMPONENTSTATE_READONLY);
+}
+else
+{
+ result.string(state);
+}
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/priceforeigncurrency/titleProcess.js b/entity/AdvertisingItem_entity/entityfields/priceforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9141ba8b43e50137d762a05f2962d0ed65521007
--- /dev/null
+++ b/entity/AdvertisingItem_entity/entityfields/priceforeigncurrency/titleProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.result");
+import("Context_lib");
+import("system.vars");
+
+var currencyParam = JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"));
+var currency = ContextUtils.loadContentTitle("Currency_entity", currencyParam["currency"]);
+
+result.string(translate.withArguments("Price (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/product_id/onValueChange.js b/entity/AdvertisingItem_entity/entityfields/product_id/onValueChange.js
index 6371c57e68a249dbbbc77c7f93bfeda996633dc7..67fcce7fdad8c5cbd48bbe97ca933fc84bf4ba27 100644
--- a/entity/AdvertisingItem_entity/entityfields/product_id/onValueChange.js
+++ b/entity/AdvertisingItem_entity/entityfields/product_id/onValueChange.js
@@ -1,3 +1,5 @@
+import("Util_lib");
+import("Currency_lib");
import("Advertising_lib");
import("system.neon");
import("system.vars");
@@ -16,7 +18,14 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
if(productDetailObj.PriceListToUse != null)
{
- neon.setFieldValue("$field.PRICE", productDetailObj.PriceListToUse.price);
+ var field = "PRICE";
+
+ if(JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"))["currency"] != $CurrencyRate.LOCALCURRENCY())
+ {
+ field = "priceForeignCurrency";
+ }
+
+ neon.setFieldValue("$field." + field, productDetailObj.PriceListToUse.price);
}
}
}
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/quantity/onValueChange.js b/entity/AdvertisingItem_entity/entityfields/quantity/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..dbbfa27dca8d7ec26c660618dc79b72e8029c606
--- /dev/null
+++ b/entity/AdvertisingItem_entity/entityfields/quantity/onValueChange.js
@@ -0,0 +1,11 @@
+import("Currency_lib");
+import("system.neon");
+import("Util_lib");
+import("system.vars");
+
+var free = vars.get("$field.free");
+var quantity = vars.get("$this.value");
+var price = vars.get("$param.CurrencyAndCurrencyRate_param")["currency"] == $CurrencyRate.LOCALCURRENCY ? vars.get("$field.PRICE") : vars.get("$field.priceForeignCurrency");
+
+var targetAmount = (Utils.toBoolean(free)) ? 0 : price * quantity;
+neon.setFieldValue("$field.actualAmountForeignCurrency", targetAmount);
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/targetamount/displayValueProcess.js b/entity/AdvertisingItem_entity/entityfields/targetamount/displayValueProcess.js
deleted file mode 100644
index 180930674023d6334c71ccaa4ec5c90298c752e9..0000000000000000000000000000000000000000
--- a/entity/AdvertisingItem_entity/entityfields/targetamount/displayValueProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("Util_lib");
-import("system.result");
-import("system.vars");
-
-var targetAmount = vars.get("$this.value");
-
-if(targetAmount)
-{
- var currency = vars.get("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
- result.string(NumberUtils.formatWithCurrency(targetAmount, "#,##0.00", currency));
-}
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/targetamount/stateProcess.js b/entity/AdvertisingItem_entity/entityfields/targetamount/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..133627944bf80fede5e5823911c833132f6ff930
--- /dev/null
+++ b/entity/AdvertisingItem_entity/entityfields/targetamount/stateProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.getFieldStateChildEntity("CurrencyAndCurrencyRate_param"));
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/targetamount/titleProcess.js b/entity/AdvertisingItem_entity/entityfields/targetamount/titleProcess.js
index 01045e711f85a2f91b62a75f547fa8f5a05972ff..cf0f85cea19e4796636329fdf09f793bf261bc53 100644
--- a/entity/AdvertisingItem_entity/entityfields/targetamount/titleProcess.js
+++ b/entity/AdvertisingItem_entity/entityfields/targetamount/titleProcess.js
@@ -1,5 +1,5 @@
+import("Currency_lib");
import("system.result");
-import("system.vars");
import("system.translate");
-result.string(translate.withArguments("Target Amount in %0", [vars.get("$param.Currency_param")]));
\ No newline at end of file
+result.string(translate.withArguments("Target Amount (%0)", [CurrencyUtils.getLocalCurrency()]));
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/targetamount/valueProcess.js b/entity/AdvertisingItem_entity/entityfields/targetamount/valueProcess.js
deleted file mode 100644
index 854a02899022dc6e218b49d12692efea495c703c..0000000000000000000000000000000000000000
--- a/entity/AdvertisingItem_entity/entityfields/targetamount/valueProcess.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import("Util_lib");
-import("system.result");
-import("system.vars");
-
-if(vars.get("$field.PRODUCT_ID") && vars.exists("$param.ProductObject_param"))
-{
- var quantity = vars.get("$field.QUANTITY");
-
- //The original price of the product is used as a fallback while the price field can still be edited by the user
- var productObj = JSON.parse(vars.get("$param.ProductObject_param"));
- var price = (productObj.PriceListToUse != null) ? productObj.PriceListToUse.price : vars.get("$field.PRICE");
-
- var ret = (Utils.toBoolean(price)) ? price * quantity : 0;
-
- result.string(ret);
-}
diff --git a/entity/AdvertisingItem_entity/entityfields/targetamountforeigncurrency/onValueChange.js b/entity/AdvertisingItem_entity/entityfields/targetamountforeigncurrency/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..007e9e6e5b8e9a97835b874ee9e4050b420fd67e
--- /dev/null
+++ b/entity/AdvertisingItem_entity/entityfields/targetamountforeigncurrency/onValueChange.js
@@ -0,0 +1,3 @@
+import("Currency_lib");
+
+CurrencyRateUtils.setOtherValueFieldChildEntity("CurrencyAndCurrencyRate_param", "TARGETAMOUNT");
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/targetamountforeigncurrency/stateProcess.js b/entity/AdvertisingItem_entity/entityfields/targetamountforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1ab4f7fc02663b32f12c2099b09c09dcd8eada64
--- /dev/null
+++ b/entity/AdvertisingItem_entity/entityfields/targetamountforeigncurrency/stateProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.getFieldStateChildEntity("CurrencyAndCurrencyRate_param", true));
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/entityfields/targetamountforeigncurrency/titleProcess.js b/entity/AdvertisingItem_entity/entityfields/targetamountforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..afc51a0736ecfede0d45aaf22df6a41fe74ee715
--- /dev/null
+++ b/entity/AdvertisingItem_entity/entityfields/targetamountforeigncurrency/titleProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.result");
+import("Context_lib");
+import("system.vars");
+
+var currencyParam = JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"));
+var currency = ContextUtils.loadContentTitle("Currency_entity", currencyParam["currency"]);
+
+result.string(translate.withArguments("Target Amount (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/actualamount.displayvalue/expression.js b/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/actualamount.displayvalue/expression.js
deleted file mode 100644
index 218041fd579470a70141909b22cd2fcf7662c48a..0000000000000000000000000000000000000000
--- a/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/actualamount.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.SQLTYPES");
-import("system.result");
-import("Sql_lib");
-
-var sqlHelper = new SqlMaskingUtils();
-result.string(sqlHelper.concatenate([sqlHelper.cast(sqlHelper.cast("ADVERTISINGITEM.PRICE*ADVERTISINGITEM.QUANTITY", SQLTYPES.DECIMAL, [30, 2]), SQLTYPES.VARCHAR, 20), "' '", sqlHelper.cast("ADVERTISING.CURRENCY", SQLTYPES.VARCHAR, 20)]))
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/actualamountforeigncurrency.value/expression.js b/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/actualamountforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..ce85ed725a96531ba2e932e0b754c5d5c831dc3f
--- /dev/null
+++ b/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/actualamountforeigncurrency.value/expression.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+var currencyParam = vars.get("$param.CurrencyAndCurrencyRate_param");
+
+var price = SqlBuilder.caseWhen(newWhere("ADVERTISINGITEM.PRICE", "0", SqlBuilder.GREATER()))
+ .then("ADVERTISINGITEM.PRICE /" + JSON.parse(currencyParam)["currencyRate"])
+ .elseValue("0")
+ .toString();
+
+result.string(price + " * ADVERTISINGITEM.QUANTITY");
diff --git a/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/price.displayvalue/expression.js b/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/price.displayvalue/expression.js
deleted file mode 100644
index 8188354b06a5552d2c820ebb0bfa896a201a062b..0000000000000000000000000000000000000000
--- a/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/price.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.SQLTYPES");
-import("system.result");
-import("Sql_lib");
-
-var sqlHelper = new SqlMaskingUtils();
-result.string(sqlHelper.concatenate([sqlHelper.cast("ADVERTISINGITEM.PRICE", SQLTYPES.VARCHAR, 20), "' '", sqlHelper.cast("ADVERTISING.CURRENCY", SQLTYPES.VARCHAR, 20)]))
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/priceforeigncurrency.value/expression.js b/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/priceforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..a3b3be7967e997c2e155c41ca1361aaf13cc6bf1
--- /dev/null
+++ b/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/priceforeigncurrency.value/expression.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+var currencyParam = vars.get("$param.CurrencyAndCurrencyRate_param");
+
+var price = SqlBuilder.caseWhen(newWhere("ADVERTISINGITEM.PRICE", "0", SqlBuilder.GREATER()))
+ .then("ADVERTISINGITEM.PRICE /" + JSON.parse(currencyParam)["currencyRate"])
+ .elseValue("0")
+ .toString();
+
+result.string(price);
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/targetamount.displayvalue/expression.js b/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/targetamount.displayvalue/expression.js
deleted file mode 100644
index 74f23bb6db02038e79bab42403515d729fd6b1ba..0000000000000000000000000000000000000000
--- a/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/targetamount.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.SQLTYPES");
-import("system.result");
-import("Sql_lib");
-
-var sqlHelper = new SqlMaskingUtils();
-result.string(sqlHelper.concatenate([sqlHelper.cast("ADVERTISINGITEM.TARGETAMOUNT", SQLTYPES.VARCHAR, 20), "' '", sqlHelper.cast("ADVERTISING.CURRENCY", SQLTYPES.VARCHAR, 20)]))
\ No newline at end of file
diff --git a/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/targetamountforeigncurrency.value/expression.js b/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/targetamountforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..5c00acc60aecb1663ac92d7553809353b5d96098
--- /dev/null
+++ b/entity/AdvertisingItem_entity/recordcontainers/db/recordfieldmappings/targetamountforeigncurrency.value/expression.js
@@ -0,0 +1,12 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+var currencyParam = vars.get("$param.CurrencyAndCurrencyRate_param");
+
+var price = SqlBuilder.caseWhen(newWhere("ADVERTISINGITEM.TARGETAMOUNT", "0", SqlBuilder.GREATER()))
+ .then("ADVERTISINGITEM.TARGETAMOUNT /" + JSON.parse(currencyParam)["currencyRate"])
+ .elseValue("0")
+ .toString();
+
+result.string(price);
diff --git a/entity/Advertising_entity/Advertising_entity.aod b/entity/Advertising_entity/Advertising_entity.aod
index 6313f129f407dee8485069f4e2b1cfec2c9459f9..fb973a2464cd62f5b5683e8a575a98bf6555a599 100644
--- a/entity/Advertising_entity/Advertising_entity.aod
+++ b/entity/Advertising_entity/Advertising_entity.aod
@@ -26,15 +26,6 @@
<state>EDITABLE</state>
<displayValueProcess>%aditoprj%/entity/Advertising_entity/entityfields/contact_id/displayValueProcess.js</displayValueProcess>
</entityField>
- <entityField>
- <name>CURRENCY</name>
- <title>Currency</title>
- <consumer>KeywordCurrencies</consumer>
- <mandatory v="true" />
- <stateProcess>%aditoprj%/entity/Advertising_entity/entityfields/currency/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/Advertising_entity/entityfields/currency/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Advertising_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
- </entityField>
<entityField>
<name>OBJECT_TYPE</name>
</entityField>
@@ -122,6 +113,10 @@
<name>AdvertisingId_param</name>
<valueProcess>%aditoprj%/entity/Advertising_entity/entityfields/advertisingitemsconsumer/children/advertisingid_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>CurrencyAndCurrencyRate_param</name>
+ <valueProcess>%aditoprj%/entity/Advertising_entity/entityfields/advertisingitemsconsumer/children/currencyandcurrencyrate_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityField>
@@ -183,23 +178,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityActionField>
- <name>startWorkflow</name>
- <title>Start Workflow</title>
- <onActionProcess>%aditoprj%/entity/Advertising_entity/entityfields/startworkflow/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:PLAY</iconId>
- <stateProcess>%aditoprj%/entity/Advertising_entity/entityfields/startworkflow/stateProcess.js</stateProcess>
- <tooltip>Start advertising material workflow</tooltip>
- <tooltipProcess>%aditoprj%/entity/Advertising_entity/entityfields/startworkflow/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- <entityActionField>
- <name>newMail</name>
- <title>new Email</title>
- <onActionProcess>%aditoprj%/entity/Advertising_entity/entityfields/newmail/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:AT</iconId>
- <stateProcess>%aditoprj%/entity/Advertising_entity/entityfields/newmail/stateProcess.js</stateProcess>
- <tooltip>Send digital Advertising materials & complete Workflow Task</tooltip>
- </entityActionField>
<entityField>
<name>USER_EDIT</name>
<title>USER_EDIT</title>
@@ -210,13 +188,6 @@
<title>USER_NEW</title>
<valueProcess>%aditoprj%/entity/Advertising_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/Advertising_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/Advertising_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityParameter>
<name>IsInsertAdvertising_param</name>
<expose v="true" />
@@ -245,10 +216,50 @@
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
+ <entityField>
+ <name>CURRENCYRATE_ID</name>
+ <title>Currency</title>
+ <mandatory v="true" />
+ <dropDownProcess>%aditoprj%/entity/Advertising_entity/entityfields/currencyrate_id/dropDownProcess.js</dropDownProcess>
+ <stateProcess>%aditoprj%/entity/Advertising_entity/entityfields/currencyrate_id/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Advertising_entity/entityfields/currencyrate_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityActionField>
+ <name>startWorkflow</name>
+ <title>Start Workflow</title>
+ <onActionProcess>%aditoprj%/entity/Advertising_entity/entityfields/startworkflow/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:PLAY</iconId>
+ <stateProcess>%aditoprj%/entity/Advertising_entity/entityfields/startworkflow/stateProcess.js</stateProcess>
+ <tooltip>Start advertising material workflow</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Advertising_entity/entityfields/startworkflow/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>newMail</name>
+ <title>new Email</title>
+ <onActionProcess>%aditoprj%/entity/Advertising_entity/entityfields/newmail/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:AT</iconId>
+ <stateProcess>%aditoprj%/entity/Advertising_entity/entityfields/newmail/stateProcess.js</stateProcess>
+ <tooltip>Send digital Advertising materials & complete Workflow Task</tooltip>
+ </entityActionField>
+ <entityActionField>
+ <name>refreshCurrencyRate</name>
+ <onActionProcess>%aditoprj%/entity/Advertising_entity/entityfields/refreshcurrencyrate/onActionProcess.js</onActionProcess>
+ <iconId>NEON:RECURRING_APPOINTMENT</iconId>
+ <stateProcess>%aditoprj%/entity/Advertising_entity/entityfields/refreshcurrencyrate/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Advertising_entity/entityfields/refreshcurrencyrate/titleProcess.js</titleProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>openAdminView</name>
+ <title>Open admin view</title>
+ <onActionProcess>%aditoprj%/entity/Advertising_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CURLY_BRACKETS</iconId>
+ <stateProcess>%aditoprj%/entity/Advertising_entity/entityfields/openadminview/stateProcess.js</stateProcess>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
+ <fromClauseProcess>%aditoprj%/entity/Advertising_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Advertising_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Advertising_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<alias>Data_alias</alias>
@@ -262,11 +273,6 @@
<recordfield>ADVERTISING.CONTACT_ID</recordfield>
<isFilterable v="true" />
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CURRENCY.value</name>
- <recordfield>ADVERTISING.CURRENCY</recordfield>
- <isFilterable v="true" />
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OBJECT_TYPE.value</name>
<recordfield>ADVERTISING.OBJECT_TYPE</recordfield>
@@ -301,10 +307,6 @@
<name>STATUS.displayValue</name>
<expression>%aditoprj%/entity/Advertising_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CURRENCY.displayValue</name>
- <expression>%aditoprj%/entity/Advertising_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>RESPONSIBLE_ID.displayValue</name>
<expression>%aditoprj%/entity/Advertising_entity/recordcontainers/db/recordfieldmappings/responsible_id.displayvalue/expression.js</expression>
@@ -335,15 +337,26 @@
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/Advertising_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CURRENCYRATE_ID.value</name>
+ <recordfield>ADVERTISING.CURRENCYRATE_ID</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
- <name>f0bfd671-33ec-4106-b89e-5e2b198ec987</name>
+ <name>5509be9c-7c45-4bfe-ae69-72626c38f63f</name>
<tableName>ADVERTISING</tableName>
<primaryKey>ADVERTISINGID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
+ <linkInformation>
+ <name>9494beff-1a9c-4541-8b3b-5ab163556b29</name>
+ <tableName>CURRENCYRATE</tableName>
+ <primaryKey>CURRENCYRATEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
</linkInformation>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Advertising_entity/entityfields/advertisingitemsconsumer/children/currencyandcurrencyrate_param/valueProcess.js b/entity/Advertising_entity/entityfields/advertisingitemsconsumer/children/currencyandcurrencyrate_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a1770bb30cfa7048dd5f4ed7844d679b31fd4487
--- /dev/null
+++ b/entity/Advertising_entity/entityfields/advertisingitemsconsumer/children/currencyandcurrencyrate_param/valueProcess.js
@@ -0,0 +1,11 @@
+import("Currency_lib");
+import("system.result");
+import("system.vars");
+
+var currencyAndRate = CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)
+var res = {
+ currency: currencyAndRate[1]
+ , currencyRate: currencyAndRate[0]
+}
+
+result.string(JSON.stringify(res));
\ No newline at end of file
diff --git a/entity/Advertising_entity/entityfields/currency/displayValueProcess.js b/entity/Advertising_entity/entityfields/currency/displayValueProcess.js
deleted file mode 100644
index 71f6fd23918c683ebf7eecb2bfc971f603bd00fe..0000000000000000000000000000000000000000
--- a/entity/Advertising_entity/entityfields/currency/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$field.CURRENCY")));
\ No newline at end of file
diff --git a/entity/Advertising_entity/entityfields/currency/stateProcess.js b/entity/Advertising_entity/entityfields/currency/stateProcess.js
deleted file mode 100644
index 0ea94f675e6d0cd8e5acfa0551e348c2d119a470..0000000000000000000000000000000000000000
--- a/entity/Advertising_entity/entityfields/currency/stateProcess.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import("Advertising_lib");
-import("system.entities");
-import("system.result");
-import("system.neon");
-import("system.vars");
-
-var loadConfig = entities.createConfigForLoadingRows()
- .entity("AdvertisingItem_entity")
- .addParameter("AdvertisingId_param", vars.get("$field.ADVERTISINGID"));
-var adverttisingItemCount = entities.getRowCount(loadConfig);
-
-if(adverttisingItemCount > 0)
-{
- result.string(neon.COMPONENTSTATE_DISABLED);
-}
-else
-{
- result.string(AdvertisingUtils.isEditable(vars.get("$field.STATUS")) ? neon.COMPONENTSTATE_AUTO : neon.COMPONENTSTATE_DISABLED);
-}
diff --git a/entity/Advertising_entity/entityfields/currency/valueProcess.js b/entity/Advertising_entity/entityfields/currency/valueProcess.js
deleted file mode 100644
index 4ec1aa77fcdb20049300a98f563ca8992fe88abd..0000000000000000000000000000000000000000
--- a/entity/Advertising_entity/entityfields/currency/valueProcess.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$this.value") == null)
-{
- result.string($KeywordRegistry.currency$eur());
-}
\ No newline at end of file
diff --git a/entity/Advertising_entity/entityfields/currencyrate_id/dropDownProcess.js b/entity/Advertising_entity/entityfields/currencyrate_id/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5b9a93751bcf685ba59553666987417116ab3083
--- /dev/null
+++ b/entity/Advertising_entity/entityfields/currencyrate_id/dropDownProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("Currency_lib");
+import("system.result");
+
+result.object(CurrencyRateUtils.getCurrencies(true, false, vars.get("$sys.recordstate")));
\ No newline at end of file
diff --git a/entity/Advertising_entity/entityfields/currencyrate_id/stateProcess.js b/entity/Advertising_entity/entityfields/currencyrate_id/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..41937ced861809ea8f2e8f8882e0df5530b649f5
--- /dev/null
+++ b/entity/Advertising_entity/entityfields/currencyrate_id/stateProcess.js
@@ -0,0 +1,29 @@
+import("Advertising_lib");
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("Offer_lib");
+import("system.entities");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ var loadConfig = entities.createConfigForLoadingRows()
+ .entity("AdvertisingItem_entity")
+ .addParameter("AdvertisingId_param", vars.get("$field.ADVERTISINGID"));
+ var advertisingItemCount = entities.getRowCount(loadConfig);
+
+ var state;
+ if(advertisingItemCount > 0)
+ {
+ state = neon.COMPONENTSTATE_DISABLED;
+ }
+ else if(AdvertisingUtils.isEditable(vars.get("$field.STATUS")))
+ {
+ state = neon.COMPONENTSTATE_AUTO;
+ }
+ else
+ {
+ state = neon.COMPONENTSTATE_DISABLED;
+ }
+ result.string(state);
+}
\ No newline at end of file
diff --git a/entity/Advertising_entity/entityfields/currencyrate_id/valueProcess.js b/entity/Advertising_entity/entityfields/currencyrate_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dfa41abc63427a2e79286d4a74410713198dfe8c
--- /dev/null
+++ b/entity/Advertising_entity/entityfields/currencyrate_id/valueProcess.js
@@ -0,0 +1,10 @@
+import("Util_lib");
+import("system.result");
+import("Currency_lib");
+import("system.vars");
+
+var rate = CurrencyRateUtils.presetCurrencyRateId("CURRENCYRATE_ID");
+if(Utils.isNotNullOrEmptyString(rate))
+{
+ result.string(rate);
+}
\ No newline at end of file
diff --git a/entity/Advertising_entity/entityfields/refreshcurrencyrate/onActionProcess.js b/entity/Advertising_entity/entityfields/refreshcurrencyrate/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e3396e95e4ec47436bfdd2a571c3592a72203539
--- /dev/null
+++ b/entity/Advertising_entity/entityfields/refreshcurrencyrate/onActionProcess.js
@@ -0,0 +1,22 @@
+import("KeywordRegistry_basic");
+import("system.result");
+import("system.datetime");
+import("Keyword_lib");
+import("system.translate");
+import("Context_lib");
+import("system.vars");
+import("Currency_lib");
+
+var title = [
+ translate.text("Advertising"),
+ KeywordUtils.getViewValue($KeywordRegistry.advertisingStatus(), vars.get("$field.STATUS")),
+ datetime.toDate(vars.get("$field.DATE_NEW"), "dd.MM.yyyy")
+];
+
+title = title.join(" | ");
+
+CurrencyRateUtils.openCurrencyRateRefreshView(ContextUtils.getCurrentContextId()
+ , vars.get("$field.ADVERTISINGID")
+ , title
+ , vars.get("$field.CURRENCYRATE_ID")
+ , true);
\ No newline at end of file
diff --git a/entity/Advertising_entity/entityfields/refreshcurrencyrate/stateProcess.js b/entity/Advertising_entity/entityfields/refreshcurrencyrate/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..49315c09cf70f44d140ef76e7008966ba0563909
--- /dev/null
+++ b/entity/Advertising_entity/entityfields/refreshcurrencyrate/stateProcess.js
@@ -0,0 +1,17 @@
+import("Advertising_lib");
+import("Util_lib");
+import("system.result");
+import("system.neon");
+import("Currency_lib");
+import("system.vars");
+
+var state = neon.COMPONENTSTATE_DISABLED;
+var currencyRateId = vars.get("$field.CURRENCYRATE_ID");
+
+if(Utils.isNotNullOrEmptyString(currencyRateId) && currencyRateId != $CurrencyRate.LOCALCURRENCY()
+ && AdvertisingUtils.isEditable(vars.get("$field.STATUS")))
+{
+ state = neon.COMPONENTSTATE_EDITABLE;
+}
+
+result.string(state);
\ No newline at end of file
diff --git a/entity/Advertising_entity/entityfields/refreshcurrencyrate/titleProcess.js b/entity/Advertising_entity/entityfields/refreshcurrencyrate/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bb63bd8374be9674191d7573fafc994a49f75154
--- /dev/null
+++ b/entity/Advertising_entity/entityfields/refreshcurrencyrate/titleProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.refreshCurrencyRateActionTitle("CURRENCYRATE_ID"));
\ No newline at end of file
diff --git a/entity/Advertising_entity/recordcontainers/db/fromClauseProcess.js b/entity/Advertising_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cbe55063b9a559e78f6493192c9f87ccbc60331b
--- /dev/null
+++ b/entity/Advertising_entity/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("Sql_lib");
+
+var from = new SqlBuilder()
+ .from("ADVERTISING")
+ .leftJoin("CURRENCYRATE", "CURRENCYRATE.CURRENCYRATEID = ADVERTISING.CURRENCYRATE_ID");
+
+result.string(from.toString());
\ No newline at end of file
diff --git a/entity/Advertising_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js b/entity/Advertising_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
deleted file mode 100644
index f51da263f1cd32d2947b92a27012ea3bd048b3d5..0000000000000000000000000000000000000000
--- a/entity/Advertising_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.currency(), "ADVERTISING.CURRENCY");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/CurrencyRateRefreshRateValues_entity/CurrencyRateRefreshRateValues_entity.aod b/entity/CurrencyRateRefreshRateValues_entity/CurrencyRateRefreshRateValues_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e5c4197d41dd7225db79c08101890c943527f9b1
--- /dev/null
+++ b/entity/CurrencyRateRefreshRateValues_entity/CurrencyRateRefreshRateValues_entity.aod
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.22" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.22">
+ <name>CurrencyRateRefreshRateValues_entity</name>
+ <title>Values</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/CurrencyRateRefreshRateValues_entity/documentation.adoc</documentation>
+ <iconId>VAADIN:EURO</iconId>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityField>
+ <name>uid</name>
+ <state>INVISIBLE</state>
+ </entityField>
+ <entityField>
+ <name>valueOld</name>
+ <state>INVISIBLE</state>
+ </entityField>
+ <entityField>
+ <name>valueNew</name>
+ <state>INVISIBLE</state>
+ </entityField>
+ <entityField>
+ <name>object_type</name>
+ <state>INVISIBLE</state>
+ </entityField>
+ <entityField>
+ <name>object_rowId</name>
+ <state>INVISIBLE</state>
+ </entityField>
+ <entityParameter>
+ <name>CurrencyRateRefreshRateId_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityProvider>
+ <name>CurrencyRateRefreshChilds</name>
+ <children>
+ <entityParameter>
+ <name>CurrencyRateRefreshRateId_param</name>
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityField>
+ <name>title</name>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>valueDisplay</name>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>object_rowTitle</name>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>object_typeDisplay</name>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>table</name>
+ <state>INVISIBLE</state>
+ </entityField>
+ <entityField>
+ <name>uidColumn</name>
+ <state>INVISIBLE</state>
+ </entityField>
+ <entityField>
+ <name>valueColumn</name>
+ <state>INVISIBLE</state>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/CurrencyRateRefreshRateValues_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/CurrencyRateRefreshRateValues_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>uid.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/CurrencyRateRefreshRateValues_entity/documentation.adoc b/entity/CurrencyRateRefreshRateValues_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..a28f0df95bedfb177119fff2f41948e5720d5832
--- /dev/null
+++ b/entity/CurrencyRateRefreshRateValues_entity/documentation.adoc
@@ -0,0 +1,2 @@
+= CurrencyRateRefreshRateValues_entity
+Needed For the field values of CurrencyRateRefreshRateValue_entity. See also documentation property of said album.
\ No newline at end of file
diff --git a/entity/CurrencyRateRefreshRateValues_entity/recordcontainers/jdito/contentProcess.js b/entity/CurrencyRateRefreshRateValues_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8a8b23ca6e41d5f262b6e6e9d5d47ddb8f0d2c56
--- /dev/null
+++ b/entity/CurrencyRateRefreshRateValues_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if(vars.get("$local.idvalues"))
+{
+ result.object([vars.get("$local.idvalues")]);
+}
\ No newline at end of file
diff --git a/entity/CurrencyRateRefreshRateValues_entity/recordcontainers/jdito/onInsert.js b/entity/CurrencyRateRefreshRateValues_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..9c5cf3dce6bdd0f9da3aaa6a9ed98978edb96456
--- /dev/null
+++ b/entity/CurrencyRateRefreshRateValues_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,2 @@
+"";
+//don't delete this! The multi edit is only editable if an onInsert exists.
\ No newline at end of file
diff --git a/entity/CurrencyRateRefreshRate_entity/CurrencyRateRefreshRate_entity.aod b/entity/CurrencyRateRefreshRate_entity/CurrencyRateRefreshRate_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..5cab7f079f0c1e1b87a0233aa4434e4c857ec4d7
--- /dev/null
+++ b/entity/CurrencyRateRefreshRate_entity/CurrencyRateRefreshRate_entity.aod
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.22" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.22">
+ <name>CurrencyRateRefreshRate_entity</name>
+ <title>Refresh Currency Rate</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/CurrencyRateRefreshRate_entity/documentation.adoc</documentation>
+ <afterUiInit>%aditoprj%/entity/CurrencyRateRefreshRate_entity/afterUiInit.js</afterUiInit>
+ <iconId>VAADIN:EURO</iconId>
+ <recordContainer>jdito</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityField>
+ <name>currencyRateOld</name>
+ <title>Current Currencyrate</title>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>currencyRateNew</name>
+ <title>New Currencyrate</title>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>uid</name>
+ <state>INVISIBLE</state>
+ </entityField>
+ <entityField>
+ <name>sourceCurrency</name>
+ </entityField>
+ <entityField>
+ <name>targetCurrency</name>
+ </entityField>
+ <entityField>
+ <name>object_type</name>
+ </entityField>
+ <entityField>
+ <name>object_rowId</name>
+ </entityField>
+ <entityConsumer>
+ <name>CurrencyRateRefreshRateChilds</name>
+ <state>READONLY</state>
+ <dependency>
+ <name>dependency</name>
+ <entityName>CurrencyRateRefreshRateValues_entity</entityName>
+ <fieldName>CurrencyRateRefreshChilds</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>CurrencyRateRefreshRateId_param</name>
+ <valueProcess>%aditoprj%/entity/CurrencyRateRefreshRate_entity/entityfields/currencyraterefreshratechilds/children/currencyraterefreshrateid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>CurrencyRateRefreshRateObject_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>CurrencyRateRefreshRateChildArray_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityField>
+ <name>title</name>
+ <state>READONLY</state>
+ <titleProcess>%aditoprj%/entity/CurrencyRateRefreshRate_entity/entityfields/title/titleProcess.js</titleProcess>
+ </entityField>
+ <entityField>
+ <name>table</name>
+ </entityField>
+ <entityField>
+ <name>uidColumn</name>
+ </entityField>
+ <entityField>
+ <name>currencyRate_id</name>
+ </entityField>
+ <entityParameter>
+ <name>InsertLogHistory_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityField>
+ <name>currencyRateNewValidFrom</name>
+ <title>Valid from</title>
+ <state>READONLY</state>
+ </entityField>
+ <entityField>
+ <name>currencyRateOldValidFrom</name>
+ <title>Valid from</title>
+ <state>READONLY</state>
+ </entityField>
+ </entityFields>
+ <recordContainers>
+ <jDitoRecordContainer>
+ <name>jdito</name>
+ <jDitoRecordAlias>Data_alias</jDitoRecordAlias>
+ <contentProcess>%aditoprj%/entity/CurrencyRateRefreshRate_entity/recordcontainers/jdito/contentProcess.js</contentProcess>
+ <onInsert>%aditoprj%/entity/CurrencyRateRefreshRate_entity/recordcontainers/jdito/onInsert.js</onInsert>
+ <recordFieldMappings>
+ <jDitoRecordFieldMapping>
+ <name>uid.value</name>
+ </jDitoRecordFieldMapping>
+ </recordFieldMappings>
+ </jDitoRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/CurrencyRateRefreshRate_entity/afterUiInit.js b/entity/CurrencyRateRefreshRate_entity/afterUiInit.js
new file mode 100644
index 0000000000000000000000000000000000000000..44bf45c99e15097c69be5f2960a25382e09f7f70
--- /dev/null
+++ b/entity/CurrencyRateRefreshRate_entity/afterUiInit.js
@@ -0,0 +1,60 @@
+import("Currency_lib");
+import("system.datetime");
+import("Sql_lib");
+import("Util_lib");
+import("system.text");
+import("system.translate");
+import("system.neon");
+import("system.vars");
+
+var parent = JSON.parse(vars.get("$param.CurrencyRateRefreshRateObject_param"));
+var childs = JSON.parse(vars.get("$param.CurrencyRateRefreshRateChildArray_param"));
+
+var currencyRateNew = parent["currencyRateId"];
+var currencyRateOld = parent["oldCurrencyRateId"];
+
+var rateValidFroms = newSelect("CURRENCYRATE.VALID_FROM")
+ .from("CURRENCYRATE")
+ .where("CURRENCYRATE.CURRENCYRATEID", [currencyRateNew, currencyRateOld], SqlBuilder.IN())
+ .orderBy("CURRENCYRATE.VALID_FROM asc")
+ .arrayColumn();
+
+var oldRateValidFrom = rateValidFroms[0];
+var newRateValidFrom = rateValidFroms[1] == undefined ? oldRateValidFrom : rateValidFroms[1];
+
+//general information
+neon.setFieldValues({
+ "$field.object_type": parent["objectType"],
+ "$field.object_rowId": parent["objectRowId"],
+ "$field.title": parent["title"],
+ "$field.currencyRateNew": parent["currencyRateNew"],
+ "$field.currencyRateOld": parent["currencyRateOld"],
+ "$field.currencyRateNewValidFrom": datetime.toDate(newRateValidFrom, translate.text("dd/MM/yyyy HH:mm")),
+ "$field.currencyRateOldValidFrom": datetime.toDate(oldRateValidFrom, translate.text("dd/MM/yyyy HH:mm")),
+ "$field.table": parent["table"],
+ "$field.uidColumn": parent["uidColumn"],
+ "$field.currencyRate_id": parent["currencyRateId"]
+ });
+
+var localCurrencyIso = newSelect("AB_CURRENCY.SIGN")
+ .from("AB_CURRENCY")
+ .where("AB_CURRENCY.ISO4", CurrencyUtils.getLocalCurrency())
+ .cell();
+//values
+for(var element in childs)
+{
+ var child = JSON.parse(childs[element]);
+ neon.addRecord("CurrencyRateRefreshRateChilds", {
+ "object_rowId" : child["objectRowId"]
+ , "object_type" : child["objectType"]
+ , "object_typeDisplay" : child["objectType"] == "Order" ? translate.text("Recipt") : child["objectType"] == "AdvertisingItem" ? translate.text("Advertising Item") : translate.text(child["objectType"])
+ , "title" : child["title"]
+ , "object_rowTitle" : child["object_rowTitle"]
+ , "valueOld" : Utils.isNullOrEmptyString(child["valueOld"]) ? 0 : child["valueOld"]
+ , "valueNew" : Utils.isNullOrEmptyString(child["valueOld"]) ? 0 : child["valueNew"]
+ , "valueDisplay": NumberUtils.formatWithCurrency(Utils.isNullOrEmptyString(child["valueOld"]) ? 0 : child["valueOld"], translate.text("#,##0.00"), localCurrencyIso) + " -> " + NumberUtils.formatWithCurrency(Utils.isNullOrEmptyString(child["valueNew"]) ? 0 : child["valueNew"], translate.text("#,##0.00"), localCurrencyIso)
+ , "table": child["table"]
+ , "uidColumn": child["uidColumn"]
+ , "valueColumn": child["valueColumn"]
+ });
+}
\ No newline at end of file
diff --git a/entity/CurrencyRateRefreshRate_entity/documentation.adoc b/entity/CurrencyRateRefreshRate_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..cf2523d3ed47a852db2f46cc4e596395f662dbd2
--- /dev/null
+++ b/entity/CurrencyRateRefreshRate_entity/documentation.adoc
@@ -0,0 +1,8 @@
+= CurrencyRateRefreshRate_entity
+
+== Overview
+Entity needed for the refresh rate action used by all the entities that support currency rates.
+Every entity that stores a currency rate id should have a action that calls CurrencyRateUtils.openCurrencyRateRefreshView(). And the object type should have been implemented in said Action.
+Said action opens the editview of this entity and the fields and consumer rows get set in the afterUiInit process of this entity using CurrencyRateRefreshRateObject_param and CurrencyRateRefreshRateChildArray_param.
+The values get updated as soon as the user saves (onInsertProcess).
+All the values get preset as consumerRows using CurrencyRateRefreshRateValues_entity. Since those could be n many.
\ No newline at end of file
diff --git a/entity/CurrencyRateRefreshRate_entity/entityfields/currencyraterefreshratechilds/children/currencyraterefreshrateid_param/valueProcess.js b/entity/CurrencyRateRefreshRate_entity/entityfields/currencyraterefreshratechilds/children/currencyraterefreshrateid_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ae73f73dbc8274e63e116f801b775503f4a4b6ab
--- /dev/null
+++ b/entity/CurrencyRateRefreshRate_entity/entityfields/currencyraterefreshratechilds/children/currencyraterefreshrateid_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("$field.uid");
\ No newline at end of file
diff --git a/entity/CurrencyRateRefreshRate_entity/entityfields/title/titleProcess.js b/entity/CurrencyRateRefreshRate_entity/entityfields/title/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fb6dd0d965e018950a88b6e998e75037b09b1537
--- /dev/null
+++ b/entity/CurrencyRateRefreshRate_entity/entityfields/title/titleProcess.js
@@ -0,0 +1,5 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+
+result.string(translate.text(vars.get("$field.object_type")));
\ No newline at end of file
diff --git a/entity/CurrencyRateRefreshRate_entity/recordcontainers/jdito/contentProcess.js b/entity/CurrencyRateRefreshRate_entity/recordcontainers/jdito/contentProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8a8b23ca6e41d5f262b6e6e9d5d47ddb8f0d2c56
--- /dev/null
+++ b/entity/CurrencyRateRefreshRate_entity/recordcontainers/jdito/contentProcess.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("system.vars");
+
+if(vars.get("$local.idvalues"))
+{
+ result.object([vars.get("$local.idvalues")]);
+}
\ No newline at end of file
diff --git a/entity/CurrencyRateRefreshRate_entity/recordcontainers/jdito/onInsert.js b/entity/CurrencyRateRefreshRate_entity/recordcontainers/jdito/onInsert.js
new file mode 100644
index 0000000000000000000000000000000000000000..d2db432b4879cb03c2257c1553596e0391534d7c
--- /dev/null
+++ b/entity/CurrencyRateRefreshRate_entity/recordcontainers/jdito/onInsert.js
@@ -0,0 +1,73 @@
+import("Sql_lib");
+import("system.translate");
+import("system.util");
+import("Employee_lib");
+import("Util_lib");
+import("Currency_lib");
+import("system.db");
+import("Entity_lib");
+import("system.vars");
+
+var objectType = vars.get("$field.object_type");
+var objectRowId = vars.get("$field.object_rowId");
+
+var values = EntityConsumerRowsHelper.getCurrentConsumerRows("CurrencyRateRefreshRateChilds", ["object_rowId"
+ , "object_type"
+ , "valueOld"
+ , "valueNew"]);
+
+var updateStatements = [];
+var parentObjectValues = {};
+parentObjectValues["CURRENCYRATE_ID"] = vars.get("$field.currencyRate_id");
+
+if(vars.get("$field.currencyRateNew") != vars.get("$field.currencyRateOld"))
+{
+ for (var i = 0; i < values.length; i++)
+ {
+ if(values[i]["valueColumn"] != $CurrencyRate.DONOTINSERT())
+ {
+ var valueColumn = values[i]["valueColumn"];
+ if(values[i]["object_type"] == objectType)
+ {
+ parentObjectValues[valueColumn] = values[i]["valueNew"];
+ }
+ else
+ {
+ var fieldsValuesObject = {};
+ fieldsValuesObject[valueColumn] = values[i]["valueNew"];
+
+ updateStatements.push(newWhere(values[i]["table"] + "." + values[i]["uidColumn"], values[i]["object_rowId"])
+ .buildUpdateStatement(fieldsValuesObject, values[i]["table"]));
+ }
+ }
+ }
+}
+
+updateStatements.push(newWhere(vars.get("$field.table") + "." + vars.get("$field.uidColumn"), vars.get("$field.object_rowId"))
+ .buildUpdateStatement(parentObjectValues, vars.get("$field.table")));
+
+db.updates(updateStatements);
+
+if(Utils.toBoolean(vars.get("$param.InsertLogHistory_param")))
+{
+ var translatedCurrency = newSelect("AB_CURRENCY.NAME")
+ .from("AB_CURRENCY")
+ .where("AB_CURRENCY.ISO4", CurrencyUtils.getLocalCurrency())
+ .cell();
+ var logText = translate.withArguments("%0 Values updated using the current rate: %1", [translatedCurrency, vars.get("$field.currencyRateOld") + " (" + vars.get("$field.currencyRateOldValidFrom")+ ") -> " + vars.get("$field.currencyRateNew")+ " (" + vars.get("$field.currencyRateOldValidFrom")+ ")"]);
+ var user = EmployeeUtils.getCurrentUserName();
+
+ var insertStatements = [];
+ var sqlBuilder = new SqlBuilder();
+
+ insertStatements.push(sqlBuilder.buildInsertStatement({
+ "USER_NEW": user
+ , "DATE_NEW": vars.get("$sys.date")
+ , "DESCRIPTION": logText
+ , "LOGTYPE": "I"
+ , "TABLENAME": vars.get("$field.table").toUpperCase()
+ , "TABLENAMEID": vars.get("$field.object_rowId")
+ }, "AB_LOGHISTORY", "AB_LOGHISTORYID"));
+
+ db.inserts(insertStatements);
+}
\ No newline at end of file
diff --git a/entity/CurrencyRate_entity/CurrencyRate_entity.aod b/entity/CurrencyRate_entity/CurrencyRate_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..afb5c20532b8dcda0381113075bd0dd551e2c4ec
--- /dev/null
+++ b/entity/CurrencyRate_entity/CurrencyRate_entity.aod
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.22" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.22">
+ <name>CurrencyRate_entity</name>
+ <title>Currency Rates</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/CurrencyRate_entity/documentation.adoc</documentation>
+ <grantUpdate v="false" />
+ <grantDelete v="false" />
+ <iconId>VAADIN:EURO</iconId>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityField>
+ <name>CURRENCYRATEID</name>
+ <state>INVISIBLE</state>
+ </entityField>
+ <entityField>
+ <name>CURRENCYRATE</name>
+ <title>Exchange Rate </title>
+ <contentType>NUMBER</contentType>
+ <mandatory v="true" />
+ </entityField>
+ <entityField>
+ <name>SOURCECURRENCYISO</name>
+ <title>Source Currency</title>
+ <consumer>Currencies</consumer>
+ <groupable v="true" />
+ <mandatory v="true" />
+ <displayValueProcess>%aditoprj%/entity/CurrencyRate_entity/entityfields/sourcecurrencyiso/displayValueProcess.js</displayValueProcess>
+ <onValidation>%aditoprj%/entity/CurrencyRate_entity/entityfields/sourcecurrencyiso/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>TARGETCURRENCYISO</name>
+ <title>Target Currency</title>
+ <consumer>Currencies</consumer>
+ <groupable v="true" />
+ <mandatory v="true" />
+ <state>READONLY</state>
+ <valueProcess>%aditoprj%/entity/CurrencyRate_entity/entityfields/targetcurrencyiso/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/CurrencyRate_entity/entityfields/targetcurrencyiso/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>VALID_FROM</name>
+ <title>Valid from</title>
+ <contentType>DATE</contentType>
+ <mandatory v="true" />
+ <state>AUTO</state>
+ <valueProcess>%aditoprj%/entity/CurrencyRate_entity/entityfields/valid_from/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>DATE_NEW</name>
+ <title>DATE_NEW</title>
+ <contentType>DATE</contentType>
+ <state>INVISIBLE</state>
+ <valueProcess>%aditoprj%/entity/CurrencyRate_entity/entityfields/date_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>USER_NEW</name>
+ <title>USER_NEW</title>
+ <state>INVISIBLE</state>
+ <valueProcess>%aditoprj%/entity/CurrencyRate_entity/entityfields/user_new/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>Currencies</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Currency_entity</entityName>
+ <fieldName>Currencies</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>DisplayLongTitle_param</name>
+ <valueProcess>%aditoprj%/entity/CurrencyRate_entity/entityfields/currencies/children/displaylongtitle_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityActionField>
+ <name>openAdminView</name>
+ <title>Open admin view</title>
+ <onActionProcess>%aditoprj%/entity/CurrencyRate_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CURLY_BRACKETS</iconId>
+ <stateProcess>%aditoprj%/entity/CurrencyRate_entity/entityfields/openadminview/stateProcess.js</stateProcess>
+ </entityActionField>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <orderClauseProcess>%aditoprj%/entity/CurrencyRate_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
+ <alias>Data_alias</alias>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>VALID_FROM.value</name>
+ <recordfield>CURRENCYRATE.VALID_FROM</recordfield>
+ <isFilterable v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TARGETCURRENCYISO.value</name>
+ <recordfield>CURRENCYRATE.TARGETCURRENCYISO</recordfield>
+ <isFilterable v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TARGETCURRENCYISO.displayValue</name>
+ <expression>%aditoprj%/entity/CurrencyRate_entity/recordcontainers/db/recordfieldmappings/targetcurrencyiso.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SOURCECURRENCYISO.value</name>
+ <recordfield>CURRENCYRATE.SOURCECURRENCYISO</recordfield>
+ <isFilterable v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CURRENCYRATE.value</name>
+ <recordfield>CURRENCYRATE.CURRENCYRATE</recordfield>
+ <isFilterable v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CURRENCYRATEID.value</name>
+ <recordfield>CURRENCYRATE.CURRENCYRATEID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>USER_NEW.value</name>
+ <recordfield>CURRENCYRATE.USER_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DATE_NEW.value</name>
+ <recordfield>CURRENCYRATE.DATE_NEW</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>SOURCECURRENCYISO.displayValue</name>
+ <expression>%aditoprj%/entity/CurrencyRate_entity/recordcontainers/db/recordfieldmappings/sourcecurrencyiso.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>6226d399-5fb5-49a1-aaa9-80f6d7890dc1</name>
+ <tableName>CURRENCYRATE</tableName>
+ <primaryKey>CURRENCYRATEID</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/CurrencyRate_entity/documentation.adoc b/entity/CurrencyRate_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..160588a6675061cf03c2679437370791be2a1291
--- /dev/null
+++ b/entity/CurrencyRate_entity/documentation.adoc
@@ -0,0 +1,60 @@
+= CurrencyRate_entity
+An Entity for handling and administering Currency Rates.
+This entity makes use of Currency_entity.
+This *might* make use of a webservice in the future.
+
+The CurrencyRate_entity contains the basic information which is needed to use currency rates in ADITO
+That includes:
+VALID_FROM : From which the rate is valid from
+SOURCECURRENCYISO : the source currency of this rate
+TARGETCURRENCYISO : the target currency of this rate
+CURRENCYRATE : The currency rate
+(Aswell as the defaultcolumns)
+
+== Why does this entity exist
+In the past it was already possible to store prices in different currencies by just adding a CURRENCY field.
+The problem with this approach is that the way the values have been stored made it nearly impossible to analyse and display the values, and a salesEmployee for example
+might have had trouble when trying to compare different prices in different currencies with eachother.
+We also didn't pay attention to currency rates - even though the value of offers might vary depending on the fluctuation of the currency.
+
+== Prefix
+Each user can change his user currency in the user settings. And more importantly: you have to set a local currency (ISO4) in the project preferences once. (see also Currency_entity)
+
+== Where to start
+Currencyrates can be created (but not deleted/edited!) in the administration using this entity:
+You set the valid from, source and target currency and the rate you want. At the moment it is only possible to set the local currency as target currency.
+If the local Currency is Euro and you create a Swiss Franc rate with 1,06 as the rate then 1,06 Swiss Francs equal to 1 Euro: 100Fr = 106,00€
+
+== Using Currencyrates in other entities
+When creating an offer for example the user has a currency field where he can chose from all the currencies that have a rate set + the local currency.
+But it's not the currency that is being stored: We always store the currency rate id of the current valid rate (or localCurrency if its the local currency).
+If the currency equals the local currency then the user can store values in the normal field as he always used to do.
+But if the currency differs then the normal field is automatically set to readOnly and instead he sees another field where he can input his value in the specified currency (in other cases this field is invisible).
+This second foreignCurrency field does not have a column in the database but instead only the local currency value gets stored (it's value is being set by the onValueChangeProcess)
+The stored values do not automatically get updated when inserting a new currency rate. Instead said entity has a objectAction to update the values and the rate.
+This opens a overlayview where you see how the rate and all the field values change. For more info on this see also (CurrencyRateRefreshRate_entity).
+
+== How to add the multi-currency capability to other entities:
+Add CURRENCYRATE_ID Column and Field
+make the field mandatory, add title, recordfieldmapping, paste valueProcess and dropDownProcess, add stateProcess to disable the field as soon as the first money value has been set
+add the field in the views you want.
+add CURRENCYRATE in linkinformation and fromClause so the foreignCurrencyPrices can be calculated
+create foreignCurrency fields for all fields of the entity that store moneyValues e.G:
+Salesproject now not only has VOLUME but also volumeForeignCurrency. In Volume we always store the value in the local currency, in the other one, as the name suggests, in a foreign currency (specified by CURRENCYRATE_ID)
+Add valueExpression and valueProcess for every foreignCurrency field, aswell as titleProcess and set contentType and input/outputFormat.
+If the field is editable then you also have to add a onValueChangeProcess (you can use CurrencyRateUtils.setOtherValueFieldChildEntity())
+You also have to set stateProcesses and titleProcesses of the local- and the foreignCurrency fields.
+The normal Behaviour is as follows:
+The fieldnames include the currency in brackets and you should only see the foreign currency ones if the currency is set to something other than the local currency. Otherwise they should be invisible.
+The local currency field is always visible but set to readonly if the currency != localCurrency
+If you have a child entity whose prices depend on the currency of the parent entity (e.g: Forecasts of Salesprojects, Offeritems of Offer, Orderitems of Order etc.)
+then you have to add a parameter there to transmit the currency and the rate. So add one and fill it in the Consumer of the parent entity (see also CurrencyAndCurrencyRate_param).
+Next you also have to add foreignCurrency fields for every price field, and repeat the same steps as above.
+
+If you already had an currencyField then you should search for it's usages and switch to the CURRENCYRATE_ID field. (you can use CurrencyRateUtils.getCurrencyRateById() to get the currency iso)
+
+We have a "refreshCurrencyRate" Action to recalculate the values using the current currency rate. Add this action to the parent entity using CurrencyRateUtils.openCurrencyRateRefreshView()
+and add a case for your context in said function.
+
+== How to migrate money values that have been entered before using the currency rate
+There exists a serverProcess to migrate those datasets: migrate_currencyValues_serverProcess. For more information have a look into the documentation of said process.
\ No newline at end of file
diff --git a/entity/CurrencyRate_entity/entityfields/currencies/children/displaylongtitle_param/valueProcess.js b/entity/CurrencyRate_entity/entityfields/currencies/children/displaylongtitle_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..40effa0178464da0c7850912345f19c7fa95975a
--- /dev/null
+++ b/entity/CurrencyRate_entity/entityfields/currencies/children/displaylongtitle_param/valueProcess.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string(true);
\ No newline at end of file
diff --git a/entity/CurrencyRate_entity/entityfields/date_new/valueProcess.js b/entity/CurrencyRate_entity/entityfields/date_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6c24b03e830f2a613bfbe30fd7ff0be6641ea87a
--- /dev/null
+++ b/entity/CurrencyRate_entity/entityfields/date_new/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/CurrencyRate_entity/entityfields/openadminview/onActionProcess.js b/entity/CurrencyRate_entity/entityfields/openadminview/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..cc82a19f5451d3f0aab4ab7b135c6e2ae40f247a
--- /dev/null
+++ b/entity/CurrencyRate_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("Context_lib");
+
+AdminViewUtils.open("CURRENCYRATEID", [
+ ["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
+ ["USER_NEW", vars.get("$field.USER_NEW")],
+]);
\ No newline at end of file
diff --git a/entity/CurrencyRate_entity/entityfields/openadminview/stateProcess.js b/entity/CurrencyRate_entity/entityfields/openadminview/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..38f2298db7304b4d44a15fbad7f720558c02da99
--- /dev/null
+++ b/entity/CurrencyRate_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+import("Context_lib");
+import("system.result");
+
+result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/CurrencyRate_entity/entityfields/sourcecurrencyiso/displayValueProcess.js b/entity/CurrencyRate_entity/entityfields/sourcecurrencyiso/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7d3d3f5ab77a3cbdc10e75d9e683b1d9493ad70a
--- /dev/null
+++ b/entity/CurrencyRate_entity/entityfields/sourcecurrencyiso/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.loadContentTitle("Currency_entity", vars.get("$field.SOURCECURRENCYISO"), "Currencies", {"DisplayLongTitle_param": true}));
\ No newline at end of file
diff --git a/entity/CurrencyRate_entity/entityfields/sourcecurrencyiso/onValidation.js b/entity/CurrencyRate_entity/entityfields/sourcecurrencyiso/onValidation.js
new file mode 100644
index 0000000000000000000000000000000000000000..de9cb7f25c74291612b86f0a5e9641f39993a861
--- /dev/null
+++ b/entity/CurrencyRate_entity/entityfields/sourcecurrencyiso/onValidation.js
@@ -0,0 +1,11 @@
+import("system.translate");
+import("system.result");
+import("system.vars");
+
+var sourceCurrency = vars.get("$this.value");
+var targetCurrency = vars.get("$field.TARGETCURRENCYISO");
+
+if(sourceCurrency == targetCurrency)
+{
+ result.string(translate.text("Source Currency and Target Currency cannot be the same Currency."))
+}
\ No newline at end of file
diff --git a/entity/CurrencyRate_entity/entityfields/targetcurrencyiso/displayValueProcess.js b/entity/CurrencyRate_entity/entityfields/targetcurrencyiso/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d769ccf395fd9e5278d11c3cca9fa9a7d06cf9c3
--- /dev/null
+++ b/entity/CurrencyRate_entity/entityfields/targetcurrencyiso/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+result.string(ContextUtils.loadContentTitle("Currency_entity", vars.get("$field.TARGETCURRENCYISO"), "Currencies", {"DisplayLongTitle_param": true}));
\ No newline at end of file
diff --git a/entity/CurrencyRate_entity/entityfields/targetcurrencyiso/valueProcess.js b/entity/CurrencyRate_entity/entityfields/targetcurrencyiso/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7f0ecb844d56966696fb028e3bcaa9f6e28b47d1
--- /dev/null
+++ b/entity/CurrencyRate_entity/entityfields/targetcurrencyiso/valueProcess.js
@@ -0,0 +1,9 @@
+import("Currency_lib");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+ result.string(CurrencyUtils.getLocalCurrency());
+}
\ No newline at end of file
diff --git a/entity/CurrencyRate_entity/entityfields/user_new/valueProcess.js b/entity/CurrencyRate_entity/entityfields/user_new/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..deded844572949711c9991fd22dd32bfeadd473a
--- /dev/null
+++ b/entity/CurrencyRate_entity/entityfields/user_new/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.util");
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+ result.string(vars.get("$sys.user"));
+}
\ No newline at end of file
diff --git a/entity/CurrencyRate_entity/entityfields/valid_from/valueProcess.js b/entity/CurrencyRate_entity/entityfields/valid_from/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6c24b03e830f2a613bfbe30fd7ff0be6641ea87a
--- /dev/null
+++ b/entity/CurrencyRate_entity/entityfields/valid_from/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
+{
+ result.string(vars.get("$sys.date"));
+}
\ No newline at end of file
diff --git a/entity/CurrencyRate_entity/recordcontainers/db/orderClauseProcess.js b/entity/CurrencyRate_entity/recordcontainers/db/orderClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1e780a28dc6d1a2da0badbd82c415185e61b2ebc
--- /dev/null
+++ b/entity/CurrencyRate_entity/recordcontainers/db/orderClauseProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("system.db");
+
+result.object({"CURRENCYRATE.VALID_FROM": db.DESCENDING});
\ No newline at end of file
diff --git a/entity/CurrencyRate_entity/recordcontainers/db/recordfieldmappings/sourcecurrencyiso.displayvalue/expression.js b/entity/CurrencyRate_entity/recordcontainers/db/recordfieldmappings/sourcecurrencyiso.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..1f66db2782e978512e5b569c505a5fc2dd7e10f8
--- /dev/null
+++ b/entity/CurrencyRate_entity/recordcontainers/db/recordfieldmappings/sourcecurrencyiso.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = CurrencyKeywordUtils.getResolvedTitleSqlPart("CURRENCYRATE.SOURCECURRENCYISO");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/CurrencyRate_entity/recordcontainers/db/recordfieldmappings/targetcurrencyiso.displayvalue/expression.js b/entity/CurrencyRate_entity/recordcontainers/db/recordfieldmappings/targetcurrencyiso.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..08b8bcfd85388861faaafb65a4931f68bb940c01
--- /dev/null
+++ b/entity/CurrencyRate_entity/recordcontainers/db/recordfieldmappings/targetcurrencyiso.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = CurrencyKeywordUtils.getResolvedTitleSqlPart("CURRENCYRATE.TARGETCURRENCYISO");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Currency_entity/Currency_entity.aod b/entity/Currency_entity/Currency_entity.aod
new file mode 100644
index 0000000000000000000000000000000000000000..b18a372f83b81a2200b1ae1604db251e934c6839
--- /dev/null
+++ b/entity/Currency_entity/Currency_entity.aod
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.22" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.22">
+ <name>Currency_entity</name>
+ <title>Currency</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/entity/Currency_entity/documentation.adoc</documentation>
+ <contentTitleProcess>%aditoprj%/entity/Currency_entity/contentTitleProcess.js</contentTitleProcess>
+ <iconId>VAADIN:EURO</iconId>
+ <titlePlural>Currencies</titlePlural>
+ <recordContainer>db</recordContainer>
+ <entityFields>
+ <entityProvider>
+ <name>#PROVIDER</name>
+ </entityProvider>
+ <entityProvider>
+ <name>#PROVIDER_AGGREGATES</name>
+ <useAggregates v="true" />
+ </entityProvider>
+ <entityField>
+ <name>ISO4</name>
+ </entityField>
+ <entityField>
+ <name>NUMBERCODE</name>
+ <contentType>NUMBER</contentType>
+ </entityField>
+ <entityField>
+ <name>NAME</name>
+ <displayValueProcess>%aditoprj%/entity/Currency_entity/entityfields/name/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>SIGN</name>
+ </entityField>
+ <entityField>
+ <name>ISACTIVE</name>
+ </entityField>
+ <entityParameter>
+ <name>Blacklist_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>InvertBlacklist_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityProvider>
+ <name>Currencies</name>
+ <documentation>%aditoprj%/entity/Currency_entity/entityfields/currencies/documentation.adoc</documentation>
+ <children>
+ <entityParameter>
+ <name>Blacklist_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>InvertBlacklist_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityParameter>
+ <name>DisplayLongTitle_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </children>
+ </entityProvider>
+ <entityParameter>
+ <name>DisplayLongTitle_param</name>
+ <expose v="true" />
+ </entityParameter>
+ </entityFields>
+ <recordContainers>
+ <dbRecordContainer>
+ <name>db</name>
+ <isPageable v="false" />
+ <conditionProcess>%aditoprj%/entity/Currency_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
+ <alias>Data_alias</alias>
+ <cacheType>GLOBAL</cacheType>
+ <cacheKeyProcess>%aditoprj%/entity/Currency_entity/recordcontainers/db/cacheKeyProcess.js</cacheKeyProcess>
+ <recordFieldMappings>
+ <dbRecordFieldMapping>
+ <name>SIGN.value</name>
+ <recordfield>AB_CURRENCY.SIGN</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>NUMBERCODE.value</name>
+ <recordfield>AB_CURRENCY.NUMBERCODE</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>NAME.value</name>
+ <recordfield>AB_CURRENCY.NAME</recordfield>
+ <isFilterable v="true" />
+ <isLookupFilter v="true" />
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ISO4.value</name>
+ <recordfield>AB_CURRENCY.ISO4</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ISACTIVE.value</name>
+ <recordfield>AB_CURRENCY.ISACTIVE</recordfield>
+ </dbRecordFieldMapping>
+ </recordFieldMappings>
+ <linkInformation>
+ <linkInformation>
+ <name>720b9da4-b237-49a5-89ce-68bc40156288</name>
+ <tableName>AB_CURRENCY</tableName>
+ <primaryKey>ISO4</primaryKey>
+ <isUIDTable v="true" />
+ <readonly v="false" />
+ </linkInformation>
+ </linkInformation>
+ </dbRecordContainer>
+ </recordContainers>
+</entity>
diff --git a/entity/Currency_entity/contentTitleProcess.js b/entity/Currency_entity/contentTitleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ee181bdd1e180aaeeb194376f3d199e7ae1c9e76
--- /dev/null
+++ b/entity/Currency_entity/contentTitleProcess.js
@@ -0,0 +1,13 @@
+import("Util_lib");
+import("system.result");
+import("system.translate");
+import("system.vars");
+
+var iso = vars.get("$field.ISO4");
+var res = iso;
+if(Utils.toBoolean(vars.get("$param.DisplayLongTitle_param")))
+{
+ var title = vars.get("$field.NAME");
+ res = translate.text(title) + " (" + iso + ")";
+}
+result.string(res);
\ No newline at end of file
diff --git a/entity/Currency_entity/documentation.adoc b/entity/Currency_entity/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..a96376d0dd24b27fa774ebdff35643a4c3adeb1f
--- /dev/null
+++ b/entity/Currency_entity/documentation.adoc
@@ -0,0 +1,7 @@
+= Currency_entity
+
+== Overview
+Central place to store currencies.
+If you want to store values in different currencies then you probably wanna use currency rates. See CurrencyRate_entity for more information on that.
+Don't forget to set a localCurrency in the project preferences! (as ISO4)
+Each user also has the option to change his currency in the user settings (click on the user icon in the top right corner, settings, user currency)
\ No newline at end of file
diff --git a/entity/Currency_entity/entityfields/currencies/documentation.adoc b/entity/Currency_entity/entityfields/currencies/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..75fb2b910a07b76cc7550368a76fb418faeb661e
--- /dev/null
+++ b/entity/Currency_entity/entityfields/currencies/documentation.adoc
@@ -0,0 +1,2 @@
+= Currencies provider
+So Whitelists / inverted Whitelists (blacklists) are possible.
\ No newline at end of file
diff --git a/entity/Currency_entity/entityfields/name/displayValueProcess.js b/entity/Currency_entity/entityfields/name/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..60728b855572f3068a1d7296e2a9e23550eb97d5
--- /dev/null
+++ b/entity/Currency_entity/entityfields/name/displayValueProcess.js
@@ -0,0 +1,5 @@
+import("system.translate");
+import("system.vars");
+import("system.result");
+
+result.string(translate.text(vars.get("$this.value")));
\ No newline at end of file
diff --git a/entity/Currency_entity/recordcontainers/db/cacheKeyProcess.js b/entity/Currency_entity/recordcontainers/db/cacheKeyProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ee27843756425f17b58191bac12a7ff431dacfa4
--- /dev/null
+++ b/entity/Currency_entity/recordcontainers/db/cacheKeyProcess.js
@@ -0,0 +1,6 @@
+import("CachedRecordContainer_lib");
+import("system.result")
+
+//no locale in the key because the locale does not modify the result of the recordcontainer
+var res = CachedRecordContainerUtils.getKeyWithPreset(CachedRecordContainerFieldPresets.STANDARD(), "$param.Blacklist_param");
+result.string(res);
\ No newline at end of file
diff --git a/entity/Currency_entity/recordcontainers/db/conditionProcess.js b/entity/Currency_entity/recordcontainers/db/conditionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1d5142521de8e1dfa771de90dd4bdf92207f94aa
--- /dev/null
+++ b/entity/Currency_entity/recordcontainers/db/conditionProcess.js
@@ -0,0 +1,17 @@
+import("system.vars");
+import("system.db");
+import("system.result");
+import("Sql_lib");
+
+var cond = newWhere();
+if (vars.getString("$param.Blacklist_param"))
+{
+ var operator = SqlBuilder.NOT_IN();
+ if(vars.get("$param.InvertBlacklist_param"))
+ {
+ operator = SqlBuilder.IN();
+ }
+ cond.andIfSet("AB_CURRENCY.ISO4", JSON.parse(vars.getString("$param.Blacklist_param")), operator)
+}
+
+result.string(cond.toString())
\ No newline at end of file
diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod
index 8d2b49c8a0d189a4e34a62dc62d6b112685946af..b53a4c2fbd2b5fe3b11812e116e7bba890e4f097 100644
--- a/entity/Forecast_entity/Forecast_entity.aod
+++ b/entity/Forecast_entity/Forecast_entity.aod
@@ -53,6 +53,8 @@
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<mandatory v="true" />
+ <mandatoryProcess>%aditoprj%/entity/Forecast_entity/entityfields/volume/mandatoryProcess.js</mandatoryProcess>
+ <stateProcess>%aditoprj%/entity/Forecast_entity/entityfields/volume/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Forecast_entity/entityfields/volume/titleProcess.js</titleProcess>
</entityField>
<entityConsumer>
@@ -127,6 +129,22 @@
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
+ <entityField>
+ <name>volumeForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <mandatoryProcess>%aditoprj%/entity/Forecast_entity/entityfields/volumeforeigncurrency/mandatoryProcess.js</mandatoryProcess>
+ <stateProcess>%aditoprj%/entity/Forecast_entity/entityfields/volumeforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Forecast_entity/entityfields/volumeforeigncurrency/titleProcess.js</titleProcess>
+ <onValueChange>%aditoprj%/entity/Forecast_entity/entityfields/volumeforeigncurrency/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityParameter>
+ <name>CurrencyAndCurrencyRate_param</name>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/Forecast_entity/entityfields/currencyandcurrencyrate_param/documentation.adoc</documentation>
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -185,13 +203,17 @@
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>volumeForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/volumeforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
- <name>920ae11e-ae44-400f-9df0-fa879131a05c</name>
+ <name>29894adc-c41b-48b4-a1bb-dcee8d054173</name>
<tableName>FORECAST</tableName>
<primaryKey>FORECASTID</primaryKey>
- <isUIDTable v="false" />
+ <isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
</linkInformation>
diff --git a/entity/Forecast_entity/afterSave.js b/entity/Forecast_entity/afterSave.js
index 5465a06689922c673973a24fdfa5ba111c79d42d..984deeb9fad136c545ba565b115c5eb6bec437dd 100644
--- a/entity/Forecast_entity/afterSave.js
+++ b/entity/Forecast_entity/afterSave.js
@@ -10,12 +10,13 @@ if(objectType == "Salesproject")
.from("FORECAST")
.where("FORECAST.OBJECT_TYPE", "Salesproject")
.and("FORECAST.OBJECT_ROWID", objectRowId)
- .cell();
-
- var config = entities.createConfigForUpdatingRows()
+ .arrayRow();
+
+ var config = entities.createConfigForUpdatingRows().consumer("NoPhaseRequirementLoading")
.uid(objectRowId)
+ .addParameter("PhaseRequirementsFullfilled", false)
.addParameter("IgnoreChecklists_param", true)
- .fieldValues({"VOLUME": volume})
+ .fieldValues({"volumeForeignCurrency": volume[0] / JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"))["currencyRate"]})
.entity("Salesproject_entity");
entities.updateRow(config);
}
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/currencyandcurrencyrate_param/documentation.adoc b/entity/Forecast_entity/entityfields/currencyandcurrencyrate_param/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..34e4426a5f4820a7085379df3022b192823b6eb5
--- /dev/null
+++ b/entity/Forecast_entity/entityfields/currencyandcurrencyrate_param/documentation.adoc
@@ -0,0 +1,7 @@
+= CurrencyAndRate_param:
+
+Stringified Object with currency and currencyRate as keys. e.g:
+JSON.stringify({
+ currency: USD
+ ,currencyRate: 1,6684
+});
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/volume/mandatoryProcess.js b/entity/Forecast_entity/entityfields/volume/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4f59184f342c35f2fd25505c6435527d52169014
--- /dev/null
+++ b/entity/Forecast_entity/entityfields/volume/mandatoryProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.getFieldMandatoryChildEntity("CurrencyAndCurrencyRate_param", false));
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/volume/stateProcess.js b/entity/Forecast_entity/entityfields/volume/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..133627944bf80fede5e5823911c833132f6ff930
--- /dev/null
+++ b/entity/Forecast_entity/entityfields/volume/stateProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.getFieldStateChildEntity("CurrencyAndCurrencyRate_param"));
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/volume/titleProcess.js b/entity/Forecast_entity/entityfields/volume/titleProcess.js
index f7b76c335483a7410366d5c56db6ae8ba7917091..1069484c5e111560c25f538b16726e72eacde4f4 100644
--- a/entity/Forecast_entity/entityfields/volume/titleProcess.js
+++ b/entity/Forecast_entity/entityfields/volume/titleProcess.js
@@ -1,4 +1,5 @@
+import("Currency_lib");
import("system.result");
import("system.translate");
-result.string(translate.text("${VOLUME_MONEY}") + " (" + translate.text("${EURO_SIGN}") + ")");
\ No newline at end of file
+result.string(translate.text("${VOLUME_MONEY}") + " (" + translate.text(CurrencyUtils.getLocalCurrency()) + ")");
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/volumeforeigncurrency/mandatoryProcess.js b/entity/Forecast_entity/entityfields/volumeforeigncurrency/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4623ee6caab4371c4c7dd3bbdace2016a8b508b7
--- /dev/null
+++ b/entity/Forecast_entity/entityfields/volumeforeigncurrency/mandatoryProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.getFieldMandatoryChildEntity("CurrencyAndCurrencyRate_param", true));
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/volumeforeigncurrency/onValueChange.js b/entity/Forecast_entity/entityfields/volumeforeigncurrency/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..1f43e94654d9f9d160088c2c2a32cbf793359fc3
--- /dev/null
+++ b/entity/Forecast_entity/entityfields/volumeforeigncurrency/onValueChange.js
@@ -0,0 +1,3 @@
+import("Currency_lib");
+
+CurrencyRateUtils.setOtherValueFieldChildEntity("CurrencyAndCurrencyRate_param", "VOLUME");
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/volumeforeigncurrency/stateProcess.js b/entity/Forecast_entity/entityfields/volumeforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1ab4f7fc02663b32f12c2099b09c09dcd8eada64
--- /dev/null
+++ b/entity/Forecast_entity/entityfields/volumeforeigncurrency/stateProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.getFieldStateChildEntity("CurrencyAndCurrencyRate_param", true));
\ No newline at end of file
diff --git a/entity/Forecast_entity/entityfields/volumeforeigncurrency/titleProcess.js b/entity/Forecast_entity/entityfields/volumeforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..85c89e4cc9088ef363a6fc4cf390f3f159b488d9
--- /dev/null
+++ b/entity/Forecast_entity/entityfields/volumeforeigncurrency/titleProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.result");
+import("Context_lib");
+import("system.vars");
+
+var currencyParam = JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"));
+var currency = ContextUtils.loadContentTitle("Currency_entity", currencyParam["currency"]);
+
+result.string(translate.text("${VOLUME_MONEY}") + " (" + currency + ")");
\ No newline at end of file
diff --git a/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/volumeforeigncurrency.value/expression.js b/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/volumeforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..4efe33b7e7322756f446dea36045df056cbbdfe8
--- /dev/null
+++ b/entity/Forecast_entity/recordcontainers/db/recordfieldmappings/volumeforeigncurrency.value/expression.js
@@ -0,0 +1,10 @@
+import("system.vars");
+import("system.result");
+
+var currencyParam = vars.get("$param.CurrencyAndCurrencyRate_param");
+var res = "0"
+if(currencyParam && JSON.parse(currencyParam)["currencyRate"])
+{
+ res = "FORECAST.VOLUME /" + JSON.parse(currencyParam)["currencyRate"]; //sqlBuilder?
+}
+result.string(res);
\ No newline at end of file
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index 0d46bf7b97d26c3887302b467074d26dc7c070c9..06b6177b7a122c6ded0204523f6d5d37f01a3cae 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -18,30 +18,9 @@
<titlePlural>Offers</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
- <entityActionField>
- <name>export</name>
- <title>Export</title>
- <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/export/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="false" />
- <iconId>NEON:EXPORT</iconId>
- <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/export/stateProcess.js</stateProcess>
- <tooltip>Export fields of this table</tooltip>
- <tooltipProcess>%aditoprj%/entity/Offer_entity/entityfields/export/tooltipProcess.js</tooltipProcess>
- </entityActionField>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
- <entityField>
- <name>CURRENCY</name>
- <title>Currency</title>
- <consumer>KeywordCurrencies</consumer>
- <groupable v="true" />
- <mandatory v="true" />
- <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/stateProcess.js</stateProcess>
- <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
- </entityField>
<entityField>
<name>OFFERCODE</name>
<documentation>%aditoprj%/entity/Offer_entity/entityfields/offercode/documentation.adoc</documentation>
@@ -95,10 +74,10 @@
<name>VAT</name>
<title>Total VAT</title>
<contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<state>READONLY</state>
- <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/vat/stateProcess.js</stateProcess>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
+ <titleProcess>%aditoprj%/entity/Offer_entity/entityfields/vat/titleProcess.js</titleProcess>
</entityField>
<entityField>
<name>IMAGE</name>
@@ -154,6 +133,11 @@
<name>Discount_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/discount_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>CurrencyAndCurrencyRate_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/offeritems/children/currencyandcurrencyrate_param/valueProcess.js</valueProcess>
+ <expose v="true" />
+ </entityParameter>
</children>
</entityConsumer>
<entityField>
@@ -164,7 +148,7 @@
<inputFormat>#,##0.00</inputFormat>
<groupable v="false" />
<state>READONLY</state>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/net/displayValueProcess.js</displayValueProcess>
+ <titleProcess>%aditoprj%/entity/Offer_entity/entityfields/net/titleProcess.js</titleProcess>
</entityField>
<entityField>
<name>TotalGross</name>
@@ -174,8 +158,8 @@
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<state>READONLY</state>
+ <titleProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgross/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>ISOLANGUAGE</name>
@@ -984,7 +968,7 @@
<inputFormat>#,##0.00</inputFormat>
<state>READONLY</state>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_net/stateProcess.js</stateProcess>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_net/displayValueProcess.js</displayValueProcess>
+ <titleProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_net/titleProcess.js</titleProcess>
</entityField>
<entityParameter>
<name>Discount_param</name>
@@ -998,9 +982,10 @@
<name>DISCOUNTED_VAT</name>
<title>discounted Vat</title>
<contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_vat/stateProcess.js</stateProcess>
- <displayValueProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_vat/displayValueProcess.js</displayValueProcess>
+ <titleProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_vat/titleProcess.js</titleProcess>
</entityField>
<entityConsumer>
<name>Products</name>
@@ -1018,6 +1003,10 @@
<name>ShownInOfferMainView_param</name>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/products/children/showninoffermainview_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>CurrencyAndCurrencyRate_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/products/children/currencyandcurrencyrate_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
@@ -1075,6 +1064,65 @@
<name>Approval_param</name>
<expose v="true" />
</entityParameter>
+ <entityField>
+ <name>CURRENCYRATE_ID</name>
+ <title>Currency</title>
+ <mandatory v="true" />
+ <dropDownProcess>%aditoprj%/entity/Offer_entity/entityfields/currencyrate_id/dropDownProcess.js</dropDownProcess>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/currencyrate_id/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/currencyrate_id/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>discounted_netForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_netforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_netforeigncurrency/titleProcess.js</titleProcess>
+ </entityField>
+ <entityField>
+ <name>discounted_vatForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_vatforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Offer_entity/entityfields/discounted_vatforeigncurrency/titleProcess.js</titleProcess>
+ </entityField>
+ <entityField>
+ <name>TotalGrossForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgrossforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Offer_entity/entityfields/totalgrossforeigncurrency/titleProcess.js</titleProcess>
+ </entityField>
+ <entityField>
+ <name>vatForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/vatforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Offer_entity/entityfields/vatforeigncurrency/titleProcess.js</titleProcess>
+ </entityField>
+ <entityField>
+ <name>netForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/netforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Offer_entity/entityfields/netforeigncurrency/titleProcess.js</titleProcess>
+ </entityField>
+ <entityActionField>
+ <name>export</name>
+ <title>Export</title>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/export/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="false" />
+ <iconId>NEON:EXPORT</iconId>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/export/stateProcess.js</stateProcess>
+ <tooltip>Export fields of this table</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Offer_entity/entityfields/export/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
<entityActionGroup>
<name>observeActionGroup</name>
<children>
@@ -1175,6 +1223,19 @@
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/approveoffer/stateProcess.js</stateProcess>
<titleProcess>%aditoprj%/entity/Offer_entity/entityfields/approveoffer/titleProcess.js</titleProcess>
</entityActionField>
+ <entityActionField>
+ <name>newSupportTicket</name>
+ <title>New support ticket</title>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TICKET</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>refreshCurrencyRate</name>
+ <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/refreshcurrencyrate/onActionProcess.js</onActionProcess>
+ <iconId>NEON:RECURRING_APPOINTMENT</iconId>
+ <stateProcess>%aditoprj%/entity/Offer_entity/entityfields/refreshcurrencyrate/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Offer_entity/entityfields/refreshcurrencyrate/titleProcess.js</titleProcess>
+ </entityActionField>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
@@ -1182,12 +1243,6 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Offer_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
- <entityActionField>
- <name>newSupportTicket</name>
- <title>New Service ticket</title>
- <onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newsupportticket/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:TICKET</iconId>
- </entityActionField>
<entityConsumer>
<name>KeywordProductGroup</name>
<dependency>
@@ -1215,12 +1270,6 @@
<onDBDelete>%aditoprj%/entity/Offer_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<alias>Data_alias</alias>
<recordFieldMappings>
- <dbRecordFieldMapping>
- <name>CURRENCY.value</name>
- <recordfield>OFFER.CURRENCY</recordfield>
- <isFilterable v="true" />
- <isLookupFilter v="false" />
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>HEADER.value</name>
<recordfield>OFFER.HEADER</recordfield>
@@ -1291,10 +1340,6 @@
<isFilterable v="true" />
<isLookupFilter v="false" />
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CURRENCY.displayValue</name>
- <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>STATUS.displayValue</name>
<expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/status.displayvalue/expression.js</expression>
@@ -1437,43 +1482,82 @@
<name>APPROVAL.value</name>
<recordfield>OFFER.APPROVAL</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CURRENCYRATE_ID.value</name>
+ <recordfield>OFFER.CURRENCYRATE_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>vatForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/vatforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>discounted_netForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/discounted_netforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>discounted_vatForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/discounted_vatforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>netForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/netforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TotalGross.value</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/totalgross.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TotalGrossForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/totalgrossforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CURRENCYRATE_ID.displayValue</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currencyrate_id.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
- <name>69b62a9f-95bf-48be-8891-b6c2524f6ea1</name>
+ <name>12f52474-b1fb-48db-ba4a-32cb97b84bb8</name>
<tableName>OFFER</tableName>
<primaryKey>OFFERID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
- <name>d2334c28-1be0-4377-b13a-062bb1613c5a</name>
+ <name>04148501-76db-49d5-9d5a-f55cdc0724f2</name>
<tableName>CONTACT</tableName>
<primaryKey>CONTACTID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
- <name>16e5d66a-f156-4855-9da4-b9dee497c3f3</name>
+ <name>063de58b-6b93-4bdd-8ad3-710ce537719c</name>
<tableName>SALESPROJECT</tableName>
<primaryKey>SALESPROJECTID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
- <name>6b708a89-8864-433b-bdec-4edcedb3d7d1</name>
+ <name>5f872814-5c42-4e91-9ed0-383f54f4f627</name>
<tableName>ORGANISATION</tableName>
<primaryKey>ORGANISATIONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
- <name>4cdfe047-48d0-409e-8b01-e2c1312e8a5b</name>
+ <name>c9640188-193a-429a-8664-1842bd496765</name>
<tableName>PERSON</tableName>
<primaryKey>PERSONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
+ <linkInformation>
+ <name>1fa857a6-1dee-4318-a3d2-52e7a82d8e3c</name>
+ <tableName>CURRENCYRATE</tableName>
+ <primaryKey>CURRENCYRATEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
</linkInformation>
<filterExtensions>
<filterExtensionSet>
diff --git a/entity/Offer_entity/contentDescriptionProcess.js b/entity/Offer_entity/contentDescriptionProcess.js
index f531fc13941d2e2f5b6ed501c3d0081337cbd997..486660210e860440486fbfea0ec23e8b76ccdb24 100644
--- a/entity/Offer_entity/contentDescriptionProcess.js
+++ b/entity/Offer_entity/contentDescriptionProcess.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("Util_lib");
import("system.eMath");
import("system.translate");
@@ -5,7 +6,7 @@ import("system.datetime");
import("system.vars");
import("system.result");
-var formattedGross = NumberUtils.formatWithCurrency(vars.get("$field.TotalGross"), translate.text("#,##0.00"), vars.get("$field.CURRENCY"));
+var formattedGross = NumberUtils.formatWithCurrency(vars.get("$field.TotalGross"), translate.text("#,##0.00"), CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)[1]);
var res = [translate.text("Total gross") + ": " + formattedGross,
translate.text("Probability") + ": " + vars.get("$field.PROBABILITY") + "%",
translate.text("Creation date") + ": " + datetime.toDate(vars.get("$field.DATE_NEW"), translate.text("dd.MM.yyyy"))];
diff --git a/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js b/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
index 1b596584b051bec97da19e07429f38fecb1a9894..a6a2ab01f05c1e1f3ad71849d6d85c32fd744952 100644
--- a/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/copyoffer/onActionProcess.js
@@ -6,7 +6,7 @@ var offerId = vars.getString("$field.OFFERID");
var fieldValues = {
contactId: vars.getString("$field.CONTACT_ID"),
language: vars.getString("$field.ISOLANGUAGE"),
- currency: vars.getString("$field.CURRENCY"),
+ currencyRateId: vars.get("$field.CURRENCYRATE_ID"),
header: vars.getString("$field.HEADER"),
footer: vars.getString("$field.FOOTER"),
deliveryTerm: vars.getString("$field.DELIVERYTERMS"),
diff --git a/entity/Offer_entity/entityfields/currency/displayValueProcess.js b/entity/Offer_entity/entityfields/currency/displayValueProcess.js
deleted file mode 100644
index c82b4d748061c5e19bf3bb21588121f5178257c2..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/currency/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$field.CURRENCY")));
diff --git a/entity/Offer_entity/entityfields/currency/valueProcess.js b/entity/Offer_entity/entityfields/currency/valueProcess.js
deleted file mode 100644
index bd7b097a841c4b70a17700906fb733cf7d06a330..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/currency/valueProcess.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param"))
-{
- result.string(vars.get("$param.OfferCurrency_param"));
-}
-else if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-{
- result.string($KeywordRegistry.currency$eur());
-}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/currencyrate_id/dropDownProcess.js b/entity/Offer_entity/entityfields/currencyrate_id/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5b9a93751bcf685ba59553666987417116ab3083
--- /dev/null
+++ b/entity/Offer_entity/entityfields/currencyrate_id/dropDownProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("Currency_lib");
+import("system.result");
+
+result.object(CurrencyRateUtils.getCurrencies(true, false, vars.get("$sys.recordstate")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/currency/stateProcess.js b/entity/Offer_entity/entityfields/currencyrate_id/stateProcess.js
similarity index 81%
rename from entity/Offer_entity/entityfields/currency/stateProcess.js
rename to entity/Offer_entity/entityfields/currencyrate_id/stateProcess.js
index c3923b8d39fd5caf059f719a70da340db2e40339..81460e0d5b6483bd48e525d28f078524f6efcfa0 100644
--- a/entity/Offer_entity/entityfields/currency/stateProcess.js
+++ b/entity/Offer_entity/entityfields/currencyrate_id/stateProcess.js
@@ -11,7 +11,7 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.rec
.addParameter("OfferId_param", vars.get("$field.OFFERID"));
var offerItemCount = entities.getRowCount(loadConfig);
- if(offerItemCount > 0)
+ if(offerItemCount > 0 || (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param")))//item exists or newOfferVersion action
{
result.string(neon.COMPONENTSTATE_DISABLED);
}
@@ -19,4 +19,4 @@ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.rec
{
result.string(OfferUtils.isEditable(vars.get("$field.STATUS")) ? neon.COMPONENTSTATE_AUTO : neon.COMPONENTSTATE_DISABLED);
}
-}
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/currencyrate_id/valueProcess.js b/entity/Offer_entity/entityfields/currencyrate_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b9981fdf1727d8f3c06de4c55babd05d6b859085
--- /dev/null
+++ b/entity/Offer_entity/entityfields/currencyrate_id/valueProcess.js
@@ -0,0 +1,21 @@
+import("system.neon");
+import("Util_lib");
+import("system.result");
+import("Currency_lib");
+import("system.vars");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
+{
+ if (vars.exists("$param.OfferCurrency_param") && vars.get("$param.OfferCurrency_param"))//newOfferVersion action
+ {
+ result.string(vars.get("$param.OfferCurrency_param"));
+ }
+ else
+ {
+ var rate = CurrencyRateUtils.presetCurrencyRateId("CURRENCYRATE_ID");
+ if(Utils.isNotNullOrEmptyString(rate))
+ {
+ result.string(rate);
+ }
+ }
+}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/discounted_net/displayValueProcess.js b/entity/Offer_entity/entityfields/discounted_net/displayValueProcess.js
deleted file mode 100644
index c7473e812c66616164442674dc87bdd5282dc50d..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/discounted_net/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("Util_lib");
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-result.string(NumberUtils.formatWithCurrency(vars.get("$field.DISCOUNTED_NET"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/discounted_net/titleProcess.js b/entity/Offer_entity/entityfields/discounted_net/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9257abd6463e9522e955dd3ea8ee433ab4e9f067
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discounted_net/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("Currency_lib");
+import("system.translate");
+import("system.result");
+
+var currency = CurrencyUtils.getLocalCurrency();
+
+result.string(translate.withArguments("discounted Price (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/discounted_netforeigncurrency/stateProcess.js b/entity/Offer_entity/entityfields/discounted_netforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ac3321a7cbcfba6358490dd76147b31f3429b1b5
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discounted_netforeigncurrency/stateProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Currency_lib");
+
+result.string(CurrencyRateUtils.getFieldState(vars.get("$field.CURRENCYRATE_ID"), true, neon.COMPONENTSTATE_READONLY));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/discounted_netforeigncurrency/titleProcess.js b/entity/Offer_entity/entityfields/discounted_netforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..35c777742cbce9adf625ffd1dc01c1523169746b
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discounted_netforeigncurrency/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.translate");
+import("system.result");
+import("Currency_lib");
+import("system.vars");
+
+var currency = CurrencyRateUtils.GetCurrencyForTitle(vars.get("$property.CURRENCYRATE_ID.dropDown"), vars.get("$field.CURRENCYRATE_ID"));
+
+result.string(translate.withArguments("discounted Price (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/discounted_vat/displayValueProcess.js b/entity/Offer_entity/entityfields/discounted_vat/displayValueProcess.js
deleted file mode 100644
index 730396f16084a8c954d9cd54640efdd758e8cb52..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/discounted_vat/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("Util_lib");
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-result.string(NumberUtils.formatWithCurrency(vars.get("$field.DISCOUNTED_VAT"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/discounted_vat/titleProcess.js b/entity/Offer_entity/entityfields/discounted_vat/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6fbd52d5094b468252a7d4b0c91b69868dd3345a
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discounted_vat/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("Currency_lib");
+import("system.translate");
+import("system.result");
+
+var currency = CurrencyUtils.getLocalCurrency();
+
+result.string(translate.withArguments("discounted Vat (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/discounted_vatforeigncurrency/stateProcess.js b/entity/Offer_entity/entityfields/discounted_vatforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ac3321a7cbcfba6358490dd76147b31f3429b1b5
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discounted_vatforeigncurrency/stateProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Currency_lib");
+
+result.string(CurrencyRateUtils.getFieldState(vars.get("$field.CURRENCYRATE_ID"), true, neon.COMPONENTSTATE_READONLY));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/discounted_vatforeigncurrency/titleProcess.js b/entity/Offer_entity/entityfields/discounted_vatforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ed33605a19d58c6d27757a48cdfbeb95ef5dae34
--- /dev/null
+++ b/entity/Offer_entity/entityfields/discounted_vatforeigncurrency/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.translate");
+import("system.result");
+import("Currency_lib");
+import("system.vars");
+
+var currency = CurrencyRateUtils.GetCurrencyForTitle(vars.get("$property.CURRENCYRATE_ID.dropDown"), vars.get("$field.CURRENCYRATE_ID"));
+
+result.string(translate.withArguments("discounted Vat (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/net/displayValueProcess.js b/entity/Offer_entity/entityfields/net/displayValueProcess.js
deleted file mode 100644
index 450ae0cfd9fa1701eeb4d4e7c049a3c8fb8fc7a0..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/net/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("Util_lib");
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-result.string(NumberUtils.formatWithCurrency(vars.get("$field.NET"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/net/titleProcess.js b/entity/Offer_entity/entityfields/net/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..41c66e77792463dd9894cd3d138a88f5cc2b6f58
--- /dev/null
+++ b/entity/Offer_entity/entityfields/net/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("Currency_lib");
+import("system.translate");
+import("system.result");
+
+var currency = CurrencyUtils.getLocalCurrency();
+
+result.string(translate.withArguments("Total net (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/netforeigncurrency/stateProcess.js b/entity/Offer_entity/entityfields/netforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ac3321a7cbcfba6358490dd76147b31f3429b1b5
--- /dev/null
+++ b/entity/Offer_entity/entityfields/netforeigncurrency/stateProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Currency_lib");
+
+result.string(CurrencyRateUtils.getFieldState(vars.get("$field.CURRENCYRATE_ID"), true, neon.COMPONENTSTATE_READONLY));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/netforeigncurrency/titleProcess.js b/entity/Offer_entity/entityfields/netforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..57f745064160118a190bc9c0b8a0d89d89899e7e
--- /dev/null
+++ b/entity/Offer_entity/entityfields/netforeigncurrency/titleProcess.js
@@ -0,0 +1,16 @@
+import("system.translate");
+import("system.result");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.vars");
+
+var currency = "";
+var possibleValues = vars.get("$property.CURRENCYRATE_ID.dropDown");
+var currencyRateId = vars.get("$field.CURRENCYRATE_ID");
+if(possibleValues && possibleValues[currencyRateId])
+{
+ var title = possibleValues[currencyRateId];
+ currency = title.substring(title.length - 4, title.length - 1);
+}
+
+result.string(translate.withArguments("Total net (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
index 8cacf0dd0fa4ffc1be9acc65a344dd337255c9a0..ee21b3e08993c251d6d1bb69bb58507bc746278b 100644
--- a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
@@ -11,7 +11,7 @@ var params = {
"OfferOriginal_Id_param" : vars.get("$field.OFFERID"),
"OfferCode_param" : vars.get("$field.OFFERCODE"),
"OfferVersnr_param" : OfferUtils.getNextOfferVersionNumber(vars.get("$field.OFFERCODE")),
- "OfferCurrency_param" : vars.get("$field.CURRENCY"),
+ "OfferCurrency_param" : vars.get("$field.CURRENCYRATE_ID"),
"OfferAddress_param" : vars.get("$field.ADDRESS"),
"OfferHeader_param" : vars.get("$field.HEADER"),
"OfferFooter_param" : vars.get("$field.FOOTER"),
diff --git a/entity/Offer_entity/entityfields/neworder/onActionProcess.js b/entity/Offer_entity/entityfields/neworder/onActionProcess.js
index 4caa7f1855881b334607e4424879d882f87f31b0..7ed84925554c72b98cbcef448c8f36bdec7ea13c 100644
--- a/entity/Offer_entity/entityfields/neworder/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/neworder/onActionProcess.js
@@ -5,11 +5,11 @@ import("Offer_lib");
var contactId = vars.getString("$field.CONTACT_ID");
var pRowId = vars.getString("$field.OBJECT_ROWID");
var pContext=vars.getString("$field.OBJECT_TYPE")
-var currency = vars.getString("$field.CURRENCY");
+var currencyRateId = vars.get("$field.CURRENCYRATE_ID");
var language = vars.getString("$field.ISOLANGUAGE");
var address = vars.getString("$field.ADDRESS");
var offerId = vars.getString("$field.OFFERID");
var discount = vars.getString("$field.DISCOUNT");
-OfferUtils.copyToOrder(offerId, pContext, pRowId, contactId, language, currency, address, discount);
+OfferUtils.copyToOrder(offerId, pContext, pRowId, contactId, language, currencyRateId, address, discount);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/offeritems/children/currency_param/valueProcess.js b/entity/Offer_entity/entityfields/offeritems/children/currency_param/valueProcess.js
index 5e55d336c5058653f14b546e53fcc03f9dce105c..d247ea0b3ebaec005a902111168fde378c1371d6 100644
--- a/entity/Offer_entity/entityfields/offeritems/children/currency_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/offeritems/children/currency_param/valueProcess.js
@@ -1,4 +1,5 @@
+import("Currency_lib");
import("system.vars");
import("system.result");
-result.string(vars.get("$field.CURRENCY"));
\ No newline at end of file
+result.string(CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)[1]);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/offeritems/children/currencyandcurrencyrate_param/valueProcess.js b/entity/Offer_entity/entityfields/offeritems/children/currencyandcurrencyrate_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9a5dce5387097e4b0df1b29035384bc58ffb3435
--- /dev/null
+++ b/entity/Offer_entity/entityfields/offeritems/children/currencyandcurrencyrate_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("Currency_lib");
+import("system.result");
+import("system.vars");
+
+var currencyAndRate = CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)
+var res = {
+ currency: currencyAndRate[1]
+ , currencyRate: currencyAndRate[0]
+}
+result.string(JSON.stringify(res));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/orders/children/copy_param/valueProcess.js b/entity/Offer_entity/entityfields/orders/children/copy_param/valueProcess.js
index 01607276137fde77208e2edb52fa35f0b7c40590..42e2f275979a3721688e94c45dd7425230a9bffc 100644
--- a/entity/Offer_entity/entityfields/orders/children/copy_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/orders/children/copy_param/valueProcess.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("system.result");
import("system.vars");
@@ -6,7 +7,7 @@ var fieldparams = {};
fieldparams["$field" + ".CONTACT_ID"] = vars.getString("$field.CONTACT_ID") || "";
fieldparams["$field" + ".ISOLANGUAGE"] = vars.getString("$field.ISOLANGUAGE") || "";
fieldparams["$field" + ".OFFER_ID"] = vars.getString("$field.OFFER_ID") || "";
-fieldparams["$field" + ".CURRENCY"] = vars.getString("$field.CURRENCY") || "";
+fieldparams["$field" + ".CURRENCYRATE_ID"] = vars.getString("$field.CURRENCYRATE_ID") || "";
fieldparams["$field" + ".PAYMENTADDRESS"] = vars.getString("$field.ADDRESS") || "";
fieldparams["$field" + ".DELIVERYADDRESS"] = vars.getString("$field.ADDRESS") || "";
fieldparams["$field" + ".OBJECT_TYPE"] = vars.getString("$field.OBJECT_TYPE") || "";
diff --git a/entity/Offer_entity/entityfields/products/children/currencyandcurrencyrate_param/valueProcess.js b/entity/Offer_entity/entityfields/products/children/currencyandcurrencyrate_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9a5dce5387097e4b0df1b29035384bc58ffb3435
--- /dev/null
+++ b/entity/Offer_entity/entityfields/products/children/currencyandcurrencyrate_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("Currency_lib");
+import("system.result");
+import("system.vars");
+
+var currencyAndRate = CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)
+var res = {
+ currency: currencyAndRate[1]
+ , currencyRate: currencyAndRate[0]
+}
+result.string(JSON.stringify(res));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/products/children/orderofferinformations_param/valueProcess.js b/entity/Offer_entity/entityfields/products/children/orderofferinformations_param/valueProcess.js
index b066c99d521690629eff7020ce956500287970e1..d978ad7ba7bf3445c267bc27c6569ec09684e833 100644
--- a/entity/Offer_entity/entityfields/products/children/orderofferinformations_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/products/children/orderofferinformations_param/valueProcess.js
@@ -3,7 +3,7 @@ import("system.result");
var orderInfoObject = {
"ContactId_param": vars.get("$field.CONTACT_ID"),
- "Currency_param": vars.get("$field.CURRENCY"),
+ "Currency_param": vars.get("$field.CURRENCYRATE_ID"),
"OfferId_param": vars.get("$field.OFFERID"),
"OfferStatus_param": vars.get("$field.STATUS")
};
diff --git a/entity/Offer_entity/entityfields/refreshcurrencyrate/onActionProcess.js b/entity/Offer_entity/entityfields/refreshcurrencyrate/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..df6c92e496a5632d97c3d3769ed78b165cfd211a
--- /dev/null
+++ b/entity/Offer_entity/entityfields/refreshcurrencyrate/onActionProcess.js
@@ -0,0 +1,35 @@
+import("system.translate");
+import("Context_lib");
+import("system.vars");
+import("Currency_lib");
+
+var title = [vars.get("$field.OfferCode_VersNr_fieldgroup"), vars.get("$field.STATUS.displayValue")]
+
+title = title.join(" | ");
+
+CurrencyRateUtils.openCurrencyRateRefreshView(ContextUtils.getCurrentContextId()
+ , vars.get("$field.OFFERID")
+ , title
+ , vars.get("$field.CURRENCYRATE_ID")
+ , [{
+ "title" : translate.text("Vat")
+ , "valueLocalCurrency": vars.get("$field.VAT")
+ , "valueForeignCurrency": vars.get("$field.vatForeignCurrency")
+ , "valueColumn": "VAT"
+ }
+ , {"title" : translate.text("Total net")
+ , "valueLocalCurrency": vars.get("$field.NET")
+ , "valueForeignCurrency": vars.get("$field.netForeignCurrency")
+ , "valueColumn": "NET"
+ }
+ , {"title" : translate.text("discounted Price")
+ , "valueLocalCurrency": vars.get("$field.DISCOUNTED_NET")
+ , "valueForeignCurrency": vars.get("$field.discounted_netForeignCurrency")
+ , "valueColumn": "DISCOUNTED_NET"
+ }
+ , {"title" : translate.text("discounted Vat")
+ , "valueLocalCurrency": vars.get("$field.DISCOUNTED_VAT")
+ , "valueForeignCurrency": vars.get("$field.discounted_vatForeignCurrency")
+ , "valueColumn": "DISCOUNTED_VAT"
+ }]
+ , true);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/refreshcurrencyrate/stateProcess.js b/entity/Offer_entity/entityfields/refreshcurrencyrate/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c92ad9db6893bc9caeb02664e216e9d893e96de9
--- /dev/null
+++ b/entity/Offer_entity/entityfields/refreshcurrencyrate/stateProcess.js
@@ -0,0 +1,17 @@
+import("Util_lib");
+import("Offer_lib");
+import("system.result");
+import("system.neon");
+import("Currency_lib");
+import("system.vars");
+
+var state = neon.COMPONENTSTATE_DISABLED;
+var currencyRateId = vars.get("$field.CURRENCYRATE_ID");
+
+if(Utils.isNotNullOrEmptyString(currencyRateId) && currencyRateId != $CurrencyRate.LOCALCURRENCY()
+ && OfferUtils.isEditable(vars.get("$field.STATUS")))
+{
+ state = neon.COMPONENTSTATE_EDITABLE;
+}
+
+result.string(state);
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/refreshcurrencyrate/titleProcess.js b/entity/Offer_entity/entityfields/refreshcurrencyrate/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bb63bd8374be9674191d7573fafc994a49f75154
--- /dev/null
+++ b/entity/Offer_entity/entityfields/refreshcurrencyrate/titleProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.refreshCurrencyRateActionTitle("CURRENCYRATE_ID"));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/totalgross/displayValueProcess.js b/entity/Offer_entity/entityfields/totalgross/displayValueProcess.js
deleted file mode 100644
index 7e05663a8bc4754d820b79c99b32536c38cb3916..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/totalgross/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("Util_lib");
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-result.string(NumberUtils.formatWithCurrency(vars.get("$field.TotalGross"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/totalgross/titleProcess.js b/entity/Offer_entity/entityfields/totalgross/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a0e29faa5794bbcd68bc6e920694bbe6b9154990
--- /dev/null
+++ b/entity/Offer_entity/entityfields/totalgross/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("Currency_lib");
+import("system.translate");
+import("system.result");
+
+var currency = CurrencyUtils.getLocalCurrency();
+
+result.string(translate.withArguments("Total gross (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/totalgrossforeigncurrency/stateProcess.js b/entity/Offer_entity/entityfields/totalgrossforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ac3321a7cbcfba6358490dd76147b31f3429b1b5
--- /dev/null
+++ b/entity/Offer_entity/entityfields/totalgrossforeigncurrency/stateProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Currency_lib");
+
+result.string(CurrencyRateUtils.getFieldState(vars.get("$field.CURRENCYRATE_ID"), true, neon.COMPONENTSTATE_READONLY));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/totalgrossforeigncurrency/titleProcess.js b/entity/Offer_entity/entityfields/totalgrossforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e6ef6190e0d6b6c8160edfda14d3699e84b14860
--- /dev/null
+++ b/entity/Offer_entity/entityfields/totalgrossforeigncurrency/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.translate");
+import("system.result");
+import("Currency_lib");
+import("system.vars");
+
+var currency = CurrencyRateUtils.GetCurrencyForTitle(vars.get("$property.CURRENCYRATE_ID.dropDown"), vars.get("$field.CURRENCYRATE_ID"));
+
+result.string(translate.withArguments("Total gross (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/vat/displayValueProcess.js b/entity/Offer_entity/entityfields/vat/displayValueProcess.js
deleted file mode 100644
index 47ebfd7ecabcff3e202bfc72a540623de1e484fd..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/vat/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("Util_lib");
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-result.string(NumberUtils.formatWithCurrency(vars.get("$field.VAT"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/vat/stateProcess.js b/entity/Offer_entity/entityfields/vat/stateProcess.js
deleted file mode 100644
index 42a2d8e6788a09e0c2c8b410c5e4eadb7bfeb115..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/entityfields/vat/stateProcess.js
+++ /dev/null
@@ -1,10 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-var discount = vars.get("$field.DISCOUNT");
-
-if(discount && parseInt(discount) != parseInt("0")){
- result.string(neon.COMPONENTSTATE_INVISIBLE);
-}
-else
- result.string(neon.COMPONENTSTATE_READONLY)
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/vat/titleProcess.js b/entity/Offer_entity/entityfields/vat/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..947024cc7d670387c5ce67b5a08474d2cf3d8956
--- /dev/null
+++ b/entity/Offer_entity/entityfields/vat/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("Currency_lib");
+import("system.translate");
+import("system.result");
+
+var currency = CurrencyUtils.getLocalCurrency();
+
+result.string(translate.withArguments("Total VAT (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/vatforeigncurrency/stateProcess.js b/entity/Offer_entity/entityfields/vatforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..500f94067fe8661d7903b97f12f83d2188792a44
--- /dev/null
+++ b/entity/Offer_entity/entityfields/vatforeigncurrency/stateProcess.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("system.vars");
+import("Currency_lib");
+
+result.string(CurrencyRateUtils.getFieldState(vars.get("$field.CURRENCYRATE_ID"), true));
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/vatforeigncurrency/titleProcess.js b/entity/Offer_entity/entityfields/vatforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d69ac8c6566e3f122d4dd258043f0424b0f665ec
--- /dev/null
+++ b/entity/Offer_entity/entityfields/vatforeigncurrency/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.translate");
+import("system.result");
+import("Currency_lib");
+import("system.vars");
+
+var currency = CurrencyRateUtils.GetCurrencyForTitle(vars.get("$property.CURRENCYRATE_ID.dropDown"), vars.get("$field.CURRENCYRATE_ID"));
+
+result.string(translate.withArguments("Total VAT (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js b/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js
index 99dbfd903855059d2b7c9b66a9ae087ffc5abae3..c3de8b05ca9bf6d2e386e43aba538b49698e2f9a 100644
--- a/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Offer_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,7 +1,12 @@
import("system.result");
+import("Sql_lib");
-result.string("OFFER \n\
- left join CONTACT on CONTACT.CONTACTID = OFFER.CONTACT_ID \n\
- left join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID \n\
- left join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID \n\
- left join SALESPROJECT on SALESPROJECT.SALESPROJECTID = OFFER.OBJECT_ROWID");
\ No newline at end of file
+var from = new SqlBuilder()
+ .from("OFFER")
+ .leftJoin("CONTACT", "CONTACT.CONTACTID = OFFER.CONTACT_ID")
+ .leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
+ .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
+ .leftJoin("SALESPROJECT", "SALESPROJECT.SALESPROJECTID = OFFER.OBJECT_ROWID")
+ .leftJoin("CURRENCYRATE", "CURRENCYRATE.CURRENCYRATEID = OFFER.CURRENCYRATE_ID");
+
+result.string(from.toString());
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
deleted file mode 100644
index be3be7b53e29117afd1dc3b139c0cd99034a37ba..0000000000000000000000000000000000000000
--- a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.currency(), "OFFER.CURRENCY");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currencyrate_id.displayvalue/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currencyrate_id.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..9273a3d9999f209095758b5de873d75a863768bd
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/currencyrate_id.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+
+var sql = CurrencyKeywordUtils.getResolvedTitleSqlPart("OFFER.CURRENCYRATE_ID");
+result.string(sql);
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/discounted_netforeigncurrency.value/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/discounted_netforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..b086e25ed509b4a12bea527ea3f09ccc497e48fe
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/discounted_netforeigncurrency.value/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("OFFER.DISCOUNTED_NET / CURRENCYRATE.CURRENCYRATE");
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/discounted_vatforeigncurrency.value/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/discounted_vatforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..282b734d8bb22b7306678b522d6b427c60e4e746
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/discounted_vatforeigncurrency.value/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("OFFER.DISCOUNTED_VAT / CURRENCYRATE.CURRENCYRATE");
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/netforeigncurrency.value/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/netforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..528ecf199e2228ab991003ed1fb6d7fe0c9a939f
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/netforeigncurrency.value/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("OFFER.NET / CURRENCYRATE.CURRENCYRATE");
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/totalgross.value/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/totalgross.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..437cb3cd3f06a1ef4588c271a06e33d56d762199
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/totalgross.value/expression.js
@@ -0,0 +1,7 @@
+import("system.result");
+import("Sql_lib");
+
+var netValue = SqlBuilder.caseWhen(newWhere("OFFER.DISCOUNT", "0", SqlBuilder.GREATER())).then("OFFER.DISCOUNTED_NET").elseValue("OFFER.NET").toString();
+var vatValue = SqlBuilder.caseWhen(newWhere("OFFER.DISCOUNT", "0", SqlBuilder.GREATER())).then("OFFER.DISCOUNTED_VAT").elseValue("OFFER.VAT").toString();
+
+result.string(netValue + " + " + vatValue);//SqlBuilder?
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/totalgrossforeigncurrency.value/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/totalgrossforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..e7ff6bef6d0db0474baa5abc2ec0373d8c311b57
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/totalgrossforeigncurrency.value/expression.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("Sql_lib");
+
+var netValue = SqlBuilder.caseWhen(newWhere("OFFER.DISCOUNT", "0", SqlBuilder.GREATER()))
+ .then("OFFER.DISCOUNTED_NET / CURRENCYRATE.CURRENCYRATE")
+ .elseValue("OFFER.NET / CURRENCYRATE.CURRENCYRATE")
+ .toString();
+var vatValue = SqlBuilder.caseWhen(newWhere("OFFER.DISCOUNT", "0", SqlBuilder.GREATER()))
+ .then("OFFER.DISCOUNTED_VAT / CURRENCYRATE.CURRENCYRATE")
+ .elseValue("OFFER.VAT / CURRENCYRATE.CURRENCYRATE")
+ .toString();
+
+result.string(netValue + " + " + vatValue);
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/vatforeigncurrency.value/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/vatforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..471b4ba1cff776e38aafdb15ab327b64d27b8fd5
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/vatforeigncurrency.value/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("OFFER.VAT / CURRENCYRATE.CURRENCYRATE");
\ No newline at end of file
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 468d323d76c33bf46f45fb7c3bea9bddab852228..1f2ff0dbafb04de96e308dfdfc3c66a24b47c616 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -75,7 +75,9 @@
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/price/displayValueProcess.js</displayValueProcess>
+ <mandatoryProcess>%aditoprj%/entity/Offeritem_entity/entityfields/price/mandatoryProcess.js</mandatoryProcess>
+ <stateProcess>%aditoprj%/entity/Offeritem_entity/entityfields/price/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Offeritem_entity/entityfields/price/titleProcess.js</titleProcess>
</entityField>
<entityField>
<name>PRODUCT_ID</name>
@@ -152,8 +154,8 @@
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<state>READONLY</state>
+ <titleProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalprice/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>IMAGE</name>
@@ -376,6 +378,30 @@
<title>Reveal the price in the offer</title>
<contentType>BOOLEAN</contentType>
</entityField>
+ <entityField>
+ <name>priceForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <mandatoryProcess>%aditoprj%/entity/Offeritem_entity/entityfields/priceforeigncurrency/mandatoryProcess.js</mandatoryProcess>
+ <stateProcess>%aditoprj%/entity/Offeritem_entity/entityfields/priceforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Offeritem_entity/entityfields/priceforeigncurrency/titleProcess.js</titleProcess>
+ <onValueChange>%aditoprj%/entity/Offeritem_entity/entityfields/priceforeigncurrency/onValueChange.js</onValueChange>
+ </entityField>
+ <entityParameter>
+ <name>CurrencyAndCurrencyRate_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityField>
+ <name>TotalPriceForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <state>READONLY</state>
+ <stateProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalpriceforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalpriceforeigncurrency/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/totalpriceforeigncurrency/valueProcess.js</valueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -549,6 +575,18 @@
<name>SHOWPRICE.value</name>
<recordfield>OFFERITEM.SHOWPRICE</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>priceForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/priceforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TotalPrice.value</name>
+ <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/totalprice.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TotalPriceForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/totalpriceforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/Offeritem_entity/entityfields/currency/valueProcess.js b/entity/Offeritem_entity/entityfields/currency/valueProcess.js
index f125324e596f8c1180a1fbb47601c2a8f0ad95c0..8eb07996680f1cf3d6106c475bc57523257ad103 100644
--- a/entity/Offeritem_entity/entityfields/currency/valueProcess.js
+++ b/entity/Offeritem_entity/entityfields/currency/valueProcess.js
@@ -1,13 +1,12 @@
-import("KeywordRegistry_basic");
-import("Keyword_lib");
+import("Context_lib");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
{
- if(vars.get("$param.Currency_param") && vars.get("$param.Currency_param") != "")
+ if(vars.get("$param.CurrencyAndCurrencyRate_param"))
{
- result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.getString("$param.Currency_param")));
+ result.string(ContextUtils.loadContentTitle("Currency_entity", JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"))["currency"]));
}
}
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/price/displayValueProcess.js b/entity/Offeritem_entity/entityfields/price/displayValueProcess.js
deleted file mode 100644
index 9e3aa2e595d4fd0732a6453bf676edd66fe0685a..0000000000000000000000000000000000000000
--- a/entity/Offeritem_entity/entityfields/price/displayValueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.translate");
-import("Util_lib");
-
-var currency = vars.get("$param.Currency_param") || vars.get("$field.OFFER_CURRENCY");
-result.string(NumberUtils.formatWithCurrency(
- vars.get("$this.value"), translate.text("#,##0.00"), currency));
diff --git a/entity/Offeritem_entity/entityfields/price/mandatoryProcess.js b/entity/Offeritem_entity/entityfields/price/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4f59184f342c35f2fd25505c6435527d52169014
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/price/mandatoryProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.getFieldMandatoryChildEntity("CurrencyAndCurrencyRate_param", false));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/price/stateProcess.js b/entity/Offeritem_entity/entityfields/price/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..133627944bf80fede5e5823911c833132f6ff930
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/price/stateProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.getFieldStateChildEntity("CurrencyAndCurrencyRate_param"));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/price/titleProcess.js b/entity/Offeritem_entity/entityfields/price/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ecb5ab46dbd61737fdafbe107a8ab5dba0836378
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/price/titleProcess.js
@@ -0,0 +1,5 @@
+import("Currency_lib");
+import("system.result");
+import("system.translate");
+
+result.string(translate.withArguments("Unit price (%0)", [CurrencyUtils.getLocalCurrency()]));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/priceforeigncurrency/mandatoryProcess.js b/entity/Offeritem_entity/entityfields/priceforeigncurrency/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4623ee6caab4371c4c7dd3bbdace2016a8b508b7
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/priceforeigncurrency/mandatoryProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.getFieldMandatoryChildEntity("CurrencyAndCurrencyRate_param", true));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/priceforeigncurrency/onValueChange.js b/entity/Offeritem_entity/entityfields/priceforeigncurrency/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..eb38da939f039afb0382ff118fe22d99b20ac4bc
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/priceforeigncurrency/onValueChange.js
@@ -0,0 +1,3 @@
+import("Currency_lib");
+
+CurrencyRateUtils.setOtherValueFieldChildEntity("CurrencyAndCurrencyRate_param", "PRICE");
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/priceforeigncurrency/stateProcess.js b/entity/Offeritem_entity/entityfields/priceforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1ab4f7fc02663b32f12c2099b09c09dcd8eada64
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/priceforeigncurrency/stateProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.getFieldStateChildEntity("CurrencyAndCurrencyRate_param", true));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/priceforeigncurrency/titleProcess.js b/entity/Offeritem_entity/entityfields/priceforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d61220aca9cccb4919ab9df4535b34b7c560742
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/priceforeigncurrency/titleProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.result");
+import("Context_lib");
+import("system.vars");
+
+var currencyParam = JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"));
+var currency = ContextUtils.loadContentTitle("Currency_entity", currencyParam["currency"]);
+
+result.string(translate.withArguments("Unit price (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
index 2dc7f5d987c0b34ce0729068c679995626a41707..54881c3aa9033b9e15f464cb99144e433cbd3b8a 100644
--- a/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/product_id/onValueChange.js
@@ -11,7 +11,7 @@ if(pId != "" && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
var entity = vars.get("$sys.currententityname");
ItemUtils.product_IdOnValueChange(pId, uid, entity);
var oiUtils = new OfferItemUtils(vars.get("$field.OFFER_ID"));
- var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
+ var curr = vars.exists("$param.CurrencyAndCurrencyRate_param") ? JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"))["currency"] : "";
var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var language = vars.exists("$param.Language_param") ? vars.get("$param.Language_param") : "";
var quantity = vars.get("$field.QUANTITY");
diff --git a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
index d633387f8c728ebe8f364759d469ad4863ae74de..702f3c2f5234d922f7dc80914bb6d70a857e9694 100644
--- a/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
+++ b/entity/Offeritem_entity/entityfields/quantity/onValueChange.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("system.vars");
import("system.neon");
import("OfferOrder_lib");
@@ -12,7 +13,7 @@ if(pId != "" && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
ItemUtils.product_IdOnValueChange(pId, uid, entity, quantity);
var oiUtils = new OfferItemUtils(vars.get("$field.OFFER_ID"));
- var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
+ var curr = vars.exists("$param.CurrencyAndCurrencyRate_param") ? vars.get("CurrencyAndCurrencyRate_param")["rate"] : "";
var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var language = vars.exists("$param.Language_param") ? vars.get("$param.Language_param") : "";
diff --git a/entity/Offeritem_entity/entityfields/totalprice/displayValueProcess.js b/entity/Offeritem_entity/entityfields/totalprice/displayValueProcess.js
deleted file mode 100644
index 9e3aa2e595d4fd0732a6453bf676edd66fe0685a..0000000000000000000000000000000000000000
--- a/entity/Offeritem_entity/entityfields/totalprice/displayValueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.translate");
-import("Util_lib");
-
-var currency = vars.get("$param.Currency_param") || vars.get("$field.OFFER_CURRENCY");
-result.string(NumberUtils.formatWithCurrency(
- vars.get("$this.value"), translate.text("#,##0.00"), currency));
diff --git a/entity/Offeritem_entity/entityfields/totalprice/titleProcess.js b/entity/Offeritem_entity/entityfields/totalprice/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4ec9ef76d688dd7abbd3c4044c26fd93281a724b
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/totalprice/titleProcess.js
@@ -0,0 +1,5 @@
+import("Currency_lib");
+import("system.result");
+import("system.translate");
+
+result.string(translate.withArguments("Sum (%0)", [CurrencyUtils.getLocalCurrency()]));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/totalpriceforeigncurrency/stateProcess.js b/entity/Offeritem_entity/entityfields/totalpriceforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d55a43d731857ca31115fdca8bd3aefb1417a1e
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/totalpriceforeigncurrency/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.neon");
+import("Currency_lib");
+import("system.result");
+
+var state = CurrencyRateUtils.getFieldStateChildEntity("CurrencyAndCurrencyRate_param", true)
+
+if(state == neon.COMPONENTSTATE_EDITABLE)
+{
+ state = neon.COMPONENTSTATE_READONLY;
+}
+
+result.string(state);
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/totalpriceforeigncurrency/titleProcess.js b/entity/Offeritem_entity/entityfields/totalpriceforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..578bce40c3f0111e48228e620ad602dc2893ebda
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/totalpriceforeigncurrency/titleProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.result");
+import("Context_lib");
+import("system.vars");
+
+var currencyParam = JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"));
+var currency = ContextUtils.loadContentTitle("Currency_entity", currencyParam["currency"]);
+
+result.string(translate.withArguments("Sum (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/totalpriceforeigncurrency/valueProcess.js b/entity/Offeritem_entity/entityfields/totalpriceforeigncurrency/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c58aeee14a773618dd2f0fdd56d09cec8002272c
--- /dev/null
+++ b/entity/Offeritem_entity/entityfields/totalpriceforeigncurrency/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("Offer_lib");
+
+var oiUtils = new OfferItemUtils(vars.get("$field.OFFER_ID"));
+
+result.string(oiUtils.roundPrice(oiUtils.getItemSum(vars.get("$field.QUANTITY"), vars.get("$field.priceForeignCurrency")
+ , vars.get("$field.DISCOUNT"), vars.get("$field.OPTIONAL"))));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js b/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
index a398cf3bf7501257f563767ba79d1ff9034e3176..85a818881e014ec7df8bd1272effa5adbda38d19 100644
--- a/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
@@ -20,4 +20,4 @@ if(oid != "")
});
db.execute(insertStatements, "Data_alias", 10000000);
}
-}
+}
\ No newline at end of file
diff --git a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/priceforeigncurrency.value/expression.js b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/priceforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..9e2e30da11a0aa2345a8b96cd71992f5d83b95e7
--- /dev/null
+++ b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/priceforeigncurrency.value/expression.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+
+var currencyParam = vars.get("$param.CurrencyAndCurrencyRate_param");
+if(currencyParam && JSON.parse(currencyParam)["currencyRate"])
+{
+ result.string("OFFERITEM.PRICE /" + JSON.parse(currencyParam)["currencyRate"]);
+}
\ No newline at end of file
diff --git a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/totalprice.value/expression.js b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/totalprice.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..20319caa3eaa64e035b9fa6a3166cdced4a3c65f
--- /dev/null
+++ b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/totalprice.value/expression.js
@@ -0,0 +1,19 @@
+import("system.result");
+import("Sql_lib");
+
+var price = SqlBuilder.caseWhen(newWhere("OFFERITEM.PRICE", "0", SqlBuilder.GREATER()))
+ .then("OFFERITEM.PRICE")
+ .elseValue("0")
+ .toString();
+
+var quantity = SqlBuilder.caseWhen(newWhere("OFFERITEM.QUANTITY", "0", SqlBuilder.GREATER()))
+ .then("OFFERITEM.QUANTITY")
+ .elseValue("0")
+ .toString();
+
+var discount = SqlBuilder.caseWhen(newWhere("OFFERITEM.DISCOUNT", "0", SqlBuilder.GREATER()))
+ .then("OFFERITEM.DISCOUNT")
+ .elseValue("0")
+ .toString();
+
+result.string(price + " * " + quantity + "* (100 - " + discount + ") / 100");
\ No newline at end of file
diff --git a/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/totalpriceforeigncurrency.value/expression.js b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/totalpriceforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..39ebf408172a29a54257eba2b09b423516803352
--- /dev/null
+++ b/entity/Offeritem_entity/recordcontainers/db/recordfieldmappings/totalpriceforeigncurrency.value/expression.js
@@ -0,0 +1,21 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+var currencyParam = vars.get("$param.CurrencyAndCurrencyRate_param");
+var price = SqlBuilder.caseWhen(newWhere("OFFERITEM.PRICE", "0", SqlBuilder.GREATER()))
+ .then("OFFERITEM.PRICE /" + JSON.parse(currencyParam)["currencyRate"])
+ .elseValue("0")
+ .toString();
+
+var quantity = SqlBuilder.caseWhen(newWhere("OFFERITEM.QUANTITY", "0", SqlBuilder.GREATER()))
+ .then("OFFERITEM.QUANTITY")
+ .elseValue("0")
+ .toString();
+
+var discount = SqlBuilder.caseWhen(newWhere("OFFERITEM.DISCOUNT", "0", SqlBuilder.GREATER()))
+ .then("OFFERITEM.DISCOUNT")
+ .elseValue("0")
+ .toString();
+
+result.string(price + " * " + quantity + "* (100 - " + discount + ") / 100");
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 7e2f3776198f36560ce47649f0b4e064ee1eb483..fef56936bc0d0c5e0241e0ae663909110d97b368 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -21,14 +21,6 @@
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
- <entityField>
- <name>CURRENCY</name>
- <title>Currency</title>
- <consumer>KeywordCurrencies</consumer>
- <groupable v="true" />
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/currency/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
- </entityField>
<entityField>
<name>SALESORDERCODE</name>
<documentation>%aditoprj%/entity/Order_entity/entityfields/salesordercode/documentation.adoc</documentation>
@@ -71,9 +63,11 @@
<title>Total VAT</title>
<contentType>NUMBER</contentType>
<minValue v="0" />
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
<state>READONLY</state>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/vat/stateProcess.js</stateProcess>
- <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/vat/displayValueProcess.js</displayValueProcess>
+ <titleProcess>%aditoprj%/entity/Order_entity/entityfields/vat/titleProcess.js</titleProcess>
</entityField>
<entityField>
<name>IMAGE</name>
@@ -127,25 +121,33 @@
<name>Discount_param</name>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/discount_param/valueProcess.js</valueProcess>
</entityParameter>
+ <entityParameter>
+ <name>CurrencyAndCurrencyRate_param</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/orderitems/children/currencyandcurrencyrate_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityField>
<name>NET</name>
<title>Total net</title>
<contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
<groupable v="true" />
<state>READONLY</state>
+ <titleProcess>%aditoprj%/entity/Order_entity/entityfields/net/titleProcess.js</titleProcess>
<valueProcess></valueProcess>
- <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/net/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>TotalGross</name>
<documentation>%aditoprj%/entity/Order_entity/entityfields/totalgross/documentation.adoc</documentation>
<title>Total gross</title>
<contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
<state>READONLY</state>
+ <titleProcess>%aditoprj%/entity/Order_entity/entityfields/totalgross/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/Order_entity/entityfields/totalgross/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/totalgross/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>ISOLANGUAGE</name>
@@ -421,7 +423,7 @@
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/paid/stateProcess.js</stateProcess>
- <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/paid/displayValueProcess.js</displayValueProcess>
+ <titleProcess>%aditoprj%/entity/Order_entity/entityfields/paid/titleProcess.js</titleProcess>
</entityField>
<entityField>
<name>CANCELLATION</name>
@@ -811,6 +813,135 @@
<name>SourceOrderId_param</name>
<expose v="true" />
</entityParameter>
+ <entityConsumer>
+ <name>Products</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Product_entity</entityName>
+ <fieldName>Products</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>OrderOfferInformations_param</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/products/children/orderofferinformations_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>ShownInOrderMainView_param</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/products/children/showninordermainview_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ <entityParameter>
+ <name>CurrencyAndCurrencyRate_param</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/products/children/currencyandcurrencyrate_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityField>
+ <name>DISCOUNT</name>
+ <title>Discount</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>0.00'%'</outputFormat>
+ <inputFormat>0.00</inputFormat>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/discount/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Order_entity/entityfields/discount/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ <onValidation>%aditoprj%/entity/Order_entity/entityfields/discount/onValidation.js</onValidation>
+ </entityField>
+ <entityField>
+ <name>DISCOUNTED_NET</name>
+ <title>discounted Price</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <state>READONLY</state>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_net/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_net/titleProcess.js</titleProcess>
+ </entityField>
+ <entityField>
+ <name>DISCOUNTED_VAT</name>
+ <title>discounted Vat</title>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <state>READONLY</state>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_vat/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_vat/titleProcess.js</titleProcess>
+ </entityField>
+ <entityField>
+ <name>DiscountChanged</name>
+ </entityField>
+ <entityParameter>
+ <name>Discount_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityConsumer>
+ <name>Links</name>
+ <refreshParent v="true" />
+ <dependency>
+ <name>dependency</name>
+ <entityName>OrderLink_entity</entityName>
+ <fieldName>Links</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>SalesorderId_param</name>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/links/children/salesorderid_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityParameter>
+ <name>Links_param</name>
+ <expose v="true" />
+ <documentation>%aditoprj%/entity/Order_entity/entityfields/links_param/documentation.adoc</documentation>
+ </entityParameter>
+ <entityField>
+ <name>vatForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/vatforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Order_entity/entityfields/vatforeigncurrency/titleProcess.js</titleProcess>
+ </entityField>
+ <entityField>
+ <name>totalGrossForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <titleProcess>%aditoprj%/entity/Order_entity/entityfields/totalgrossforeigncurrency/titleProcess.js</titleProcess>
+ </entityField>
+ <entityField>
+ <name>netForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/netforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Order_entity/entityfields/netforeigncurrency/titleProcess.js</titleProcess>
+ </entityField>
+ <entityField>
+ <name>discounted_vatForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_vatforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_vatforeigncurrency/titleProcess.js</titleProcess>
+ </entityField>
+ <entityField>
+ <name>discounted_netForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_netforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_netforeigncurrency/titleProcess.js</titleProcess>
+ </entityField>
+ <entityField>
+ <name>CURRENCYRATE_ID</name>
+ <title>Currency</title>
+ <mandatory v="true" />
+ <dropDownProcess>%aditoprj%/entity/Order_entity/entityfields/currencyrate_id/dropDownProcess.js</dropDownProcess>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/currencyrate_id/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Order_entity/entityfields/currencyrate_id/valueProcess.js</valueProcess>
+ </entityField>
<entityActionGroup>
<name>observeActionGroup</name>
<children>
@@ -945,6 +1076,13 @@
</entityActionField>
</children>
</entityActionGroup>
+ <entityActionField>
+ <name>refreshCurrencyRate</name>
+ <onActionProcess>%aditoprj%/entity/Order_entity/entityfields/refreshcurrencyrate/onActionProcess.js</onActionProcess>
+ <iconId>NEON:RECURRING_APPOINTMENT</iconId>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/refreshcurrencyrate/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Order_entity/entityfields/refreshcurrencyrate/titleProcess.js</titleProcess>
+ </entityActionField>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
@@ -952,84 +1090,13 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/Order_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
- <entityConsumer>
- <name>Products</name>
- <dependency>
- <name>dependency</name>
- <entityName>Product_entity</entityName>
- <fieldName>Products</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>OrderOfferInformations_param</name>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/products/children/orderofferinformations_param/valueProcess.js</valueProcess>
- </entityParameter>
- <entityParameter>
- <name>ShownInOrderMainView_param</name>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/products/children/showninordermainview_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityField>
- <name>DISCOUNT</name>
- <title>Discount</title>
- <contentType>NUMBER</contentType>
- <outputFormat>0.00'%'</outputFormat>
- <inputFormat>0.00</inputFormat>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/discount/valueProcess.js</valueProcess>
- <onValueChange>%aditoprj%/entity/Order_entity/entityfields/discount/onValueChange.js</onValueChange>
- <onValueChangeTypes>
- <element>MASK</element>
- </onValueChangeTypes>
- <onValidation>%aditoprj%/entity/Order_entity/entityfields/discount/onValidation.js</onValidation>
- </entityField>
<entityField>
- <name>DISCOUNTED_NET</name>
- <title>discounted Price</title>
- <contentType>NUMBER</contentType>
+ <name>paidForeignCurrency</name>
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
- <state>READONLY</state>
- <stateProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_net/stateProcess.js</stateProcess>
- <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_net/displayValueProcess.js</displayValueProcess>
+ <stateProcess>%aditoprj%/entity/Order_entity/entityfields/paidforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Order_entity/entityfields/paidforeigncurrency/titleProcess.js</titleProcess>
</entityField>
- <entityField>
- <name>DISCOUNTED_VAT</name>
- <title>discounted Vat</title>
- <contentType>NUMBER</contentType>
- <outputFormat>#,##0.00</outputFormat>
- <inputFormat>#,##0.00</inputFormat>
- <state>READONLY</state>
- <stateProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_vat/stateProcess.js</stateProcess>
- <displayValueProcess>%aditoprj%/entity/Order_entity/entityfields/discounted_vat/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>DiscountChanged</name>
- </entityField>
- <entityParameter>
- <name>Discount_param</name>
- <expose v="true" />
- </entityParameter>
- <entityConsumer>
- <name>Links</name>
- <refreshParent v="true" />
- <dependency>
- <name>dependency</name>
- <entityName>OrderLink_entity</entityName>
- <fieldName>Links</fieldName>
- </dependency>
- <children>
- <entityParameter>
- <name>SalesorderId_param</name>
- <valueProcess>%aditoprj%/entity/Order_entity/entityfields/links/children/salesorderid_param/valueProcess.js</valueProcess>
- </entityParameter>
- </children>
- </entityConsumer>
- <entityParameter>
- <name>Links_param</name>
- <expose v="true" />
- <documentation>%aditoprj%/entity/Order_entity/entityfields/links_param/documentation.adoc</documentation>
- </entityParameter>
<entityConsumer>
<name>KeywordProductGroup</name>
<dependency>
@@ -1057,12 +1124,6 @@
<onDBDelete>%aditoprj%/entity/Order_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<alias>Data_alias</alias>
<recordFieldMappings>
- <dbRecordFieldMapping>
- <name>CURRENCY.value</name>
- <recordfield>SALESORDER.CURRENCY</recordfield>
- <isFilterable v="true" />
- <isLookupFilter v="false" />
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>FOOTER.value</name>
<recordfield>SALESORDER.FOOTER</recordfield>
@@ -1115,10 +1176,6 @@
<isFilterable v="false" />
<isLookupFilter v="false" />
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CURRENCY.displayValue</name>
- <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>OFFER_ID.value</name>
<recordfield>SALESORDER.OFFER_ID</recordfield>
@@ -1268,36 +1325,75 @@
<name>DISCOUNTED_VAT.value</name>
<recordfield>SALESORDER.DISCOUNTED_VAT</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TotalGross.value</name>
+ <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/totalgross.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>vatForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/vatforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>totalGrossForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/totalgrossforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>discounted_netForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/discounted_netforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>discounted_vatForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/discounted_vatforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>netForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/netforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CURRENCYRATE_ID.value</name>
+ <recordfield>SALESORDER.CURRENCYRATE_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>paidForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Order_entity/recordcontainers/db/recordfieldmappings/paidforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
- <name>43290f18-46fb-4d1f-b653-60f39f1fe3fb</name>
+ <name>2d5f3943-39c4-4e24-8938-9eabd42aca93</name>
<tableName>SALESORDER</tableName>
<primaryKey>SALESORDERID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
<linkInformation>
- <name>3f8c21b4-a81e-4405-8b4f-346ff724b8a5</name>
+ <name>730ed615-34fa-4f59-9bb6-ec21b2c50e4b</name>
<tableName>CONTACT</tableName>
<primaryKey>CONTACTID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
- <name>0131be90-6232-4dda-9036-bbde951eded5</name>
+ <name>d899b431-382a-4832-a065-b26e21162fbc</name>
<tableName>PERSON</tableName>
<primaryKey>PERSONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
<linkInformation>
- <name>0efeab02-efaf-4155-9312-0aee1f7f5535</name>
+ <name>2a9c72c8-6373-48af-aea4-ea1e3e9a3e4c</name>
<tableName>ORGANISATION</tableName>
<primaryKey>ORGANISATIONID</primaryKey>
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
+ <linkInformation>
+ <name>a664d8f7-e258-42d2-b1d8-dddb8ff34e47</name>
+ <tableName>CURRENCYRATE</tableName>
+ <primaryKey>CURRENCYRATEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
</linkInformation>
<filterExtensions>
<filterExtension>
diff --git a/entity/Order_entity/entityfields/cancel/onActionProcess.js b/entity/Order_entity/entityfields/cancel/onActionProcess.js
index 541e1d8929271be192b851790dacafc6a96e6e9e..0f81aad981ccb8dfbb431309b834830dcee84eb2 100644
--- a/entity/Order_entity/entityfields/cancel/onActionProcess.js
+++ b/entity/Order_entity/entityfields/cancel/onActionProcess.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("Sql_lib");
import("system.vars");
import("system.neon");
@@ -16,7 +17,7 @@ neon.refreshAll();
var fieldValues = {
contactId: vars.getString("$field.CONTACT_ID"),
- currency: vars.getString("$field.CURRENCY"),
+ currency: CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)[1],
language: vars.getString("$field.ISOLANGUAGE"),
header: vars.getString("$field.HEADER"),
footer: vars.getString("$field.FOOTER"),
diff --git a/entity/Order_entity/entityfields/copyorder/onActionProcess.js b/entity/Order_entity/entityfields/copyorder/onActionProcess.js
index 08aa313af34c0b6b2a2f65389221f8a893139fc7..549ef0ff5f877ab61ea760baee0624fb46934c74 100644
--- a/entity/Order_entity/entityfields/copyorder/onActionProcess.js
+++ b/entity/Order_entity/entityfields/copyorder/onActionProcess.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("system.vars");
import("system.neon");
import("Order_lib");
@@ -8,7 +9,7 @@ import("KeywordRegistry_basic");
var orderId = vars.get("$field.SALESORDERID");
var fieldValues = {
contactId: vars.getString("$field.CONTACT_ID"),
- currency: vars.getString("$field.CURRENCY"),
+ currencyRateId: vars.get("$field.CURRENCYRATE_ID"),
language: vars.getString("$field.ISOLANGUAGE"),
header: vars.getString("$field.HEADER"),
footer: vars.getString("$field.FOOTER"),
diff --git a/entity/Order_entity/entityfields/currency/displayValueProcess.js b/entity/Order_entity/entityfields/currency/displayValueProcess.js
deleted file mode 100644
index c82b4d748061c5e19bf3bb21588121f5178257c2..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/currency/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$field.CURRENCY")));
diff --git a/entity/Order_entity/entityfields/currency/valueProcess.js b/entity/Order_entity/entityfields/currency/valueProcess.js
deleted file mode 100644
index 317b5ce1ed9b68979dbf953ee5b7abe78329d317..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/currency/valueProcess.js
+++ /dev/null
@@ -1,7 +0,0 @@
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))
- result.string($KeywordRegistry.currency$eur());
diff --git a/entity/Order_entity/entityfields/currencyrate_id/dropDownProcess.js b/entity/Order_entity/entityfields/currencyrate_id/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5b9a93751bcf685ba59553666987417116ab3083
--- /dev/null
+++ b/entity/Order_entity/entityfields/currencyrate_id/dropDownProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("Currency_lib");
+import("system.result");
+
+result.object(CurrencyRateUtils.getCurrencies(true, false, vars.get("$sys.recordstate")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/currencyrate_id/stateProcess.js b/entity/Order_entity/entityfields/currencyrate_id/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0b0c671f3f4702c9560c9ff119750858211a3871
--- /dev/null
+++ b/entity/Order_entity/entityfields/currencyrate_id/stateProcess.js
@@ -0,0 +1,22 @@
+import("Order_lib");
+import("system.vars");
+import("system.result");
+import("system.neon");
+import("system.entities");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
+{
+ var loadConfig = entities.createConfigForLoadingRows()
+ .entity("Orderitem_entity")
+ .addParameter("OrderId_param", vars.get("$field.SALESORDER_ID"));
+ var offerItemCount = entities.getRowCount(loadConfig);
+
+ if(offerItemCount > 0 || (vars.exists("$param.Copy_param") && vars.get("$param.Copy_param")))//item exists or newOrderVersion action
+ {
+ result.string(neon.COMPONENTSTATE_DISABLED);
+ }
+ else
+ {
+ result.string(OrderUtils.isEditable(vars.get("$field.ORDERSTATUS")) ? neon.COMPONENTSTATE_AUTO : neon.COMPONENTSTATE_DISABLED);
+ }
+}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/currencyrate_id/valueProcess.js b/entity/Order_entity/entityfields/currencyrate_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dfa41abc63427a2e79286d4a74410713198dfe8c
--- /dev/null
+++ b/entity/Order_entity/entityfields/currencyrate_id/valueProcess.js
@@ -0,0 +1,10 @@
+import("Util_lib");
+import("system.result");
+import("Currency_lib");
+import("system.vars");
+
+var rate = CurrencyRateUtils.presetCurrencyRateId("CURRENCYRATE_ID");
+if(Utils.isNotNullOrEmptyString(rate))
+{
+ result.string(rate);
+}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/discounted_net/displayValueProcess.js b/entity/Order_entity/entityfields/discounted_net/displayValueProcess.js
deleted file mode 100644
index c7473e812c66616164442674dc87bdd5282dc50d..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/discounted_net/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("Util_lib");
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-result.string(NumberUtils.formatWithCurrency(vars.get("$field.DISCOUNTED_NET"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/discounted_net/titleProcess.js b/entity/Order_entity/entityfields/discounted_net/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9257abd6463e9522e955dd3ea8ee433ab4e9f067
--- /dev/null
+++ b/entity/Order_entity/entityfields/discounted_net/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("Currency_lib");
+import("system.translate");
+import("system.result");
+
+var currency = CurrencyUtils.getLocalCurrency();
+
+result.string(translate.withArguments("discounted Price (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/discounted_netforeigncurrency/stateProcess.js b/entity/Order_entity/entityfields/discounted_netforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ac3321a7cbcfba6358490dd76147b31f3429b1b5
--- /dev/null
+++ b/entity/Order_entity/entityfields/discounted_netforeigncurrency/stateProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Currency_lib");
+
+result.string(CurrencyRateUtils.getFieldState(vars.get("$field.CURRENCYRATE_ID"), true, neon.COMPONENTSTATE_READONLY));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/discounted_netforeigncurrency/titleProcess.js b/entity/Order_entity/entityfields/discounted_netforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..35c777742cbce9adf625ffd1dc01c1523169746b
--- /dev/null
+++ b/entity/Order_entity/entityfields/discounted_netforeigncurrency/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.translate");
+import("system.result");
+import("Currency_lib");
+import("system.vars");
+
+var currency = CurrencyRateUtils.GetCurrencyForTitle(vars.get("$property.CURRENCYRATE_ID.dropDown"), vars.get("$field.CURRENCYRATE_ID"));
+
+result.string(translate.withArguments("discounted Price (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/discounted_vat/displayValueProcess.js b/entity/Order_entity/entityfields/discounted_vat/displayValueProcess.js
deleted file mode 100644
index 730396f16084a8c954d9cd54640efdd758e8cb52..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/discounted_vat/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("Util_lib");
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-result.string(NumberUtils.formatWithCurrency(vars.get("$field.DISCOUNTED_VAT"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/discounted_vat/titleProcess.js b/entity/Order_entity/entityfields/discounted_vat/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..6fbd52d5094b468252a7d4b0c91b69868dd3345a
--- /dev/null
+++ b/entity/Order_entity/entityfields/discounted_vat/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("Currency_lib");
+import("system.translate");
+import("system.result");
+
+var currency = CurrencyUtils.getLocalCurrency();
+
+result.string(translate.withArguments("discounted Vat (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/discounted_vatforeigncurrency/stateProcess.js b/entity/Order_entity/entityfields/discounted_vatforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ac3321a7cbcfba6358490dd76147b31f3429b1b5
--- /dev/null
+++ b/entity/Order_entity/entityfields/discounted_vatforeigncurrency/stateProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Currency_lib");
+
+result.string(CurrencyRateUtils.getFieldState(vars.get("$field.CURRENCYRATE_ID"), true, neon.COMPONENTSTATE_READONLY));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/discounted_vatforeigncurrency/titleProcess.js b/entity/Order_entity/entityfields/discounted_vatforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ed33605a19d58c6d27757a48cdfbeb95ef5dae34
--- /dev/null
+++ b/entity/Order_entity/entityfields/discounted_vatforeigncurrency/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.translate");
+import("system.result");
+import("Currency_lib");
+import("system.vars");
+
+var currency = CurrencyRateUtils.GetCurrencyForTitle(vars.get("$property.CURRENCYRATE_ID.dropDown"), vars.get("$field.CURRENCYRATE_ID"));
+
+result.string(translate.withArguments("discounted Vat (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/net/displayValueProcess.js b/entity/Order_entity/entityfields/net/displayValueProcess.js
deleted file mode 100644
index 450ae0cfd9fa1701eeb4d4e7c049a3c8fb8fc7a0..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/net/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("Util_lib");
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-result.string(NumberUtils.formatWithCurrency(vars.get("$field.NET"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/net/titleProcess.js b/entity/Order_entity/entityfields/net/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..41c66e77792463dd9894cd3d138a88f5cc2b6f58
--- /dev/null
+++ b/entity/Order_entity/entityfields/net/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("Currency_lib");
+import("system.translate");
+import("system.result");
+
+var currency = CurrencyUtils.getLocalCurrency();
+
+result.string(translate.withArguments("Total net (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/netforeigncurrency/stateProcess.js b/entity/Order_entity/entityfields/netforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ac3321a7cbcfba6358490dd76147b31f3429b1b5
--- /dev/null
+++ b/entity/Order_entity/entityfields/netforeigncurrency/stateProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Currency_lib");
+
+result.string(CurrencyRateUtils.getFieldState(vars.get("$field.CURRENCYRATE_ID"), true, neon.COMPONENTSTATE_READONLY));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/netforeigncurrency/titleProcess.js b/entity/Order_entity/entityfields/netforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..57f745064160118a190bc9c0b8a0d89d89899e7e
--- /dev/null
+++ b/entity/Order_entity/entityfields/netforeigncurrency/titleProcess.js
@@ -0,0 +1,16 @@
+import("system.translate");
+import("system.result");
+import("KeywordRegistry_basic");
+import("Keyword_lib");
+import("system.vars");
+
+var currency = "";
+var possibleValues = vars.get("$property.CURRENCYRATE_ID.dropDown");
+var currencyRateId = vars.get("$field.CURRENCYRATE_ID");
+if(possibleValues && possibleValues[currencyRateId])
+{
+ var title = possibleValues[currencyRateId];
+ currency = title.substring(title.length - 4, title.length - 1);
+}
+
+result.string(translate.withArguments("Total net (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderitems/children/currency_param/valueProcess.js b/entity/Order_entity/entityfields/orderitems/children/currency_param/valueProcess.js
index 5e55d336c5058653f14b546e53fcc03f9dce105c..d247ea0b3ebaec005a902111168fde378c1371d6 100644
--- a/entity/Order_entity/entityfields/orderitems/children/currency_param/valueProcess.js
+++ b/entity/Order_entity/entityfields/orderitems/children/currency_param/valueProcess.js
@@ -1,4 +1,5 @@
+import("Currency_lib");
import("system.vars");
import("system.result");
-result.string(vars.get("$field.CURRENCY"));
\ No newline at end of file
+result.string(CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)[1]);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/orderitems/children/currencyandcurrencyrate_param/valueProcess.js b/entity/Order_entity/entityfields/orderitems/children/currencyandcurrencyrate_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9a5dce5387097e4b0df1b29035384bc58ffb3435
--- /dev/null
+++ b/entity/Order_entity/entityfields/orderitems/children/currencyandcurrencyrate_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("Currency_lib");
+import("system.result");
+import("system.vars");
+
+var currencyAndRate = CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)
+var res = {
+ currency: currencyAndRate[1]
+ , currencyRate: currencyAndRate[0]
+}
+result.string(JSON.stringify(res));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paid/displayValueProcess.js b/entity/Order_entity/entityfields/paid/displayValueProcess.js
deleted file mode 100644
index 41eb0973521153ec8af5545fd8105202745e7a43..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/paid/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("Util_lib");
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-result.string(NumberUtils.formatWithCurrency(vars.get("$field.PAID"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paid/stateProcess.js b/entity/Order_entity/entityfields/paid/stateProcess.js
index c5b973b17369f2080b66374d84448a83637224eb..6fd853697164f8921d4bb8c0f3a2826a5b57f802 100644
--- a/entity/Order_entity/entityfields/paid/stateProcess.js
+++ b/entity/Order_entity/entityfields/paid/stateProcess.js
@@ -1,13 +1,14 @@
+import("Currency_lib");
import("system.result");
import("system.vars");
import("system.neon");
import("KeywordRegistry_basic")
if(vars.get("$field.ORDERTYPE") != $KeywordRegistry.orderType$confirmation())
- {
- result.string(neon.COMPONENTSTATE_EDITABLE);
- }
+{
+ result.string(CurrencyRateUtils.getFieldState(vars.get("$field.CURRENCYRATE_ID")));
+}
else
- {
+{
result.string(neon.COMPONENTSTATE_INVISIBLE);
- }
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paid/titleProcess.js b/entity/Order_entity/entityfields/paid/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dc6c5108a1da066e528f615ed08ea3f1dfa1c84b
--- /dev/null
+++ b/entity/Order_entity/entityfields/paid/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("Currency_lib");
+import("system.translate");
+import("system.result");
+
+var currency = CurrencyUtils.getLocalCurrency();
+
+result.string(translate.withArguments("Paid (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paidforeigncurrency/stateProcess.js b/entity/Order_entity/entityfields/paidforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a330159d74f202e6921f41dd48878e34cf46a296
--- /dev/null
+++ b/entity/Order_entity/entityfields/paidforeigncurrency/stateProcess.js
@@ -0,0 +1,14 @@
+import("Currency_lib");
+import("system.result");
+import("system.vars");
+import("system.neon");
+import("KeywordRegistry_basic")
+
+if(vars.get("$field.ORDERTYPE") != $KeywordRegistry.orderType$confirmation())
+{
+ result.string(CurrencyRateUtils.getFieldState(vars.get("$field.CURRENCYRATE_ID"), true));
+}
+else
+{
+ result.string(neon.COMPONENTSTATE_INVISIBLE);
+}
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/paidforeigncurrency/titleProcess.js b/entity/Order_entity/entityfields/paidforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..21d0776302f252e1f2c620b8f942f34c74f6aeb3
--- /dev/null
+++ b/entity/Order_entity/entityfields/paidforeigncurrency/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.translate");
+import("system.result");
+import("Currency_lib");
+import("system.vars");
+
+var currency = CurrencyRateUtils.GetCurrencyForTitle(vars.get("$property.CURRENCYRATE_ID.dropDown"), vars.get("$field.CURRENCYRATE_ID"));
+
+result.string(translate.withArguments("Paid (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/products/children/currencyandcurrencyrate_param/valueProcess.js b/entity/Order_entity/entityfields/products/children/currencyandcurrencyrate_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9a5dce5387097e4b0df1b29035384bc58ffb3435
--- /dev/null
+++ b/entity/Order_entity/entityfields/products/children/currencyandcurrencyrate_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("Currency_lib");
+import("system.result");
+import("system.vars");
+
+var currencyAndRate = CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)
+var res = {
+ currency: currencyAndRate[1]
+ , currencyRate: currencyAndRate[0]
+}
+result.string(JSON.stringify(res));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/products/children/orderofferinformations_param/valueProcess.js b/entity/Order_entity/entityfields/products/children/orderofferinformations_param/valueProcess.js
index 9de8fbf51b9869563227d4ef30fcd4bba5a6eac7..e56d9cc05490d5608be400b4d77f995509c8d6cd 100644
--- a/entity/Order_entity/entityfields/products/children/orderofferinformations_param/valueProcess.js
+++ b/entity/Order_entity/entityfields/products/children/orderofferinformations_param/valueProcess.js
@@ -1,9 +1,10 @@
+import("Currency_lib");
import("system.vars");
import("system.result");
var orderInfoObject = {
"ContactId_param": vars.get("$field.CONTACT_ID"),
- "Currency_param": vars.get("$field.CURRENCY"),
+ "Currency_param": CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)[1],
"OrderId_param": vars.get("$field.SALESORDERID"),
"OrderStatus_param": vars.get("$field.ORDERSTATUS")
};
diff --git a/entity/Order_entity/entityfields/refreshcurrencyrate/onActionProcess.js b/entity/Order_entity/entityfields/refreshcurrencyrate/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8566120e6fb0889b83fb24790c9b92045c204e0d
--- /dev/null
+++ b/entity/Order_entity/entityfields/refreshcurrencyrate/onActionProcess.js
@@ -0,0 +1,49 @@
+import("Util_lib");
+import("system.translate");
+import("Context_lib");
+import("system.vars");
+import("Currency_lib");
+
+var title = [vars.get("$field.SALESORDERCODE")];
+
+if(Utils.toBoolean(vars.get("$field.CANCELLATION")))
+{
+ title.push(translate.text("${ORDER_CANCELLED}"));
+}
+
+
+title = title.join(" | ");
+
+var fields = [{"title" : translate.text("Paid")
+ , "valueLocalCurrency": vars.get("$field.PAID")
+ , "valueForeignCurrency": vars.get("$field.paidForeignCurrency")
+ , "valueColumn": "PAID"
+ }
+ , {"title" : translate.text("discounted Vat")
+ , "valueLocalCurrency": vars.get("$field.DISCOUNTED_VAT")
+ , "valueForeignCurrency": vars.get("$field.discounted_vatForeignCurrency")
+ , "valueColumn": "DISCOUNTED_VAT"
+ }
+ , {"title" : translate.text("discounted Price")
+ , "valueLocalCurrency": vars.get("$field.DISCOUNTED_NET")
+ , "valueForeignCurrency": vars.get("$field.discounted_netForeignCurrency")
+ , "valueColumn": "DISCOUNTED_NET"
+ }
+ , {
+ "title" : translate.text("Total VAT")
+ , "valueLocalCurrency": vars.get("$field.VAT")
+ , "valueForeignCurrency": vars.get("$field.vatForeignCurrency")
+ , "valueColumn": "VAT"
+ }
+ , {"title" : translate.text("Total net")
+ , "valueLocalCurrency": vars.get("$field.NET")
+ , "valueForeignCurrency": vars.get("$field.netForeignCurrency")
+ , "valueColumn": "NET"
+ }];
+
+CurrencyRateUtils.openCurrencyRateRefreshView(ContextUtils.getCurrentContextId()
+ , vars.get("$field.SALESORDERID")
+ , title
+ , vars.get("$field.CURRENCYRATE_ID")
+ , fields
+ , true);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/refreshcurrencyrate/stateProcess.js b/entity/Order_entity/entityfields/refreshcurrencyrate/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..33f8ebe1ee008ca879c3becd4a143a3d9046a3f5
--- /dev/null
+++ b/entity/Order_entity/entityfields/refreshcurrencyrate/stateProcess.js
@@ -0,0 +1,17 @@
+import("Util_lib");
+import("Order_lib");
+import("system.result");
+import("system.neon");
+import("Currency_lib");
+import("system.vars");
+
+var state = neon.COMPONENTSTATE_DISABLED;
+var currencyRateId = vars.get("$field.CURRENCYRATE_ID");
+
+if(Utils.isNotNullOrEmptyString(currencyRateId) && currencyRateId != $CurrencyRate.LOCALCURRENCY()
+ && OrderUtils.isEditable(vars.get("$field.ORDERSTATUS")))
+{
+ state = neon.COMPONENTSTATE_EDITABLE;
+}
+
+result.string(state);
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/refreshcurrencyrate/titleProcess.js b/entity/Order_entity/entityfields/refreshcurrencyrate/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bb63bd8374be9674191d7573fafc994a49f75154
--- /dev/null
+++ b/entity/Order_entity/entityfields/refreshcurrencyrate/titleProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.refreshCurrencyRateActionTitle("CURRENCYRATE_ID"));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/totalgross/displayValueProcess.js b/entity/Order_entity/entityfields/totalgross/displayValueProcess.js
deleted file mode 100644
index 7e05663a8bc4754d820b79c99b32536c38cb3916..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/totalgross/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("Util_lib");
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-result.string(NumberUtils.formatWithCurrency(vars.get("$field.TotalGross"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/totalgross/titleProcess.js b/entity/Order_entity/entityfields/totalgross/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..a0e29faa5794bbcd68bc6e920694bbe6b9154990
--- /dev/null
+++ b/entity/Order_entity/entityfields/totalgross/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("Currency_lib");
+import("system.translate");
+import("system.result");
+
+var currency = CurrencyUtils.getLocalCurrency();
+
+result.string(translate.withArguments("Total gross (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/totalgrossforeigncurrency/titleProcess.js b/entity/Order_entity/entityfields/totalgrossforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..e6ef6190e0d6b6c8160edfda14d3699e84b14860
--- /dev/null
+++ b/entity/Order_entity/entityfields/totalgrossforeigncurrency/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.translate");
+import("system.result");
+import("Currency_lib");
+import("system.vars");
+
+var currency = CurrencyRateUtils.GetCurrencyForTitle(vars.get("$property.CURRENCYRATE_ID.dropDown"), vars.get("$field.CURRENCYRATE_ID"));
+
+result.string(translate.withArguments("Total gross (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/transferdeliverynote/onActionProcess.js b/entity/Order_entity/entityfields/transferdeliverynote/onActionProcess.js
index f61918ffc215724c1fe727ed4d97783f8f61adac..22537be86de788d55a707f7f3d4e4f14e57a9953 100644
--- a/entity/Order_entity/entityfields/transferdeliverynote/onActionProcess.js
+++ b/entity/Order_entity/entityfields/transferdeliverynote/onActionProcess.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("system.vars");
import("system.neon");
import("Order_lib");
@@ -8,7 +9,7 @@ import("KeywordRegistry_basic");
var orderId = vars.get("$field.SALESORDERID");
var fieldValues = {
contactId: vars.getString("$field.CONTACT_ID"),
- currency: vars.getString("$field.CURRENCY"),
+ currency: CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)[1],
language: vars.getString("$field.ISOLANGUAGE"),
header: vars.getString("$field.HEADER"),
footer: vars.getString("$field.FOOTER"),
diff --git a/entity/Order_entity/entityfields/transferinvoice/onActionProcess.js b/entity/Order_entity/entityfields/transferinvoice/onActionProcess.js
index b6e2432b8f61a73d8cdc2c4a9d8cedb3d6e1f032..0503b743fb6ab91250f3945af61166197a23e60c 100644
--- a/entity/Order_entity/entityfields/transferinvoice/onActionProcess.js
+++ b/entity/Order_entity/entityfields/transferinvoice/onActionProcess.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("system.vars");
import("system.neon");
import("Order_lib");
@@ -8,7 +9,7 @@ import("KeywordRegistry_basic");
var orderId = vars.get("$field.SALESORDERID");
var fieldValues = {
contactId: vars.getString("$field.CONTACT_ID"),
- currency: vars.getString("$field.CURRENCY"),
+ currency: CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)[1],
language: vars.getString("$field.ISOLANGUAGE"),
header: vars.getString("$field.HEADER"),
footer: vars.getString("$field.FOOTER"),
diff --git a/entity/Order_entity/entityfields/vat/displayValueProcess.js b/entity/Order_entity/entityfields/vat/displayValueProcess.js
deleted file mode 100644
index 47ebfd7ecabcff3e202bfc72a540623de1e484fd..0000000000000000000000000000000000000000
--- a/entity/Order_entity/entityfields/vat/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("Util_lib");
-import("system.vars");
-import("system.translate");
-import("system.result");
-
-result.string(NumberUtils.formatWithCurrency(vars.get("$field.VAT"), translate.text("#,##0.00"), vars.get("$field.CURRENCY")));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/vat/titleProcess.js b/entity/Order_entity/entityfields/vat/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..947024cc7d670387c5ce67b5a08474d2cf3d8956
--- /dev/null
+++ b/entity/Order_entity/entityfields/vat/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("Currency_lib");
+import("system.translate");
+import("system.result");
+
+var currency = CurrencyUtils.getLocalCurrency();
+
+result.string(translate.withArguments("Total VAT (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/vatforeigncurrency/stateProcess.js b/entity/Order_entity/entityfields/vatforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ac3321a7cbcfba6358490dd76147b31f3429b1b5
--- /dev/null
+++ b/entity/Order_entity/entityfields/vatforeigncurrency/stateProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Currency_lib");
+
+result.string(CurrencyRateUtils.getFieldState(vars.get("$field.CURRENCYRATE_ID"), true, neon.COMPONENTSTATE_READONLY));
\ No newline at end of file
diff --git a/entity/Order_entity/entityfields/vatforeigncurrency/titleProcess.js b/entity/Order_entity/entityfields/vatforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d69ac8c6566e3f122d4dd258043f0424b0f665ec
--- /dev/null
+++ b/entity/Order_entity/entityfields/vatforeigncurrency/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.translate");
+import("system.result");
+import("Currency_lib");
+import("system.vars");
+
+var currency = CurrencyRateUtils.GetCurrencyForTitle(vars.get("$property.CURRENCYRATE_ID.dropDown"), vars.get("$field.CURRENCYRATE_ID"));
+
+result.string(translate.withArguments("Total VAT (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/fromClauseProcess.js b/entity/Order_entity/recordcontainers/db/fromClauseProcess.js
index 923c8a9a9ec21dd5d6351f162e1c2dc16c316a91..1320870422dbbe36b4e4f5b06fb11a9c87ac4c94 100644
--- a/entity/Order_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Order_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,6 +1,11 @@
import("system.result");
+import("Sql_lib");
-result.string("SALESORDER \n\
- left join CONTACT on CONTACT.CONTACTID = SALESORDER.CONTACT_ID \n\
- left join ORGANISATION on ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID \n\
- left join PERSON on PERSON.PERSONID = CONTACT.PERSON_ID");
\ No newline at end of file
+var from = new SqlBuilder()
+ .from("SALESORDER")
+ .leftJoin("CONTACT", "CONTACT.CONTACTID = SALESORDER.CONTACT_ID")
+ .leftJoin("ORGANISATION", "ORGANISATION.ORGANISATIONID = CONTACT.ORGANISATION_ID")
+ .leftJoin("PERSON", "PERSON.PERSONID = CONTACT.PERSON_ID")
+ .leftJoin("CURRENCYRATE", "CURRENCYRATE.CURRENCYRATEID = SALESORDER.CURRENCYRATE_ID");
+
+result.string(from.toString());
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
deleted file mode 100644
index 96a20903efbd23dc29c8dac4a97c46c2fe6d3c88..0000000000000000000000000000000000000000
--- a/entity/Order_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.currency(), "SALESORDER.CURRENCY");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/discounted_netforeigncurrency.value/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/discounted_netforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..2a02b344cdb06e01a90d0c9da55f64999832cf45
--- /dev/null
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/discounted_netforeigncurrency.value/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("SALESORDER.DISCOUNTED_NET / CURRENCYRATE.CURRENCYRATE");
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/discounted_vatforeigncurrency.value/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/discounted_vatforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..838538ce09eb81b77083ba808ddd2dbd80e88127
--- /dev/null
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/discounted_vatforeigncurrency.value/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("SALESORDER.DISCOUNTED_VAT / CURRENCYRATE.CURRENCYRATE");
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/netforeigncurrency.value/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/netforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..c7e2a1512b66e0da2dbba156f334d329201ecbce
--- /dev/null
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/netforeigncurrency.value/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("SALESORDER.NET / CURRENCYRATE.CURRENCYRATE");
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/paidforeigncurrency.value/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/paidforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..a24d155c7feb0ed0e71f349130bf65d6289ea655
--- /dev/null
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/paidforeigncurrency.value/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("SALESORDER.PAID / CURRENCYRATE.CURRENCYRATE");
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/totalgross.value/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/totalgross.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..ed4ca0ac224294d9a447b30af64d75de149173b3
--- /dev/null
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/totalgross.value/expression.js
@@ -0,0 +1,12 @@
+import("system.result");
+import("Sql_lib");
+
+var netValue = SqlBuilder.caseWhen(newWhere("SALESORDER.DISCOUNT", "0", SqlBuilder.GREATER()))
+ .then("SALESORDER.DISCOUNTED_NET")
+ .elseValue("SALESORDER.NET").toString();
+
+var vatValue = SqlBuilder.caseWhen(newWhere("SALESORDER.DISCOUNT", "0", SqlBuilder.GREATER()))
+ .then("SALESORDER.DISCOUNTED_VAT")
+ .elseValue("SALESORDER.VAT").toString();
+
+result.string(netValue + " + " + vatValue);
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/totalgrossforeigncurrency.value/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/totalgrossforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..e5f215f096da62aacb4a19b56b6408f2d5ed9e5a
--- /dev/null
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/totalgrossforeigncurrency.value/expression.js
@@ -0,0 +1,13 @@
+import("system.result");
+import("Sql_lib");
+
+var netValue = SqlBuilder.caseWhen(newWhere("SALESORDER.DISCOUNT", "0", SqlBuilder.GREATER()))
+ .then("SALESORDER.DISCOUNTED_NET / CURRENCYRATE.CURRENCYRATE")
+ .elseValue("SALESORDER.NET / CURRENCYRATE.CURRENCYRATE")
+ .toString();
+var vatValue = SqlBuilder.caseWhen(newWhere("SALESORDER.DISCOUNT", "0", SqlBuilder.GREATER()))
+ .then("SALESORDER.DISCOUNTED_VAT / CURRENCYRATE.CURRENCYRATE")
+ .elseValue("SALESORDER.VAT / CURRENCYRATE.CURRENCYRATE")
+ .toString();
+
+result.string(netValue + " + " + vatValue);
\ No newline at end of file
diff --git a/entity/Order_entity/recordcontainers/db/recordfieldmappings/vatforeigncurrency.value/expression.js b/entity/Order_entity/recordcontainers/db/recordfieldmappings/vatforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..8174d5981979a596ec3bf5af84d8f2e367ac5244
--- /dev/null
+++ b/entity/Order_entity/recordcontainers/db/recordfieldmappings/vatforeigncurrency.value/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("SALESORDER.VAT / CURRENCYRATE.CURRENCYRATE");
\ No newline at end of file
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index dbdcda99143f4bb0b4db861f5cb61c3d057db778..331038500ab79b72c614ba764d1e0131baf93561 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -65,7 +65,9 @@
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<mandatory v="true" />
- <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/price/displayValueProcess.js</displayValueProcess>
+ <mandatoryProcess>%aditoprj%/entity/Orderitem_entity/entityfields/price/mandatoryProcess.js</mandatoryProcess>
+ <stateProcess>%aditoprj%/entity/Orderitem_entity/entityfields/price/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Orderitem_entity/entityfields/price/titleProcess.js</titleProcess>
</entityField>
<entityField>
<name>PRODUCT_ID</name>
@@ -132,8 +134,8 @@
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<state>READONLY</state>
+ <titleProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalprice/displayValueProcess.js</displayValueProcess>
</entityField>
<entityField>
<name>IMAGE</name>
@@ -359,6 +361,29 @@
<name>PICTURE</name>
<contentType>IMAGE</contentType>
</entityField>
+ <entityParameter>
+ <name>CurrencyAndCurrencyRate_param</name>
+ <expose v="true" />
+ </entityParameter>
+ <entityField>
+ <name>totalPriceForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalpriceforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalpriceforeigncurrency/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/totalpriceforeigncurrency/valueProcess.js</valueProcess>
+ </entityField>
+ <entityField>
+ <name>priceForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <mandatoryProcess>%aditoprj%/entity/Orderitem_entity/entityfields/priceforeigncurrency/mandatoryProcess.js</mandatoryProcess>
+ <stateProcess>%aditoprj%/entity/Orderitem_entity/entityfields/priceforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Orderitem_entity/entityfields/priceforeigncurrency/titleProcess.js</titleProcess>
+ <onValueChange>%aditoprj%/entity/Orderitem_entity/entityfields/priceforeigncurrency/onValueChange.js</onValueChange>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -510,6 +535,14 @@
<name>PICTURE.value</name>
<expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/picture.value/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>totalPriceForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/totalpriceforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>priceForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/priceforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/Orderitem_entity/entityfields/currency/valueProcess.js b/entity/Orderitem_entity/entityfields/currency/valueProcess.js
index f125324e596f8c1180a1fbb47601c2a8f0ad95c0..8eb07996680f1cf3d6106c475bc57523257ad103 100644
--- a/entity/Orderitem_entity/entityfields/currency/valueProcess.js
+++ b/entity/Orderitem_entity/entityfields/currency/valueProcess.js
@@ -1,13 +1,12 @@
-import("KeywordRegistry_basic");
-import("Keyword_lib");
+import("Context_lib");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
{
- if(vars.get("$param.Currency_param") && vars.get("$param.Currency_param") != "")
+ if(vars.get("$param.CurrencyAndCurrencyRate_param"))
{
- result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.getString("$param.Currency_param")));
+ result.string(ContextUtils.loadContentTitle("Currency_entity", JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"))["currency"]));
}
}
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/price/displayValueProcess.js b/entity/Orderitem_entity/entityfields/price/displayValueProcess.js
deleted file mode 100644
index 371d20d026cf2c99b48ba2dee82c4129d1d07ac6..0000000000000000000000000000000000000000
--- a/entity/Orderitem_entity/entityfields/price/displayValueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.translate");
-import("Util_lib");
-
-var currency = vars.get("$param.Currency_param") || vars.get("$field.ORDER_CURRENCY");
-result.string(NumberUtils.formatWithCurrency(
- vars.get("$this.value"), translate.text("#,##0.00"), currency));
diff --git a/entity/Orderitem_entity/entityfields/price/mandatoryProcess.js b/entity/Orderitem_entity/entityfields/price/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4f59184f342c35f2fd25505c6435527d52169014
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/price/mandatoryProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.getFieldMandatoryChildEntity("CurrencyAndCurrencyRate_param", false));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/price/stateProcess.js b/entity/Orderitem_entity/entityfields/price/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..133627944bf80fede5e5823911c833132f6ff930
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/price/stateProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.getFieldStateChildEntity("CurrencyAndCurrencyRate_param"));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/price/titleProcess.js b/entity/Orderitem_entity/entityfields/price/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ecb5ab46dbd61737fdafbe107a8ab5dba0836378
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/price/titleProcess.js
@@ -0,0 +1,5 @@
+import("Currency_lib");
+import("system.result");
+import("system.translate");
+
+result.string(translate.withArguments("Unit price (%0)", [CurrencyUtils.getLocalCurrency()]));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/priceforeigncurrency/mandatoryProcess.js b/entity/Orderitem_entity/entityfields/priceforeigncurrency/mandatoryProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4623ee6caab4371c4c7dd3bbdace2016a8b508b7
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/priceforeigncurrency/mandatoryProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.getFieldMandatoryChildEntity("CurrencyAndCurrencyRate_param", true));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/priceforeigncurrency/onValueChange.js b/entity/Orderitem_entity/entityfields/priceforeigncurrency/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..eb38da939f039afb0382ff118fe22d99b20ac4bc
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/priceforeigncurrency/onValueChange.js
@@ -0,0 +1,3 @@
+import("Currency_lib");
+
+CurrencyRateUtils.setOtherValueFieldChildEntity("CurrencyAndCurrencyRate_param", "PRICE");
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/priceforeigncurrency/stateProcess.js b/entity/Orderitem_entity/entityfields/priceforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1ab4f7fc02663b32f12c2099b09c09dcd8eada64
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/priceforeigncurrency/stateProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.getFieldStateChildEntity("CurrencyAndCurrencyRate_param", true));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/priceforeigncurrency/titleProcess.js b/entity/Orderitem_entity/entityfields/priceforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d61220aca9cccb4919ab9df4535b34b7c560742
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/priceforeigncurrency/titleProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.result");
+import("Context_lib");
+import("system.vars");
+
+var currencyParam = JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"));
+var currency = ContextUtils.loadContentTitle("Currency_entity", currencyParam["currency"]);
+
+result.string(translate.withArguments("Unit price (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/product_id/onValueChange.js b/entity/Orderitem_entity/entityfields/product_id/onValueChange.js
index 83f60fa1a8d9b90b49baed0d01c96d4a97e32fa1..a26d410c37308ca2d52e6c14644bc08b3f68ca47 100644
--- a/entity/Orderitem_entity/entityfields/product_id/onValueChange.js
+++ b/entity/Orderitem_entity/entityfields/product_id/onValueChange.js
@@ -12,7 +12,7 @@ if(pId != "" && vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
ItemUtils.product_IdOnValueChange(pId, uid, entity);
var oiUtils = new OrderItemUtils(vars.get("$field.SALESORDER_ID"));
- var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
+ var curr = vars.exists("$param.CurrencyAndCurrencyRate_param") ? JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"))["currency"] : "";
var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var quantity = vars.get("$field.QUANTITY");
diff --git a/entity/Orderitem_entity/entityfields/totalprice/displayValueProcess.js b/entity/Orderitem_entity/entityfields/totalprice/displayValueProcess.js
deleted file mode 100644
index 371d20d026cf2c99b48ba2dee82c4129d1d07ac6..0000000000000000000000000000000000000000
--- a/entity/Orderitem_entity/entityfields/totalprice/displayValueProcess.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import("system.result");
-import("system.vars");
-import("system.translate");
-import("Util_lib");
-
-var currency = vars.get("$param.Currency_param") || vars.get("$field.ORDER_CURRENCY");
-result.string(NumberUtils.formatWithCurrency(
- vars.get("$this.value"), translate.text("#,##0.00"), currency));
diff --git a/entity/Orderitem_entity/entityfields/totalprice/titleProcess.js b/entity/Orderitem_entity/entityfields/totalprice/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4ec9ef76d688dd7abbd3c4044c26fd93281a724b
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/totalprice/titleProcess.js
@@ -0,0 +1,5 @@
+import("Currency_lib");
+import("system.result");
+import("system.translate");
+
+result.string(translate.withArguments("Sum (%0)", [CurrencyUtils.getLocalCurrency()]));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/totalpriceforeigncurrency/stateProcess.js b/entity/Orderitem_entity/entityfields/totalpriceforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d55a43d731857ca31115fdca8bd3aefb1417a1e
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/totalpriceforeigncurrency/stateProcess.js
@@ -0,0 +1,12 @@
+import("system.neon");
+import("Currency_lib");
+import("system.result");
+
+var state = CurrencyRateUtils.getFieldStateChildEntity("CurrencyAndCurrencyRate_param", true)
+
+if(state == neon.COMPONENTSTATE_EDITABLE)
+{
+ state = neon.COMPONENTSTATE_READONLY;
+}
+
+result.string(state);
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/totalpriceforeigncurrency/titleProcess.js b/entity/Orderitem_entity/entityfields/totalpriceforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..578bce40c3f0111e48228e620ad602dc2893ebda
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/totalpriceforeigncurrency/titleProcess.js
@@ -0,0 +1,9 @@
+import("system.translate");
+import("system.result");
+import("Context_lib");
+import("system.vars");
+
+var currencyParam = JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"));
+var currency = ContextUtils.loadContentTitle("Currency_entity", currencyParam["currency"]);
+
+result.string(translate.withArguments("Sum (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/entityfields/totalpriceforeigncurrency/valueProcess.js b/entity/Orderitem_entity/entityfields/totalpriceforeigncurrency/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7b717d4e1ca3aa49873e6524e1c09721e503d44b
--- /dev/null
+++ b/entity/Orderitem_entity/entityfields/totalpriceforeigncurrency/valueProcess.js
@@ -0,0 +1,8 @@
+import("system.result");
+import("system.vars");
+import("Order_lib");
+
+var oiUtils = new OrderItemUtils(vars.get("$field.SALESORDER_ID"));
+
+result.string(oiUtils.roundPrice(oiUtils.getItemSum(vars.get("$field.QUANTITY"), vars.get("$field.priceForeignCurrency")
+ , vars.get("$field.DISCOUNT"))));
\ No newline at end of file
diff --git a/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/priceforeigncurrency.value/expression.js b/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/priceforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..a95f60f92c6f65c3c9b9bfb7ee5925d530c4e216
--- /dev/null
+++ b/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/priceforeigncurrency.value/expression.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("system.result");
+
+var currencyParam = vars.get("$param.CurrencyAndCurrencyRate_param");
+if(currencyParam && JSON.parse(currencyParam)["currencyRate"])
+{
+ result.string("SALESORDERITEM.PRICE /" + JSON.parse(currencyParam)["currencyRate"]);
+}
\ No newline at end of file
diff --git a/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/totalpriceforeigncurrency.value/expression.js b/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/totalpriceforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..e3eb485c2d4e6c26f48b04ee89ab729b102af908
--- /dev/null
+++ b/entity/Orderitem_entity/recordcontainers/db/recordfieldmappings/totalpriceforeigncurrency.value/expression.js
@@ -0,0 +1,21 @@
+import("system.vars");
+import("system.result");
+import("Sql_lib");
+
+var currencyParam = vars.get("$param.CurrencyAndCurrencyRate_param");
+var price = SqlBuilder.caseWhen(newWhere("SALESORDERITEM.PRICE", "0", SqlBuilder.GREATER()))
+ .then("SALESORDERITEM.PRICE /" + JSON.parse(currencyParam)["currencyRate"])
+ .elseValue("0")
+ .toString();
+
+var quantity = SqlBuilder.caseWhen(newWhere("SALESORDERITEM.QUANTITY", "0", SqlBuilder.GREATER()))
+ .then("SALESORDERITEM.QUANTITY")
+ .elseValue("0")
+ .toString();
+
+var discount = SqlBuilder.caseWhen(newWhere("SALESORDERITEM.DISCOUNT", "0", SqlBuilder.GREATER()))
+ .then("SALESORDERITEM.DISCOUNT")
+ .elseValue("0")
+ .toString();
+
+result.string(price + " * " + quantity + "* (100 - " + discount + ") / 100");
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index 6c66d90b9193913044811aa5b08ec3225e1661fd..2fd9e315e940660e3c243f9dee2285989548e27f 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -17,27 +17,6 @@
<titlePlural>Companies</titlePlural>
<recordContainer>db</recordContainer>
<entityFields>
- <entityActionGroup>
- <name>observeActionGroup</name>
- <children>
- <entityActionField>
- <name>observe</name>
- <title>Observe</title>
- <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
- <isObjectAction v="true" />
- <iconId>VAADIN:EYE</iconId>
- <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
- </entityActionField>
- <entityActionField>
- <name>cancelObservation</name>
- <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:EYE_SLASH</iconId>
- <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
- </entityActionField>
- </children>
- </entityActionGroup>
<entityField>
<name>CUSTOMERCODE</name>
<title>Customercode</title>
@@ -1073,6 +1052,27 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityActionGroup>
+ <name>observeActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>observe</name>
+ <title>Observe</title>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
+ <isObjectAction v="true" />
+ <iconId>VAADIN:EYE</iconId>
+ <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>cancelObservation</name>
+ <onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:EYE_SLASH</iconId>
+ <stateProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Organisation_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
<entityActionField>
<name>openEditDefaultsView</name>
<documentation>%aditoprj%/entity/Organisation_entity/entityfields/openeditdefaultsview/documentation.adoc</documentation>
diff --git a/entity/Planning_entity/Planning_entity.aod b/entity/Planning_entity/Planning_entity.aod
index 272d77a0807f3323d412be46be3c20b510e7adf9..280338d6bcfb23cab4c2c635da4356edc02fb10b 100644
--- a/entity/Planning_entity/Planning_entity.aod
+++ b/entity/Planning_entity/Planning_entity.aod
@@ -35,6 +35,7 @@
<inputFormat>#,##0.00</inputFormat>
<groupable v="true" />
<mandatory v="true" />
+ <titleProcess>%aditoprj%/entity/Planning_entity/entityfields/volume/titleProcess.js</titleProcess>
</entityField>
<entityField>
<name>FORECAST_YEAR</name>
diff --git a/entity/Planning_entity/entityfields/volume/titleProcess.js b/entity/Planning_entity/entityfields/volume/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d1fb3d557032bdf6de8f1dd848768aec7e909baf
--- /dev/null
+++ b/entity/Planning_entity/entityfields/volume/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("Currency_lib");
+import("system.translate");
+import("system.result");
+
+var localCurrency = CurrencyUtils.getLocalCurrency();
+
+result.string(translate.withArguments("Volume (%0)", [localCurrency]));
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index bf2d0e8493d6330b1ae9d73060dbfd7f923dd462..fc9512094087826d276c307fbbc449ab39e7f3bf 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -578,6 +578,10 @@
</entityParameter>
</children>
</entityConsumer>
+ <entityParameter>
+ <name>CurrencyAndCurrencyRate_param</name>
+ <expose v="true" />
+ </entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
diff --git a/entity/Product_entity/entityfields/addtooffer/onActionProcess.js b/entity/Product_entity/entityfields/addtooffer/onActionProcess.js
index 546c24d014d84332730819b364ce5f3103a79334..becdc1334c076175802a66e0573d411e2b20e780 100644
--- a/entity/Product_entity/entityfields/addtooffer/onActionProcess.js
+++ b/entity/Product_entity/entityfields/addtooffer/onActionProcess.js
@@ -4,6 +4,7 @@ import("system.vars");
var params = JSON.parse(vars.get("$param.OrderOfferInformations_param"));
params["ProductId_param"] = vars.get("$field.PRODUCTID");
+params["CurrencyAndCurrencyRate_param"] = vars.get("$param.CurrencyAndCurrencyRate_param");
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString();
neon.openContextWithRecipe("OfferItem", "OfferItemEdit_view", recipe, neon.OPERATINGSTATE_NEW);
diff --git a/entity/Product_entity/entityfields/addtoorder/onActionProcess.js b/entity/Product_entity/entityfields/addtoorder/onActionProcess.js
index 8efbb6acb5cfd6fa9c70f08a8417bc27792bd115..ef8576a250caddb785b910a67698e7dbaf559a3a 100644
--- a/entity/Product_entity/entityfields/addtoorder/onActionProcess.js
+++ b/entity/Product_entity/entityfields/addtoorder/onActionProcess.js
@@ -1,9 +1,11 @@
import("system.neonFilter");
import("system.neon");
import("system.vars");
+import("system.neonFilter");
var params = JSON.parse(vars.get("$param.OrderOfferInformations_param"));
params["ProductId_param"] = vars.get("$field.PRODUCTID");
+params["CurrencyAndCurrencyRate_param"] = vars.get("$param.CurrencyAndCurrencyRate_param");
var recipe = neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString();
-neon.openContextWithRecipe("OrderItem", "OrderItemEdit_view", recipe, neon.OPERATINGSTATE_NEW);
+neon.openContextWithRecipe("Orderitem", "OrderitemEdit_view", recipe, neon.OPERATINGSTATE_NEW);
\ No newline at end of file
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 177b09df41ec56f5d3bad7feca838a7ed1d6df17..450059169814b3d67e19c14e8f9121461a0e5ab5 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -22,15 +22,6 @@
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/buysell/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/Productprice_entity/entityfields/buysell/onValueChange.js</onValueChange>
</entityField>
- <entityField>
- <name>CURRENCY</name>
- <title>Currency</title>
- <consumer>KeywordCurrencies</consumer>
- <groupable v="true" />
- <mandatory v="true" />
- <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
- </entityField>
<entityField>
<name>FROMQUANTITY</name>
<title>Valid from</title>
@@ -51,6 +42,8 @@
<inputFormat>#,##0.00</inputFormat>
<mandatory v="true" />
<state>AUTO</state>
+ <stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/price/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Productprice_entity/entityfields/price/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/price/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -228,11 +221,40 @@
<name>IgnoreOnValidation_param</name>
<expose v="true" />
</entityParameter>
+ <entityField>
+ <name>CURRENCYRATE_ID</name>
+ <title>Currency</title>
+ <mandatory v="true" />
+ <dropDownProcess>%aditoprj%/entity/Productprice_entity/entityfields/currencyrate_id/dropDownProcess.js</dropDownProcess>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currencyrate_id/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Productprice_entity/entityfields/currencyrate_id/onValueChange.js</onValueChange>
+ </entityField>
+ <entityField>
+ <name>priceForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/priceforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Productprice_entity/entityfields/priceforeigncurrency/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/priceforeigncurrency/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Productprice_entity/entityfields/priceforeigncurrency/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityActionField>
+ <name>refreshCurrencyRate</name>
+ <onActionProcess>%aditoprj%/entity/Productprice_entity/entityfields/refreshcurrencyrate/onActionProcess.js</onActionProcess>
+ <iconId>NEON:RECURRING_APPOINTMENT</iconId>
+ <stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/refreshcurrencyrate/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Productprice_entity/entityfields/refreshcurrencyrate/titleProcess.js</titleProcess>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>db</name>
<hasDependentRecords v="true" />
+ <fromClauseProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/fromClauseProcess.js</fromClauseProcess>
<conditionProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Productprice_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
<onDBInsert>%aditoprj%/entity/Productprice_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
@@ -244,12 +266,6 @@
<isFilterable v="true" />
<isLookupFilter v="false" />
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CURRENCY.value</name>
- <recordfield>PRODUCTPRICE.CURRENCY</recordfield>
- <isFilterable v="true" />
- <isLookupFilter v="false" />
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>FROMQUANTITY.value</name>
<recordfield>PRODUCTPRICE.FROMQUANTITY</recordfield>
@@ -302,10 +318,6 @@
<isFilterable v="true" />
<isLookupFilter v="false" />
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>CURRENCY.displayValue</name>
- <expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>FROMQUANTITY.displayValue</name>
<expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/fromquantity.displayvalue/expression.js</expression>
@@ -314,15 +326,30 @@
<name>PRODUCT_ID.displayValue</name>
<expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>priceForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/priceforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CURRENCYRATE_ID.value</name>
+ <recordfield>PRODUCTPRICE.CURRENCYRATE_ID</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
- <name>85fd1bcf-499f-4708-ad8e-18f5a0f5337d</name>
+ <name>daed38ef-80d1-475c-ab2e-76c87238b000</name>
<tableName>PRODUCTPRICE</tableName>
<primaryKey>PRODUCTPRICEID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
+ <linkInformation>
+ <name>6c712eae-560e-41b8-a601-45cfb4b55ee9</name>
+ <tableName>CURRENCYRATE</tableName>
+ <primaryKey>CURRENCYRATEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
</linkInformation>
<filterExtensions>
<filterExtension>
diff --git a/entity/Productprice_entity/entityfields/buysell/onValueChange.js b/entity/Productprice_entity/entityfields/buysell/onValueChange.js
index cd46fff6b68ea0ffe4537bf860a1d5e992a27deb..bde805350b3d791bade77d02e3c7c9739eac62dd 100644
--- a/entity/Productprice_entity/entityfields/buysell/onValueChange.js
+++ b/entity/Productprice_entity/entityfields/buysell/onValueChange.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("system.neon");
import("Product_lib");
import("system.vars");
@@ -5,5 +6,5 @@ import("system.vars");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
{
ProductUtils.presetPriceAndVat(vars.get("$field.PRODUCT_ID"), vars.get("$field.VAT"), vars.get("$field.PRICELIST"), vars.get("$this.value")
- , vars.get("$field.CURRENCY"), vars.get("$field.FROMQUANTITY"), vars.get("$field.PRICE"));
+ , CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)[1], vars.get("$field.FROMQUANTITY"), vars.get("$field.PRICE"));
}
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/currency/displayValueProcess.js b/entity/Productprice_entity/entityfields/currency/displayValueProcess.js
deleted file mode 100644
index c268b6c47a2f8a524285a57ed57f8be564fab1b2..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/entityfields/currency/displayValueProcess.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("system.vars");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$field.CURRENCY")));
diff --git a/entity/Productprice_entity/entityfields/currency/valueProcess.js b/entity/Productprice_entity/entityfields/currency/valueProcess.js
deleted file mode 100644
index 7b9758eece838fc7690866c7ba831802a1e180ab..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/entityfields/currency/valueProcess.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("KeywordRegistry_basic");
-
-if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.get("$this.value") == null)
-{
- result.string($KeywordRegistry.currency$eur());
-}
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/currencyrate_id/dropDownProcess.js b/entity/Productprice_entity/entityfields/currencyrate_id/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5b9a93751bcf685ba59553666987417116ab3083
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/currencyrate_id/dropDownProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("Currency_lib");
+import("system.result");
+
+result.object(CurrencyRateUtils.getCurrencies(true, false, vars.get("$sys.recordstate")));
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/currencyrate_id/onValueChange.js b/entity/Productprice_entity/entityfields/currencyrate_id/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..12581bc45c646d90b213951e4ae534f33c4e8a57
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/currencyrate_id/onValueChange.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.vars");
+
+CurrencyRateUtils.setOtherValueField("PRICE", vars.get("$this.value"), "priceForeignCurrency");
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/currencyrate_id/valueProcess.js b/entity/Productprice_entity/entityfields/currencyrate_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dfa41abc63427a2e79286d4a74410713198dfe8c
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/currencyrate_id/valueProcess.js
@@ -0,0 +1,10 @@
+import("Util_lib");
+import("system.result");
+import("Currency_lib");
+import("system.vars");
+
+var rate = CurrencyRateUtils.presetCurrencyRateId("CURRENCYRATE_ID");
+if(Utils.isNotNullOrEmptyString(rate))
+{
+ result.string(rate);
+}
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/price/stateProcess.js b/entity/Productprice_entity/entityfields/price/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0eafebe5108d26f571c90e05df228692dbdff726
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/price/stateProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Currency_lib");
+
+result.string(CurrencyRateUtils.getFieldState(vars.get("$field.CURRENCYRATE_ID")));
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/price/titleProcess.js b/entity/Productprice_entity/entityfields/price/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4ec9ef76d688dd7abbd3c4044c26fd93281a724b
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/price/titleProcess.js
@@ -0,0 +1,5 @@
+import("Currency_lib");
+import("system.result");
+import("system.translate");
+
+result.string(translate.withArguments("Sum (%0)", [CurrencyUtils.getLocalCurrency()]));
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/priceforeigncurrency/onValueChange.js b/entity/Productprice_entity/entityfields/priceforeigncurrency/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..e396a0458eb5256cfa4cf3d531ea6508d77a1e7c
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/priceforeigncurrency/onValueChange.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.vars");
+
+CurrencyRateUtils.setOtherValueField("PRICE", vars.get("$field.CURRENCYRATE_ID"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/priceforeigncurrency/stateProcess.js b/entity/Productprice_entity/entityfields/priceforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..fc17d86f887bf82e63a61b63cdde5ad63afe0a38
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/priceforeigncurrency/stateProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Currency_lib");
+
+result.string(CurrencyRateUtils.getFieldState(vars.get("$field.CURRENCYRATE_ID"), true));
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/priceforeigncurrency/titleProcess.js b/entity/Productprice_entity/entityfields/priceforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1b3ec1d07e2e01e50954ba9963e0b559f25a6a03
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/priceforeigncurrency/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.translate");
+import("system.result");
+import("Currency_lib");
+import("system.vars");
+
+var currency = CurrencyRateUtils.GetCurrencyForTitle(vars.get("$property.CURRENCYRATE_ID.dropDown"), vars.get("$field.CURRENCYRATE_ID"));
+
+result.string(translate.withArguments("Total net (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/priceforeigncurrency/valueProcess.js b/entity/Productprice_entity/entityfields/priceforeigncurrency/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..963e00e4a935ee18b5db45662be8c1b71f1353bd
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/priceforeigncurrency/valueProcess.js
@@ -0,0 +1,9 @@
+import("Currency_lib");
+import("system.result");
+import("system.vars");
+import("Util_lib");
+
+if(Utils.isNullOrEmptyString(vars.get("$this.value")) && Utils.isNotNullOrEmptyString(vars.get("$field.CURRENCYRATE_ID")))
+{
+ result.string(vars.get("$field.PRICE") / CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID")));
+}
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/pricelist/onValueChange.js b/entity/Productprice_entity/entityfields/pricelist/onValueChange.js
index 7006000253e81919f28473aa904396bb8f159d8d..242060d9cc129a055bbbdd6df702bf4e5a6081b7 100644
--- a/entity/Productprice_entity/entityfields/pricelist/onValueChange.js
+++ b/entity/Productprice_entity/entityfields/pricelist/onValueChange.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("system.neon");
import("Product_lib");
import("system.vars");
@@ -5,5 +6,5 @@ import("system.vars");
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
{
ProductUtils.presetPriceAndVat(vars.get("$field.PRODUCT_ID"), vars.get("$field.VAT"), vars.get("$this.value"), vars.get("$field.BUYSELL")
- , vars.get("$field.CURRENCY"), vars.get("$field.FROMQUANTITY"), vars.get("$field.PRICE"));
+ , CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)[1], vars.get("$field.FROMQUANTITY"), vars.get("$field.PRICE"));
}
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/refreshcurrencyrate/onActionProcess.js b/entity/Productprice_entity/entityfields/refreshcurrencyrate/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..7d8e45d56e8f000f9fb062a9fa0469ba3c8a1d56
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/refreshcurrencyrate/onActionProcess.js
@@ -0,0 +1,22 @@
+import("system.datetime");
+import("Util_lib");
+import("system.translate");
+import("Context_lib");
+import("system.vars");
+import("Currency_lib");
+
+var title = [vars.get("$field.PRICELIST.displayValue")
+ , datetime.toDate(vars.get("$field.VALID_FROM"), translate.text("dd.MM.yyyy")) + " - " + datetime.toDate(vars.get("$field.VALID_TO"), translate.text("dd.MM.yyyy"))
+ , vars.get("$field.BUYSELL.displayValue") + " " + vars.get("$field.FROMQUANTITY.displayValue")];
+
+title = title.join(" | ");
+
+CurrencyRateUtils.openCurrencyRateRefreshView(ContextUtils.getCurrentContextId()
+ , vars.get("$field.PRODUCTPRICEID")
+ , title
+ , vars.get("$field.CURRENCYRATE_ID")
+ , [{"title" : translate.text("Price")
+ , "valueLocalCurrency": vars.get("$field.PRICE")
+ , "valueForeignCurrency": vars.get("$field.priceForeignCurrency")
+ , "valueColumn": "PRICE"
+ }]);
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/refreshcurrencyrate/stateProcess.js b/entity/Productprice_entity/entityfields/refreshcurrencyrate/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..433912a92c3ac6dd0a45a48f58d6671213348dc8
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/refreshcurrencyrate/stateProcess.js
@@ -0,0 +1,14 @@
+import("system.result");
+import("system.neon");
+import("Currency_lib");
+import("system.vars");
+
+var state = neon.COMPONENTSTATE_DISABLED;
+var currencyRateId = vars.get("$field.CURRENCYRATE_ID");
+
+if(currencyRateId != $CurrencyRate.LOCALCURRENCY())
+{
+ state = neon.COMPONENTSTATE_EDITABLE;
+}
+
+result.string(state);
\ No newline at end of file
diff --git a/entity/Productprice_entity/entityfields/refreshcurrencyrate/titleProcess.js b/entity/Productprice_entity/entityfields/refreshcurrencyrate/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bb63bd8374be9674191d7573fafc994a49f75154
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/refreshcurrencyrate/titleProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.refreshCurrencyRateActionTitle("CURRENCYRATE_ID"));
\ No newline at end of file
diff --git a/entity/Productprice_entity/onValidation.js b/entity/Productprice_entity/onValidation.js
index ffa8af2f179045a2f17f51042d19489a3b4347ca..3eb21be23368457b62ec99953a8d338f290faf9f 100644
--- a/entity/Productprice_entity/onValidation.js
+++ b/entity/Productprice_entity/onValidation.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("Util_lib");
import("system.datetime");
import("system.eMath");
@@ -56,7 +57,7 @@ if(vars.getString("$param.IgnoreOnValidation_param") != "true")
var buySell = vars.get("$field.BUYSELL");
var validFrom = vars.get("$field.VALID_FROM");
var validTo = vars.get("$field.VALID_TO");
- var currency = vars.get("$field.CURRENCY");
+ var currency = CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)[1];
var productPriceListId = vars.get("$field.PRODUCTPRICEID");
var quantity = vars.get("$field.FROMQUANTITY");
diff --git a/entity/Productprice_entity/recordcontainers/db/fromClauseProcess.js b/entity/Productprice_entity/recordcontainers/db/fromClauseProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..126a925496441aa56c322d0f66c6468424a79615
--- /dev/null
+++ b/entity/Productprice_entity/recordcontainers/db/fromClauseProcess.js
@@ -0,0 +1,9 @@
+import("system.result");
+import("Sql_lib");
+
+var fromClause = new SqlBuilder()
+.from("PRODUCTPRICE")
+.leftJoin("CURRENCYRATE", newWhere("CURRENCYRATE.CURRENCYRATEID = PRODUCTPRICE.CURRENCYRATE_ID"))
+.toString();
+
+result.string(fromClause);
\ No newline at end of file
diff --git a/entity/Productprice_entity/recordcontainers/db/onDBInsert.js b/entity/Productprice_entity/recordcontainers/db/onDBInsert.js
index a67c60ee19fba912c468b6399be24380ea0312a3..dbe8f6a32bc4f663ae83e53427a570b74643a43e 100644
--- a/entity/Productprice_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Productprice_entity/recordcontainers/db/onDBInsert.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("system.eMath");
import("Date_lib");
import("system.datetime");
@@ -31,7 +32,7 @@ var productId = vars.get("$field.PRODUCT_ID");
var buySell = vars.get("$field.BUYSELL");
var validFrom = vars.get("$field.VALID_FROM");
var validTo = vars.get("$field.VALID_TO");
-var currency = vars.get("$field.CURRENCY");
+var currency = CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)[1];
var oneDayPrior = eMath.subInt(validFrom, datetime.ONE_DAY);
var oneDayAfter = eMath.addInt(validTo, datetime.ONE_DAY);
var productPriceListId = vars.get("$field.PRODUCTPRICEID");
diff --git a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
deleted file mode 100644
index 49249021849c167d7ff0fb0b3cea9389f042150c..0000000000000000000000000000000000000000
--- a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js
+++ /dev/null
@@ -1,6 +0,0 @@
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
-var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.currency(), "PRODUCTPRICE.CURRENCY");
-result.string(sql);
\ No newline at end of file
diff --git a/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/priceforeigncurrency.value/expression.js b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/priceforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..684c75952df30b62976352ac2a4fbdea3b8f0d48
--- /dev/null
+++ b/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/priceforeigncurrency.value/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("PRODUCTPRICE.PRICE / CURRENCYRATE.CURRENCYRATE");
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index ef2ecfc0e644b2426e7a25165dc217b44280be62..464a1d783eed5d9cf959821370b01b2252afc7ec 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -9,6 +9,7 @@
<element>Member_entity</element>
<element>MSTTeam_entity</element>
<element>AttributeRelation_entity</element>
+ <element>Forecast_entity</element>
</siblings>
<grantDeleteProcess>%aditoprj%/entity/Salesproject_entity/grantDeleteProcess.js</grantDeleteProcess>
<contentTitleProcess>%aditoprj%/entity/Salesproject_entity/contentTitleProcess.js</contentTitleProcess>
@@ -110,13 +111,18 @@
</entityField>
<entityField>
<name>VOLUME</name>
- <title>Volume(€)</title>
<description></description>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<groupable v="true" />
- <state>READONLY</state>
+ <state>DISABLED</state>
+ <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/titleProcess.js</titleProcess>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
</entityField>
<entityConsumer>
<name>Organisations</name>
@@ -182,6 +188,10 @@
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/forecasts/children/objectrowid_param/valueProcess.js</valueProcess>
<expose v="true" />
</entityParameter>
+ <entityParameter>
+ <name>CurrencyAndCurrencyRate_param</name>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/forecasts/children/currencyandcurrencyrate_param/valueProcess.js</valueProcess>
+ </entityParameter>
</children>
</entityConsumer>
<entityConsumer>
@@ -747,81 +757,6 @@
</entityParameter>
</children>
</entityProvider>
- <entityActionGroup>
- <name>observeActionGroup</name>
- <children>
- <entityActionField>
- <name>observe</name>
- <title>Observe</title>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
- <isObjectAction v="true" />
- <iconId>VAADIN:EYE</iconId>
- <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
- </entityActionField>
- <entityActionField>
- <name>cancelObservation</name>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:EYE_SLASH</iconId>
- <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
- <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
- </entityActionField>
- <entityActionField>
- <name>export</name>
- <title>Export</title>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/onActionProcess.js</onActionProcess>
- <isMenuAction v="true" />
- <isObjectAction v="false" />
- <iconId>NEON:EXPORT</iconId>
- <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/stateProcess.js</stateProcess>
- <tooltip>Export fields of this table</tooltip>
- <tooltipProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- </children>
- </entityActionGroup>
- <entityActionField>
- <name>newOffer</name>
- <documentation>%aditoprj%/entity/Salesproject_entity/entityfields/newoffer/documentation.adoc</documentation>
- <title>New offer</title>
- <description>Opens the Offer context in NEW-Mode and fills salesproject and contact.</description>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CART</iconId>
- </entityActionField>
- <entityActionField>
- <name>newTimetracking</name>
- <title>New time tracking</title>
- <description>Opens the time tracking context in new-mode for the selected salesproject</description>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newtimetracking/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:STOPWATCH</iconId>
- </entityActionField>
- <entityActionField>
- <name>newActivity</name>
- <title>New activity</title>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:HOURGLASS_END</iconId>
- <tooltip>New activity</tooltip>
- <tooltipProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- <entityActionField>
- <name>newTask</name>
- <title>New task</title>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:TASKS</iconId>
- </entityActionField>
- <entityActionField>
- <name>startWorkflow</name>
- <title>Start workflow</title>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startworkflow/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:PLAY</iconId>
- <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startworkflow/stateProcess.js</stateProcess>
- </entityActionField>
- <entityActionField>
- <name>openAdminView</name>
- <title>Open admin view</title>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CURLY_BRACKETS</iconId>
- <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/openadminview/stateProcess.js</stateProcess>
- </entityActionField>
<entityAggregateField>
<name>PROBABILITY_aggregate</name>
<parentField>PROBABILITY</parentField>
@@ -860,24 +795,19 @@
</entityParameter>
</children>
</entityConsumer>
- <entityActionField>
- <name>openClassificationOverView</name>
- <title>Show Classification</title>
- <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/openclassificationoverview/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:LIST_OL</iconId>
- </entityActionField>
<entityParameter>
<name>IgnoreChecklists_param</name>
<expose v="true" />
</entityParameter>
<entityField>
<name>volumeWeighted</name>
- <title>Volume Weighted(€)</title>
+ <title></title>
<contentType>NUMBER</contentType>
<outputFormat>#,##0.00</outputFormat>
<inputFormat>#,##0.00</inputFormat>
<groupable v="true" />
- <state>READONLY</state>
+ <state>DISABLED</state>
+ <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volumeweighted/titleProcess.js</titleProcess>
<valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volumeweighted/valueProcess.js</valueProcess>
</entityField>
<entityAggregateField>
@@ -900,6 +830,19 @@
<name>IgnoreOrderBy_param</name>
<expose v="true" />
</entityParameter>
+ <entityField>
+ <name>volumeForeignCurrency</name>
+ <contentType>NUMBER</contentType>
+ <outputFormat>#,##0.00</outputFormat>
+ <inputFormat>#,##0.00</inputFormat>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volumeforeigncurrency/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volumeforeigncurrency/titleProcess.js</titleProcess>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volumeforeigncurrency/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Salesproject_entity/entityfields/volumeforeigncurrency/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ </onValueChangeTypes>
+ </entityField>
<entityConsumer>
<name>Contacts</name>
<dependency>
@@ -908,6 +851,106 @@
<fieldName>Contacts</fieldName>
</dependency>
</entityConsumer>
+ <entityField>
+ <name>CURRENCYRATE_ID</name>
+ <title>Currency</title>
+ <dropDownProcess>%aditoprj%/entity/Salesproject_entity/entityfields/currencyrate_id/dropDownProcess.js</dropDownProcess>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/currencyrate_id/stateProcess.js</stateProcess>
+ <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/currencyrate_id/valueProcess.js</valueProcess>
+ <onValueChange>%aditoprj%/entity/Salesproject_entity/entityfields/currencyrate_id/onValueChange.js</onValueChange>
+ <onValueChangeTypes>
+ <element>MASK</element>
+ <element>PROCESS_SETVALUE</element>
+ </onValueChangeTypes>
+ </entityField>
+ <entityActionGroup>
+ <name>observeActionGroup</name>
+ <children>
+ <entityActionField>
+ <name>observe</name>
+ <title>Observe</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/observe/onActionProcess.js</onActionProcess>
+ <isObjectAction v="true" />
+ <iconId>VAADIN:EYE</iconId>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/observe/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/observe/titleProcess.js</titleProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>cancelObservation</name>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/cancelobservation/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:EYE_SLASH</iconId>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/cancelobservation/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/cancelobservation/titleProcess.js</titleProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>export</name>
+ <title>Export</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/onActionProcess.js</onActionProcess>
+ <isMenuAction v="true" />
+ <isObjectAction v="false" />
+ <iconId>NEON:EXPORT</iconId>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/stateProcess.js</stateProcess>
+ <tooltip>Export fields of this table</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Salesproject_entity/entityfields/observeactiongroup/children/export/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ </children>
+ </entityActionGroup>
+ <entityActionField>
+ <name>newOffer</name>
+ <documentation>%aditoprj%/entity/Salesproject_entity/entityfields/newoffer/documentation.adoc</documentation>
+ <title>New offer</title>
+ <description>Opens the Offer context in NEW-Mode and fills salesproject and contact.</description>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newoffer/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CART</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>newTimetracking</name>
+ <title>New time tracking</title>
+ <description>Opens the time tracking context in new-mode for the selected salesproject</description>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newtimetracking/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:STOPWATCH</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>newActivity</name>
+ <title>New activity</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:HOURGLASS_END</iconId>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>newTask</name>
+ <title>New task</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:TASKS</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>startWorkflow</name>
+ <title>Start workflow</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startworkflow/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:PLAY</iconId>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/startworkflow/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>openClassificationOverView</name>
+ <title>Show Classification</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/openclassificationoverview/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:LIST_OL</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>refreshCurrencyRate</name>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/refreshcurrencyrate/onActionProcess.js</onActionProcess>
+ <iconId>NEON:RECURRING_APPOINTMENT</iconId>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/refreshcurrencyrate/stateProcess.js</stateProcess>
+ <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/refreshcurrencyrate/titleProcess.js</titleProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>openAdminView</name>
+ <title>Open admin view</title>
+ <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CURLY_BRACKETS</iconId>
+ <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/openadminview/stateProcess.js</stateProcess>
+ </entityActionField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -1079,6 +1122,20 @@
<name>USER_NEW.value</name>
<recordfield>SALESPROJECT.USER_NEW</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>VOLUME.displayValue</name>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>volumeForeignCurrency.value</name>
+ <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volumeforeigncurrency.value/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CURRENCYRATE_ID.value</name>
+ <recordfield>SALESPROJECT.CURRENCYRATE_ID</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>CURRENCYRATE_ID.displayValue</name>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
@@ -1109,6 +1166,13 @@
<isUIDTable v="false" />
<readonly v="true" />
</linkInformation>
+ <linkInformation>
+ <name>79182402-4178-40ff-b085-dcc734f6a98f</name>
+ <tableName>CURRENCYRATE</tableName>
+ <primaryKey>CURRENCYRATEID</primaryKey>
+ <isUIDTable v="false" />
+ <readonly v="true" />
+ </linkInformation>
</linkInformation>
<filterExtensions>
<filterExtensionSet>
diff --git a/entity/Salesproject_entity/contentDescriptionProcess.js b/entity/Salesproject_entity/contentDescriptionProcess.js
index 0145dd781fb79477fdca61d1ddf0e9ffcb00bff6..8679d499f52a31f4bbf06b4504173d034a037064 100644
--- a/entity/Salesproject_entity/contentDescriptionProcess.js
+++ b/entity/Salesproject_entity/contentDescriptionProcess.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("Util_lib");
import("system.logging");
import("Keyword_lib");
@@ -9,7 +10,7 @@ import("KeywordRegistry_basic");
var res = [translate.text("Phase") + ": " + KeywordUtils.getViewValue($KeywordRegistry.salesprojectPhase(), vars.get("$field.PHASE")),
translate.text("Classification: ") + vars.get("$field.CLASSIFICATIONVALUE"),
- translate.text("Volume") + ": " + NumberUtils.formatWithCurrency(vars.get("$field.VOLUME"), translate.text("#,##0.00"), "\u20ac"),
+ translate.text("Volume") + ": " + NumberUtils.formatWithCurrency(vars.get("$field.VOLUME"), translate.text("#,##0.00"), CurrencyUtils.getLocalCurrency()),
translate.text("Probability") + ": " + vars.get("$field.PROBABILITY") + "%",
translate.text("Creation date") + ": " + datetime.toDate(vars.get("$field.DATE_NEW"), translate.text("dd.MM.yyyy"))];
diff --git a/entity/Salesproject_entity/entityfields/currencyrate_id/dropDownProcess.js b/entity/Salesproject_entity/entityfields/currencyrate_id/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5b9a93751bcf685ba59553666987417116ab3083
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/currencyrate_id/dropDownProcess.js
@@ -0,0 +1,5 @@
+import("system.vars");
+import("Currency_lib");
+import("system.result");
+
+result.object(CurrencyRateUtils.getCurrencies(true, false, vars.get("$sys.recordstate")));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/currencyrate_id/onValueChange.js b/entity/Salesproject_entity/entityfields/currencyrate_id/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..8287faca880738e3215b4245872b7aed247f3764
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/currencyrate_id/onValueChange.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.vars");
+
+CurrencyRateUtils.setOtherValueField("VOLUME", vars.get("$this.value"), "volumeForeignCurrency");
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/currencyrate_id/stateProcess.js b/entity/Salesproject_entity/entityfields/currencyrate_id/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5cec8ce4df4aef80c8222cbe787dc50c34475276
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/currencyrate_id/stateProcess.js
@@ -0,0 +1,24 @@
+import("Sql_lib");
+import("system.result");
+import("Util_lib");
+import("system.vars");
+import("system.neon");
+
+//disable in edit as soon as forecasts exist.
+var state = neon.COMPONENTSTATE_EDITABLE;
+
+if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT)
+{
+ var salesprojectId = vars.get("$field.SALESPROJECTID");
+ var forecasts = newSelect("count(*)")
+ .from("FORECAST")
+ .where("FORECAST.OBJECT_ROWID", salesprojectId)
+ .cell();
+
+ if(forecasts > 0)
+ {
+ state = neon.COMPONENTSTATE_READONLY;
+ }
+}
+
+result.string(state);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/currencyrate_id/valueProcess.js b/entity/Salesproject_entity/entityfields/currencyrate_id/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..dfa41abc63427a2e79286d4a74410713198dfe8c
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/currencyrate_id/valueProcess.js
@@ -0,0 +1,10 @@
+import("Util_lib");
+import("system.result");
+import("Currency_lib");
+import("system.vars");
+
+var rate = CurrencyRateUtils.presetCurrencyRateId("CURRENCYRATE_ID");
+if(Utils.isNotNullOrEmptyString(rate))
+{
+ result.string(rate);
+}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/forecasts/children/currencyandcurrencyrate_param/valueProcess.js b/entity/Salesproject_entity/entityfields/forecasts/children/currencyandcurrencyrate_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..9a5dce5387097e4b0df1b29035384bc58ffb3435
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/forecasts/children/currencyandcurrencyrate_param/valueProcess.js
@@ -0,0 +1,10 @@
+import("Currency_lib");
+import("system.result");
+import("system.vars");
+
+var currencyAndRate = CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID"), true)
+var res = {
+ currency: currencyAndRate[1]
+ , currencyRate: currencyAndRate[0]
+}
+result.string(JSON.stringify(res));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/refreshcurrencyrate/onActionProcess.js b/entity/Salesproject_entity/entityfields/refreshcurrencyrate/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4b241f36026f535e7758d23ec774c0c7978244fe
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/refreshcurrencyrate/onActionProcess.js
@@ -0,0 +1,15 @@
+import("system.translate");
+import("Context_lib");
+import("system.vars");
+import("Currency_lib");
+
+CurrencyRateUtils.openCurrencyRateRefreshView(ContextUtils.getCurrentContextId()
+ , vars.get("$field.SALESPROJECTID")
+ , vars.get("$field.PROJECTCODE") + " " + vars.get("$field.PROJECTTITLE")
+ , vars.get("$field.CURRENCYRATE_ID")
+ , [{
+ "title" : translate.text("Volume")
+ , "valueLocalCurrency": vars.get("$field.VOLUME")
+ , "valueForeignCurrency": vars.get("$field.volumeForeignCurrency")
+ , "valueColumn": "VOLUME"
+ }], true);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/refreshcurrencyrate/stateProcess.js b/entity/Salesproject_entity/entityfields/refreshcurrencyrate/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ed928b4a059d3fc5b9c4a95afcbd3612ed773c93
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/refreshcurrencyrate/stateProcess.js
@@ -0,0 +1,20 @@
+import("Util_lib");
+import("system.result");
+import("system.neon");
+import("KeywordRegistry_basic");
+import("Currency_lib");
+import("system.vars");
+
+var state = neon.COMPONENTSTATE_DISABLED;
+var currencyRateId = vars.get("$field.CURRENCYRATE_ID");
+
+if(Utils.isNotNullOrEmptyString(currencyRateId) && currencyRateId != $CurrencyRate.LOCALCURRENCY()
+ && vars.get("$field.STATUS") != $KeywordRegistry.salesprojectState$partialOrder
+ && vars.get("$field.STATUS") != $KeywordRegistry.salesprojectState$lost
+ && vars.get("$field.STATUS") != $KeywordRegistry.salesprojectState$order
+ && vars.get("$field.STATUS") != $KeywordRegistry.salesprojectState$aborted)
+{
+ state = neon.COMPONENTSTATE_EDITABLE;
+}
+
+result.string(state);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/refreshcurrencyrate/titleProcess.js b/entity/Salesproject_entity/entityfields/refreshcurrencyrate/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..bb63bd8374be9674191d7573fafc994a49f75154
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/refreshcurrencyrate/titleProcess.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.result");
+
+result.string(CurrencyRateUtils.refreshCurrencyRateActionTitle("CURRENCYRATE_ID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/volume/titleProcess.js b/entity/Salesproject_entity/entityfields/volume/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..03b104eb8ff9392923da82dd25ad7e6f3386433b
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/volume/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.vars");
+import("Currency_lib");
+import("system.translate");
+import("system.result");
+
+var currency = CurrencyUtils.getLocalCurrency();
+
+result.string(translate.withArguments("Volume (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/volumeforeigncurrency/onValueChange.js b/entity/Salesproject_entity/entityfields/volumeforeigncurrency/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..7e3e3ee70d09cbd1b85beac5fd119267c0b89580
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/volumeforeigncurrency/onValueChange.js
@@ -0,0 +1,4 @@
+import("Currency_lib");
+import("system.vars");
+
+CurrencyRateUtils.setOtherValueField("VOLUME", vars.get("$field.CURRENCYRATE_ID"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/volumeforeigncurrency/stateProcess.js b/entity/Salesproject_entity/entityfields/volumeforeigncurrency/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..ac3321a7cbcfba6358490dd76147b31f3429b1b5
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/volumeforeigncurrency/stateProcess.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("Currency_lib");
+
+result.string(CurrencyRateUtils.getFieldState(vars.get("$field.CURRENCYRATE_ID"), true, neon.COMPONENTSTATE_READONLY));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/volumeforeigncurrency/titleProcess.js b/entity/Salesproject_entity/entityfields/volumeforeigncurrency/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..0b3320c37ffb92189e2abb6c02cd4f4c2b0fb37e
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/volumeforeigncurrency/titleProcess.js
@@ -0,0 +1,8 @@
+import("system.translate");
+import("system.result");
+import("Currency_lib");
+import("system.vars");
+
+var currency = CurrencyRateUtils.GetCurrencyForTitle(vars.get("$property.CURRENCYRATE_ID.dropDown"), vars.get("$field.CURRENCYRATE_ID"));
+
+result.string(translate.withArguments("Volume (%0)", [currency]));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/volumeforeigncurrency/valueProcess.js b/entity/Salesproject_entity/entityfields/volumeforeigncurrency/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..3b6c425d9bbfc985da5d976b3a0cc4e6974ec714
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/volumeforeigncurrency/valueProcess.js
@@ -0,0 +1,11 @@
+import("Currency_lib");
+import("system.result");
+import("system.vars");
+import("Util_lib");
+
+//the volume in the foreign currency is not being stored in the database, but instead always calculated by using the volume in the local currency divided by the stored currencyrate.
+//so we preset the value and display it
+if(Utils.isNullOrEmptyString(vars.get("$this.value")) && Utils.isNullOrEmptyString(vars.get("$field.VOLUME")) && Utils.isNotNullOrEmptyString(vars.get("$field.CURRENCYRATE_ID")))
+{
+ result.string(vars.get("$field.VOLUME") / CurrencyRateUtils.getCurrencyRateById(vars.get("$field.CURRENCYRATE_ID")));
+}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/volumeweighted/titleProcess.js b/entity/Salesproject_entity/entityfields/volumeweighted/titleProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..d9f87d7a1f890f0e9c006bc605fa04b193f89c83
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/volumeweighted/titleProcess.js
@@ -0,0 +1,5 @@
+import("Currency_lib");
+import("system.translate");
+import("system.result");
+
+result.string(translate.withArguments("Volume Weighted(%0)", [CurrencyUtils.getLocalCurrency()]));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js b/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js
index b9e273ff9f34870de6b80808285eda2d0205fbc9..b482d0d442df727a52ac6958cc6e66f8c3e5bdef 100644
--- a/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/fromClauseProcess.js
@@ -1,9 +1,13 @@
import("system.vars");
import("system.result");
-import("KeywordRegistry_basic");
+import("Sql_lib");
//CLASSIFICATIONSTORAGE is necessaray to make it possible to get the classifications of the organisations and making it possible to group by them
-result.string("SALESPROJECT \n\
- left join CONTACT on (SALESPROJECT.CONTACT_ID = CONTACT.CONTACTID) \n\
- left join ORGANISATION on (CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID)\n\
- left join CLASSIFICATIONSTORAGE on (CLASSIFICATIONSTORAGE.OBJECT_ROWID = SALESPROJECT.SALESPROJECTID)");
+var from = new SqlBuilder()
+ .from("SALESPROJECT")
+ .leftJoin("CONTACT", "SALESPROJECT.CONTACT_ID = CONTACT.CONTACTID")
+ .leftJoin("ORGANISATION", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
+ .leftJoin("CLASSIFICATIONSTORAGE", "CLASSIFICATIONSTORAGE.OBJECT_ROWID = SALESPROJECT.SALESPROJECTID")
+ .leftJoin("CURRENCYRATE", "CURRENCYRATE.CURRENCYRATEID = SALESPROJECT.CURRENCYRATE_ID");
+
+result.string(from.toString());
diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volumeforeigncurrency.value/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volumeforeigncurrency.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..dcd76a437afb431d5f10b3f8de2584348cfb6c88
--- /dev/null
+++ b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/volumeforeigncurrency.value/expression.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("SALESPROJECT.VOLUME / CURRENCYRATE.CURRENCYRATE");
\ No newline at end of file
diff --git a/entity/Usersettings_entity/Usersettings_entity.aod b/entity/Usersettings_entity/Usersettings_entity.aod
index 8a8a6ade78f81e590b688a655d24fb3ea0363492..d5fc817b63036af4985a85340b3a3a07962e8a29 100644
--- a/entity/Usersettings_entity/Usersettings_entity.aod
+++ b/entity/Usersettings_entity/Usersettings_entity.aod
@@ -81,6 +81,13 @@
<name>#PROVIDER_AGGREGATES</name>
<useAggregates v="true" />
</entityProvider>
+ <entityField>
+ <name>userCurrency</name>
+ <title>User Currency</title>
+ <consumer></consumer>
+ <dropDownProcess>%aditoprj%/entity/Usersettings_entity/entityfields/usercurrency/dropDownProcess.js</dropDownProcess>
+ <displayValueProcess>%aditoprj%/entity/Usersettings_entity/entityfields/usercurrency/displayValueProcess.js</displayValueProcess>
+ </entityField>
</entityFields>
<recordContainers>
<jDitoRecordContainer>
@@ -115,6 +122,9 @@
<jDitoRecordFieldMapping>
<name>UID.value</name>
</jDitoRecordFieldMapping>
+ <jDitoRecordFieldMapping>
+ <name>userCurrency.value</name>
+ </jDitoRecordFieldMapping>
</recordFieldMappings>
</jDitoRecordContainer>
</recordContainers>
diff --git a/entity/Usersettings_entity/documentation.adoc b/entity/Usersettings_entity/documentation.adoc
index 5eb27c8972d266957edf45e9924c283553d49309..7488012edacb69fa21f4f1f93ad08efa4ab62b81 100644
--- a/entity/Usersettings_entity/documentation.adoc
+++ b/entity/Usersettings_entity/documentation.adoc
@@ -38,7 +38,7 @@ How can I add more fields to the settings view?::
* Add a new field to this entity. The name must be the same as in the users data model/the settings table
* Add the field to `UsersettingsEdit_view`
- * Add the name of the field to the arrays in `UserSettings_lib`. Most of them are located in the user objects `params` property => `paramSettings`
+ * Add the name of the field to the array in `UserSettings_lib`. Most of them are located in the user objects `params` property => `paramSettings`
Which setting fields are possible?::
You can find out if you have a look at the return value of `tools.getCurrentUser()`
\ No newline at end of file
diff --git a/entity/Usersettings_entity/entityfields/usercurrency/displayValueProcess.js b/entity/Usersettings_entity/entityfields/usercurrency/displayValueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..5758da2ad9c56e9a1dd94c3fea2c526977b6ab1e
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/usercurrency/displayValueProcess.js
@@ -0,0 +1,13 @@
+import("system.translate");
+import("system.result");
+import("Sql_lib");
+import("system.vars");
+
+var currencyIso = vars.get("$field.userCurrency");
+
+var title = newSelect("AB_CURRENCY.NAME", "Data_alias")
+ .from("AB_CURRENCY")
+ .where("AB_CURRENCY.ISO4", currencyIso)
+ .cell();
+
+result.string(translate.text(title) + " (" + currencyIso + ")");
\ No newline at end of file
diff --git a/entity/Usersettings_entity/entityfields/usercurrency/dropDownProcess.js b/entity/Usersettings_entity/entityfields/usercurrency/dropDownProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1b44d855cbb9ba80bf0456253beff3c3f5f6da1e
--- /dev/null
+++ b/entity/Usersettings_entity/entityfields/usercurrency/dropDownProcess.js
@@ -0,0 +1,27 @@
+import("Currency_lib");
+import("system.entities");
+import("system.result");
+import("Sql_lib");
+
+//dropDownProcess isntead of consumer so we can add the local currency
+var currenciesWithRateSet = new SqlBuilder("Data_alias").selectDistinct("CURRENCYRATE.SOURCECURRENCYISO")
+.from("CURRENCYRATE")
+.arrayColumn();
+
+currenciesWithRateSet.unshift(CurrencyUtils.getLocalCurrency())//add local Currency
+
+var loadingConfig = entities.createConfigForLoadingRows().fields(["ISO4", "#CONTENTTITLE"])
+ .entity("Currency_entity")
+ .provider("Currencies")
+ .addParameter("DisplayLongTitle_param", true)
+ .addParameter("InvertBlacklist_param", true)
+ .addParameter("Blacklist_param", JSON.stringify(currenciesWithRateSet));
+
+var currencies = entities.getRows(loadingConfig);
+var res = [];
+for (var currency in currencies)
+{
+ res.push([currencies[currency]["ISO4"], currencies[currency]["#CONTENTTITLE"]])
+}
+
+result.object(res);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 226ecefed0e7878bf52b9432231ebcb5fcb2d7e1..3a98eb7d74771609113da1c2dd938493de542389 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -9665,7 +9665,7 @@
<key>Update AdvertisingItem</key>
</entry>
<entry>
- <key>Volume%0</key>
+ <key>Volume (%0)</key>
</entry>
<entry>
<key>Euro Values updated using the current rate:</key>
@@ -11213,6 +11213,171 @@
<entry>
<key>Reveal the price in the offer</key>
</entry>
+ <entry>
+ <key>Volume(Euro)</key>
+ </entry>
+ <entry>
+ <key>Swiss Franc</key>
+ </entry>
+ <entry>
+ <key>Canadian Dollar</key>
+ </entry>
+ <entry>
+ <key>Volume Weighted(%0)</key>
+ </entry>
+ <entry>
+ <key>Values have not been updated, because the stored rate is equal to the most up to date one.</key>
+ </entry>
+ <entry>
+ <key>Values have not been updated, because the stored rate is already up to date.</key>
+ </entry>
+ <entry>
+ <key>Refresh %0 Values</key>
+ </entry>
+ <entry>
+ <key>Values</key>
+ </entry>
+ <entry>
+ <key>Slave UID</key>
+ </entry>
+ <entry>
+ <key>AsysAudit Clean Up</key>
+ </entry>
+ <entry>
+ <key>EWS - Manage Synctable</key>
+ </entry>
+ <entry>
+ <key>Refresh Currency Rate</key>
+ </entry>
+ <entry>
+ <key>Start Workflow</key>
+ </entry>
+ <entry>
+ <key>Beschreibung</key>
+ </entry>
+ <entry>
+ <key>EWS - Sync to Exchange</key>
+ </entry>
+ <entry>
+ <key>Search Synchronisation</key>
+ </entry>
+ <entry>
+ <key>Last synchronized</key>
+ </entry>
+ <entry>
+ <key>Intervall</key>
+ </entry>
+ <entry>
+ <key>Intervall setzen</key>
+ </entry>
+ <entry>
+ <key>Mosaico template</key>
+ </entry>
+ <entry>
+ <key>Currencies</key>
+ </entry>
+ <entry>
+ <key>Mosaico</key>
+ </entry>
+ <entry>
+ <key>Device ID</key>
+ </entry>
+ <entry>
+ <key>Show my tickets that are in process.</key>
+ </entry>
+ <entry>
+ <key>Propkey</key>
+ </entry>
+ <entry>
+ <key>User Currency</key>
+ </entry>
+ <entry>
+ <key>LastSync zurücksetzen</key>
+ </entry>
+ <entry>
+ <key>Currency RATE</key>
+ </entry>
+ <entry>
+ <key>Device ID Reset</key>
+ </entry>
+ <entry>
+ <key>Show the finished Tickets in the last 4 weeks</key>
+ </entry>
+ <entry>
+ <key>Total gross (%0)</key>
+ </entry>
+ <entry>
+ <key>discounted Price (%0)</key>
+ </entry>
+ <entry>
+ <key>Total net (%0)</key>
+ </entry>
+ <entry>
+ <key>Total Net (%0)</key>
+ </entry>
+ <entry>
+ <key>Total VAT (%0)</key>
+ </entry>
+ <entry>
+ <key>Unit price (%0)</key>
+ </entry>
+ <entry>
+ <key>discounted Vat (%0)</key>
+ </entry>
+ <entry>
+ <key>Sum (%0)</key>
+ </entry>
+ <entry>
+ <key>Target Amount (%0)</key>
+ </entry>
+ <entry>
+ <key>Actual Amount (%0)</key>
+ </entry>
+ <entry>
+ <key>Price (%0)</key>
+ </entry>
+ <entry>
+ <key>Advertising Item</key>
+ </entry>
+ <entry>
+ <key>Currency Rates</key>
+ </entry>
+ <entry>
+ <key>%0 Values updated using the current rate: %1</key>
+ </entry>
+ <entry>
+ <key>Source Currency and Target Currency cannot be the same Currency.</key>
+ </entry>
+ <entry>
+ <key>British Pound Sterling</key>
+ </entry>
+ <entry>
+ <key>Valid from (as %0)</key>
+ </entry>
+ <entry>
+ <key>Insert subnode</key>
+ </entry>
+ <entry>
+ <key>Calculate sum</key>
+ </entry>
+ <entry>
+ <key>Offers / Receipts</key>
+ </entry>
+ <entry>
+ <key>New Currencyrate</key>
+ </entry>
+ <entry>
+ <key>Current Currencyrate</key>
+ </entry>
+ <entry>
+ <key>Paid (%0)</key>
+ </entry>
+ <entry>
+ <key>Vat</key>
+ </entry>
+ <entry>
+ <key>Net</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 0b73b03f7ebbd7abe80fb1d4b1bc2b5ed84064e5..fcdaf1234409d6d13e2bedb129e007087b4bac0e 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -29,10 +29,22 @@
<key>Create new campaign step</key>
<value>Neue Kampagnenstufe erstellen</value>
</entry>
+ <entry>
+ <key>Current Currencyrate</key>
+ <value>Derzeitiger Währungskurs</value>
+ </entry>
+ <entry>
+ <key>New Currencyrate</key>
+ <value>Neuer Währungskurs</value>
+ </entry>
<entry>
<key>Create subordinate relationship</key>
<value>Untergeordnete Beziehung anlegen</value>
</entry>
+ <entry>
+ <key>British Pound Sterling</key>
+ <value>Pfund Sterling</value>
+ </entry>
<entry>
<key>Base Template</key>
<value>Ursprungsvorlage</value>
@@ -483,6 +495,22 @@
<key>discounted Vat</key>
<value>Rbt. Mehrwertssteuer</value>
</entry>
+ <entry>
+ <key>discounted Vat (%0)</key>
+ <value>Rbt. Mehrwertssteuer (%0)</value>
+ </entry>
+ <entry>
+ <key>Total gross (%0)</key>
+ <value>Betrag brutto (%0)</value>
+ </entry>
+ <entry>
+ <key>Source Currency and Target Currency cannot be the same Currency.</key>
+ <value>Quellwährung und Zielwährung dürfen nicht die gleiche Währung sein.</value>
+ </entry>
+ <entry>
+ <key>%0 Values updated using the current rate: %1</key>
+ <value>%0 Beträge wurden anhand des aktuellen Kurses aktualisiert %1</value>
+ </entry>
<entry>
<key>Filter can't be empty</key>
<value>Filter darf nicht leer sein</value>
@@ -814,6 +842,14 @@
<key>Advertising item</key>
<value>Werbemittelposten</value>
</entry>
+ <entry>
+ <key>Advertising Item</key>
+ <value>Werbemittelposten</value>
+ </entry>
+ <entry>
+ <key>Refresh Currency Rate</key>
+ <value>Währungskurs aktualisieren</value>
+ </entry>
<entry>
<key>Distribution list</key>
<value>Marketingliste</value>
@@ -1616,6 +1652,10 @@
<key>None</key>
<value>Keine</value>
</entry>
+ <entry>
+ <key>User Currency</key>
+ <value>Benutzerwährung</value>
+ </entry>
<entry>
<key>Do you really want to resynchronize the user completely?\nThe synchronisation in ADITO will be deleted.\nThe outlook contacts must be cleared manually.</key>
<value>Wollen Sie den Benutzer wirklich komplett neu synchronisieren?\nDie Synchronisation wird aus ADITO gelöscht.\nDie Outlook-Kontakte müssen manuell gelöscht werden.</value>
@@ -2737,8 +2777,8 @@
<value>Neue Angebotsversion</value>
</entry>
<entry>
- <key>Volume%0</key>
- <value>Volume%0</value>
+ <key>Volume (%0)</key>
+ <value>Volumen (%0)</value>
</entry>
<entry>
<key>Copy offer</key>
@@ -3264,6 +3304,14 @@
<key>Unit price</key>
<value>Einzelpreis</value>
</entry>
+ <entry>
+ <key>Unit price (%0)</key>
+ <value>Einzelpreis (%0)</value>
+ </entry>
+ <entry>
+ <key>Price (%0)</key>
+ <value>Preis (%0)</value>
+ </entry>
<entry>
<key>Workflow instances</key>
<value>Workflowinstanzen</value>
@@ -4559,6 +4607,46 @@
<key>Euro</key>
<value>Euro</value>
</entry>
+ <entry>
+ <key>Paid (%0)</key>
+ <value>Bezahlt (%0)</value>
+ </entry>
+ <entry>
+ <key>Canadian Dollar</key>
+ <value>Kanadische Dollar</value>
+ </entry>
+ <entry>
+ <key>Swiss Franc</key>
+ <value>Schweizer Franken</value>
+ </entry>
+ <entry>
+ <key>discounted Price (%0)</key>
+ <value>Rbt. Betrag netto (%0)</value>
+ </entry>
+ <entry>
+ <key>Volume Weighted(%0)</key>
+ <value>Volumen Gewichtet(%0)</value>
+ </entry>
+ <entry>
+ <key>Total Net (%0)</key>
+ <value>Betrag netto (%0)</value>
+ </entry>
+ <entry>
+ <key>Total net (%0)</key>
+ <value>Betrag netto (%0)</value>
+ </entry>
+ <entry>
+ <key>Total VAT (%0)</key>
+ <value>USt (%0)</value>
+ </entry>
+ <entry>
+ <key>Actual Amount (%0)</key>
+ <value>ist Betrag (%0)</value>
+ </entry>
+ <entry>
+ <key>Target Amount (%0)</key>
+ <value>Soll Betrag (%0)</value>
+ </entry>
<entry>
<key>executives</key>
<value>Geschäftsführung</value>
@@ -4693,7 +4781,7 @@
</entry>
<entry>
<key>Swiss franc</key>
- <value>Schweizerfranken</value>
+ <value>Schweizer franken</value>
</entry>
<entry>
<key>Swaziland</key>
@@ -5163,6 +5251,14 @@
<key>7 days net</key>
<value>7 Tage netto</value>
</entry>
+ <entry>
+ <key>Net</key>
+ <value>Netto</value>
+ </entry>
+ <entry>
+ <key>Vat</key>
+ <value>USt</value>
+ </entry>
<entry>
<key>carriage free</key>
<value>frei Haus</value>
@@ -11332,6 +11428,10 @@ Bitte Datumseingabe prüfen</value>
<key>Sum Chart</key>
<value>Summen Diagramm</value>
</entry>
+ <entry>
+ <key>Sum (%0)</key>
+ <value>Summe (%0)</value>
+ </entry>
<entry>
<key>Probability Chart</key>
<value>Wahrscheinlichkeit Diagramm</value>
@@ -12756,7 +12856,6 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>new Email</key>
- <value>Neue E-Mail</value>
</entry>
<entry>
<key>Price in </key>
@@ -12769,6 +12868,7 @@ Bitte Datumseingabe prüfen</value>
</entry>
<entry>
<key>Exchange Rate </key>
+ <value>Wechselkurs</value>
</entry>
<entry>
<key>Digital</key>
@@ -12808,13 +12908,17 @@ Bitte Datumseingabe prüfen</value>
<key>Update Advertising</key>
</entry>
<entry>
- <key>Refresh Euro Values</key>
- <value>Beträge in Euro aktualisieren</value>
+ <key>Refresh %0 Values</key>
+ <value>Beträge in %0 aktualisieren</value>
</entry>
<entry>
<key>Currency Rate</key>
<value>Währungskurs</value>
</entry>
+ <entry>
+ <key>Currency Rates</key>
+ <value>Währungskurse</value>
+ </entry>
<entry>
<key>Soft Bounce</key>
</entry>
@@ -12823,28 +12927,29 @@ Bitte Datumseingabe prüfen</value>
<value>Quellwährung</value>
</entry>
<entry>
- <key>Values have not been updated, because the stored rate is already up to date</key>
- <value>Beträge wurden nicht geupdated, weil der gespeicherte Kurs bereits der aktuelle ist.</value>
+ <key>Values</key>
+ <value>Werte</value>
</entry>
<entry>
- <key>Euro Values updated using the current rate:</key>
- <value>Beträge wurden anhand des aktuellen Kurses geupdated:</value>
+ <key>Values have not been updated, because the stored rate is already up to date.</key>
+ <value>Beträge wurden nicht geupdated, weil der gespeicherte Kurs bereits der aktuellste ist.</value>
</entry>
<entry>
- <key>Approval</key>
+ <key>Values have not been updated, because the stored rate is equal to the most up to date one.</key>
+ <value>Beträge wurden nicht geupdated, weil der gespeicherte Kurs bereits gleich der aktuelle ist.</value>
</entry>
<entry>
- <key>No activity</key>
+ <key>Approval</key>
</entry>
<entry>
- <key>Values have been updated, using the current rate:</key>
- <value>Beträge wurden anhand des aktuellen Kurses aktualisisert:</value>
+ <key>No activity</key>
</entry>
<entry>
<key>set attribute (use filter result)</key>
</entry>
<entry>
<key>Volume (Euro)</key>
+ <value>Volumes (Euro)</value>
</entry>
<entry>
<key>Shows the organisations turnover and forecast</key>
@@ -14667,6 +14772,81 @@ Bitte Datumseingabe prüfen</value>
<key>Valid from (as %0)</key>
<value>Gültig von (in %0)</value>
</entry>
+ <entry>
+ <key>Intervall</key>
+ </entry>
+ <entry>
+ <key>Show my tickets that are in process.</key>
+ </entry>
+ <entry>
+ <key>Mosaico template</key>
+ </entry>
+ <entry>
+ <key>Propkey</key>
+ </entry>
+ <entry>
+ <key>Device ID</key>
+ </entry>
+ <entry>
+ <key>Search Synchronisation</key>
+ </entry>
+ <entry>
+ <key>AsysAudit Clean Up</key>
+ </entry>
+ <entry>
+ <key>Currencies</key>
+ </entry>
+ <entry>
+ <key>EWS - Manage Synctable</key>
+ </entry>
+ <entry>
+ <key>Slave UID</key>
+ </entry>
+ <entry>
+ <key>Values have not been updated, because the stored rate is already up to date</key>
+ </entry>
+ <entry>
+ <key>Volume(Euro)</key>
+ </entry>
+ <entry>
+ <key>Mosaico</key>
+ </entry>
+ <entry>
+ <key>Beschreibung</key>
+ </entry>
+ <entry>
+ <key>EWS - Sync to Exchange</key>
+ </entry>
+ <entry>
+ <key>Euro Values updated using the current rate:</key>
+ </entry>
+ <entry>
+ <key>Show the finished Tickets in the last 4 weeks</key>
+ </entry>
+ <entry>
+ <key>Intervall setzen</key>
+ </entry>
+ <entry>
+ <key>LastSync zurücksetzen</key>
+ </entry>
+ <entry>
+ <key>Start Workflow</key>
+ </entry>
+ <entry>
+ <key>Currency RATE</key>
+ </entry>
+ <entry>
+ <key>Values have been updated, using the current rate:</key>
+ </entry>
+ <entry>
+ <key>Refresh Euro Values</key>
+ </entry>
+ <entry>
+ <key>Device ID Reset</key>
+ </entry>
+ <entry>
+ <key>Last synchronized</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 2f554c6be49a49f1c44155317a7e92885810dc9d..6b2cee8cac330028e228bfafee82d48a2df1e534 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -9181,7 +9181,7 @@
<key>Values have not been updated, because the stored rate is already up to date</key>
</entry>
<entry>
- <key>Volume%0</key>
+ <key>Volume (%0)</key>
</entry>
<entry>
<key>Euro Values updated using the current rate:</key>
@@ -11309,6 +11309,171 @@
<entry>
<key>Reveal the price in the offer</key>
</entry>
+ <entry>
+ <key>Volume(Euro)</key>
+ </entry>
+ <entry>
+ <key>Swiss Franc</key>
+ </entry>
+ <entry>
+ <key>Canadian Dollar</key>
+ </entry>
+ <entry>
+ <key>Volume Weighted(%0)</key>
+ </entry>
+ <entry>
+ <key>Values have not been updated, because the stored rate is equal to the most up to date one.</key>
+ </entry>
+ <entry>
+ <key>Values have not been updated, because the stored rate is already up to date.</key>
+ </entry>
+ <entry>
+ <key>Refresh %0 Values</key>
+ </entry>
+ <entry>
+ <key>Values</key>
+ </entry>
+ <entry>
+ <key>Slave UID</key>
+ </entry>
+ <entry>
+ <key>AsysAudit Clean Up</key>
+ </entry>
+ <entry>
+ <key>EWS - Manage Synctable</key>
+ </entry>
+ <entry>
+ <key>Refresh Currency Rate</key>
+ </entry>
+ <entry>
+ <key>Start Workflow</key>
+ </entry>
+ <entry>
+ <key>Beschreibung</key>
+ </entry>
+ <entry>
+ <key>EWS - Sync to Exchange</key>
+ </entry>
+ <entry>
+ <key>Search Synchronisation</key>
+ </entry>
+ <entry>
+ <key>Last synchronized</key>
+ </entry>
+ <entry>
+ <key>Intervall</key>
+ </entry>
+ <entry>
+ <key>Intervall setzen</key>
+ </entry>
+ <entry>
+ <key>Mosaico template</key>
+ </entry>
+ <entry>
+ <key>Currencies</key>
+ </entry>
+ <entry>
+ <key>Mosaico</key>
+ </entry>
+ <entry>
+ <key>Device ID</key>
+ </entry>
+ <entry>
+ <key>Show my tickets that are in process.</key>
+ </entry>
+ <entry>
+ <key>Propkey</key>
+ </entry>
+ <entry>
+ <key>User Currency</key>
+ </entry>
+ <entry>
+ <key>LastSync zurücksetzen</key>
+ </entry>
+ <entry>
+ <key>Currency RATE</key>
+ </entry>
+ <entry>
+ <key>Device ID Reset</key>
+ </entry>
+ <entry>
+ <key>Show the finished Tickets in the last 4 weeks</key>
+ </entry>
+ <entry>
+ <key>Total gross (%0)</key>
+ </entry>
+ <entry>
+ <key>discounted Price (%0)</key>
+ </entry>
+ <entry>
+ <key>Total net (%0)</key>
+ </entry>
+ <entry>
+ <key>Total Net (%0)</key>
+ </entry>
+ <entry>
+ <key>Total VAT (%0)</key>
+ </entry>
+ <entry>
+ <key>Unit price (%0)</key>
+ </entry>
+ <entry>
+ <key>discounted Vat (%0)</key>
+ </entry>
+ <entry>
+ <key>Sum (%0)</key>
+ </entry>
+ <entry>
+ <key>Target Amount (%0)</key>
+ </entry>
+ <entry>
+ <key>Actual Amount (%0)</key>
+ </entry>
+ <entry>
+ <key>Price (%0)</key>
+ </entry>
+ <entry>
+ <key>Advertising Item</key>
+ </entry>
+ <entry>
+ <key>Currency Rates</key>
+ </entry>
+ <entry>
+ <key>%0 Values updated using the current rate: %1</key>
+ </entry>
+ <entry>
+ <key>Source Currency and Target Currency cannot be the same Currency.</key>
+ </entry>
+ <entry>
+ <key>British Pound Sterling</key>
+ </entry>
+ <entry>
+ <key>Valid from (as %0)</key>
+ </entry>
+ <entry>
+ <key>Insert subnode</key>
+ </entry>
+ <entry>
+ <key>Calculate sum</key>
+ </entry>
+ <entry>
+ <key>Offers / Receipts</key>
+ </entry>
+ <entry>
+ <key>New Currencyrate</key>
+ </entry>
+ <entry>
+ <key>Current Currencyrate</key>
+ </entry>
+ <entry>
+ <key>Paid (%0)</key>
+ </entry>
+ <entry>
+ <key>Vat</key>
+ </entry>
+ <entry>
+ <key>Net</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonContext/Currency/Currency.aod b/neonContext/Currency/Currency.aod
new file mode 100644
index 0000000000000000000000000000000000000000..0e319068505cce9c77bef36fa1ac57285040acc1
--- /dev/null
+++ b/neonContext/Currency/Currency.aod
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>Currency</name>
+ <title>Currency</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:EURO</icon>
+ <entity>Currency_entity</entity>
+</neonContext>
diff --git a/neonContext/CurrencyRate/CurrencyRate.aod b/neonContext/CurrencyRate/CurrencyRate.aod
new file mode 100644
index 0000000000000000000000000000000000000000..3c87309c3a97faaca3296ff6f61fc21fe9beb11c
--- /dev/null
+++ b/neonContext/CurrencyRate/CurrencyRate.aod
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>CurrencyRate</name>
+ <title>Currency Rates</title>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:EURO</icon>
+ <filterView>CurrencyRateFilter_view</filterView>
+ <editView>CurrencyRateEdit_view</editView>
+ <previewView>CurrencyRatePreview_view</previewView>
+ <entity>CurrencyRate_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>d973bef6-a6be-4690-999b-bfa8b00365d6</name>
+ <view>CurrencyRateFilter_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>18752b56-3c55-420b-8705-1ba5d4abdcc8</name>
+ <view>CurrencyRateEdit_view</view>
+ </neonViewReference>
+ <neonViewReference>
+ <name>2003b4c3-5eb6-469f-b3d9-755c7c093286</name>
+ <view>CurrencyRatePreview_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/CurrencyRateRefreshRate/CurrencyRateRefreshRate.aod b/neonContext/CurrencyRateRefreshRate/CurrencyRateRefreshRate.aod
new file mode 100644
index 0000000000000000000000000000000000000000..52dce0f5048abfb30907748bcd5ae08b1786e2bc
--- /dev/null
+++ b/neonContext/CurrencyRateRefreshRate/CurrencyRateRefreshRate.aod
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>CurrencyRateRefreshRate</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:EURO</icon>
+ <editView>CurrencyRateRefreshRateEdit_view</editView>
+ <entity>CurrencyRateRefreshRate_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>0fd6abb9-2419-415c-8508-d32c2aa0bacb</name>
+ <view>CurrencyRateRefreshRateEdit_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonContext/CurrencyRateRefreshRateValues/CurrencyRateRefreshRateValues.aod b/neonContext/CurrencyRateRefreshRateValues/CurrencyRateRefreshRateValues.aod
new file mode 100644
index 0000000000000000000000000000000000000000..dc8760a7a295221861a27b8bc25ac62ceba060a5
--- /dev/null
+++ b/neonContext/CurrencyRateRefreshRateValues/CurrencyRateRefreshRateValues.aod
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
+ <name>CurrencyRateRefreshRateValues</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <icon>VAADIN:EURO</icon>
+ <editView>CurrencyRateRefreshRateValues_view</editView>
+ <entity>CurrencyRateRefreshRateValues_entity</entity>
+ <references>
+ <neonViewReference>
+ <name>86dc9de8-049c-4daf-918d-29818c31e34a</name>
+ <view>CurrencyRateRefreshRateValues_view</view>
+ </neonViewReference>
+ </references>
+</neonContext>
diff --git a/neonView/AdvertisingDetail_view/AdvertisingDetail_view.aod b/neonView/AdvertisingDetail_view/AdvertisingDetail_view.aod
index 1c78dd8f378240d8e0a0e2bd18e697abd52b9451..33a86ee3276c3c87a0fdce58f14503bcce56a363 100644
--- a/neonView/AdvertisingDetail_view/AdvertisingDetail_view.aod
+++ b/neonView/AdvertisingDetail_view/AdvertisingDetail_view.aod
@@ -32,8 +32,8 @@
<entityField>STATUS</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>b04b5d8b-82af-465d-89f8-d02568d6e254</name>
- <entityField>CURRENCY</entityField>
+ <name>57fedb3b-1f5f-42fc-9810-2f7116f08624</name>
+ <entityField>CURRENCYRATE_ID</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/AdvertisingEdit_view/AdvertisingEdit_view.aod b/neonView/AdvertisingEdit_view/AdvertisingEdit_view.aod
index 84e7e192d8408db9e6ce3a6a40e0853286288770..9e1e4207796183230d53018b632624f7e6cf25e2 100644
--- a/neonView/AdvertisingEdit_view/AdvertisingEdit_view.aod
+++ b/neonView/AdvertisingEdit_view/AdvertisingEdit_view.aod
@@ -33,8 +33,8 @@
<entityField>STATUS</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>7cc60069-433a-496d-8c59-e59756f15402</name>
- <entityField>CURRENCY</entityField>
+ <name>5430499a-b03f-4476-a7dc-fd51447536dc</name>
+ <entityField>CURRENCYRATE_ID</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/AdvertisingFilter_view/AdvertisingFilter_view.aod b/neonView/AdvertisingFilter_view/AdvertisingFilter_view.aod
index 0142ccd3be22efb6cb4a66bcc84fccb829a30d4b..a61f90b0b34cbb057c8f50d1eb202e3962635d8d 100644
--- a/neonView/AdvertisingFilter_view/AdvertisingFilter_view.aod
+++ b/neonView/AdvertisingFilter_view/AdvertisingFilter_view.aod
@@ -35,8 +35,8 @@
<entityField>OBJECT_ROWID</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>fa9fa2a6-4240-49dc-a516-cbbd6abd29a6</name>
- <entityField>CURRENCY</entityField>
+ <name>1a6add70-939c-48ef-b0ce-d71f0fd3636f</name>
+ <entityField>CURRENCYRATE_ID</entityField>
</neonTableColumn>
</columns>
</tableViewTemplate>
diff --git a/neonView/AdvertisingItemEdit_view/AdvertisingItemEdit_view.aod b/neonView/AdvertisingItemEdit_view/AdvertisingItemEdit_view.aod
index c635c98edf23bac272ff3ba1de9660da88af7dce..f4a480e3647c4098d9e307d85d12143c45374526 100644
--- a/neonView/AdvertisingItemEdit_view/AdvertisingItemEdit_view.aod
+++ b/neonView/AdvertisingItemEdit_view/AdvertisingItemEdit_view.aod
@@ -29,10 +29,18 @@
<name>cd06598f-1469-4513-a233-c95eafb26ca2</name>
<entityField>QUANTITY</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>38e467be-9d05-4ead-abe3-46603915fc92</name>
+ <entityField>UNIT</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>477b087c-6a34-4e2c-8c21-71c7e0c52f04</name>
<entityField>PRICE</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>192ab901-8c64-436b-a734-545c862e7583</name>
+ <entityField>priceForeignCurrency</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>1c812246-f844-4827-bbb9-001642fa4a5d</name>
<entityField>free</entityField>
@@ -41,10 +49,18 @@
<name>f7ecb1cf-5365-45fa-9c45-fd5cbfed0e60</name>
<entityField>actualAmount</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>a2432464-3e74-468d-8ee3-9fd7987389b7</name>
+ <entityField>actualAmountForeignCurrency</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>733e1d22-af01-4a21-8626-d7280feabab9</name>
<entityField>TARGETAMOUNT</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>e8dc8edc-ccbf-45e1-8e46-02b51aca6184</name>
+ <entityField>targetAmountForeignCurrency</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>7d066a98-85e8-43d3-ade7-ce7346f9e843</name>
<entityField>INFO</entityField>
diff --git a/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod b/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod
index bca3120650c430358c0db22166dedc6cebbc56b9..c4f5dc80868f0fc73c092adb982b07555b593d58 100644
--- a/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod
+++ b/neonView/AdvertisingItemFilter_view/AdvertisingItemFilter_view.aod
@@ -43,6 +43,18 @@
<name>8ad44ae5-47e8-4437-a6f5-88d1c9fbe61f</name>
<entityField>actualAmount</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>f5992246-e240-4e99-a037-8151f8072cbc</name>
+ <entityField>priceForeignCurrency</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>aa5167b1-cef6-41d1-b697-268967471c59</name>
+ <entityField>targetAmountForeignCurrency</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a08fea7d-2c68-404e-bec0-4536ab14b9bd</name>
+ <entityField>actualAmountForeignCurrency</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>e53a6f55-c4d4-49df-8785-55fa8ee8a657</name>
<entityField>DELIVERY</entityField>
diff --git a/neonView/AdvertisingItemPreview_view/AdvertisingItemPreview_view.aod b/neonView/AdvertisingItemPreview_view/AdvertisingItemPreview_view.aod
index fdca083a04cd48044e3318e2d4c871210cb5524c..e4f3f12ed1e0001bbd4a835f29a51fa5252e7f85 100644
--- a/neonView/AdvertisingItemPreview_view/AdvertisingItemPreview_view.aod
+++ b/neonView/AdvertisingItemPreview_view/AdvertisingItemPreview_view.aod
@@ -40,6 +40,18 @@
<name>8d096f27-2ece-41a1-8988-662d9e4cd125</name>
<entityField>actualAmount</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>13e6b5ba-9390-489f-9420-774d96808103</name>
+ <entityField>priceForeignCurrency</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>ac79e8bf-ebfb-4214-8aca-2c4fd27a773a</name>
+ <entityField>targetAmountForeignCurrency</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>6626b4e2-13c0-4cfb-943b-d52b2b5dbb69</name>
+ <entityField>actualAmountForeignCurrency</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>da8ef39a-31e6-49fe-bd24-52eb0d1f7d37</name>
<entityField>DELIVERY</entityField>
diff --git a/neonView/AdvertisingPreview_view/AdvertisingPreview_view.aod b/neonView/AdvertisingPreview_view/AdvertisingPreview_view.aod
index 7f185600c6333265e179b3b7f74e1a2e7ab47186..ace8ea43f6643176883eaa1a9ab9f5dfa162e2fa 100644
--- a/neonView/AdvertisingPreview_view/AdvertisingPreview_view.aod
+++ b/neonView/AdvertisingPreview_view/AdvertisingPreview_view.aod
@@ -32,8 +32,8 @@
<entityField>countItems</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>88ae7bf6-00ef-4c73-9be5-7e562243c537</name>
- <entityField>CURRENCY</entityField>
+ <name>043ab774-8584-46fe-bc18-1267df3ae9c9</name>
+ <entityField>CURRENCYRATE_ID</entityField>
</entityFieldLink>
</fields>
</genericViewTemplate>
diff --git a/neonView/CurrencyRateEdit_view/CurrencyRateEdit_view.aod b/neonView/CurrencyRateEdit_view/CurrencyRateEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..e1ad60eee623efc7e1caa0ed5197dd46bcea8b90
--- /dev/null
+++ b/neonView/CurrencyRateEdit_view/CurrencyRateEdit_view.aod
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+ <name>CurrencyRateEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <size>SMALL</size>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>generic</name>
+ <editMode v="true" />
+ <hideEmptyFields v="false" />
+ <fields>
+ <entityFieldLink>
+ <name>7062e347-b26b-4d22-a41d-c40a2395d12e</name>
+ <entityField>CURRENCYRATEID</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3dff9e5c-0b96-4918-8664-7af871592b02</name>
+ <entityField>SOURCECURRENCYISO</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>49fda4b4-9e2f-460f-80cc-54468fecb051</name>
+ <entityField>TARGETCURRENCYISO</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>bad7beaf-16eb-4a6f-a37f-cad1af6d8645</name>
+ <entityField>CURRENCYRATE</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>e232972f-9c1d-4932-8690-f5979d4a5c80</name>
+ <entityField>DATE_NEW</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>40fc9d29-1cd0-493f-868c-aea32848e738</name>
+ <entityField>USER_NEW</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0a3af426-ad09-4d6a-9fd3-55ae1803d9e2</name>
+ <entityField>VALID_FROM</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CurrencyRateFilter_view/CurrencyRateFilter_view.aod b/neonView/CurrencyRateFilter_view/CurrencyRateFilter_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..25a282f050fcb1dd70e09c208a7bebb706c8e6da
--- /dev/null
+++ b/neonView/CurrencyRateFilter_view/CurrencyRateFilter_view.aod
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+ <name>CurrencyRateFilter_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <filterable v="true" />
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <tableViewTemplate>
+ <name>table</name>
+ <columns>
+ <neonTableColumn>
+ <name>beb118f3-29d0-4bd8-96e9-b792650bdee4</name>
+ <entityField>CURRENCYRATEID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>22102528-e5f9-4483-822a-8dce254db7b9</name>
+ <entityField>VALID_FROM</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>a39dd6a2-2477-403d-99c1-39c238fd92d6</name>
+ <entityField>CURRENCYRATE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>3110e341-5ae7-4aea-a8ce-7738b0ddaee0</name>
+ <entityField>SOURCECURRENCYISO</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ef29a080-0fe6-4880-81d9-51073485c8f2</name>
+ <entityField>TARGETCURRENCYISO</entityField>
+ </neonTableColumn>
+ </columns>
+ </tableViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CurrencyRatePreview_view/CurrencyRatePreview_view.aod b/neonView/CurrencyRatePreview_view/CurrencyRatePreview_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..97e68441be85d048b1e68c65e85356862c3c65ee
--- /dev/null
+++ b/neonView/CurrencyRatePreview_view/CurrencyRatePreview_view.aod
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+ <name>CurrencyRatePreview_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <headerFooterLayout>
+ <name>layout</name>
+ <header>Card</header>
+ </headerFooterLayout>
+ </layout>
+ <children>
+ <cardViewTemplate>
+ <name>Card</name>
+ <titleField>VALID_FROM</titleField>
+ <subtitleField>SOURCECURRENCYISO</subtitleField>
+ <descriptionField>TARGETCURRENCYISO</descriptionField>
+ <informationField>CURRENCYRATE</informationField>
+ </cardViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/CurrencyRateRefreshRateEdit_view/CurrencyRateRefreshRateEdit_view.aod b/neonView/CurrencyRateRefreshRateEdit_view/CurrencyRateRefreshRateEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..1997d37ab662b7919842a5246d2a88855e676910
--- /dev/null
+++ b/neonView/CurrencyRateRefreshRateEdit_view/CurrencyRateRefreshRateEdit_view.aod
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+ <name>CurrencyRateRefreshRateEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <size>SMALL</size>
+ <isOverlay v="true" />
+ <overlayOrientation>PORTRAIT</overlayOrientation>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericViewTemplate>
+ <name>generic</name>
+ <editMode v="true" />
+ <hideEmptyFields v="false" />
+ <fields>
+ <entityFieldLink>
+ <name>3049488f-5779-471e-b68d-f9c803c99d7c</name>
+ <entityField>uid</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c733e0d5-ab50-443f-9ab9-81f4446d133f</name>
+ <entityField>title</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0c265e4f-0382-4e68-b1d3-5775a1743b58</name>
+ <entityField>currencyRateOld</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>372aa28e-8461-4774-9b99-969d1db99764</name>
+ <entityField>currencyRateOldValidFrom</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>bcf46c55-2851-4b6f-978d-3abac9c8b351</name>
+ <entityField>currencyRateNew</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>df2e3409-e08b-44cb-8397-a590ac699f82</name>
+ <entityField>currencyRateNewValidFrom</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
+ <neonViewReference>
+ <name>6af35c77-e677-47ec-8a5e-534f5003f7d0</name>
+ <entityField>CurrencyRateRefreshRateChilds</entityField>
+ <view>CurrencyRateRefreshRateValues_view</view>
+ </neonViewReference>
+ </children>
+</neonView>
diff --git a/neonView/CurrencyRateRefreshRateValues_view/CurrencyRateRefreshRateValues_view.aod b/neonView/CurrencyRateRefreshRateValues_view/CurrencyRateRefreshRateValues_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..4a08c7d00c16e58d3a9cb272bef3b27d9ba04e37
--- /dev/null
+++ b/neonView/CurrencyRateRefreshRateValues_view/CurrencyRateRefreshRateValues_view.aod
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.8" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.8">
+ <name>CurrencyRateRefreshRateValues_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <noneLayout>
+ <name>layout</name>
+ </noneLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>genericMultiple</name>
+ <autoNewRow v="false" />
+ <isCreatable v="false" />
+ <isDeletable v="false" />
+ <isEditable v="false" />
+ <columns>
+ <neonGenericMultipleTableColumn>
+ <name>65bfbd72-2b8a-4275-a108-a08eb759cacc</name>
+ <entityField>object_typeDisplay</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>3b23b3f9-8853-4474-b8fe-2b202aba9dfa</name>
+ <entityField>object_rowTitle</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>d0b85808-dc21-4735-914b-4894ea629bb6</name>
+ <entityField>title</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>9487f57a-caea-4991-96d8-0a962a98dc31</name>
+ <entityField>valueDisplay</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>8eac49d4-074a-48a4-994c-e876b3077c1d</name>
+ <entityField>object_rowId</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>0bdb62d0-1cc3-40de-aebe-ae0e495ded13</name>
+ <entityField>uid</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>ff9b9281-6b3d-41b5-86f1-c8c635c3d5c5</name>
+ <entityField>valueNew</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>5cdcc3c7-4fdf-49b4-96d5-b146fa1e6c3b</name>
+ <entityField>valueOld</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>c5b2e7d5-c565-41a0-a633-1fbb4e53869c</name>
+ <entityField>object_type</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>169cd7bd-9028-4448-9776-7959fb21f118</name>
+ <entityField>table</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>2bff8e33-06a3-42c8-ad59-3f565ed213bc</name>
+ <entityField>uidColumn</entityField>
+ </neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>8434d6c7-5431-4154-b0e4-f68923a7eaa4</name>
+ <entityField>valueColumn</entityField>
+ </neonGenericMultipleTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/neonView/ForecastEdit_view/ForecastEdit_view.aod b/neonView/ForecastEdit_view/ForecastEdit_view.aod
index 95f7a1089f58033cc45cb2648f7ff27663c87fac..bf1339f9089271c22cbee08ec0d8cd317f5e34de 100644
--- a/neonView/ForecastEdit_view/ForecastEdit_view.aod
+++ b/neonView/ForecastEdit_view/ForecastEdit_view.aod
@@ -27,6 +27,10 @@
<name>7bf22970-1a62-4d8f-b40a-b2d4e5fc4dd8</name>
<entityField>VOLUME</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>49679202-15c3-4c34-bffe-6f64e1f7b98e</name>
+ <entityField>volumeForeignCurrency</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>f5e95dd2-c853-48be-ad18-e5fdbe714873</name>
<entityField>INFO</entityField>
diff --git a/neonView/ForecastFilter_view/ForecastFilter_view.aod b/neonView/ForecastFilter_view/ForecastFilter_view.aod
index f232cf1d4c9d4af943003da4a22777f432b8d907..2f07eef2213b18574d68b778cb5896c77db58c6c 100644
--- a/neonView/ForecastFilter_view/ForecastFilter_view.aod
+++ b/neonView/ForecastFilter_view/ForecastFilter_view.aod
@@ -15,6 +15,7 @@
<element>GROUPCODE</element>
<element>DATE_START</element>
<element>VOLUME</element>
+ <element>volumeForeignCurrency</element>
<element>INFO</element>
</editableColumns>
<columns>
@@ -34,6 +35,10 @@
<name>53536f1f-7590-4d1d-aa37-61fb446a01d2</name>
<entityField>VOLUME</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>d3d8fd02-4ef0-4b84-bdb2-f8370b8b4e32</name>
+ <entityField>volumeForeignCurrency</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>a55f7907-e37d-4eed-b865-36cfbe28ffce</name>
<entityField>INFO</entityField>
@@ -45,6 +50,11 @@
<fieldName>VOLUME</fieldName>
<renderer>numberInput</renderer>
</rendererMappingEntry>
+ <rendererMappingEntry>
+ <name>5c24038c-f703-4a89-a46f-8cc3aecd05fc</name>
+ <fieldName>volumeForeignCurrency</fieldName>
+ <renderer>numberInput</renderer>
+ </rendererMappingEntry>
</editRendererMapping>
</multiEditTableViewTemplate>
<tableViewTemplate>
@@ -70,6 +80,10 @@
<name>24ecfbc3-5f8a-4ce1-b21b-663385845ff6</name>
<entityField>VOLUME</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>0f5d8c81-1cb3-4b11-a4cf-c05c7207e012</name>
+ <entityField>volumeForeignCurrency</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>305d0254-a1ea-4733-87a7-a4d85fc78b7e</name>
<entityField>INFO</entityField>
@@ -96,6 +110,10 @@
<name>270e0ea4-89e4-41bf-a822-66bfe4f9e37d</name>
<entityField>VOLUME</entityField>
</neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>de8e08fc-d54a-4721-bb24-ccc25063fb25</name>
+ <entityField>volumeForeignCurrency</entityField>
+ </neonTreeTableColumn>
<neonTreeTableColumn>
<name>fa491370-9243-4531-b496-750c45ba69fa</name>
<entityField>INFO</entityField>
diff --git a/neonView/ForecastPreview_view/ForecastPreview_view.aod b/neonView/ForecastPreview_view/ForecastPreview_view.aod
index 83d8efb894d56b0630967da3e9e942fd66e765f5..6b8e08f03478c13c040e30b3c539eb6da29e5779 100644
--- a/neonView/ForecastPreview_view/ForecastPreview_view.aod
+++ b/neonView/ForecastPreview_view/ForecastPreview_view.aod
@@ -26,6 +26,10 @@
<name>796d2325-8684-4723-b376-262074268f4c</name>
<entityField>VOLUME</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>36e69db9-f961-41ea-83ae-336f4a11d4b1</name>
+ <entityField>volumeForeignCurrency</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>7261d58e-7534-4877-b5cd-f05201823711</name>
<entityField>OBJECT_TYPE</entityField>
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index a5728d886f9082a66ceebc9f0ae867eeb7c3445e..77c0992c525c24c738946da217c1868d555a5c73 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -37,8 +37,8 @@
<entityField>OFFERDATE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>64cb7376-3a7c-4ce9-99e8-e70bc91b41d0</name>
- <entityField>CURRENCY</entityField>
+ <name>878f668f-81fd-4cf4-8810-a3dd88bc012f</name>
+ <entityField>CURRENCYRATE_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>ce72d9f3-66ce-4a5e-a5af-c3a82520141d</name>
diff --git a/neonView/OfferPreview_view/OfferPreview_view.aod b/neonView/OfferPreview_view/OfferPreview_view.aod
index 3351f58318296f98404e708ff528eb9d976268e4..cabb05f1fd4037d53cda129338912cede148a06d 100644
--- a/neonView/OfferPreview_view/OfferPreview_view.aod
+++ b/neonView/OfferPreview_view/OfferPreview_view.aod
@@ -32,8 +32,8 @@
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
- <name>44e6dc8e-4f90-454b-9be5-f96c66ce36ec</name>
- <entityField>CURRENCY</entityField>
+ <name>ef8a9728-2331-42f3-bc27-c57224939e83</name>
+ <entityField>CURRENCYRATE_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>8d780ff6-9ca0-4067-b2b1-6e092c62253e</name>
@@ -61,6 +61,7 @@
<name>Prices</name>
<showDrawer v="true" />
<drawerCaption>Prices</drawerCaption>
+ <hideEmptyFields v="true" />
<entityField>#ENTITY</entityField>
<fields>
<entityFieldLink>
@@ -83,6 +84,26 @@
<name>43972a26-67f7-4fb5-9107-111731d326af</name>
<entityField>TotalGross</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>b8480aee-4fdd-4161-8b63-b9bac7a8878a</name>
+ <entityField>netForeignCurrency</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0ac354df-0782-40d5-a890-1b0fc464b6c9</name>
+ <entityField>discounted_netForeignCurrency</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>fa26d566-4b86-4196-b46f-81bf8cf90036</name>
+ <entityField>vatForeignCurrency</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>be64ff79-0843-4b2f-bc42-092306141daf</name>
+ <entityField>discounted_vatForeignCurrency</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>bacd4fff-b665-4c5b-a94b-b777220d0a83</name>
+ <entityField>TotalGrossForeignCurrency</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
diff --git a/neonView/OfferitemEdit_view/OfferitemEdit_view.aod b/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
index 096392bebd5b7b833ac2909119ab2754838255e3..b534a6b06f686e0f80cd4e8177f0e0b289bcaea9 100644
--- a/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
+++ b/neonView/OfferitemEdit_view/OfferitemEdit_view.aod
@@ -40,6 +40,10 @@
<name>2b635ddb-d52c-4063-af11-aea8eeee151b</name>
<entityField>PRICE</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>6baa2bcb-555a-4fde-885a-46d611d3b4f9</name>
+ <entityField>priceForeignCurrency</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>fa6d99df-4f30-4737-8064-28eb5c88f17f</name>
<entityField>currency</entityField>
@@ -60,6 +64,10 @@
<name>0b26591b-e97b-4c09-9584-3bdd6dc2740c</name>
<entityField>TotalPrice</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>5bd66253-1c4b-4c2f-b2d8-375ab8e0f4a0</name>
+ <entityField>TotalPriceForeignCurrency</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
diff --git a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
index e828f36d9130033b976a51f416e7eb6a80e8baaf..453f3ae5af2f7def053fe59c4133d11cdecd2de5 100644
--- a/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
+++ b/neonView/OfferitemFilter_view/OfferitemFilter_view.aod
@@ -13,6 +13,7 @@
<name>OfferItemsMultiEditTable</name>
<editableColumns>
<element>PRICE</element>
+ <element>priceForeignCurrency</element>
<element>QUANTITY</element>
<element>DISCOUNT</element>
</editableColumns>
@@ -46,6 +47,10 @@
<name>14da5a9f-4fed-4977-aec0-823ab665e1cb</name>
<entityField>PRICE</entityField>
</neonTreeTableColumn>
+ <neonTableColumn>
+ <name>ef831785-c8ef-4a81-a0a6-66eb88b2b527</name>
+ <entityField>priceForeignCurrency</entityField>
+ </neonTableColumn>
<neonTreeTableColumn>
<name>25d9f682-eb5f-4d96-a040-c3f4522affe7</name>
<entityField>DISCOUNT</entityField>
@@ -62,6 +67,10 @@
<name>5a340c30-ddbe-46f0-8b5e-e3c2ab25d2d4</name>
<entityField>SHOWPRICE</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>ae439c66-eca1-4c77-a172-e0641eb67b36</name>
+ <entityField>TotalPriceForeignCurrency</entityField>
+ </neonTableColumn>
<neonTreeTableColumn>
<name>ee165147-d91b-4d87-bd8a-90428d6f52be</name>
<entityField>INFO</entityField>
@@ -83,6 +92,11 @@
<fieldName>DISCOUNT</fieldName>
<renderer>discount</renderer>
</rendererMappingEntry>
+ <rendererMappingEntry>
+ <name>9850c203-44a3-42d3-b0b0-5007fec7af7b</name>
+ <fieldName>priceForeignCurrency</fieldName>
+ <renderer>numberInput</renderer>
+ </rendererMappingEntry>
</editRendererMapping>
</multiEditTableViewTemplate>
<treeTableViewTemplate>
@@ -118,6 +132,10 @@
<name>14da5a9f-4fed-4977-aec0-823ab665e1cb</name>
<entityField>PRICE</entityField>
</neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>c13955e8-9dc1-4dec-b23c-29201840c6e1</name>
+ <entityField>priceForeignCurrency</entityField>
+ </neonTreeTableColumn>
<neonTreeTableColumn>
<name>25d9f682-eb5f-4d96-a040-c3f4522affe7</name>
<entityField>DISCOUNT</entityField>
@@ -134,6 +152,10 @@
<name>0451dd35-6a5a-4868-add2-c922e1f308a8</name>
<entityField>SHOWPRICE</entityField>
</neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>1734e1e9-2a57-48ac-9950-190a9bdd3b9b</name>
+ <entityField>TotalPriceForeignCurrency</entityField>
+ </neonTreeTableColumn>
<neonTreeTableColumn>
<name>ee165147-d91b-4d87-bd8a-90428d6f52be</name>
<entityField>INFO</entityField>
diff --git a/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod b/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
index 3931678d959d2a94982c9d558b92763f02d21dec..21270f16dc59009947b4f883ebcc1c2e9e133677 100644
--- a/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
+++ b/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
@@ -37,6 +37,10 @@
<name>d97355ec-c266-4ef3-ac3a-dae3507c3a85</name>
<entityField>PRICE</entityField>
</neonGenericMultipleTableColumn>
+ <neonGenericMultipleTableColumn>
+ <name>5693eccb-721d-426c-9b85-5b8089cb4362</name>
+ <entityField>priceForeignCurrency</entityField>
+ </neonGenericMultipleTableColumn>
<neonGenericMultipleTableColumn>
<name>78f80e28-dfd1-44d5-8d7a-c45c63aa89e8</name>
<entityField>DISCOUNT</entityField>
diff --git a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
index e471d419bb8158a5fa997d1825b095616a504f69..3a99d263c9d0ecf21d824b0e5876ed292cea7669 100644
--- a/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
+++ b/neonView/OfferitemPreview_view/OfferitemPreview_view.aod
@@ -36,6 +36,10 @@
<name>b503187b-db64-4d2f-839f-9e812ee5163e</name>
<entityField>PRICE</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>28676c13-011a-4786-b550-e5ef35414586</name>
+ <entityField>priceForeignCurrency</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>b161516e-f1ee-47c6-ae92-a37bbe0ae564</name>
<entityField>TotalPrice</entityField>
@@ -44,6 +48,10 @@
<name>69948799-9ec2-4fba-843d-7b86f9e4585f</name>
<entityField>TotalPrice</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>c7583a10-bc3e-4529-8eee-8d086ee6b3eb</name>
+ <entityField>TotalPriceForeignCurrency</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>f8043352-f756-4854-9caa-a9aea073e4fe</name>
<entityField>DISCOUNT</entityField>
diff --git a/neonView/OrderCondition_view/OrderCondition_view.aod b/neonView/OrderCondition_view/OrderCondition_view.aod
index a7179fb5df70f4f82b40abe1f92b725ff568909c..493f85500dd24a0a023ee692eab4fd42125cba25 100644
--- a/neonView/OrderCondition_view/OrderCondition_view.aod
+++ b/neonView/OrderCondition_view/OrderCondition_view.aod
@@ -32,10 +32,6 @@
<name>3644cf2a-508e-4adb-a821-f4bbe5975db2</name>
<entityField>PAYDUEDATE</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>a15c9d22-3a20-49e7-a37b-c10443de106a</name>
- <entityField>CURRENCY</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
diff --git a/neonView/OrderEdit_view/OrderEdit_view.aod b/neonView/OrderEdit_view/OrderEdit_view.aod
index 686bb298e348df0882623a6fad08b66d6672fec9..c4fb9fb2266e37c1711f30efe7b0f04e7b95052c 100644
--- a/neonView/OrderEdit_view/OrderEdit_view.aod
+++ b/neonView/OrderEdit_view/OrderEdit_view.aod
@@ -41,8 +41,8 @@
<entityField>ORDERSTATUS</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>64cb7376-3a7c-4ce9-99e8-e70bc91b41d0</name>
- <entityField>CURRENCY</entityField>
+ <name>34002006-fafb-4730-a8bd-920b0b386adb</name>
+ <entityField>CURRENCYRATE_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9f357666-930f-41c5-81dc-c5bf1e57aced</name>
@@ -96,6 +96,10 @@
<name>31ed9eba-66a1-4114-a1fe-61ef475d532d</name>
<entityField>PAID</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>beb4d911-41c6-4e7b-9933-b209f7bae372</name>
+ <entityField>paidForeignCurrency</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>9f25be07-768a-4598-a766-c78beb9ac650</name>
<entityField>DUNNINGDATE</entityField>
diff --git a/neonView/OrderPaid_view/OrderPaid_view.aod b/neonView/OrderPaid_view/OrderPaid_view.aod
index 178b0008726d3c6718ffe5c128a7de1ffed90641..2c0fec0f533ca39b662fc1f873d89fb0ca002f3d 100644
--- a/neonView/OrderPaid_view/OrderPaid_view.aod
+++ b/neonView/OrderPaid_view/OrderPaid_view.aod
@@ -23,6 +23,10 @@
<name>cb3e76a5-a34f-4e02-bd41-e9acad7fa01a</name>
<entityField>PAID</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>bc07c6de-3ce5-4b65-ae4c-0fab9bd15153</name>
+ <entityField>paidForeignCurrency</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/OrderPreview_view/OrderPreview_view.aod b/neonView/OrderPreview_view/OrderPreview_view.aod
index cc5cdd5c9557e602e8a8cebb93ace6cf6d7a86e5..72bff0dccf1d640b3a5fe5c87c6e696fe5ec9050 100644
--- a/neonView/OrderPreview_view/OrderPreview_view.aod
+++ b/neonView/OrderPreview_view/OrderPreview_view.aod
@@ -31,6 +31,10 @@
<drawerCaption>Details</drawerCaption>
<entityField>#ENTITY</entityField>
<fields>
+ <entityFieldLink>
+ <name>2e7e2db1-9519-4e8f-8726-7dfc6d1bdbb3</name>
+ <entityField>CURRENCYRATE_ID</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>0ee64080-2459-4a56-b4b9-cab2cac0f8c3</name>
<entityField>SALESORDERDATE</entityField>
@@ -95,6 +99,22 @@
<name>43972a26-67f7-4fb5-9107-111731d326af</name>
<entityField>TotalGross</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>96cce4c1-1d12-46fe-9501-ce2ac7975dd6</name>
+ <entityField>netForeignCurrency</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>9cdefbc9-6f9b-44c9-bb30-d40e523b0868</name>
+ <entityField>discounted_netForeignCurrency</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c986e395-0520-4def-8a9c-da60c22854fd</name>
+ <entityField>vatForeignCurrency</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>0f4d5515-0d84-489d-a719-48f011afe0c9</name>
+ <entityField>discounted_vatForeignCurrency</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>893e3b20-891e-49ba-a460-7dadfca7b18a</name>
<entityField>PAID</entityField>
diff --git a/neonView/OrderitemEdit_view/OrderitemEdit_view.aod b/neonView/OrderitemEdit_view/OrderitemEdit_view.aod
index bc85773ca902dda4352de7775535c2477f566e8a..56ea51dada93241cfa345b02beb6a0cc33572909 100644
--- a/neonView/OrderitemEdit_view/OrderitemEdit_view.aod
+++ b/neonView/OrderitemEdit_view/OrderitemEdit_view.aod
@@ -39,6 +39,10 @@
<name>f7bd09a0-ed27-4989-940e-e3baac4c3c80</name>
<entityField>PRICE</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>ae5cd186-6f1e-433f-b5ec-d1e38b8d9d9e</name>
+ <entityField>priceForeignCurrency</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>f4e3ecc2-6303-493b-aa5a-5d6b974ae9da</name>
<entityField>currency</entityField>
@@ -51,6 +55,10 @@
<name>ff49cd49-d539-4c43-b9c7-822360ae6881</name>
<entityField>TotalPrice</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>bea1903a-0037-460b-98c1-bfcf203bc096</name>
+ <entityField>totalPriceForeignCurrency</entityField>
+ </entityFieldLink>
</fields>
</genericViewTemplate>
<genericViewTemplate>
diff --git a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
index 8d4a407dd4469e08d76ccc511d9587d662111bc5..2077deebcfc7b9ff16e61b0724264b0476867497 100644
--- a/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
+++ b/neonView/OrderitemFilter_view/OrderitemFilter_view.aod
@@ -44,6 +44,10 @@
<name>33ef0703-d4ea-4187-b555-648a1733ee99</name>
<entityField>PRICE</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>956d560b-dccb-4d20-a523-b2b762c4e2e1</name>
+ <entityField>priceForeignCurrency</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>61a39c6b-f7dd-487c-bc5f-c2e95376ec37</name>
<entityField>DISCOUNT</entityField>
@@ -52,6 +56,10 @@
<name>eecc066d-e380-4fe7-9e9b-99d80842981d</name>
<entityField>TotalPrice</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>0a8e2b38-35e0-4a26-be28-538d4fd4444e</name>
+ <entityField>totalPriceForeignCurrency</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>03a15cab-67d9-4e9d-b911-0d5599c87671</name>
<entityField>INFO</entityField>
@@ -91,6 +99,10 @@
<name>b4470ca6-89e8-421b-bb91-7d32f9c48aa2</name>
<entityField>PRICE</entityField>
</neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>4c6b6cc9-fec4-4684-b232-ea053baa4b5f</name>
+ <entityField>priceForeignCurrency</entityField>
+ </neonTreeTableColumn>
<neonTreeTableColumn>
<name>0c533079-4b39-4412-8de5-086bf7a08706</name>
<entityField>DISCOUNT</entityField>
@@ -99,6 +111,10 @@
<name>c44b5bc2-4283-4dca-bd20-bd048e05fe45</name>
<entityField>TotalPrice</entityField>
</neonTreeTableColumn>
+ <neonTreeTableColumn>
+ <name>a6d7b76d-1068-4e91-a8f9-fd4a1208926f</name>
+ <entityField>totalPriceForeignCurrency</entityField>
+ </neonTreeTableColumn>
<neonTreeTableColumn>
<name>4d4f204a-1c2b-4587-93b9-df03f31da38e</name>
<entityField>INFO</entityField>
@@ -144,6 +160,10 @@
<name>a341a42e-2916-4321-8ee0-846709a0614c</name>
<entityField>PRICE</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>cd347000-cdf9-4db5-ad3c-73b9f1a52885</name>
+ <entityField>priceForeignCurrency</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>145ba68c-5f5c-40ef-9e8c-1ed8e3b8dc68</name>
<entityField>DISCOUNT</entityField>
@@ -152,6 +172,10 @@
<name>53d13740-da29-4fee-a105-d6dedac03374</name>
<entityField>TotalPrice</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>9df87ef1-cec5-449a-a718-888c046aa03e</name>
+ <entityField>totalPriceForeignCurrency</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>96cbea05-d12e-4a1f-8942-311b4420b35e</name>
<entityField>INFO</entityField>
diff --git a/neonView/OrderitemPreview_view/OrderitemPreview_view.aod b/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
index 554b0bdc40fe12c71dd449d9cff5a50be14923d5..68a1c545af7c35b5d43b37f147e3c7599b9497ca 100644
--- a/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
+++ b/neonView/OrderitemPreview_view/OrderitemPreview_view.aod
@@ -36,10 +36,18 @@
<name>53c04932-b042-4a47-8f94-27d95b8e2ef2</name>
<entityField>PRICE</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>ab03e084-7559-459e-bb6f-41247673cee3</name>
+ <entityField>priceForeignCurrency</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>c365fa49-b445-42ca-9de4-4fe9a1fbc55b</name>
<entityField>TotalPrice</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>92f2abba-3deb-4028-bddf-8bf49f70a70a</name>
+ <entityField>totalPriceForeignCurrency</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>e679761b-c004-4bd8-940c-b12e8b209762</name>
<entityField>DISCOUNT</entityField>
diff --git a/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod b/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod
index 0704f1c49cfc70277c5fb3eaf699eb98a380d8d3..389c837fae5571a3e75b69b07fc70f9400ed7e16 100644
--- a/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod
+++ b/neonView/ProductpriceEdit_view/ProductpriceEdit_view.aod
@@ -36,6 +36,14 @@
<name>e82da6cf-63f2-4d52-a7e5-38e775b4c123</name>
<entityField>PRICE</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>8aa78a5a-e984-4161-ab82-06faa1c0196d</name>
+ <entityField>priceForeignCurrency</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>3ace9041-b811-4129-a37e-1270739f9cac</name>
+ <entityField>CURRENCYRATE_ID</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>3685f50e-e21c-4091-9246-d042cf1e0fa9</name>
<entityField>BUYSELL</entityField>
@@ -48,10 +56,6 @@
<name>562e1b29-ba29-4eae-b8f0-473935ea62a3</name>
<entityField>VAT</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>ca06ebcb-abf5-4606-98cd-fd54dccce6d0</name>
- <entityField>CURRENCY</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
</children>
diff --git a/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod b/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
index 9680051e7399c4618b4de58476ce62cceb09a850..8915d7a5ad7b7ada596544986622522d10275e6d 100644
--- a/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
+++ b/neonView/ProductpriceFilter_view/ProductpriceFilter_view.aod
@@ -38,8 +38,8 @@
<entityField>PRICE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>8879e46d-fa53-4769-8bcf-15b65fdf9967</name>
- <entityField>CURRENCY</entityField>
+ <name>cdd22900-6591-4604-a94f-d22b85c06ea7</name>
+ <entityField>CURRENCYRATE_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>15a669d9-b089-4134-89a0-129de6e1e68c</name>
@@ -84,8 +84,8 @@
<entityField>PRICE</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
- <name>0ca0e585-c5c8-4b3e-9024-7d38770a768a</name>
- <entityField>CURRENCY</entityField>
+ <name>6a9fe72e-9ca4-49c1-817a-4a4e96677c2c</name>
+ <entityField>CURRENCYRATE_ID</entityField>
</neonTreeTableColumn>
<neonTreeTableColumn>
<name>9f4ebc5e-41e3-4a0a-af28-8bfc08a597b7</name>
@@ -135,8 +135,8 @@
<entityField>PRICE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>6b192adc-d947-467d-9e00-433ee45d9dec</name>
- <entityField>CURRENCY</entityField>
+ <name>e0dc2b4f-4174-400d-89a2-7dbaed4e0b46</name>
+ <entityField>CURRENCYRATE_ID</entityField>
</neonTableColumn>
</columns>
<editRendererMapping>
diff --git a/neonView/ProductpriceForProductFilter_view/ProductpriceForProductFilter_view.aod b/neonView/ProductpriceForProductFilter_view/ProductpriceForProductFilter_view.aod
index 24702f56ada2efdd230ff0f5e1c278cae94d82f9..3a036ef363c2eddcefebc231b9910a52258f8251 100644
--- a/neonView/ProductpriceForProductFilter_view/ProductpriceForProductFilter_view.aod
+++ b/neonView/ProductpriceForProductFilter_view/ProductpriceForProductFilter_view.aod
@@ -34,8 +34,8 @@
<entityField>PRICE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>f5f43936-fa42-46a7-b152-e5a8fa0228c9</name>
- <entityField>CURRENCY</entityField>
+ <name>33d1fc3f-4e3a-4a95-96be-207b49956dd3</name>
+ <entityField>CURRENCYRATE_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>16bcb0f7-6dd5-449b-830d-0eef6c11a600</name>
diff --git a/neonView/ProductpricePreview_view/ProductpricePreview_view.aod b/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
index 09bbb44cccc14d88aebe4d919f49d8fb759e7fb5..fe1371e57987228907e52d68164daf423d19d72b 100644
--- a/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
+++ b/neonView/ProductpricePreview_view/ProductpricePreview_view.aod
@@ -41,8 +41,12 @@
<entityField>PRICE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>264eb382-5e41-4c8b-a2fa-ce93398c844b</name>
- <entityField>CURRENCY</entityField>
+ <name>c24b7b8c-4f9b-448d-b820-343d43ce9cd4</name>
+ <entityField>priceForeignCurrency</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>fc876953-7628-4be1-b2fd-de10142c5371</name>
+ <entityField>CURRENCYRATE_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>9584102a-f0a1-4d44-934a-9dd6087a7ff4</name>
diff --git a/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod b/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod
index 9da1a4286d5817ba9e386a10d834ec29386916da..ee34d1dd3e6131b1a88fdfa250c93679e7266c64 100644
--- a/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod
+++ b/neonView/ProductpriceRelation_view/ProductpriceRelation_view.aod
@@ -35,8 +35,8 @@
<entityField>PRICE</entityField>
</neonTableColumn>
<neonTableColumn>
- <name>8879e46d-fa53-4769-8bcf-15b65fdf9967</name>
- <entityField>CURRENCY</entityField>
+ <name>61799b18-f3fa-446a-9571-e7e79d048db3</name>
+ <entityField>CURRENCYRATE_ID</entityField>
</neonTableColumn>
<neonTableColumn>
<name>15a669d9-b089-4134-89a0-129de6e1e68c</name>
diff --git a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
index 60dba732ff7c9b04cc3874369356f486017afe0a..291ded8efdc8d7dc0795240f69500fc8226d7a2e 100644
--- a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
+++ b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod
@@ -53,8 +53,8 @@
<entityField>ENDDATE</entityField>
</entityFieldLink>
<entityFieldLink>
- <name>5b3c3dc2-4ca5-45c5-96e5-7196a99dcdce</name>
- <entityField>VOLUME</entityField>
+ <name>d380a197-e9fc-4980-ae73-2f9303efb500</name>
+ <entityField>CURRENCYRATE_ID</entityField>
</entityFieldLink>
<entityFieldLink>
<name>3836ef6b-64c4-4e0e-8cd6-88f784275b2f</name>
diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
index db91bfb1b79095049298c48c0484e54c78c05269..375d4fadf34d6d342e615491057ee5468a94355b 100644
--- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
+++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod
@@ -66,10 +66,18 @@
<name>bee2acfb-20ac-485e-be6c-c9c6a25e6013</name>
<entityField>PROBABILITY_AI</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>bcd0edb0-1510-4587-a9ce-14a3e0cf8404</name>
+ <entityField>CURRENCYRATE_ID</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>950d21a3-c0f9-4df5-9810-fa027a6fdb4a</name>
<entityField>VOLUME</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>6483f0de-ac7b-4892-9b61-3f53022a643a</name>
+ <entityField>volumeForeignCurrency</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>bf7ecf7a-3d7f-4ec8-867a-c10ced346343</name>
<entityField>TIMETRACKINGSUM</entityField>
diff --git a/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod b/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
index fdd70da5d99fc842a5d72c26149d604c6f3f021b..70a18a86cad06e0db7183706315cc9918e573484 100644
--- a/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
+++ b/neonView/UsersettingsEdit_view/UsersettingsEdit_view.aod
@@ -34,5 +34,21 @@
</entityFieldLink>
</fields>
</genericViewTemplate>
+ <genericViewTemplate>
+ <name>CurrencyEdit</name>
+ <editMode v="true" />
+ <showDrawer v="true" />
+ <drawerCaption>Currency</drawerCaption>
+ <fixedDrawer v="true" />
+ <hideLabels v="false" />
+ <hideEmptyFields v="false" />
+ <title>Settings</title>
+ <fields>
+ <entityFieldLink>
+ <name>06e4af54-9604-4139-9be1-ba7a7025d231</name>
+ <entityField>userCurrency</entityField>
+ </entityFieldLink>
+ </fields>
+ </genericViewTemplate>
</children>
</neonView>
diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
index 50d0738fb82a5a337077ba8f5c5d4760bd59093f..07b035ddfda2309aebdb23b24b7abdf0c1c9eadb 100644
--- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
+++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod
@@ -225,5 +225,10 @@
<description>Url of the Mosaico Email Editor</description>
<property>https://mosaico.xrm-service.dev.c2.adito.cloud</property>
</customStringProperty>
+ <customStringProperty>
+ <name>local.currency</name>
+ <description>local currency as iso4 (e.g. "EUR")</description>
+ <property>EUR</property>
+ </customStringProperty>
</customProperties>
</preferences>
diff --git a/process/Advertising_lib/process.js b/process/Advertising_lib/process.js
index db5d5c742270388ad559988a1e3416b9275ef06c..9341bdaa21042620b50a74691daa77407c91dfca 100644
--- a/process/Advertising_lib/process.js
+++ b/process/Advertising_lib/process.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("system.util");
import("Contact_lib");
import("system.translate");
@@ -45,7 +46,8 @@ AdvertisingUtils.insertAdvertising = function(pRowId, pContext, pContactIds)
"CURRENCY" : $KeywordRegistry.currency$eur(),
"STATUS" : $KeywordRegistry.advertisingStatus$Open(),
"DATE_NEW": vars.get("$sys.date"),
- "USER_NEW": vars.get("$sys.user")
+ "USER_NEW": vars.get("$sys.user"),
+ "CURRENCYRATE_ID": CurrencyRateUtils.getCurrencyRateId(CurrencyUtils.getUserCurrency(), CurrencyUtils.getLocalCurrency())
}
new SqlBuilder().insertFields(advObj, "ADVERTISING", "ADVERTISINGID", "ADVERTISINGID");
@@ -158,12 +160,12 @@ AdvertisingUtils.getProductObject = function(pProductId, pAdvertisingId, pQuanti
if(productId)
{
- var advInfo = newSelect("ADVERTISING.CURRENCY, ADVERTISING.CONTACT_ID")
+ var advInfo = newSelect("ADVERTISING.CURRENCYRATE_ID, ADVERTISING.CONTACT_ID")
.from("ADVERTISING")
.where("ADVERTISING.ADVERTISINGID", advertisingId)
.arrayRow();
- var curr = (advInfo[0]) ? advInfo[0] : "";
+ var curr = (advInfo[0]) ? CurrencyRateUtils.getCurrencyRateById(advInfo[0], true)[1] : "";
var contactid = (advInfo[1]) ? advInfo[1] : "";
var orgContactId = ContactUtils.getOrganisationContactId(contactid);
diff --git a/process/Currency_lib/Currency_lib.aod b/process/Currency_lib/Currency_lib.aod
new file mode 100644
index 0000000000000000000000000000000000000000..f9e933deeff85b0d22f6653bf16ffe7048dd0c52
--- /dev/null
+++ b/process/Currency_lib/Currency_lib.aod
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+ <name>Currency_lib</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <process>%aditoprj%/process/Currency_lib/process.js</process>
+ <alias>Data_alias</alias>
+ <variants>
+ <element>LIBRARY</element>
+ </variants>
+</process>
diff --git a/process/Currency_lib/process.js b/process/Currency_lib/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..bbaf9c1a04fadfaa81c52678a2a651fc0157ae16
--- /dev/null
+++ b/process/Currency_lib/process.js
@@ -0,0 +1,686 @@
+import("system.datetime");
+import("system.translate");
+import("system.neonFilter");
+import("system.util");
+import("system.neon");
+import("Util_lib");
+import("Keyword_lib");
+import("system.tools");
+import("system.project");
+import("KeywordRegistry_basic");
+import("system.vars");
+import("Sql_lib");
+
+/**
+ * a static Utility class for Currency
+ *
+ * Do not create an instance of this!
+ * @class
+ */
+function CurrencyUtils() {}
+
+/*
+ * Returns the local currency (project property) </br>
+ * This actually only calls project.getInstanceConfigValue() but presets "EUR" as defaultFallback if no other pDefault is being used
+ *
+ * @param {String} [pDefault] optional default, otherwiee "EUR";
+ *
+ * @return {Number} the configured local currency
+ */
+CurrencyUtils.getLocalCurrency = function(pDefault)
+{
+ var defaultCurrency = Utils.isNotNullOrEmptyString(pDefault) ? pDefault : "EUR";
+ return project.getPreferenceValue("custom.local.currency", defaultCurrency)
+}
+
+/*
+ * Returns the user currency (user property) </br>
+ * Fallbacks to local Currency
+ *
+ * @param {String} [pDefault] optional default thats being used by CurrencyUtils.getLocalCurrency;
+ *
+ * @return {Number} The configured local currency
+ */
+CurrencyUtils.getUserCurrency = function(pDefault)
+{
+ var userCurrency = tools.getCurrentUser()[tools.PARAMS]["userCurrency"];
+ if(!userCurrency)
+ {
+ userCurrency = CurrencyUtils.getLocalCurrency(pDefault);
+ }
+
+ return userCurrency;
+}
+
+/**
+ * a static Utility class for Currency Rates
+ *
+ * Do not create an instance of this!
+ * @class
+ */
+function CurrencyRateUtils() {}
+
+
+/*
+ * Retrieves valid Rate (most recent One) for pSourceCurrency
+ *
+ * @param {String} pCurrencyRateId the currency rate id;
+ *
+ * @param {Boolean} [pIncludeCurrency] also return the ISO4 value of the currency;
+ *
+ * @return {Number/Array} The rate. 1 if $CurrencyRate.LOCALCURRENCY()) or no rate exists.</br>
+ * And optional the ISO4 if pIncludeCurrency is set to true.
+ *
+ */
+CurrencyRateUtils.getCurrencyRateById = function(pCurrencyRateId, pIncludeCurrency)
+{
+ var rate = 1; //fallback if local Currency
+ var currency = CurrencyUtils.getLocalCurrency(); // local Currency as fallback
+ if(pCurrencyRateId != $CurrencyRate.LOCALCURRENCY())
+ {
+ var sql = new SqlBuilder().from("CURRENCYRATE")
+ .where("CURRENCYRATE.CURRENCYRATEID", pCurrencyRateId)
+ if(pIncludeCurrency)
+ {
+ [rate, currency] = sql.select(["CURRENCYRATE.CURRENCYRATE", "CURRENCYRATE.SOURCECURRENCYISO"]).arrayRow();
+ }
+ else
+ {
+ rate = sql.select("CURRENCYRATE.CURRENCYRATE").cell();
+ }
+
+ rate = Utils.isNullOrEmptyString(rate) ? 1 : rate;
+ }
+ if(pIncludeCurrency)
+ {
+ return [rate, currency];
+ }
+ else
+ {
+ return rate;
+ }
+};
+
+/*
+ * Retrieves valid Rate (most recent One) for pSourceCurrency
+ *
+ * @param {String} pSourceCurrency the source currency as ISO;
+ *
+ * @param {String} pTargetCurrency the target currency as ISO;
+ *
+ * @return {Array} The rateId and rate
+ */
+CurrencyRateUtils.getCurrencyRate = function(pSourceCurrency, pTargetCurrency)
+{
+ var rateAndId = newSelect("CURRENCYRATE.CURRENCYRATE, CURRENCYRATE.CURRENCYRATEID")
+ .from("CURRENCYRATE")
+ .where("CURRENCYRATE.VALID_FROM", vars.get("$sys.date"), SqlBuilder.LESS_OR_EQUAL())
+ .and("CURRENCYRATE.SOURCECURRENCYISO", pSourceCurrency)
+ .and("CURRENCYRATE.TARGETCURRENCYISO", pTargetCurrency)
+ .orderBy("CURRENCYRATE.VALID_FROM desc")
+ .arrayRow();
+
+ var rate = Utils.isNullOrEmpty(rateAndId[0]) ? 1 : rateAndId[0];
+ var rateId = Utils.isNullOrEmpty(rateAndId[1]) ? $CurrencyRate.LOCALCURRENCY() : rateAndId[1];
+
+ return {"rateId" : rateId
+ , "rate": rate};
+};
+
+/*
+ * Retrieves valid Rate id (most recent One) for pSourceCurrency
+ *
+ * @param {String} pSourceCurrency the source currency as ISO;
+ *
+ * @param {String} pTargetCurrency the target currency as ISO;
+ *
+ * @return {String} the currency rate id
+ */
+CurrencyRateUtils.getCurrencyRateId = function(pSourceCurrency, pTargetCurrency)
+{
+ var rate = newSelect("CURRENCYRATE.CURRENCYRATEID")
+ .from("CURRENCYRATE")
+ .where("CURRENCYRATE.VALID_FROM", vars.get("$sys.date"), SqlBuilder.LESS_OR_EQUAL())
+ .and("CURRENCYRATE.SOURCECURRENCYISO", pSourceCurrency)
+ .and("CURRENCYRATE.TARGETCURRENCYISO", pTargetCurrency)
+ .orderBy("CURRENCYRATE.VALID_FROM desc")
+ .cell();
+ rate = Utils.isNullOrEmptyString(rate) ? $CurrencyRate.LOCALCURRENCY() : rate;
+ return rate;
+};
+
+/*
+ * Retrieves all currencies that have a Rate set. </br>
+ * Can be used in dropdownProcesses
+ *
+ * @param {Boolean} pIncludeLocalCurrency wether or not to add the local currency; (local Currency gets $CurrencyRate.LOCALCURRENCY() as key instead of currency rate id)
+ *
+ * @param {Boolean} pIsIso4 wether or not to return the currency rate id or the iso4 code as key. Set this to true if you want to store the ISO4 code. </br>
+ * The advantage of storring the currency rate id is that you can always check what currencyrate existed at that moment.
+ *
+ * @param {String} [pRecordState] if edit/new: returns all rates, else only the current ones (needed for resolving displayValue)
+ *
+ * @return {Array} the currencies as twodimensional array with ISO4 and translated title: </br>
+ * </br> [[EUR, Euro], [USD, US-Dollar], [CHF, Swiss Franc]]
+ */
+CurrencyRateUtils.getCurrencies = function(pIncludeLocalCurrency, pIsIso4, pRecordState)
+{
+ var key = "rate.CURRENCYRATEID";
+ if(pIsIso4)
+ {
+ key = "rate.SOURCECURRENCYISO";
+ }
+
+ var keyValueArray = [];
+ if(pRecordState != neon.OPERATINGSTATE_NEW && pRecordState != neon.OPERATINGSTATE_EDIT)
+ {
+ key = "CURRENCYRATE.CURRENCYRATEID";
+ if(pIsIso4)
+ {
+ key = "CURRENCYRATE.SOURCECURRENCYISO";
+ }
+ keyValueArray = newSelect([key, CurrencyKeywordUtils.getResolvedTitleSqlPart("AB_CURRENCY.ISO4")])
+ .from("CURRENCYRATE")
+ .join("AB_CURRENCY", "CURRENCYRATE.SOURCECURRENCYISO = AB_CURRENCY.ISO4")
+ .table();
+ }
+ else
+ {
+ keyValueArray = newSelect([key, CurrencyKeywordUtils.getResolvedTitleSqlPart("AB_CURRENCY.ISO4")])
+ .from("(" + newSelect("CURRENCYRATE.SOURCECURRENCYISO, max(CURRENCYRATE.VALID_FROM) as mostValid")
+ .from("CURRENCYRATE")
+ .groupBy("CURRENCYRATE.SOURCECURRENCYISO") + ")", "groupRate")
+ .join("CURRENCYRATE", newWhere("rate.SOURCECURRENCYISO = groupRate.SOURCECURRENCYISO").and("rate.VALID_FROM = groupRate.mostValid"), "rate")
+ .join("AB_CURRENCY", "rate.SOURCECURRENCYISO = AB_CURRENCY.ISO4")
+ .table();
+ }
+
+ if(Utils.toBoolean(pIncludeLocalCurrency))
+ {
+ var localCurrencyIso = CurrencyUtils.getLocalCurrency();
+ var localCurrencyName = newSelect("AB_CURRENCY.NAME")
+ .from("AB_CURRENCY")
+ .where("AB_CURRENCY.ISO4", localCurrencyIso).arrayRow()
+ //add local Currency on top
+ keyValueArray.unshift(["localCurrency", translate.text(localCurrencyName) + " (" + localCurrencyIso + ")"]);
+ }
+ return keyValueArray;
+};
+
+/*
+ * Opens the CurrencyRateRefreshView to display the values and how they will be changed.
+ *
+ * @param {String} pObjectType the object type
+ *
+ * @param {String} pObjectRowId the object row id
+ *
+ * @param {String} pObjectTitle title that should be used for displaying the dataset
+ *
+ * @param {String} pCurrencyRateId the currency rate id
+ *
+ * @param {Array} [pFields] Array of Objects with the following properties: "title", "valueLocalCurrency", "valueForeignCurrency"
+ *
+ * @param {Boolean} [pInsertLogHistory] whether or not to create a logHistory entry after updating.
+ *
+ * @return {void} Opens the view
+ *
+ */
+CurrencyRateUtils.openCurrencyRateRefreshView = function(pObjectType, pObjectRowId, pObjectTitle, pCurrencyRateId, pFields, pInsertLogHistory)
+{
+ var currencyAndRate = CurrencyRateUtils.getCurrencyRateById(pCurrencyRateId, true);
+ var currency = currencyAndRate[1];
+ var rate = currencyAndRate[0];
+ var localCurrency = CurrencyUtils.getLocalCurrency();
+ var newRateAndRateId = CurrencyRateUtils.getCurrencyRate(currency, localCurrency);
+ var newRate = newRateAndRateId["rate"];
+ var newRateId = newRateAndRateId["rateId"];
+
+ var objectInformationParam = JSON.stringify({
+ "objectType": pObjectType
+ , "objectRowId": pObjectRowId
+ , "title": pObjectTitle
+ , "currencyRateOld": rate
+ , "currencyRateNew": newRate
+ , "table": pObjectType == "Order" ? "Sales" + pObjectType : pObjectType
+ , "uidColumn": pObjectType == "Order" ? "Sales" + pObjectType + "ID" : pObjectType + "ID"
+ , "currencyRateId": newRateId
+ , "oldCurrencyRateId": pCurrencyRateId
+ });
+
+ var childPrices = [];
+
+ //We add the values of the linked entities first, and then add the Values of the "parentEntity", since the order is getting flipped when adding the consumerRows
+ switch(pObjectType)
+ {
+ case "Salesproject":
+ var forecasts = newSelect(["FORECAST.FORECASTID"
+ , KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.productGroupcode()
+ , "FORECAST.GROUPCODE")
+ , "FORECAST.DATE_START"
+ , "FORECAST.VOLUME"
+ , "FORECAST.VOLUME / " + rate])
+ .from("FORECAST")
+ .where("FORECAST.OBJECT_TYPE", "Salesproject")
+ .and("FORECAST.OBJECT_ROWID", pObjectRowId)
+ .and("FORECAST.KIND", "FORECAST")
+ .table();
+
+ var forecastId, forecastGroupcode, forecastDateStart, forecastVolume, forecastVolumeForeignCurrency;
+ for (let i = 0; i < forecasts.length; i++)
+ {
+ [forecastId, forecastGroupcode, forecastDateStart, forecastVolume, forecastVolumeForeignCurrency] = forecasts[i];
+ childPrices.push(JSON.stringify({
+ "objectType": "Forecast"
+ , "objectRowId": forecastId
+ , "title": translate.text("Value")
+ , "object_rowTitle": forecastGroupcode + " | " + datetime.toDate(forecastDateStart, translate.text("dd.MM.yyyy"))
+ , "valueOld": forecastVolume
+ , "valueNew": forecastVolumeForeignCurrency * newRate
+ , "table": "FORECAST"
+ , "uidColumn": "FORECASTID"
+ , "valueColumn": "VOLUME"
+ }))
+ }
+ break;
+ case "Offer":
+ case "Order":
+
+ var sqlMasking = new SqlMaskingUtils();
+ var objectType = pObjectType == "Order" ? ("Sales" + pObjectType) : pObjectType;
+ var table = objectType.toUpperCase();
+ var itemTable = table + "ITEM"; //SALESORDERITEM/OFFERITEM
+ var offerItems = newSelect([itemTable + "." + itemTable + "ID"
+ , sqlMasking.concatenate([itemTable + ".ITEMPOSITION", "' | '", itemTable + ".ITEMNAME"])
+ , itemTable + ".PRICE"
+ , itemTable + ".PRICE / " + rate])
+ .from(itemTable)
+ .where(itemTable + "." + table + "_ID", pObjectRowId)
+ .orderBy(itemTable + ".ITEMSORT desc")//reverse order -> get's flipped again
+ .table();
+
+ var itemId, itemDisplayName, price, priceForeignCurrency;
+ for (let i = 0; i < offerItems.length; i++)
+ {
+ [offerItemId, itemDisplayName, price, priceForeignCurrency] = offerItems[i];
+ childPrices.push(JSON.stringify({
+ "objectType": translate.text(pObjectType + "item")
+ , "objectRowId": itemId
+ , "title": translate.text("Price")
+ , "object_rowTitle": itemDisplayName
+ , "valueOld": price
+ , "valueNew": priceForeignCurrency * newRate
+ , "table": itemTable
+ , "uidColumn": itemTable + "ID"
+ , "valueColumn": "PRICE"
+ }))
+ }
+ break;
+ case "Advertising":
+ var advertisingItems = newSelect(["ADVERTISINGITEM.ADVERTISINGITEMID"
+ , "ADVERTISINGITEM.ITEMPOSITION"
+ , "PRODUCT.PRODUCTNAME"
+ , "ADVERTISINGITEM.PRICE"
+ , "ADVERTISINGITEM.PRICE / " + rate
+ , "ADVERTISINGITEM.TARGETAMOUNT"
+ , "ADVERTISINGITEM.TARGETAMOUNT / " + rate
+ , "ADVERTISINGITEM.PRICE*ADVERTISINGITEM.QUANTITY"
+ , SqlBuilder.caseWhen(newWhere("ADVERTISINGITEM.PRICE", "0", SqlBuilder.GREATER()))
+ .then("ADVERTISINGITEM.PRICE /" + rate)
+ .elseValue("0")
+ .toString() + " * ADVERTISINGITEM.QUANTITY"])
+ .from("ADVERTISINGITEM")
+ .join("PRODUCT", "PRODUCT.PRODUCTID = ADVERTISINGITEM.PRODUCT_ID")
+ .where("ADVERTISINGITEM.ADVERTISING_ID", pObjectRowId)
+ .table();
+
+ var advertisingItemId, itemPosition, itemProductName, itemPrice, itemPriceForeignCurrency, itemTargetAmount, itemTargetAmountForeignCurrency, itemActualAmount, itemActualAmountForeignCurrency;
+ for (let i = 0; i < advertisingItems.length; i++)
+ {
+ [advertisingItemId, itemPosition, itemProductName, itemPrice, itemPriceForeignCurrency, itemTargetAmount, itemTargetAmountForeignCurrency, itemActualAmount, itemActualAmountForeignCurrency] = advertisingItems[i];
+ childPrices.push(JSON.stringify({
+ "objectType": "AdvertisingItem"
+ , "objectRowId": advertisingItemId
+ , "title": translate.text("Price")
+ , "object_rowTitle": itemPosition + " | " + itemProductName
+ , "valueOld": itemPrice
+ , "valueNew": itemPriceForeignCurrency * newRate
+ , "table": "ADVERTISINGITEM"
+ , "uidColumn": "ADVERTISINGITEMID"
+ , "valueColumn": "PRICE"
+ })
+ , JSON.stringify({
+ "objectType": "AdvertisingItem"
+ , "objectRowId": advertisingItemId
+ , "title": translate.text("Target amount")
+ , "object_rowTitle": itemPosition + " | " + itemProductName
+ , "valueOld": itemTargetAmount
+ , "valueNew": itemTargetAmountForeignCurrency * newRate
+ , "table": "ADVERTISINGITEM"
+ , "uidColumn": "ADVERTISINGITEMID"
+ , "valueColumn": "TARGETAMOUNT"
+ })
+ , JSON.stringify({
+ "objectType": "AdvertisingItem"
+ , "objectRowId": advertisingItemId
+ , "title": translate.text("Actual amount")
+ , "object_rowTitle": itemPosition + " | " + itemProductName
+ , "valueOld": itemActualAmount
+ , "valueNew": itemActualAmountForeignCurrency * newRate
+ , "table": "ADVERTISINGITEM"
+ , "uidColumn": "ADVERTISINGITEMID"
+ , "valueColumn": $CurrencyRate.DONOTINSERT()
+ }))
+ }
+ break;
+ case "Productprice":
+ default:
+ break;
+ }
+
+ for(var field in pFields)
+ {
+ childPrices.push(JSON.stringify({
+ "objectType": pObjectType
+ , "objectRowId": util.getNewUUID()
+ , "title": pFields[field]["title"]
+ , "object_rowTitle": pObjectTitle
+ , "valueOld": pFields[field]["valueLocalCurrency"]
+ , "valueNew": (pFields[field]["valueForeignCurrency"] / rate) * newRate
+ , "table": pObjectType == "Order" ? "Sales" + pObjectType : pObjectType
+ , "uidColumn": pObjectType == "Order" ? "Sales" + pObjectType + "ID" : pObjectType + "ID"
+ , "valueColumn": pFields[field]["valueColumn"]
+ }))
+ }
+
+ var params = {"CurrencyRateRefreshRateObject_param": objectInformationParam
+ , "CurrencyRateRefreshRateChildArray_param": JSON.stringify(childPrices)
+ , "InsertLogHistory_param": pInsertLogHistory};
+
+ neon.openContextWithRecipe("CurrencyRateRefreshRate"
+ , "CurrencyRateRefreshRateEdit_view"
+ , neonFilter.createEntityRecordsRecipeBuilder().parameters(params).toString()
+ , neon.OPERATINGSTATE_NEW, false, false);
+};
+
+/*
+ * Returns the state of the field according to it's currency.
+ *
+ * @param {String} pCurrencyRate (currencyrateId or localCurrency)
+ *
+ * @param {Boolean} [pIsForeignField]
+ *
+ * @param {String} [pDefault] default component state to set if said currency is set, otherwise editable
+ *
+ * @return {String} the state
+ */
+CurrencyRateUtils.getFieldState = function(pCurrencyRate, pIsForeignField, pDefault)
+{
+ var state;
+ if(Utils.toBoolean(pIsForeignField))
+ {
+ state = neon.COMPONENTSTATE_INVISIBLE;
+ if(pCurrencyRate && pCurrencyRate != $CurrencyRate.LOCALCURRENCY())
+ {
+ state = pDefault ? pDefault : neon.COMPONENTSTATE_EDITABLE;
+ }
+ }
+ else
+ {
+ state = pDefault ? pDefault : neon.COMPONENTSTATE_EDITABLE;
+ if(pCurrencyRate != $CurrencyRate.LOCALCURRENCY())
+ {
+ state = neon.COMPONENTSTATE_READONLY;
+ }
+ }
+
+ return state;
+}
+
+
+/*
+ * Returns the state of the field according to it's currency.
+ *
+ * @param {String} pCurrencyRate (currencyrateId or localCurrency)
+ *
+ * @param {Boolean} pIsForeignField
+ *
+ * @return {Boolean} true if mandatory, false if not mandatory
+ */
+CurrencyRateUtils.getFieldMandatory = function(pCurrencyRate, pIsForeignField)
+{
+ if(pCurrencyRate != CurrencyUtils.getLocalCurrency())
+ {
+ return Utils.toBoolean(pIsForeignField);
+ }
+ else
+ {
+ return !Utils.toBoolean(pIsForeignField);
+ }
+}
+
+/*
+ * Returns the state of the field according to it's currency.
+ *
+ * @param {String} pParameterName
+ *
+ * @param {Boolean} pIsForeignField
+ *
+ * @return {String} the state
+ */
+CurrencyRateUtils.getFieldStateChildEntity = function(pParameterName, pIsForeignField)
+{
+ var currencyParam = JSON.parse(vars.get("$param." + pParameterName));
+ var currency = currencyParam["currency"];
+ var state;
+ if(Utils.toBoolean(pIsForeignField))
+ {
+ state = neon.COMPONENTSTATE_INVISIBLE;
+
+ if(currency != CurrencyUtils.getLocalCurrency())
+ {
+ state = neon.COMPONENTSTATE_EDITABLE;
+ }
+ }
+ else
+ {
+ state = neon.COMPONENTSTATE_EDITABLE;
+
+ if(currency != CurrencyUtils.getLocalCurrency())
+ {
+ state = neon.COMPONENTSTATE_READONLY;
+ }
+
+ }
+
+ return state;
+}
+
+/*
+ * Returns the state of the field according to it's currency.
+ *
+ * @param {String} pParameterName
+ *
+ * @param {Boolean} pIsForeignField
+ *
+ * @return {Boolean} true if mandatory, false if not mandatory
+ */
+CurrencyRateUtils.getFieldMandatoryChildEntity = function(pParameterName, pIsForeignField)
+{
+ var currencyParam = JSON.parse(vars.get("$param." + pParameterName));
+ var currency = currencyParam["currency"];
+
+ if(currency != CurrencyUtils.getLocalCurrency())
+ {
+ return Utils.toBoolean(pIsForeignField);
+ }
+ else
+ {
+ return !Utils.toBoolean(pIsForeignField);
+ }
+}
+
+/*
+ * Use this in a foreign currency value field.
+ * Set's the local Currency Field accodingly when changes to this field happen.
+ *
+ * @param {String} pParametername the field(!) that contains the local currency value
+ *
+ * @param {String} pFieldName name of the field you want to set the value of
+ *
+ * @return {void}
+ */
+CurrencyRateUtils.setOtherValueFieldChildEntity = function(pParametername, pFieldName)
+{
+ var currencyParam = JSON.parse(vars.get("$param." + pParametername));
+ var currencyIso = currencyParam["currency"];
+
+ if(currencyIso)
+ {
+ var currencyRate = currencyParam["currencyRate"];
+ var foreignCurrencyValue = vars.get("$this.value");
+ neon.setFieldValue("$field." + pFieldName, (foreignCurrencyValue*currencyRate).toFixed(2));
+ }
+}
+
+/*
+ * Set's the local Currency/foreignCurrencyField accodingly when changes to the pForeignCurrencyField or the currencyField happen. </br>
+ * If you type in 100 francs and the rate is set to 1.3 then the localCurrencyField get's set to 130. </br>
+ * When you change the currency back to the local currency then the 130 remains set and the foreign value gets resettet.</br>
+ * Then changing back to francs presets the 130 as foreignCurrencyField and keeps the 100 as local currency value.
+ *
+ * @param {String} pLocalCurrencyField the field(!) that contains the local currency value
+ *
+ * @param {String} pCurrencyRateId currency rate id or localCurrency
+ *
+ * @param {String} [pForeignCurrencyField] the field(!) that contains the foreign currency value
+ *
+ * @return {void}
+ */
+CurrencyRateUtils.setOtherValueField = function(pLocalCurrencyField, pCurrencyRateId, pForeignCurrencyField)
+{
+ var currencyRateId = pCurrencyRateId;
+ var currencyRate = CurrencyRateUtils.getCurrencyRateById(currencyRateId);
+
+ if(Utils.isNotNullOrEmptyString(pForeignCurrencyField))//currency changed
+ {
+ var fieldsWithValues = {};
+ if(Utils.isNotNullOrEmptyString(currencyRateId))
+ {
+
+ var localValue = vars.get("$field." + pLocalCurrencyField);
+
+ if(localValue)
+ {
+ if(currencyRateId == $CurrencyRate.LOCALCURRENCY())
+ {
+ fieldsWithValues["$field." + pForeignCurrencyField] = "";
+ }
+ else
+ {
+ fieldsWithValues["$field." + pForeignCurrencyField] = (localValue/currencyRate).toFixed(2);
+ }
+ }
+
+ neon.setFieldValues(fieldsWithValues);
+ }
+ }
+ else//foreign value changed
+ {
+ if(currencyRateId)
+ {
+ var foreignCurrencyValue = vars.get("$this.value");
+ neon.setFieldValue("$field." + pLocalCurrencyField, (foreignCurrencyValue * currencyRate).toFixed(2));
+ }
+ }
+}
+
+/*
+ * Returns the state of the field according to it's currency.
+ *
+ * @param {String} pFieldName the field name
+ *
+ * @return {String} currency rate id
+ */
+CurrencyRateUtils.presetCurrencyRateId = function(pFieldName)
+{
+ var possibleValues;
+ var localCurrency;
+ var res;
+ if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value"))//preset
+ {
+ possibleValues = vars.get("$property." + pFieldName + ".dropDown");
+ localCurrency = CurrencyUtils.getLocalCurrency();
+ var userCurrency = CurrencyUtils.getUserCurrency();
+
+ var userCurrencyRateId = CurrencyRateUtils.getCurrencyRate(userCurrency, localCurrency)["rateId"];
+ if(possibleValues && possibleValues[userCurrencyRateId])
+ {
+ res = userCurrencyRateId;
+ }
+ else if(possibleValues && possibleValues[$CurrencyRate.LOCALCURRENCY()])
+ {
+ res = $CurrencyRate.LOCALCURRENCY();
+ }
+ }
+ else if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT && vars.get("$this.value"))//switch datasets if new currencyrate exists
+ {
+ localCurrency = CurrencyUtils.getLocalCurrency();
+ possibleValues = vars.get("$property." + pFieldName + ".dropDown");
+
+ if(possibleValues && !possibleValues[vars.get("$this.value")])
+ {
+ var currencyIso = CurrencyRateUtils.getCurrencyRateById(vars.get("$this.value"), true)[1];
+
+ var newRate = CurrencyRateUtils.getCurrencyRate(currencyIso, localCurrency)["rateId"];
+
+ res = newRate;
+ }
+ }
+ return res;
+}
+
+/*
+ * Returns the title for the refresh currency rate action </br>
+ *
+ * @param {String} pFieldName the field name
+ *
+ * @return {String} translated title: "Refresh Euro Values"
+ */
+CurrencyRateUtils.refreshCurrencyRateActionTitle = function(pFieldName)
+{
+
+ var localCurrency = $CurrencyRate.LOCALCURRENCY();
+ var possibleValues = vars.get("$property." + pFieldName + ".dropDown");
+
+ var res = CurrencyUtils.getLocalCurrency();//fallback local currency e.G: "EUR"
+ if(possibleValues && possibleValues[localCurrency])
+ {
+ res = possibleValues[localCurrency];//display value -> "Euro" instead of "EUR"
+ }
+
+ return translate.withArguments("Refresh %0 Values", [res]);
+}
+
+/*
+ * Returns the iso from the value of the dropdown ("EUR" from "Euro (EUR)") </br>
+ *
+ * @param {Array} pDropDownValues key value pair in two DImensional Array, as retruned by vars.get("$property.CURRENCYRATE_ID.dropDown");
+ *
+ * @param {String} pCurrencyRateId currency rate id
+ *
+ * @return {String} currency as iso, "" if none.
+ */
+CurrencyRateUtils.GetCurrencyForTitle = function(pDropDownValues, pCurrencyRateId)
+{
+ var currency = "";
+ if(pDropDownValues && pDropDownValues[pCurrencyRateId])
+ {
+ var title = pDropDownValues[pCurrencyRateId];
+ currency = title.substring(title.length - 4, title.length - 1);
+ }
+ return currency;
+}
+
+function $CurrencyRate(){}
+$CurrencyRate.LOCALCURRENCY = function(){return "localCurrency"};
+$CurrencyRate.DONOTINSERT = function(){return "thisPlaceHolderExistsToMakeItPossibleToDisplayFieldsInTheCurrencyActionThatAreNotStoredInTheDbWithoutInsertingThemWhenSaving"};
\ No newline at end of file
diff --git a/process/KeywordData_lib/process.js b/process/KeywordData_lib/process.js
index f9ed4ba049025f57f20ed0bfb26fe15c0f2690c3..1124b30cc1e53fb8be890e7d900d36ab4bdbf6c0 100644
--- a/process/KeywordData_lib/process.js
+++ b/process/KeywordData_lib/process.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("Keyword_lib");
import("system.db");
import("system.translate");
@@ -167,5 +168,50 @@ LanguageData.getIso3Map = function(pLocale, pAlias)
return res;
});
+ return cachedData;
+};
+
+function CurrencyData() {}
+
+CurrencyData.getData = function()
+{
+ var sqlMasking = new SqlMaskingUtils();
+ var cache = new CachedData("CurrenciesData", false);
+
+ return cache.load(function(pTranslationNecessary, pLocale) {
+ var data = newSelect(["AB_CURRENCY.ISO4", sqlMasking.concatenate(["AB_CURRENCY.NAME", "' ('", "AB_CURRENCY.ISO4", "')'"])])
+ .from("AB_CURRENCY").table();
+
+ var localCurrency = CurrencyUtils.getLocalCurrency();
+
+ var localCurrencyTitle = newSelect("AB_CURRENCY.NAME")
+ .from("AB_CURRENCY")
+ .where("AB_CURRENCY.ISO4", localCurrency)
+ .cell();
+ data.push([$CurrencyRate.LOCALCURRENCY(), localCurrencyTitle + " (" + CurrencyUtils.getLocalCurrency() + ")"])
+ return data;
+ });
+};
+
+CurrencyData.getIso4Map = function(pLocale, pAlias)
+{
+ var dbAlias = pAlias || db.getCurrentAlias();
+ var cache = new CachedData("CurrenciesISO4Map", true, pLocale, dbAlias);
+ var cachedData = cache.load(function(pTranslationNecessary, pLocale, pAlias)
+ {
+ var data = db.table("select AB_CURRENCY.ISO4, AB_CURRENCY.NUMBERCODE, AB_CURRENCY.NAME from AB_CURRENCY", pAlias);
+
+ var res = {};
+ var iso4, numbercode, name;
+
+ for (var i = 0, l = data.length; i < l; i++)
+ {
+ [iso4, numbercode, name] = data[i];
+ res[iso4] = {name: translate.text(name, pLocale), numbercode: numbercode};
+ }
+
+ return res;
+ });
+
return cachedData;
};
\ No newline at end of file
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 0d8c94bafb8e57613b7d193ee1f677c562e63eed..845b08db27cebc5aaf9b4e03667d6b175521ed9b 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -46,6 +46,9 @@ $KeywordRegistry.contactStatus$markToDelete = function(){return "CONTACTSTATDELE
$KeywordRegistry.currency = function(){return "Currency";};
$KeywordRegistry.currency$eur = function(){return "EUR";};
+$KeywordRegistry.currency$usd = function(){return "USD";};
+$KeywordRegistry.currency$cad = function(){return "CAD";};
+$KeywordRegistry.currency$chf = function(){return "CHF";};
$KeywordRegistry.productGroupcode = function(){return "ProductGroupcode";};
$KeywordRegistry.productGroupcode$discount = function(){return "PRODUCTDISCOUNT";};
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 4d822f2253c79ae65e1a26ac581b9d81159510fd..85e06f008c9b38cdd40cf7b1387e623e47d446c3 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -1,3 +1,4 @@
+import("Util_lib");
import("KeywordData_lib");
import("system.entities");
import("system.db");
@@ -485,17 +486,21 @@ LanguageKeywordUtils.getResolvedTitleSqlPart = function(pDbFieldName, pLocale)
LanguageKeywordUtils.getViewValue = function(key, locale)
{
if (!key)
+ {
return "";
+ }
var languageMap = LanguageData.getIso3Map(locale);
var languageInfo = languageMap[key];
if (languageInfo == undefined)
+ {
return "";
+ }
var title = languageInfo.name;
- return title == undefined ? "" : title;
+ return Utils.isNullOrEmptyString(title) ? "" : title;
};
/**
@@ -523,4 +528,26 @@ LanguageKeywordUtils.Iso2FromIso3 = function(key, pAlias)
var res = languageInfo.iso2;
return res == undefined ? "" : res;
+};
+
+/**
+ * provides methods for interactions with the special-keywords "CURRENCY"
+ *
+ * @class
+ */
+function CurrencyKeywordUtils() {}
+
+/**
+* resolves CurrencyCode (ISO4) into the latin name
+*
+* @param {String} pDbFieldName name fo the database field where the ISO4-value is stored
+* @param {String} [pLocale=current client language] specifies the locale for translating the title; can be false if nothing shall be translated
+*
+* @return {String} a SQL-expression (case-when-statement)
+*/
+CurrencyKeywordUtils.getResolvedTitleSqlPart = function(pDbFieldName, pLocale)
+{
+ var data = CurrencyData.getData();
+ var resSql = SqlUtils.getResolvingCaseWhen(data, pDbFieldName, pLocale, true);
+ return SqlUtils.translateStatementWithQuotes(resSql);
};
\ No newline at end of file
diff --git a/process/Neon_lib/documentation.adoc b/process/Neon_lib/documentation.adoc
index 63f85af69459e163f28844400e364f42d7ca8023..edb2962b621aaef79e240a37fe92dae6b83a081d 100644
--- a/process/Neon_lib/documentation.adoc
+++ b/process/Neon_lib/documentation.adoc
@@ -67,7 +67,7 @@ var params = {
"OfferOriginal_Id_param" : vars.get("$field.OFFERID"),
"OfferCode_param" : vars.get("$field.OFFERCODE"),
"OfferVersnr_param" : OfferUtils.getNextOfferVersionNumber(vars.get("$field.OFFERCODE")),
- "OfferCurrency_param" : vars.get("$field.CURRENCY"),
+ "OfferCurrency_param" : vars.get("$field.CURRENCYRATE_ID"),
"OfferAddress_param" : vars.get("$field.ADDRESS"),
"OfferHeader_param" : vars.get("$field.HEADER")
}
diff --git a/process/OfferOrder_lib/process.js b/process/OfferOrder_lib/process.js
index 5ef98cc5d6fb90b4d6b994d079f80f8814c0b75e..4d6198b15fc4ff2e09e8ba9806b9578ba988fce8 100644
--- a/process/OfferOrder_lib/process.js
+++ b/process/OfferOrder_lib/process.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("Util_lib");
import("system.entities");
import("system.logging");
@@ -650,9 +651,10 @@ ItemUtils.prototype.reOrgItems = function() {
*/
ItemUtils.product_IdOnValueChange = function (pProductId, pUid, pEntity, pQuantity)
{
- var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
+ var curr = vars.exists("$param.CurrencyAndCurrencyRate_param") ? JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"))["currency"] : "";
var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var orgContactId = contactid;
+
if(ContactUtils.getContactTypeByContactId(orgContactId) == 3)
{
orgContactId = newSelect("CONTACT.CONTACTID")
@@ -686,15 +688,23 @@ ItemUtils.product_IdOnValueChange = function (pProductId, pUid, pEntity, pQuanti
neon.setFieldValue("$field.UNIT", ProductDetails.unit);
neon.setFieldValue("$field.ITEMNAME", ProductDetails.productName);
neon.setFieldValue("$field.INFO", ProductDetails.info);
-
+
+ var priceField = "PRICE";
+ var rate = 1;
+ if(curr != CurrencyUtils.getLocalCurrency())
+ {
+ priceField = "priceForeignCurrency";
+ rate = JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param"))["currencyRate"];
+ }
+
if(ProductDetails.PriceListToUse != null)
{
- neon.setFieldValue("$field.PRICE", ProductDetails.PriceListToUse.price);
+ neon.setFieldValue("$field." + priceField, ProductDetails.PriceListToUse.price / rate);
neon.setFieldValue("$field.VAT", ProductDetails.PriceListToUse.vat);
}
else
{
- neon.setFieldValue("$field.PRICE", "");
+ neon.setFieldValue("$field." + priceField, "");
neon.setFieldValue("$field.VAT", 0);
}
}
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index 892a9d06cea1c081e06c1b669700801aca7fc592..ca4ef4820c50a97f1cb15d6d6abaf2fe4ebdd727 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -1,4 +1,5 @@
import("system.neonFilter");
+import("Currency_lib");
import("system.project");
import("system.SQLTYPES");
import("system.vars");
@@ -138,7 +139,7 @@ OfferUtils.buildOfferReport = function (pOfferID, pExclDiscountGroupcodes)
"PAYMENTTERMS",
"DELIVERYTERMS", //4
"OFFERCODE",
- "CURRENCY",
+ "'" + CurrencyUtils.getLocalCurrency() + "'",
"OFFERDATE",
"HEADER", //8
"VAT",
@@ -414,7 +415,7 @@ OfferUtils.copyOffer = function (pOfferId, pOfferData)
"OfferOriginal_Id_param": pOfferId,
"ContactId_param": pOfferData.contactId,
"OfferLanguage_param": pOfferData.language,
- "OfferCurrency_param": pOfferData.currency || "",
+ "OfferCurrency_param": pOfferData.currencyRateId || "",
"OfferHeader_param": pOfferData.header || "",
"OfferFooter_param": pOfferData.footer || "",
"OfferDeliveryTerm_param": pOfferData.deliveryTerm || "",
@@ -479,18 +480,18 @@ OfferUtils.copyOfferItems = function (pSourceOfferId, pTargetOfferId, pDiscount)
* @param pRowId {String} row id
* @param pContactId {String} contact id
* @param pLanguage {String} language
- * @param pCurrency {String} [currency=""]
+ * @param pCurrencyRateId {String} currency rate id
* @param pAddress {String} [address=""]
* @param pDiscount {String} discount
*/
-OfferUtils.copyToOrder = function (pOfferId, pContextId, pRowId, pContactId, pLanguage, pCurrency, pAddress, pDiscount)
+OfferUtils.copyToOrder = function (pOfferId, pContextId, pRowId, pContactId, pLanguage, pCurrencyRateId, pAddress, pDiscount)
{
var fieldparams =
{
"$field.CONTACT_ID" : pContactId,
"$field.ISOLANGUAGE" : pLanguage,
"$field.OFFER_ID" : pOfferId,
- "$field.CURRENCY" : pCurrency || "",
+ "$field.CURRENCYRATE_ID" : pCurrencyRateId || "",
"$field.PAYMENTADDRESS" : pAddress || "",
"$field.DELIVERYADDRESS" : pAddress || "",
"$field.OBJECT_TYPE" : pContextId || "",
@@ -665,17 +666,11 @@ OfferItemUtils.updateOfferNet = function(pOfferId, pDiscount)
{
var oiUtils = new OfferItemUtils(pOfferId)
var vals = oiUtils.getNetAndVat();
- var discountedVals = OfferItemUtils.getDiscountedNet(null, pOfferId, pDiscount);
- if(discountedVals)
- {
- newWhere("OFFER.OFFERID", pOfferId).updateFields({
- NET: vals[0], VAT: vals[1],
- DISCOUNTED_NET: discountedVals[0],
- DISCOUNTED_VAT: discountedVals[1]
- });
- }
+ newWhere("OFFER.OFFERID", pOfferId)
+ .updateFields({ NET: vals[0], VAT: vals[1] });
}
+
OfferItemUtils.getDiscountedNet = function(pExcludedIs, pOfferId, pDiscount, pExcludedProductgroups){
pDiscount = pDiscount ? pDiscount : 0;
var ret;
diff --git a/process/Order_lib/process.js b/process/Order_lib/process.js
index db4ee6805e7cb51a9c462099c9851bb779565b12..6ba4f050722ec99ce71142b31baf278b86a37db3 100644
--- a/process/Order_lib/process.js
+++ b/process/Order_lib/process.js
@@ -1,4 +1,5 @@
import("system.neonFilter");
+import("Currency_lib");
import("Employee_lib");
import("system.entities");
import("Offer_lib");
@@ -121,7 +122,7 @@ OrderUtils.copyOrder = function (pSourceOrderId, pOrderData, pCopyLinks)
"$field.ORDERTYPE": pOrderData.orderType,
"$field.ISOLANGUAGE": pOrderData.language,
"$field.OFFER_ID": pOrderData.offerId,
- "$field.CURRENCY": pOrderData.currency || "",
+ "$field.CURRENCYRATE_ID": pOrderData.currencyRateId || "",
"$field.HEADER": pOrderData.header || "",
"$field.FOOTER": pOrderData.footer || "",
"$field.DELIVERYTERMS": pOrderData.deliveryTerm || "",
@@ -282,7 +283,7 @@ OrderUtils.buildOrderReport = function (pOrderID)
"PAYMENTTERMS",
"DELIVERYTERMS", //4
"SALESORDERCODE",
- "CURRENCY",
+ "'" + CurrencyUtils.getLocalCurrency() + "'",
"SALESORDERDATE",
"HEADER", //8
"VAT",
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index 51f13baf3e085ce7e6282fb8f08addf0733c93ae..75418ccf0c5acfec8e18e5e15030294806249a26 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("Contact_lib");
import("OfferOrder_lib");
import("system.neon");
@@ -39,9 +40,11 @@ function ProductUtils() {}
ProductUtils.getCurrentProductPrice = function(pid, buySell, onlyStandard, pCurrency) {
if (pid != undefined && pid != "" && buySell != undefined && buySell != "")
{
+ var currencyCaseWhen = SqlBuilder.caseStatement().when("PRODUCTPRICE.CURRENCYRATE_ID IS NULL").thenString(CurrencyUtils.getLocalCurrency()).elseValue("CURRENCYRATE.SOURCECURRENCYISO").toString();
var today = datetime.clearTime(vars.get("sys.date"), "utc");
- var actualPriceSelect = newSelect("PRICE, CURRENCY, VAT")
+ var actualPriceSelect = newSelect(["PRICE", CurrencyKeywordUtils.getResolvedTitleSqlPart(currencyCaseWhen), "VAT"])
.from("PRODUCTPRICE")
+ .leftJoin("CURRENCYRATE", "CURRENCYRATE.CURRENCYRATEID = PRODUCTPRICE.CURRENCYRATE_ID")
.where();
if (onlyStandard != undefined && onlyStandard)
@@ -51,12 +54,12 @@ ProductUtils.getCurrentProductPrice = function(pid, buySell, onlyStandard, pCurr
actualPriceSelect.and("PRODUCTPRICE.BUYSELL", buySell)
.and("PRODUCTPRICE.PRODUCT_ID", pid)
- .andIfSet("PRODUCTPRICE.CURRENCY", pCurrency)
+ .andIfSet("CURRENCYRATE.SOURCECURRENCYISO", pCurrency)
.and("PRODUCTPRICE.VALID_FROM", today, SqlBuilder.LESS_OR_EQUAL())
.and(newWhere("PRODUCTPRICE.VALID_TO", today, SqlBuilder.GREATER_OR_EQUAL())
.or("PRODUCTPRICE.VALID_TO is null"));
- var productPriceData = actualPriceSelect.orderBy("VALID_FROM desc")
+ var productPriceData = actualPriceSelect.orderBy("PRODUCTPRICE.VALID_FROM desc")
.arrayRow();
if (productPriceData[0] && productPriceData[1])
@@ -190,13 +193,33 @@ ProductUtils.getProductDetails = function(pid, pPriceListFilter, pAdditionalProd
var joins = []; // should contain: arrays of [joinPrefix, table, tableAlias, conditioinAsStringOrSqlBuilder]
var orderBy = ["PRODUCTID"];
+ var isLocalCurrency = false;
+ if (priceListFilter.currency == CurrencyUtils.getLocalCurrency())//different handling if the currency == local currency (local currency doesn't have a currency rate, so we don't need the join)
+ {
+ isLocalCurrency = true;
+ }
+
//PriceList (all)
var colsPricelistAll = ["allPP.PRODUCTPRICEID", "allPP.CONTACT_ID", "allPP.PRICELIST", "allPP.PRICE", "allPP.VAT"
- , "allPP.VALID_FROM", "allPP.VALID_TO", "allPP.BUYSELL", "allPP.FROMQUANTITY", "allPP.CURRENCY"];
-
+ , "allPP.VALID_FROM", "allPP.VALID_TO", "allPP.BUYSELL", "allPP.FROMQUANTITY",];
+
+ if (!isLocalCurrency)
+ {
+ colsPricelistAll.push("currencyrate.sourcecurrencyiso");
+ }
+ else
+ {
+ colsPricelistAll.push("allPP.CURRENCYRATE_ID");
+ }
+
cols = cols.concat(colsPricelistAll);
joins.push(["left", "PRODUCTPRICE", "allPP", "allPP.PRODUCT_ID = PRODUCTID"]);
-
+
+ if (!isLocalCurrency)
+ {
+ joins.push(["left", "currencyrate", "", "currencyrate.currencyrateid = allPP.currencyrate_id"]);
+ }
+
//PriceList (currently valid)
var validPriceLists = false;
if (priceListFilter != undefined
@@ -212,10 +235,19 @@ ProductUtils.getProductDetails = function(pid, pPriceListFilter, pAdditionalProd
priceListFilter.relationId = ContactUtils.getOrganisationContactId(priceListFilter.relationId);
}
validPriceLists = true;
+
var colsPricelistValid = ["validPP.PRODUCTPRICEID", "validPP.CONTACT_ID", "validPP.PRICELIST", "validPP.PRICE", "validPP.VAT"
- , "validPP.VALID_FROM", "validPP.VALID_TO", "validPP.BUYSELL", "validPP.FROMQUANTITY", "validPP.CURRENCY"];
+ , "validPP.VALID_FROM", "validPP.VALID_TO", "validPP.BUYSELL", "validPP.FROMQUANTITY"];
+ if (!isLocalCurrency)
+ {
+ colsPricelistValid.push("currencyValid.sourcecurrencyiso");
+ }
+ else
+ {
+ colsPricelistValid.push("validPP.CURRENCYRATE_ID");
+ }
orderBy = orderBy.concat(["validPP.VALID_FROM desc", "validPP.FROMQUANTITY desc"]);
-
+
cols = cols.concat(colsPricelistValid);
var cond;
if(dateFrom != undefined)
@@ -243,15 +275,25 @@ ProductUtils.getProductDetails = function(pid, pPriceListFilter, pAdditionalProd
}
joins.push(["left", "PRODUCTPRICE", "validPP",
newWhere("validPP.PRODUCT_ID = PRODUCTID")
- .and(["PRODUCTPRICE", "CURRENCY", "validPP"], priceListFilter.currency)
+ ]);
+
+ var currencyCond = newWhere(["PRODUCTPRICE", "CURRENCYRATE_ID", "validPP"], $CurrencyRate.LOCALCURRENCY());
+ if (!isLocalCurrency)
+ {
+ joins.push(["left", "currencyrate", "currencyValid",
+ newWhere("currencyValid.currencyrateid = validPP.currencyrate_id")
+ ]);
+ currencyCond = newWhere(["CURRENCYRATE", "SOURCECURRENCYISO", "currencyValid"], priceListFilter.currency);
+ }
+
+ cond = newWhere(currencyCond)
.and(cond)
.and(["PRODUCTPRICE", "FROMQUANTITY", "validPP"], priceListFilter.quantity, SqlBuilder.LESS_OR_EQUAL())
.and(newWhere()
.or(["PRODUCTPRICE", "CONTACT_ID", "validPP"], priceListFilter.relationId)
.or(newWhere()
.and("validPP.CONTACT_ID is null")
- .and(["PRODUCTPRICE", "BUYSELL", "validPP"], 'SP')))
- ]);
+ .and(["PRODUCTPRICE", "BUYSELL", "validPP"], 'SP')));
}
var productDataSql = newSelect(cols)
@@ -264,6 +306,7 @@ ProductUtils.getProductDetails = function(pid, pPriceListFilter, pAdditionalProd
var ProductData = productDataSql
.where("PRODUCT.PRODUCTID", pid)
+ .and(cond)
.orderBy(orderBy)
.table();
@@ -688,7 +731,7 @@ function ProductPriceUtils() {}
*/
ProductUtils.presetPriceAndVat = function(pProductId, pVat, pPriceList, pBuySell, pCurrency, pFromQuantity, pPrice)
{
- var currency = pCurrency ? pCurrency : "EUR";
+ var currency = pCurrency ? pCurrency : CurrencyUtils.getLocalCurrency();
var fromQuantity = pFromQuantity ? pFromQuantity : 1;
var price = pPrice ? pPrice : 0;
var vat = pVat ? pVat : 0;
diff --git a/process/Sql_lib/process.js b/process/Sql_lib/process.js
index 2a72f327942d4adb6a0472566e15163f23a90256..91a17dfabf4784c1ca241f28851bc4dff9ae8201 100644
--- a/process/Sql_lib/process.js
+++ b/process/Sql_lib/process.js
@@ -4034,7 +4034,7 @@ SqlUtils.getSqlInStatement = function(pFieldname, pData, pQuoteSymbol, pAsPrepar
*
* @return {String} a SQL-expression (case-when-statement) that resolves the KEYID into the title -> as preparedSatement-elements
*/
-SqlUtils.getResolvingCaseWhen = function(pKeyValueArray, pDbFieldName, pLocale)
+SqlUtils.getResolvingCaseWhen = function(pKeyValueArray, pDbFieldName, pLocale, pIsCurrency)
{
var keyData = pKeyValueArray;
if (keyData.length == 0)
@@ -4061,7 +4061,19 @@ SqlUtils.getResolvingCaseWhen = function(pKeyValueArray, pDbFieldName, pLocale)
var colTypeTitle = SQLTYPES.NVARCHAR;
for (var i = 0, l = keyData.length; i < l; i++)
{
- var translatedTitle = translateValue(keyData[i][1]);
+ var translatedTitle;
+ if(pIsCurrency)
+ {
+ var titleWithiso = keyData[i][1]; //Euro (EUR) (iso ALWAYS has a length of 3 + the columns and one space)
+ var title = titleWithiso.substring(0, titleWithiso.length - 6);
+ var iso = titleWithiso.substring(titleWithiso.length - 6, titleWithiso.length);
+ translatedTitle = translateValue(title) + iso;
+ }
+ else
+ {
+ translatedTitle = translateValue(keyData[i][1]);
+ }
+
resSql += " when " + pDbFieldName + " = ? then ? "
preparedValues.push([keyData[i][0], colTypeKeyId]);
preparedValues.push([translatedTitle, colTypeTitle]);
diff --git a/process/UserSettings_lib/process.js b/process/UserSettings_lib/process.js
index 69c4108c4dd233d621da6a7a40e9f51abf2aed5e..a41e2a1d5c16eaff4fcdd659387c2d99b792b0fc 100644
--- a/process/UserSettings_lib/process.js
+++ b/process/UserSettings_lib/process.js
@@ -1,3 +1,4 @@
+import("Currency_lib");
import("system.logging");
import("system.neon");
import("system.tools");
@@ -19,6 +20,7 @@ function UserSettingUtil () {}
tools.PASSWORD,
];
let paramSettings = [
+ "userCurrency"
/*
"calHourdivider",
"calMaintimeEnd",
@@ -70,7 +72,7 @@ function UserSettingUtil () {}
*
* @param {String} pKey name of the setting key
*
- * @result {String|undefined} the value of a setting or undefined if it dies not exist
+ * @result {String|undefined} the value of a setting or undefined if it does not exist
*/
UserSettingUtil.getValue = function (pKey)
{
@@ -82,6 +84,11 @@ function UserSettingUtil () {}
return _currentSettings[pKey];
}
+ if(pKey == "userCurrency")//preset currency
+ {
+ return CurrencyUtils.getLocalCurrency();
+ }
+
return undefined;
}
diff --git a/process/migrate_currencyValues_serverProcess/documentation.adoc b/process/migrate_currencyValues_serverProcess/documentation.adoc
new file mode 100644
index 0000000000000000000000000000000000000000..ee8dfc2872245501d9d3e970e6e56cda58351744
--- /dev/null
+++ b/process/migrate_currencyValues_serverProcess/documentation.adoc
@@ -0,0 +1,13 @@
+= Currency migration
+This process can be used to migrate all the values that have been created before the huge multi currency capability rework of 2022.0.0.
+Before this version it was already possible in some cases to change the currency of e.G. offers, orders, advertisings etc.
+All the values, no matter the currency then got stored in one field.
+Now we always store the local currency value in said field (local currency has to be set in the project settings!) together with the currency rate id if the currency differs from the local currency.
+We also added foreignCurrency fields for every field that stores a money value.
+e.g:
+Salesproject now has two fields for Volume: VOLUME and volumeForeignCurrency (only the first one get's stored in the database).
+Aswell as CURRENCYRATE_ID where we store the currencyRateId if the currency differs from the local currency (otherwise $TopicTreeConstants.TOPTOPIC())
+Forecast also got a second field for volumeForeignCurrency but no field for the currencyRateId; because forecast datasets always use the rate from the linked salesproject.
+
+So to use this process you have to add currencyrates for every currency you used in your project, add entities that we didn't implement (see also code documentation of this process)
+and then just run it once.
\ No newline at end of file
diff --git a/process/migrate_currencyValues_serverProcess/migrate_currencyValues_serverProcess.aod b/process/migrate_currencyValues_serverProcess/migrate_currencyValues_serverProcess.aod
new file mode 100644
index 0000000000000000000000000000000000000000..ddb9ba3d646349b0d3164631399ab6ec2d19037f
--- /dev/null
+++ b/process/migrate_currencyValues_serverProcess/migrate_currencyValues_serverProcess.aod
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<process xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/process/1.2.2">
+ <name>migrate_currencyValues_serverProcess</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <documentation>%aditoprj%/process/migrate_currencyValues_serverProcess/documentation.adoc</documentation>
+ <process>%aditoprj%/process/migrate_currencyValues_serverProcess/process.js</process>
+ <alias>Data_alias</alias>
+ <variants>
+ <element>EXECUTABLE</element>
+ </variants>
+</process>
diff --git a/process/migrate_currencyValues_serverProcess/process.js b/process/migrate_currencyValues_serverProcess/process.js
new file mode 100644
index 0000000000000000000000000000000000000000..97330f6d266759fa0ec8a44c385a3447c11b96b4
--- /dev/null
+++ b/process/migrate_currencyValues_serverProcess/process.js
@@ -0,0 +1,399 @@
+import("Util_lib");
+import("system.db");
+import("Currency_lib");
+import("Sql_lib");
+
+var pageSize = 500;//page because of potentially huge amount of data, you can increase/decrese this depending on you database
+
+var updateStatements = [];
+runBasicMigration();
+
+/*
+ * Migrates the money + currency values of the following basic entites:<p>
+ * Salesproject<p>
+ * Offer + Offeritem<p>
+ * Order + Orderitem<p>
+ * Advertising + Advertisingitem<p>
+ * </br>
+ * For each of these cases a helper function exists that get's the datasets and puts them in a object that _migrateEntityValues can handle.<p>
+ * For more information about the migration itself see the documentation property of this process. For more information about how to migrate your own entity see _migrateEntityValues().
+ *
+ * @return {void}
+ */
+function runBasicMigration()
+{
+ _migrateSalesprojectValues();
+ _migrateOfferValues();
+ _migrateOrderValues();
+ _migrateAdvertisingValues();
+ _migrateProductpriceValues();
+
+ if(updateStatements.length > 0)
+ {
+ do
+ {
+ var updates = updateStatements.splice(0, pageSize)
+ db.updates(updates);
+ }
+ while(updateStatements.length > 0)
+ }
+}
+
+/*
+ * Migrates Entity Values that have a currency column that stores the currency as iso4 (e.g: EUR, CHF, USD) instead of the currencyRate that arrived with 2022.0.0.<p>
+ * This does two things: it set's the currency rate id field using the current currency rate of said currency, or $CurrencyRate.LOCALCURRENCY() if localCurrency.<p>
+ * In the past we stored the fieldValues in the specified currency, now we always store the value in the localCurrency (project preference) and store the currency rate to the dataset.<p>
+ * This is why this function migrates all fieldvalues using the rate: If we stored 100 CHF then we now have to multiply those 100CHF times the current rate (e.G. 1,06) to get the local currency value -> 106 EUR <p>
+ * This, of course, is only being done if the currency differs from the local currency.
+ *
+ * @param {Object} pFields Following Structure: pFields[currency][tablename][rowId]{columnValues, currencyIdColumn} <br>
+ * Each row has one object with to optional properties: columnValues(Object) and currencyIdColumn(String). <br>
+ * columnValues expects a object with the columnName as key and the value as value. <br>
+ * currencyIdColumn the name of the column that should store the currency rate id<br>
+ *
+ * @return {String} translated title: "Refresh Euro Values"
+ */
+function _migrateEntityValues(pFields)
+{
+ var currencyRateObj = {};
+ for (var currency in pFields)
+ {
+ if (!currencyRateObj.hasOwnProperty(currency))
+ {
+ currencyRateObj[currency] = {};
+ currencyRateObj[currency] = CurrencyRateUtils.getCurrencyRate(currency, CurrencyUtils.getLocalCurrency());
+ }
+
+ for (var objectType in pFields[currency])
+ {
+ for (var objectRowId in pFields[currency][objectType])
+ {
+ var row = pFields[currency][objectType][objectRowId];
+ var fieldsValuesObject = {};
+
+ if(currency != CurrencyUtils.getLocalCurrency())//don't change value if it's already in the local. If it differs: calculate value in localCurrency to update it
+ {
+
+ var columnValues = row["columnValues"];
+ for (var element in columnValues)
+ {
+ //If we stored 100 CHF then we now have to multiply those 100CHF times the current rate (e.G. 1,06) to get the local currency value -> 106 EUR
+ columnValues[element] = columnValues[element] * currencyRateObj[currency]["rate"];
+ }
+ fieldsValuesObject = columnValues;
+ }
+
+ if(row["currencyIdColumn"] && Utils.isNotNullOrEmptyString(row["currencyIdColumn"]))
+ {
+ fieldsValuesObject[row["currencyIdColumn"]] = currencyRateObj[currency]["rateId"];
+
+ }
+
+ if(!Utils.isNullOrEmpty(fieldsValuesObject))
+ {
+ updateStatements.push(newWhere(objectType + "." + objectType + "ID", objectRowId)
+ .buildUpdateStatement(fieldsValuesObject, objectType));
+ }
+ }
+ }
+ }
+}
+
+/*
+ * Migrates Offers and their Offeritems.<p>
+ * We set the CURRENCYRATE_ID according to the stored currency and set the following money fields according to said rate:<p>
+ * OFFER: NET, VAT, DISCOUNTED_NET, DISCOUNTED_VAT<p>
+ * OFFERITEM: PRICE<p>
+ *
+ * @return {void}
+ */
+function _migrateOfferValues()
+{
+ var offers = newSelect(["OFFER.OFFERID", "OFFER.CURRENCY", "OFFER.NET", "OFFER.VAT", "OFFER.DISCOUNTED_NET", "OFFER.DISCOUNTED_VAT", "OFFERITEM.OFFERITEMID", "OFFERITEM.PRICE"])
+ .from("OFFER")
+ .leftJoin("OFFERITEM", newWhere("OFFER.OFFERID = OFFERITEM.OFFER_ID"))
+ .where(newWhere("OFFER.CURRENCYRATE_ID IS NULL")
+ .or("OFFER.CURRENCYRATE_ID", "", SqlBuilder.EQUAL()))
+ .table();
+
+ _migrateOffers(offers);
+
+ function _migrateOffers(pOffers)
+ {
+ var fields = {};
+ var helperObject = {};
+ var columnValues = {};
+ var offerId, currency, offerNet, offerVat, offerDiscountedNet, offerDiscountedVat, offerItemId, offerItemPrice;
+ for (var element in pOffers)
+ {
+ [offerId, currency, offerNet, offerVat, offerDiscountedNet, offerDiscountedVat, offerItemId, offerItemPrice] = pOffers[element];
+ if (!helperObject[currency])
+ {
+ fields[currency] = {};
+ helperObject[currency] = true;
+
+ }
+ if (!helperObject[currency + "OFFER"])
+ {
+ fields[currency]["OFFER"] = {};
+ helperObject[currency + "OFFER"] = true;
+ }
+ if (!helperObject[currency + "OFFERITEM"])
+ {
+ fields[currency]["OFFERITEM"] = {};
+ helperObject[currency + "OFFERITEM"] = true;
+ }
+ if (!helperObject[currency + "OFFER" + offerId])
+ {
+ columnValues = {};
+ fields[currency]["OFFER"][offerId] = {};
+ columnValues["NET"] = offerNet;
+ columnValues["VAT"] = offerVat;
+ columnValues["DISCOUNTED_NET"] = offerDiscountedNet;
+ columnValues["DISCOUNTED_VAT"] = offerDiscountedVat;
+ fields[currency]["OFFER"][offerId] = {"columnValues": columnValues
+ , "currencyIdColumn": "CURRENCYRATE_ID"};
+ helperObject[currency + "OFFER" + offerId] = true;
+ }
+ if (!helperObject[currency + "OFFERITEM" + offerItemId])
+ {
+ columnValues = {};
+ fields[currency]["OFFERITEM"][offerItemId] = {};
+ columnValues["PRICE"] = offerItemPrice;
+ fields[currency]["OFFERITEM"][offerItemId] = {"columnValues": columnValues};
+ helperObject[currency + "OFFERITEM" + offerItemId] = true;
+ }
+ }
+ _migrateEntityValues(fields);
+ }
+}
+
+/*
+ * Migrates Orders and their Orderitems.<p>
+ * We set the CURRENCYRATE_ID according to the stored currency and set the following money fields according to said rate:<p>
+ * SALESORDER: NET, VAT, DISCOUNTED_NET, DISCOUNTED_VAT<p>
+ * SALESORDERITEM: PRICE<p>
+ *
+ * @return {void}
+ */
+function _migrateOrderValues()
+{
+ var orders = newSelect(["SALESORDER.SALESORDERID", "SALESORDER.CURRENCY", "SALESORDER.NET", "SALESORDER.VAT", "SALESORDER.DISCOUNTED_NET", "SALESORDER.DISCOUNTED_VAT", "SALESORDERITEM.SALESORDERITEMID", "SALESORDERITEM.PRICE"])
+ .from("SALESORDER")
+ .leftJoin("SALESORDERITEM", newWhere("SALESORDER.SALESORDERID = SALESORDERITEM.SALESORDER_ID"))
+ .where(newWhere("SALESORDER.CURRENCYRATE_ID IS NULL")
+ .or("SALESORDER.CURRENCYRATE_ID", "", SqlBuilder.EQUAL()))
+ .table();
+
+ _migrateOrders(orders);
+
+ function _migrateOrders(pOrders)
+ {
+ var fields = {};
+ var helperObject = {};
+ var columnValues = {};
+ var orderId, currency, orderNet, orderVat, orderDiscountedNet, orderDiscountedVat, orderItemId, orderItemPrice;
+ for (var element in pOrders)
+ {
+ [orderId, currency, orderNet, orderVat, orderDiscountedNet, orderDiscountedVat, orderItemId, orderItemPrice] = pOrders[element];
+ if (!helperObject[currency])
+ {
+ fields[currency] = {};
+ helperObject[currency] = true;
+
+ }
+ if (!helperObject[currency + "SALESORDER"])
+ {
+ fields[currency]["SALESORDER"] = {};
+ helperObject[currency + "SALESORDER"] = true;
+ }
+ if (!helperObject[currency + "SALESORDERITEM"])
+ {
+ fields[currency]["SALESORDERITEM"] = {};
+ helperObject[currency + "SALESORDERITEM"] = true;
+ }
+ if (!helperObject[currency + "SALESORDER" + orderId])
+ {
+ columnValues = {};
+ fields[currency]["SALESORDER"][orderId] = {};
+ columnValues["NET"] = orderNet;
+ columnValues["VAT"] = orderVat;
+ columnValues["DISCOUNTED_NET"] = orderDiscountedNet;
+ columnValues["DISCOUNTED_VAT"] = orderDiscountedVat;
+ fields[currency]["SALESORDER"][orderId] = {"columnValues": columnValues
+ , "currencyIdColumn": "CURRENCYRATE_ID"};
+ helperObject[currency + "SALESORDER" + orderId] = true;
+ }
+ if (!helperObject[currency + "SALESORDERITEM" + orderItemId])
+ {
+ columnValues = {};
+ fields[currency]["SALESORDERITEM"][orderItemId] = {};
+ columnValues["PRICE"] = orderItemPrice;
+ fields[currency]["SALESORDERITEM"][orderItemId] = {"columnValues": columnValues};
+ helperObject[currency + "SALESORDERITEM" + orderItemId] = true;
+ }
+ }
+ _migrateEntityValues(fields);
+ }
+}
+
+/*
+ * Migrates Advertisings and their AdvertisingItems.<p>
+ * We set the CURRENCYRATE_ID according to the stored currency and set the following money fields according to said rate:<p>
+ * ADVERTISINGITEM: PRICE, TARGETAMOUNT<p>
+ *
+ * @return {void}
+ */
+function _migrateAdvertisingValues()
+{
+ var advertisings = newSelect(["ADVERTISING.ADVERTISINGID", "ADVERTISING.CURRENCY", "ADVERTISINGITEM.ADVERTISINGITEMID", "ADVERTISINGITEM.PRICE", "ADVERTISINGITEM.TARGETAMOUNT"])
+ .from("ADVERTISING")
+ .leftJoin("ADVERTISINGITEM", newWhere("ADVERTISING.ADVERTISINGID = ADVERTISINGITEM.ADVERTISING_ID"))
+ .where(newWhere("ADVERTISING.CURRENCYRATE_ID IS NULL")
+ .or("ADVERTISING.CURRENCYRATE_ID", "", SqlBuilder.EQUAL()))
+ .table();
+
+ _migrateAdvertisings(advertisings);
+
+ function _migrateAdvertisings(pAdvertisings)
+ {
+ var fields = {};
+ var helperObject = {};
+ var columnValues = {};
+ var advertisingId, currency, advertisingItemId, advertisingItemPrice, advertisingItemTargetAmount;
+ for (var element in pAdvertisings)
+ {
+ [advertisingId, currency, advertisingItemId, advertisingItemPrice, advertisingItemTargetAmount] = pAdvertisings[element];
+ if (!helperObject[currency])
+ {
+ fields[currency] = {};
+ helperObject[currency] = true;
+
+ }
+ if (!helperObject[currency + "ADVERTISING"])
+ {
+ fields[currency]["ADVERTISING"] = {};
+ helperObject[currency + "ADVERTISING"] = true;
+ }
+ if (!helperObject[currency + "ADVERTISINGITEM"])
+ {
+ fields[currency]["ADVERTISINGITEM"] = {};
+ helperObject[currency + "ADVERTISINGITEM"] = true;
+ }
+ if (!helperObject[currency + "ADVERTISING" + advertisingId])
+ {
+ columnValues = {};
+ fields[currency]["ADVERTISING"][advertisingId] = {"columnValues": columnValues
+ , "currencyIdColumn": "CURRENCYRATE_ID"};
+ helperObject[currency + "ADVERTISING" + advertisingId] = true;
+ }
+ if (!helperObject[currency + "ADVERTISINGITEM" + advertisingItemId])
+ {
+ columnValues = {};
+ fields[currency]["ADVERTISINGITEM"][advertisingItemId] = {};
+ columnValues["PRICE"] = advertisingItemPrice;
+ columnValues["TARGETAMOUNT"] = advertisingItemTargetAmount;
+ fields[currency]["ADVERTISINGITEM"][advertisingItemId] = {"columnValues": columnValues};
+ helperObject[currency + "ADVERTISINGITEM" + advertisingItemId] = true;
+ }
+ }
+ _migrateEntityValues(fields);
+ }
+}
+
+/*
+ * Migrates Productprices.<p>
+ * We set the CURRENCYRATE_ID according to the stored currency and set the following money fields according to said rate:<p>
+ * PRODUCTPRICE: PRICE<p>
+ *
+ * @return {void}
+ */
+function _migrateProductpriceValues()
+{
+ var productprices = newSelect(["PRODUCTPRICE.PRODUCTPRICEID", "PRODUCTPRICE.CURRENCY", "PRODUCTPRICE.PRICE"])
+ .from("PRODUCTPRICE")
+ .where(newWhere("PRODUCTPRICE.CURRENCYRATE_ID IS NULL")
+ .or("PRODUCTPRICE.CURRENCYRATE_ID", "", SqlBuilder.EQUAL()))
+ .table();
+
+ _migrateProductprices(productprices);
+
+ function _migrateProductprices(pProductprices)
+ {
+ var fields = {};
+ var helperObject = {};
+ var columnValues = {};
+ var productpriceId, currency, price;
+ for (var element in pProductprices)
+ {
+ [productpriceId, currency, price] = pProductprices[element];
+ if (!helperObject[currency])
+ {
+ fields[currency] = {};
+ helperObject[currency] = true;
+
+ }
+ if (!helperObject[currency + "PRODUCTPRICE"])
+ {
+ fields[currency]["PRODUCTPRICE"] = {};
+ helperObject[currency + "PRODUCTPRICE"] = true;
+ }
+ if (!helperObject[currency + "PRODUCTPRICE" + productpriceId])
+ {
+ columnValues = {};
+ fields[currency]["PRODUCTPRICE"][productpriceId] = {};
+ columnValues["PRICE"] = price;
+ fields[currency]["PRODUCTPRICE"][productpriceId] = {"columnValues": columnValues
+ , "currencyIdColumn": "CURRENCYRATE_ID"};
+ helperObject[currency + "PRODUCTPRICE" + productpriceId] = true;
+ }
+ }
+ _migrateEntityValues(fields);
+ }
+}
+
+/*
+ * Migrates Salesprojects<p>
+ * Salesprojects originally didn't have an currency that could be changed so we only really have to set the CURRENCYRATE_ID field and can ignore it's volume and forecasts.<p>
+ *
+ * @return {void}
+ */
+function _migrateSalesprojectValues()
+{
+ var salesprojects = newSelect(["SALESPROJECT.SALESPROJECTID"
+ , "'" + CurrencyUtils.getLocalCurrency() + "'"])
+ .from("SALESPROJECT")
+ .where(newWhere("SALESPROJECT.CURRENCYRATE_ID is null").or("SALESPROJECT.CURRENCYRATE_ID", "", SqlBuilder.EQUAL()))
+ .table();
+
+ _migrateSalespojects(salesprojects);
+
+ function _migrateSalespojects(pSalesprojects)
+ {
+ var fields = {};
+ var helperObject = {};
+ var salesprojectId, currency;
+ for (var element in pSalesprojects)
+ {
+ [salesprojectId, currency] = pSalesprojects[element];
+ if (!helperObject[currency])
+ {
+ fields[currency] = {};
+ helperObject[currency] = true;
+
+ }
+ if (!helperObject[currency + "SALESPROJECT"])
+ {
+ fields[currency]["SALESPROJECT"] = {};
+ helperObject[currency + "SALESPROJECT"] = true;
+ }
+ if (!helperObject[currency + "SALESPROJECT" + salesprojectId])
+ {
+ fields[currency]["SALESPROJECT"][salesprojectId] = {};
+ fields[currency]["SALESPROJECT"][salesprojectId] = {"currencyIdColumn": "CURRENCYRATE_ID"};
+ helperObject[currency + "SALESPROJECT" + salesprojectId] = true;
+ }
+ }
+ _migrateEntityValues(fields);
+ }
+}
\ No newline at end of file