You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ap...@apache.org on 2009/08/03 17:09:24 UTC
svn commit: r800414 - in /ofbiz/trunk/applications/accounting: config/
webapp/accounting/invoice/ webapp/accounting/lookup/
webapp/accounting/payment/ widget/ widget/ap/forms/ widget/ar/forms/
Author: apatel
Date: Mon Aug 3 15:09:23 2009
New Revision: 800414
URL: http://svn.apache.org/viewvc?rev=800414&view=rev
Log:
Adding more localization of screen labels. Thanks Arpit, Rishi and Hans for quick reminder.
Modified:
ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml
ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
ofbiz/trunk/applications/accounting/widget/GlForms.xml
ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml
ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml
Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=800414&r1=800413&r2=800414&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original)
+++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Mon Aug 3 15:09:23 2009
@@ -8442,6 +8442,10 @@
<value xml:lang="th">Acctg Trans Id</value>
<value xml:lang="zh">è´¢å¡äº¤ææ è¯</value>
</property>
+ <property key="FormFieldTitle_acctgTransType">
+ <value xml:lang="en">Acctg Trans Type</value>
+ <value xml:lang="hi_IN">लà¥à¤¨à¤¦à¥à¤¨ à¤à¤¾à¤¤à¥à¤ à¤à¥ पà¥à¤°à¤à¤¾à¤°</value>
+ </property>
<property key="FormFieldTitle_acctgTransTypeId">
<value xml:lang="en">Acctg Trans Type Id</value>
<value xml:lang="es">Id Tipo Tans Contable</value>
@@ -8551,6 +8555,10 @@
<value xml:lang="it">Riga contratto</value>
<value xml:lang="zh">ååæ¡æ¬¾åºåå·</value>
</property>
+ <property key="FormFieldTitle_agreementItemType">
+ <value xml:lang="en">Agreement Item Type</value>
+ <value xml:lang="hi_IN">मद समà¤à¥à¤¤à¥ à¤à¥ पà¥à¤°à¤à¤¾à¤°</value>
+ </property>
<property key="FormFieldTitle_agreementItemTypeId">
<value xml:lang="en">Agreement Item Type Id</value>
<value xml:lang="fr">Type de point d'accord</value>
@@ -9144,6 +9152,10 @@
<value xml:lang="th">รหัสรายà¸à¸²à¸£à¸à¸£à¸°à¹à¸ à¸à¸à¸±à¸à¸à¸µà¸à¸²à¸£à¹à¸à¸´à¸</value>
<value xml:lang="zh">éèè´¦æ·äº¤æç±»åæ è¯</value>
</property>
+ <property key="FormFieldTitle_finAccountType">
+ <value xml:lang="en">Fin Account Type</value>
+ <value xml:lang="hi_IN">वितà¥à¤¤à¥à¤¯ à¤à¤¾à¤¤à¥ à¤à¤¾ पà¥à¤°à¤à¤¾à¤° </value>
+ </property>
<property key="FormFieldTitle_finAccountTypeId">
<value xml:lang="en">Fin Account Type Id</value>
<value xml:lang="fr">Réf. type de compte financier</value>
@@ -9315,6 +9327,10 @@
<value xml:lang="th">รหัสà¸à¸±à¸à¸à¸µà¹à¸¢à¸à¸à¸£à¸°à¹à¸ à¸à¸à¸±à¹à¸§à¹à¸</value>
<value xml:lang="zh">æ»è´¦è´¦æ·ç¼å·</value>
</property>
+ <property key="FormFieldTitle_glAccountType">
+ <value xml:lang="en">Gl Account Type</value>
+ <value xml:lang="hi_IN">सामानà¥à¤¯ बहॠà¤à¤¾à¤¤à¥ à¤à¤¾ पà¥à¤°à¤à¤¾à¤°</value>
+ </property>
<property key="FormFieldTitle_glAccountTypeId">
<value xml:lang="ar">دÙÙÙ ÙÙع اÙØساب اÙÙ
ØاسبÙ</value>
<value xml:lang="en">Gl Account Type Id</value>
@@ -9327,6 +9343,10 @@
<value xml:lang="th">รหัสà¸à¸£à¸°à¹à¸ à¸à¸à¸±à¸à¸à¸µà¹à¸¢à¸à¸à¸£à¸°à¹à¸ à¸à¸à¸±à¹à¸§à¹à¸</value>
<value xml:lang="zh">æ»è´¦ç±»åæ è¯</value>
</property>
+ <property key="FormFieldTitle_glFiscalType">
+ <value xml:lang="en">Fiscal Gl Type</value>
+ <value xml:lang="hi_IN">वितà¥à¤¤à¥à¤¯ सामानà¥à¤¯ बहॠà¤à¤¾à¤¤à¥ à¤à¤¾ पà¥à¤°à¤à¤¾à¤°</value>
+ </property>
<property key="FormFieldTitle_glFiscalTypeId">
<value xml:lang="ar">دÙÙÙ ÙÙع اÙضرÙبة اÙÙ
ØاسبÙØ©</value>
<value xml:lang="en">Fiscal Gl Type Id</value>
@@ -9339,6 +9359,10 @@
<value xml:lang="th">รหัสà¸à¸£à¹à¸ à¸à¸à¸à¸à¸£à¸°à¸¡à¸²à¸à¸à¸±à¹à¸§à¹à¸</value>
<value xml:lang="zh">è´¢å¡æ»è´¦ç±»åæ è¯</value>
</property>
+ <property key="FormFieldTitle_glJournal">
+ <value xml:lang="en">Gl Journal</value>
+ <value xml:lang="hi_IN">सामानà¥à¤¯ बहॠà¤à¤¾à¤¤à¤¾ </value>
+ </property>
<property key="FormFieldTitle_glJournalId">
<value xml:lang="de">GI Grundbuchs-ID</value>
<value xml:lang="en">Gl Journal Id</value>
@@ -9394,6 +9418,10 @@
<value xml:lang="it">Id gruppo</value>
<value xml:lang="zh">ç»æ è¯</value>
</property>
+ <property key="FormFieldTitle_groupStatus">
+ <value xml:lang="en">Group Status</value>
+ <value xml:lang="hi_IN">समà¥à¤¹ à¤à¥ सà¥à¤¥à¤¿à¤¤à¤¿</value>
+ </property>
<property key="FormFieldTitle_groupStatusId">
<value xml:lang="en">Group Status Id</value>
<value xml:lang="fr">Réf. de groupe de statuts</value>
@@ -9784,6 +9812,10 @@
<property key="FormFieldTitle_glAccountCategoryMember">
<value xml:lang="en">GL Account Category Member</value>
</property>
+ <property key="FormFieldTitle_glAccountCategoryType">
+ <value xml:lang="en">GL Account Category Type</value>
+ <value xml:lang="hi_IN">सामानà¥à¤¯ बहॠà¤à¤¾à¤¤à¥ à¤à¥ शà¥à¤°à¥à¤£à¥</value>
+ </property>
<property key="FormFieldTitle_glAccountCategoryTypeId">
<value xml:lang="en">GL Account Category Type Id</value>
</property>
@@ -10014,6 +10046,10 @@
<property key="FormFieldTitle_paymentGroupName">
<value xml:lang="en">Payment Group Name</value>
</property>
+ <property key="FormFieldTitle_paymentGroupType">
+ <value xml:lang="en">Payment Group Type</value>
+ <value xml:lang="hi_IN">à¤à¥à¤à¤¤à¤¾à¤¨ समà¥à¤¹ à¤à¤¾ पà¥à¤°à¤à¤¾à¤°</value>
+ </property>
<property key="FormFieldTitle_paymentGroupTypeId">
<value xml:lang="en">Payment Group Type Id</value>
</property>
@@ -10377,6 +10413,10 @@
<value xml:lang="th">รหัสà¹à¸à¹à¸ªà¸£à¹à¸à¸£à¸±à¸à¹à¸à¸´à¸</value>
<value xml:lang="zh">æ¶æ®æ è¯</value>
</property>
+ <property key="FormFieldTitle_reconcileStatus">
+ <value xml:lang="en">Reconcile Status</value>
+ <value xml:lang="hi_IN">मिलान à¤à¥ सà¥à¤¥à¤¿à¤¤à¤¿</value>
+ </property>
<property key="FormFieldTitle_reconcileStatusId">
<value xml:lang="en">Reconcile Status Id</value>
<value xml:lang="es">Id Status Reconciliación</value>
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml?rev=800414&r1=800413&r2=800414&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml Mon Aug 3 15:09:23 2009
@@ -32,7 +32,7 @@
<entity-options description="${description}" entity-name="InvoiceType"/>
</drop-down>
</field>
- <field position="2" name="statusId">
+ <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
@@ -78,16 +78,16 @@
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
- <field name="invoiceTypeId" sort-field="true"><display-entity entity-name="InvoiceType" description="${description}"/></field>
+ <field name="invoiceTypeId" sort-field="true"><display-entity entity-name="InvoiceType"/></field>
<field name="invoiceDate" sort-field="true"><display type="date"/></field>
- <field name="statusId" sort-field="true"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}" sort-field="true"><display-entity entity-name="StatusItem"/></field>
<field name="description" sort-field="true"><display/></field>
- <field name="partyIdFrom" sort-field="true">
+ <field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}" sort-field="true">
<hyperlink target="/partymgr/control/PartyFinancialHistory" target-type="inter-app" description="${partyNameResultFrom.fullName} [${partyIdFrom}]">
<parameter param-name="partyId" from-field="partyIdFrom"/>
</hyperlink>
</field>
- <field name="partyIdTo" parameter-name="partyId">
+ <field name="partyIdTo" title="${uiLabelMap.AccountingToParty}" parameter-name="partyId">
<hyperlink target="/partymgr/control/PartyFinancialHistory" target-type="inter-app" description="${partyNameResultTo.fullName} [${partyId}]">
<parameter param-name="partyId"/>
</hyperlink>
@@ -115,7 +115,7 @@
</actions>
<field name="invoiceId"><hidden/></field>
<field position="1" name="invoiceTypeId"><display-entity entity-name="InvoiceType"/></field>
- <field position="2" name="statusId"><display-entity entity-name="StatusItem"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2"><display-entity entity-name="StatusItem"/></field>
<field position="1" name="description"><display/></field>
<field position="2" name="invoiceMessage"><display/></field>
<field position="1" name="partyIdFrom">
@@ -150,7 +150,7 @@
<auto-fields-entity entity-name="InvoiceItem" default-field-type="display"/>
<field name="invoiceId"><hidden/></field>
<field name="invoiceItemSeqId"><display/></field>
- <field name="invoiceItemTypeId"><display-entity description="${description}" entity-name="InvoiceItemType"/></field>
+ <field name="invoiceItemTypeId"><display-entity entity-name="InvoiceItemType"/></field>
<field name="orderId" widget-style="linktext">
<hyperlink target="/ordermgr/control/orderview" target-type="inter-app" description="${orderId}">
<parameter param-name="orderId"/>
@@ -216,11 +216,11 @@
<field name="amount"><display type="currency" currency="${currencyUomId}"/></field>
<field name="origAmount"><display type="currency" currency="${origCurrencyUomId}"/></field>
<field name="acctgTransId"><hyperlink description="${acctgTransId}" target="EditAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}"/></field>
- <field name="acctgTransTypeId"><display-entity entity-name="AcctgTransType" description="${description}"/></field>
- <field name="glJournalId"><display-entity entity-name="GlJournal" description="${glJournalName}"/></field>
- <field name="glAccountTypeId"><display-entity entity-name="GlAccountType" description="${description}"/></field>
- <field name="glAccountClassId"><display-entity entity-name="GlAccountClass" description="${description}"/></field>
- <field name="partyId"><display-entity entity-name="PartyNameView" description="${lastName} ${groupName}"/></field>
+ <field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}"><display-entity entity-name="AcctgTransType"/></field>
+ <field name="glJournalId" title="${uiLabelMap.FormFieldTitle_glJournal}"><display-entity entity-name="GlJournal" description="${glJournalName}"/></field>
+ <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}"><display-entity entity-name="GlAccountType"/></field>
+ <field name="glAccountClassId" title="${uiLabelMap.AccountingGlAccountClass}"><display-entity entity-name="GlAccountClass" description="${description}"/></field>
+ <field name="partyId" title="${uiLabelMap.PartyParty}"><display-entity entity-name="PartyNameView" description="${lastName} ${groupName}"/></field>
<field name="reconcileStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
<field name="origCurrencyUomId"><ignored/></field>
<field name="currencyUomId"><ignored/></field>
@@ -299,8 +299,8 @@
</entity-options>
</drop-down>
</field>
- <field name="statusId" use-when="invoice==null"><hidden value="INVOICE_IN_PROCESS"/></field>
- <field position="2" name="statusId" use-when="invoice!=null"><display-entity entity-name="StatusItem"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}" use-when="invoice==null"><hidden value="INVOICE_IN_PROCESS"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2" use-when="invoice!=null"><display-entity entity-name="StatusItem"/></field>
<field position="1" name="description"><text size="100"/></field>
<field position="1" name="partyIdFrom" use-when="invoiceType.getString("parentTypeId").equals("SALES_INVOICE")"><display description="${invoice.partyIdFrom}"/></field>
<field position="1" name="partyIdFrom" use-when="invoiceType.getString("parentTypeId").equals("PURCHASE_INVOICE")"><lookup target-form-name="LookupPartyName"/></field>
@@ -436,7 +436,7 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="invoiceId"><hidden/></field>
<field name="statusDate"><display description="${bsh:statusDate.toString().substring(0,10)}"/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
</form>
<form name="ListInvoiceTerms" list-name="invoiceTerms" target="" title="" type="list"
@@ -618,7 +618,7 @@
<form name="lookupInvoicesStatus" type="single" target="BillingAccountInvoices" title=""
header-row-style="header-row" default-table-style="basic-table">
<field name="billingAccountId"><hidden/></field>
- <field name="statusId">
+ <field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml?rev=800414&r1=800413&r2=800414&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml Mon Aug 3 15:09:23 2009
@@ -151,7 +151,7 @@
<entity-options description="${description}" entity-name="InvoiceType"/>
</drop-down>
</field>
- <field position="2" name="statusId">
+ <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
@@ -178,7 +178,7 @@
<hyperlink also-hidden="false" target-type="plain" description="${invoiceId}" target="javascript:set_value('${invoiceId}')"/>
</field>
<field name="invoiceTypeId"><display-entity entity-name="InvoiceType"/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
<field name="description"><display/></field>
<field name="partyIdFrom"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
<field name="partyId" title="${uiLabelMap.AccountingPartyIdTo}"><display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName}[${partyId}]"/></field>
@@ -219,7 +219,7 @@
header-row-style="header-row" default-table-style="basic-table">
<field name="agreementId"><text-find/></field>
<field name="agreementItemSeqId"><text-find/></field>
- <field name="agreementItemTypeId">
+ <field name="agreementItemTypeId" title="${uiLabelMap.FormFieldTitle_agreementItemType}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="AgreementItemType"/>
</drop-down>
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml?rev=800414&r1=800413&r2=800414&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml Mon Aug 3 15:09:23 2009
@@ -26,14 +26,14 @@
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="paymentId"><text-find default-option="contains" ignore-case="true"/></field>
<field name="comments"><text-find default-option="contains" ignore-case="true"/></field>
- <field position="1" name="paymentTypeId">
+ <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="1">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="PaymentType">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field position="2" name="statusId">
+ <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="StatusItem">
<entity-constraint name="statusTypeId" operator="equals" value="PMNT_STATUS"/>
@@ -64,17 +64,17 @@
<parameter param-name="paymentId"/>
</hyperlink>
</field>
- <field name="paymentTypeId"><display-entity entity-name="PaymentType" description="${description}"/></field>
- <field name="statusId"><display-entity entity-name="StatusItem"/></field>
+ <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}"><display-entity entity-name="PaymentType"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
<field name="comments"><display/></field>
- <field name="partyIdFrom">
+ <field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}">
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName},${firstName}">
<sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyIdFrom}]" >
<parameter param-name="partyId" from-field="partyIdFrom"/>
</sub-hyperlink>
</display-entity>
</field>
- <field name="partyIdTo">
+ <field name="partyIdTo" title="${uiLabelMap.AccountingToParty}">
<display-entity entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${lastName},${firstName}">
<sub-hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="[${partyIdTo}]" >
<parameter param-name="partyId" from-field="partyIdTo"/>
@@ -108,14 +108,14 @@
</drop-down>
</field>
<field name="partyIdTo" position="2"><lookup target-form-name="LookupPartyName"/></field>
- <field position="1" name="paymentTypeId">
+ <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="1">
<drop-down allow-empty="false">
<list-options list-name="paymentTypes" key-name="paymentTypeId" description="${description}"/>
</drop-down>
</field>
- <field position="2" name="paymentMethodTypeId">
+ <field name="paymentMethodTypeId" position="2">
<drop-down allow-empty="false">
- <entity-options entity-name="PaymentMethodType" description="${description}">
+ <entity-options entity-name="PaymentMethodType" description="${description}">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
@@ -140,7 +140,7 @@
</drop-down>
</field>
<field name="partyIdFrom" position="2"><lookup target-form-name="LookupPartyName"/></field>
- <field position="1" name="paymentTypeId">
+ <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="1">
<drop-down allow-empty="false">
<entity-options description="${description}" entity-name="PaymentType">
<entity-constraint name="parentTypeId" value="RECEIPT"/>
@@ -176,7 +176,7 @@
</actions>
<auto-fields-entity entity-name="Payment"/>
<field name="paymentId"><hidden/></field>
- <field position="1" name="paymentTypeId">
+ <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}" position="1">
<drop-down allow-empty="false">
<entity-options description="${description}" entity-name="PaymentType">
<entity-order-by field-name="description"/>
@@ -190,7 +190,7 @@
</entity-options>
</drop-down>
</field>
- <field name="statusId" position="1">
+ <field name="statusId" title="${uiLabelMap.CommonStatus}" position="1">
<drop-down allow-empty="false" current-description="${currentStatus.description}">
<entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})">
<entity-constraint name="statusId" value="${payment.statusId}"/>
@@ -396,14 +396,14 @@
<field name="paymentId"><hidden/></field>
<field name="paymentTypeId" position="1"><display-entity entity-name="PaymentType"/></field>
<field name="paymentMethodTypeId" position="2"><display-entity entity-name="PaymentMethodType"/></field>
- <field name="statusId" position="1"><display-entity entity-name="StatusItem"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}" position="1"><display-entity entity-name="StatusItem"/></field>
<field name="paymentMethodId" position="2"><display-entity entity-name="PaymentMethod" description="${paymentMethodId}[${paymentMethodTypeId}]"/></field>
- <field name="partyIdFrom" position="1">
+ <field name="partyIdFrom" title="${uiLabelMap.AccountingFromParty}" position="1">
<hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultFrom.fullName} [${payment.partyIdFrom}]">
<parameter param-name="partyId" from-field="payment.partyIdFrom"/>
</hyperlink>
</field>
- <field name="partyIdTo" position="2">
+ <field name="partyIdTo" title="${uiLabelMap.AccountingToParty}" position="2">
<hyperlink target="/partymgr/control/viewprofile" target-type="inter-app" description="${partyNameResultTo.fullName} [${payment.partyIdTo}]">
<parameter param-name="partyId" from-field="payment.partyIdTo"/>
</hyperlink>
Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml?rev=800414&r1=800413&r2=800414&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountForms.xml Mon Aug 3 15:09:23 2009
@@ -89,9 +89,9 @@
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
- <field name="invoiceTypeId"><display-entity entity-name="InvoiceType" description="${description}"/></field>
+ <field name="invoiceTypeId"><display-entity entity-name="InvoiceType"/></field>
<field name="invoiceDate"><display/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
<field name="description"><display/></field>
<field name="partyIdFrom"><display description="${partyNameResultFrom.fullName} [${partyIdFrom}]"/></field>
<field name="partyIdTo" parameter-name="partyId"><display description="${partyNameResultTo.fullName} [${partyId}]"/></field>
@@ -295,7 +295,7 @@
</entity-options>
</drop-down>
</field>
- <field name="paymentTypeId">
+ <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}">
<drop-down allow-empty="false" no-current-selected-key="CUSTOMER_DEPOSIT">
<entity-options description="${description}" entity-name="PaymentType">
<entity-order-by field-name="description"/>
@@ -323,14 +323,14 @@
</hyperlink>
</field>
<field name="orderDate"><display/></field>
- <field name="paymentMethodTypeId" title="${uiLabelMap.CommonType}">
- <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId" description="${description}"/>
+ <field name="paymentMethodTypeId">
+ <display-entity entity-name="PaymentMethodType" key-field-name="paymentMethodTypeId"/>
</field>
<field name="paymentStatusId" title="${uiLabelMap.CommonStatus}">
- <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="maxAmount">
<display type="currency" currency="${currencyUomId}"/>
</field>
</form>
-</forms>
\ No newline at end of file
+</forms>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=800414&r1=800413&r2=800414&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Mon Aug 3 15:09:23 2009
@@ -25,7 +25,7 @@
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="FinAccount" default-field-type="find"/>
<field name="finAccountId"><text-find default-option="contains" ignore-case="true"/></field>
- <field name="finAccountTypeId">
+ <field name="finAccountTypeId" title="${uiLabelMap.FormFieldTitle_finAccountType}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="FinAccountType">
<entity-order-by field-name="description"/>
@@ -54,8 +54,8 @@
<parameter param-name="finAccountId"/>
</hyperlink>
</field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
- <field name="finAccountTypeId"><display-entity entity-name="FinAccountType" description="${description}"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
+ <field name="finAccountTypeId" title="${uiLabelMap.FormFieldTitle_finAccountType}"><display-entity entity-name="FinAccountType"/></field>
<field name="finAccountName">
<hyperlink description="${finAccountName}" target="EditFinAccount">
<parameter param-name="finAccountId"/>
@@ -84,7 +84,7 @@
<field name="finAccountCode"><text size="20"/></field>
<field name="finAccountPin"><text size="10"/></field>
- <field name="finAccountTypeId">
+ <field name="finAccountTypeId" title="${uiLabelMap.FormFieldTitle_finAccountType}">
<drop-down no-current-selected-key="DEPOSIT_ACCOUNT">
<entity-options description="${description}" entity-name="FinAccountType">
<entity-order-by field-name="description"/>
@@ -246,7 +246,7 @@
</field>
</form>
<form name="EditDepositSlip" type="single" target="updateDepositSlip" extends="EditPaymentGroup" extends-resource="component://accounting/widget/PaymentGroupForms.xml">
- <field name="paymentGroupTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="PaymentGroupType" description="${description}"/></field>
+ <field name="paymentGroupTypeId" title="${uiLabelMap.CommonType}"><display-entity entity-name="PaymentGroupType"/></field>
<field name="finAccountId"><hidden value="${finAccountId}"/></field>
</form>
<form name="AddDepositSlipMember" type="single" target="addDepositSlipMember" extends="AddPaymentGroupMember" extends-resource="component://accounting/widget/PaymentGroupForms.xml">
@@ -271,7 +271,7 @@
<form name="QuickFindFinAccounts" type="single" target="FindFinAccount"
header-row-style="header-row" default-table-style="basic-table">
<field name="finAccountId"><text-find default-option="contains" ignore-case="true"/></field>
- <field name="finAccountTypeId">
+ <field name="finAccountTypeId" title="${uiLabelMap.FormFieldTitle_finAccountType}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="FinAccountType">
<entity-order-by field-name="description"/>
@@ -307,7 +307,7 @@
</form>
<form name="FindBankReconciliationFinAcctTrans" target="BankReconciliation"
extends="FindFinAccountTransactions">
- <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
</form>
<form name="EditDepositPayment" extends="EditPayment"
extends-resource="component://accounting/webapp/accounting/payment/PaymentForms.xml" target="createDepositPayment">
@@ -327,7 +327,7 @@
<entity-options entity-name="PaymentMethod" description="${paymentMethodTypeId} (${paymentMethodId})"/>
</drop-down>
</field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
<field name="partyIdTo" position="2"><lookup target-form-name="LookupInternalOrganization"/></field>
<field name="amount" position="2"><text size="6"/></field>
<field name="comments" position="2"><text size="35"/></field>
Modified: ofbiz/trunk/applications/accounting/widget/GlForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlForms.xml?rev=800414&r1=800413&r2=800414&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlForms.xml Mon Aug 3 15:09:23 2009
@@ -34,7 +34,7 @@
</entity-options>
</drop-down>
</field>
- <field name="glFiscalTypeId">
+ <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
<drop-down allow-empty="true">
<entity-options entity-name="GlFiscalType" description="${description}">
<entity-order-by field-name="glFiscalTypeId"/>
@@ -106,8 +106,8 @@
</hyperlink>
</field>
<field name="transactionDate"><display/></field>
- <field name="acctgTransTypeId"><display-entity entity-name="AcctgTransType" description="${description}"/></field>
- <field name="glFiscalTypeId"><display-entity entity-name="GlFiscalType" description="${description}"/></field>
+ <field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}"><display-entity entity-name="AcctgTransType"/></field>
+ <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}"><display-entity entity-name="GlFiscalType"/></field>
<field name="invoiceId" use-when="invoiceId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice">
<parameter param-name="invoiceId"/>
@@ -156,8 +156,8 @@
</hyperlink>
</field>
<field name="transactionDate"><display/></field>
- <field name="acctgTransTypeId"><display-entity entity-name="AcctgTransType" description="${description}"/></field>
- <field name="glFiscalTypeId"><display-entity entity-name="GlFiscalType" description="${description}"/></field>
+ <field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}"><display-entity entity-name="AcctgTransType"/></field>
+ <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}"><display-entity entity-name="GlFiscalType"/></field>
<field name="invoiceId" use-when="invoiceId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice">
<parameter param-name="invoiceId"/>
@@ -209,7 +209,7 @@
</entity-options>
</drop-down>
</field>
- <field name="glFiscalTypeId">
+ <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
<drop-down allow-empty="true">
<entity-options entity-name="GlFiscalType" description="${description}">
<entity-order-by field-name="glFiscalTypeId"/>
@@ -293,8 +293,8 @@
</field>
<field name="acctgTransEntrySeqId" widget-style="buttontext" position="2"><display/></field>
<field name="transactionDate" position="2"><display/></field>
- <field name="acctgTransTypeId" position="2"><display-entity entity-name="AcctgTransType" description="${description}"/></field>
- <field name="glFiscalTypeId" position="2"><display-entity entity-name="GlFiscalType" description="${description}"/></field>
+ <field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}" position="2"><display-entity entity-name="AcctgTransType"/></field>
+ <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}" position="2"><display-entity entity-name="GlFiscalType"/></field>
<field name="invoiceId" position="2" use-when="invoiceId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice">
<parameter param-name="invoiceId"/>
@@ -369,8 +369,8 @@
</hyperlink>
</field>
<field name="acctgTransEntrySeqId" widget-style="buttontext"><display/></field>
- <field name="acctgTransTypeId"><display-entity entity-name="AcctgTransType" description="${description}"/></field>
- <field name="glFiscalTypeId"><display-entity entity-name="GlFiscalType" description="${description}"/></field>
+ <field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}"><display-entity entity-name="AcctgTransType"/></field>
+ <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}"><display-entity entity-name="GlFiscalType"/></field>
<field name="glAccountId"><display/></field>
<field name="glAccountDescription" title="${uiLabelMap.CommonDescription}">
<display description="${accountCode} ${accountName}"/>
@@ -427,14 +427,14 @@
<set field="creditGlAccountClassId" from-field="parameters.creditGlAccountClassId"/>
</actions>
<field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
- <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}">
+ <field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}">
<drop-down>
<entity-options entity-name="AcctgTransType" description="${description}">
<entity-order-by field-name="acctgTransTypeId"/>
</entity-options>
</drop-down>
</field>
- <field name="glFiscalTypeId">
+ <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
<drop-down>
<entity-options entity-name="GlFiscalType" description="${description}">
<entity-order-by field-name="glFiscalTypeId"/>
@@ -506,7 +506,7 @@
</entity-options>
</drop-down>
</field>
- <field name="glFiscalTypeId">
+ <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
<drop-down>
<entity-options entity-name="GlFiscalType" description="${description}">
<entity-order-by field-name="glFiscalTypeId"/>
@@ -535,7 +535,7 @@
<field name="produtId"><lookup target-form-name="LookupProduct" size="20" maxlength="20"/></field>
<field name="shipmentId"><lookup target-form-name="LookupShipment" size="20" maxlength="20"/></field>
<field name="inventoryItemId"><text/></field>
- <field name="groupStatusId">
+ <field name="groupStatusId" title="${uiLabelMap.FormFieldTitle_groupStatus}">
<drop-down allow-empty="true">
<entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
<entity-order-by field-name="description"/>
@@ -563,7 +563,7 @@
<field name="acctgTransEntrySeqId"><hidden/></field>
<field name="acctgTransEntryTypeId" ><hidden value="_NA_"/></field>
<field name="description"><text size="30"/></field>
- <field name="glAccountTypeId">
+ <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}">
<drop-down allow-empty="true">
<entity-options entity-name="GlAccountType" description="${description}">
<entity-order-by field-name="glAccountTypeId"/>
@@ -615,7 +615,7 @@
<field name="organizationPartyId"><hidden/></field>
<field name="acctgTransId"><hidden/></field>
<field name="acctgTransEntrySeqId"><display/></field>
- <field name="glAccountTypeId">
+ <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}">
<drop-down allow-empty="true">
<entity-options entity-name="GlAccountType" description="${description}">
<entity-order-by field-name="glAccountTypeId"/>
@@ -648,7 +648,7 @@
<field name="productId">
<lookup target-form-name="LookupProduct" size="20" maxlength="20"/>
</field>
- <field name="reconcileStatusId">
+ <field name="reconcileStatusId" title="${uiLabelMap.FormFieldTitle_reconcileStatus}">
<drop-down allow-empty="true">
<entity-options entity-name="StatusItem" key-field-name="statusId" description="${description}">
<entity-constraint name="statusTypeId" operator="equals" value="ACCTG_ENREC_STATUS"/>
@@ -678,21 +678,21 @@
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createAcctgTrans"/>
<field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
- <field name="acctgTransTypeId">
+ <field name="acctgTransTypeId" title="${uiLabelMap.FormFieldTitle_acctgTransType}">
<drop-down>
<entity-options entity-name="AcctgTransType" description="${description}">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="glFiscalTypeId">
+ <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
<drop-down>
<entity-options entity-name="GlFiscalType" description="${description}" key-field-name="glFiscalTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="groupStatusId">
+ <field name="groupStatusId" title="${uiLabelMap.FormFieldTitle_groupStatus}">
<drop-down allow-empty="true">
<entity-options entity-name="StatusItem" description="${description}" key-field-name="statusId">
<entity-constraint name="statusTypeId" operator="equals" value="ACCTG_ENREC_STATUS"/>
@@ -838,16 +838,16 @@
<field name="invoiceId"><hyperlink target="invoiceOverview?invoiceId=${acctgTrans.invoiceId}" description="${acctgTrans.invoiceId}"/></field>
<field name="paymentId"><hyperlink target="paymentOverview?paymentId=${acctgTrans.paymentId}" description="${acctgTrans.paymentId}"/></field>
<field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}">
- <display-entity entity-name="AcctgTransType" description="${description}"/>
+ <display-entity entity-name="AcctgTransType"/>
</field>
- <field name="glFiscalTypeId">
- <display-entity entity-name="GlFiscalType" description="${description}"/>
+ <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
+ <display-entity entity-name="GlFiscalType"/>
</field>
<field name="roleTypeId">
- <display-entity entity-name="RoleType" description="${description}"/>
+ <display-entity entity-name="RoleType"/>
</field>
- <field name="groupStatusId">
- <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+ <field name="groupStatusId" title="${uiLabelMap.FormFieldTitle_groupStatus}">
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
</form>
<form name="ViewAcctgTransEntries" type="list" list-name="acctgTransEntries" default-entity-name="AcctgTransEntry"
@@ -855,8 +855,8 @@
<field name="organizationPartyId"><hidden/></field>
<field name="acctgTransId"><hidden/></field>
<field name="acctgTransEntrySeqId"><display/></field>
- <field name="glAccountTypeId">
- <display-entity entity-name="GlAccountType" description="${description}"/>
+ <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}">
+ <display-entity entity-name="GlAccountType"/>
</field>
<field name="glAccountId">
<display-entity entity-name="GlAccount" description="${glAccountId} ${accountName}"/>
@@ -877,8 +877,8 @@
</sub-hyperlink>
</display-entity>
</field>
- <field name="reconcileStatusId">
- <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
+ <field name="reconcileStatusId" title="${uiLabelMap.FormFieldTitle_reconcileStatus}">
+ <display-entity entity-name="StatusItem" key-field-name="statusId"/>
</field>
<field name="isSummary"><display/></field>
<field name="debitCreditFlag"><display/></field>
@@ -924,10 +924,10 @@
<field name="quot5" title="""><display/></field>
<field name="separator2" title=","><display description=", "/></field>
- <field name="acctgTransTypeId"><display-entity entity-name="AcctgTransType" description="${description}"/></field>
+ <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}"><display-entity entity-name="AcctgTransType"/></field>
<field name="separator3" title=","><display description=", "/></field>
- <field name="glFiscalTypeId"><display-entity entity-name="GlFiscalType" description="${description}"/></field>
+ <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}"><display-entity entity-name="GlFiscalType"/></field>
<field name="separator4" title=","><display description=", "/></field>
<field name="quot6" title="""><display/></field>
@@ -938,7 +938,7 @@
<field name="glAccountDescription"><display description="${accountName}"/></field>
<field name="separator6" title=","><display description=","/></field>
- <field name="glAccountClassId"><display-entity entity-name="GlAccountClass" description="${description}"/></field>
+ <field name="glAccountClassId" title="${uiLabelMap.AccountingGlAccountClass}"><display-entity entity-name="GlAccountClass"/></field>
<field name="separator7" title=","><display description=","/></field>
<field name="quot8" title="""><display/></field>
@@ -1031,9 +1031,9 @@
<field name="transactionDate"><display/></field>
<field name="quot3" title="""><display/></field>
<field name="separator2" title=","><display description=","/></field>
- <field name="acctgTransTypeId"><display-entity entity-name="AcctgTransType" description="${description}"/></field>
+ <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}"><display-entity entity-name="AcctgTransType"/></field>
<field name="separator3" title=","><display description=","/></field>
- <field name="glFiscalTypeId"><display-entity entity-name="GlFiscalType" description="${description}"/></field>
+ <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}"><display-entity entity-name="GlFiscalType"/></field>
<field name="separator4" title=","><display description=","/></field>
<field name="quot4" title="""><display/></field>
<field name="invoiceId"><display/></field>
@@ -1113,4 +1113,4 @@
<field name="creditAmount"><display type="currency" currency="${currencyUomId}" description="${groovy:if(debitCreditFlag.equals('C'))return(amount);if(debitCreditFlag.equals('D'))return(0);}"/></field>
</form>
-</forms>
\ No newline at end of file
+</forms>
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml?rev=800414&r1=800413&r2=800414&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupForms.xml Mon Aug 3 15:09:23 2009
@@ -299,7 +299,7 @@
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
<field name="uomId" title="${uiLabelMap.CommonFrom} ${uiLabelMap.CommonCurrency}"><display/></field>
<field name="uomIdTo" title="${uiLabelMap.CommonTo} ${uiLabelMap.CommonCurrency}"><display/></field>
- <field name="purposeEnumId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="Enumeration" key-field-name="enumId" description="${description}"/></field>
+ <field name="purposeEnumId" title="${uiLabelMap.CommonPurpose}"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
<field name="conversionFactor"><display/></field>
<field name="fromDate" title="${uiLabelMap.CommonFrom}"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThru}"><display/></field>
@@ -365,7 +365,7 @@
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createGlAccountTypeDefault"/>
<field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
- <field name="glAccountTypeId">
+ <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}">
<drop-down>
<entity-options entity-name="GlAccountType" description="${description}">
<entity-order-by field-name="description"/>
@@ -491,8 +491,8 @@
</entity-condition>
</actions>
<auto-fields-entity entity-name="PaymentGlAccountTypeMap" default-field-type="display"/>
- <field name="paymentTypeId"><display-entity entity-name="PaymentType" description="${description}"/></field>
- <field name="glAccountTypeId"><display-entity entity-name="GlAccountType" description="${description}"/></field>
+ <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}"><display-entity entity-name="PaymentType"/></field>
+ <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}"><display-entity entity-name="GlAccountType"/></field>
<field name="organizationPartyId"><hidden/></field>
<field name="remove" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
<hyperlink target="removePaymentTypeGlAssignment" description="${uiLabelMap.CommonRemove}">
@@ -505,14 +505,14 @@
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="addPaymentTypeGlAssignment"/>
<field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
- <field name="paymentTypeId">
+ <field name="paymentTypeId" title="${uiLabelMap.AccountingPaymentType}">
<drop-down>
<entity-options entity-name="PaymentType" description="${description}" key-field-name="paymentTypeId">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="glAccountTypeId">
+ <field name="glAccountTypeId" title="${uiLabelMap.FormFieldTitle_glAccountType}">
<drop-down>
<entity-options entity-name="GlAccountType" description="${description}" key-field-name="glAccountTypeId">
<entity-order-by field-name="description"/>
@@ -538,7 +538,7 @@
<set field="description" value="${glAccount.description}"/>
</row-actions>
<auto-fields-entity entity-name="PaymentMethodTypeGlAccount" default-field-type="display"/>
- <field name="paymentMethodTypeId"><display-entity entity-name="PaymentMethodType" description="${description}"/></field>
+ <field name="paymentMethodTypeId"><display-entity entity-name="PaymentMethodType"/></field>
<field name="glAccountId"><display-entity entity-name="GlAccount" description="${accountName}[${glAccountId}]"/></field>
<field name="organizationPartyId"><hidden/></field>
<field name="defaultGlAccountId"><display description="${defaultGlAccountId} : ${description}"/></field>
@@ -1033,7 +1033,7 @@
<form name="FindGlAccountCategory" type="single" target="FindGlAccountCategory" default-entity-name="GlAccountCategory">
<field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="glAccountCategoryId"><text-find/></field>
- <field name="glAccountCategoryTypeId">
+ <field name="glAccountCategoryTypeId" title="${uiLabelMap.FormFieldTitle_glAccountCategoryType}">
<drop-down>
<entity-options entity-name="GlAccountCategoryType" key-field-name="glAccountCategoryTypeId" description="${description}"/>
</drop-down>
@@ -1064,7 +1064,7 @@
<auto-fields-entity entity-name="GlAccountCategory" default-field-type="edit"/>
<field name="glAccountCategoryId" use-when="glAccountCategoryId!=null"><display/></field>
<field name="glAccountCategoryId" use-when="glAccountCategoryId==null"><hidden/></field>
- <field name="glAccountCategoryTypeId">
+ <field name="glAccountCategoryTypeId" title="${uiLabelMap.FormFieldTitle_glAccountCategoryType}">
<drop-down>
<entity-options entity-name="GlAccountCategoryType" key-field-name="glAccountCategoryTypeId" description="${description}"/>
</drop-down>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml?rev=800414&r1=800413&r2=800414&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGroupForms.xml Mon Aug 3 15:09:23 2009
@@ -42,7 +42,7 @@
<parameter param-name="paymentGroupId"/>
</hyperlink>
</field>
- <field name="paymentGroupTypeId"><display-entity entity-name="PaymentGroupType" description="${description}"/></field>
+ <field name="paymentGroupTypeId" title="${uiLabelMap.FormFieldTitle_paymentGroupType}"><display-entity entity-name="PaymentGroupType"/></field>
<field name="paymentGroupName"><display/></field>
<field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext" use-when="${paymentGroupTypeId == 'BATCH_PAYMENT'}">
<hyperlink target="cancelPaymentGroup" description="${uiLabelMap.CommonCancel}" also-hidden="false">
Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=800414&r1=800413&r2=800414&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Mon Aug 3 15:09:23 2009
@@ -119,7 +119,7 @@
</field>
<field name="fromDate" required-field="false"><date-time type="timestamp"/></field>
<field name="thruDate" required-field="false"><date-time type="timestamp"/></field>
- <field name="glFiscalTypeId">
+ <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
<drop-down>
<entity-options entity-name="GlFiscalType" description="${description}">
<entity-order-by field-name="glFiscalTypeId"/>
@@ -152,7 +152,7 @@
header-row-style="header-row" default-table-style="basic-table">
<field name="organizationPartyId"><hidden/></field>
<field name="thruDate"><date-time/></field>
- <field name="glFiscalTypeId">
+ <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
<drop-down>
<entity-options entity-name="GlFiscalType" description="${description}">
<entity-order-by field-name="glFiscalTypeId"/>
Modified: ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml?rev=800414&r1=800413&r2=800414&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml Mon Aug 3 15:09:23 2009
@@ -55,9 +55,9 @@
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
- <field name="invoiceTypeId"><display-entity entity-name="InvoiceType" description="${description}"/></field>
+ <field name="invoiceTypeId"><display-entity entity-name="InvoiceType"/></field>
<field name="invoiceDate"><display/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
<field name="description"><display/></field>
<field name="partyIdFrom"><display description="${partyNameResultFrom.fullName} [${partyIdFrom}]"/></field>
<field name="partyIdTo" parameter-name="partyId"><display description="${partyNameResultTo.fullName} [${partyId}]"/></field>
@@ -103,9 +103,9 @@
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
- <field name="invoiceTypeId" sort-field="true"><display-entity entity-name="InvoiceType" description="${description}"/></field>
+ <field name="invoiceTypeId" sort-field="true"><display-entity entity-name="InvoiceType"/></field>
<field name="invoiceDate" sort-field="true"><display type="date"/></field>
- <field name="statusId" sort-field="true"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}" sort-field="true"><display-entity entity-name="StatusItem"/></field>
<field name="description" sort-field="true"><display/></field>
<field name="partyIdFrom" sort-field="true">
<hyperlink target="/partymgr/control/PartyFinancialHistory" target-type="inter-app" description="${partyNameResultFrom.fullName} [${partyIdFrom}]">
@@ -126,7 +126,7 @@
<set field="organizationPartyId" from-field="parameters.organizationPartyId" default-value="${defaultOrganizationPartyId}"/>
</actions>
<field name="partyIdFrom" title="${uiLabelMap.AccountingVendorParty}" position="1"><lookup target-form-name="LookupPartyName"/></field>
- <field name="statusId" position="2">
+ <field name="statusId" title="${uiLabelMap.CommonStatus}" position="2">
<drop-down allow-empty="true">
<entity-options entity-name="StatusItem" description="${description}">
<entity-constraint name="statusTypeId" operator="equals" value="INVOICE_STATUS"/>
Modified: ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml?rev=800414&r1=800413&r2=800414&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/forms/InvoiceForms.xml Mon Aug 3 15:09:23 2009
@@ -64,9 +64,9 @@
<parameter param-name="invoiceId"/>
</hyperlink>
</field>
- <field name="invoiceTypeId"><display-entity entity-name="InvoiceType" description="${description}"/></field>
+ <field name="invoiceTypeId"><display-entity entity-name="InvoiceType"/></field>
<field name="invoiceDate"><display/></field>
- <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem"/></field>
<field name="description"><display/></field>
<field name="partyIdFrom"><display description="${partyNameResultFrom.fullName} [${partyIdFrom}]"/></field>
<field name="partyIdTo" parameter-name="partyId"><display description="${partyNameResultTo.fullName} [${partyId}]"/></field>
@@ -75,4 +75,4 @@
<field name="total" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field>
<field name="amountToApply" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field>
</form>
-</forms>
\ No newline at end of file
+</forms>