Merge branch 'sales_1079745_offerorder_company_person_filter' into '2021.2'

[Projekt: xRM-Sales][TicketNr.: 1079745][Offer_entity: Filter 'Firma' und...

See merge request xrm/basic!1481

entity/Offer_entity/Offer_entity.aod

@@ -1265,13 +1265,13 @@
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ORG_ID.value</name>
-          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
+          <recordfield>CONTACT.CONTACTID</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="false" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_PERSON_ID.value</name>
-          <recordfield>CONTACT.PERSON_ID</recordfield>
+          <recordfield>CONTACT.CONTACTID</recordfield>
           <isFilterable v="true" />
           <isLookupFilter v="false" />
         </dbRecordFieldMapping>

entity/Order_entity/Order_entity.aod

@@ -1099,15 +1099,13 @@
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_ORG_ID.value</name>
-          <recordfield>CONTACT.ORGANISATION_ID</recordfield>
-          <isFilterable v="false" />
-          <isLookupFilter v="false" />
+          <recordfield>CONTACT.CONTACTID</recordfield>
+          <isFilterable v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CONTACT_PERSON_ID.value</name>
-          <recordfield>CONTACT.PERSON_ID</recordfield>
-          <isFilterable v="false" />
-          <isLookupFilter v="false" />
+          <recordfield>CONTACT.CONTACTID</recordfield>
+          <isFilterable v="true" />
         </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>CURRENCY.displayValue</name>