From f17c8921756d693978d51d6c3b5591f30f27bb92 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 28 Mar 2019 13:03:44 +0100
Subject: [PATCH] Salesproject fixes
---
.../entityfields/deliveryterms/valueProcess.js | 14 ++++++++------
.../newofferversion/onActionProcess.js | 4 +++-
.../SalesprojectSource_entity.aod | 1 +
neonContext/Salesproject/Salesproject.aod | 1 +
.../SalesprojectSourceFilter_view.aod | 1 +
5 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js b/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
index c1fc17cc44..2e15600563 100644
--- a/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
+++ b/entity/Offer_entity/entityfields/deliveryterms/valueProcess.js
@@ -1,7 +1,9 @@
-import("system.result");
-import("system.vars");
-
-if (vars.exists("$param.OfferDeliveryTerm_param") && vars.get("$param.OfferDeliveryTerm_param"))
-{
- result.string(vars.get("$param.OfferDeliveryTerm_param"));
+import("system.logging");
+import("system.result");
+import("system.vars");
+
+logging.log(vars.get("$param.OfferDeliveryTerm_param"))
+if (vars.exists("$param.OfferDeliveryTerm_param") && vars.get("$param.OfferDeliveryTerm_param"))
+{
+ result.string(vars.get("$param.OfferDeliveryTerm_param"));
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
index add48fbf11..be8fa6eecb 100644
--- a/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
+++ b/entity/Offer_entity/entityfields/newofferversion/onActionProcess.js
@@ -11,6 +11,8 @@ var params = {
"OfferVersnr_param" : OfferUtils.getNextOfferVersionNumber(vars.get("$field.OFFERCODE")),
"OfferCurrency_param" : vars.get("$field.CURRENCY"),
"OfferAddress_param" : vars.get("$field.ADDRESS"),
- "OfferHeader_param" : vars.get("$field.HEADER")
+ "OfferHeader_param" : vars.get("$field.HEADER"),
+ "OfferDeliveryTerm_param" : vars.get("$field.DELIVERYTERMS"),
+ "OfferPaymentTerm_param" : vars.get("$field.PAYMENTTERMS")
}
neon.openContext("Offer", null, null, neon.OPERATINGSTATE_NEW, params);
\ No newline at end of file
diff --git a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
index 41439ab453..7f5a87461d 100644
--- a/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
+++ b/entity/SalesprojectSource_entity/SalesprojectSource_entity.aod
@@ -46,6 +46,7 @@
<entityField>
<name>INFO</name>
<title>Info</title>
+ <contentType>LONG_TEXT</contentType>
</entityField>
<entityField>
<name>SALESPROJECT_ID</name>
diff --git a/neonContext/Salesproject/Salesproject.aod b/neonContext/Salesproject/Salesproject.aod
index 49cf110412..feef456053 100644
--- a/neonContext/Salesproject/Salesproject.aod
+++ b/neonContext/Salesproject/Salesproject.aod
@@ -7,6 +7,7 @@
<filterview>SalesprojectFilter_view</filterview>
<editview>SalesprojectEdit_view</editview>
<preview>SalesprojectPreview_view</preview>
+ <lookupview>SalesprojectFilter_view</lookupview>
<entity>Salesproject_entity</entity>
<references>
<neonViewReference>
diff --git a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
index 09dda8d565..a5549a7bf9 100644
--- a/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
+++ b/neonView/SalesprojectSourceFilter_view/SalesprojectSourceFilter_view.aod
@@ -11,6 +11,7 @@
<children>
<tableViewTemplate>
<name>Entries</name>
+ <autoNewRow v="true" />
<entityField>#ENTITY</entityField>
<columns>
<neonTableColumn>
--
GitLab