diff --git a/entity/Offer_entity/entityfields/contact_id/valueProcess.js b/entity/Offer_entity/entityfields/contact_id/valueProcess.js index 1127220726ee436e1f878c4467fa29d976d6af80..744f4812435aa9ddfa0cfb51c67aa741bc98aca0 100644 --- a/entity/Offer_entity/entityfields/contact_id/valueProcess.js +++ b/entity/Offer_entity/entityfields/contact_id/valueProcess.js @@ -1,7 +1,15 @@ +import("system.db"); import("system.result"); import("system.vars"); +import("Sql_lib"); -if (vars.exists("$param.ContactId_param")) +if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param")) { result.string(vars.get("$param.ContactId_param")); +} +else if (vars.exists("$param.SalesprojectId_param") && vars.get("$param.SalesprojectId_param")) +{ + result.string(db.cell(SqlCondition.begin() + .andPrepareVars("SALESPROJECT.SALESPROJECTID", "$param.SalesprojectId_param") + .buildSql("select CONTACT_ID from SALESPROJECT", "1=2"))); } \ No newline at end of file diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index d662fb120ad38de27b9d1d9cb36a2baa334bd99a..589fbf5c674b64632d2db1e5cd3069b41597d963 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -2602,6 +2602,15 @@ <key>30 days net</key> <value></value> </entry> + <entry> + <key>Relation tree</key> + </entry> + <entry> + <key>Directly responsible:</key> + </entry> + <entry> + <key>Payment term</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> <sqlModels> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index 508a1120f734d45ab000cdd45f825b849ff52539..114a078cbf0bba1af1126e1a3feb6d000a62c4c1 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -2909,6 +2909,7 @@ </entry> <entry> <key>Internal sales manager</key> + <value>Interner Vertrieb</value> </entry> <entry> <key>Virgin Islands (U.S.)</key> @@ -3370,6 +3371,12 @@ <key>30 days net</key> <value>30 Tage netto</value> </entry> + <entry> + <key>Payment terms</key> + </entry> + <entry> + <key>Ihr zuständiger Betreuer:</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index f30f98b43c00a7e47d860fb8f4b63c3ac3cf1e7a..3d0ec6c6c081ba1a3fad9c2df69845caf1b07c91 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -2626,6 +2626,15 @@ <entry> <key>30 days net</key> </entry> + <entry> + <key>Relation tree</key> + </entry> + <entry> + <key>Directly responsible:</key> + </entry> + <entry> + <key>Payment term</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod index 281e8f4479ea3a7009da8cc565902da8cd552389..35430f5089fee2c2b0e5c87d3278c5f9d34a897c 100644 --- a/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod +++ b/preferences/_____PREFERENCES_PROJECT/_____PREFERENCES_PROJECT.aod @@ -2,7 +2,7 @@ <preferences xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="3.1.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/preferences/3.1.0"> <name>_____PREFERENCES_PROJECT</name> <majorModelMode>DISTRIBUTED</majorModelMode> - <projectName>basic 2019</projectName> + <projectName>xRM-Basic5</projectName> <jditoMaxContentSize v="57671680" /> <calendarCategoriesEvent> <entry>