diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 8a42653e859a888cca6db0bdfc78a369efe0631a..3300832e69cce35ce026b1fc23dc6e56181c7956 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -1798,6 +1798,34 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>PAYMENTTERMS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <size v="36" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
+ <entityFieldDb>
+ <name>DELIVERYTERMS</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="1" />
+ <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>
diff --git a/entity/Activity_entity/Activity_entity.aod b/entity/Activity_entity/Activity_entity.aod
index 17d7315659bf292902964c5f528595b0fe2af890..b033f2486d4ff3c854add4736cfaa0b7fae7918b 100644
--- a/entity/Activity_entity/Activity_entity.aod
+++ b/entity/Activity_entity/Activity_entity.aod
@@ -46,6 +46,7 @@
<title>Subject</title>
<mandatory v="true" />
<groupable v="false" />
+ <onValueChange>%aditoprj%/entity/Activity_entity/entityfields/subject/onValueChange.js</onValueChange>
</entityField>
<entityParameter>
<name>RowId_param</name>
@@ -286,6 +287,8 @@
<title>New activity</title>
<onActionProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>NEON:HISTORY</iconId>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Activity_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>newTask</name>
@@ -382,7 +385,6 @@
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Activity_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBInsert>%aditoprj%/entity/Activity_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBDelete>%aditoprj%/entity/Activity_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
diff --git a/entity/Activity_entity/afterOperatingState.js b/entity/Activity_entity/afterOperatingState.js
index e2a61f97758bb5de2d74741e1feeec6b5b4d17e8..3ecca0b8c1188e162337649cb606276d6d05aa53 100644
--- a/entity/Activity_entity/afterOperatingState.js
+++ b/entity/Activity_entity/afterOperatingState.js
@@ -1,19 +1,15 @@
-//import("system.logging");
-//import("system.util");
-//import("system.db");
-//import("system.neon");
-//import("system.vars");
-//import("Context_lib");
-//
-//if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
-// && vars.exists("$param.RowId_param") && vars.get("$param.RowId_param")
-// && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
-//{
-// logging.log(vars.get("$field.ACTIVITYID"))
-// neon.addRecord(null, "Links", {
-// "OBJECT_TYPE" : vars.get("$param.ObjectId_param"),
-// "OBJECT_ROWID" : vars.get("$param.RowId_param"),
-// "ACTIVITY_ID" : vars.getString("$field.ACTIVITYID"),
-// "ActivityId_param" : vars.getString("$field.ACTIVITYID")
-// });
-//}
\ No newline at end of file
+import("system.util");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
+ && vars.exists("$param.RowId_param") && vars.get("$param.RowId_param")
+ && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
+{
+ neon.addRecord(null, "Links", {
+ "OBJECT_TYPE" : vars.get("$param.ObjectId_param"),
+ "OBJECT_ROWID" : vars.get("$param.RowId_param")
+ });
+}
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/newactivity/tooltipProcess.js b/entity/Activity_entity/entityfields/newactivity/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2cdf4480a4bb519f955eb0f5a3c84ddd7bf3e5f7
--- /dev/null
+++ b/entity/Activity_entity/entityfields/newactivity/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Activity_entity/entityfields/subject/onValueChange.js b/entity/Activity_entity/entityfields/subject/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..3ecca0b8c1188e162337649cb606276d6d05aa53
--- /dev/null
+++ b/entity/Activity_entity/entityfields/subject/onValueChange.js
@@ -0,0 +1,15 @@
+import("system.util");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
+ && vars.exists("$param.RowId_param") && vars.get("$param.RowId_param")
+ && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
+{
+ neon.addRecord(null, "Links", {
+ "OBJECT_TYPE" : vars.get("$param.ObjectId_param"),
+ "OBJECT_ROWID" : vars.get("$param.RowId_param")
+ });
+}
\ No newline at end of file
diff --git a/entity/Activity_entity/recordcontainers/db/onDBInsert.js b/entity/Activity_entity/recordcontainers/db/onDBInsert.js
deleted file mode 100644
index 309f19972fbe819442e918970e9c80d38c1a764f..0000000000000000000000000000000000000000
--- a/entity/Activity_entity/recordcontainers/db/onDBInsert.js
+++ /dev/null
@@ -1,24 +0,0 @@
-import("system.util");
-import("system.db");
-import("system.neon");
-import("system.vars");
-import("Context_lib");
-
-if (vars.exists("$param.RowId_param") && vars.get("$param.RowId_param")
- && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
-{
- var rowIds = vars.get("$param.RowId_param");
- if (/^\[.*\]$/.test(rowIds))
- rowIds = JSON.parse(rowIds);
- else
- rowIds = [rowIds];
- rowIds.forEach(function (rowId)
- {
- //TODO: remove this and use neon.addRecord
- db.insertData(
- "ACTIVITYLINK",
- ["ACTIVITYLINKID", "OBJECT_TYPE", "OBJECT_ROWID", "ACTIVITY_ID"],
- null,
- [util.getNewUUID(), vars.get("$param.ObjectId_param"), rowId, vars.getString("$field.ACTIVITYID")]);
- });
-}
\ No newline at end of file
diff --git a/entity/Attribute_entity/Attribute_entity.aod b/entity/Attribute_entity/Attribute_entity.aod
index c204aef676ae39a7c6598da1397f70a48d887fd4..ac48686c7783304f6557c61ace5c9d4d121f2de5 100644
--- a/entity/Attribute_entity/Attribute_entity.aod
+++ b/entity/Attribute_entity/Attribute_entity.aod
@@ -4,6 +4,7 @@
<title>Attribute</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Attribute_entity/documentation.adoc</documentation>
+ <afterOperatingState>%aditoprj%/entity/Attribute_entity/afterOperatingState.js</afterOperatingState>
<iconId>VAADIN:TAG</iconId>
<titleProcess>%aditoprj%/entity/Attribute_entity/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
@@ -26,6 +27,7 @@
<stateProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/stateProcess.js</stateProcess>
<valueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/valueProcess.js</valueProcess>
<displayValueProcess>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/displayValueProcess.js</displayValueProcess>
+ <onValueChange>%aditoprj%/entity/Attribute_entity/entityfields/attribute_type/onValueChange.js</onValueChange>
</entityField>
<entityField>
<name>AB_ATTRIBUTEID</name>
@@ -206,7 +208,6 @@
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/Attribute_entity/recordcontainers/db/conditionProcess.js</conditionProcess>
<orderClauseProcess>%aditoprj%/entity/Attribute_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBInsert>%aditoprj%/entity/Attribute_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBDelete>%aditoprj%/entity/Attribute_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
diff --git a/entity/Attribute_entity/afterOperatingState.js b/entity/Attribute_entity/afterOperatingState.js
new file mode 100644
index 0000000000000000000000000000000000000000..f52c883d543b804a928da3e193fc69bafbe3a1ca
--- /dev/null
+++ b/entity/Attribute_entity/afterOperatingState.js
@@ -0,0 +1,25 @@
+import("system.util");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
+ && vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
+{
+ var parentId = vars.get("$param.attrParentId_param");
+ var attributeId = vars.get("$field.AB_ATTRIBUTEID");
+
+ var usageSql = SqlCondition.begin()
+ .andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", parentId)
+ .buildSql("select OBJECT_TYPE from AB_ATTRIBUTEUSAGE", "1=0");
+ var usages = db.array(db.COLUMN, usageSql);
+
+ //preset the usages with the ones from the parent
+ usages.forEach(function (usage)
+ {
+ neon.addRecord(null, "AttributeUsages", {
+ "OBJECT_TYPE" : usage
+ });
+ });
+}
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/attribute_type/onValueChange.js b/entity/Attribute_entity/entityfields/attribute_type/onValueChange.js
new file mode 100644
index 0000000000000000000000000000000000000000..9b54cffaa705381d858c3079deb12ccaf1b3f5b9
--- /dev/null
+++ b/entity/Attribute_entity/entityfields/attribute_type/onValueChange.js
@@ -0,0 +1,8 @@
+import("system.neon");
+import("system.vars");
+import("Attribute_lib");
+import("Entity_lib");
+
+var type = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.ATTRIBUTE_TYPE")) || "";
+if (type.trim() != $AttributeTypes.KEYWORD && vars.get("$field.KEYWORD_CONTAINER"))
+ neon.setFieldValue("$field.KEYWORD_CONTAINER", "");
\ No newline at end of file
diff --git a/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js b/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
index eed48d6bc1c8b5253f3c6d29e6923253a1f6df90..ed2192032e9bf5ff0f09b1766cde23e8ca969ceb 100644
--- a/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
+++ b/entity/Attribute_entity/entityfields/keyword_container/stateProcess.js
@@ -1,12 +1,13 @@
+import("system.logging");
import("system.neon");
import("system.vars");
import("system.result");
import("Attribute_lib");
var fieldState;
-if (vars.get("$field.ATTRIBUTE_TYPE") == $AttributeTypes.KEYWORD || true) //TODO use the correct condition when updating the state is possible
- fieldState = neon.COMPONENTSTATE_AUTO;
+if (vars.get("$field.ATTRIBUTE_TYPE").trim() == $AttributeTypes.KEYWORD)
+ fieldState = neon.COMPONENTSTATE_EDITABLE;
else
- fieldState = neon.COMPONENTSTATE_INVISIBLE;
+ fieldState = neon.COMPONENTSTATE_DISABLED;
result.string(fieldState);
\ No newline at end of file
diff --git a/entity/Attribute_entity/recordcontainers/db/onDBInsert.js b/entity/Attribute_entity/recordcontainers/db/onDBInsert.js
deleted file mode 100644
index 9abf4505f0765bd027b54de2c259db0da57b5704..0000000000000000000000000000000000000000
--- a/entity/Attribute_entity/recordcontainers/db/onDBInsert.js
+++ /dev/null
@@ -1,31 +0,0 @@
-import("system.db");
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("system.util");
-import("Sql_lib");
-
-if (vars.exists("$param.attrParentId_param") && vars.get("$param.attrParentId_param"))
-{
- var parentId = vars.get("$param.attrParentId_param");
- var attributeId = vars.get("$field.AB_ATTRIBUTEID");
- var cols = [
- "AB_ATTRIBUTEUSAGEID",
- "OBJECT_TYPE",
- "AB_ATTRIBUTE_ID"
- ];
- var usageSql = SqlCondition.begin()
- .andPrepare("AB_ATTRIBUTEUSAGE.AB_ATTRIBUTE_ID", parentId)
- .buildSql("select " + cols.join(", ") + " from AB_ATTRIBUTEUSAGE", "1=0");
- var usages = db.table(usageSql);
-
- var table = "AB_ATTRIBUTEUSAGE";
- var types = db.getColumnTypes(table, cols);
-
- var toInsert = usages.map(function (row)
- {
- return [table, cols, types, [util.getNewUUID(), row[1], attributeId]];
- });
-
- db.inserts(toInsert);
-}
\ No newline at end of file
diff --git a/entity/KeywordEntry_entity/KeywordEntry_entity.aod b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
index 61a243030f198d4b0934d0914a12f70f8358c103..b8ac899bf372ff96fda9dae3dc27bdc28a862bcf 100644
--- a/entity/KeywordEntry_entity/KeywordEntry_entity.aod
+++ b/entity/KeywordEntry_entity/KeywordEntry_entity.aod
@@ -342,6 +342,18 @@
<fieldName>KeywordProgress</fieldName>
<isConsumer v="false" />
</entityDependency>
+ <entityDependency>
+ <name>36aa04c1-5361-4e40-a036-0546db596973</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>KeywordDeliveryTerm</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
+ <entityDependency>
+ <name>7e12cbd6-3a2c-4bd8-bc66-5001c282b690</name>
+ <entityName>Offer_entity</entityName>
+ <fieldName>KeywordPaymentTerm</fieldName>
+ <isConsumer v="false" />
+ </entityDependency>
</dependencies>
<children>
<entityParameter>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index baa87a37cff792879254d79072b3d7dd41b6c582..406ba51591d389358e2caa2a39b48e2861a44e2e 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -92,7 +92,7 @@
<entityField>
<name>HEADER</name>
<title>Cover letter</title>
- <contentType>HTML</contentType>
+ <contentType>LONG_TEXT</contentType>
<valueProcess>%aditoprj%/entity/Offer_entity/entityfields/header/valueProcess.js</valueProcess>
</entityField>
<entityConsumer>
@@ -429,6 +429,8 @@
<title>New activity</title>
<onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>NEON:HISTORY</iconId>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Offer_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityProvider>
<name>ContactOffers</name>
@@ -518,6 +520,46 @@
<onActionProcess>%aditoprj%/entity/Offer_entity/entityfields/newtask/onActionProcess.js</onActionProcess>
<iconId>VAADIN:TASKS</iconId>
</entityActionField>
+ <entityField>
+ <name>PAYMENTTERMS</name>
+ <title>Payment term</title>
+ <consumer>KeywordPaymentTerm</consumer>
+ </entityField>
+ <entityField>
+ <name>DELIVERYTERMS</name>
+ <title>Deliveryspecification</title>
+ <consumer>KeywordDeliveryTerm</consumer>
+ </entityField>
+ <entityConsumer>
+ <name>KeywordPaymentTerm</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keywordpaymentterm/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
+ <entityConsumer>
+ <name>KeywordDeliveryTerm</name>
+ <fieldType>DEPENDENCY_OUT</fieldType>
+ <dependency>
+ <name>dependency</name>
+ <entityName>KeywordEntry_entity</entityName>
+ <fieldName>SpecificContainerKeywords</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>containerName_param</name>
+ <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/keyworddeliveryterm/children/containername_param/valueProcess.js</valueProcess>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -639,6 +681,22 @@
<name>PROBABILITY.displayValue</name>
<expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/probability.displayvalue/expression.js</expression>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PAYMENTTERMS.value</name>
+ <recordfield>OFFER.PAYMENTTERMS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DELIVERYTERMS.value</name>
+ <recordfield>OFFER.DELIVERYTERMS</recordfield>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>DELIVERYTERMS.displayValue</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/deliveryterms.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>PAYMENTTERMS.displayValue</name>
+ <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/paymentterms.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Offer_entity/entityfields/keyworddeliveryterm/children/containername_param/valueProcess.js b/entity/Offer_entity/entityfields/keyworddeliveryterm/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..c7114a89045e6f93d8913d978543762c5ee95a89
--- /dev/null
+++ b/entity/Offer_entity/entityfields/keyworddeliveryterm/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.deliveryTerm());
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/keywordpaymentterm/children/containername_param/valueProcess.js b/entity/Offer_entity/entityfields/keywordpaymentterm/children/containername_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..1f840f4c59a047a355cb56c2ae5ae539b25c7c33
--- /dev/null
+++ b/entity/Offer_entity/entityfields/keywordpaymentterm/children/containername_param/valueProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("KeywordRegistry_basic");
+
+result.string($KeywordRegistry.paymentTerm());
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/newactivity/tooltipProcess.js b/entity/Offer_entity/entityfields/newactivity/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2cdf4480a4bb519f955eb0f5a3c84ddd7bf3e5f7
--- /dev/null
+++ b/entity/Offer_entity/entityfields/newactivity/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/deliveryterms.displayvalue/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/deliveryterms.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..da3eb8bffc7bdeb41121608e2768e28c4982af86
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/deliveryterms.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.deliveryTerm(), "OFFER.DELIVERYTERMS");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/paymentterms.displayvalue/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/paymentterms.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..d1d4de62195b81043baad809396d9b3b2550f30a
--- /dev/null
+++ b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/paymentterms.displayvalue/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+var sql = KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.paymentTerm(), "OFFER.PAYMENTTERMS");
+result.string(sql);
\ No newline at end of file
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index b4dd1d0c4058cf50264b6bf7b184f58f12fc5ab4..43d51a741e939fee92aa44a79bdc4355ad12315b 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -387,6 +387,8 @@
<title>New activity</title>
<onActionProcess>%aditoprj%/entity/Order_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>NEON:HISTORY</iconId>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Order_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityField>
<name>OFFER_ID</name>
diff --git a/entity/Order_entity/entityfields/newactivity/tooltipProcess.js b/entity/Order_entity/entityfields/newactivity/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2cdf4480a4bb519f955eb0f5a3c84ddd7bf3e5f7
--- /dev/null
+++ b/entity/Order_entity/entityfields/newactivity/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Organisation_entity/Organisation_entity.aod b/entity/Organisation_entity/Organisation_entity.aod
index d14786dcc45996d2251fdb06cf76cc7199af42d1..a8da3d81ff08c27712e605f7ac54a6f516c0a148 100644
--- a/entity/Organisation_entity/Organisation_entity.aod
+++ b/entity/Organisation_entity/Organisation_entity.aod
@@ -363,6 +363,8 @@
<onActionProcess>%aditoprj%/entity/Organisation_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<actionOrder v="0" />
<iconId>NEON:HISTORY</iconId>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Organisation_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>orgReport</name>
diff --git a/entity/Organisation_entity/entityfields/newactivity/tooltipProcess.js b/entity/Organisation_entity/entityfields/newactivity/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2cdf4480a4bb519f955eb0f5a3c84ddd7bf3e5f7
--- /dev/null
+++ b/entity/Organisation_entity/entityfields/newactivity/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index e9e43d8f824ffcdc23882df45ff79d0b83be5666..2818cdc999055188418c11ed90300f99808f91eb 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -472,6 +472,8 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<title>New activity</title>
<onActionProcess>%aditoprj%/entity/Person_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>NEON:HISTORY</iconId>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Person_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityConsumer>
<name>ObjectRelations</name>
diff --git a/entity/Person_entity/entityfields/newactivity/tooltipProcess.js b/entity/Person_entity/entityfields/newactivity/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2cdf4480a4bb519f955eb0f5a3c84ddd7bf3e5f7
--- /dev/null
+++ b/entity/Person_entity/entityfields/newactivity/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Product_entity/Product_entity.aod b/entity/Product_entity/Product_entity.aod
index bd797c557cb84dcbd611cbf6841935878f827981..d388d08f6b765f203f01ce8faf60681322b85ed1 100644
--- a/entity/Product_entity/Product_entity.aod
+++ b/entity/Product_entity/Product_entity.aod
@@ -313,6 +313,8 @@
<title>New activity</title>
<onActionProcess>%aditoprj%/entity/Product_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>NEON:HISTORY</iconId>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Product_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityConsumer>
<name>Attributes</name>
diff --git a/entity/Product_entity/entityfields/newactivity/tooltipProcess.js b/entity/Product_entity/entityfields/newactivity/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2cdf4480a4bb519f955eb0f5a3c84ddd7bf3e5f7
--- /dev/null
+++ b/entity/Product_entity/entityfields/newactivity/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod
index b806c1e1e1155840ec86ccf310a9dbeba4d27d99..692da6ce1ccd00299d2363d9b1c9ed054db5fcbc 100644
--- a/entity/Salesproject_entity/Salesproject_entity.aod
+++ b/entity/Salesproject_entity/Salesproject_entity.aod
@@ -405,6 +405,8 @@
<title>New activity</title>
<onActionProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>NEON:HISTORY</iconId>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Salesproject_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityField>
<name>DAYS_NOTACTIVE</name>
diff --git a/entity/Salesproject_entity/entityfields/newactivity/tooltipProcess.js b/entity/Salesproject_entity/entityfields/newactivity/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2cdf4480a4bb519f955eb0f5a3c84ddd7bf3e5f7
--- /dev/null
+++ b/entity/Salesproject_entity/entityfields/newactivity/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Task_entity/Task_entity.aod b/entity/Task_entity/Task_entity.aod
index 0ffa4b8165b3c4effbbb5ccb8aff2d468c538446..126a3c2ccdaea0101c4011e3fb08582d82477434 100644
--- a/entity/Task_entity/Task_entity.aod
+++ b/entity/Task_entity/Task_entity.aod
@@ -221,6 +221,8 @@
<title>New activity</title>
<onActionProcess>%aditoprj%/entity/Task_entity/entityfields/newactivity/onActionProcess.js</onActionProcess>
<iconId>NEON:HISTORY</iconId>
+ <tooltip>New activity</tooltip>
+ <tooltipProcess>%aditoprj%/entity/Task_entity/entityfields/newactivity/tooltipProcess.js</tooltipProcess>
</entityActionField>
<entityActionField>
<name>newTask</name>
@@ -307,7 +309,6 @@
<name>db</name>
<alias>Data_alias</alias>
<orderClauseProcess>%aditoprj%/entity/Task_entity/recordcontainers/db/orderClauseProcess.js</orderClauseProcess>
- <onDBInsert>%aditoprj%/entity/Task_entity/recordcontainers/db/onDBInsert.js</onDBInsert>
<onDBDelete>%aditoprj%/entity/Task_entity/recordcontainers/db/onDBDelete.js</onDBDelete>
<linkInformation>
<linkInformation>
diff --git a/entity/Task_entity/afterOperatingState.js b/entity/Task_entity/afterOperatingState.js
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..3ecca0b8c1188e162337649cb606276d6d05aa53 100644
--- a/entity/Task_entity/afterOperatingState.js
+++ b/entity/Task_entity/afterOperatingState.js
@@ -0,0 +1,15 @@
+import("system.util");
+import("system.db");
+import("system.neon");
+import("system.vars");
+import("Context_lib");
+
+if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW
+ && vars.exists("$param.RowId_param") && vars.get("$param.RowId_param")
+ && vars.exists("$param.ObjectId_param") && vars.get("$param.ObjectId_param"))
+{
+ neon.addRecord(null, "Links", {
+ "OBJECT_TYPE" : vars.get("$param.ObjectId_param"),
+ "OBJECT_ROWID" : vars.get("$param.RowId_param")
+ });
+}
\ No newline at end of file
diff --git a/entity/Task_entity/entityfields/newactivity/tooltipProcess.js b/entity/Task_entity/entityfields/newactivity/tooltipProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..2cdf4480a4bb519f955eb0f5a3c84ddd7bf3e5f7
--- /dev/null
+++ b/entity/Task_entity/entityfields/newactivity/tooltipProcess.js
@@ -0,0 +1,4 @@
+import("system.translate");
+import("system.result");
+
+result.string(translate.text("New activity"));
\ No newline at end of file
diff --git a/entity/Task_entity/recordcontainers/db/onDBInsert.js b/entity/Task_entity/recordcontainers/db/onDBInsert.js
deleted file mode 100644
index 832d42b125946d7c2ffa983cfa4a91f03c21670f..0000000000000000000000000000000000000000
--- a/entity/Task_entity/recordcontainers/db/onDBInsert.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.vars");
-import("system.util");
-import("system.db");
-
-if (vars.exists("$param.ObjectType_param") && vars.exists("$param.RowId_param") && vars.get("$param.ObjectType_param") && vars.get("$param.RowId_param"))
- db.insertData("TASKLINK", ["TASKLINKID", "OBJECT_TYPE", "OBJECT_ROWID", "TASK_ID"], null,
- [
- util.getNewUUID(),
- vars.get("$param.ObjectType_param"),
- vars.get("$param.RowId_param"),
- vars.get("$field.TASKID")
- ]);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 5c651ab9b9f64375957196797f7526a7c48f92f5..0620d74259b80ce98b1c07b829686cb5ebb91d65 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -2568,6 +2568,40 @@
<entry>
<key>Progress</key>
</entry>
+ <entry>
+ <key>Module</key>
+ </entry>
+ <entry>
+ <key>7 days net</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>carriage free</key>
+ </entry>
+ <entry>
+ <key>Delivery terms</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>8 days 2% discount, 30 days net</key>
+ <value></value>
+ </entry>
+ <entry>
+ <key>CIF</key>
+ </entry>
+ <entry>
+ <key>ex works</key>
+ </entry>
+ <entry>
+ <key>Relation</key>
+ </entry>
+ <entry>
+ <key>Payment terms</key>
+ </entry>
+ <entry>
+ <key>30 days net</key>
+ <value></value>
+ </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 1b9c09e7083008c9ffcb9c30fe897116e87090f6..916dcec7a1d76fdb3a1ab883ed43c1739f050397 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -718,6 +718,7 @@
</entry>
<entry>
<key>75 %</key>
+ <value></value>
</entry>
<entry>
<key>100 %</key>
@@ -3316,6 +3317,39 @@
<key>Japan</key>
<value>Japan</value>
</entry>
+ <entry>
+ <key>7 days net</key>
+ <value>7 Tage netto</value>
+ </entry>
+ <entry>
+ <key>carriage free</key>
+ <value>frei Haus</value>
+ </entry>
+ <entry>
+ <key>Delivery terms</key>
+ </entry>
+ <entry>
+ <key>8 days 2% discount, 30 days net</key>
+ <value>8 Tage 2% Skonto, 30 Tage netto</value>
+ </entry>
+ <entry>
+ <key>CIF</key>
+ </entry>
+ <entry>
+ <key>ex works</key>
+ <value>ab Werk</value>
+ </entry>
+ <entry>
+ <key>Relation</key>
+ </entry>
+ <entry>
+ <key>Payment term</key>
+ <value>Zahlungsbedingung</value>
+ </entry>
+ <entry>
+ <key>30 days net</key>
+ <value>30 Tage netto</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 89482f2d09e3521ea6104087cea0e09388248fd3..166e7600e1221c52b33ec5852770d252d5db5c97 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -2595,6 +2595,36 @@
<entry>
<key>Progress</key>
</entry>
+ <entry>
+ <key>Module</key>
+ </entry>
+ <entry>
+ <key>7 days net</key>
+ </entry>
+ <entry>
+ <key>carriage free</key>
+ </entry>
+ <entry>
+ <key>Delivery terms</key>
+ </entry>
+ <entry>
+ <key>8 days 2% discount, 30 days net</key>
+ </entry>
+ <entry>
+ <key>CIF</key>
+ </entry>
+ <entry>
+ <key>ex works</key>
+ </entry>
+ <entry>
+ <key>Relation</key>
+ </entry>
+ <entry>
+ <key>Payment terms</key>
+ </entry>
+ <entry>
+ <key>30 days net</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/neonView/OfferDetail_view/OfferDetail_view.aod b/neonView/OfferDetail_view/OfferDetail_view.aod
index c2648f53605983db816ceb6aefc6de4e888ddd29..2f5c466e65728a21f1c19bf8e5d426501df84b2d 100644
--- a/neonView/OfferDetail_view/OfferDetail_view.aod
+++ b/neonView/OfferDetail_view/OfferDetail_view.aod
@@ -16,6 +16,14 @@
<entityField>#ENTITY</entityField>
<title></title>
<fields>
+ <entityFieldLink>
+ <name>f0d0c68a-8437-4d9e-b852-575efaa984e8</name>
+ <entityField>DELIVERYTERMS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>c66f5e5b-82ad-4f93-9951-d96dfb802dbe</name>
+ <entityField>PAYMENTTERMS</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>8bf2a10e-e7e9-4f33-98cf-4ded02bf68a9</name>
<entityField>HEADER</entityField>
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index 03cec9f4c8bcc0e85f54bae8438b91a2f0554888..ca229cc9d32bbb97be616bf86ca74d75006c4340 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -44,6 +44,14 @@
<name>ac6f81a2-5012-461a-bcf1-4534182b0973</name>
<entityField>SALESPROJECT_ID</entityField>
</entityFieldLink>
+ <entityFieldLink>
+ <name>7a9b0943-eb06-4b44-a111-ed4e2749da6a</name>
+ <entityField>DELIVERYTERMS</entityField>
+ </entityFieldLink>
+ <entityFieldLink>
+ <name>1e98fe37-8d52-4eef-8825-8ea14e7e20b5</name>
+ <entityField>PAYMENTTERMS</entityField>
+ </entityFieldLink>
<entityFieldLink>
<name>ed71986f-303c-4118-a895-51ec31ba8775</name>
<entityField>HEADER</entityField>
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_DeliveryTerm.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_DeliveryTerm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..895edb0305d2c1564a21eaf218aa245b8f1cffb6
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_DeliveryTerm.xml
@@ -0,0 +1,55 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.listl" id="7fb6a9f2-88c3-49cf-9c93-9210c4ccc127">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="9509c6b8-208a-4e97-bdcd-53642d0c7489"/>
+
+ <column name="KEYID" value="7ab99d69-2a1e-4ef1-af62-aeabc7a3bc97"/>
+ <column name="TITLE" value="carriage free"/>
+ <column name="CONTAINER" value="DeliveryTerm"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="d713c45a-6f87-4516-ae21-1d8f1c217949"/>
+
+ <column name="KEYID" value="aa8713c9-ae12-4ce3-a588-0303cea11b44"/>
+ <column name="TITLE" value="CIF"/>
+ <column name="CONTAINER" value="DeliveryTerm"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="410a389b-67d4-4155-8d9e-1e8d816ecfb9"/>
+
+ <column name="KEYID" value="a4d40341-a015-4c59-9bde-f8e59582269b"/>
+ <column name="TITLE" value="ex works"/>
+ <column name="CONTAINER" value="DeliveryTerm"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <rollback>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="9509c6b8-208a-4e97-bdcd-53642d0c7489" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="d713c45a-6f87-4516-ae21-1d8f1c217949" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="410a389b-67d4-4155-8d9e-1e8d816ecfb9" />
+ </whereParams>
+ </delete>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_PaymentTerm.xml b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_PaymentTerm.xml
new file mode 100644
index 0000000000000000000000000000000000000000..dafc82509cd4f22c65d3d16cd3b944d899e18622
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/AditoBasic/init_PaymentTerm.xml
@@ -0,0 +1,55 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.listl" id="c603e739-e01a-48ca-9ef4-4dc6ecc226c1">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="b8409c4a-6447-408a-bd06-dfe67054a4f1"/>
+
+ <column name="KEYID" value="178aabbf-3f4c-415b-98bd-5f2510ea72b4"/>
+ <column name="TITLE" value="7 days net"/>
+ <column name="CONTAINER" value="PaymentTerm"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="edba1a8f-766b-4dfa-9360-1a2aca8569d6"/>
+
+ <column name="KEYID" value="c67ba0fc-2f2f-46d8-8d4d-e8fb4c27e09a"/>
+ <column name="TITLE" value="30 days net"/>
+ <column name="CONTAINER" value="PaymentTerm"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="ed1b3d39-9cab-4c3c-84c5-438a8b67be53"/>
+
+ <column name="KEYID" value="860d8e1c-ea85-426d-91c2-a78dcd14df8d"/>
+ <column name="TITLE" value="8 days 2% discount, 30 days net"/>
+ <column name="CONTAINER" value="PaymentTerm"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <rollback>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="b8409c4a-6447-408a-bd06-dfe67054a4f1" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="edba1a8f-766b-4dfa-9360-1a2aca8569d6" />
+ </whereParams>
+ </delete>
+ <delete tableName="AB_KEYWORD_ENTRY">
+ <where>AB_KEYWORD_ENTRYID = ?</where>
+ <whereParams>
+ <param value="ed1b3d39-9cab-4c3c-84c5-438a8b67be53" />
+ </whereParams>
+ </delete>
+ </rollback>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/Offer_terms.xml b/others/db_changes/data_alias/basic/2019.2/Offer_terms.xml
new file mode 100644
index 0000000000000000000000000000000000000000..89189b968b50b200f77fb830071f62f5837e3614
--- /dev/null
+++ b/others/db_changes/data_alias/basic/2019.2/Offer_terms.xml
@@ -0,0 +1,11 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
+ <changeSet author="s.listl" id="09de84ad-de1a-42f6-a403-6032480be850">
+ <addColumn tableName="OFFER">
+ <column name="PAYMENTTERMS" type="CHAR(36)"/>
+ </addColumn>
+ <addColumn tableName="OFFER">
+ <column name="DELIVERYTERMS" type="CHAR(36)"/>
+ </addColumn>
+ </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/others/db_changes/data_alias/basic/2019.2/changelog.xml b/others/db_changes/data_alias/basic/2019.2/changelog.xml
index c736ceb9e34909da0ffb88eb2a20bc03067c9808..1de36b80a0f47f7b7a339fc98c0b7ecf6ba4fe6b 100644
--- a/others/db_changes/data_alias/basic/2019.2/changelog.xml
+++ b/others/db_changes/data_alias/basic/2019.2/changelog.xml
@@ -40,7 +40,7 @@
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1008.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_salesorder/SALESORDER_1009.xml" context="example"/>
<include relativeToChangelogFile="true" file="data/example_task/base.xml" context="example"/>
-
+
<include relativeToChangelogFile="true" file="update_TaskType_Task.xml"/>
<include relativeToChangelogFile="true" file="removeTaskCode.xml"/>
@@ -75,11 +75,16 @@
<include relativeToChangelogFile="true" file="AditoBasic/init_TaskProgress.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_SalesprojectCompetitionState.xml"/>
<include relativeToChangelogFile="true" file="AditoBasic/init_AttributeType.xml"/>
+ <include relativeToChangelogFile="true" file="AditoBasic/init_PaymentTerm.xml"/>
+ <include relativeToChangelogFile="true" file="AditoBasic/init_DeliveryTerm.xml"/>
<include relativeToChangelogFile="true" file="AttributeKeyword.xml"/>
<include relativeToChangelogFile="true" file="Contact_add_columns.xml"/>
<include relativeToChangelogFile="true" file="SalesOrder_source_offer.xml"/>
<include relativeToChangelogFile="true" file="Product_remove_fk.xml"/>
+ <include relativeToChangelogFile="true" file="data/example_attribute/Attribute.xml" context="example"/>
+ <include relativeToChangelogFile="true" file="data/example_attribute/AttributeUsage.xml" context="example"/>
+
<include relativeToChangelogFile="true" file="drop_contact_id_sp_forecast.xml"/>
<include relativeToChangelogFile="true" file="fix_sp_phases.xml"/>
@@ -90,6 +95,8 @@
<include relativeToChangelogFile="true" file="create_taskLink.xml"/>
+ <include relativeToChangelogFile="true" file="Offer_terms.xml"/>
+
<include relativeToChangelogFile="true" file="add_ObjectRelation_type.xml"/>
<include relativeToChangelogFile="true" file="data/AditoBasic/ObjectRelation_exampleData.xml" context="example"/>
</databaseChangeLog>
diff --git a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
index 9ccc46c08d8a92dbf13ea0b33e0bbe3d1e85add3..7ad3f95ced078aeeab93939d4abdade69125db82 100644
--- a/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
+++ b/others/db_changes/data_alias/basic/2019.2/data/example_attribute/Attribute.xml
@@ -876,6 +876,7 @@
<column name="ATTRIBUTE_NAME" value="Zahlungskondition"/>
<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
<column name="ATTRIBUTE_TYPE" value="KEYWORD "/>
+ <column name="KEYWORD_CONTAINER" value="PaymentTerm"/>
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="3a6e11fc-b00a-4cf3-975a-a5e8b60fc5cb"/>
@@ -884,6 +885,7 @@
<column name="ATTRIBUTE_NAME" value="Lieferkondition"/>
<column name="ATTRIBUTE_PARENT_ID" value="ab545654-1fce-4993-b763-0ec469781302"/>
<column name="ATTRIBUTE_TYPE" value="KEYWORD "/>
+ <column name="KEYWORD_CONTAINER" value="DeliveryTerm"/>
</insert>
<insert tableName="AB_ATTRIBUTE">
<column name="AB_ATTRIBUTEID" value="97b449a5-d9b4-42ff-b9b0-4f8b27b8a9ec"/>
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 6c571b3e1ac1a1e843a8bc2d56aba2fe0fdee0e7..ffd3454e5163c3277b89d3bdc1f44d9b52934a40 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -58,3 +58,5 @@ $KeywordRegistry.taskPriority = function(){return "TaskPriority"};
$KeywordRegistry.taskProgress = function(){return "TaskProgress"};
$KeywordRegistry.salesprojectCompetitionState = function(){return "SalesprojectCompetitionState"};
$KeywordRegistry.objectRelationType = function(){return "ObjectRelationType"};
+$KeywordRegistry.deliveryTerm = function(){return "DeliveryTerm"};
+$KeywordRegistry.paymentTerm = function(){return "PaymentTerm"};
diff --git a/process/Offer_lib/process.js b/process/Offer_lib/process.js
index ef2ffc8cce809ab59037685c7007be611fc7cab6..b7ee707a8fcb27cc592b76705c1f072d24f11799 100644
--- a/process/Offer_lib/process.js
+++ b/process/Offer_lib/process.js
@@ -88,110 +88,115 @@ OfferUtils.createNewOffer = function(pSalesprojectId, pRelationId)
*
* @return {[]}
*/
-OfferUtils.openOfferReport = function(pOfferID)
+OfferUtils.openOfferReport = function (pOfferID)
{
var offerReport = new Report("RPTJ_OFFER");
var sqlUtil = new SqlMaskingUtils();
- // get data from DB
- // TODO: OFFER.ADDRESS
- var fields = [
- /*"OFFER.ADDRESS"*/ "''",
- "OFFER.CONTACT_ID",
- "OFFER.LANGUAGE",
- /*"OFFER.PAYMENTTERMS"*/ "'DUMMY_OFFER.PAYMENTTERMS'", // 3
- /*"OFFER.DELIVERYTERMS"*/ "'DUMMY_OFFER.DELIVERYTERMS'",
- "OFFER.OFFERCODE",
- "OFFER.CURRENCY",
- "OFFER.OFFERDATE", // 7
- "OFFER.OFFERID",
- "OFFERITEM.OFFER_ID",
+ var offerFields = [
+ "ADDRESS",
+ "CONTACT_ID",
+ "LANGUAGE",
+ "PAYMENTTERMS",
+ "DELIVERYTERMS", //4
+ "OFFERCODE",
+ "CURRENCY",
+ "OFFERDATE",
+ "HEADER", //8
+ "VAT",
+ sqlUtil.isNull("VERSNR", "0"),
+ sqlUtil.isNull("OFFERCODE", "0"),
+ "SALESPROJECT_ID" //12
+ ];
+
+ var offerSql = SqlCondition.begin()
+ .andPrepare("OFFER.OFFERID", pOfferID)
+ .buildSql("select " + offerFields.join(", ") + " from OFFER", "1 = 0");
+ var offerData = db.array(db.ROW, offerSql);
+
+ offerData[7] = datetime.toDate(offerData[7], translate.text("dd.MM.yyyy", language));
+
+ //TODO: use new keyword logic for language when possible
+ var language = "DE";
+ var contactId = offerData[1];
+
+
+ var offerItemFields = [
"OFFERITEM.INFO",
- "OFFERITEM.ASSIGNEDTO", // 11
- "OFFERITEM.PRODUCT_ID",
- "OFFERITEM.ITEMNAME" , // 13
+ "OFFERITEM.ASSIGNEDTO",
+ "OFFERITEM.PRODUCT_ID",
+ "OFFERITEM.ITEMNAME" , //3
"OFFERITEM.OPTIONAL",
- "OFFERITEM.ITEMPOSITION", // 15
+ "OFFERITEM.ITEMPOSITION",
"PRODUCT.PRODUCTCODE",
"PRODUCT.PRODUCTID",
- "OFFER.HEADER",
- "OFFERITEM.UNIT",
- "OFFER.VAT", // 20
- sqlUtil.isNull("OFFERITEM.QUANTITY", "0"),
+ "OFFERITEM.UNIT", //8
+ sqlUtil.isNull("OFFERITEM.QUANTITY", "0"),
sqlUtil.isNull("OFFERITEM.PRICE", "0"),
- sqlUtil.isNull("OFFERITEM.DISCOUNT", "0"), // 23
- sqlUtil.isNull("OFFER.VERSNR", "0"),
- sqlUtil.isNull("OFFER.OFFERCODE", "0"),
+ sqlUtil.isNull("OFFERITEM.DISCOUNT", "0"), //11
sqlUtil.isNull("OFFERITEM.VAT", "0"),
"0",
- "''",
- "SALESPROJECT_ID" // 29
+ "''"
];
- var offerFromSql = " from PRODUCT"
- + " inner join OFFERITEM on (PRODUCT.PRODUCTID = OFFERITEM.PRODUCT_ID) "
- + " inner join OFFER on (OFFERITEM.OFFER_ID = OFFER.OFFERID)";
-
- var offerCondition = SqlCondition.begin()
- .andPrepare("OFFER.OFFERID", pOfferID);
- var rptdata = db.table(offerCondition.buildSql("select " + fields.join(", ") + offerFromSql, "1 = 0"));
+ var offerItemSql = SqlCondition.begin()
+ .andPrepare("OFFERITEM.OFFER_ID", pOfferID)
+ .buildSql(
+ "select " + offerItemFields.join(", ") + " from OFFERITEM join PRODUCT on PRODUCT.PRODUCTID = OFFERITEM.PRODUCT_ID",
+ "1 = 0"
+ );
+ var itemData = db.table(offerItemSql);
- //TODO: use new keyword logic for language when possible
- var language = "DE";
- var relid = rptdata[0][1];
// TODO: AddrObject implementieren
- //var addrobj = new AddrObject(relid);
+ //var addrobj = new AddrObject(contactId);
- // new logik: Relationid from Org is always also the OrgId
- var orgrelid = relid;
-
- var fullPrice= 0;
+ var fullPrice = 0;
var itemSum = 0;
var sumItemSum = 0;
var total = 0;
var sums = [];
var vatsum = 0;
- var data = rptdata.map(function (row)
+ itemData = itemData.map(function (item)
{
//quantity * price
- fullPrice = eMath.mulDec(parseFloat(row[21]), parseFloat(row[22]));
+ fullPrice = eMath.mulDec(parseFloat(item[9]), parseFloat(item[10]));
- if (row[14] != "1") //optional
+ if (item[4] != "1") //optional
{
//itemSum = (fullPrice * (100 - discount)) / 100
- itemSum = eMath.roundDec(eMath.divDec(eMath.mulDec(fullPrice, eMath.subDec(100, row[23])), 100), 2, eMath.ROUND_HALF_EVEN); //sum of the item
+ itemSum = eMath.roundDec(eMath.divDec(eMath.mulDec(fullPrice, eMath.subDec(100, item[11])), 100), 2, eMath.ROUND_HALF_EVEN); //sum of the item
sumItemSum += itemSum; //total sum (without vat)
}
//vatsum = itemSum * vat / 100
- vatsum = eMath.divDec(eMath.mulDec(itemSum, row[26]), 100); //vat per product
- if(row[26] > 0)
- sums.push([row[26], vatsum]); //MWSteuerwerte für Map vorbereiten
+ vatsum = eMath.divDec(eMath.mulDec(itemSum, item[12]), 100); //vat per product
+ if(item[12] > 0)
+ sums.push([item[12], vatsum]); //MWSteuerwerte für Map vorbereiten
// sumItemSum + vat
- total = eMath.addDec(sumItemSum, row[20]); //total sum with vat
+ total = eMath.addDec(sumItemSum, offerData[9]); //total sum with vat
return [
- row[6], //currency
- datetime.toDate(row[7], translate.text("dd.MM.yyyy", language)), //offerdate
- row[8], //offerId
- row[10], //info
- row[11], //assignedTo
- row[13], //itemname
- row[14], //optional
- row[15], //itemposition
- row[16], //productcode
- text.html2text(row[18]), //header
- text.formatDouble(row[21], translate.text("#,##0"), true), //quantity
- text.formatDouble(row[22], translate.text("#,##0.00"), true), //price
- text.formatDouble(row[23], translate.text("0.00"), true), //discount
- row[24], //versnr
- row[25], //offercode
- text.formatDouble(row[26], translate.text("#,##0.00"), true), //vat
- text.formatDouble(itemSum, translate.text("#,##0.00"), true), //itemsum
- KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), row[19]) //unittext
+ offerData[6], //currency
+ offerData[7], //offerdate
+ pOfferId, //offerId
+ item[0], //info
+ item[1], //assignedTo
+ item[3], //itemname
+ item[4], //optional
+ item[5], //itemposition
+ item[6], //productcode
+ offerData[8], //header
+ text.formatDouble(item[9], translate.text("#,##0"), true), //quantity
+ text.formatDouble(item[10], translate.text("#,##0.00"), true), //price
+ text.formatDouble(item[11], translate.text("0.00"), true), //discount
+ offerData[10], //versnr
+ offerData[5], //offercode
+ text.formatDouble(item[12], translate.text("#,##0.00"), true), //vat
+ text.formatDouble(itemSum, translate.text("#,##0.00"), true), //itemsum
+ KeywordUtils.getViewValue($KeywordRegistry.quantityUnit(), item[8]) //unittext
];
});
@@ -207,13 +212,23 @@ OfferUtils.openOfferReport = function(pOfferID)
"base64:iVBORw0KGgoAAAANSUhEUgAAAM4AAABRCAYAAACaL5lSAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MDA4QzAyM0IwREIwMTFFNEFGMDREM0VEMjExRjlBRTIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MDA4QzAyM0MwREIwMTFFNEFGMDREM0VEMjExRjlBRTIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDowMDhDMDIzOTBEQjAxMUU0QUYwNEQzRUQyMTFGOUFFMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDowMDhDMDIzQTBEQjAxMUU0QUYwNEQzRUQyMTFGOUFFMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PhF3nYoAAAlvSURBVHja7J1fjBXV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"]
// getMyASYS_ICONSdata();
+ // TODO: implementieren wenn Attribute möglich sind
+ var adma = ""
+ /*var adm = getAddressData( [GetAttributeKey( "Aussendienst", "1", orgrelid, pUser )[0]],
+ [["Person","function", "concat( ['SALUTATION', 'TITLE', 'FIRSTNAME','LASTNAME'])"],
+ ["Telefon", "function", "getCommAddrSQL('Telefon', 'CONTACT.CONTACTID')"],
+ ["Email", "function", "getCommAddrSQL('E-Mail', 'CONTACT.CONTACTID')"]
+ ] );
+ var adma = "";
+ if (adm[1] != undefined) adma = adm[1].join("\n");*/
+
var params = {
"Zahlungsbedingung" : translate.text("Conditions of payment", language),
"Artikelbezeichnung" : translate.text("Articledescription", language),
"Lieferbedingung" : translate.text("Deliveryspecification", language),
"OFFERPers" : (AddressUtils.getLetterSalutation() + ",").toString(), // TODO: AddrObject implementieren (addrobj.formatAddress("{ls},");)
"Artikel-Nr" : translate.text("Articlenumber", language),
- "OFFERAddr" : AddressUtils.getAddress(relid).toString(), // TODO: OFFER.ADDRESS
+ "OFFERAddr" : AddressUtils.getAddress(contactId).toString(), // TODO: OFFER.ADDRESS
"zzglUMST" : translate.text("Plus Salestax", language),
"Einzelpreis" : translate.text("Unitprice", language),
"Nummer" : translate.text("Number", language),
@@ -226,23 +241,16 @@ OfferUtils.openOfferReport = function(pOfferID)
"Pos" : translate.text("Pos.", language),
"myAddr" : imgData[0],
// TODO: payment / delivery-Terms implement (if needed)
- "OFFERPay" : "", //getKeyName(rptdata[0][3] , "PAYMENTTERMS", "KEYNAME1", language);
- "OFFERDel" : "" //getKeyName(rptdata[0][4] , "DELIVERYTERMS", "KEYNAME1", language);
+
+ "OFFERPay" : KeywordUtils.getViewValue($KeywordRegistry.paymentTerm(), offerData[3]),
+ "OFFERDel" : KeywordUtils.getViewValue($KeywordRegistry.deliveryTerm(), offerData[4]),
+ "AD_Name" : adma,
+ "SUMITEMSUM" : sumItemSum,
+ "TOTAL" : text.formatDouble(total, translate.text("#,##0.00"), true),
+ "anzahl" : countDiscounts
};
- // TODO: implementieren wenn Attribute möglich sind
- var adma = ""
- /*var adm = getAddressData( [GetAttributeKey( "Aussendienst", "1", orgrelid, pUser )[0]],
- [["Person","function", "concat( ['SALUTATION', 'TITLE', 'FIRSTNAME','LASTNAME'])"],
- ["Telefon", "function", "getCommAddrSQL('Telefon', 'CONTACT.CONTACTID')"],
- ["Email", "function", "getCommAddrSQL('E-Mail', 'CONTACT.CONTACTID')"]
- ] );
- var adma = "";
- if (adm[1] != undefined) adma = adm[1].join("\n");*/
- params["AD_Name"] = adma;
- params["SUMITEMSUM"] = sumItemSum;
- params["TOTAL"] = text.formatDouble(total, translate.text("#,##0.00"), true);
- params["anzahl"] = countDiscounts;
+
offerReport.addImage("myLogo", imgData[1]);
@@ -270,7 +278,7 @@ OfferUtils.openOfferReport = function(pOfferID)
"ITEMSUM", // 16
"OFFERITEM_UNITTEXT" //17
])
- .add(data));
+ .add(itemData));
offerReport.openReport();
}
diff --git a/report/RPTJ_OFFER/reportData.jrxml b/report/RPTJ_OFFER/reportData.jrxml
index eb3f94233e15c3ef7e83778cb2158003ea1b2a37..8b2770cb5478bfdf07ba53199fc3d93e03070191 100644
--- a/report/RPTJ_OFFER/reportData.jrxml
+++ b/report/RPTJ_OFFER/reportData.jrxml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="report1" pageWidth="595" pageHeight="842" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea">
- <property name="ireport.zoom" value="1.4641000000000006"/>
+ <property name="ireport.zoom" value="1.0"/>
<property name="ireport.x" value="0"/>
- <property name="ireport.y" value="75"/>
+ <property name="ireport.y" value="0"/>
<parameter name="myAddr" class="java.lang.String"/>
<parameter name="Pos" class="java.lang.String"/>
<parameter name="Artikelbezeichnung" class="java.lang.String"/>
@@ -24,7 +24,7 @@
<parameter name="OFFERDel" class="java.lang.String"/>
<parameter name="AD_Name" class="java.lang.String"/>
<parameter name="SUBREPORT_DIR" class="java.lang.String" isForPrompting="false">
- <defaultValueExpression><![CDATA["C:\\Entwicklungszweige\\0.0\\project\\xRM-Basic2019\\report\\RPTJ_OFFER\\"]]></defaultValueExpression>
+ <defaultValueExpression><![CDATA["C:\\entwicklungszweige\\0.0\\project\\xRM-Basic2019\\report\\RPTJ_OFFER\\"]]></defaultValueExpression>
</parameter>
<parameter name="adito.datasource.subdata" class="java.lang.Object"/>
<parameter name="SUMITEMSUM" class="java.lang.Double"/>
diff --git a/report/RPTJ_OFFER/reportData_subreport1.jrxml b/report/RPTJ_OFFER/reportData_subreport1.jrxml
index 3704cb6ed86eee69055cfb7d5d0fd3eb21c6bfc0..64c7bed355e5b67b1af4d11fbbff85398b6c3105 100644
--- a/report/RPTJ_OFFER/reportData_subreport1.jrxml
+++ b/report/RPTJ_OFFER/reportData_subreport1.jrxml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="reportData_subreport1" pageWidth="200" pageHeight="802" columnWidth="200" leftMargin="0" rightMargin="0" topMargin="0" bottomMargin="0" uuid="65da6912-abcf-40ed-a854-750d851fe857">
- <property name="ireport.zoom" value="1.3310000000000004"/>
+ <property name="ireport.zoom" value="6.72749994932561"/>
<property name="ireport.x" value="0"/>
<property name="ireport.y" value="0"/>
<parameter name="zzglUMST" class="java.lang.String"/>
@@ -22,7 +22,7 @@
<textElement>
<font fontName="Segoe UI" size="8"/>
</textElement>
- <textFieldExpression><![CDATA[$P{zzglUMST} + " ( " + $F{VAT} + " %) "]]></textFieldExpression>
+ <textFieldExpression><![CDATA[$P{zzglUMST} + " (" + $F{VAT} + " %) "]]></textFieldExpression>
</textField>
<textField evaluationTime="Group" evaluationGroup="VAT" pattern="#,##0.00;-#,##0.00">
<reportElement x="117" y="0" width="80" height="15" uuid="6bba70aa-7399-45b7-805a-1590fbe07209"/>