diff --git a/applications/accounting/config/AccountingUiLabels.properties b/applications/accounting/config/AccountingUiLabels.properties index 1cd145163e..e7ffad2997 100644 --- a/applications/accounting/config/AccountingUiLabels.properties +++ b/applications/accounting/config/AccountingUiLabels.properties @@ -591,6 +591,7 @@ AccountingInvoiceCommissionZeroInvoiceAmount=This invoice has an amount of zero, AccountingInvoiceCommissionMultHeader=Multiple orders or returns, not handled. AccountingInvoiceCommissionNoItems=No order or return items, not creating commission invoice AccountingInvoiceCommissionEntityDataProblem=Entity/data problem creating commission invoice: ${reason} +AccountingPageTitleAgreementPriceList=Agreement Price List #Potentional Common definitions FormFieldTitle_emailAddressFrom=From Emailadress diff --git a/applications/accounting/widget/AgreementScreens.xml b/applications/accounting/widget/AgreementScreens.xml index adbaa48fdc..9b850c4b97 100644 --- a/applications/accounting/widget/AgreementScreens.xml +++ b/applications/accounting/widget/AgreementScreens.xml @@ -320,14 +320,9 @@ under the License.
- - + - - - - diff --git a/framework/common/webcommon/includes/simple.fo.ftl b/framework/common/webcommon/includes/simple.fo.ftl index 2a04900502..395f97d2bb 100644 --- a/framework/common/webcommon/includes/simple.fo.ftl +++ b/framework/common/webcommon/includes/simple.fo.ftl @@ -42,7 +42,7 @@ under the License. - <#if titleProperty?exists>${titleProperty}<#else>${title?if_exists} + <#if titleProperty?exists>${uiLabelMap.get(titleProperty)}<#else>${title?if_exists} ${uiLabelMap.CommonUsername}: <#if userLogin?exists>${userLogin.userLoginId?if_exists} ${uiLabelMap.CommonDate}: ${nowTimestamp?if_exists}