From 98ac28782bc74aa968eac58e0bd446475adec03b Mon Sep 17 00:00:00 2001
From: "S.Listl" <S.Listl@SLISTL.aditosoftware.local>
Date: Fri, 3 May 2019 11:29:35 +0200
Subject: [PATCH] some titles fixed
---
entity/Contact_entity/Contact_entity.aod | 2 +-
entity/ObjectTree_entity/ObjectTree_entity.aod | 1 +
entity/Productprice_entity/Productprice_entity.aod | 1 +
.../entityfields/productprices/titleProcess.js | 7 +++++++
4 files changed, 10 insertions(+), 1 deletion(-)
create mode 100644 entity/Productprice_entity/entityfields/productprices/titleProcess.js
diff --git a/entity/Contact_entity/Contact_entity.aod b/entity/Contact_entity/Contact_entity.aod
index 8c758766c3f..84f14225dff 100644
--- a/entity/Contact_entity/Contact_entity.aod
+++ b/entity/Contact_entity/Contact_entity.aod
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.3" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.3">
<name>Contact_entity</name>
- <description></description>
<majorModelMode>DISTRIBUTED</majorModelMode>
<documentation>%aditoprj%/entity/Contact_entity/documentation.adoc</documentation>
<title>Contact</title>
@@ -150,6 +149,7 @@
<fieldType>DEPENDENCY_IN</fieldType>
<targetContextField>targetContext</targetContextField>
<targetIdField>CONTACTID</targetIdField>
+ <title>Other Contactroles</title>
<dependencies>
<entityDependency>
<name>34cc85f4-5555-4631-94fc-f3ad35b7ce7e</name>
diff --git a/entity/ObjectTree_entity/ObjectTree_entity.aod b/entity/ObjectTree_entity/ObjectTree_entity.aod
index 6cd325173f4..d485f8a75e4 100644
--- a/entity/ObjectTree_entity/ObjectTree_entity.aod
+++ b/entity/ObjectTree_entity/ObjectTree_entity.aod
@@ -3,6 +3,7 @@
<name>ObjectTree_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Object relation</title>
+ <titlePlural>Relations</titlePlural>
<recordContainer>jdito</recordContainer>
<entityFields>
<entityProvider>
diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod
index 8af21278894..75dbd6e872b 100644
--- a/entity/Productprice_entity/Productprice_entity.aod
+++ b/entity/Productprice_entity/Productprice_entity.aod
@@ -133,6 +133,7 @@
<entityProvider>
<name>Productprices</name>
<fieldType>DEPENDENCY_IN</fieldType>
+ <titleProcess>%aditoprj%/entity/Productprice_entity/entityfields/productprices/titleProcess.js</titleProcess>
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
diff --git a/entity/Productprice_entity/entityfields/productprices/titleProcess.js b/entity/Productprice_entity/entityfields/productprices/titleProcess.js
new file mode 100644
index 00000000000..6d9df5d404b
--- /dev/null
+++ b/entity/Productprice_entity/entityfields/productprices/titleProcess.js
@@ -0,0 +1,7 @@
+import("system.vars");
+import("system.translate");
+import("system.result");
+
+//title should be "Conditions" in Organisation
+if (vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param"))
+ result.string(translate.text("Conditions"));
\ No newline at end of file
--
GitLab