From b8847b464ebe951399df5335abbdabf37c3d2c9a Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 11 Jan 2019 13:20:03 +0100
Subject: [PATCH] [Projekt: Entwicklung - Neon][TicketNr.:
1030899][Adressselektion in Angebot und Beleg]
---
aliasDefinition/Data_alias/Data_alias.aod | 28 +++++++++++++++++++
entity/Offer_entity/Offer_entity.aod | 11 ++++++++
.../possibleaddresses/possibleItemsProcess.js | 4 +++
entity/Offeritem_entity/Offeritem_entity.aod | 3 +-
entity/Order_entity/Order_entity.aod | 7 +++++
entity/Orderitem_entity/Orderitem_entity.aod | 3 +-
.../SalesprojectCycle_entity.aod | 1 +
others/db_changes/struct/create_offer.xml | 1 +
.../db_changes/struct/create_salesorder.xml | 1 +
9 files changed, 57 insertions(+), 2 deletions(-)
create mode 100644 entity/Offer_entity/entityfields/possibleaddresses/possibleItemsProcess.js
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 6cf60a5dd6f..1ebd7e030b6 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -2347,6 +2347,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>ADDRESS</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>
</entityFields>
</entityDb>
<entityDb>
@@ -4544,6 +4558,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>ADDRESS</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>
</entityFields>
</entityDb>
<entityDb>
diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod
index fdd8885508f..78334abd582 100644
--- a/entity/Offer_entity/Offer_entity.aod
+++ b/entity/Offer_entity/Offer_entity.aod
@@ -327,6 +327,13 @@
<fieldName>#INCOMING</fieldName>
</dependency>
</entityOutgoingField>
+ <entityField>
+ <name>ADDRESS</name>
+ </entityField>
+ <entityField>
+ <name>PossibleAddresses</name>
+ <possibleItemsProcess>%aditoprj%/entity/Offer_entity/entityfields/possibleaddresses/possibleItemsProcess.js</possibleItemsProcess>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -447,6 +454,10 @@
<name>RELATION_PERS_ID.value</name>
<recordfield>RELATION.PERS_ID</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDRESS.value</name>
+ <recordfield>OFFER.ADDRESS</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Offer_entity/entityfields/possibleaddresses/possibleItemsProcess.js b/entity/Offer_entity/entityfields/possibleaddresses/possibleItemsProcess.js
new file mode 100644
index 00000000000..fbbb4f0c71b
--- /dev/null
+++ b/entity/Offer_entity/entityfields/possibleaddresses/possibleItemsProcess.js
@@ -0,0 +1,4 @@
+import("system.result");
+import("Keyword_lib");
+
+result.object(KeywordUtils.getStandardArray("ADDRESS.TYPE"));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/Offeritem_entity.aod b/entity/Offeritem_entity/Offeritem_entity.aod
index 7b0e267ae24..bc8aff6d2b6 100644
--- a/entity/Offeritem_entity/Offeritem_entity.aod
+++ b/entity/Offeritem_entity/Offeritem_entity.aod
@@ -64,6 +64,7 @@
<name>OPTIONAL</name>
<title>Optional</title>
<contentType>BOOLEAN</contentType>
+ <mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/optional/valueProcess.js</valueProcess>
</entityField>
@@ -166,7 +167,7 @@
<entityField>
<name>INFO</name>
<documentation>%aditoprj%/entity/Offeritem_entity/entityfields/info/documentation.adoc</documentation>
- <title>Description</title>
+ <title>Note</title>
<contentType>LONG_TEXT</contentType>
<valueProcess>%aditoprj%/entity/Offeritem_entity/entityfields/info/valueProcess.js</valueProcess>
</entityField>
diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod
index 113d2fccd6d..f1e50ec43a9 100644
--- a/entity/Order_entity/Order_entity.aod
+++ b/entity/Order_entity/Order_entity.aod
@@ -301,6 +301,9 @@
<fieldName>#INCOMING</fieldName>
</dependency>
</entityOutgoingField>
+ <entityField>
+ <name>ADDRESS</name>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -417,6 +420,10 @@
<name>RELATION_PERS_ID.value</name>
<recordfield>RELATION.PERS_ID</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ADDRESS.value</name>
+ <recordfield>SALESORDER.ADDRESS</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Orderitem_entity/Orderitem_entity.aod b/entity/Orderitem_entity/Orderitem_entity.aod
index fe1270a5636..c8b87a86609 100644
--- a/entity/Orderitem_entity/Orderitem_entity.aod
+++ b/entity/Orderitem_entity/Orderitem_entity.aod
@@ -61,6 +61,7 @@
<name>OPTIONAL</name>
<title>Optional</title>
<contentType>BOOLEAN</contentType>
+ <mandatory v="true" />
<possibleItemsProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/possibleItemsProcess.js</possibleItemsProcess>
<valueProcess>%aditoprj%/entity/Orderitem_entity/entityfields/optional/valueProcess.js</valueProcess>
</entityField>
@@ -168,7 +169,7 @@
</entityIncomingField>
<entityField>
<name>INFO</name>
- <title>Description</title>
+ <title>Note</title>
</entityField>
</entityFields>
<recordContainers>
diff --git a/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod b/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
index 49f226f8382..2cda2b72852 100644
--- a/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
+++ b/entity/SalesprojectCycle_entity/SalesprojectCycle_entity.aod
@@ -13,6 +13,7 @@
<title>End date</title>
<contentType>DATE</contentType>
<resolution>DAY</resolution>
+ <searchable v="true" />
</entityField>
<entityField>
<name>DATE_START</name>
diff --git a/others/db_changes/struct/create_offer.xml b/others/db_changes/struct/create_offer.xml
index de77d4e25e6..0978ccf807b 100644
--- a/others/db_changes/struct/create_offer.xml
+++ b/others/db_changes/struct/create_offer.xml
@@ -21,6 +21,7 @@
<column name="NET" type="NUMERIC(14,2)"/>
<column name="VAT" type="NUMERIC(14,2)"/>
<column name="CURRENCY" type="INTEGER"/>
+ <column name="ADDRESS" type="NCLOB"/>
<column name="DATE_EDIT" type="TIMESTAMP"/>
<column name="DATE_NEW" type="TIMESTAMP">
<constraints nullable="false"/>
diff --git a/others/db_changes/struct/create_salesorder.xml b/others/db_changes/struct/create_salesorder.xml
index e28ce2b3a79..b19c0865518 100644
--- a/others/db_changes/struct/create_salesorder.xml
+++ b/others/db_changes/struct/create_salesorder.xml
@@ -20,6 +20,7 @@
<column name="NET" type="NUMERIC(14,2)"/>
<column name="VAT" type="NUMERIC(14,2)"/>
<column name="CURRENCY" type="INTEGER"/>
+ <column name="ADDRESS" type="NCLOB"/>
<column name="DATE_EDIT" type="TIMESTAMP"/>
<column name="DATE_NEW" type="TIMESTAMP">
<constraints nullable="false"/>
--
GitLab