diff --git a/.liquibase/Data_alias/basic/2021.1.1/CurrencyRate/alter_Forecast.xml b/.liquibase/Data_alias/basic/2021.1.1/CurrencyRate/alter_Forecast.xml new file mode 100644 index 0000000000000000000000000000000000000000..0649ab5ccf3d42fe11954e02baadc516fc95ce03 --- /dev/null +++ b/.liquibase/Data_alias/basic/2021.1.1/CurrencyRate/alter_Forecast.xml @@ -0,0 +1,28 @@ +<?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="FORECAST"> + <column name ="VOLUMEFOREIGNCURRENCY" type="NUMERIC(14,2)"/> + </addColumn> + </changeSet> + + <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/2021.1.1/CurrencyRate/alter_Salesproject.xml b/.liquibase/Data_alias/basic/2021.1.1/CurrencyRate/alter_Salesproject.xml new file mode 100644 index 0000000000000000000000000000000000000000..5cffc8d604126ddc5dced054c253f5bc0fc7ebb7 --- /dev/null +++ b/.liquibase/Data_alias/basic/2021.1.1/CurrencyRate/alter_Salesproject.xml @@ -0,0 +1,12 @@ +<?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="CURRENCY" type="CHAR(3)"/> + <column name="CURRENCYRATE" type="FLOAT"/> + <column name ="VOLUMEFOREIGNCURRENCY" type="NUMERIC(14,2)"/> + </addColumn> + </changeSet> +</databaseChangeLog> \ No newline at end of file diff --git a/.liquibase/Data_alias/basic/2021.1.1/CurrencyRate/changelog.xml b/.liquibase/Data_alias/basic/2021.1.1/CurrencyRate/changelog.xml new file mode 100644 index 0000000000000000000000000000000000000000..422eca9ab54104b6253de9333fb1ea40bc47ea84 --- /dev/null +++ b/.liquibase/Data_alias/basic/2021.1.1/CurrencyRate/changelog.xml @@ -0,0 +1,7 @@ +<?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="update_Salesproject.xml" relativeToChangelogFile="true"/> +</databaseChangeLog> \ No newline at end of file diff --git a/.liquibase/Data_alias/basic/2021.1.1/CurrencyRate/create_CurrencyRate.xml b/.liquibase/Data_alias/basic/2021.1.1/CurrencyRate/create_CurrencyRate.xml new file mode 100644 index 0000000000000000000000000000000000000000..c3528a254252b9020e49f145a5aee54c7ff7c57d --- /dev/null +++ b/.liquibase/Data_alias/basic/2021.1.1/CurrencyRate/create_CurrencyRate.xml @@ -0,0 +1,19 @@ +<?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" /> + <column name="USER_EDIT" type="NVARCHAR(50)" /> + <column name="DATE_EDIT" type="DATETIME" /> + </createTable> + </changeSet> +</databaseChangeLog> \ No newline at end of file diff --git a/.liquibase/Data_alias/basic/2021.1.1/CurrencyRate/update_Salesproject.xml b/.liquibase/Data_alias/basic/2021.1.1/CurrencyRate/update_Salesproject.xml new file mode 100644 index 0000000000000000000000000000000000000000..f2b934fb0ed35b8a3ad5d2b2c9cde5591db73c13 --- /dev/null +++ b/.liquibase/Data_alias/basic/2021.1.1/CurrencyRate/update_Salesproject.xml @@ -0,0 +1,11 @@ +<?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="42d29d91-9071-4a09-b0a1-308946809e89"> + <!--until now it was only possible to use euro for these prices, so we know that all of tham are in euro--> + <update tableName="SALESPROJECT"> + <column name="CURRENCY" value="EUR"></column> + </update> + </changeSet> +</databaseChangeLog> \ No newline at end of file diff --git a/.liquibase/Data_alias/basic/2021.1.1/changelog.xml b/.liquibase/Data_alias/basic/2021.1.1/changelog.xml index dbb03bc9d62c0fea077c10159291a3f25f764e5b..04d7ebe37a0ad01d785ec410f836fbd36b0786f2 100644 --- a/.liquibase/Data_alias/basic/2021.1.1/changelog.xml +++ b/.liquibase/Data_alias/basic/2021.1.1/changelog.xml @@ -1,7 +1,7 @@ <?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"> + 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="EmailFilter/alter_emailFilterHandling.xml"/> <include relativeToChangelogFile="true" file="EmailFilter/insert_recipientStatusBounced.xml"/> </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 2f7aec85052da42bdfe0ccac94629992f9b27eee..be9311f554676c2e2fe7c5b92061d71d6dbb8942 100644 --- a/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml +++ b/.liquibase/Data_alias/basic/_demoData/generatedData/salesproject.xml @@ -14,6 +14,7 @@ <column name="STARTDATE" valueDate="2020-05-14T12:00:00"/> <column name="DATE_NEW" valueDate="2020-01-01T11:22:49"/> <column name="STATUS" value="SALPROJSTATOPEN"/> + <column name="CURRENCY" value="EUR"/> </insert> <insert tableName="salesproject"> <column name="VOLUME" valueNumeric="120000.00"/> @@ -27,6 +28,7 @@ <column name="STARTDATE" valueDate="2020-05-15T12:00:00"/> <column name="DATE_NEW" valueDate="2020-01-01T11:22:49"/> <column name="STATUS" value="SALPROJSTATOPEN"/> + <column name="CURRENCY" value="EUR"/> </insert> <insert tableName="salesproject"> <column name="VOLUME" valueNumeric="350000.00"/> @@ -40,6 +42,7 @@ <column name="STARTDATE" valueDate="2020-05-13T12:00:00"/> <column name="DATE_NEW" valueDate="2020-01-01T11:22:49"/> <column name="STATUS" value="SALPROJSTATOPEN"/> + <column name="CURRENCY" value="EUR"/> </insert> <insert tableName="salesproject"> <column name="VOLUME" valueNumeric="250000.00"/> @@ -53,6 +56,7 @@ <column name="STARTDATE" valueDate="2020-05-15T12:00:00"/> <column name="DATE_NEW" valueDate="2020-01-01T11:22:49"/> <column name="STATUS" value="SALPROJSTATOPEN"/> + <column name="CURRENCY" value="EUR"/> </insert> <insert tableName="salesproject"> <column name="PHASE" value="SALPROJPHASECONTACT"/> @@ -65,6 +69,7 @@ <column name="STARTDATE" valueDate="2020-11-24T12:00:00"/> <column name="DATE_NEW" valueDate="2020-01-01T11:22:49"/> <column name="STATUS" value="SALPROJSTATOPEN"/> + <column name="CURRENCY" value="EUR"/> </insert> <insert tableName="salesproject"> <column name="VOLUME" valueNumeric="450000.00"/> @@ -78,6 +83,7 @@ <column name="STARTDATE" valueDate="2020-02-05T12:00:00"/> <column name="DATE_NEW" valueDate="2020-01-01T11:22:49"/> <column name="STATUS" value="SALPROJSTATOPEN"/> + <column name="CURRENCY" value="EUR"/> </insert> </changeSet> </databaseChangeLog> \ No newline at end of file diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod index 82b7e21c4c0cf5e469cbe1be5a17e61a759d9265..c2b79be597e2a13c90fa3ac33d193f80d5c4d437 100644 --- a/aliasDefinition/Data_alias/Data_alias.aod +++ b/aliasDefinition/Data_alias/Data_alias.aod @@ -50,7 +50,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -150,8 +150,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -164,8 +164,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -205,7 +205,7 @@ <name>PICTURE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-4" /> + <columnType v="2004" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -445,8 +445,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -473,8 +473,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -720,8 +720,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -748,8 +748,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -775,7 +775,7 @@ <name>PICTURE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-4" /> + <columnType v="2004" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -1274,8 +1274,8 @@ <name>ISSTANDARD</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -1315,8 +1315,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -1329,8 +1329,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -1391,8 +1391,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -1451,8 +1451,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -1551,8 +1551,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -1570,7 +1570,7 @@ <name>REMARK</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -1691,7 +1691,7 @@ <columnType v="12" /> <size v="100" /> <scale v="0" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="true" /> <index v="true" /> <title>Product number</title> @@ -1807,8 +1807,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -1835,8 +1835,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -1862,7 +1862,7 @@ <name>PICTURE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-4" /> + <columnType v="2004" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -1910,8 +1910,8 @@ <name>OPTIONAL</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -1930,8 +1930,8 @@ <name>TAKEPRICE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -1977,7 +1977,7 @@ <name>QUANTITY</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -2077,7 +2077,7 @@ <name>PRICE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -2097,7 +2097,7 @@ <name>VAT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -2190,8 +2190,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -2209,7 +2209,7 @@ <name>FROMQUANTITY</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -2262,8 +2262,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -2367,7 +2367,7 @@ <name>QUANTITY</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -2388,8 +2388,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -2434,8 +2434,8 @@ <name>IN_OUT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -2612,7 +2612,7 @@ <name>FLAG</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-4" /> + <columnType v="2004" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -2673,7 +2673,7 @@ <name>VAT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -2699,8 +2699,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -2833,7 +2833,7 @@ <name>NET</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -2858,7 +2858,7 @@ <name>HEADER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -2920,7 +2920,7 @@ <name>ADDRESS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -2993,7 +2993,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -3015,8 +3015,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -3043,8 +3043,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -3098,7 +3098,7 @@ <name>FOOTER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -3140,7 +3140,7 @@ <name>DISCOUNT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -3154,7 +3154,7 @@ <name>DISCOUNTED_NET</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -3168,7 +3168,7 @@ <name>DISCOUNTED_VAT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -3255,7 +3255,7 @@ <name>PRICE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -3275,7 +3275,7 @@ <name>QUANTITY</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -3295,7 +3295,7 @@ <name>VAT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -3387,7 +3387,7 @@ <name>DISCOUNT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -3427,8 +3427,8 @@ <name>OPTIONAL</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -3502,7 +3502,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="true" /> + <index v="false" /> <title>Assigned to</title> <description></description> <customProperties> @@ -3537,7 +3537,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -3579,8 +3579,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -3598,7 +3598,7 @@ <name>VOLUME</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -3618,7 +3618,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -3639,8 +3639,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -3847,7 +3847,35 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> + <size v="29" /> + <scale v="9" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>CURRENCY</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" /> @@ -3856,6 +3884,20 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>VOLUMEFOREIGNCURRENCY</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="2" /> + <size v="14" /> + <scale v="2" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> @@ -3943,7 +3985,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -4000,8 +4042,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -4081,8 +4123,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="true" /> @@ -4101,7 +4143,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -4210,8 +4252,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -4238,8 +4280,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -4265,8 +4307,8 @@ <name>RESPONSIBLE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="1" /> - <size v="36" /> + <columnType v="12" /> + <size v="50" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -4336,7 +4378,7 @@ <name>VAT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -4357,7 +4399,7 @@ <name>FOOTER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -4378,7 +4420,7 @@ <name>HEADER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -4421,8 +4463,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -4495,7 +4537,7 @@ <name>NET</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -4610,7 +4652,7 @@ <name>NOTICE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -4632,8 +4674,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -4652,8 +4694,8 @@ <name>CANCELLATION</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -4679,8 +4721,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -4699,7 +4741,7 @@ <name>DUNNINGTEXT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -4747,8 +4789,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -4845,7 +4887,7 @@ <name>PAYMENTADDRESS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -4913,7 +4955,7 @@ <name>DELIVERYADDRESS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -4934,8 +4976,8 @@ <name>ORDERSTATUS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -4974,7 +5016,7 @@ <name>DISCOUNTED_VAT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -4988,7 +5030,7 @@ <name>DISCOUNT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -5002,7 +5044,7 @@ <name>DISCOUNTED_NET</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -5061,7 +5103,7 @@ <name>PRICE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -5082,7 +5124,7 @@ <name>QUANTITY</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -5103,7 +5145,7 @@ <name>VAT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -5156,7 +5198,7 @@ <name>DISCOUNT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -5283,7 +5325,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="true" /> + <index v="false" /> <documentation></documentation> <title>Assigned to</title> <description></description> @@ -5334,7 +5376,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -5402,8 +5444,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -5495,7 +5537,7 @@ <name>DESCRIPTION</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -5597,8 +5639,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -5828,7 +5870,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -6043,8 +6085,8 @@ <name>ATTRIBUTE_ACTIVE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -6127,7 +6169,7 @@ <name>ATTRIBUTE_INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -6218,8 +6260,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="true" /> @@ -6238,7 +6280,7 @@ <name>NUMBER_VALUE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -6358,8 +6400,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -6386,8 +6428,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -6538,8 +6580,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -6552,8 +6594,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -6612,8 +6654,8 @@ <name>ISESSENTIAL</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -6717,8 +6759,8 @@ <name>ISACTIVE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -6842,8 +6884,8 @@ <name>ISACTIVE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -7033,8 +7075,8 @@ <name>BOOL_VALUE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -7068,7 +7110,7 @@ <name>NUMBER_VALUE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -7131,7 +7173,7 @@ <name>LONG_CHAR_VALUE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -7713,8 +7755,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -8005,8 +8047,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -8025,7 +8067,7 @@ <name>LOCKED</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-7" /> + <columnType v="16" /> <size v="1" /> <scale v="0" /> <notNull v="true" /> @@ -8114,7 +8156,7 @@ <name>DESCRIPTION</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -8199,8 +8241,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="true" /> @@ -8247,8 +8289,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -8296,8 +8338,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -8428,8 +8470,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -8463,8 +8505,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -8560,8 +8602,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -8616,8 +8658,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -8733,8 +8775,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -8761,8 +8803,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -8851,8 +8893,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -8900,8 +8942,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -9012,8 +9054,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -9054,8 +9096,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -9123,8 +9165,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -9242,8 +9284,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -9381,8 +9423,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -9416,8 +9458,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -9555,8 +9597,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -9597,8 +9639,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -9624,7 +9666,7 @@ <name>NET</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -9736,7 +9778,7 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="12" /> - <size v="63" /> + <size v="36" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -9749,7 +9791,7 @@ <name>FILTER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -9777,8 +9819,8 @@ <name>OUTDATED</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -9926,7 +9968,7 @@ <columnType v="1" /> <size v="36" /> <scale v="0" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="true" /> <documentation></documentation> @@ -9937,7 +9979,7 @@ <name>SCOREPOINTS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -10027,9 +10069,9 @@ <name>SCOREPERCENT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="4" /> + <columnType v="2" /> <size v="10" /> - <scale v="0" /> + <scale v="2" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -10041,8 +10083,8 @@ <name>FIELDVALUE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> - <size v="2147483647" /> + <columnType v="12" /> + <size v="1000" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -10055,8 +10097,8 @@ <name>INDICATORTEXT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> - <size v="2147483647" /> + <columnType v="12" /> + <size v="100" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -10069,8 +10111,8 @@ <name>INDICATORINTEGER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> - <size v="2147483647" /> + <columnType v="12" /> + <size v="100" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -10083,8 +10125,8 @@ <name>INDICATORNUMBER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="2005" /> - <size v="2147483647" /> + <columnType v="12" /> + <size v="100" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -10185,9 +10227,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" /> @@ -10207,8 +10249,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -10220,7 +10262,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -10348,6 +10390,20 @@ </customBooleanProperty> </customProperties> </entityFieldDb> + <entityFieldDb> + <name>VOLUMEFOREIGNCURRENCY</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="2" /> + <size v="14" /> + <scale v="2" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> @@ -10375,7 +10431,7 @@ <columnType v="1" /> <size v="36" /> <scale v="0" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="true" /> <documentation></documentation> @@ -10449,7 +10505,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -10477,7 +10533,7 @@ <name>REASON</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -10492,8 +10548,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -10554,8 +10610,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -10760,8 +10816,8 @@ <name>CREATEACTIVITIES</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -10802,8 +10858,8 @@ <name>USE_TEMPLATE_ATTACHMENTS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -10817,8 +10873,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -10961,8 +11017,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -11002,8 +11058,8 @@ <name>IS_TEST_RECIPIENT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -11120,8 +11176,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -11134,8 +11190,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -11183,8 +11239,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -11334,7 +11390,7 @@ <name>DESCRIPTION</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -11396,7 +11452,7 @@ <name>MAIL</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -11411,8 +11467,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -11453,8 +11509,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -11494,7 +11550,7 @@ <name>RECIPIENTS</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -11523,8 +11579,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="true" /> @@ -11598,8 +11654,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -11640,8 +11696,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -12020,7 +12076,7 @@ <columnType v="1" /> <size v="36" /> <scale v="0" /> - <notNull v="false" /> + <notNull v="true" /> <isUnique v="false" /> <index v="true" /> <documentation></documentation> @@ -12073,8 +12129,8 @@ <name>ONSITE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -12136,8 +12192,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -12149,7 +12205,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -12205,8 +12261,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -12233,8 +12289,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -12330,7 +12386,7 @@ <name>SCAN_PATTERN</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -12469,8 +12525,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -12525,8 +12581,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -12790,8 +12846,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -13118,8 +13174,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -13244,8 +13300,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -13272,8 +13328,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -13348,8 +13404,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -13390,8 +13446,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -13833,8 +13889,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -13889,8 +13945,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -14173,8 +14229,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -14201,8 +14257,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -14305,8 +14361,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -14374,7 +14430,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -14506,7 +14562,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -14569,7 +14625,7 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="92" /> - <size v="10" /> + <size v="8" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -14583,7 +14639,7 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="92" /> - <size v="10" /> + <size v="8" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -14860,8 +14916,8 @@ <name>OUTDATED</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -14971,8 +15027,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -14999,8 +15055,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -15131,8 +15187,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15173,8 +15229,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15256,7 +15312,7 @@ <name>DISTRICT_FILTER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -15319,8 +15375,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15375,8 +15431,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15444,9 +15500,9 @@ <name>VALID_FROM</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="12" /> - <size v="36" /> - <scale v="0" /> + <columnType v="93" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15458,9 +15514,9 @@ <name>VALID_UNTIL</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="12" /> - <size v="36" /> - <scale v="0" /> + <columnType v="93" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15627,8 +15683,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15641,8 +15697,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15655,8 +15711,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15683,8 +15739,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15758,7 +15814,7 @@ <name>DISCUSSIONTEXT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -15773,8 +15829,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15829,8 +15885,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15905,8 +15961,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -15933,8 +15989,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16023,8 +16079,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16099,7 +16155,7 @@ <name>CONTENTDECODED</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -16134,7 +16190,7 @@ <name>CONTENT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -16156,8 +16212,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16301,8 +16357,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16343,8 +16399,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16509,8 +16565,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16523,8 +16579,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16599,8 +16655,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16641,8 +16697,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -16882,8 +16938,8 @@ <name>IS_ARCHIVED</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -16971,7 +17027,7 @@ <name>OBJECT_FILTER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -16985,8 +17041,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17075,8 +17131,8 @@ <name>TRIGGEREVENTDELETE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -17088,8 +17144,8 @@ <name>TRIGGEREVENTINSERT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -17101,8 +17157,8 @@ <name>TRIGGEREVENTUPDATE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -17115,8 +17171,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17153,7 +17209,7 @@ <name>OBJECT_FIELD</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -17212,8 +17268,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17238,8 +17294,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17349,8 +17405,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17375,8 +17431,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17413,8 +17469,8 @@ <name>AUTO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -17460,8 +17516,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17473,8 +17529,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17557,8 +17613,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17583,8 +17639,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17648,8 +17704,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17772,8 +17828,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17803,7 +17859,7 @@ <size v="36" /> <scale v="0" /> <notNull v="false" /> - <isUnique v="true" /> + <isUnique v="false" /> <index v="true" /> <documentation></documentation> <title></title> @@ -17842,8 +17898,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17870,8 +17926,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17918,8 +17974,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -17946,8 +18002,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18043,8 +18099,8 @@ <name>ISREDIRECT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -18106,8 +18162,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18134,8 +18190,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18223,7 +18279,7 @@ <name>ERRORMESSAGE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -18336,8 +18392,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18440,8 +18496,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18468,8 +18524,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18668,8 +18724,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18682,8 +18738,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="false" /> @@ -18758,8 +18814,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -18800,8 +18856,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="true" /> <isUnique v="false" /> <index v="true" /> @@ -19083,8 +19139,8 @@ <name>IS_DEFAULT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> @@ -19216,8 +19272,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -19263,7 +19319,7 @@ <name>MONTH_FACTOR</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="5" /> <scale v="2" /> <notNull v="false" /> @@ -19311,7 +19367,7 @@ <name>FILTER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -19326,8 +19382,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -19354,8 +19410,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -19477,8 +19533,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -19579,8 +19635,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -19900,7 +19956,7 @@ <name>PERSINFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -20265,8 +20321,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20306,7 +20362,7 @@ <name>ORGINFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -20349,8 +20405,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20425,7 +20481,7 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="2004" /> - <size v="65535" /> + <size v="2147483647" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -20439,7 +20495,7 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="2004" /> - <size v="65535" /> + <size v="2147483647" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -20519,7 +20575,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -20533,7 +20589,7 @@ <scale v="0" /> <notNull v="false" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -20561,7 +20617,7 @@ <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -20599,8 +20655,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20613,8 +20669,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20674,7 +20730,7 @@ <name>PRICE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -20689,8 +20745,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20702,7 +20758,7 @@ <name>QUANTITY</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -20716,7 +20772,7 @@ <name>INFO</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -20744,8 +20800,8 @@ <name>FREE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -20786,7 +20842,7 @@ <name>TARGETAMOUNT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -20829,8 +20885,8 @@ <dbName></dbName> <primaryKey v="false" /> <columnType v="93" /> - <size v="19" /> - <scale v="0" /> + <size v="29" /> + <scale v="9" /> <notNull v="false" /> <isUnique v="false" /> <index v="false" /> @@ -20856,7 +20912,7 @@ <name>ACTUALAMOUNT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="3" /> + <columnType v="2" /> <size v="14" /> <scale v="2" /> <notNull v="false" /> @@ -20870,8 +20926,8 @@ <name>SENT</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -20889,7 +20945,7 @@ <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> - <index v="false" /> + <index v="true" /> <documentation></documentation> <title></title> <description></description> @@ -20918,7 +20974,7 @@ <name>FILTER</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-1" /> + <columnType v="2005" /> <size v="2147483647" /> <scale v="0" /> <notNull v="false" /> @@ -21002,8 +21058,8 @@ <name>ISACTIVE</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -21030,8 +21086,8 @@ <name>ISFALLTHROUGH</name> <dbName></dbName> <primaryKey v="false" /> - <columnType v="-6" /> - <size v="3" /> + <columnType v="5" /> + <size v="5" /> <scale v="0" /> <notNull v="true" /> <isUnique v="false" /> @@ -21040,6 +21096,180 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>WORKFLOWSIGNAL_NAME</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="250" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>ACTION_TYPE</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> + <name>CURRENCYRATE</name> + <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>DATE_EDIT</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>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> + <entityFieldDb> + <name>USER_EDIT</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> </entityFields> </entityDb> </entities> diff --git a/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod b/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod index 5b08bfa758bd3d89880949aedb36d889fdd00d1b..3e8a0541c9016e844b22df168fc8a6062343ff5c 100644 --- a/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod +++ b/aliasDefinition/Data_alias_noAudit/Data_alias_noAudit.aod @@ -299,6 +299,20 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>AUTOPROBABILITY</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="3" /> + <size v="6" /> + <scale v="2" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> @@ -13709,6 +13723,34 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>DONEDATE</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>DONEUSER</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="63" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> </entityFields> </entityDb> <entityDb> @@ -16975,166 +17017,6 @@ </entityFieldDb> </entityFields> </entityDb> - <entityDb> - <name>COMMUNICATIONBLACKLIST</name> - <dbName></dbName> - <idColumn>COMMUNICATIONBLACKLISTID</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>BLACKLIST_FILTER</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="2005" /> - <size v="2147483647" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>DATE_EDIT</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>END_DATE</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>START_DATE</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>DATE_NEW</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="93" /> - <size v="29" /> - <scale v="9" /> - <notNull v="true" /> - <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="true" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>COMMUNICATIONBLACKLISTID</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>REASON</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="500" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - <entityFieldDb> - <name>USER_EDIT</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>BLACKLIST_TYPE</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="12" /> - <size v="36" /> - <scale v="0" /> - <notNull v="true" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> - </entityFields> - </entityDb> <entityDb> <name>COMMUNICATIONSETTINGS</name> <dbName></dbName> @@ -17467,6 +17349,34 @@ <title></title> <description></description> </entityFieldDb> + <entityFieldDb> + <name>WORKFLOWSIGNAL_NAME</name> + <dbName></dbName> + <primaryKey v="false" /> + <columnType v="12" /> + <size v="255" /> + <scale v="0" /> + <notNull v="false" /> + <isUnique v="false" /> + <index v="false" /> + <documentation></documentation> + <title></title> + <description></description> + </entityFieldDb> + <entityFieldDb> + <name>ACTION_TYPE</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> @@ -17601,6 +17511,152 @@ </entityFieldDb> </entityFields> </entityDb> + <entityDb> + <name>CURRENCYRATE</name> + <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>DATE_EDIT</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>RATE</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> + <entityFieldDb> + <name>USER_EDIT</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> + </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 ee0a5b93039f68e19d4786c596e783eb21d5a6d6..97777155453adafc3644fe06e1c6a5d9326b0267 100644 --- a/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod +++ b/application/_____SYSTEM_APPLICATION_NEON/_____SYSTEM_APPLICATION_NEON.aod @@ -377,6 +377,10 @@ <name>SalesprojectPhaseDefinition</name> <kind v="10077" /> </entityNode> + <entityNode> + <name>CurrencyRates</name> + <kind v="10077" /> + </entityNode> </childNodes> </entityNode> <entityNode> diff --git a/entity/CurrencyRate_entity/CurrencyRate_entity.aod b/entity/CurrencyRate_entity/CurrencyRate_entity.aod new file mode 100644 index 0000000000000000000000000000000000000000..d4119078496bb60f1e97425f33d63dea87bfbe49 --- /dev/null +++ b/entity/CurrencyRate_entity/CurrencyRate_entity.aod @@ -0,0 +1,177 @@ +<?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.21" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.21"> + <name>CurrencyRate_entity</name> + <title>Currency Rate</title> + <majorModelMode>DISTRIBUTED</majorModelMode> + <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>KeywordCurrencySource</consumer> + <groupable v="true" /> + <mandatory v="true" /> + <displayValueProcess>%aditoprj%/entity/CurrencyRate_entity/entityfields/sourcecurrencyiso/displayValueProcess.js</displayValueProcess> + </entityField> + <entityField> + <name>TARGETCURRENCYISO</name> + <title>Target Currency</title> + <consumer>KeywordCurrencyTarget</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_EDIT</name> + <title>DATE_EDIT</title> + <contentType>DATE</contentType> + <state>INVISIBLE</state> + <valueProcess>%aditoprj%/entity/CurrencyRate_entity/entityfields/date_edit/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> + <entityField> + <name>USER_EDIT</name> + <title>USER_EDIT</title> + <state>INVISIBLE</state> + <valueProcess>%aditoprj%/entity/CurrencyRate_entity/entityfields/user_edit/valueProcess.js</valueProcess> + </entityField> + <entityConsumer> + <name>KeywordCurrencySource</name> + <dependency> + <name>dependency</name> + <entityName>KeywordEntry_entity</entityName> + <fieldName>SpecificContainerKeywords</fieldName> + </dependency> + <children> + <entityParameter> + <name>ContainerName_param</name> + <valueProcess>%aditoprj%/entity/CurrencyRate_entity/entityfields/keywordcurrencysource/children/containername_param/valueProcess.js</valueProcess> + </entityParameter> + </children> + </entityConsumer> + <entityConsumer> + <name>KeywordCurrencyTarget</name> + <dependency> + <name>dependency</name> + <entityName>KeywordEntry_entity</entityName> + <fieldName>SpecificContainerKeywords</fieldName> + </dependency> + <children> + <entityParameter> + <name>ContainerName_param</name> + <valueProcess>%aditoprj%/entity/CurrencyRate_entity/entityfields/keywordcurrencytarget/children/containername_param/valueProcess.js</valueProcess> + </entityParameter> + <entityParameter> + <name>WhitelistIds_param</name> + <valueProcess>%aditoprj%/entity/CurrencyRate_entity/entityfields/keywordcurrencytarget/children/whitelistids_param/valueProcess.js</valueProcess> + </entityParameter> + </children> + </entityConsumer> + </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_EDIT.value</name> + <recordfield>CURRENCYRATE.USER_EDIT</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>DATE_EDIT.value</name> + <recordfield>CURRENCYRATE.DATE_EDIT</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/entityfields/date_edit/valueProcess.js b/entity/CurrencyRate_entity/entityfields/date_edit/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..9dbcc6c546b293a830f400b8a92d67741a2a454f --- /dev/null +++ b/entity/CurrencyRate_entity/entityfields/date_edit/valueProcess.js @@ -0,0 +1,8 @@ +import("system.neon"); +import("system.result"); +import("system.vars"); + +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) +{ + result.string(vars.get("$sys.date")); +} \ 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/keywordcurrencysource/children/containername_param/valueProcess.js b/entity/CurrencyRate_entity/entityfields/keywordcurrencysource/children/containername_param/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..4c7780fc3a92a387ce3420c577290d3fc22221a6 --- /dev/null +++ b/entity/CurrencyRate_entity/entityfields/keywordcurrencysource/children/containername_param/valueProcess.js @@ -0,0 +1,5 @@ +import("system.result"); +import("Keyword_lib"); +import("KeywordRegistry_basic"); + +result.string($KeywordRegistry.currency()); \ No newline at end of file diff --git a/entity/CurrencyRate_entity/entityfields/keywordcurrencytarget/children/containername_param/valueProcess.js b/entity/CurrencyRate_entity/entityfields/keywordcurrencytarget/children/containername_param/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..4c7780fc3a92a387ce3420c577290d3fc22221a6 --- /dev/null +++ b/entity/CurrencyRate_entity/entityfields/keywordcurrencytarget/children/containername_param/valueProcess.js @@ -0,0 +1,5 @@ +import("system.result"); +import("Keyword_lib"); +import("KeywordRegistry_basic"); + +result.string($KeywordRegistry.currency()); \ No newline at end of file diff --git a/entity/CurrencyRate_entity/entityfields/keywordcurrencytarget/children/whitelistids_param/valueProcess.js b/entity/CurrencyRate_entity/entityfields/keywordcurrencytarget/children/whitelistids_param/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..c507a262ebeba2a6e47d86893032343ec00587ca --- /dev/null +++ b/entity/CurrencyRate_entity/entityfields/keywordcurrencytarget/children/whitelistids_param/valueProcess.js @@ -0,0 +1,4 @@ +import("KeywordRegistry_basic"); +import("system.result"); + +result.string(JSON.stringify([$KeywordRegistry.currency$eur()])); \ 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..22486d9d492aed2284a856fd906ee6d21dc4be2e --- /dev/null +++ b/entity/CurrencyRate_entity/entityfields/sourcecurrencyiso/displayValueProcess.js @@ -0,0 +1,6 @@ +import("system.vars"); +import("KeywordRegistry_basic"); +import("Keyword_lib"); +import("system.result"); + +result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$field.SOURCECURRENCYISO"))); \ 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..f8fe9e0fe9d1434e595a11141b8835c282885ac5 --- /dev/null +++ b/entity/CurrencyRate_entity/entityfields/targetcurrencyiso/displayValueProcess.js @@ -0,0 +1,6 @@ +import("system.vars"); +import("KeywordRegistry_basic"); +import("Keyword_lib"); +import("system.result"); + +result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$field.TARGETCURRENCYISO"))); \ 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..f3bac57861f74d693fb9fad44d843204f84313fb --- /dev/null +++ b/entity/CurrencyRate_entity/entityfields/targetcurrencyiso/valueProcess.js @@ -0,0 +1,9 @@ +import("KeywordRegistry_basic"); +import("system.result"); +import("system.neon"); +import("system.vars"); + +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value")) +{ + result.string($KeywordRegistry.currency$eur()); +} \ No newline at end of file diff --git a/entity/CurrencyRate_entity/entityfields/user_edit/valueProcess.js b/entity/CurrencyRate_entity/entityfields/user_edit/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..97a672156e0d8dd1eb661114f7e51a9565140421 --- /dev/null +++ b/entity/CurrencyRate_entity/entityfields/user_edit/valueProcess.js @@ -0,0 +1,9 @@ +import("system.result"); +import("system.vars"); +import("system.neon"); + + +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) +{ + result.string(vars.get("$sys.user")); +} \ 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..747cb6a2dfae0facd07134a3a70b07ff544463fa --- /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..bcf59560b7d826aa2a3cd36930e6db6652fdbebe --- /dev/null +++ b/entity/CurrencyRate_entity/recordcontainers/db/recordfieldmappings/sourcecurrencyiso.displayvalue/expression.js @@ -0,0 +1,6 @@ +import("system.result"); +import("Keyword_lib"); +import("KeywordRegistry_basic"); + +var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.currency(), "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..e4aa397665e53e708ac8aa36488d8d86b2d0c994 --- /dev/null +++ b/entity/CurrencyRate_entity/recordcontainers/db/recordfieldmappings/targetcurrencyiso.displayvalue/expression.js @@ -0,0 +1,6 @@ +import("system.result"); +import("Keyword_lib"); +import("KeywordRegistry_basic"); + +var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.currency(), "CURRENCYRATE.TARGETCURRENCYISO"); +result.string(sql); \ No newline at end of file diff --git a/entity/Forecast_entity/Forecast_entity.aod b/entity/Forecast_entity/Forecast_entity.aod index c5ca5ac38a15ff8769588eaae98adf074dc28e9e..2fd439e67aaca76d939f57ddd9bd8aa4a49aaca0 100644 --- a/entity/Forecast_entity/Forecast_entity.aod +++ b/entity/Forecast_entity/Forecast_entity.aod @@ -52,6 +52,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> @@ -122,6 +124,22 @@ <name>KIND</name> <valueProcess>%aditoprj%/entity/Forecast_entity/entityfields/kind/valueProcess.js</valueProcess> </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> @@ -176,6 +194,10 @@ <name>KIND.value</name> <recordfield>FORECAST.KIND</recordfield> </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>VOLUMEFOREIGNCURRENCY.value</name> + <recordfield>FORECAST.VOLUMEFOREIGNCURRENCY</recordfield> + </dbRecordFieldMapping> </recordFieldMappings> <linkInformation> <linkInformation> 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..e246351e4e98ff87b6675c09a10316bef4759fd3 --- /dev/null +++ b/entity/Forecast_entity/entityfields/volume/mandatoryProcess.js @@ -0,0 +1,14 @@ +import("system.result"); +import("KeywordRegistry_basic"); +import("system.vars"); + +var currencyParam = JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param")); +var currency = currencyParam["currency"]; +var mandatory = true; + +if(currency != $KeywordRegistry.currency$eur()) +{ + mandatory = false; +} + +result.string(mandatory); \ 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..283ac345711a331a81cb4a7caafb6daeb446b390 --- /dev/null +++ b/entity/Forecast_entity/entityfields/volume/stateProcess.js @@ -0,0 +1,15 @@ +import("system.result"); +import("system.neon"); +import("KeywordRegistry_basic"); +import("system.vars"); + +var currencyParam = JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param")); +var currency = currencyParam["currency"]; +var state = neon.COMPONENTSTATE_EDITABLE; + +if(currency != $KeywordRegistry.currency$eur()) +{ + state = neon.COMPONENTSTATE_READONLY; +} + +result.string(state); \ 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..7511cb850f75ff4d9a2b0fc7cfb7a24fb35b71aa 100644 --- a/entity/Forecast_entity/entityfields/volume/titleProcess.js +++ b/entity/Forecast_entity/entityfields/volume/titleProcess.js @@ -1,4 +1,4 @@ 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("Euro") + ")"); \ 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..a20b1c70dce5e011052994c670470f2b9b3b9ca2 --- /dev/null +++ b/entity/Forecast_entity/entityfields/volumeforeigncurrency/mandatoryProcess.js @@ -0,0 +1,14 @@ +import("system.result"); +import("KeywordRegistry_basic"); +import("system.vars"); + +var currencyParam = JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param")); +var currency = currencyParam["currency"]; +var mandatory = false; + +if(currency != $KeywordRegistry.currency$eur()) +{ + mandatory = true; +} + +result.string(mandatory); \ 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..71b465c9c0da524eafe4ba45d02974b59d435952 --- /dev/null +++ b/entity/Forecast_entity/entityfields/volumeforeigncurrency/onValueChange.js @@ -0,0 +1,14 @@ +import("KeywordRegistry_basic"); +import("system.neon"); +import("Currency_lib"); +import("system.vars"); + +var currencyParam = JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param")); +var currencyIso = currencyParam["currency"]; +var fieldsWithValues = {}; +if(currencyIso) +{ + var currencyRate = currencyParam["currencyRate"]; + var foreignCurrencyValue = vars.get("$this.value"); + neon.setFieldValue("$field.VOLUME", (foreignCurrencyValue*currencyRate).toFixed(2)); +} \ 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..9bd3eec7b3074292ce87a041c8c8eaa711debda8 --- /dev/null +++ b/entity/Forecast_entity/entityfields/volumeforeigncurrency/stateProcess.js @@ -0,0 +1,15 @@ +import("system.result"); +import("system.neon"); +import("KeywordRegistry_basic"); +import("system.vars"); + +var currencyParam = JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param")); +var currency = currencyParam["currency"]; +var state = neon.COMPONENTSTATE_INVISIBLE; + +if(currency != $KeywordRegistry.currency$eur()) +{ + state = neon.COMPONENTSTATE_EDITABLE; +} + +result.string(state); \ 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..828b3b2e4bd5e1b5314277395a0146f567a7f9e5 --- /dev/null +++ b/entity/Forecast_entity/entityfields/volumeforeigncurrency/titleProcess.js @@ -0,0 +1,9 @@ +import("KeywordRegistry_basic"); +import("Keyword_lib"); +import("system.vars"); +import("system.result"); +import("system.translate"); + +var currencyParam = JSON.parse(vars.get("$param.CurrencyAndCurrencyRate_param")); +var currency = KeywordUtils.getViewValue($KeywordRegistry.currency(), currencyParam["currency"]); +result.string(translate.text("${VOLUME_MONEY}") + " (" + currency + ")"); \ No newline at end of file diff --git a/entity/Offer_entity/entityfields/currency/stateProcess.js b/entity/Offer_entity/entityfields/currency/stateProcess.js index b6e87e7004a152baaecbc7d1c4fb3b44affc09ad..fdbf74eea1ca99967f6cc8d3ecdee9b4ba62ea2a 100644 --- a/entity/Offer_entity/entityfields/currency/stateProcess.js +++ b/entity/Offer_entity/entityfields/currency/stateProcess.js @@ -4,16 +4,20 @@ import("system.neon"); import("Offer_lib"); import("system.entities"); -var loadConfig = entities.createConfigForLoadingRows() - .entity("Offeritem_entity") - .addParameter("OfferId_param", vars.get("$field.OFFERID")); -var offerItemCount = entities.getRowCount(loadConfig); -if(offerItemCount > 0) +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT) { - result.string(neon.COMPONENTSTATE_DISABLED); -} -else -{ - result.string(OfferUtils.isEditable(vars.get("$field.STATUS")) ? neon.COMPONENTSTATE_AUTO : neon.COMPONENTSTATE_DISABLED); -} + var loadConfig = entities.createConfigForLoadingRows() + .entity("Offeritem_entity") + .addParameter("OfferId_param", vars.get("$field.OFFERID")); + var offerItemCount = entities.getRowCount(loadConfig); + + if(offerItemCount > 0) + { + result.string(neon.COMPONENTSTATE_DISABLED); + } + else + { + result.string(OfferUtils.isEditable(vars.get("$field.STATUS")) ? neon.COMPONENTSTATE_AUTO : neon.COMPONENTSTATE_DISABLED); + } +} \ No newline at end of file diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod index 6ed29045095d9f06f042d66f43da31888a7defa5..5a45d1d5b1b258f140fe294a62659b19cb183437 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>MSTTeamLink_entity</element> + <element>Forecast_entity</element> </siblings> <grantDeleteProcess>%aditoprj%/entity/Salesproject_entity/grantDeleteProcess.js</grantDeleteProcess> <contentTitleProcess>%aditoprj%/entity/Salesproject_entity/contentTitleProcess.js</contentTitleProcess> @@ -111,12 +112,13 @@ </entityField> <entityField> <name>VOLUME</name> - <title>Volume(€)</title> + <title>Volume (Euro)</title> <description></description> <contentType>NUMBER</contentType> <outputFormat>#,##0.00</outputFormat> <inputFormat>#,##0.00</inputFormat> <groupable v="true" /> + <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volume/stateProcess.js</stateProcess> </entityField> <entityConsumer> <name>Organisations</name> @@ -182,6 +184,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> @@ -859,6 +865,52 @@ <name>IgnoreChecklists_param</name> <expose v="true" /> </entityParameter> + <entityField> + <name>CURRENCY</name> + <title>Currency</title> + <consumer>KeywordCurrency</consumer> + <mandatory v="true" /> + <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/currency/stateProcess.js</stateProcess> + <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/currency/valueProcess.js</valueProcess> + <displayValueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/currency/displayValueProcess.js</displayValueProcess> + <onValueChange>%aditoprj%/entity/Salesproject_entity/entityfields/currency/onValueChange.js</onValueChange> + </entityField> + <entityField> + <name>CURRENCYRATE</name> + <title>Currency Rate</title> + <state>INVISIBLE</state> + </entityField> + <entityConsumer> + <name>KeywordCurrency</name> + <dependency> + <name>dependency</name> + <entityName>KeywordEntry_entity</entityName> + <fieldName>SpecificContainerKeywords</fieldName> + </dependency> + <children> + <entityParameter> + <name>ContainerName_param</name> + <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/keywordcurrency/children/containername_param/valueProcess.js</valueProcess> + </entityParameter> + </children> + </entityConsumer> + <entityField> + <name>VOLUMEFOREIGNCURRENCY</name> + <contentType>NUMBER</contentType> + <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volumeforeigncurrency/stateProcess.js</stateProcess> + <titleProcess>%aditoprj%/entity/Salesproject_entity/entityfields/volumeforeigncurrency/titleProcess.js</titleProcess> + <onValueChange>%aditoprj%/entity/Salesproject_entity/entityfields/volumeforeigncurrency/onValueChange.js</onValueChange> + <onValueChangeTypes> + <element>MASK</element> + </onValueChangeTypes> + </entityField> + <entityActionField> + <name>refreshEuroValues</name> + <title>Refresh Euro Values</title> + <onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/refresheurovalues/onActionProcess.js</onActionProcess> + <iconId>NEON:RECURRING_APPOINTMENT</iconId> + <stateProcess>%aditoprj%/entity/Salesproject_entity/entityfields/refresheurovalues/stateProcess.js</stateProcess> + </entityActionField> </entityFields> <recordContainers> <dbRecordContainer> @@ -1003,6 +1055,25 @@ <recordfield>SALESPROJECT.PROBABILITY</recordfield> <aggregateType>AVG</aggregateType> </aggregateFieldDbMapping> + <dbRecordFieldMapping> + <name>CURRENCY.value</name> + <recordfield>SALESPROJECT.CURRENCY</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>CURRENCYRATE.value</name> + <recordfield>SALESPROJECT.CURRENCYRATE</recordfield> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>CURRENCY.displayValue</name> + <expression>%aditoprj%/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>VOLUME.displayValue</name> + </dbRecordFieldMapping> + <dbRecordFieldMapping> + <name>VOLUMEFOREIGNCURRENCY.value</name> + <recordfield>SALESPROJECT.VOLUMEFOREIGNCURRENCY</recordfield> + </dbRecordFieldMapping> </recordFieldMappings> <linkInformation> <linkInformation> diff --git a/entity/Salesproject_entity/entityfields/currency/displayValueProcess.js b/entity/Salesproject_entity/entityfields/currency/displayValueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..0e15edb3b55890fdbd058321697741bb8b0a5e1b --- /dev/null +++ b/entity/Salesproject_entity/entityfields/currency/displayValueProcess.js @@ -0,0 +1,6 @@ +import("system.vars"); +import("KeywordRegistry_basic"); +import("Keyword_lib"); +import("system.result"); + +result.string(KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$field.CURRENCY"))); \ No newline at end of file diff --git a/entity/Salesproject_entity/entityfields/currency/onValueChange.js b/entity/Salesproject_entity/entityfields/currency/onValueChange.js new file mode 100644 index 0000000000000000000000000000000000000000..04df06b0289afd482f856cc2da4cbc20ee46a9ac --- /dev/null +++ b/entity/Salesproject_entity/entityfields/currency/onValueChange.js @@ -0,0 +1,30 @@ +import("KeywordRegistry_basic"); +import("system.neon"); +import("Currency_lib"); +import("system.vars"); + +var currencyIso = vars.get("$this.value"); +var fieldsWithValues = {}; +if(currencyIso) +{ + var currencyRate = CurrencyUtils.getCurrencyRate(currencyIso, $KeywordRegistry.currency$eur()) + + fieldsWithValues["$field.CURRENCYRATE"] = currencyRate; + + var euroValue = vars.get("$field.VOLUME"); + var foreignCurrencyValue = vars.get("$field.VOLUMEFOREIGNCURRENCY"); + + if(euroValue) + { + if(currencyIso == $KeywordRegistry.currency$eur()) + { + fieldsWithValues["$field.VOLUMEFOREIGNCURRENCY"] = ""; + } + else + { + fieldsWithValues["$field.VOLUMEFOREIGNCURRENCY"] = (euroValue/currencyRate).toFixed(2); + } + } + + neon.setFieldValues(fieldsWithValues); +} \ No newline at end of file diff --git a/entity/Salesproject_entity/entityfields/currency/stateProcess.js b/entity/Salesproject_entity/entityfields/currency/stateProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..c57db8d962057f1fc0b921e131cf91dedd8ff6f6 --- /dev/null +++ b/entity/Salesproject_entity/entityfields/currency/stateProcess.js @@ -0,0 +1,25 @@ +import("Sql_lib"); +import("system.result"); +import("system.neon"); +import("KeywordRegistry_basic"); +import("Currency_lib"); +import("system.vars"); + +var currency = vars.get("$field.CURRENCY"); +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/currency/valueProcess.js b/entity/Salesproject_entity/entityfields/currency/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..f3bac57861f74d693fb9fad44d843204f84313fb --- /dev/null +++ b/entity/Salesproject_entity/entityfields/currency/valueProcess.js @@ -0,0 +1,9 @@ +import("KeywordRegistry_basic"); +import("system.result"); +import("system.neon"); +import("system.vars"); + +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && !vars.get("$this.value")) +{ + result.string($KeywordRegistry.currency$eur()); +} \ 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..a10a349bafa59d0f9091aa07c447841443be8b58 --- /dev/null +++ b/entity/Salesproject_entity/entityfields/forecasts/children/currencyandcurrencyrate_param/valueProcess.js @@ -0,0 +1,8 @@ +import("system.result"); +import("system.vars"); + +var res = { + currency: vars.get("$field.CURRENCY") + ,currencyRate: vars.get("$field.CURRENCYRATE") +} +result.string(JSON.stringify(res)); \ No newline at end of file diff --git a/entity/Salesproject_entity/entityfields/keywordcurrency/children/containername_param/valueProcess.js b/entity/Salesproject_entity/entityfields/keywordcurrency/children/containername_param/valueProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..4c7780fc3a92a387ce3420c577290d3fc22221a6 --- /dev/null +++ b/entity/Salesproject_entity/entityfields/keywordcurrency/children/containername_param/valueProcess.js @@ -0,0 +1,5 @@ +import("system.result"); +import("Keyword_lib"); +import("KeywordRegistry_basic"); + +result.string($KeywordRegistry.currency()); \ No newline at end of file diff --git a/entity/Salesproject_entity/entityfields/refresheurovalues/onActionProcess.js b/entity/Salesproject_entity/entityfields/refresheurovalues/onActionProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..2c3fcadb4230b5b143f883b9f6625c389b3d3bd5 --- /dev/null +++ b/entity/Salesproject_entity/entityfields/refresheurovalues/onActionProcess.js @@ -0,0 +1,77 @@ +import("system.util"); +import("system.translate"); +import("Employee_lib"); +import("system.notification"); +import("system.neon"); +import("system.db"); +import("Sql_lib"); +import("system.result"); +import("KeywordRegistry_basic"); +import("Currency_lib"); +import("system.vars"); + +var currency = vars.get("$field.CURRENCY"); +var rate = vars.get("$field.CURRENCYRATE"); +var newRate = CurrencyUtils.getCurrencyRate(currency, $KeywordRegistry.currency$eur()); +var salesproject = vars.get("$field.PROJECTTITLE"); + +var notificationConfig = notification.createConfig() + .addUserWithId(EmployeeUtils.getCurrentUserId()) + .forcedPriority(notification.PRIO_NONE) + .notificationType("_____SYSTEM_NOTIFICATION_MESSAGE") + .initialState(notification.STATE_UNSEEN) + .daysToLive(1) + .caption(translate.text("Refresh Euro Values") + ": " + salesproject); + +var notificationText = translate.text("Values have not been updated, because the stored rate is already up to date"); +if(rate != newRate) +{ + notificationText = "Euro Values updated using the current rate:" + " " + rate + "->" + newRate; + var projectVolumeForeignCurrency = vars.get("$field.VOLUMEFOREIGNCURRENCY"); + var statements = []; + if(projectVolumeForeignCurrency) + { + //update volume of the salesproject + statements.push(newWhere("SALESPROJECT.SALESPROJECTID", vars.get("$field.SALESPROJECTID")) + .buildUpdateStatement({"VOLUME": (projectVolumeForeignCurrency*newRate).toFixed(2)} + , "SALESPROJECT")); + } + var salesprojectId = vars.get("$field.SALESPROJECTID"); + var forecastValues = newSelect("FORECAST.FORECASTID, FORECAST.VOLUMEFOREIGNCURRENCY") + .from("FORECAST") + .where("FORECAST.OBJECT_ROWID", salesprojectId) + .table(); + for (var i = 0; i < forecastValues.length; i++) + { + var forecastId, volumeForeignCurrency; + [forecastId, volumeForeignCurrency] = forecastValues[i]; + + statements.push(["FORECAST", ["VOLUME"], null, [(volumeForeignCurrency*newRate).toFixed(2)], + newWhere("FORECAST.FORECASTID", forecastId).build()]); + } + db.execute(statements);//update volumes of forecasts + + //insert into AB_LOGHISTORY + var userName = EmployeeUtils.getCurrentUserName(); + + db.insertData("AB_LOGHISTORY", ["USER_NEW" + , "DATE_NEW" + , "DESCRIPTION" + , "LOGTYPE" + , "TABLENAME" + , "TABLENAMEID" + , "AB_LOGHISTORYID"], null, [userName + , vars.get("$sys.date") + , notificationText + , "I" + , "SALESPROJECT" + , salesprojectId + , util.getNewUUID() + ], db.getCurrentAlias()); +} + +notificationConfig.description(notificationText); + +notification.addNotificationWith(notificationConfig); + +neon.refreshAll(); \ No newline at end of file diff --git a/entity/Salesproject_entity/entityfields/refresheurovalues/stateProcess.js b/entity/Salesproject_entity/entityfields/refresheurovalues/stateProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..92d638c89d8b75002e36bd9fa1a53e004f921524 --- /dev/null +++ b/entity/Salesproject_entity/entityfields/refresheurovalues/stateProcess.js @@ -0,0 +1,26 @@ +import("system.result"); +import("system.neon"); +import("KeywordRegistry_basic"); +import("Currency_lib"); +import("system.vars"); + +var currency = vars.get("$field.CURRENCY"); +var state = neon.COMPONENTSTATE_DISABLED; + +if(currency != $KeywordRegistry.currency$eur() + && 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); + + +$KeywordRegistry.salesprojectState = function(){return "SalesprojectState";}; +$KeywordRegistry.salesprojectState$open = function(){return "SALPROJSTATOPEN";}; +$KeywordRegistry.salesprojectState$postponed = function(){return "SALPROJSTATPOSTPONED";}; +$KeywordRegistry.salesprojectState$aborted = function(){return "SALPROJSTATABORT";}; +$KeywordRegistry.salesprojectState$partialOrder = function(){return "SALPROJSTATPARTIAL";}; +$KeywordRegistry.salesprojectState$order = function(){return "SALPROJSTATORDER";}; +$KeywordRegistry.salesprojectState$lost = function(){return "SALPROJSTATLOST";}; \ No newline at end of file diff --git a/entity/Salesproject_entity/entityfields/volume/stateProcess.js b/entity/Salesproject_entity/entityfields/volume/stateProcess.js new file mode 100644 index 0000000000000000000000000000000000000000..f18e18ece4625fe24076d02547805798d011e7d3 --- /dev/null +++ b/entity/Salesproject_entity/entityfields/volume/stateProcess.js @@ -0,0 +1,12 @@ +import("system.result"); +import("system.neon"); +import("KeywordRegistry_basic"); +import("system.vars"); + +var state = neon.COMPONENTSTATE_EDITABLE; +if((vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW || vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_EDIT ) + && vars.get("$field.CURRENCY") != $KeywordRegistry.currency$eur()) +{ + state = neon.COMPONENTSTATE_DISABLED; +} +result.string(state); \ 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..878bb967f7c7c61a46263b00cf2270b7e5eac196 --- /dev/null +++ b/entity/Salesproject_entity/entityfields/volumeforeigncurrency/onValueChange.js @@ -0,0 +1,13 @@ +import("KeywordRegistry_basic"); +import("system.neon"); +import("Currency_lib"); +import("system.vars"); + +var currencyIso = vars.get("$field.CURRENCY"); +var fieldsWithValues = {}; +if(currencyIso) +{ + var currencyRate = vars.get("$field.CURRENCYRATE"); + var foreignCurrencyValue = vars.get("$this.value"); + neon.setFieldValue("$field.VOLUME", (foreignCurrencyValue*currencyRate).toFixed(2)); +} \ 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..e116dd4ff28e15287d9d2fcc88dc4c709d2d17ae --- /dev/null +++ b/entity/Salesproject_entity/entityfields/volumeforeigncurrency/stateProcess.js @@ -0,0 +1,11 @@ +import("system.result"); +import("system.neon"); +import("KeywordRegistry_basic"); +import("system.vars"); + +var state = neon.COMPONENTSTATE_INVISIBLE; +if(vars.get("$field.CURRENCY") && vars.get("$field.CURRENCY") != $KeywordRegistry.currency$eur()) +{ + state = neon.COMPONENTSTATE_EDITABLE; +} +result.string(state); \ 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..95c6d5876cf2c142f92f1ddc2028a1d6db998c11 --- /dev/null +++ b/entity/Salesproject_entity/entityfields/volumeforeigncurrency/titleProcess.js @@ -0,0 +1,9 @@ +import("system.translate"); +import("system.result"); +import("KeywordRegistry_basic"); +import("Keyword_lib"); +import("system.vars"); + +var currency = " (" + KeywordUtils.getViewValue($KeywordRegistry.currency(), vars.get("$field.CURRENCY")) + ")"; + +result.string(translate.withArguments("Volume%0", [currency])); \ No newline at end of file diff --git a/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js new file mode 100644 index 0000000000000000000000000000000000000000..6b170793b12d5fbd9888dae85cccc9cad11b2f15 --- /dev/null +++ b/entity/Salesproject_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js @@ -0,0 +1,6 @@ +import("system.result"); +import("Keyword_lib"); +import("KeywordRegistry_basic"); + +var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.currency(), "SALESPROJECT.CURRENCY"); +result.string(sql); \ No newline at end of file diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index 261af67253da652ba25c7b07a35bb50c6c25a251..55f0face8f1178221e508b900b1ec9573e5b8180 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -8632,9 +8632,6 @@ <entry> <key>show all offers with first approval</key> </entry> - <entry> - <key>No advertising</key> - </entry> <entry> <key>[TEST] Importer</key> </entry> @@ -8944,6 +8941,87 @@ <entry> <key>Target amount</key> </entry> + <entry> + <key>Approval</key> + </entry> + <entry> + <key>Soft Bounce</key> + </entry> + <entry> + <key>Price in </key> + </entry> + <entry> + <key>Email body (Regular expression)</key> + </entry> + <entry> + <key>new Email</key> + </entry> + <entry> + <key>Datenew</key> + </entry> + <entry> + <key>Update Advertising</key> + </entry> + <entry> + <key>Digital</key> + </entry> + <entry> + <key>Target Currency</key> + </entry> + <entry> + <key>[TEST] Observation_lib</key> + </entry> + <entry> + <key>Update AdvertisingItem</key> + </entry> + <entry> + <key>Volume%0</key> + </entry> + <entry> + <key>Euro Values updated using the current rate:</key> + </entry> + <entry> + <key>Email Filter</key> + </entry> + <entry> + <key>Source Currency</key> + </entry> + <entry> + <key>Indicator Type</key> + </entry> + <entry> + <key>Exchange Rate </key> + </entry> + <entry> + <key>Email body</key> + </entry> + <entry> + <key>Values have been updated, using the current rate:</key> + </entry> + <entry> + <key>Refresh Euro Values</key> + </entry> + <entry> + <key>Advertising_lib</key> + </entry> + <entry> + <key>Hard Bounce</key> + </entry> + <entry> + <key>Values have not been updated, because the stored rate is already up to date</key> + </entry> + <entry> + <key>Currency Rate</key> + </entry> + <entry> + <key>Attachment count</key> + </entry> + <entry> + <key>Volume(Euro)</key> + </entry> + <entry> + <key>Field Type</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 9b7b076de3357af3990893731d7fa739620f65c8..b01bf74d086d054fbfdd07be828d8a3b9c2fc239 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -2218,6 +2218,10 @@ <key>New offer version</key> <value>Neue Angebotsversion</value> </entry> + <entry> + <key>Volume%0</key> + <value>Volume%0</value> + </entry> <entry> <key>Copy offer</key> <value>Angebot kopieren</value> @@ -11695,10 +11699,6 @@ Bitte Datumseingabe prüfen</value> <key>wrong configuration for '%0'</key> <value>falsche Konfiguration für '%0'</value> </entry> - <entry> - <key>No activity</key> - <value>Keine Aktivität</value> - </entry> <entry> <key>Bulk Mail Key Figures</key> </entry> @@ -11738,6 +11738,100 @@ Bitte Datumseingabe prüfen</value> <entry> <key>Shows device types used by bulkmail recipients</key> </entry> + <entry> + <key>Volume(Euro)</key> + <value>Volumen(Euro)</value> + </entry> + <entry> + <key>new Email</key> + </entry> + <entry> + <key>Price in </key> + </entry> + <entry> + <key>Attachment count</key> + </entry> + <entry> + <key>Email Filter</key> + </entry> + <entry> + <key>Exchange Rate </key> + <value>Wechselkurs</value> + </entry> + <entry> + <key>Digital</key> + </entry> + <entry> + <key>Indicator Type</key> + </entry> + <entry> + <key>Advertising_lib</key> + </entry> + <entry> + <key>Email body</key> + </entry> + <entry> + <key>Field Type</key> + </entry> + <entry> + <key>Target Currency</key> + <value>Zielwährung</value> + </entry> + <entry> + <key>Update AdvertisingItem</key> + </entry> + <entry> + <key>[TEST] Observation_lib</key> + </entry> + <entry> + <key>Datenew</key> + </entry> + <entry> + <key>Hard Bounce</key> + </entry> + <entry> + <key>Email body (Regular expression)</key> + </entry> + <entry> + <key>Update Advertising</key> + </entry> + <entry> + <key>Refresh Euro Values</key> + <value>Beträge in Euro aktualisieren</value> + </entry> + <entry> + <key>Currency Rate</key> + <value>Währungskurs</value> + </entry> + <entry> + <key>Soft Bounce</key> + </entry> + <entry> + <key>Source Currency</key> + <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> + </entry> + <entry> + <key>Euro Values updated using the current rate:</key> + <value>Beträge wurden anhand des aktuellen Kurses geupdated:</value> + </entry> + <entry> + <key>Approval</key> + </entry> + <entry> + <key>No activity</key> + </entry> + <entry> + <key>Values have been updated, using the current rate:</key> + <value>Beträge wurden anhand des aktuellen Kurses aktualisisert:</value> + </entry> + <entry> + <key>Volume (Euro)</key> + <value>Volumes (Euro)</value> + </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 697ff03cfe71fa3f932e32143e4f7c19fb6f11fc..4c01584f1e3659dda7173085a8b5482097d1ba95 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -8717,9 +8717,6 @@ <entry> <key>show all offers with first approval</key> </entry> - <entry> - <key>No advertising</key> - </entry> <entry> <key>[TEST] Importer</key> </entry> @@ -9011,9 +9008,6 @@ <entry> <key>please only filter using 'equal'</key> </entry> - <entry> - <key>No activity</key> - </entry> <entry> <key>Advertising shipment</key> </entry> @@ -9029,6 +9023,90 @@ <entry> <key>Target amount</key> </entry> + <entry> + <key>Volume(Euro)</key> + </entry> + <entry> + <key>new Email</key> + </entry> + <entry> + <key>Price in </key> + </entry> + <entry> + <key>Attachment count</key> + </entry> + <entry> + <key>Email Filter</key> + </entry> + <entry> + <key>Exchange Rate </key> + </entry> + <entry> + <key>Digital</key> + </entry> + <entry> + <key>Indicator Type</key> + </entry> + <entry> + <key>Advertising_lib</key> + </entry> + <entry> + <key>Email body</key> + </entry> + <entry> + <key>Field Type</key> + </entry> + <entry> + <key>Target Currency</key> + </entry> + <entry> + <key>Update AdvertisingItem</key> + </entry> + <entry> + <key>[TEST] Observation_lib</key> + </entry> + <entry> + <key>Datenew</key> + </entry> + <entry> + <key>Hard Bounce</key> + </entry> + <entry> + <key>Email body (Regular expression)</key> + </entry> + <entry> + <key>Update Advertising</key> + </entry> + <entry> + <key>Refresh Euro Values</key> + </entry> + <entry> + <key>Currency Rate</key> + </entry> + <entry> + <key>Soft Bounce</key> + </entry> + <entry> + <key>Source Currency</key> + </entry> + <entry> + <key>Approval</key> + </entry> + <entry> + <key>Values have been updated, using the current rate:</key> + </entry> + <entry> + <key>Values have not been updated, because the stored rate is already up to date</key> + </entry> + <entry> + <key>Volume%0</key> + </entry> + <entry> + <key>Euro Values updated using the current rate:</key> + </entry> + <entry> + <key>No activity</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/neonContext/CurrencyRates/CurrencyRates.aod b/neonContext/CurrencyRates/CurrencyRates.aod new file mode 100644 index 0000000000000000000000000000000000000000..1c3f5de63b0aec7ee13dea6e676c72eb6fbb56ab --- /dev/null +++ b/neonContext/CurrencyRates/CurrencyRates.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>CurrencyRates</name> + <title>Currency Rate</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/neonView/CurrencyRateEdit_view/CurrencyRateEdit_view.aod b/neonView/CurrencyRateEdit_view/CurrencyRateEdit_view.aod new file mode 100644 index 0000000000000000000000000000000000000000..cd0fa9fcf85a7aa30acbf9d8bc0cf163a384d59c --- /dev/null +++ b/neonView/CurrencyRateEdit_view/CurrencyRateEdit_view.aod @@ -0,0 +1,55 @@ +<?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> + <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>2801504d-5a9d-42bb-8b96-cdfaf63c02bf</name> + <entityField>DATE_EDIT</entityField> + </entityFieldLink> + <entityFieldLink> + <name>e232972f-9c1d-4932-8690-f5979d4a5c80</name> + <entityField>DATE_NEW</entityField> + </entityFieldLink> + <entityFieldLink> + <name>be93a506-44f2-46d2-8678-0d280d5e17df</name> + <entityField>USER_EDIT</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/ForecastEdit_view/ForecastEdit_view.aod b/neonView/ForecastEdit_view/ForecastEdit_view.aod index 95f7a1089f58033cc45cb2648f7ff27663c87fac..2d43398ec1022d8d47afed704ff0c76e0aa85037 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>22f2f780-8ef3-47e3-bd16-542f0a878bbd</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 2003610345324c73fcf071ee54400368b0445569..c6d632eeb290cae1d1bdb687b8771abb2269795a 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> @@ -30,6 +31,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> @@ -62,6 +67,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> @@ -84,6 +93,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 c35834022761561c18ba617f2b659fb5e79c9422..499ba9705907ca29bd1a92121635c5941849f0a5 100644 --- a/neonView/ForecastPreview_view/ForecastPreview_view.aod +++ b/neonView/ForecastPreview_view/ForecastPreview_view.aod @@ -25,6 +25,10 @@ <name>796d2325-8684-4723-b376-262074268f4c</name> <entityField>VOLUME</entityField> </entityFieldLink> + <entityFieldLink> + <name>f6dd8b50-4ac2-4cd0-8e1a-00a5184de252</name> + <entityField>VOLUMEFOREIGNCURRENCY</entityField> + </entityFieldLink> <entityFieldLink> <name>7261d58e-7534-4877-b5cd-f05201823711</name> <entityField>OBJECT_TYPE</entityField> diff --git a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod index 7a2444f88509fb17c60ebaa2b3edcf59e59ebb7e..ed02fcf2dbe54420baf0ffc13dd2e90123c16a34 100644 --- a/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod +++ b/neonView/SalesprojectEdit_view/SalesprojectEdit_view.aod @@ -52,10 +52,18 @@ <name>ed4308b5-dd5a-49a1-b748-9a2980291d56</name> <entityField>ENDDATE</entityField> </entityFieldLink> + <entityFieldLink> + <name>bc016233-a721-4df1-8ab7-3ff96bb80d82</name> + <entityField>CURRENCY</entityField> + </entityFieldLink> <entityFieldLink> <name>5b3c3dc2-4ca5-45c5-96e5-7196a99dcdce</name> <entityField>VOLUME</entityField> </entityFieldLink> + <entityFieldLink> + <name>7b1fbe42-d9c7-4cbc-8989-2529f13485a6</name> + <entityField>VOLUMEFOREIGNCURRENCY</entityField> + </entityFieldLink> <entityFieldLink> <name>3836ef6b-64c4-4e0e-8cd6-88f784275b2f</name> <entityField>PROBABILITY</entityField> diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod index db91bfb1b79095049298c48c0484e54c78c05269..af453579a9bd902b21e58324a5a15a6011dadacd 100644 --- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod +++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod @@ -66,10 +66,22 @@ <name>bee2acfb-20ac-485e-be6c-c9c6a25e6013</name> <entityField>PROBABILITY_AI</entityField> </entityFieldLink> + <entityFieldLink> + <name>c6df8c5f-1603-4b16-b4a4-0f8bed18aa53</name> + <entityField>CURRENCY</entityField> + </entityFieldLink> + <entityFieldLink> + <name>f33df05b-4a78-4626-b0d2-723599749a54</name> + <entityField>CURRENCYRATE</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/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..084e7e25a0405fb07c55b011cd24463f66381281 --- /dev/null +++ b/process/Currency_lib/process.js @@ -0,0 +1,34 @@ +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() {} + +/* + * Retrieves valid Rate (most recent One) for pCurrency + * + * @param {String} pSourceCurrency the source currency as ISO; + * + * @param {String} pTargetCurrency the target currency as ISO; + * + * @return {Number} the rate + */ +CurrencyUtils.getCurrencyRate = function(pSourceCurrency, pTargetCurrency) +{ + var rate = newSelect("CURRENCYRATE.CURRENCYRATE") + .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 = rate == "" ? 1 : rate; + return rate; +}; \ No newline at end of file diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js index 86bfc662594e207c5911ec0f786cde055b67d34d..d09f17cf10198155632992c6fa01321c54dceaab 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";};