Merge branch 'master' into adding-suppliers

2021-06-07 08:33:21 +02:00
parent 593228a51e 0dc1dc198d
commit 5e5ace0dd4
7 changed files with 13 additions and 7 deletions
--- a/fiori/app/common.cds
+++ b/fiori/app/common.cds
@@ -54,7 +54,7 @@ annotate my.Books with {
 	title @title:'{i18n>Title}';
 	genre  @title:'{i18n>Genre}'  @Common: { Text: genre.name,  TextArrangement: #TextOnly };
 	author @title:'{i18n>Author}' @Common: { Text: author.name, TextArrangement: #TextOnly };
-	price @title:'{i18n>Price}';
+	price @title:'{i18n>Price}' @Measures.ISOCurrency: currency_code;
 	stock @title:'{i18n>Stock}';
 	descr @UI.MultiLineText;
 }
--- a/fiori/test/requests.http
+++ b/fiori/test/requests.http
@@ -38,7 +38,11 @@ GET {{bookshop}}/browse/Books(201)?
 &$select=ID,title,rating
 &$expand=reviews

+###

+GET {{bookshop}}/browse/Books?
+  &$select=title,author&$expand=currency
+Accept-Language: de

 #################################################
 #