From 2bb7fa616ef355b3ebe9a83bc4e2d380bfb61de9 Mon Sep 17 00:00:00 2001 From: Jacopo Cappellato Date: Wed, 9 Aug 2006 16:55:09 +0000 Subject: [PATCH] Small misc cleanups to the form widget pdf template. git-svn-id: https://svn.apache.org/repos/asf/incubator/ofbiz/trunk@430094 13f79535-47bb-0310-9956-ffa450edef68 --- .../accounting/config/AccountingUiLabels.properties | 1 + applications/accounting/widget/AgreementScreens.xml | 7 +------ framework/common/webcommon/includes/simple.fo.ftl | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) 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}