Skip to content
Snippets Groups Projects
Commit 617a0a73 authored by Benjamin Ulrich's avatar Benjamin Ulrich :speech_balloon:
Browse files

Merge branch '2021.0_360_offercreation_contact' into '2021.0'

[Projekt: xRM-Sales][TicketNr.: 1076358][Angebotserstellung aus 360° Ansicht...

See merge request xrm/basic!780
parents cd81b6d9 b05c7a39
No related branches found
No related tags found
No related merge requests found
......@@ -3,8 +3,11 @@ import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT ||
(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW && vars.exists("$param.ContactId_param") && vars.get("$param.ContactId_param")))
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
{
result.string(neon.COMPONENTSTATE_READONLY);
}
else
result.string(OfferUtils.isEditable(vars.get("$field.STATUS")) ? neon.COMPONENTSTATE_AUTO : neon.COMPONENTSTATE_DISABLED);
\ No newline at end of file
{
result.string(OfferUtils.isEditable(vars.get("$field.STATUS")) ? neon.COMPONENTSTATE_AUTO : neon.COMPONENTSTATE_DISABLED);
}
......@@ -5,6 +5,6 @@ import("system.result");
var contactids = newSelect( "CONTACTID" )
.from("CONTACT")
.where("CONTACT.ORGANISATION_ID", vars.getString("$field.ORGANISATIONID"))
.arrayColumn();
.orderBy("CONTACT.PERSON_ID DESC").arrayColumn();
result.string( JSON.stringify(contactids) );
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment