svn commit: r796253 - in /ofbiz/trunk/applications/acco
Locked
 
|
Author: apatel
Date: Tue Jul 21 11:22:26 2009 New Revision: 796253 URL: http://svn.apache.org/viewvc?rev=796253&view=rev Log: In Accounting Component cleanup and make UI labels name symmetric to "FormFieldTitle_*" so that can be used any where in Form-Widgets without giving "title" attribute. Also added labels for missing title if any. Patch from JIRA # OFBIZ-2744 Thanks Sumit and Arpit. Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml ofbiz/trunk/applications/accounting/widget/ap/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=796253&r1=796252&r2=796253&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Tue Jul 21 11:22:26 2009 @@ -1655,12 +1655,6 @@ <value xml:lang="nl">Afgesloten perioden</value> <value xml:lang="th">à¸à¸´à¸à¸à¹à¸§à¸à¹à¸§à¸¥à¸²</value> </property> - <property key="AccountingClosingBalanceCredit"> - <value xml:lang="en">Closing Balance Credit</value> - </property> - <property key="AccountingClosingBalanceDebit"> - <value xml:lang="en">Closing Balance Debit</value> - </property> <property key="AccountingComments"> <value xml:lang="ar">تعاÙÙÙ</value> <value xml:lang="de">Kommentare</value> @@ -5489,12 +5483,6 @@ <value xml:lang="nl">Open perioden</value> <value xml:lang="th">à¹à¸à¸´à¸à¸à¹à¸§à¸à¹à¸§à¸¥à¸²</value> </property> - <property key="AccountingOpeningBalanceCredit"> - <value xml:lang="en">Opening Balance Credit</value> - </property> - <property key="AccountingOpeningBalanceDebit"> - <value xml:lang="en">Opening Balance Debit</value> - </property> <property key="AccountingOrderItemWithIdNotFound"> <value xml:lang="en">Order Item with id ${orderItemSeqId} not found.</value> <value xml:lang="fr">La ligne de commande avec identifiant ${orderItemSeqId} n'a pas été trouvée</value> @@ -7845,12 +7833,6 @@ <value xml:lang="en">Delivery Address Editable</value> <value xml:lang="it">Indirizzo di spedizione editabile</value> </property> - <property key="AccountingYearToDateBalanceCredit"> - <value xml:lang="en">Year To Date Balance Credit</value> - </property> - <property key="AccountingYearToDateBalanceDebit"> - <value xml:lang="en">Year To Date Balance Debit</value> - </property> <property key="AcctgAssignGlAccount"> <value xml:lang="ar">تعÙÙ٠اÙØساب اÙÙ ØاسبÙ</value> <value xml:lang="de">zuweisen Hauptbuchkonto</value> @@ -8417,6 +8399,12 @@ <value xml:lang="en">Client Id</value> <value xml:lang="it">Id client</value> </property> + <property key="FormFieldTitle_closingBalanceCredit"> + <value xml:lang="en">Closing Balance Credit</value> + </property> + <property key="FormFieldTitle_closingBalanceDebit"> + <value xml:lang="en">Closing Balance Debit</value> + </property> <property key="FormFieldTitle_cogsMethodId"> <value xml:lang="en">Cost Of Goods Sold (COGS) Method</value> <value xml:lang="es">Método de costo de bienes vendidos</value> @@ -8680,6 +8668,9 @@ <value xml:lang="th">Expected End Of Life</value> <value xml:lang="zh">ææ使ç¨å¯¿å½</value> </property> + <property key="FormFieldTitle_externalAccountId"> + <value xml:lang="en">External Account Id</value> + </property> <property key="FormFieldTitle_finAccountAuthId"> <value xml:lang="en">Fin Account Auth Id</value> <value xml:lang="fr">Réf. d'autorisation de compte financier</value> @@ -8809,6 +8800,12 @@ <value xml:lang="th">รหัสà¸à¸£à¸°à¹à¸ à¸à¹à¸¡à¹à¸«à¸¡à¸¸à¸à¹à¸§à¸µà¸¢à¸</value> <value xml:lang="zh">åºå®èµäº§ç±»åæ è¯</value> </property> + <property key="FormFieldTitle_fromDueDate"> + <value xml:lang="en">From Due Date</value> + </property> + <property key="FormFieldTitle_fromInvoiceDate"> + <value xml:lang="en">From Invoice Date</value> + </property> <property key="FormFieldTitle_gatewayAvsResult"> <value xml:lang="en">Gateway Avs Result</value> <value xml:lang="es">Resultado Puerta Avs</value> @@ -9121,6 +9118,9 @@ <value xml:lang="th">ลำà¸à¸±à¸à¹à¸à¸à¸³à¸à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value> <value xml:lang="zh">å票åºå·</value> </property> + <property key="FormFieldTitle_invoiceTermId"> + <value xml:lang="en">Invoice Term Id</value> + </property> <property key="FormFieldTitle_invoiceTypeId"> <value xml:lang="ar">ÙÙع اÙÙاتÙرة</value> <value xml:lang="de">Rechnungs-Art</value> @@ -9318,11 +9318,11 @@ <value xml:lang="ru">Ðин. кол-во</value> <value xml:lang="th">à¸à¸³à¸à¸§à¸à¸à¹à¸à¸¢à¸ªà¸¸à¸</value> </property> - <property key="FormFieldTitle_monthlyTotalCredit"> - <value xml:lang="en">Monthly Total Credit</value> + <property key="FormFieldTitle_monthAmountCredit"> + <value xml:lang="en">Month Amount Credit</value> </property> - <property key="FormFieldTitle_monthlyTotalDebit"> - <value xml:lang="en">Monthly Total Debit</value> + <property key="FormFieldTitle_monthAmountDebit"> + <value xml:lang="en">Month Amount Debit</value> </property> <property key="FormFieldTitle_name"> <value xml:lang="ar">اس٠</value> @@ -9345,6 +9345,12 @@ <value xml:lang="en">Notify Url</value> <value xml:lang="it">URL di notifica</value> </property> + <property key="FormFieldTitle_openingBalanceCredit"> + <value xml:lang="en">Opening Balance Credit</value> + </property> + <property key="FormFieldTitle_openingBalanceDebit"> + <value xml:lang="en">Opening Balance Debit</value> + </property> <property key="FormFieldTitle_orderIdPrefix"> <value xml:lang="en">Order Id Prefix</value> <value xml:lang="es">Id Prefijo de orden</value> @@ -9502,6 +9508,9 @@ <value xml:lang="en">Partner</value> <value xml:lang="it">Partner</value> </property> + <property key="FormFieldTitle_paymentApplicationId"> + <value xml:lang="en">Payment Application Id</value> + </property> <property key="FormFieldTitle_paymentApplied"> <value xml:lang="en">Already Applied</value> <value xml:lang="es">Ya aplicado</value> @@ -9535,6 +9544,15 @@ <value xml:lang="th">รหัสà¸à¸²à¸£à¸à¸à¸à¸ªà¸à¸à¸à¸§à¸´à¸à¸µà¸à¸²à¸£à¸à¸³à¸£à¸°à¹à¸à¸´à¸</value> <value xml:lang="zh">æ¯ä»ç½å ³ååºæ è¯</value> </property> + <property key="FormFieldTitle_paymentGroupId"> + <value xml:lang="en">Payment Group Id</value> + </property> + <property key="FormFieldTitle_paymentGroupName"> + <value xml:lang="en">Payment Group Name</value> + </property> + <property key="FormFieldTitle_paymentGroupTypeId"> + <value xml:lang="en">Payment Group Type Id</value> + </property> <property key="FormFieldTitle_paymentId"> <value xml:lang="en">Payment Id</value> <value xml:lang="es">Id Pago</value> @@ -9675,6 +9693,9 @@ <value xml:lang="it">Tipo Periodo Fiscale</value> <value xml:lang="th">รหัสà¸à¸£à¸°à¹à¸ à¸à¸à¹à¸§à¸à¹à¸§à¸¥à¸²</value> </property> + <property key="FormFieldTitle_posted"> + <value xml:lang="en">Posted</value> + </property> <property key="FormFieldTitle_postToGlAccountId"> <value xml:lang="de">auf Hauptbuchkonto-Nr. buchen</value> <value xml:lang="en">Post To Gl Account Id</value> @@ -10199,6 +10220,12 @@ <value xml:lang="fr">Leur réf. de transcation comptable</value> <value xml:lang="it">Loro Numero Transazione Contabilità </value> </property> + <property key="FormFieldTitle_thruDueDate"> + <value xml:lang="en">Thru Due Date</value> + </property> + <property key="FormFieldTitle_thruInvoiceDate"> + <value xml:lang="en">Thru Invoice Date</value> + </property> <property key="FormFieldTitle_timeEntryId"> <value xml:lang="en">Time Entry Id</value> <value xml:lang="fr">Réf. de date d'écriture</value> @@ -10348,6 +10375,12 @@ <value xml:lang="th">à¸à¹à¸²à¸à¸à¸´à¸à¹à¸à¸ªà¸³à¸à¸±à¸</value> <value xml:lang="zh">ä¼æ å¸è¯æ</value> </property> + <property key="FormFieldTitle_yearToDateBalanceCredit"> + <value xml:lang="en">Year To Date Balance Credit</value> + </property> + <property key="FormFieldTitle_yearToDateBalanceDebit"> + <value xml:lang="en">Year To Date Balance Debit</value> + </property> <property key="PageTitleAddAgreementRoles"> <value xml:lang="en">Add Agreement Roles</value> <value xml:lang="fr">Ajouter des rôles d'accords commerciaux</value> 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=796253&r1=796252&r2=796253&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/lookup/FieldLookupForms.xml Tue Jul 21 11:22:26 2009 @@ -24,8 +24,8 @@ <form name="lookupFixedAsset" target="LookupFixedAsset" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="FixedAsset" default-field-type="hidden"/> - <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}"><text-find/></field> - <field name="fixedAssetName" title="${uiLabelMap.AccountingFixedAssetName}"><text-find/></field> + <field name="fixedAssetId"><text-find/></field> + <field name="fixedAssetName"><text-find/></field> <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedAssetTypeId}"> <drop-down allow-empty="true"> <entity-options entity-name="FixedAssetType" description="${description}"> @@ -44,7 +44,7 @@ <field-map field-name="entityName" value="FixedAsset"/> </service> </actions> - <field name="fixedAssetId" title="${uiLabelMap.AccountingFixedAssetId}" widget-style="buttontext"> + <field name="fixedAssetId" widget-style="buttontext"> <hyperlink also-hidden="false" target-type="plain" description="${fixedAssetId}" target="javascript:set_value('${fixedAssetId}')"/> </field> <field name="fixedAssetName" title="${uiLabelMap.CommonName}"><display/></field> @@ -72,7 +72,7 @@ <field name="billingAccountId" title="${uiLabelMap.AccountingBillingAccountId}" widget-style="buttontext"> <hyperlink also-hidden="false" target-type="plain" description="${billingAccountId}" target="javascript:set_value('${billingAccountId}')"/> </field> - <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field> + <field name="description"><display/></field> <field name="externalAccountId" title="${uiLabelMap.AccountingExternalAccountId}"><display/></field> </form> @@ -246,8 +246,8 @@ <form name="lookupPaymentGroupMember" target="LookupPaymentGroupMember" title="" type="single" header-row-style="header-row" default-table-style="basic-table"> <field name="paymentGroupId"><text-find/></field> <field name="paymentId"><text-find/></field> - <field name="fromDate" title="${uiLabelMap.CommonFromDate}" position="1"><date-time/></field> - <field name="thruDate" title="${uiLabelMap.CommonThruDate}" position="2"><date-time/></field> + <field name="fromDate" position="1"><date-time/></field> + <field name="thruDate" position="2"><date-time/></field> <field name="sequenceNum"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> @@ -267,4 +267,4 @@ <field name="sequenceNum"><display/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=796253&r1=796252&r2=796253&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Tue Jul 21 11:22:26 2009 @@ -477,10 +477,10 @@ <field name="accountName" title="${uiLabelMap.FormFieldTitle_accountName}" entry-name="glAccountId"> <display-entity entity-name="GlAccount" key-field-name="glAccountId" description="${accountName}"/> </field> - <field name="openingBalanceCredit" title="${uiLabelMap.AccountingOpeningBalanceCredit}"> + <field name="openingBalanceCredit"> <display description="${openingBalanceCredit}" type="currency" currency="${currencyUomId}"/> </field> - <field name="openingBalanceDebit" title="${uiLabelMap.AccountingOpeningBalanceDebit}"> + <field name="openingBalanceDebit"> <display description="${openingBalanceDebit}" type="currency" currency="${currencyUomId}"/> </field> <field name="monthAmountCredit"> @@ -489,16 +489,16 @@ <field name="monthAmountDebit"> <display description="${debit}" type="currency" currency="${currencyUomId}"/> </field> - <field name="closingBalanceCredit" title="${uiLabelMap.AccountingClosingBalanceCredit}"> + <field name="closingBalanceCredit"> <display description="${openingBalanceCredit + credit}" type="currency" currency="${currencyUomId}"/> </field> - <field name="closingBalanceDebit" title="${uiLabelMap.AccountingClosingBalanceDebit}"> + <field name="closingBalanceDebit"> <display description="${openingBalanceDebit + debit}" type="currency" currency="${currencyUomId}"/> </field> - <field name="yearToDateBalanceCredit" title="${uiLabelMap.AccountingYearToDateBalanceCredit}"> + <field name="yearToDateBalanceCredit"> <display description="${openingBalanceCredit + credit}" type="currency" currency="${currencyUomId}"/> </field> - <field name="yearToDateBalanceDebit" title="${uiLabelMap.AccountingYearToDateBalanceDebit}"> + <field name="yearToDateBalanceDebit"> <display description="${openingBalanceDebit + debit}" type="currency" currency="${currencyUomId}"/> </field> </form> 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=796253&r1=796252&r2=796253&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/ap/forms/InvoiceForms.xml Tue Jul 21 11:22:26 2009 @@ -143,7 +143,7 @@ </form> <form name="CommissionRun" type="single" target="CommissionRun"> - <field name="partyId" title="${uiLabelMap.PartyPartyId}" required-field="true"> + <field name="partyId" required-field="true"> <drop-down allow-multiple="true"> <entity-options entity-name="PartyRole" description="${partyId}"> <entity-constraint name="roleTypeId" operator="equals" value="SALES_REP"/> @@ -156,4 +156,4 @@ <field name="thruInvoiceDate" position="2"><date-time/></field> <field name="search" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |