Skip to content
Snippets Groups Projects
Commit 083aa40f authored by Markus Escher's avatar Markus Escher
Browse files

fix Lookup for Contract

parent ea885b4e
No related branches found
No related tags found
No related merge requests found
......@@ -173,15 +173,6 @@
<entityIncomingField>
<name>#INCOMING</name>
</entityIncomingField>
<entityOutgoingField>
<name>ContractRelation_dfo</name>
<fieldType>DEPENDENCY_OUT</fieldType>
<dependency>
<name>dependency</name>
<entityName>Relation_entity</entityName>
<fieldName>ContractRelation_dfi</fieldName>
</dependency>
</entityOutgoingField>
<entityField>
<name>RELATION_ORG_ID</name>
</entityField>
......
......@@ -118,24 +118,16 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
<entityIncomingField>
<name>ContractRelation_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
<<<<<<< HEAD
<dependencies>
<entityDependency>
<name>b0e92b19-d9b3-4217-a2fc-9348230efb8c</name>
=======
<recordContainer>db</recordContainer>
<dependencies>
<entityDependency>
<name>c57332c1-19c2-466d-a59f-35f78ecb47af</name>
>>>>>>> add Lookup for Contract, Offer, Salesproject relationfields
<entityName>Contract_entity</entityName>
<fieldName>ContractRelation_dfo</fieldName>
<isOutgoing v="false" />
</entityDependency>
</dependencies>
</entityIncomingField>
<<<<<<< HEAD
=======
<entityIncomingField>
<name>OfferRelation_dfi</name>
<fieldType>DEPENDENCY_IN</fieldType>
......@@ -149,7 +141,6 @@ See RelationUtils.getRelationTypeByPersOrg for possible values</description>
</entityDependency>
</dependencies>
</entityIncomingField>
>>>>>>> add Lookup for Contract, Offer, Salesproject relationfields
</entityFields>
<recordContainers>
<dbRecordContainer>
......
......@@ -6,5 +6,6 @@
<aditoHomePath>$ADITOHOME</aditoHomePath>
<aditoDataPath>$PROJECTHOME/data</aditoDataPath>
<loginUser>Admin</loginUser>
<loginPassword>a</loginPassword>
<enableJDitoDebug v="true" />
</system>
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