svn commit: r430094 - in /incubator/ofbiz/trunk: applications/accounting/config/AccountingUiLabels.properties applications/accounting/widget/AgreementScreens.xml framework/common/webcommon/includes/simple.fo.ftl

[jacopoc]

Author: jacopoc
Date: Wed Aug  9 09:55:09 2006
New Revision: 430094

URL: http://svn.apache.org/viewvc?rev=430094&view=rev
Log:
Small misc cleanups to the form widget pdf template.

Modified:
    incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
    incubator/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
    incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl

Modified: incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=430094&r1=430093&r2=430094&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Wed Aug  9 09:55:09 2006
@@ -591,6 +591,7 @@
 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

Modified: incubator/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=430094&r1=430093&r2=430094&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Wed Aug  9 09:55:09 2006
@@ -320,14 +320,9 @@
     <screen name="ListAgreementItemProductsReport">
         <section>
             <actions>
-                <set field="title" value="List Agreement Item Products"/>
-                <set field="titleProperty" value="PageTitleListAgreementItemProducts"/>
+                <set field="titleProperty" value="AccountingPageTitleAgreementPriceList"/>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
-
-            <!--<set field="logoImageUrl" value="http://localhost:8080/images/ofbiz_logo.jpg"/>-->
                 
                 <entity-one entity-name="Agreement" value-name="agreement" auto-field-map="true"/>
                 <entity-one entity-name="AgreementItem" value-name="agreementItem"/>

Modified: incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl?rev=430094&r1=430093&r2=430094&view=diff
==============================================================================
--- incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl (original)
+++ incubator/ofbiz/trunk/framework/common/webcommon/includes/simple.fo.ftl Wed Aug  9 09:55:09 2006
@@ -42,7 +42,7 @@
                         </#if>
                         </fo:table-cell>
                         <fo:table-cell>
-                            <fo:block font-weight="bold" space-after="0.03in"><#if titleProperty?exists>${titleProperty}<#else>${title?if_exists}</#if></fo:block>
+                            <fo:block font-weight="bold" space-after="0.03in"><#if titleProperty?exists>${uiLabelMap.get(titleProperty)}<#else>${title?if_exists}</#if></fo:block>
                             <fo:block>${uiLabelMap.CommonUsername}: <#if userLogin?exists>${userLogin.userLoginId?if_exists}</#if></fo:block>
                             <fo:block>${uiLabelMap.CommonDate}: ${nowTimestamp?if_exists}</fo:block>
                         </fo:table-cell>