[OFBiz] SVN: r7896 - in trunk/applications/accounting: webapp/accounting webapp/accounting/fixedasset webapp/accounting/invoice webapp/accounting/payment widget
jacopo@svn.ofbiz.org
jacopo at svn.ofbiz.org
Wed Jun 28 13:45:58 CDT 2006
Author: jacopo
Date: 2006-06-28 13:45:30 -0500 (Wed, 28 Jun 2006)
New Revision: 7896
Modified:
trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl
trunk/applications/accounting/webapp/accounting/main.ftl
trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl
trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl
trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl
trunk/applications/accounting/widget/AccountingPrintForms.xml
trunk/applications/accounting/widget/FixedAssetScreens.xml
trunk/applications/accounting/widget/PaymentScreens.xml
Log:
Applied i18n patch from Marco Risaliti (Apache OFBIZ-25).
Modified: trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml 2006-06-28 17:30:46 UTC (rev 7895)
+++ trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml 2006-06-28 18:45:30 UTC (rev 7896)
@@ -23,7 +23,7 @@
<form name="ListFixedAssets" type="list" list-name="fixedAssets"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" widget-style="linktext">
+ <field name="fixedAssetId" widget-style="linktext">
<hyperlink also-hidden="false" description="${fixedAssetId}" target="EditFixedAsset?fixedAssetId=${fixedAssetId}"/>
</field>
<field name="fixedAssetName" title="${uiLabelMap.AccountingFixedAssetName}">
@@ -44,11 +44,11 @@
<alt-target use-when="fixedAsset==null" target="createFixedAsset"/>
<auto-fields-service service-name="updateFixedAsset" map-name="fixedAsset"/>
- <field use-when="fixedAsset!=null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
- <field use-when="fixedAsset==null&&fixedAssetId==null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}"><text size="20" maxlength="20"/></field>
- <field use-when="fixedAsset==null&&fixedAssetId!=null" name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" tooltip="${uiLabelMap.CommonCannotBeFound}:[${fixedAssetId}]"><text size="20" maxlength="20"/></field>
+ <field use-when="fixedAsset!=null" name="fixedAssetId" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field>
+ <field use-when="fixedAsset==null&&fixedAssetId==null" name="fixedAssetId"><text size="20" maxlength="20"/></field>
+ <field use-when="fixedAsset==null&&fixedAssetId!=null" name="fixedAssetId" tooltip="${uiLabelMap.CommonCannotBeFound}:[${fixedAssetId}]"><text size="20" maxlength="20"/></field>
- <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}" widget-style="selectBox">
+ <field name="fixedAssetTypeId" widget-style="selectBox">
<drop-down allow-empty="false">
<entity-options entity-name="FixedAssetType" description="${description}">
<entity-order-by field-name="description"/>
@@ -87,7 +87,7 @@
</entity-options>
</drop-down>
</field>
- <field name="parentFixedAssetId" title="${uiLabelMap.AccountingFixedAssetParent}"><lookup target-form-name="LookupFixedAsset"/></field>
+ <field name="parentFixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -138,7 +138,7 @@
<form name="listFixedAssetCalendar" type="list" default-required-field-style="calendar" list-name="weeks" target="updateFixedAssetProductCalendar"
default-title-style="calendarHeader" default-title-area-style="calendarHeader" default-widget-style="calendarContent" default-tooltip-style="tabletext">
- <field name="week" title="${uiLabelMap.Common${month}} ${year}" widget-area-style="calendarWeek" widget-style="calendarWeek"><display description="Week ${week}"/></field>
+ <field name="week" title="${uiLabelMap.Common${month}} ${year}" widget-area-style="calendarWeek" widget-style="calendarWeek"><display description="${uiLabelMap.CommonWeek} ${week}"/></field>
<field name="Monday" title="" widget-style="calendarDayNumber"><display/></field>
<field name="MondayData" title="${uiLabelMap.CommonMonday}"><display/></field>
<field name="Tuesday" title="" widget-style="calendarDayNumber"><display/></field>
@@ -208,14 +208,14 @@
<form name="ListFixedAssets" type="list" list-name="fixedAssets"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
- <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" widget-style="linktext">
+ <field name="fixedAssetId" widget-style="linktext">
<hyperlink also-hidden="false" description="${fixedAssetId}" target="EditFixedAsset?fixedAssetId=${fixedAssetId}"/>
</field>
<field name="fixedAssetName" title="${uiLabelMap.AccountingFixedAssetName}">
<display/>
</field>
- <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedTypeId}"><display-entity entity-name="FixedAssetType"/></field>
- <field name="parentFixedAssetId" title="${uiLabelMap.AccountingFixedAssetParentId}">
+ <field name="fixedAssetTypeId"><display-entity entity-name="FixedAssetType"/></field>
+ <field name="parentFixedAssetId">
<display-entity entity-name="FixedAsset" key-field-name="fixedAssetId" description="${fixedAssetName}">
<sub-hyperlink target="EditFixedAsset?fixedAssetId=${parentFixedAssetId}" description="${parentFixedAssetId}" link-style="buttontext"/>
</display-entity>
Modified: trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml 2006-06-28 17:30:46 UTC (rev 7895)
+++ trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml 2006-06-28 18:45:30 UTC (rev 7896)
@@ -273,7 +273,7 @@
<field name="total" widget-area-style="tabletextright" widget-style="tabletext" use-when="uomId==null"><display type="currency" currency="${invoice.currencyUomId}"/></field> <!-- this should not look like something you can modify, hence "tabletext" -->
<field name="uomId"><hidden/></field>
<field name="taxableFlag"><hidden/></field>
- <field name="updateButton" widget-style="buttontext" ><submit button-type="text-link"/></field>
+ <field name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext" ><submit button-type="text-link"/></field>
<field name="removeButton" title="" widget-style="buttontext">
<hyperlink description="${uiLabelMap.CommonRemove}" target="removeInvoiceItem?invoiceId=${invoiceId}&invoiceItemSeqId=${invoiceItemSeqId}"/>
</field>
@@ -325,10 +325,10 @@
<option key="N" description="No"/>
</drop-down>
</field>
- <field name="addButton" widget-style="smallSubmit" use-when="invoiceItem==null">
+ <field name="addButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit" use-when="invoiceItem==null">
<submit button-type="button"/>
</field>
- <field name="updateButton" widget-style="smallSubmit" use-when="invoiceItem!=null">
+ <field name="updateButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit" use-when="invoiceItem!=null">
<submit button-type="button"/>
</field>
</form>
@@ -439,6 +439,6 @@
<field name="emailAddressCc" entry-name="ccEmailAddress" parameter-name="sendCc"><text/></field>
<field name="subject"><text default-value="Please find attached invoice."/></field>
<field name="bodyText"><textarea/></field>
- <field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
</forms>
Modified: trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl 2006-06-28 17:30:46 UTC (rev 7895)
+++ trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl 2006-06-28 18:45:30 UTC (rev 7896)
@@ -69,7 +69,7 @@
<fo:table-body>
<fo:table-row>
<fo:table-cell>
- <fo:block number-columns-spanned="2" font-weight="bold" wrap-option="no-wrap">${invoice.getRelatedOne("InvoiceType").get("description")}</fo:block>
+ <fo:block number-columns-spanned="2" font-weight="bold" wrap-option="no-wrap">${invoice.getRelatedOne("InvoiceType").get("description",locale)}</fo:block>
</fo:table-cell>
</fo:table-row>
@@ -93,7 +93,7 @@
<!--fo:table-row>
<fo:table-cell><fo:block>${uiLabelMap.CommonStatus}</fo:block></fo:table-cell>
- <fo:table-cell><fo:block font-weight="bold">${invoiceStatus.description}</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block font-weight="bold">${invoiceStatus.get("description",locale)}</fo:block></fo:table-cell>
</fo:table-row-->
</fo:table-body>
</fo:table>
@@ -133,7 +133,7 @@
<#-- this part is the footer. Use it for standard boilerplate text. -->
<fo:static-content flow-name="xsl-region-after">
<#-- displays page number. "theEnd" is an id of a fo:block at the very end -->
- <fo:block font-size="10pt" text-align="center">Page <fo:page-number/> of <fo:page-number-citation ref-id="theEnd"/></fo:block>
+ <fo:block font-size="10pt" text-align="center">${uiLabelMap.CommonPage} <fo:page-number/> ${uiLabelMap.CommonOf} <fo:page-number-citation ref-id="theEnd"/></fo:block>
<fo:block font-size="10pt"/>
<fo:block font-size="8pt" text-align="center">Powered by OFBiz at www.ofbiz.org</fo:block>
</fo:static-content>
@@ -191,10 +191,10 @@
</#if>
<#if invoiceItem.description?has_content>
<#assign description=invoiceItem.description>
- <#elseif taxRate?exists & taxRate.description?has_content>
- <#assign description=taxRate.description>
- <#elseif itemType.description?has_content>
- <#assign description=itemType.description>
+ <#elseif taxRate?exists & taxRate.get("description",locale)?has_content>
+ <#assign description=taxRate.get("description",locale)>
+ <#elseif itemType.get("description",locale)?has_content>
+ <#assign description=itemType.get("description",locale)>
</#if>
<#if newShipmentId?exists & newShipmentId != currentShipmentId>
@@ -205,7 +205,7 @@
</fo:table-row>
<fo:table-row height="14px">
<fo:table-cell number-columns-spanned="6">
- <fo:block font-weight="bold"> Shipment: ${newShipmentId} </fo:block>
+ <fo:block font-weight="bold"> ${uiLabelMap.ProductShipmentId}: ${newShipmentId} </fo:block>
</fo:table-cell>
</fo:table-row>
<#assign currentShipmentId = newShipmentId>
Modified: trunk/applications/accounting/webapp/accounting/main.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/main.ftl 2006-06-28 17:30:46 UTC (rev 7895)
+++ trunk/applications/accounting/webapp/accounting/main.ftl 2006-06-28 18:45:30 UTC (rev 7896)
@@ -53,7 +53,7 @@
<tr>
<td colspan="3">
<ul>
-<li><a href="<@ofbizUrl>ListFixedAssets</@ofbizUrl>">${uiLabelMap.CommonShowAll} ${uiLabelMap.AccountingFixedAssets}</a></li>
+<li><a href="<@ofbizUrl>ListFixedAssets</@ofbizUrl>">${uiLabelMap.AccountingShowAllFixedAssets}</a></li>
</ul>
<br/>
</td>
@@ -66,21 +66,21 @@
<tr valign="top">
<td>
<ul>
-<li><a href="<@ofbizUrl>findInvoices?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.CommonShowAll} ${uiLabelMap.AccountingInvoices}</a></li>
+<li><a href="<@ofbizUrl>findInvoices?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.AccountingShowAllInvoices}</a></li>
</ul>
</td>
<td>
<ul>
<#list invoiceTypes as invoiceType>
-<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">${uiLabelMap.CommonShow} ${invoiceType.get("description",locale)} ${uiLabelMap.AccountingInvoices}</a></li>
+<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${invoiceType.get("description",locale)}</a></li>
</#list>
</ul>
</td>
<td>
<ul>
<#list invoiceStatus as status>
-<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.CommonShow} ${status.get("description",locale)} ${uiLabelMap.AccountingInvoices}</a></li>
+<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowInvoices} ${status.get("description",locale)}</a></li>
</#list>
</ul>
</td>
@@ -93,14 +93,14 @@
<tr valign="top">
<td>
<ul>
-<li><a href="<@ofbizUrl>findPayments?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.CommonShowAll} ${uiLabelMap.AccountingPayments}</a></li>
+<li><a href="<@ofbizUrl>findPayments?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.AccountingShowAllPayments}</a></li>
</ul>
</td>
<td>
<ul>
<#list paymentTypes as paymentType>
-<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentTypeId=${paymentType.paymentTypeId}</@ofbizUrl>">${uiLabelMap.CommonShow} ${paymentType.get("description",locale)} ${uiLabelMap.AccountingPayments}</a></li>
+<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentTypeId=${paymentType.paymentTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentType.get("description",locale)}</a></li>
</#list>
</ul>
</td>
@@ -109,7 +109,7 @@
<td>
<ul>
<#list paymentMethodTypes as paymentMethodType>
-<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentMethodTypeId=${paymentMethodType.paymentMethodTypeId}</@ofbizUrl>">${uiLabelMap.CommonShow} ${paymentMethodType.get("description",locale)} ${uiLabelMap.AccountingPayments}</a></li>
+<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentMethodTypeId=${paymentMethodType.paymentMethodTypeId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${paymentMethodType.get("description",locale)}</a></li>
</#list>
</ul>
</td>
@@ -117,7 +117,7 @@
<td>
<ul>
<#list paymentStatus as status>
-<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.CommonShow} ${status.get("description",locale)} ${uiLabelMap.AccountingPayments}</a></li>
+<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.AccountingShowPayments} ${status.get("description",locale)}</a></li>
</#list>
</ul>
</td>
Modified: trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml 2006-06-28 17:30:46 UTC (rev 7895)
+++ trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml 2006-06-28 18:45:30 UTC (rev 7896)
@@ -20,7 +20,7 @@
<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../../../../framework/widget/dtd/widget-form.xsd">
- <form name="FindPayments" type="single" target="findPayments" title="Find and list payments"
+ <form name="FindPayments" type="single" target="findPayments"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<field name="noConditionFind"><hidden value="Y"/></field>
<field name="paymentId"><text-find default-option="contains" ignore-case="true"/></field>
@@ -47,7 +47,7 @@
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListPayments" type="list" separate-columns="true" default-entity-name="Payment"
- title="Payment List" default-title-style="tableheadtext" list-name="listIt"
+ default-title-style="tableheadtext" list-name="listIt"
default-widget-style="tabletext" default-tooltip-style="tabletext"
paginate-target="/findPayments" paginate="true">
<actions>
@@ -77,7 +77,7 @@
</form>
<form name="EditPayment" type="single"
- target="updatePayment" title="Edit Payment Header" default-map-name="payment"
+ target="updatePayment" default-map-name="payment"
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
<alt-target use-when="payment==null" target="createPayment"/>
<field name="paymentId"><hidden/></field>
@@ -139,7 +139,7 @@
<form name="editPaymentApplicationsInv" default-title-style="tableheadtext" default-entity-name="PaymentApplication"
default-tooltip-style="tabletext" default-widget-style="tabletext" list-name="paymentApplicationsInv"
- target="updatePaymentApplication" title="List payment Applications" type="list" separate-columns="false">
+ target="updatePaymentApplication" type="list" separate-columns="false">
<field name="paymentApplicationId"><hidden/></field>
<field name="paymentId"><hidden/></field>
<field name="invoiceId"><lookup target-form-name="LookupInvoice"></lookup></field>
@@ -160,7 +160,7 @@
</form>
<form name="editPaymentApplicationsPay" default-title-style="tableheadtext" default-entity-name="PaymentApplication"
default-tooltip-style="tabletext" default-widget-style="tabletext" list-name="paymentApplicationsPay"
- target="updatePaymentApplication" title="List payment Applications" type="list" separate-columns="false">
+ target="updatePaymentApplication" type="list" separate-columns="false">
<field name="paymentApplicationId"><hidden/></field>
<field name="paymentId"><hidden/></field>
<field name="toPaymentId"><lookup target-form-name="LookupPayment"></lookup></field>
@@ -173,7 +173,7 @@
</form>
<form name="editPaymentApplicationsBil" default-title-style="tableheadtext" default-entity-name="PaymentApplication"
default-tooltip-style="tabletext" default-widget-style="tabletext" list-name="paymentApplicationsBil"
- target="updatePaymentApplication" title="List payment Applications" type="list" separate-columns="false">
+ target="updatePaymentApplication" type="list" separate-columns="false">
<field name="paymentApplicationId"><hidden/></field>
<field name="paymentId"><hidden/></field>
<field name="billingAccountId"><lookup target-form-name="LookupBillingAccount"/></field>
@@ -186,7 +186,7 @@
</form>
<form name="editPaymentApplicationsTax" default-title-style="tableheadtext" default-entity-name="PaymentApplication"
default-tooltip-style="tabletext" default-widget-style="tabletext" list-name="paymentApplicationsTax"
- target="updatePaymentApplication" title="List payment Applications" type="list" separate-columns="false">
+ target="updatePaymentApplication" type="list" separate-columns="false">
<field name="paymentApplicationId"><hidden/></field>
<field name="paymentId"><hidden/></field>
<field name="taxAuthGeoId">
@@ -258,7 +258,7 @@
</field>
</form>
- <form name="paymentHeader" type="single" title="Payment header information" default-map-name="payment"
+ <form name="paymentHeader" type="single" default-map-name="payment"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<actions>
<service service-name="getPartyNameForDate" result-map-name="partyNameResultFrom">
@@ -291,7 +291,7 @@
<field name="overrideGlAccountId" position="2"><display/></field>
</form>
- <form name="paymentApplications" type="list" title="Payment Applications" list-name="paymentApplications"
+ <form name="paymentApplications" type="list" list-name="paymentApplications"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<actions>
<entity-condition entity-name="PaymentApplication">
@@ -314,7 +314,7 @@
<field name="amountApplied"><display type="currency" currency="${payment.currencyUomId}"/></field>
</form>
- <form name="AcctgTransAndEntries" type="list" title="Accounting Transactions" list-name="AcctgTransAndEntries"
+ <form name="AcctgTransAndEntries" type="list" list-name="AcctgTransAndEntries"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<actions>
<entity-condition entity-name="AcctgTransAndEntries">
Modified: trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl 2006-06-28 17:30:46 UTC (rev 7895)
+++ trunk/applications/accounting/webapp/accounting/payment/PrintChecks.fo.ftl 2006-06-28 18:45:30 UTC (rev 7896)
@@ -40,7 +40,7 @@
<fo:block padding="20pt">${uiLabelMap.AccountingPrintChecksPermissionError}</fo:block>
<#else>
<#if payments.size() == 0>
- <fo:block padding="20pt">Sorry, no payments were selected.</fo:block>
+ <fo:block padding="20pt">${uiLabelMap.AccountingPaymentCheckMessage1}</fo:block>
</#if>
<#list payments as payment>
@@ -103,23 +103,23 @@
</fo:table-row>
<fo:table-row>
<fo:table-cell padding="3pt">
- <fo:block font-weight="bold">Date</fo:block>
+ <fo:block font-weight="bold">${uiLabelMap.CommonDate}</fo:block>
</fo:table-cell>
<fo:table-cell padding="3pt">
- <fo:block font-weight="bold">Type</fo:block>
+ <fo:block font-weight="bold">${uiLabelMap.CommonType}</fo:block>
</fo:table-cell>
<fo:table-cell padding="3pt">
- <fo:block font-weight="bold">Reference</fo:block>
+ <fo:block font-weight="bold">${uiLabelMap.AccountingReferenceNumber}</fo:block>
</fo:table-cell>
<fo:table-cell padding="3pt"><fo:block/></fo:table-cell>
<fo:table-cell padding="3pt">
- <fo:block font-weight="bold" text-align="right">Original Amt.</fo:block>
+ <fo:block font-weight="bold" text-align="right">${uiLabelMap.AccountingPaymentOriginalAmount}</fo:block>
</fo:table-cell>
<fo:table-cell padding="3pt">
- <fo:block font-weight="bold" text-align="right">Balance Due</fo:block>
+ <fo:block font-weight="bold" text-align="right">${uiLabelMap.AccountingBalanceDue}</fo:block>
</fo:table-cell>
<fo:table-cell padding="3pt">
- <fo:block font-weight="bold" text-align="right">Payment</fo:block>
+ <fo:block font-weight="bold" text-align="right">${uiLabelMap.AccountingPayment}</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-header>
@@ -132,7 +132,7 @@
<fo:block>${payment.effectiveDate?date?string.short}</fo:block>
</fo:table-cell>
<fo:table-cell padding="3pt">
- <fo:block><#if invoice?exists>Invoice</#if></fo:block>
+ <fo:block><#if invoice?exists>${uiLabelMap.AccountingInvoice}</#if></fo:block>
</fo:table-cell>
<fo:table-cell padding="3pt">
<fo:block>
@@ -151,7 +151,7 @@
<fo:table-row>
<fo:table-cell padding="3pt" number-columns-spanned="6">
- <fo:block text-align="end">Check Amount</fo:block>
+ <fo:block text-align="end">${uiLabelMap.AccountingCheckAmount}</fo:block>
</fo:table-cell>
<fo:table-cell padding="3pt">
<fo:block text-align="end">${payment.getBigDecimal("amount").setScale(decimals, rounding).toString()}</fo:block>
@@ -183,23 +183,23 @@
</fo:table-row>
<fo:table-row>
<fo:table-cell padding="3pt">
- <fo:block font-weight="bold">Date</fo:block>
+ <fo:block font-weight="bold">${uiLabelMap.CommonDate}</fo:block>
</fo:table-cell>
<fo:table-cell padding="3pt">
- <fo:block font-weight="bold">Type</fo:block>
+ <fo:block font-weight="bold">${uiLabelMap.CommonType}</fo:block>
</fo:table-cell>
<fo:table-cell padding="3pt">
- <fo:block font-weight="bold">Reference</fo:block>
+ <fo:block font-weight="bold">${uiLabelMap.AccountingReferenceNumber}</fo:block>
</fo:table-cell>
<fo:table-cell padding="3pt"><fo:block/></fo:table-cell>
<fo:table-cell padding="3pt">
- <fo:block font-weight="bold" text-align="right">Original Amt.</fo:block>
+ <fo:block font-weight="bold" text-align="right">${uiLabelMap.AccountingPaymentOriginalAmount}</fo:block>
</fo:table-cell>
<fo:table-cell padding="3pt">
- <fo:block font-weight="bold" text-align="right">Balance Due</fo:block>
+ <fo:block font-weight="bold" text-align="right">${uiLabelMap.AccountingBalanceDue}</fo:block>
</fo:table-cell>
<fo:table-cell padding="3pt">
- <fo:block font-weight="bold" text-align="right">Payment</fo:block>
+ <fo:block font-weight="bold" text-align="right">${uiLabelMap.AccountingPayment}</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-header>
@@ -212,7 +212,7 @@
<fo:block>${payment.effectiveDate?date?string.short}</fo:block>
</fo:table-cell>
<fo:table-cell padding="3pt">
- <fo:block><#if invoice?exists>Invoice</#if></fo:block>
+ <fo:block><#if invoice?exists>${uiLabelMap.AccountingInvoice}</#if></fo:block>
</fo:table-cell>
<fo:table-cell padding="3pt">
<fo:block>
@@ -231,7 +231,7 @@
<fo:table-row>
<fo:table-cell padding="3pt" number-columns-spanned="6">
- <fo:block text-align="end">Check Amount</fo:block>
+ <fo:block text-align="end">${uiLabelMap.AccountingCheckAmount}</fo:block>
</fo:table-cell>
<fo:table-cell padding="3pt">
<fo:block text-align="end">${payment.getBigDecimal("amount").setScale(decimals, rounding).toString()}</fo:block>
Modified: trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl 2006-06-28 17:30:46 UTC (rev 7895)
+++ trunk/applications/accounting/webapp/accounting/payment/manualCCTx.ftl 2006-06-28 18:45:30 UTC (rev 7896)
@@ -30,7 +30,7 @@
<#assign validTx = true>
<tr><td colspan="3"><hr class="sepbar"></td></tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">Reference Number</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingReferenceNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="referenceNum">
@@ -48,21 +48,21 @@
</script>
<tr><td colspan="3"><hr class="sepbar"></td></tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">First Name</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.PartyFirstName}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="firstName" value="${(person.firstName)?if_exists}">
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">Last Name</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.PartyLastName}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="lastName" value="${(person.lastName)?if_exists}">
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">Email Address</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.PartyEmailAddress}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="60" name="infoString" value="">
@@ -71,18 +71,18 @@
<tr><td colspan="3"><hr class="sepbar"></td></tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tableheadtext">Company Name On Card</div></td>
+ <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingCompanyNameCard}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class='inputBox' size="30" maxlength="60" name="companyNameOnCard" value="${(creditCard.companyNameOnCard)?if_exists}">
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tableheadtext">Prefix On Card</div></td>
+ <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingPrefixCard}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="titleOnCard" class="selectBox">
- <option value="">Select One</option>
+ <option value="">${uiLabelMap.CommonSelectOne}</option>
<option<#if ((creditCard.titleOnCard)?default("") == "Mr.")> checked</#if>>Mr.</option>
<option<#if ((creditCard.titleOnCard)?default("") == "Mrs.")> checked</#if>>Mrs.</option>
<option<#if ((creditCard.titleOnCard)?default("") == "Ms.")> checked</#if>>Ms.</option>
@@ -91,32 +91,32 @@
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tableheadtext">First Name On Card</div></td>
+ <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingFirstNameCard}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)?if_exists}">
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tableheadtext">Middle Name On Card</div></td>
+ <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingMiddleNameCard}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)?if_exists}">
</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tableheadtext">Last Name On Card</div></td>
+ <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingLastNameCard}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)?if_exists}">
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign="top"><div class="tableheadtext">Suffix On Card</div></td>
+ <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingSuffixCard}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="suffixOnCard" class="selectBox">
- <option value="">Select One</option>
+ <option value="">${uiLabelMap.CommonSelectOne}</option>
<option<#if ((creditCard.suffixOnCard)?default("") == "Jr.")> checked</#if>>Jr.</option>
<option<#if ((creditCard.suffixOnCard)?default("") == "Sr.")> checked</#if>>Sr.</option>
<option<#if ((creditCard.suffixOnCard)?default("") == "I")> checked</#if>>I</option>
@@ -129,7 +129,7 @@
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">Card Type</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingCardType}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="cardType" class="selectBox">
@@ -142,21 +142,21 @@
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">Card Number</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingCardNumber}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="30" name="cardNumber" value="${(creditCard.cardNumber)?if_exists}">
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">Card Security Code</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingSecurityCodeCard}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" size="5" maxlength="10" name="cardSecurityCode" value="">
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">Expiration Date</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingExpirationDate}</div></td>
<td width="5"> </td>
<td width="74%">
<#assign expMonth = "">
@@ -196,14 +196,14 @@
<#-- first / last name -->
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">First Name</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.PartyFirstName}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="30" name="firstName" value="${(person.firstName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">Last Name</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.PartyLastName}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="30" name="lastName" value="${(person.lastName)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
@@ -212,28 +212,28 @@
<#-- credit card address -->
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">Bill-To Address1</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingBillToAddress1}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="30" name="address1" value="${(postalFields.address1)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">Bill-To Address2</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingBillToAddress2}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="30" name="address2" value="${(postalFields.address2)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">City</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.CommonCity}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="30" maxlength="30" name="city" value="${(postalFields.city)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">State/Province</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.CommonStateProvince}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="stateProvinceGeoId" class="selectBox" <#if requestParameters.useShipAddr?exists>disabled</#if>>
@@ -241,21 +241,21 @@
<option>${postalFields.stateProvinceGeoId}</option>
<option value="${postalFields.stateProvinceGeoId}">---</option>
<#else>
- <option value="">No State</option>
+ <option value="">${uiLabelMap.CommonNone} ${uiLabelMap.CommonState}</option>
</#if>
${screens.render("component://common/widget/CommonScreens.xml#states")}
</select>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">Postal Code</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.CommonZipPostalCode}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="12" maxlength="10" name="postalCode" value="${(postalFields.postalCode)?if_exists}" <#if requestParameters.useShipAddr?exists>disabled</#if>>
*</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">Country</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.CommonCountry}</div></td>
<td width="5"> </td>
<td width="74%">
<select name="countryGeoId" class="selectBox" <#if requestParameters.useShipAddr?exists>disabled</#if>>
Modified: trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl 2006-06-28 17:30:46 UTC (rev 7895)
+++ trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl 2006-06-28 18:45:30 UTC (rev 7896)
@@ -70,12 +70,12 @@
<td width="5"> </td>
<td width='74%'>
<#if currentTx?has_content>
- <div class="tabletext">${currentTx.description}</div>
+ <div class="tabletext">${currentTx.get("description",locale)}</div>
<input type="hidden" name="transactionType" value="${currentTx.enumId}">
<#else>
<select name="transactionType" class="selectBox" onchange="javascript:document.manualTxForm.submit();">
<#list paymentSettings as setting>
- <option value="${setting.enumId}">${setting.description}</option>
+ <option value="${setting.enumId}">${setting.get("description",locale)}</option>
</#list>
</select>
</#if>
Modified: trunk/applications/accounting/widget/AccountingPrintForms.xml
===================================================================
--- trunk/applications/accounting/widget/AccountingPrintForms.xml 2006-06-28 17:30:46 UTC (rev 7895)
+++ trunk/applications/accounting/widget/AccountingPrintForms.xml 2006-06-28 18:45:30 UTC (rev 7896)
@@ -26,12 +26,12 @@
<screen name="InvoicePDF">
<section>
<actions>
- <set field="title" value="Invoice"/>
- <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.bsh"/>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="title" value="Invoice"/>
+ <script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.bsh"/>
</actions>
<widgets>
<platform-specific>
Modified: trunk/applications/accounting/widget/FixedAssetScreens.xml
===================================================================
--- trunk/applications/accounting/widget/FixedAssetScreens.xml 2006-06-28 17:30:46 UTC (rev 7895)
+++ trunk/applications/accounting/widget/FixedAssetScreens.xml 2006-06-28 18:45:30 UTC (rev 7896)
@@ -122,7 +122,7 @@
<link target="ListFixedAssetCalendar?fixedAssetId=${fixedAssetId}&month=1" text="${uiLabelMap.CommonNext} ${uiLabelMap.CommonMonth}" style="buttontext"/>
<link target="ListFixedAssetCalendar?fixedAssetId=${fixedAssetId}&month=3" text="${uiLabelMap.CommonNext} ${uiLabelMap.CommonQuarter}" style="buttontext"/>
<include-form name="listFixedAssetCalendar" location="component://accounting/webapp/accounting/fixedasset/FixedAssetForms.xml"/>
- <label style="tabletext" text="*) empty, but maximum from fixed Asset capacity shown"></label>
+ <label style="tabletext" text="${uiLabelMap.AccountingFixedAssetMessage1}"></label>
</container>
<!--
<container>
Modified: trunk/applications/accounting/widget/PaymentScreens.xml
===================================================================
--- trunk/applications/accounting/widget/PaymentScreens.xml 2006-06-28 17:30:46 UTC (rev 7895)
+++ trunk/applications/accounting/widget/PaymentScreens.xml 2006-06-28 18:45:30 UTC (rev 7896)
@@ -198,7 +198,7 @@
<include-form name="listPaymentsNotApplied" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
</widgets>
</section>
- <container><label style="head1">Apply this payment to:</label></container>
+ <container><label style="head1">${uiLabelMap.AccountingApplyPaymentoTo}:</label></container>
<include-form name="addPaymentApplication" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
</widgets>
</section>
@@ -214,7 +214,7 @@
<set field="titleProperty" value="PageTitlePaymentOverview"/>
<set field="tabButtonItem" value="paymentOverview"/>
<set field="paymentId" from-field="parameters.paymentId"/>
- <set field="labelTitleProperty" value=" Payment Overview"/>
+ <set field="labelTitleProperty" value="PageTitlePaymentOverview"/>
<entity-one entity-name="Payment" value-name="payment"/>
<set field="appliedAmount" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentAppliedBd(payment).toString()}"/>
<set field="notAppliedAmount" value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotAppliedBd(payment).toString()}"/>
@@ -233,7 +233,7 @@
<include-form name="paymentHeader" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
</container>
<container>
- <label style="head1" text="${uiLabelMap.AccountingPaymentsApplied}: ${appliedAmount?currency(${payment.currencyUomId})}, open: ${notAppliedAmount?currency(${payment.currencyUomId})}"/>
+ <label style="head1" text="${uiLabelMap.AccountingPaymentsApplied}: ${appliedAmount?currency(${payment.currencyUomId})}, ${uiLabelMap.AccountingOpenPayments}: ${notAppliedAmount?currency(${payment.currencyUomId})}"/>
<link target="editPaymentApplications?paymentId=${paymentId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/>
<include-form name="paymentApplications" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
</container>
@@ -314,6 +314,7 @@
<!-- pass in paymentId to print one check, otherwise use multi form input -->
<set field="paymentId" from-field="parameters.paymentId" />
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/printChecks.bsh"/>
</actions>
<widgets>
More information about the Svn
mailing list