diff --git a/entity/Offeritem_entity/onDBInsert.js b/entity/Offeritem_entity/onDBInsert.js
index 763e536da26a84980c1a4a3b49f313865b177146..a986453959371b96d3ec2a714429cfcf6607950b 100644
--- a/entity/Offeritem_entity/onDBInsert.js
+++ b/entity/Offeritem_entity/onDBInsert.js
@@ -5,10 +5,12 @@ import("system.db");
import("system.util");
import("OfferOrder_lib");
import("Product_lib");
-
+logging.log("INSEEEERRTTTTT")
var oid = vars.get("$field.OFFER_ID");
if(oid != "")
{
+ logging.log("INSEEEERRTTTTT222222")
+
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
var relid = vars.exists("$param.RelationId_param") ? vars.get("$param.RelationId_param") : "";
diff --git a/entity/Org_entity/Org_entity.aod b/entity/Org_entity/Org_entity.aod
index 04d2ebf79c6df88431a7dfac47c5f03c5fc61d3a..b33aa1bf59d19aaa403a7f29cc3fd6b623b8d2ed 100644
--- a/entity/Org_entity/Org_entity.aod
+++ b/entity/Org_entity/Org_entity.aod
@@ -45,7 +45,6 @@
<columnName>DATE_NEW</columnName>
<contentType>DATE</contentType>
<outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
- <state>READONLY</state>
<valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_date_new/valueProcess.js</valueProcess>
<onValueChangeTypes>
<element>MASK</element>
@@ -82,7 +81,6 @@
<name>ORG_USER_NEW</name>
<tableName>ORG</tableName>
<columnName>USER_NEW</columnName>
- <state>READONLY</state>
<valueProcess>%aditoprj%/entity/Org_entity/entityfields/org_user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -99,7 +97,6 @@
<columnName>DATE_NEW</columnName>
<contentType>DATE</contentType>
<outputFormat>yyyy-MM-dd&apos;T&apos;HH:mm:ssZ</outputFormat>
- <state>READONLY</state>
<valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -140,7 +137,6 @@
<name>REL_USER_NEW</name>
<tableName>RELATION</tableName>
<columnName>USER_NEW</columnName>
- <state>READONLY</state>
<valueProcess>%aditoprj%/entity/Org_entity/entityfields/rel_user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
@@ -457,58 +453,58 @@
<name>NAME.value</name>
<value>ORG.NAME</value>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>TYPE.value</name>
- <value>ORG.TYPE</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>ORGID.value</name>
- <value>ORG.ORGID</value>
- </dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>STATUS.value</name>
- <value>RELATION.STATUS</value>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_DATE_EDIT.value</name>
<value>ORG.DATE_EDIT</value>
</dbRecordFieldMapping>
- <dbRecordFieldMapping>
- <name>REL_USER_NEW.value</name>
- <value>ORG.USER_NEW</value>
- </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_DATE_NEW.value</name>
<value>ORG.DATE_NEW</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>REL_USER_EDIT.value</name>
+ <name>ORGID.value</name>
+ <value>ORG.ORGID</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORG_USER_EDIT.value</name>
<value>ORG.USER_EDIT</value>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ORG_USER_NEW.value</name>
+ <value>ORG.USER_NEW</value>
+ </dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ORG_ID.value</name>
<value>RELATION.ORG_ID</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>REL_DATE_NEW.value</name>
- <value>RELATION.DATE_NEW</value>
+ <name>REL_DATE_EDIT.value</name>
+ <value>RELATION.DATE_EDIT</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>ORG_USER_EDIT.value</name>
- <value>ORG.USER_EDIT</value>
+ <name>REL_DATE_NEW.value</name>
+ <value>RELATION.DATE_NEW</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>REL_DATE_EDIT.value</name>
- <value>RELATION.DATE_EDIT</value>
+ <name>REL_USER_EDIT.value</name>
+ <value>RELATION.USER_EDIT</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
- <name>ORG_USER_NEW.value</name>
- <value>ORG.USER_NEW</value>
+ <name>REL_USER_NEW.value</name>
+ <value>RELATION.USER_NEW</value>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>RELATIONID.value</name>
<value>RELATION.RELATIONID</value>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>STATUS.value</name>
+ <value>RELATION.STATUS</value>
+ </dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>TYPE.value</name>
+ <value>ORG.TYPE</value>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/Org_entity/entityfields/rel_user_new/valueProcess.js b/entity/Org_entity/entityfields/rel_user_new/valueProcess.js
index 81966a3fbcd9b3cf25a186c93baa1928abc9d6d2..05a19b61b29de124296203c4fb2d5374685c0c20 100644
--- a/entity/Org_entity/entityfields/rel_user_new/valueProcess.js
+++ b/entity/Org_entity/entityfields/rel_user_new/valueProcess.js
@@ -1,6 +1,9 @@
+import("system.logging");
import("system.vars");
import("system.result");
import("system.neon");
-
+logging.log("NOOOOW")
+logging.log(vars.get("$sys.operatingstate"))
+logging.log(vars.getString("$sys.user"))
if(vars.get("$sys.operatingstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.getString("$sys.user"));
\ No newline at end of file
diff --git a/neonContext/Offeritem_context/Offeritem_context.aod b/neonContext/Offeritem_context/Offeritem_context.aod
index d541a52c517c3226f5605c3e52c7520dfa07e3ad..e36d0a25aa35d49e16b2d9fe222f5adf9d7689cf 100644
--- a/neonContext/Offeritem_context/Offeritem_context.aod
+++ b/neonContext/Offeritem_context/Offeritem_context.aod
@@ -15,5 +15,9 @@
<name>3439b9ca-cc68-47f7-bfae-676280b28cdf</name>
<view>OfferitemPreview_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>440a19f2-4893-47b9-b10c-864540b6287f</name>
+ <view>OfferitemMultiEdit_view</view>
+ </neonViewReference>
</references>
</neonContext>
diff --git a/neonView/OfferEdit_view/OfferEdit_view.aod b/neonView/OfferEdit_view/OfferEdit_view.aod
index 4868bbc72f3ce0aa480d93f80bc9bb0d4f6b99ac..01e2fb97295fc803e1d319b29ab9f39223d8c591 100644
--- a/neonView/OfferEdit_view/OfferEdit_view.aod
+++ b/neonView/OfferEdit_view/OfferEdit_view.aod
@@ -56,9 +56,9 @@
</fields>
</genericViewTemplate>
<neonViewReference>
- <name>a5e09fc0-5df1-489c-b660-414bd6f64308</name>
+ <name>a74af385-7088-4168-9e0a-22e4b73dd6fb</name>
<entityField>OfferOfferitem_dfo</entityField>
- <view>OfferitemFilter_view</view>
+ <view>OfferitemMultiEdit_view</view>
</neonViewReference>
</children>
</neonView>
diff --git a/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod b/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
new file mode 100644
index 0000000000000000000000000000000000000000..1be9462f224096e9fcefff2dac3e396d69a9d08b
--- /dev/null
+++ b/neonView/OfferitemMultiEdit_view/OfferitemMultiEdit_view.aod
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.0.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.0.0">
+ <name>OfferitemMultiEdit_view</name>
+ <majorModelMode>DISTRIBUTED</majorModelMode>
+ <layout>
+ <boxLayout>
+ <name>layout</name>
+ </boxLayout>
+ </layout>
+ <children>
+ <genericMultipleViewTemplate>
+ <name>OfferitemData</name>
+ <autoNewRow v="true" />
+ <entityField>#ENTITY</entityField>
+ <columns>
+ <neonTableColumn>
+ <name>12f27f34-ab2d-4025-99ec-5377ff392466</name>
+ <entityField>ITEMPOSITION</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>ba428fc1-4f38-4888-b48d-35ef4cec5b7c</name>
+ <entityField>PRODUCT_ID</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>6f4713ef-5642-4d2f-8ac1-eb315ca27fed</name>
+ <entityField>QUANTITY</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>9aeb9256-a31a-4a96-bae7-d9a007191254</name>
+ <entityField>UNIT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>d97355ec-c266-4ef3-ac3a-dae3507c3a85</name>
+ <entityField>PRICE</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>78f80e28-dfd1-44d5-8d7a-c45c63aa89e8</name>
+ <entityField>DISCOUNT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>d0255477-0e96-48eb-9596-c5ab523a2622</name>
+ <entityField>VAT</entityField>
+ </neonTableColumn>
+ <neonTableColumn>
+ <name>c60f6315-5b63-4c4a-96fa-eaa99b94646e</name>
+ <entityField>OPTIONAL</entityField>
+ </neonTableColumn>
+ </columns>
+ </genericMultipleViewTemplate>
+ </children>
+</neonView>
diff --git a/others/db_changes/struct/create_offer.xml b/others/db_changes/struct/create_offer.xml
index ff23a37af8837e8e9726dc342f431565ee0e40d3..a0a379cefc074d0117b645d9e267fae0e0d3b80f 100644
--- a/others/db_changes/struct/create_offer.xml
+++ b/others/db_changes/struct/create_offer.xml
@@ -9,9 +9,7 @@
<constraints nullable="false"/>
</column>
<column name="SALESPROJECT_ID" type="CHAR(36)"/>
- <column name="OFFER_ID" type="CHAR(36)">
- <constraints foreignKeyName="FK_OFFER_OFFER_ID" references="OFFER(OFFERID)"/>
- </column>
+ <column name="OFFER_ID" type="CHAR(36)"/>
<column name="HEADER" type="NCLOB"/>
<column name="FOOTER" type="NCLOB"/>
<column name="OFFERDATE" type="TIMESTAMP"/>
diff --git a/others/db_changes/struct/create_offeritem.xml b/others/db_changes/struct/create_offeritem.xml
index f393f9864a3a0ca26ab16d153ce5ce46823b39b5..d81a9e397f79b88560b180aa663a7ce7ab7019f4 100644
--- a/others/db_changes/struct/create_offeritem.xml
+++ b/others/db_changes/struct/create_offeritem.xml
@@ -5,9 +5,7 @@
<column name="OFFERITEMID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_OFFERITEM_OFFERITEMID"/>
</column>
- <column name="OFFER_ID" type="CHAR(36)">
- <constraints nullable="false" foreignKeyName="FK_OFFERITEM_OFFER_ID" references="OFFER(OFFERID)"/>
- </column>
+ <column name="OFFER_ID" type="CHAR(36)"/>
<column name="UNIT" type="INTEGER"/>
<column name="QUANTITY" type="NUMERIC(14,2)"/>
<column name="GROUPCODEID" type="INTEGER"/>
diff --git a/others/db_changes/struct/create_relation.xml b/others/db_changes/struct/create_relation.xml
index 6b150873f74b9a09873e29fe2ce45dcff2faa2c7..9be75f2ec139e0ece2c7c35a0626d698e0b06c30 100644
--- a/others/db_changes/struct/create_relation.xml
+++ b/others/db_changes/struct/create_relation.xml
@@ -4,9 +4,7 @@
<createTable tableName="RELATION">
<column name="STATUS" type="SMALLINT"/>
<column name="LANGUAGE" type="CHAR(5)"/>
- <column name="ORG_ID" type="CHAR(36)">
- <constraints nullable="false" foreignKeyName="FK_RELATION_ORG_ID" references="ORG(ORGID)"/>
- </column>
+ <column name="ORG_ID" type="CHAR(36)"/>
<column name="PERS_ID" type="CHAR(36)" />
<column name="RELATIONID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_RELATION_RELATIONID"/>