From 06bda973d39b0a359d629ffae7c9873a0fa77c3d Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Fri, 12 Apr 2019 14:40:46 +0200
Subject: [PATCH] refactor: remove unneeded loggings
---
.../children/newcontract/onActionProcess.js | 1 -
.../children/newcontract/stateProcess.js | 1 -
.../recordcontainers/jdito/contentProcess.js | 2 -
.../recordcontainers/db/onDBInsert.js | 1 -
.../objectid/displayValueProcess.js | 1 -
.../objecttype/displayValueProcess.js | 18 ++++-----
.../recordcontainers/db/onDBUpdate.js | 1 -
.../entityfields/address_id/valueProcess.js | 1 -
.../recordcontainers/jdito/contentProcess.js | 1 -
.../dest_object_type/stateProcess.js | 3 --
.../recordcontainers/jdito/onDelete.js | 1 -
.../recordcontainers/jdito/onUpdate.js | 4 --
.../alter/children/insert/onActionProcess.js | 1 -
.../recordcontainers/jdito/contentProcess.js | 1 -
.../recordcontainers/jdito/contentProcess.js | 4 --
.../entityfields/contact_id/onValueChange.js | 37 +++++++++---------
.../salesproject_id/stateProcess.js | 34 ++++++++--------
.../children/contactid_param/valueProcess.js | 12 +++---
.../entityfields/discount/onValidation.js | 1 -
.../status/displayValueProcess.js | 3 +-
.../newappointment/onActionProcess.js | 27 +++++++------
.../entityfields/address_id/valueProcess.js | 2 +-
.../recordcontainers/jdito/contentProcess.js | 1 -
.../open_salesprojects/valueProcess.js | 25 ++++++------
.../overall_forecast/valueProcess.js | 25 ++++++------
.../overall_turnover/valueProcess.js | 25 ++++++------
.../entityfields/sent_offers/valueProcess.js | 23 ++++++-----
.../reasons/possibleItemsProcess.js | 9 ++---
.../recordcontainers/db/conditionProcess.js | 39 +++++++++----------
.../recordcontainers/db/onDBDelete.js | 1 -
process/ActivityTask_lib/process.js | 1 -
process/Context_lib/process.js | 1 -
process/Keyword_lib/process.js | 2 -
process/Product_lib/process.js | 1 -
process/Salesproject_lib/process.js | 2 -
process/StandardObject_lib/process.js | 1 -
36 files changed, 132 insertions(+), 181 deletions(-)
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js
index c441f436ac..0593c0ea1d 100644
--- a/entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newcontract/onActionProcess.js
@@ -1,5 +1,4 @@
import("system.vars");
import("Contract_lib");
-import("system.logging");
ContractUtils.createNewContract(vars.getString("$param.ObjectRowId_param"));
\ No newline at end of file
diff --git a/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js b/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js
index 45d4c0d1ca..fc6fedaff8 100644
--- a/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js
+++ b/entity/360Degree_entity/entityfields/newmodule/children/newcontract/stateProcess.js
@@ -1,7 +1,6 @@
import("system.result");
import("system.vars");
import("system.neon");
-import("system.logging");
var contextList = JSON.parse(vars.getString("$param.ObjectType_param"));
var found = false;
diff --git a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
index f74342ef8f..5f91637c83 100644
--- a/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/360Degree_entity/recordcontainers/jdito/contentProcess.js
@@ -1,11 +1,9 @@
-import("system.logging");
import("system.util");
import("system.db");
import("system.vars");
import("system.result");
import("Context_lib");
import("system.translate");
-import("system.logging");
var resultList = [];
if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param") && vars.exists("$param.ObjectRowId_param") && vars.get("$param.ObjectRowId_param"))
diff --git a/entity/Address_entity/recordcontainers/db/onDBInsert.js b/entity/Address_entity/recordcontainers/db/onDBInsert.js
index 4f0f20e26a..0b06b98f3f 100644
--- a/entity/Address_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Address_entity/recordcontainers/db/onDBInsert.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.vars");
import("StandardObject_lib");
diff --git a/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js b/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js
index 844708f89d..b603d5545b 100644
--- a/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js
+++ b/entity/AppointmentLink_entity/entityfields/objectid/displayValueProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.db");
import("system.vars");
import("system.result");
diff --git a/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js b/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js
index 9e7fb9a949..bc84d07a9f 100644
--- a/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js
+++ b/entity/AppointmentLink_entity/entityfields/objecttype/displayValueProcess.js
@@ -1,11 +1,9 @@
-import("system.logging");
-import("system.result");
-import("system.neon");
-import("system.vars");
-import("system.project");
-
-if (vars.exists("$field.OBJECTTYPE") && vars.get("$field.OBJECTTYPE"))
-{
- logging.log("objecttype value: " + project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECTTYPE"))[1]);
- result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECTTYPE"))[1]);
+import("system.result");
+import("system.neon");
+import("system.vars");
+import("system.project");
+
+if (vars.exists("$field.OBJECTTYPE") && vars.get("$field.OBJECTTYPE"))
+{
+ result.string(project.getDataModel(project.DATAMODEL_KIND_CONTEXT, vars.get("$field.OBJECTTYPE"))[1]);
}
\ No newline at end of file
diff --git a/entity/Communication_entity/recordcontainers/db/onDBUpdate.js b/entity/Communication_entity/recordcontainers/db/onDBUpdate.js
index 7e2690d20a..30d791c0aa 100644
--- a/entity/Communication_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Communication_entity/recordcontainers/db/onDBUpdate.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.vars");
import("StandardObject_lib");
diff --git a/entity/Contact_entity/entityfields/address_id/valueProcess.js b/entity/Contact_entity/entityfields/address_id/valueProcess.js
index d1d6810b04..0ddd690f6c 100644
--- a/entity/Contact_entity/entityfields/address_id/valueProcess.js
+++ b/entity/Contact_entity/entityfields/address_id/valueProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.result");
import("system.vars");
import("StandardObject_lib");
diff --git a/entity/Document_entity/recordcontainers/jdito/contentProcess.js b/entity/Document_entity/recordcontainers/jdito/contentProcess.js
index ccee9b0372..d58680419f 100644
--- a/entity/Document_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Document_entity/recordcontainers/jdito/contentProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.vars");
import("system.result");
import("system.db");
diff --git a/entity/ObjectRelationType_entity/entityfields/dest_object_type/stateProcess.js b/entity/ObjectRelationType_entity/entityfields/dest_object_type/stateProcess.js
index d9cbdc51a7..74da791552 100644
--- a/entity/ObjectRelationType_entity/entityfields/dest_object_type/stateProcess.js
+++ b/entity/ObjectRelationType_entity/entityfields/dest_object_type/stateProcess.js
@@ -1,10 +1,7 @@
-import("system.logging");
import("system.vars");
import("system.result");
import("system.neon");
-logging.log("hui " + vars.get("$field.Type2Enabled_proxy"))
-
if (vars.getString("$field.Type2Enabled_proxy") == "0")
{
result.string(neon.COMPONENTSTATE_DISABLED);
diff --git a/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js b/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js
index 0c99d246e9..be2ad9cda0 100644
--- a/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js
+++ b/entity/ObjectRelationType_entity/recordcontainers/jdito/onDelete.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.vars");
import("system.db");
import("system.translate");
diff --git a/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js b/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js
index 218578069a..e31eccf005 100644
--- a/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js
+++ b/entity/ObjectRelationType_entity/recordcontainers/jdito/onUpdate.js
@@ -1,11 +1,9 @@
import("Entity_lib");
-import("system.logging");
import("system.util");
import("Sql_lib");
import("system.db");
import("system.vars");
-logging.log("---------------------------")
var usageCount = db.cell(SqlCondition.begin()
.andPrepareVars("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE1", "$field.UID")
.andPrepareVars("AB_OBJECTRELATION.AB_OBJECTRELATIONTYPE2", "$field.DEST_OBJECTRELATIONTYPEID")
@@ -48,12 +46,10 @@ if (usageCount <= 0)
var type2Enabled = vars.getString("$field.Type2Enabled_proxy");
- logging.log("en " + type2Enabled)
// delete, if type2 is empty -> convert it to a "same"-type
if (type2Enabled == "0" || ((vars.get("$field.SOURCE_RELATION_TITLE") == vars.get("$field.DEST_RELATION_TITLE") && vars.get("$field.SOURCE_OBJECT_TYPE") == vars.get("$field.DEST_OBJECT_TYPE"))
|| !vars.get("$field.DEST_OBJECT_TYPE") && !vars.get("$field.DEST_RELATION_TITLE")))
{
- logging.log(vars.get("$field.DEST_OBJECTRELATIONTYPEID"))
db.deleteData("AB_OBJECTRELATIONTYPE", type2Cond);
}
else
diff --git a/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js b/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
index 2291f0b04c..cbeeeb007e 100644
--- a/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
+++ b/entity/ObjectTree_entity/entityfields/alter/children/insert/onActionProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.result");
import("system.neon");
import("system.vars");
diff --git a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
index 850e7a7b8b..b7e9b9983d 100644
--- a/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/ObjectTree_entity/recordcontainers/jdito/contentProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.db");
import("system.translate");
import("system.result");
diff --git a/entity/Object_entity/recordcontainers/jdito/contentProcess.js b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
index cc89716725..4497cff400 100644
--- a/entity/Object_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Object_entity/recordcontainers/jdito/contentProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.db");
import("system.vars");
import("system.result");
@@ -11,9 +10,6 @@ if (vars.exists("$param.ObjectType_param") && vars.get("$param.ObjectType_param"
if (vars.exists("$param.ExcludedObjectIds_param") && vars.get("$param.ExcludedObjectIds_param"))
excludedIds = JSON.parse(vars.get("$param.ExcludedObjectIds_param"));
- logging.log("aa22aa" + vars.get("$param.ExcludedObjectIds_param").toSource())
- logging.log("aa22aa" + vars.get("$param.ObjectType_param").toSource())
-
result.object(db.table(ContextUtils.getContextDataSql(vars.get("$param.ObjectType_param"), undefined, false, undefined, false, excludedIds)))
}
else
diff --git a/entity/Offer_entity/entityfields/contact_id/onValueChange.js b/entity/Offer_entity/entityfields/contact_id/onValueChange.js
index 98ae338e18..21017ee1ee 100644
--- a/entity/Offer_entity/entityfields/contact_id/onValueChange.js
+++ b/entity/Offer_entity/entityfields/contact_id/onValueChange.js
@@ -1,20 +1,19 @@
-import("system.logging");
-import("system.neon");
-import("system.vars");
-import("system.db");
-import("Util_lib");
-import("Entity_lib");
-import("Contact_lib");
-
-var contactid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"));
-if(contactid != "")
-{
- //Language Preset
- var relData = db.array(db.ROW, "select LANGUAGE from CONTACT where CONTACTID = '" + contactid + "'");
- if(relData[0] != "")
- neon.setFieldValue("field.LANGUAGE", relData[0]);
-
- // set $field.CONTATCT_ORG_ID per contactid
- var orgid = ContactUtils.getPersOrgIds(contactid);
- neon.setFieldValue("$field.CONTACT_ORG_ID", orgid[2]);
+import("system.neon");
+import("system.vars");
+import("system.db");
+import("Util_lib");
+import("Entity_lib");
+import("Contact_lib");
+
+var contactid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"));
+if(contactid != "")
+{
+ //Language Preset
+ var relData = db.array(db.ROW, "select LANGUAGE from CONTACT where CONTACTID = '" + contactid + "'");
+ if(relData[0] != "")
+ neon.setFieldValue("field.LANGUAGE", relData[0]);
+
+ // set $field.CONTATCT_ORG_ID per contactid
+ var orgid = ContactUtils.getPersOrgIds(contactid);
+ neon.setFieldValue("$field.CONTACT_ORG_ID", orgid[2]);
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js b/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js
index 1a1eb537b9..1b35d9149a 100644
--- a/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js
+++ b/entity/Offer_entity/entityfields/salesproject_id/stateProcess.js
@@ -1,19 +1,17 @@
-import("system.logging");
-import("system.neon");
-import("system.result");
-import("system.vars");
-import("Entity_lib");
-
-
-switch (vars.get("$sys.recordstate"))
-{
- case neon.OPERATINGSTATE_NEW:
- //only EDITABLE if $field.CONTACT_ID is set
- if(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID")))
- result.object(neon.COMPONENTSTATE_EDITABLE);
- else
- result.object(neon.COMPONENTSTATE_READONLY);
- break;
- default:
- result.object(neon.COMPONENTSTATE_READONLY);
+import("system.neon");
+import("system.result");
+import("system.vars");
+import("Entity_lib");
+
+switch (vars.get("$sys.recordstate"))
+{
+ case neon.OPERATINGSTATE_NEW:
+ //only EDITABLE if $field.CONTACT_ID is set
+ if(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID")))
+ result.object(neon.COMPONENTSTATE_EDITABLE);
+ else
+ result.object(neon.COMPONENTSTATE_READONLY);
+ break;
+ default:
+ result.object(neon.COMPONENTSTATE_READONLY);
}
\ No newline at end of file
diff --git a/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js b/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js
index 2b24f74fc8..f2c342bc94 100644
--- a/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js
+++ b/entity/Offer_entity/entityfields/salesprojects/children/contactid_param/valueProcess.js
@@ -1,7 +1,5 @@
-import("system.logging");
-import("system.vars");
-import("system.result");
-import("Entity_lib");
-
-var contact = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ORG_ID"));
-result.string(contact);
\ No newline at end of file
+import("system.vars");
+import("system.result");
+import("Entity_lib");
+
+result.string(ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ORG_ID")));
\ No newline at end of file
diff --git a/entity/Offeritem_entity/entityfields/discount/onValidation.js b/entity/Offeritem_entity/entityfields/discount/onValidation.js
index a929b1d08a..2864ac016f 100644
--- a/entity/Offeritem_entity/entityfields/discount/onValidation.js
+++ b/entity/Offeritem_entity/entityfields/discount/onValidation.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.result");
import("system.vars");
import("Util_lib");
diff --git a/entity/Order_entity/entityfields/status/displayValueProcess.js b/entity/Order_entity/entityfields/status/displayValueProcess.js
index d88b5bffbb..4a9b7bcc8b 100644
--- a/entity/Order_entity/entityfields/status/displayValueProcess.js
+++ b/entity/Order_entity/entityfields/status/displayValueProcess.js
@@ -1,7 +1,6 @@
-import("system.logging");
import("system.result");
import("system.vars");
import("Keyword_lib");
import("KeywordRegistry_basic");
-logging.log("loadState")
+
result.string(KeywordUtils.getViewValue($KeywordRegistry.salesorderState(), vars.get("$field.STATUS")));
diff --git a/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js b/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
index 475936e138..fde05a49a0 100644
--- a/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
+++ b/entity/Organisation_entity/entityfields/newappointment/onActionProcess.js
@@ -1,14 +1,13 @@
-import("system.vars");
-import("system.logging");
-import("system.neon");
-import("system.calendars");
-import("Calendar_lib");
-import("system.date");
-import("Context_lib");
-
-
-var params = {};
-params["Entry_param"] = JSON.stringify(CalendarUtil.createEntry(calendars.VEVENT, "neue Termin weissu", "", false, ContextUtils.getCurrentContextId(), vars.get("$field.ORGANISATIONID")));
-
-neon.openContext("Appointment", "AppointmentEdit_view", null, neon.OPERATINGSTATE_NEW, params);
-
+import("system.vars");
+import("system.neon");
+import("system.calendars");
+import("Calendar_lib");
+import("system.date");
+import("Context_lib");
+
+
+var params = {};
+params["Entry_param"] = JSON.stringify(CalendarUtil.createEntry(calendars.VEVENT, "neue Termin weissu", "", false, ContextUtils.getCurrentContextId(), vars.get("$field.ORGANISATIONID")));
+
+neon.openContext("Appointment", "AppointmentEdit_view", null, neon.OPERATINGSTATE_NEW, params);
+
diff --git a/entity/Person_entity/entityfields/address_id/valueProcess.js b/entity/Person_entity/entityfields/address_id/valueProcess.js
index 72dfe18cc0..f513144759 100644
--- a/entity/Person_entity/entityfields/address_id/valueProcess.js
+++ b/entity/Person_entity/entityfields/address_id/valueProcess.js
@@ -1,7 +1,7 @@
-import("system.logging");
import("system.result");
import("system.vars");
import("StandardObject_lib");
+
// Check if the standard address is already set.
if (vars.get("$field.ADDRESS_ID") === null || vars.get("$field.ADDRESS_ID") === "" || vars.get("$field.ADDRESS_ID") == 0) {
var possibleStandardAddressID = new StandardObject("Address", null, "Person", vars.get("$field.PERSONID"))
diff --git a/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js b/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
index eeef1e962f..bb5fcc0559 100644
--- a/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
+++ b/entity/Prod2prod_entity/recordcontainers/jdito/contentProcess.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.neon");
import("system.result");
import("system.vars");
diff --git a/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js
index d58be99a6a..edfcaddcb8 100644
--- a/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js
+++ b/entity/SalesprojectAnalyses_entity/entityfields/open_salesprojects/valueProcess.js
@@ -1,14 +1,13 @@
-import("system.datetime");
-import("system.db");
-import("system.result");
-import("system.vars");
-import("Date_lib");
-import("system.logging");
-import("Sql_lib");
-import("system.SQLTYPES")
-
-var opensp = db.cell("select count(STATE) from SALESPROJECT \n\
-join AB_KEYWORD_ENTRY on KEYID = STATE and CONTAINER = 'SalesprojectState' and TITLE = 'Open' \n\
-group by KEYID, AB_KEYWORD_ENTRY.TITLE");
-
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Date_lib");
+import("Sql_lib");
+import("system.SQLTYPES")
+
+var opensp = db.cell("select count(STATE) from SALESPROJECT \n\
+join AB_KEYWORD_ENTRY on KEYID = STATE and CONTAINER = 'SalesprojectState' and TITLE = 'Open' \n\
+group by KEYID, AB_KEYWORD_ENTRY.TITLE");
+
result.string(opensp);
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js
index b1f1ae8c00..48cfc63206 100644
--- a/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js
+++ b/entity/SalesprojectAnalyses_entity/entityfields/overall_forecast/valueProcess.js
@@ -1,14 +1,13 @@
-import("system.datetime");
-import("system.db");
-import("system.result");
-import("system.vars");
-import("Date_lib");
-import("system.logging");
-import("Sql_lib");
-import("system.SQLTYPES")
-
-var forecast = db.cell(SqlCondition.begin()
- .andPrepare("SALESPROJECT_FORECAST.DATE_START", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
- .buildSql("select sum(VOLUME * 1000) from SALESPROJECT_FORECAST", "1=2"));
-
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Date_lib");
+import("Sql_lib");
+import("system.SQLTYPES")
+
+var forecast = db.cell(SqlCondition.begin()
+ .andPrepare("SALESPROJECT_FORECAST.DATE_START", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
+ .buildSql("select sum(VOLUME * 1000) from SALESPROJECT_FORECAST", "1=2"));
+
result.string(forecast);
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js
index a08d40a129..9c8e5ea68d 100644
--- a/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js
+++ b/entity/SalesprojectAnalyses_entity/entityfields/overall_turnover/valueProcess.js
@@ -1,14 +1,13 @@
-import("system.datetime");
-import("system.db");
-import("system.result");
-import("system.vars");
-import("Date_lib");
-import("system.logging");
-import("Sql_lib");
-import("system.SQLTYPES")
-
-var turnover = db.cell(SqlCondition.begin()
- .andPrepare("SALESORDER.SALESORDERDATE", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
- .buildSql("select sum(NET + VAT) from SALESORDER", "1=2"));
-
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Date_lib");
+import("Sql_lib");
+import("system.SQLTYPES")
+
+var turnover = db.cell(SqlCondition.begin()
+ .andPrepare("SALESORDER.SALESORDERDATE", datetime.toDate(vars.get("$sys.date"), "yyyy"), "year(#) = ?", SQLTYPES.INTEGER)
+ .buildSql("select sum(NET + VAT) from SALESORDER", "1=2"));
+
result.string(turnover);
\ No newline at end of file
diff --git a/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js b/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js
index c415d73135..8d610d08ab 100644
--- a/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js
+++ b/entity/SalesprojectAnalyses_entity/entityfields/sent_offers/valueProcess.js
@@ -1,13 +1,12 @@
-import("system.datetime");
-import("system.db");
-import("system.result");
-import("system.vars");
-import("Date_lib");
-import("system.logging");
-import("Sql_lib");
-import("system.SQLTYPES")
-
-var sentoffer = db.cell("select count(STATUS) from OFFER join AB_KEYWORD_ENTRY \n\
-on KEYID = STATUS and CONTAINER = 'OfferStatus' and TITLE = 'Sent' group by KEYID, AB_KEYWORD_ENTRY.TITLE");
-
+import("system.datetime");
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Date_lib");
+import("Sql_lib");
+import("system.SQLTYPES")
+
+var sentoffer = db.cell("select count(STATUS) from OFFER join AB_KEYWORD_ENTRY \n\
+on KEYID = STATUS and CONTAINER = 'OfferStatus' and TITLE = 'Sent' group by KEYID, AB_KEYWORD_ENTRY.TITLE");
+
result.string(sentoffer);
\ No newline at end of file
diff --git a/entity/Salesproject_entity/entityfields/reasons/possibleItemsProcess.js b/entity/Salesproject_entity/entityfields/reasons/possibleItemsProcess.js
index 82ceaf9374..650da662b9 100644
--- a/entity/Salesproject_entity/entityfields/reasons/possibleItemsProcess.js
+++ b/entity/Salesproject_entity/entityfields/reasons/possibleItemsProcess.js
@@ -1,6 +1,5 @@
-import("system.logging");
-import("system.result");
-import("Keyword_lib");
-import("KeywordRegistry_basic");
-
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
result.object(KeywordUtils.getEntryNamesAndIdsByContainer("SalesprojectWonLost"));
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js b/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
index 49d846ad22..f3a32a333d 100644
--- a/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
+++ b/entity/Salesproject_entity/recordcontainers/db/conditionProcess.js
@@ -1,21 +1,20 @@
-import("system.logging");
-import("system.db");
-import("system.result");
-import("system.vars");
-import("Sql_lib");
-
-if(vars.exists("$param.State_param") && vars.get("$param.State_param") && vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
-{
- result.string(db.translateCondition(
- SqlCondition.begin()
- .andPrepareVars("SALESPROJECT.CONTACT_ID", "$param.ContactId_param")
- .andPrepareVars("SALESPROJECT.STATE", "$param.State_param")
- .build("1 = 2")));
-}
-else
-{
- result.string(db.translateCondition(
- SqlCondition.begin()
- .andPrepareVars("SALESPROJECT.CONTACT_ID", "$param.ContactId_param")
- .build("1 = 1")));
+import("system.db");
+import("system.result");
+import("system.vars");
+import("Sql_lib");
+
+if(vars.exists("$param.State_param") && vars.get("$param.State_param") && vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
+{
+ result.string(db.translateCondition(
+ SqlCondition.begin()
+ .andPrepareVars("SALESPROJECT.CONTACT_ID", "$param.ContactId_param")
+ .andPrepareVars("SALESPROJECT.STATE", "$param.State_param")
+ .build("1 = 2")));
+}
+else
+{
+ result.string(db.translateCondition(
+ SqlCondition.begin()
+ .andPrepareVars("SALESPROJECT.CONTACT_ID", "$param.ContactId_param")
+ .build("1 = 1")));
}
\ No newline at end of file
diff --git a/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
index 45345082bb..65d94ab76d 100644
--- a/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
+++ b/entity/Salesproject_entity/recordcontainers/db/onDBDelete.js
@@ -1,5 +1,4 @@
import("system.db");
-import("system.logging");
import("system.vars");
import("Sql_lib");
diff --git a/process/ActivityTask_lib/process.js b/process/ActivityTask_lib/process.js
index 8f7de2b78e..f68618c237 100644
--- a/process/ActivityTask_lib/process.js
+++ b/process/ActivityTask_lib/process.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.vars");
import("system.util");
import("system.datetime");
diff --git a/process/Context_lib/process.js b/process/Context_lib/process.js
index 4d86570ae5..881dbcdf80 100644
--- a/process/Context_lib/process.js
+++ b/process/Context_lib/process.js
@@ -6,7 +6,6 @@ import("Keyword_lib");
import("Sql_lib");
import("Proto_lib");
import("Contact_lib");
-import("system.logging");
/**
* Methods to manage contexts.
diff --git a/process/Keyword_lib/process.js b/process/Keyword_lib/process.js
index 2df66cbf60..971a45c630 100644
--- a/process/Keyword_lib/process.js
+++ b/process/Keyword_lib/process.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.vars");
import("system.SQLTYPES");
import("system.db");
@@ -204,7 +203,6 @@ KeywordUtils.exists = function(pKeyId, pContainerName)
.andPrepare("AB_KEYWORD_ENTRY.KEYID", pKeyId)
.andPrepare("AB_KEYWORD_ENTRY.CONTAINER", pContainerName)
.buildSql("select count(*) from AB_KEYWORD_ENTRY", "1=2")
- logging.log(db.cell(sql))
return parseInt(db.cell(sql)) > 0;
};
diff --git a/process/Product_lib/process.js b/process/Product_lib/process.js
index 4780833eed..cc2645e75e 100644
--- a/process/Product_lib/process.js
+++ b/process/Product_lib/process.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.util");
import("system.SQLTYPES");
import("system.datetime");
diff --git a/process/Salesproject_lib/process.js b/process/Salesproject_lib/process.js
index b9a24ffdad..ba78c7709d 100644
--- a/process/Salesproject_lib/process.js
+++ b/process/Salesproject_lib/process.js
@@ -1,5 +1,4 @@
import("Sql_lib");
-import("system.logging");
import("system.neon");
import("system.vars");
import("system.util");
@@ -49,7 +48,6 @@ Salesproject.validateProjectNumber = function(projectNumber) {
* @result {Boolean} true if inserted, else false
*/
Salesproject.insertMilestone = function(salesprojectId, type, value, notifyForecast) {
- logging.log(type + " " + value + " " + KeywordUtils.exists(value, type))
if (KeywordUtils.exists(value, type)) {
db.updateData(
"SALESPROJECT_MILESTONE",
diff --git a/process/StandardObject_lib/process.js b/process/StandardObject_lib/process.js
index 4e39fc12e4..11ad559a92 100644
--- a/process/StandardObject_lib/process.js
+++ b/process/StandardObject_lib/process.js
@@ -1,4 +1,3 @@
-import("system.logging");
import("system.db");
import("Keyword_lib");
import("KeywordRegistry_basic");
--
GitLab