Skip to content
Snippets Groups Projects
Commit 491e2ebf authored by Maximilian Hofmann's avatar Maximilian Hofmann
Browse files

[Projekt: Entwicklung - Neon][TicketNr.: 1034075][Renaming: entity-dfi/dfo,... 

[Projekt: Entwicklung - Neon][TicketNr.: 1034075][Renaming: entity-dfi/dfo, Context und DB-Tabellen]
parent 0bd36e2a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 51 additions and 29 deletions
entity/Communication_entity/Communication_entity.aod
+ 16
− 1
View file @ 491e2ebf
......@@ -35,7 +35,7 @@
<name>ContactId_param</name>
<expose v="true" />
<description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entires by a specified contact or creating a new entry that is related to a contact.</description>
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
<entityField>
<name>IS_STANDARD</name>
......@@ -76,6 +76,11 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
<expose v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
<description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
</children>
</entityProvider>
<entityProvider>
......@@ -109,6 +114,11 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
<expose v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
<description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
</children>
</entityProvider>
<entityProvider>
......@@ -142,6 +152,11 @@ Usually this is used for filtering COMMUNICATION-entires by a specified contact
<expose v="true" />
<description>TODO: expose auf false. aktuell wird der Code nicht ausgeführt, wenn Expose false ist.</description>
</entityParameter>
<entityParameter>
<name>ContactId_param</name>
<description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
</children>
</entityProvider>
<entityParameter>
......
entity/Communication_entity/entityfields/contactsmaincountry_param/code.js
+ 2
− 3
View file @ 491e2ebf
......@@ -2,12 +2,11 @@ import("system.db");
import("system.result");
import("Sql_lib");
var relId, country, cond;
cond = new SqlCondition();
var cond = new SqlCondition();
cond.andPrepareVars("CONTACT.CONTACTID", "$param.ContactId_param");
//TODO: this should happen by 1:1 links instead of manually requesting the data by a select
country = db.cell(cond.buildSql("select ADDRESS.COUNTRY from ADDRESS "
var country = db.cell(cond.buildSql("select ADDRESS.COUNTRY from ADDRESS "
+ "join CONTACT on CONTACT.ADDRESS_ID = ADDRESS.ADDRESSID ", "1 = 1"));
if (country != "")
result.string(country);
\ No newline at end of file
entity/Offer_entity/entityfields/contact_id/onValueChange.js
+ 3
− 3
View file @ 491e2ebf
......@@ -3,10 +3,10 @@ import("system.db");
import("Util_lib");
import("Entity_lib");
var relid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"));
if(relid != "")
var contactid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"));
if(contactid != "")
{
var relData = db.array(db.ROW, "select LANGUAGE from CONTACT where CONTACTID = '" + relid + "'");
var relData = db.array(db.ROW, "select LANGUAGE from CONTACT where CONTACTID = '" + contactid + "'");
if(relData[0] != "") vars.set("$field.LANGUAGE", relData[0]);
}
\ No newline at end of file
entity/Offeritem_entity/entityfields/product_id/documentation.adoc
+ 1
− 1
View file @ 491e2ebf
......@@ -11,4 +11,4 @@ The following field are set with the values from the selected product:
* UNIT
* ITEMNAME
* PRICE & VAT: Values from the current valid price list defined to this product.
For futher informations see the comments in method __getPriceListToUse_ in _Product_lib_.
\ No newline at end of file
For further information see the comments in method __getPriceListToUse_ in _Product_lib_.
\ No newline at end of file
entity/Offeritem_entity/entityfields/product_id/onValueChange.js
+ 2
− 2
View file @ 491e2ebf
......@@ -8,9 +8,9 @@ var pid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRODUCT_ID"
if(pid != "")
{
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), relationId: relid };
var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), relationId: contactid };
var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter);
......
entity/Offeritem_entity/entityfields/quantity/onValueChange.js
+ 2
− 2
View file @ 491e2ebf
......@@ -9,9 +9,9 @@ var newQuantity = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.QUA
if(pid != "" && newQuantity != "")
{
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: relid };
var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: contactid };
var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter);
......
entity/Offeritem_entity/onDBInsert.js
+ 2
− 2
View file @ 491e2ebf
......@@ -10,10 +10,10 @@ var oid = vars.get("$field.OFFER_ID");
if(oid != "")
{
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var oiUtils = new OfferItemUtils(vars.get("$field.OFFER_ID"));
oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.OFFERITEMID"), curr, relid);
oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.OFFERITEMID"), curr, contactid);
oiUtils.reOrgItems();
//update offer price
......
entity/Offeritem_entity/recordcontainers/db/onDBInsert.js
+ 2
− 2
View file @ 491e2ebf
......@@ -11,10 +11,10 @@ var oid = vars.get("$field.OFFER_ID");
if(oid != "")
{
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var oiUtils = new OfferItemUtils(vars.get("$field.OFFER_ID"));
oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.OFFERITEMID"), curr, relid);
oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.OFFERITEMID"), curr, contactid);
oiUtils.reOrgItems();
//update offer price
......
entity/Order_entity/entityfields/contact_id/onValueChange.js
+ 3
− 3
View file @ 491e2ebf
......@@ -3,10 +3,10 @@ import("system.db");
import("Util_lib");
import("Entity_lib");
var relid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"));
if(relid != "")
var contactid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.CONTACT_ID"));
if(contactid != "")
{
var relData = db.array(db.ROW, "select LANGUAGE from CONTACT where CONTACTID = '" + relid + "'");
var relData = db.array(db.ROW, "select LANGUAGE from CONTACT where CONTACTID = '" + contactid + "'");
if(relData[0] != "") vars.set("$field.LANGUAGE", relData[0]);
}
\ No newline at end of file
entity/Orderitem_entity/entityfields/product_id/documentation.adoc
+ 1
− 1
View file @ 491e2ebf
......@@ -11,4 +11,4 @@ The following field are set with the values from the selected product:
* UNIT
* ITEMNAME
* PRICE & VAT: Values from the current valid price list defined to this product.
For futher informations see the comments in method __getPriceListToUse_ in _Product_lib_.
\ No newline at end of file
For further information see the comments in method __getPriceListToUse_ in _Product_lib_.
\ No newline at end of file
entity/Orderitem_entity/entityfields/product_id/onValueChange.js
+ 2
− 2
View file @ 491e2ebf
......@@ -8,9 +8,9 @@ var pid = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.PRODUCT_ID"
if(pid != "")
{
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), relationId: relid };
var PriceListFilter = { currency: curr, quantity: vars.get("$field.QUANTITY"), relationId: contactid };
var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter);
......
entity/Orderitem_entity/entityfields/quantity/onValueChange.js
+ 2
− 2
View file @ 491e2ebf
......@@ -9,9 +9,9 @@ var newQuantity = ProcessHandlingUtils.getOnValidationValue(vars.get("$field.QUA
if(pid != "" && newQuantity != "")
{
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: relid };
var PriceListFilter = { currency: curr, quantity: newQuantity, relationId: contactid };
var ProductDetails = ProductUtils.getProductDetails(pid, PriceListFilter);
......
entity/Orderitem_entity/recordcontainers/db/onDBInsert.js
+ 2
− 2
View file @ 491e2ebf
......@@ -11,10 +11,10 @@ var oid = vars.get("$field.SALESORDER_ID");
if(oid != "")
{
var curr = vars.exists("$param.Currency_param") ? vars.get("$param.Currency_param") : "";
var relid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var contactid = vars.exists("$param.ContactId_param") ? vars.get("$param.ContactId_param") : "";
var oiUtils = new OrderItemUtils(vars.get("$field.SALESORDER_ID"));
oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.SALESORDERITEMID"), curr, relid);
oiUtils.insertPartsList(vars.get("$field.PRODUCT_ID"), vars.get("$field.SALESORDERITEMID"), curr, contactid);
oiUtils.reOrgItems();
//update order price
......
entity/Person_entity/Person_entity.aod
+ 6
− 0
View file @ 491e2ebf
......@@ -171,6 +171,8 @@
<code>%aditoprj%/entity/Person_entity/entityfields/communications/children/contactid_param/code.js</code>
<expose v="false" />
<triggerRecalculation v="true" />
<description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
</children>
</entityConsumer>
......@@ -409,6 +411,8 @@
<name>ContactId_param</name>
<code>%aditoprj%/entity/Person_entity/entityfields/phonecommunications/children/contactid_param/code.js</code>
<expose v="false" />
<description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
</children>
</entityConsumer>
......@@ -426,6 +430,8 @@
<name>ContactId_param</name>
<code>%aditoprj%/entity/Person_entity/entityfields/emailcommunications/children/contactid_param/code.js</code>
<expose v="false" />
<description>This parameter is used for specifing a related &amp;quot;CONTACTID&amp;quot; to a COMMUNICATION-entry.
Usually this is used for filtering COMMUNICATION-entries by a specified contact or creating a new entry that is related to a contact.</description>
</entityParameter>
</children>
</entityConsumer>
......
entity/Productprice_entity/entityfields/pricelist/documentation.adoc
+ 1
− 1
View file @ 491e2ebf
......@@ -13,6 +13,6 @@ The following criteria will be checked in function _ProductUtils.checkForIndenti
* Identical from quantity
* Identical currency
* Identical purchase price/sales price
* Idcentical Valid from and valid to OR
* Identical Valid from and valid to OR
If all criteria are fulfilled, price list can not be saved.
\ No newline at end of file
entity/SalesprojectCompetition_entity/SalesprojectCompetition_entity.aod
+ 1
− 0
View file @ 491e2ebf
......@@ -129,6 +129,7 @@
<entityParameter>
<name>containerName_param</name>
<code>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/code.js</code>
<documentation>%aditoprj%/entity/SalesprojectCompetition_entity/entityfields/keywordwonlost/children/containername_param/documentation.adoc</documentation>
</entityParameter>
</children>
</entityConsumer>
......
entity/SalesprojectForecast_entity/SalesprojectForecast_entity.aod
+ 1
− 0
View file @ 491e2ebf
......@@ -74,6 +74,7 @@
<entityParameter>
<name>containerName_param</name>
<code>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/code.js</code>
<documentation>%aditoprj%/entity/SalesprojectForecast_entity/entityfields/keywordproductgroupcodes/children/containername_param/documentation.adoc</documentation>
</entityParameter>
</children>
</entityConsumer>
......
entity/SalesprojectMember_entity/entityfields/targetcontext/valueProcess.js
+ 2
− 2
View file @ 491e2ebf
import("system.result");
result.string("Person_context"); //to show the preview of the person
\ No newline at end of file
import("system.result");
result.string("Person"); //to show the preview of the person
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment