Skip to content
Snippets Groups Projects
Commit b5d95a49 authored by Johannes Hörmann's avatar Johannes Hörmann
Browse files

Merge origin/master

parents a0a3c037 8f68b311
No related branches found
No related tags found
No related merge requests found
......@@ -153,7 +153,7 @@
<name>ORG_ID</name>
<title>Firma</title>
<linkedContextProcess>%aditoprj%/entity/Pers_entity/entityfields/org_id/linkedContextProcess.js</linkedContextProcess>
<mandatory v="true" />
<mandatory v="false" />
<outgoingField>PersOrg_dfo</outgoingField>
<searchable v="false" />
<valueProcess>%aditoprj%/entity/Pers_entity/entityfields/org_id/valueProcess.js</valueProcess>
......@@ -546,7 +546,7 @@
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>PERS_DATE_NEW.value</name>
<recordfield>ORG.DATE_NEW</recordfield>
<recordfield>PERS.DATE_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>MIDDLENAME.value</name>
......
import("system.result");
import("system.vars");
if (vars.exists("$param.OrgId_param"))
if (vars.exists("$param.OrgId_param") && vars.get("$param.OrgId_param") != null)
{
result.string(vars.get("$param.OrgId_param"));
}
\ No newline at end of file
}
else if(!vars.get("$field.ORG_ID"))
{
result.string("0")
}
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