diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod index 6f02e58b00c835587d71daba5547dfa5cd2fe4de..98cee0660b27b73f57e3344e3cbb52a67c36fd35 100644 --- a/entity/BulkMail_entity/BulkMail_entity.aod +++ b/entity/BulkMail_entity/BulkMail_entity.aod @@ -95,6 +95,7 @@ <entityField> <name>ICON</name> <contentType>IMAGE</contentType> + <state>READONLY</state> <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/icon/valueProcess.js</valueProcess> </entityField> <entityConsumer> diff --git a/entity/Contract_entity/Contract_entity.aod b/entity/Contract_entity/Contract_entity.aod index 52283a9db64a6e7fb6d341afbd64cd2076ce3bf8..a3f94750a83b31999ba354cd7364a75f21098bef 100644 --- a/entity/Contract_entity/Contract_entity.aod +++ b/entity/Contract_entity/Contract_entity.aod @@ -124,6 +124,7 @@ <entityField> <name>IMAGE</name> <contentType>IMAGE</contentType> + <state>READONLY</state> <valueProcess>%aditoprj%/entity/Contract_entity/entityfields/image/valueProcess.js</valueProcess> </entityField> <entityFieldGroup> diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod index a567633b71090d0791e1146bbf93e9b9979821ad..3963a8727f5bb17ce2d832daba4d5b22ab215bd2 100644 --- a/entity/Offer_entity/Offer_entity.aod +++ b/entity/Offer_entity/Offer_entity.aod @@ -81,6 +81,7 @@ <entityField> <name>IMAGE</name> <contentType>IMAGE</contentType> + <state>READONLY</state> <valueProcess>%aditoprj%/entity/Offer_entity/entityfields/image/valueProcess.js</valueProcess> </entityField> <entityField> diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod index 0f222669ca7a884f0a9a1701697c39bbdf286089..8d267bc62baf3910f56af57d6cb2670025bf269f 100644 --- a/entity/Order_entity/Order_entity.aod +++ b/entity/Order_entity/Order_entity.aod @@ -76,6 +76,7 @@ <entityField> <name>IMAGE</name> <contentType>IMAGE</contentType> + <state>READONLY</state> <valueProcess>%aditoprj%/entity/Order_entity/entityfields/image/valueProcess.js</valueProcess> </entityField> <entityField> diff --git a/entity/Organisation_entity/entityfields/picture/displayValueProcess.js b/entity/Organisation_entity/entityfields/picture/displayValueProcess.js index a8bad702a846e9273db756ed1bb6c1c4781591dd..2ad6742677b7f0a685be75783483833b35bebfc0 100644 --- a/entity/Organisation_entity/entityfields/picture/displayValueProcess.js +++ b/entity/Organisation_entity/entityfields/picture/displayValueProcess.js @@ -2,5 +2,9 @@ import("system.vars"); import("system.result"); import("system.neon"); -if (vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW && !vars.get("$this.value")) - result.string(vars.get("$param.AvatarText_param")); \ No newline at end of file +if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_VIEW) { + if (vars.get("$field.PICTURE")) + result.string(vars.get("$field.PICTURE")); + else + result.string(vars.get("$param.AvatarText_param")); +} diff --git a/entity/Productprice_entity/Productprice_entity.aod b/entity/Productprice_entity/Productprice_entity.aod index f7678ec46b2e1de22e5e1807873280e36b6539ba..9321eb08057c9a408477097630baf639ab107f64 100644 --- a/entity/Productprice_entity/Productprice_entity.aod +++ b/entity/Productprice_entity/Productprice_entity.aod @@ -129,6 +129,7 @@ <entityField> <name>IMAGE</name> <contentType>IMAGE</contentType> + <state>READONLY</state> <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/image/valueProcess.js</valueProcess> </entityField> <entityProvider> diff --git a/entity/Salesproject_entity/Salesproject_entity.aod b/entity/Salesproject_entity/Salesproject_entity.aod index dc45ece712f9ede183d49751dabb204edbeb1ce4..1f92dd13f74e0e423937a0277e56de37f9682934 100644 --- a/entity/Salesproject_entity/Salesproject_entity.aod +++ b/entity/Salesproject_entity/Salesproject_entity.aod @@ -295,6 +295,7 @@ <entityField> <name>IMAGE</name> <contentType>IMAGE</contentType> + <state>READONLY</state> <valueProcess>%aditoprj%/entity/Salesproject_entity/entityfields/image/valueProcess.js</valueProcess> </entityField> <entityConsumer> diff --git a/entity/SerialLetter_entity/SerialLetter_entity.aod b/entity/SerialLetter_entity/SerialLetter_entity.aod index a9ce78e8e811c97cd4ad541fee68b4e56a3d0cd7..43586c78cbdaf4830533bc17c99400a032cf081b 100644 --- a/entity/SerialLetter_entity/SerialLetter_entity.aod +++ b/entity/SerialLetter_entity/SerialLetter_entity.aod @@ -45,6 +45,7 @@ <entityField> <name>ICON</name> <contentType>IMAGE</contentType> + <state>READONLY</state> <valueProcess>%aditoprj%/entity/SerialLetter_entity/entityfields/icon/valueProcess.js</valueProcess> </entityField> <entityConsumer> diff --git a/entity/SupportTicket_entity/SupportTicket_entity.aod b/entity/SupportTicket_entity/SupportTicket_entity.aod index 55bb20dcf129a71f68038c8d61c240ebd87828f4..53a96c119287cd132e7709d310f719409b746f84 100644 --- a/entity/SupportTicket_entity/SupportTicket_entity.aod +++ b/entity/SupportTicket_entity/SupportTicket_entity.aod @@ -100,6 +100,7 @@ <name>TASK_PRIORITY_ICON</name> <colorProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_priority_icon/colorProcess.js</colorProcess> <contentType>IMAGE</contentType> + <state>READONLY</state> <valueProcess>%aditoprj%/entity/SupportTicket_entity/entityfields/task_priority_icon/valueProcess.js</valueProcess> </entityField> <entityParameter>