Merge branch '#1067508-BaumtabellenOhneSinn' into '2021.0.0'

#1067508-BaumtabellenOhneSinn Baumtabellen entfernt oder gruppierung hinzugefügt

See merge request xrm/basic!636

entity/Leadimport_entity/Leadimport_entity.aod

@@ -68,7 +68,6 @@
       <name>STATUS</name>
       <title>Status</title>
       <consumer>KeywordImportStatus</consumer>
-      <groupable v="true" />
       <state>READONLY</state>
       <valueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/status/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Leadimport_entity/entityfields/status/displayValueProcess.js</displayValueProcess>
@@ -131,7 +130,6 @@
     <entityField>
       <name>IMPORTSOURCE</name>
       <title>Import source</title>
-      <groupable v="true" />
       <mandatory v="true" />
     </entityField>
     <entityConsumer>

entity/Productprice_entity/Productprice_entity.aod

@@ -25,6 +25,7 @@
       <name>CURRENCY</name>
       <title>Currency</title>
       <consumer>KeywordCurrencies</consumer>
+      <groupable v="true" />
       <mandatory v="true" />
       <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/valueProcess.js</valueProcess>
       <displayValueProcess>%aditoprj%/entity/Productprice_entity/entityfields/currency/displayValueProcess.js</displayValueProcess>
@@ -58,6 +59,7 @@
       <name>PRODUCT_ID</name>
       <title>Product</title>
       <consumer>Products</consumer>
+      <groupable v="true" />
       <linkedContext>Product</linkedContext>
       <mandatory v="true" />
       <stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/product_id/stateProcess.js</stateProcess>
@@ -93,6 +95,7 @@
       <contentType>NUMBER</contentType>
       <outputFormat>#,##0.00</outputFormat>
       <inputFormat>#,##0.00</inputFormat>
+      <groupable v="true" />
       <mandatory v="true" />
       <stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/vat/stateProcess.js</stateProcess>
       <valueProcess>%aditoprj%/entity/Productprice_entity/entityfields/vat/valueProcess.js</valueProcess>
@@ -104,6 +107,7 @@
       <title>Price list</title>
       <colorProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/colorProcess.js</colorProcess>
       <consumer>KeywordPricelists</consumer>
+      <groupable v="true" />
       <state>AUTO</state>
       <stateProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/stateProcess.js</stateProcess>
       <titleProcess>%aditoprj%/entity/Productprice_entity/entityfields/pricelist/titleProcess.js</titleProcess>
@@ -316,10 +320,6 @@
           <name>CURRENCY.displayValue</name>
           <expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/currency.displayvalue/expression.js</expression>
         </dbRecordFieldMapping>
-        <dbRecordFieldMapping>
-          <name>PRODUCT_ID.displayValue</name>
-          <expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js</expression>
-        </dbRecordFieldMapping>
         <dbRecordFieldMapping>
           <name>FROMQUANTITY.displayValue</name>
           <expression>%aditoprj%/entity/Productprice_entity/recordcontainers/db/recordfieldmappings/fromquantity.displayvalue/expression.js</expression>

entity/Productprice_entity/recordcontainers/db/recordfieldmappings/product_id.displayvalue/expression.js

-import("system.result");
-
-result.string("select PRODUCT.PRODUCTNAME from PRODUCT where PRODUCT.PRODUCTID = PRODUCTPRICE.PRODUCT_ID");
\ No newline at end of file

language/_____LANGUAGE_de/_____LANGUAGE_de.aod

@@ -1293,7 +1293,7 @@
     </entry>
     <entry>
       <key>VAT</key>
-      <value>UmsSt.</value>
+      <value>Ust.</value>
     </entry>
     <entry>
       <key>The expiry date must be after the start date!</key>
@@ -4149,7 +4149,7 @@
     </entry>
     <entry>
       <key>VAT in %</key>
-      <value>UmsSt. in %</value>
+      <value>Ust. in %</value>
     </entry>
     <entry>
       <key>Sales manager</key>
@@ -10477,10 +10477,7 @@ Bitte Datumseingabe prüfen</value>
       <key>Marketing Workflow</key>
     </entry>
     <entry>
-        <key>INSERT</key>
-    </entry>
-    <entry>
-        <key>Automatically</key>
+      <key>INSERT</key>
     </entry>
   </keyValueMap>
   <font name="Dialog" style="0" size="11" />

neonView/LeadimportFilter_view/LeadimportFilter_view.aod

@@ -36,32 +36,5 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
-    <treeTableViewTemplate>
-      <name>Treetable</name>
-      <entityField>#ENTITY</entityField>
-      <favoriteActionGroup1>observeActionGroup</favoriteActionGroup1>
-      <columns>
-        <neonTreeTableColumn>
-          <name>5b550d07-b92f-4429-a9f7-e18013aa3280</name>
-          <entityField>#IMAGE</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>e25d671d-50c8-4c77-9a2b-8214b0b87814</name>
-          <entityField>NAME</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>3ffd6131-6064-4ca2-958b-50f7eef0b3e1</name>
-          <entityField>IMPORTSOURCE</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>5fe0eed1-ed45-478d-b84e-ad65e1e5fd0a</name>
-          <entityField>LEADIMPORT_DATE</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>9563e615-fc93-406f-8cbb-2eceafc5bcc4</name>
-          <entityField>STATUS</entityField>
-        </neonTreeTableColumn>
-      </columns>
-    </treeTableViewTemplate>
   </children>
 </neonView>

neonView/SerialLetterFilter_view/SerialLetterFilter_view.aod

@@ -38,34 +38,5 @@
         </neonTableColumn>
       </columns>
     </tableViewTemplate>
-    <treeTableViewTemplate>
-      <name>Treetable</name>
-      <entityField>#ENTITY</entityField>
-      <linkedColumns>
-        <element>TITLE</element>
-      </linkedColumns>
-      <columns>
-        <neonTreeTableColumn>
-          <name>cae0d686-5109-4106-9b35-421e79e265db</name>
-          <entityField>ICON</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>a5a9f4f1-14ad-4997-94c7-f76de7c5f8da</name>
-          <entityField>TITLE</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>dc1a061a-95fa-499e-aee4-9b49aed28cfc</name>
-          <entityField>STATUS</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>ec667f9a-65e3-482c-a459-87545b22af2a</name>
-          <entityField>DOCUMENTTEMPLATE_ID</entityField>
-        </neonTreeTableColumn>
-        <neonTreeTableColumn>
-          <name>88b074e6-587a-477f-97d6-fde128cae267</name>
-          <entityField>DESCRIPTION</entityField>
-        </neonTreeTableColumn>
-      </columns>
-    </treeTableViewTemplate>
   </children>
 </neonView>