diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod index 275128b82b1da8205db474942261350c07b96ea6..23611c626af86dd490739bbc199f8f2bb811063b 100644 --- a/aliasDefinition/Data_alias/Data_alias.aod +++ b/aliasDefinition/Data_alias/Data_alias.aod @@ -3569,20 +3569,6 @@ </customBooleanProperty> </customProperties> </entityFieldDb> - <entityFieldDb> - <name>SHOWPRICE</name> - <dbName></dbName> - <primaryKey v="false" /> - <columnType v="-7" /> - <size v="3" /> - <scale v="0" /> - <notNull v="false" /> - <isUnique v="false" /> - <index v="false" /> - <documentation></documentation> - <title></title> - <description></description> - </entityFieldDb> <entityFieldDb> <name>SHOWPRICE</name> <dbName></dbName> diff --git a/entity/Offer_entity/Offer_entity.aod b/entity/Offer_entity/Offer_entity.aod index aaa4f51ed37ef7ffa5bec09a02f054cbc9c1f3df..af1767714fc3ce7cff4e566f9ab9f3261c30c7c7 100644 --- a/entity/Offer_entity/Offer_entity.aod +++ b/entity/Offer_entity/Offer_entity.aod @@ -1508,10 +1508,6 @@ <name>netForeignCurrency.value</name> <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/netforeigncurrency.value/expression.js</expression> </dbRecordFieldMapping> - <dbRecordFieldMapping> - <name>TotalGross.value</name> - <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/totalgross.value/expression.js</expression> - </dbRecordFieldMapping> <dbRecordFieldMapping> <name>TotalGrossForeignCurrency.value</name> <expression>%aditoprj%/entity/Offer_entity/recordcontainers/db/recordfieldmappings/totalgrossforeigncurrency.value/expression.js</expression> diff --git a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/totalgross.value/expression.js b/entity/Offer_entity/recordcontainers/db/recordfieldmappings/totalgross.value/expression.js deleted file mode 100644 index 437cb3cd3f06a1ef4588c271a06e33d56d762199..0000000000000000000000000000000000000000 --- a/entity/Offer_entity/recordcontainers/db/recordfieldmappings/totalgross.value/expression.js +++ /dev/null @@ -1,7 +0,0 @@ -import("system.result"); -import("Sql_lib"); - -var netValue = SqlBuilder.caseWhen(newWhere("OFFER.DISCOUNT", "0", SqlBuilder.GREATER())).then("OFFER.DISCOUNTED_NET").elseValue("OFFER.NET").toString(); -var vatValue = SqlBuilder.caseWhen(newWhere("OFFER.DISCOUNT", "0", SqlBuilder.GREATER())).then("OFFER.DISCOUNTED_VAT").elseValue("OFFER.VAT").toString(); - -result.string(netValue + " + " + vatValue);//SqlBuilder? \ No newline at end of file diff --git a/entity/Order_entity/Order_entity.aod b/entity/Order_entity/Order_entity.aod index 4c81eac28240b4f6027e6f5a95791d2b2068c987..6f10dd928a14b8037a708dc3c21dbb55041c6e67 100644 --- a/entity/Order_entity/Order_entity.aod +++ b/entity/Order_entity/Order_entity.aod @@ -1077,24 +1077,6 @@ <iconId>VAADIN:CURLY_BRACKETS</iconId> <stateProcess>%aditoprj%/entity/Order_entity/entityfields/openadminview/stateProcess.js</stateProcess> </entityActionField> - <entityConsumer> - <name>Products</name> - <dependency> - <name>dependency</name> - <entityName>Product_entity</entityName> - <fieldName>Products</fieldName> - </dependency> - <children> - <entityParameter> - <name>OrderOfferInformations_param</name> - <valueProcess>%aditoprj%/entity/Order_entity/entityfields/products/children/orderofferinformations_param/valueProcess.js</valueProcess> - </entityParameter> - <entityParameter> - <name>ShownInOrderMainView_param</name> - <valueProcess>%aditoprj%/entity/Order_entity/entityfields/products/children/showninordermainview_param/valueProcess.js</valueProcess> - </entityParameter> - </children> - </entityConsumer> <entityField> <name>paidForeignCurrency</name> <outputFormat>#,##0.00</outputFormat>