[OFBiz] SVN: r7917 - in trunk/applications/accounting: config entitydef webapp/accounting/admin webapp/accounting/agreement webapp/accounting/billingaccount webapp/accounting/chartofaccounts webapp/accounting/fixedasset widget
jacopo@svn.ofbiz.org
jacopo at svn.ofbiz.org
Fri Jun 30 17:27:43 CDT 2006
Author: jacopo
Date: 2006-06-30 17:27:08 -0500 (Fri, 30 Jun 2006)
New Revision: 7917
Modified:
trunk/applications/accounting/config/AccountingEntityLabels_it.properties
trunk/applications/accounting/config/AccountingUiLabels.properties
trunk/applications/accounting/config/AccountingUiLabels_it.properties
trunk/applications/accounting/entitydef/entitymodel.xml
trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl
trunk/applications/accounting/webapp/accounting/admin/timePeriods.ftl
trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountPayments.ftl
trunk/applications/accounting/webapp/accounting/billingaccount/EditBillingAccountTerms.ftl
trunk/applications/accounting/webapp/accounting/billingaccount/FindBillingAccount.ftl
trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml
trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
trunk/applications/accounting/widget/AccountingScreens.xml
trunk/applications/accounting/widget/AdminScreens.xml
trunk/applications/accounting/widget/CommonScreens.xml
trunk/applications/accounting/widget/FixedAssetScreens.xml
Log:
i18n patch for the accounting component from Marco Risaliti (Apache OFBIZ-25).
Modified: trunk/applications/accounting/config/AccountingEntityLabels_it.properties
===================================================================
--- trunk/applications/accounting/config/AccountingEntityLabels_it.properties 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/config/AccountingEntityLabels_it.properties 2006-06-30 22:27:08 UTC (rev 7917)
@@ -93,6 +93,7 @@
PaymentType.description.CUSTOMER_PAYMENT=Cliente
PaymentType.description.CUSTOMER_DEPOSIT=Deposito Cliente
PaymentType.description.GC_DEPOSIT=Deposito Certificato Omaggio
+
FixedAssetType.description.EQUIPMENT=Attrezzature
FixedAssetType.description.PRODUCTION_EQUIPMENT=I cespiti usati nella definizione operazione-rotta
FixedAssetType.description.GROUP_EQUIPMENT=Gruppo di macchine, usate per definizioni compiti e rotte
Modified: trunk/applications/accounting/config/AccountingUiLabels.properties
===================================================================
--- trunk/applications/accounting/config/AccountingUiLabels.properties 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/config/AccountingUiLabels.properties 2006-06-30 22:27:08 UTC (rev 7917)
@@ -41,6 +41,8 @@
AccountingAccountLimit=Account Limit
AccountingAccountNumber=Account Number
AccountingAccountType=Account Type
+AccountingAccounts=Accounts
+AccountingAdmin=Admin
AccountingAssignPaymentToInvoice=Assign Payment to This Invoice
AccountingAddNewCreditCard=Add New Credit Card
AccountingAddNewEftAccount=Add New EFT Account
@@ -66,43 +68,47 @@
AccountingAnyPaymentStatus=Any Payment Status
AccountingApplications=Applications
AccountingApplyToInvoiceItems=Apply to Invoice Items
+AccountingApplyPaymentoTo=Apply this payment to
AccountingAppliedPayments=Applied Payments
AccountingAssets=Assets
+AccountingAssignSalesInvoiceToRevenue=Assign Sales Invoice type to Revenue GL Account Number
AccountingAuthorize=Authorize
+AccountingAvailableInternalOrganizations=Available Internal Organizations
+AccountingBalanceDue=Balance Due
AccountingBalanceSheet=Balance Sheet
AccountingBankName=Bank Name
AccountingBilling=Billing
AccountingBillingAccount=Billing Acct
AccountingBillingAccountId=Billing Acct ID
AccountingBillingAccountInvoices=Billing Account Invoices
-AccountingApplyPaymentoTo=Apply this payment to
AccountingBillingAccountOnly=Pay With Billing Account Only
AccountingBillingAccountPayments=Billing Account Payments
AccountingBillingAccounts=Billing Accounts
-AccountingBalanceDue=Balance Due
AccountingBillingAcct=Billing Acct
AccountingBillingAddress=Billing Address
-AccountingBillToAddress1=Bill-To Address1
-AccountingBillToAddress2=Bill-To Address2
AccountingBillingContactMechId=Billing Contact Mech
AccountingBillingContactMechIdMessage=Billing Address; Add Party/Role first, then select from drop-down
AccountingBillingInformation=AccountingBilling Information
AccountingBillingMenu=Billing Accounts
+AccountingBillToAddress1=Bill-To Address1
+AccountingBillToAddress2=Bill-To Address2
AccountingBillUpTo=Bill-Up To
AccountingCapture=Capture
AccountingCardNumber=Card Number
AccountingCardType=Card Type
AccountingChartOfAcctsMenu=Chart of Accounts
+AccountingCheckAmount=Check Amount
+AccountingChecks=Checks
AccountingComments=Comments
AccountingCompanies=Companies
AccountingCompanyName=OFBiz: Accounting Manager
AccountingCompanyNameAccount=Company Name on Account
AccountingCompanyNameCard=Company Name on Card
AccountingCompanySubtitle=Part of the Open For Business Family of Open Source Software
+AccountingCouldNotFindGlAccount=Could not find GlAccount with ID
AccountingCreateAssignment=Create Assignment
AccountingCreateBillingAccount=Create Billing Account
AccountingCreateBillingAccountPermissionError=Security Error: to run createBillingAccount you must have the ACCOUNTING_CREATE or ACCOUNTING_ADMIN permission <br>
-AccountingCheckAmount=Check Amount
AccountingCreateBillingAccountRole=Create Billing Account Role
AccountingCreateBillingAccountRolePermissionError=Security Error : to run createBillingAccountRole you must have the ACCOUNTING_CREATE or ACCOUNTING_ADMIN permission
AccountingCreateBillingAccountTerm=Create Billing Account Term
@@ -133,6 +139,18 @@
AccountingFindPayment=Find Payment
AccountingFindPayments=Find Payments
AccountingFirstNameCard=First Name on Card
+AccountingFiscalMonth01=01-Jan
+AccountingFiscalMonth02=02-Feb
+AccountingFiscalMonth03=03-Mar
+AccountingFiscalMonth04=04-Apr
+AccountingFiscalMonth05=05-May
+AccountingFiscalMonth06=06-Jun
+AccountingFiscalMonth07=07-Jul
+AccountingFiscalMonth08=08-Aug
+AccountingFiscalMonth09=09-Sep
+AccountingFiscalMonth10=10-Oct
+AccountingFiscalMonth11=11-Nov
+AccountingFiscalMonth12=12-Dec
AccountingFixedAsset=Fixed Asset
AccountingFixedAssetCalendar=Calendar
AccountingFixedAssetEdit=Create/Update Fixed Asset
@@ -156,6 +174,7 @@
AccountingFixedAssetMaintName=Maintenance Name
AccountingFixedAssetMaintMeters=Meters Readings
AccountingFixedAssetMaintMeterValue=Meter Value
+AccountingFixedAssetMessage1=*) empty, but maximum from fixed Asset capacity shown
AccountingFromParty=From Party
AccountingFromPartyId=From Party ID
AccountingFX=Foreign Exchange Rates
@@ -165,8 +184,9 @@
AccountingGlAccs=GL Accounts
AccountingGlAccount=GL Account
AccountingGlAccounts=GL Accounts
-AccountingFixedAssetMessage1=*) empty, but maximum from fixed Asset capacity shown
+AccountingGlAccountAssignments=GL Account Assignments
AccountingGlAccountClass=GL Account Class
+AccountingGlAccountDefault=GL Account defaults
AccountingGlAccountId=GL Account ID
AccountingInvoiceHeaderDetailedInformation=Header Detailed Information
AccountingHideFields=Hide Fields
@@ -187,8 +207,10 @@
AccountingInvoiceOverview=Overview
AccountingInvoicePaid=Paid
AccountingInvoicePayments=Payments
+AccountingInvoicePurchase=Purchase Invoice
AccountingInvoicePDF=PDF
AccountingInvoiceRoles=Roles
+AccountingInvoiceSales=Sales Invoice
AccountingInvoiceStatus=Status
AccountingInvoiceStatusHistory=Status History
AccountingInvoiceStatusToApproved=Status to 'Approved'
@@ -251,11 +273,14 @@
AccountingNoPaymentsApplicationsfound=No applications found..
AccountingNoPaymentMethods=There are no payment methods on file.
AccountingNoPaymentsfound=No Payments found
+AccountingNotModificationRecrationGlAccount=This cannot be changed without re-creating the GL Account.
AccountingOfflinePayment=Offline Payment
AccountingOpenPayments=Open
AccountingOrders=Orders
AccountingOrderNr=Order #
AccountingOrderPaymentPreferenceId=Accounting Order Payment Preference Id
+AccountingOrganizationPartyId=Organization Party Id
+AccountingOverrideRevenueGlAccountId=Override Revenue Gl Account Id
AccountingPaidDate=Paid Date
AccountingPartyBilledFrom=Party Billed From
AccountingPartyBilledTo=Party Billed To
@@ -281,6 +306,9 @@
AccountingPaymentApplToPayment=other paymentID [${paymentApplication.toPaymentId}]
AccountingPaymentApplToBillingAccount=Billing Account ID [${paymentApplication.billingAccountId}]
AccountingPaymentApplToTaxAuth=Tax Authority area [${paymentApplication.taxAuthGeoId}]
+AccountingPaymentCheckMessage1=Sorry, no payments were selected.
+AccountingPaymentMethodType=Payment Method Type
+AccountingPaymentOriginalAmount=Original Amt.
AccountingPaymentsApplied=Payments Applied
AccountingPaymentsFound=Payment(s) Found
AccountingPaymentsMenu=Payments
@@ -290,9 +318,6 @@
AccountingPaymentTabApplications=Applications
AccountingPaymentTabHeader=Header
AccountingPaymentTabOverview=Overview
-AccountingPaymentCheckMessage1=Sorry, no payments were selected.
-AccountingPaymentMethodType=Payment Method Type
-AccountingPaymentOriginalAmount=Original Amt.
AccountingPaymentTabStatusToCancelled=Status to 'Cancelled'
AccountingPaymentTabStatusToConfirmed=Status to 'Confirmed'
AccountingPaymentTabStatusToReceived=Status to 'Received'
@@ -300,6 +325,7 @@
AccountingPaymentType=Payment Type
AccountingPermissionError=You do not have permission for this function.
AccountingPleaseSendPaymentTo=Please Send Payment To
+AccountingPostTransaction=Post Transaction
AccountingPreference=Organization Accounting Preferences
AccountingPrefixCard=Prefix on Card
AccountingPrintAsCheck=Print As Check
@@ -315,22 +341,24 @@
AccountingRoleTypeIdFrom=Role Type Id From
AccountingRoleTypeIdTo=Role Type Id To
AccountingRoutingNumber=Routing Number
+AccountingSalesInvoiceToRevenue=Sales Invoice type to Revenue GL Account Number assignment list
+AccountingSecurityCodeCard=Card Security Code
AccountingSendChecks=Mark Checks Sent
+AccountingShowAllFixedAssets=Show All Fixed Assets
+AccountingShowAllInvoices=Show All Invoices
+AccountingShowAllPayments=Show All Payments
+AccountingShowInvoices=Show Invoices
+AccountingShowPayments=Show Payments
AccountingStatus=Accounting Status
AccountingSuffixCard=Suffix on Card
AccountingTaxAuthorities=Tax Authorities
AccountingTaxAuthority=Tax Authority
+AccountingTaxAuthorityParty=Tax Authority Party
AccountingtaxAuthGeoId=Tax Auth Geo ID
AccountingTaxSummary=Tax Summary Report
AccountingTermTypeId=Term Type Id
AccountingTextData=Text Data
-AccountingSecurityCodeCard=Card Security Code
AccountingThruDate=Thru Date
-AccountingShowAllFixedAssets=Show All Fixed Assets
-AccountingShowAllInvoices=Show All Invoices
-AccountingShowAllPayments=Show All Payments
-AccountingShowInvoices=Show Invoices
-AccountingShowPayments=Show Payments
AccountingTitleTransfer=Title Transfer
AccountingTotalCapital=TOTAL
AccountingTransactions=Transactions
@@ -360,17 +388,17 @@
AccountingFixedAssetRegNumber=Registration Number
AccountingFixedAssetLicenseNumber=License Number
AccountingFixedAssetGovAgencyPartyId=Government Agency
-
-PageTitleEditAgreement=Edit Agreement
-PageTitleEditAgreementItem=Edit Agreement Item
-PageTitleEditAgreementTerm=Edit Agreement Term
AccountingFixedAssetMaintType=Maintenace Type
AccountingFixedAssetMaintName=Maintenace Name
AccountingFixedAssetMaintIntervalUom=Interval Uom
AccountingFixedAssetMaintIntervalMeterType=Interval Meter Type
AccountingFixedAssetMaintIntervalQuantity=Interval Quantity
+AccountingFixedAssetMaintMessage1=If the Product Maintenance is specified, this will be set/reset automatically
+AccountingFixedAssetMaintMessage2=Only use if applicable, can use Maintenance Type instead
-
+PageTitleEditAgreement=Edit Agreement
+PageTitleEditAgreementItem=Edit Agreement Item
+PageTitleEditAgreementTerm=Edit Agreement Term
PageTitleEditBillingAccount=Edit Billing Account
PageTitleEditBillingAccountInvoices=Edit Billing Account Invoices
PageTitleEditBillingAccountPayments=Edit Billing Account Payments
@@ -378,6 +406,7 @@
PageTitleEditBillingAccountTerms=Edit Billing Account Terms
PageTitleEditFixedAsset=Edit Fixed Asset
PageTitleEditFixedAssetIdents=Edit Fixed Asset Idents
+PageTitleEditFixedAssetMaintenance=Edit Fixed Asset Maintenance
PageTitleEditFixedAssetRegistrations=Edit Fixed Asset Registrations
PageTitleEditFixedAssetStdCost=Edit Fixed Asset Standard Cost
PageTitleEditGlAccount=Edit GL Account
@@ -396,6 +425,7 @@
PageTitleListAgreementTerms=List Agreement Terms
PageTitleListFixedAssets=List Fixed Assets
PageTitleListFixedAssetCalendar=List Fixed Asset Calendar
+PageTitleListFixedAssetMaints=List Fixed Asset Maints
PageTitleListFixedAssetProducts=List Fixed Asset Products
PageTitleListFixedAssetStdCosts=List Fixed Asset Standard Costs
PageTitleListEditInvoiceApplications=List Edit Invoice Applications
@@ -407,6 +437,7 @@
PageTitleLookupGlAccount=Lookup GL Account
PageTitleLookupProduct=Lookup Product
PageTitleMain=Main Page
+PageTitlePaymentOverview=Payment Overview
PageTitleFindTaxAuthority=Find Tax Authority
PageTitleEditTaxAuthority=Edit Tax Authority
@@ -416,12 +447,15 @@
PageTitleAddTaxAuthorityAssoc=Add Tax Authority Association
PageTitleEditTaxAuthorityGlAccounts=Edit Tax Authority GL Accounts
PageTitleAddTaxAuthorityGlAccount=Add Tax Authority GL Account
-PageTitlePaymentOverview=Payment Overview
PageTitleEditTaxAuthorityRateProducts=Edit Tax Authority Product Rates
PageTitleAddTaxAuthorityRateProduct=Add Tax Authority Product Rate
PageTitleListTaxAuthorityParties=List Tax Authority Parties
PageTitleEditTaxAuthorityPartyInfo=Edit Tax Authority Party Info
PageTitleSendInvoicePerEmail=Send Invoice per email
+PageTitleViewGlAccountEntries=View Gl Account Entries
+PageTitleViewAccountingTransaction=View Accounting Transaction
+PageTitleAddGlAccount=Add Gl Account
+PageTitleUnpostedTransactions=Un-posted Accounting Transactions
PartyPartyId=Party ID
PartyRoles=Roles
@@ -440,6 +474,8 @@
isClosed=CLOSED
isNotClosed=NOT CLOSED
TimePeriod=Time Period
+TimePeriodMessage1=There are currently no closed time periods.
+TimePeriodMessage2=The following time periods have been closed
ByTimePeriod=For Closed Time Period
ByDate=By Date
AsOf=As Of
Modified: trunk/applications/accounting/config/AccountingUiLabels_it.properties
===================================================================
--- trunk/applications/accounting/config/AccountingUiLabels_it.properties 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/config/AccountingUiLabels_it.properties 2006-06-30 22:27:08 UTC (rev 7917)
@@ -21,7 +21,7 @@
nl=Olandese
AccountingPermissionError=Errore Sicurezza\: per eseguire ${methodShortDescription} tu devi avere il permesso ACCOUNTING${securityAction} o ACCOUNTING_ADMIN
-
+
AcctgGlPartyLabel=Soggetto Contabilit\u00e0 Generale :
AcctgGlAcctLabel=Conti Contabilit\u00e0 Generale:
AcctgEditGlJournalEntry=Voce Giornale
@@ -41,6 +41,8 @@
AccountingAccountLimit=Limite Conto
AccountingAccountNumber=Numero Conto
AccountingAccountType=Tipo Conto
+AccountingAccounts=Conti
+AccountingAdmin=Amministra
AccountingAssignPaymentToInvoice=Assegna Pagamento a Questa Fattura
AccountingAddNewCreditCard=Aggiungi Nuova Carta Credito
AccountingAddNewEftAccount=Aggiungi Nuovo Conto EFT
@@ -69,12 +71,12 @@
AccountingApplyPaymentoTo=Applica questo pagamento a
AccountingAppliedPayments=Pagamenti Applicati
AccountingAssets=Cespiti
+AccountingAssignSalesInvoiceToRevenue=Assegna Tipo Fattura Vendita al Numero Conto Profitti Gl
AccountingAuthorize=Autorizza
+AccountingAvailableInternalOrganizations=Organizzazioni Interne Disponibili
AccountingBalanceDue=Bilancio Dovuto
AccountingBalanceSheet=Bilancio
AccountingBankName=Nome Banca
-AccountingBillToAddress1=Fattura-All'Indirizzo 1
-AccountingBillToAddress2=Fattura-All'Indirizzo 2
AccountingBilling=Fatturato
AccountingBillingAccount=Conto Fatturazione
AccountingBillingAccountId=Numero Conto Fatturazione
@@ -88,18 +90,22 @@
AccountingBillingContactMechIdMessage=Indirizzo Fatturazione; Aggiungi Soggetto/Ruolo per primo, allora seleziona dalla lista
AccountingBillingInformation=Informazioni Conto Fatturazione
AccountingBillingMenu=Conti Fatturazione
+AccountingBillToAddress1=Fattura-All'Indirizzo 1
+AccountingBillToAddress2=Fattura-All'Indirizzo 2
AccountingBillUpTo=Fatturare A
AccountingCapture=Cattura
AccountingCardNumber=Numero Carta
AccountingCardType=Tipo Carta
AccountingChartOfAcctsMenu=Piano dei Conti
AccountingCheckAmount=Importo Assegno
+AccountingChecks=Assegni
AccountingComments=Commenti
AccountingCompanies=Aziende
AccountingCompanyName=OFBiz: Gestione Contabilit\u00e0
AccountingCompanyNameAccount=Nome Azienda sul Conto
AccountingCompanyNameCard=Nome Azienda sulla Carta
AccountingCompanySubtitle=Part of the Open For Business Family of Open Source Software
+AccountingCouldNotFindGlAccount=Non trovato Conto Gl con Codice
AccountingCreateAssignment=Creare Assegnazione
AccountingCreateBillingAccount=Creare Conto Fatturazione
AccountingCreateBillingAccountPermissionError=Errore Sicurezza : per eseguire createBillingAccount tu devi avere il permesso ACCOUNTING_CREATE o ACCOUNTING_ADMIN<br>
@@ -133,6 +139,18 @@
AccountingFindPayment=Ricerca Pagamento
AccountingFindPayments=Ricerca Pagamenti
AccountingFirstNameCard=Nome sulla Carta
+AccountingFiscalMonth01=01-Gen
+AccountingFiscalMonth02=02-Feb
+AccountingFiscalMonth03=03-Mar
+AccountingFiscalMonth04=04-Apr
+AccountingFiscalMonth05=05-Mag
+AccountingFiscalMonth06=06-Giu
+AccountingFiscalMonth07=07-Lug
+AccountingFiscalMonth08=08-Aug
+AccountingFiscalMonth09=09-Set
+AccountingFiscalMonth10=10-Ott
+AccountingFiscalMonth11=11-Nov
+AccountingFiscalMonth12=12-Dic
AccountingFixedAsset=Cespite
AccountingFixedAssetCalendar=Calendario
AccountingFixedAssetEdit=Crea/Aggiorna Cespite
@@ -151,17 +169,24 @@
AccountingFixedAssets=Cespiti
AccountingFixedAssetIdents=Identificazioni
AccountingFixedAssetRegistrations=Registrazioni
+AccountingFixedAssetMaints=Manutenzioni
+AccountingFixedAssetMaint=Manutenzione
+AccountingFixedAssetMaintName=Nome Manutenzione
+AccountingFixedAssetMaintMeters=Lettura Contatore
+AccountingFixedAssetMaintMeterValue=Valore Contatore
AccountingFixedAssetMessage1=*) vuoto, ma al massimo della capacit\u00e0 mostrate per il cespite
AccountingFromParty=Dal Soggetto
AccountingFromPartyId=Dal Codice Soggetto
-AccountingFX=Percentuali Cambi Valuta
+AccountingFX=Tasso Cambi Valuta
AccountingGatewayResponse=Risposta Gateway
AccountingGatewayResponses=Risposte Gateway
AccountingGlAcc=Conto Contabilit\u00e0 Generale
AccountingGlAccs=Conti Contabilit\u00e0 Generale
AccountingGlAccount=Conto Contabilit\u00e0 Generale
AccountingGlAccounts=Conti Contabilit\u00e0 Generale
+AccountingGlAccountAssignments=Assegnazione Conti Gl
AccountingGlAccountClass=Classe Conto Contabilit\u00e0 Generale
+AccountingGlAccountDefault=Defaults Conto Contabilit\u00e0 Generale
AccountingGlAccountId=Codice Conto Contabilit\u00e0 Generale
AccountingInvoiceHeaderDetailedInformation=Informazioni Dettagliate Testata
AccountingHideFields=Campi Nascosti
@@ -170,6 +195,7 @@
AccountingInformation=Informazione
AccountingInvNr=Nr.Fattura
AccountingInvoice=Fattura
+AccountingInvoiceCapitals=FATTURA
AccountingInvoiceDate=Data Fattura
AccountingInvoiceDateAbbr=Dt.Fattura
AccountingInvoiceHeader=Testata
@@ -181,8 +207,10 @@
AccountingInvoiceOverview=Visione
AccountingInvoicePaid=Pagato
AccountingInvoicePayments=Pagamenti
+AccountingInvoicePurchase=Fattura Acquisto
AccountingInvoicePDF=PDF
AccountingInvoiceRoles=Ruoli
+AccountingInvoiceSales=Fattura Vendita
AccountingInvoiceStatus=Stato
AccountingInvoiceStatusHistory=Storia Stati
AccountingInvoiceStatusToApproved=Stato a 'Approvato'
@@ -192,7 +220,7 @@
AccountingInvoiceStatusToReady=Stato a 'Pronto'
AccountingInvoiceStatusToReceived=Stato a 'Ricevuto'
AccountingInvoiceStatusToSent=Stato a 'Inviato'
-AccountingInvoiceStatusToWriteoff=Stato a 'Ammortizzato'
+AccountingInvoiceStatusToWriteoff=Stato a 'Perso'
AccountingInvoiceTotal=Totale Fattura
AccountingInvoices=Fatture
AccountingInvoicesFound=Fatture Trovate
@@ -228,6 +256,7 @@
AccountingNewAgreementPromoAppl=Aggiungi Nuova Promozione
AccountingNewAgreementTerm=Creare Termine Contratto
AccountingNewFixedAsset=Nuovo Cespite
+AccountingNewFixedAssetMaint=Nuova Manutenzione
AccountingNewFixedAssetStdCost=Nuovo Costo Standard
AccountingNewPayment=Nuovo Pagamento
AccountingNewTaxAuthority=Nuova Autorit\u00e0 Tasse
@@ -244,11 +273,14 @@
AccountingNoPaymentsApplicationsfound=Nessun applicazione pagamento trovata.
AccountingNoPaymentMethods=Non ci sono metodi di pagamento sul file.
AccountingNoPaymentsfound=Nessun Pagamento trovato
+AccountingNotModificationRecrationGlAccount=Questo non pu\u00f2 essere cambiato senza ricreare il Conto Gl.
AccountingOfflinePayment=Pagamento Offline
AccountingOpenPayments=Aperti
AccountingOrders=Ordini
AccountingOrderNr=Ordine #
AccountingOrderPaymentPreferenceId=Codice Preferenza Ordine Pagamento Contabile
+AccountingOrganizationPartyId=Soggeto Organizzazione
+AccountingOverrideRevenueGlAccountId=Sostituzione Conto Profitti Gl
AccountingPaidDate=Data Pagato
AccountingPartyBilledFrom=Soggetto Fatturazione Da
AccountingPartyBilledTo=Soggetto Fatturazione A
@@ -293,6 +325,7 @@
AccountingPaymentType=Tipo Pagamento
AccountingPermissionError=Tu non hai il permesso per questa funzione.
AccountingPleaseSendPaymentTo=Perfavore Inviare Pagamento A:
+AccountingPostTransaction=Contabilizza Transazione
AccountingPreference=Preferenze Contabilit\u00e0 Organizzazione
AccountingPrefixCard=Prefisso sulla Carta
AccountingPrintAsCheck=Stampa Come Assegno
@@ -308,6 +341,7 @@
AccountingRoleTypeIdFrom=Tipo Ruolo Da
AccountingRoleTypeIdTo=Tipo Ruolo A
AccountingRoutingNumber=Numero Rotta
+AccountingSalesInvoiceToRevenue=Lista Tipo Fattura Vendita assegnate al Numero Conto Profitti Gl
AccountingSecurityCodeCard=Codice Sicurezza Carta
AccountingSendChecks=Segna Assegni Inviati
AccountingShowAllFixedAssets=Mostra tutti i Cespiti
@@ -319,6 +353,7 @@
AccountingSuffixCard=Suffisso sulla Carta
AccountingTaxAuthorities=Autorit\u00e0 Tasse
AccountingTaxAuthority=Autorit\u00e0 Tasse
+AccountingTaxAuthorityParty=Soggetto Autorit\u00e0 Tasse
AccountingtaxAuthGeoId=Autorit\u00e0 Tasse Geografia
AccountingTaxSummary=Stampa Sommario Tasse
AccountingTermTypeId=Tipo Termine
@@ -337,12 +372,13 @@
AccountingUpdateBillingAccountRolePermissionError=Errore Sicurezza : per eseguire updateBillingAccountRole tu devi avere il permesso ACCOUNTING_UPDATE o ACCOUNTING_ADMIN
AccountingUpdateBillingAccountTermPermissionError=Errore Sicurezza : per eseguire updateBillingAccountTerm tu devi avere il permesso ACCOUNTING_UPDATE o ACCOUNTING_ADMIN
AccountingUpdateBillingAccount=Aggiorna Conto Fatturazione
-AccountingUpdateFX=Aggiorna Percentuali Cambi Valute
+AccountingUpdateFX=Aggiorna Tasso Cambio Valuta
AccountingUpdatePaymentPermissionError=Errore Sicurezza : Per Aggiornare un Pagamento tu devi avere entrambi da o a Soggetto o il permesso PAY_INFO_UPDATE o PAY_INFO_ADMIN.
AccountingUnitPrice=Prezzo Unitario
AccountingValidationPattern=Usa espressioni regolari per la validazione dello stile
AccountingViewPermissionError=Tu non sei autorizzato a vedere questa pagina. ("ACCOUNTING_VIEW" o "ACCOUNTING_ADMIN" necessitano)
-AccountingFX=Percentuali Cambi Valuta
+AccountingFX=Tasso Cambio Valuta
+AccountingDataSourceError=Errore Sorgente Dati
AccountingNewFixedAssetIdents=Creare Identificazione Cespite
AccountingNewFixedAssetIdentsType=Tipo Identificazione Cespite
@@ -352,6 +388,13 @@
AccountingFixedAssetRegNumber=Numero Registrazione
AccountingFixedAssetLicenseNumber=Numero Licenza
AccountingFixedAssetGovAgencyPartyId=Agenzia Governativa
+AccountingFixedAssetMaintType=Tipo Manutenzione
+AccountingFixedAssetMaintName=Nome Manutenzione
+AccountingFixedAssetMaintIntervalUom=Udm Intervallo
+AccountingFixedAssetMaintIntervalMeterType=Tipo Contatore Intervallo
+AccountingFixedAssetMaintIntervalQuantity=Quantit\u00e0 Intervallo
+AccountingFixedAssetMaintMessage1=Se la Manutenzione Prodotto \u00e8 specificata, questa sar\u00e0 impostata/azzerata automaticamente
+AccountingFixedAssetMaintMessage2=Solamente usato se applicabile, pu\u00f2 essere usato Tipo Manutenzione invece
PageTitleEditAgreement=Aggiorna Contratto
PageTitleEditAgreementItem=Aggiorna Riga Contratto
@@ -363,6 +406,7 @@
PageTitleEditBillingAccountTerms=Aggiorna Termini Conto Fatturazione
PageTitleEditFixedAsset=Aggiorna Cespite
PageTitleEditFixedAssetIdents=Aggiorna Identit\u00e0 Cespite
+PageTitleEditFixedAssetMaintenance=Aggiorna Manutenzione Cespite
PageTitleEditFixedAssetRegistrations=Aggiorna Registrazioni Cespite
PageTitleEditFixedAssetStdCost=Aggiorna Costi Standard Cespiti
PageTitleEditGlAccount=Aggiorna Conto Contabilit\u00e0 Generale
@@ -381,6 +425,7 @@
PageTitleListAgreementTerms=Lista Termini Contratto
PageTitleListFixedAssets=Lista Cespiti
PageTitleListFixedAssetCalendar=Lista Calendario Cespite
+PageTitleListFixedAssetMaints=Lista Manutenzioni Cespiti
PageTitleListFixedAssetProducts=Lista Prodotti Cespite
PageTitleListFixedAssetStdCosts=Lista Costi Standard Cespite
PageTitleListEditInvoiceApplications=Aggiorna Applicazioni Fattura
@@ -407,6 +452,10 @@
PageTitleListTaxAuthorityParties=Lista Soggetto Autorit\u00e0 Tasse
PageTitleEditTaxAuthorityPartyInfo=Aggiorna Informazioni Soggetto Autorit\u00e0 Tasse
PageTitleSendInvoicePerEmail=Invia Fattura per email
+PageTitleViewGlAccountEntries=Mostra Voci Conto Gl
+PageTitleViewAccountingTransaction=Mostra Transazioni Contabilit\u00e0
+PageTitleAddGlAccount=Aggiungi Conto Gl
+PageTitleUnpostedTransactions=Transazione non Contabilizzate
PartyPartyId=Codice Soggetto
PartyRoles=Ruoli
@@ -424,7 +473,9 @@
GlFiscalType=Tipo Fiscale
isClosed=CHIUSO
isNotClosed=NON CHIUSO
-TimePeriod=Ora Periodo
+TimePeriod=Periodo Orario
+TimePeriodMessage1=Attualmente non ci sono periodi orari chiusi.
+TimePeriodMessage2=I seguenti periodi orario sono stati chiusi
ByTimePeriod=Per Periodo Ora Chiuso
ByDate=Dalla Data
AsOf=Come Da
@@ -525,6 +576,14 @@
AccountingApplicationToTax=all'area Autorit\u00e0 Tasse [${taxAuthGeoId}]
AccountingSuccessFull= successo
AccountingEmailScheduledToSend=Messaggio Email con fattura allegata: ${parameters.invoiceId} schedulata per essere inviata....
+AccountingInvoiceCommissionError=Errore creazione provvigioni fattura
+AccountingInvoiceCommissionErrorRole=Errore creazione ruolo fattura per provvigioni fattura
+AccountingInvoiceCommissionErrorItem=Errore creazione righe fattura per provvigioni fattura
+AccountingInvoiceCommissionInvalid=Questo tipo di fattura non ha provvigione, non creata provvigione fattura
+AccountingInvoiceCommissionZeroInvoiceAmount=Questa fattura ha un importo a zero, cos\u00ec nessena provvigione fattura sar\u00e0 creata
+AccountingInvoiceCommissionMultHeader=Ordine Multipli o resi, non trattati.
+AccountingInvoiceCommissionNoItems=Nessun ordine o righe reso, non creata provvigione fattura
+AccountingInvoiceCommissionEntityDataProblem=Entit\u00e0/dati problemi creata provvigione fattura: ${reason}
#Potentional Common definitions
FormFieldTitle_emailAddressFrom=Da indirizzo Email
Modified: trunk/applications/accounting/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/accounting/entitydef/entitymodel.xml 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/entitydef/entitymodel.xml 2006-06-30 22:27:08 UTC (rev 7917)
@@ -446,6 +446,7 @@
</entity>
<entity entity-name="FixedAssetIdentType"
package-name="org.ofbiz.accounting.fixedasset"
+ default-resource-name="AccountingEntityLabels"
title="Fixed Asset Identification Type Entity">
<field name="fixedAssetIdentTypeId" type="id-ne"></field>
<field name="description" type="description"></field>
@@ -577,7 +578,10 @@
<key-map field-name="amountUomId" rel-field-name="uomId"/>
</relation>
</entity>
- <entity entity-name="FixedAssetStdCostType" package-name="org.ofbiz.accounting.fixedasset" title="Fixed Asset Standard Cost Type Entity">
+ <entity entity-name="FixedAssetStdCostType"
+ package-name="org.ofbiz.accounting.fixedasset"
+ default-resource-name="AccountingEntityLabels"
+ title="Fixed Asset Standard Cost Type Entity">
<field name="fixedAssetStdCostTypeId" type="id-ne"></field>
<field name="parentTypeId" type="id-ne"></field>
<field name="hasTable" type="indicator"></field>
@@ -1239,6 +1243,7 @@
</entity>
<entity entity-name="AcctgTransType"
package-name="org.ofbiz.accounting.ledger"
+ default-resource-name="AccountingEntityLabels"
title="Accounting Transaction Type Entity">
<field name="acctgTransTypeId" type="id-ne"></field>
<field name="parentTypeId" type="id-ne"></field>
@@ -1518,6 +1523,7 @@
</entity>
<entity entity-name="GlFiscalType"
package-name="org.ofbiz.accounting.ledger"
+ default-resource-name="AccountingEntityLabels"
title="General Ledger Fiscal Entity">
<field name="glFiscalTypeId" type="id-ne"></field>
<field name="description" type="description"></field>
@@ -1579,6 +1585,7 @@
</entity>
<entity entity-name="GlResourceType"
package-name="org.ofbiz.accounting.ledger"
+ default-resource-name="AccountingEntityLabels"
title="General Ledger Resource Entity">
<field name="glResourceTypeId" type="id-ne"></field>
<field name="description" type="description"></field>
@@ -2754,7 +2761,10 @@
<key-map field-name="taxAuthorityAssocTypeId"/>
</relation>
</entity>
- <entity entity-name="TaxAuthorityAssocType" package-name="org.ofbiz.accounting.tax" title="Tax Authority Assoc Type Entity">
+ <entity entity-name="TaxAuthorityAssocType"
+ package-name="org.ofbiz.accounting.tax"
+ default-resource-name="AccountingEntityLabels"
+ title="Tax Authority Assoc Type Entity">
<field name="taxAuthorityAssocTypeId" type="id-ne"></field>
<field name="description" type="description"></field>
<prim-key field="taxAuthorityAssocTypeId"/>
@@ -2832,7 +2842,10 @@
<key-map field-name="productCategoryId"/>
</relation>
</entity>
- <entity entity-name="TaxAuthorityRateType" package-name="org.ofbiz.accounting.tax" title="Tax Authority Rate Type Entity">
+ <entity entity-name="TaxAuthorityRateType"
+ package-name="org.ofbiz.accounting.tax"
+ default-resource-name="AccountingEntityLabels"
+ title="Tax Authority Rate Type Entity">
<field name="taxAuthorityRateTypeId" type="id-ne"></field>
<field name="description" type="description"></field>
<prim-key field="taxAuthorityRateTypeId"/>
Modified: trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml 2006-06-30 22:27:08 UTC (rev 7917)
@@ -23,8 +23,8 @@
<form name="ListCompanies" type="list" title="Internal Organizations" default-widget-style="linktext"
default-title-style="tableheadtext" default-tooltip-style="tabletext" list-name="parties">
<field name="partyId" title="${uiLabelMap.AccountingCompanies}" widget-style="tabletext"><display-entity entity-name="PartyGroup" description="${groupName}"/></field>
- <field name="admin" title="Admin"><hyperlink target="AdminMain?organizationPartyId=${partyId}" description="Admin"/></field>
- <field name="accounts" title="Accounts"><hyperlink target="ListGlAccountOrganization?organizationPartyId=${partyId}" description="Accounts"/></field>
+ <field name="admin" title="${uiLabelMap.AccountingAdmin}"><hyperlink target="AdminMain?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingAdmin}"/></field>
+ <field name="accounts" title="${uiLabelMap.AccountingAccounts}"><hyperlink target="ListGlAccountOrganization?organizationPartyId=${partyId}" description="${uiLabelMap.AccountingAccounts}"/></field>
</form>
<form name="PartyAcctgPreference" type="single" target="createPartyAcctgPreference"
@@ -33,22 +33,22 @@
<auto-fields-service service-name="createPartyAcctgPreference"/>
<field name="organizationPartyId"><hidden value="${parameters.organizationPartyId}"/></field>
<!-- the partyId is always displayed -->
- <field name="partyId" title="Organization Party Id"><display/></field>
+ <field name="partyId" title="${uiLabelMap.AccountingOrganizationPartyId}"><display/></field>
<!-- if there is no partyAcctgPreference yet, then we show drop-downs for the fields and a submit button -->
<field name="fiscalYearStartMonth" use-when="partyAcctgPreference==null">
<drop-down>
- <option key="1" description="01-Jan"/>
- <option key="2" description="02-Feb"/>
- <option key="3" description="03-Mar"/>
- <option key="4" description="04-Apr"/>
- <option key="5" description="05-May"/>
- <option key="6" description="06-Jun"/>
- <option key="7" description="07-Jul"/>
- <option key="8" description="08-Aug"/>
- <option key="9" description="09-Sep"/>
- <option key="10" description="10-Oct"/>
- <option key="11" description="11-Nov"/>
- <option key="12" description="12-Dec"/>
+ <option key="1" description="${uiLabelMap.AccountingFiscalMonth01}"/>
+ <option key="2" description="${uiLabelMap.AccountingFiscalMonth02}"/>
+ <option key="3" description="${uiLabelMap.AccountingFiscalMonth03}"/>
+ <option key="4" description="${uiLabelMap.AccountingFiscalMonth04}"/>
+ <option key="5" description="${uiLabelMap.AccountingFiscalMonth05}"/>
+ <option key="6" description="${uiLabelMap.AccountingFiscalMonth06}"/>
+ <option key="7" description="${uiLabelMap.AccountingFiscalMonth07}"/>
+ <option key="8" description="${uiLabelMap.AccountingFiscalMonth08}"/>
+ <option key="9" description="${uiLabelMap.AccountingFiscalMonth09}"/>
+ <option key="10" description="${uiLabelMap.AccountingFiscalMonth10}"/>
+ <option key="11" description="${uiLabelMap.AccountingFiscalMonth11}"/>
+ <option key="12" description="${uiLabelMap.AccountingFiscalMonth12}"/>
</drop-down>
</field>
<field name="fiscalYearStartDay" use-when="partyAcctgPreference==null">
@@ -63,7 +63,7 @@
</drop-down>
</field>
- <field name="taxFormId" title="Tax Form for Organization" use-when="partyAcctgPreference==null">
+ <field name="taxFormId" use-when="partyAcctgPreference==null">
<drop-down>
<entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="TAX_FORMS"/>
@@ -71,7 +71,7 @@
</entity-options>
</drop-down>
</field>
- <field name="cogsMethodId" title="Cost Of Goods Sold (COGS) Method" use-when="partyAcctgPreference==null">
+ <field name="cogsMethodId" use-when="partyAcctgPreference==null">
<drop-down>
<entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="COGS_METHODS"/>
@@ -79,7 +79,7 @@
</entity-options>
</drop-down>
</field>
- <field name="baseCurrencyUomId" title="Base Currency" use-when="partyAcctgPreference==null">
+ <field name="baseCurrencyUomId" use-when="partyAcctgPreference==null">
<drop-down no-current-selected-key="USD">
<entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
<entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
@@ -88,7 +88,7 @@
</drop-down>
</field>
<field name="invoiceIdPrefix" use-when="partyAcctgPreference==null"><text maxlength="10" size="5"/></field>
- <field name="invoiceSequenceEnumId" title="Invoice Sequence" use-when="partyAcctgPreference==null">
+ <field name="invoiceSequenceEnumId" use-when="partyAcctgPreference==null">
<drop-down>
<entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="INVOICE_SEQMD"/>
@@ -103,7 +103,7 @@
</field>
<field name="quoteIdPrefix" use-when="partyAcctgPreference==null"><text maxlength="10" size="5"/></field>
- <field name="quoteSequenceEnumId" title="Quote Sequence" use-when="partyAcctgPreference==null">
+ <field name="quoteSequenceEnumId" use-when="partyAcctgPreference==null">
<drop-down>
<entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="QUOTE_SEQMD"/>
@@ -112,7 +112,7 @@
</drop-down>
</field>
<field name="orderIdPrefix" use-when="partyAcctgPreference==null"><text maxlength="10" size="5"/></field>
- <field name="orderSequenceEnumId" title="Order Sequence" use-when="partyAcctgPreference==null">
+ <field name="orderSequenceEnumId" use-when="partyAcctgPreference==null">
<drop-down>
<entity-options entity-name="Enumeration" description="${description}" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="ORDER_SEQMD"/>
@@ -120,22 +120,22 @@
</entity-options>
</drop-down>
</field>
- <field name="submit" title="Create" use-when="partyAcctgPreference==null"><submit/></field>
+ <field name="submit" title="${uiLabelMap.CommonCreate}" use-when="partyAcctgPreference==null"><submit/></field>
<!-- otherwise, we just display the fields. there is no submit button because we shouldn't try to create it again and don't support an update option right now-->
<field name="fiscalYearStartMonth" use-when="partyAcctgPreference!=null"><display/></field>
<field name="fiscalYearStartDay" use-when="partyAcctgPreference!=null"><display/></field>
- <field name="taxFormId" title="Tax Form for Organization" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
- <field name="cogsMethodId" title="Cost Of Goods Sold (COGS) Method" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
- <field name="baseCurrencyUomId" title="Base Currency" use-when="partyAcctgPreference!=null"><display/></field>
+ <field name="taxFormId" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
+ <field name="cogsMethodId" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
+ <field name="baseCurrencyUomId" use-when="partyAcctgPreference!=null"><display/></field>
<field name="invoiceIdPrefix" use-when="partyAcctgPreference!=null"><display/></field>
- <field name="invoiceSequenceEnumId" title="Invoice Sequence" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
+ <field name="invoiceSequenceEnumId" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
<field name="useInvoiceIdForReturns" use-when="partyAcctgPreference!=null"><display/></field>
- <field name="quoteSequenceEnumId" title="Quote Sequence" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
+ <field name="quoteSequenceEnumId" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
<field name="quoteIdPrefix" use-when="partyAcctgPreference!=null"><display/></field>
<field name="lastQuoteNumber" use-when="partyAcctgPreference!=null"><display/></field>
- <field name="orderSequenceEnumId" title="Order Sequence" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
+ <field name="orderSequenceEnumId" use-when="partyAcctgPreference!=null"><display-entity entity-name="Enumeration" key-field-name="enumId"/></field>
<field name="orderIdPrefix" use-when="partyAcctgPreference!=null"><display/></field>
<field name="lastOrderNumber" use-when="partyAcctgPreference!=null"><display/></field>
<!--
@@ -157,8 +157,8 @@
<hyperlink also-hidden="false" description="${acctgTransId}" target="ListAcctgTransEntries?acctgTransId=${acctgTransId}"/>
</field>
<field name="transactionDate"><display/></field>
- <field name="acctgTransTypeId" title="Type"><display-entity entity-name="AcctgTransType" description="${description}"/></field>
- <field name="glFiscalTypeId" title="Type"><display-entity entity-name="GlFiscalType" description="${description}"/></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="invoiceId" use-when="invoiceId!=null" widget-style="buttontext">
<hyperlink also-hidden="false" description="${invoiceId}" target="editInvoice?invoiceId=${invoiceId}"/>
</field>
@@ -168,27 +168,27 @@
</field>
<field name="paymentId" use-when="paymentId==null"><display/></field>
<field name="partyId"><display/></field>
- <field name="post" title="Post Transaction" widget-style="buttontext">
- <hyperlink description="Post Transaction" target="postAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}" also-hidden="false"/>
+ <field name="post" title="${uiLabelMap.AccountingPostTransaction}" widget-style="buttontext">
+ <hyperlink description="${uiLabelMap.AccountingPostTransaction}" target="postAcctgTrans?acctgTransId=${acctgTransId}&organizationPartyId=${organizationPartyId}" also-hidden="false"/>
</field>
</form>
<!-- forms for managing FX rates -->
- <form name="ListConversions" type="list" title="Foreign Exchange Conversion Rates" default-widget-style="tabletext"
+ <form name="ListConversions" type="list" default-widget-style="tabletext"
default-title-style="tableheadtext" default-tooltip-style="tabletext" list-name="conversions">
- <field name="uomId" title="From Currency"><display/></field>
- <field name="uomIdTo" title="To Currency"><display/></field>
- <field name="conversionFactor" title="Rate"><display/></field>
- <field name="fromDate" title="From"><display/></field>
- <field name="thruDate" title="Thru"><display/></field>
+ <field name="uomId" title="${uiLabelMap.CommonFrom} ${uiLabelMap.CommonCurrency}"><display/></field>
+ <field name="uomIdTo" title="${uiLabelMap.CommonTo} ${uiLabelMap.CommonCurrency}"><display/></field>
+ <field name="conversionFactor"><display/></field>
+ <field name="fromDate" title="${uiLabelMap.CommonFrom}"><display/></field>
+ <field name="thruDate" title="${uiLabelMap.CommonThru}"><display/></field>
</form>
- <form name="updateFXConversion" type="single" title="Update Exchange Rate" target="updateFXConversion"
+ <form name="updateFXConversion" type="single" target="updateFXConversion"
default-service-name="updateFXConversion"
default-widget-style="tabletext" default-title-style="tableheadtext">
<field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
- <field name="uomId" title="From Currency">
+ <field name="uomId" title="${uiLabelMap.CommonFrom} ${uiLabelMap.CommonCurrency}">
<drop-down no-current-selected-key="USD">
<entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
<entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
@@ -196,7 +196,7 @@
</entity-options>
</drop-down>
</field>
- <field name="uomIdTo" title="To Currency">
+ <field name="uomIdTo" title="${uiLabelMap.CommonTo} ${uiLabelMap.CommonCurrency}">
<drop-down no-current-selected-key="USD">
<entity-options entity-name="Uom" description="${description}" key-field-name="uomId">
<entity-constraint name="uomTypeId" operator="equals" value="CURRENCY_MEASURE"/>
@@ -204,12 +204,12 @@
</entity-options>
</drop-down>
</field>
- <field name="conversionFactor" title="Conversion Factor"><text/></field>
- <field name="submitButton" title="Updated Exchange Rate"><submit/></field>
+ <field name="conversionFactor"><text/></field>
+ <field name="submitButton" title="${uiLabelMap.AccountingUpdateFX}"><submit/></field>
</form>
<!-- forms for Sales invoice Itemtypes to GLAccount number -->
- <form name="ListSalInvoiceItemTypeGlAssignments" type="list" title="Invoice Item types to GL account mapping" default-widget-style="tabletext"
+ <form name="ListSalInvoiceItemTypeGlAssignments" type="list" default-widget-style="tabletext"
default-title-style="tableheadtext" default-tooltip-style="tabletext" list-name="invoiceItemTypes" >
<actions>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/listInvoiceItemTypesGlAccount.bsh"/>
@@ -222,11 +222,11 @@
<field name="activeGlDescription"><display/></field>
<field name="remove" title=""><hyperlink target="removeSalInvoiceItemTypeGlAssignment?organizationPartyId=${organizationPartyId}&invoiceItemTypeId=${invoiceItemTypeId}" description="${remove}"/></field>
</form>
- <form name="AddSalInvoiceItemTypeGlAssignment" type="single" title="Add GL to Invoice Itemtype for a certain organisation" target="addSalInvoiceItemTypeGlAssignment"
+ <form name="AddSalInvoiceItemTypeGlAssignment" type="single" target="addSalInvoiceItemTypeGlAssignment"
default-widget-style="tabletext" default-title-style="tableheadtext">
<auto-fields-service service-name="addInvoiceItemTypeGlAssignment"/>
<field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
- <field name="invoiceItemTypeId" title="Sales Invoice Item Type">
+ <field name="invoiceItemTypeId">
<drop-down allow-empty="false" >
<entity-options description="${description}" entity-name="InvoiceItemType">
<entity-constraint name="invoiceItemTypeId" operator="like" value="INV_%"/>
@@ -234,7 +234,7 @@
</entity-options>
</drop-down>
</field>
- <field name="glAccountId" title="Override Revenue Gl Account Id">
+ <field name="glAccountId" title="${uiLabelMap.AccountingOverrideRevenueGlAccountId}">
<drop-down>
<entity-options entity-name="GlAccountOrganizationAndClass" description="${accountName}[${glAccountId}]">
<entity-constraint name="organizationPartyId" operator="equals" value="${organizationPartyId}"/>
@@ -244,11 +244,11 @@
</drop-down>
</field>
- <field name="submit" title="Save"><submit/></field>
+ <field name="submit" title="${uiLabelMap.CommonSave}"><submit/></field>
</form>
<!-- forms for Purchase invoice Itemtypes to GLAccount number -->
- <form name="ListPurInvoiceItemTypeGlAssignments" type="list" title="Invoice Item types to GL account mapping" default-widget-style="tabletext"
+ <form name="ListPurInvoiceItemTypeGlAssignments" type="list" default-widget-style="tabletext"
default-title-style="tableheadtext" default-tooltip-style="tabletext" list-name="purinvoiceItemTypes" default-map-name="iTypes" >
<actions>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/admin/listPurInvoiceItemTypesGlAccount.bsh"/>
@@ -261,7 +261,7 @@
<field name="activeGlDescription"><display/></field>
<field name="remove" title=""><hyperlink target="removePurInvoiceItemTypeGlAssignment?organizationPartyId=${organizationPartyId}&invoiceItemTypeId=${invoiceItemTypeId}" description="${remove}"/></field>
</form>
- <form name="AddPurInvoiceItemTypeGlAssignment" type="single" title="Add GL to Invoice Itemtype for a certain organisation" target="addPurInvoiceItemTypeGlAssignment"
+ <form name="AddPurInvoiceItemTypeGlAssignment" type="single" target="addPurInvoiceItemTypeGlAssignment"
default-widget-style="tabletext" default-title-style="tableheadtext">
<auto-fields-service service-name="addInvoiceItemTypeGlAssignment"/>
<field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
@@ -283,11 +283,11 @@
</drop-down>
</field>
- <field name="submit" title="Save"><submit/></field>
+ <field name="submit" title="${uiLabelMap.CommonSave}"><submit/></field>
</form>
<!-- forms for payment types to GLAccount type -->
- <form name="ListPaymentTypeGlAssignments" type="list" title="Payment types to GL account mapping" default-widget-style="tabletext"
+ <form name="ListPaymentTypeGlAssignments" type="list" default-widget-style="tabletext"
default-title-style="tableheadtext" default-tooltip-style="tabletext">
<actions>
<entity-condition entity-name="PaymentGlAccountTypeMap">
@@ -302,7 +302,7 @@
<field name="remove" title=""><hyperlink target="removePaymentTypeGlAssignment?organizationPartyId=${organizationPartyId}&paymentTypeId=${paymentTypeId}" description="Remove"/></field>
</form>
- <form name="AddPaymentTypeGlAssignment" type="single" title="Add GL to payment type" target="addPaymentTypeGlAssignment"
+ <form name="AddPaymentTypeGlAssignment" type="single" target="addPaymentTypeGlAssignment"
default-widget-style="tabletext" default-title-style="tableheadtext">
<auto-fields-service service-name="addPaymentTypeGlAssignment"/>
<field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
@@ -321,10 +321,10 @@
</drop-down>
</field>
- <field name="submit" title="Save"><submit/></field>
+ <field name="submit" title="${uiLabelMap.CommonSave}"><submit/></field>
</form>
<!-- forms for payment method Type to GLAccounts -->
- <form name="ListPaymentMethodTypeGlAssignments" type="list" title="Payment method types to GL account mapping" default-widget-style="tabletext"
+ <form name="ListPaymentMethodTypeGlAssignments" type="list" default-widget-style="tabletext"
default-title-style="tableheadtext" default-tooltip-style="tabletext">
<actions>
<entity-condition entity-name="PaymentMethodTypeGlAccount">
@@ -339,7 +339,7 @@
<field name="remove" title=""><hyperlink target="removePaymentMethodTypeGlAssignment?organizationPartyId=${organizationPartyId}&paymentMethodTypeId=${paymentMethodTypeId}" description="Remove"/></field>
</form>
- <form name="AddPaymentMethodTypeGlAssignment" type="single" title="Add GL Account to payment method type" target="addPaymentMethodTypeGlAssignment"
+ <form name="AddPaymentMethodTypeGlAssignment" type="single" target="addPaymentMethodTypeGlAssignment"
default-widget-style="tabletext" default-title-style="tableheadtext">
<auto-fields-service service-name="addPaymentMethodTypeGlAssignment"/>
<field name="organizationPartyId"><hidden value="${organizationPartyId}"/></field>
@@ -359,10 +359,10 @@
</drop-down>
</field>
- <field name="submit" title="Save"><submit/></field>
+ <field name="submit" title="${uiLabelMap.CommonSave}"><submit/></field>
</form>
- <form name="ListChecksToPrint" type="multi" list-name="payments" title="List Checks to Print" target="printChecks"
+ <form name="ListChecksToPrint" type="multi" list-name="payments" target="printChecks"
default-widget-style="tabletext" default-title-style="tableheadtext" separate-columns="true">
<field name="paymentId">
<hyperlink target="paymentOverview?paymentId=${paymentId}" description="${paymentId}"/>
@@ -377,7 +377,7 @@
<submit/>
</field>
</form>
- <form name="ListChecksToSend" type="multi" use-row-submit="true" list-name="payments" title="List Checks to Send"
+ <form name="ListChecksToSend" type="multi" use-row-submit="true" list-name="payments"
target="quickSendPayment?organizationPartyId=${organizationPartyId}"
default-widget-style="tabletext" default-title-style="tableheadtext" separate-columns="true">
<field name="paymentId"><hidden/></field>
Modified: trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/webapp/accounting/admin/AdminTabBar.ftl 2006-06-30 22:27:08 UTC (rev 7917)
@@ -19,22 +19,22 @@
<#if (parameters.organizationPartyId)?exists><#assign organizationPartyId = parameters.organizationPartyId></#if>
<#assign unselectedClassName = "tabButton">
<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
-<div class="head1">${title?if_exists} ${labelTitleProperty?if_exists} for organization: ${organizationPartyId}</div>
+<div class="head1">${title?if_exists} ${labelTitleProperty?if_exists} ${uiLabelMap.CommonFor} ${uiLabelMap.Organization}: ${organizationPartyId}</div>
<div class="tabContainer">
- <a href="<@ofbizUrl>TimePeriods?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.TimePeriods?default(unselectedClassName)}">Time Periods</a>
- <a href="<@ofbizUrl>PartyAcctgPreference?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.PartyAcctgPreference?default(unselectedClassName)}">Preferences</a>
- <a href="<@ofbizUrl>listChecksToPrint?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.ChecksTabButton?default(unselectedClassName)}">Checks</a>
- <a href="<@ofbizUrl>viewFXConversions?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.ViewFXConversions?default(unselectedClassName)}">Exchange Rates</a>
- <a href="<@ofbizUrl>EditGlJournalEntry?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.EditGlJournalEntry?default(unselectedClassName)}">Manual Journal Entry</a>
- <a href="<@ofbizUrl>ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.ListUnpostedAcctgTrans?default(unselectedClassName)}">Manual Transaction Posting</a>
- <a href="<@ofbizUrl>GlAccountAssignment?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.GlAccountAssignment?default(unselectedClassName)}">GL Account defaults</a>
+ <a href="<@ofbizUrl>TimePeriods?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.TimePeriods?default(unselectedClassName)}">${uiLabelMap.TimePeriod}</a>
+ <a href="<@ofbizUrl>PartyAcctgPreference?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.PartyAcctgPreference?default(unselectedClassName)}">${uiLabelMap.AccountingPreference}</a>
+ <a href="<@ofbizUrl>listChecksToPrint?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.ChecksTabButton?default(unselectedClassName)}">${uiLabelMap.AccountingChecks}</a>
+ <a href="<@ofbizUrl>viewFXConversions?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.ViewFXConversions?default(unselectedClassName)}">${uiLabelMap.AccountingFX}</a>
+ <a href="<@ofbizUrl>EditGlJournalEntry?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.EditGlJournalEntry?default(unselectedClassName)}">${uiLabelMap.AccountingManualJournalEntry}</a>
+ <a href="<@ofbizUrl>ListUnpostedAcctgTrans?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.ListUnpostedAcctgTrans?default(unselectedClassName)}">${uiLabelMap.AccountingManualPostTrans}</a>
+ <a href="<@ofbizUrl>GlAccountAssignment?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="${selectedClassMap.GlAccountAssignment?default(unselectedClassName)}">${uiLabelMap.AccountingGlAccountDefault}</a>
</div>
<#if (page.tabButtonItem)?exists && page.tabButtonItem == "GlAccountAssignment">
<div>
- <a href="<@ofbizUrl>GlAccountSalInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="buttontext">[Sales Invoice]</a>
- <a href="<@ofbizUrl>GlAccountPurInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="buttontext">[Purchase Invoice]</a>
- <a href="<@ofbizUrl>GlAccountTypePaymentType?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="buttontext">[Payment Type/GlAccnt Type]</a>
- <a href="<@ofbizUrl>GlAccountNrPaymentMethod?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="buttontext">[Payment Method/Gl Accnt. Nr.]</a>
+ <a href="<@ofbizUrl>GlAccountSalInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.AccountingInvoiceSales}]</a>
+ <a href="<@ofbizUrl>GlAccountPurInvoice?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.AccountingInvoicePurchase}]</a>
+ <a href="<@ofbizUrl>GlAccountTypePaymentType?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.AccountingPaymentType}/${uiLabelMap.FormFieldTitle_glAccountTypeId}]</a>
+ <a href="<@ofbizUrl>GlAccountNrPaymentMethod?organizationPartyId=${organizationPartyId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.AccountingPaymentMethodId}/${uiLabelMap.AccountingGlAccountId}]</a>
</div>
<br/>
</#if>
Modified: trunk/applications/accounting/webapp/accounting/admin/timePeriods.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/admin/timePeriods.ftl 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/webapp/accounting/admin/timePeriods.ftl 2006-06-30 22:27:08 UTC (rev 7917)
@@ -33,7 +33,7 @@
</script>
<#if closedTimePeriods?has_content>
-<p>The following time periods have been closed:
+<p>${uiLabelMap.TimePeriodMessage2}:
<ul type="circle">
<#list closedTimePeriods as timePeriod>
<li>${timePeriod.periodName?if_exists} ${timePeriod.periodNum?string("####")} (${timePeriod.fromDate} - ${timePeriod.thruDate})
@@ -41,7 +41,7 @@
</ul></p>
<p>
<#else>
-<p>There are currently no closed time periods.</p>
+<p>${uiLabelMap.TimePeriodMessage1}</p>
</#if>
</div>
Modified: trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/webapp/accounting/agreement/AgreementForms.xml 2006-06-30 22:27:08 UTC (rev 7917)
@@ -278,10 +278,10 @@
<auto-fields-entity entity-name="AgreementPromoAppl" default-field-type="edit"/>
<field name="agreementId" title="${uiLabelMap.AccountingAgreementId}"><hidden/></field>
<field name="agreementItemSeqId" title="${uiLabelMap.AccountingAgreementItemSeqId}"><hidden/></field>
- <field use-when="agreementPromoAppl!=null" name="productPromoId" title="${uiLabelMap.ProductPromoId}">
+ <field use-when="agreementPromoAppl!=null" name="productPromoId" title="${uiLabelMap.FormFieldTitle_productPromoId}">
<display-entity entity-name="ProductPromo" key-field-name="productPromoId" description="${promoName}"/>
</field>
- <field name="productPromoId" use-when="agreementPromoAppl==null" title="${uiLabelMap.ProductPromoId}">
+ <field name="productPromoId" use-when="agreementPromoAppl==null">
<drop-down allow-empty="true">
<entity-options description="${promoName}" entity-name="ProductPromo" key-field-name="productPromoId"/>
</drop-down>
Modified: trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountPayments.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountPayments.ftl 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/webapp/accounting/billingaccount/BillingAccountPayments.ftl 2006-06-30 22:27:08 UTC (rev 7917)
@@ -43,7 +43,7 @@
<#assign paymentMethodType = payment.getRelatedOne("PaymentMethodType")>
<tr>
<td><div class="tabletext">${payment.paymentId?if_exists}</div></td>
- <td><div class="tabletext">${paymentMethodType.description?default(uiLabelMap.CommonNA)}</div></td>
+ <td><div class="tabletext">${paymentMethodType.get("description",locale)?default(uiLabelMap.CommonNA)}</div></td>
<td><div class="tabletext">${payment.invoiceId?default(uiLabelMap.CommonNA)}</div></td>
<td><div class="tabletext">${payment.invoiceItemSeqId?default(uiLabelMap.CommonNA)}</div></td>
<td><div class="tabletext">${payment.effectiveDate?string}</div></td>
Modified: trunk/applications/accounting/webapp/accounting/billingaccount/EditBillingAccountTerms.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/billingaccount/EditBillingAccountTerms.ftl 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/webapp/accounting/billingaccount/EditBillingAccountTerms.ftl 2006-06-30 22:27:08 UTC (rev 7917)
@@ -50,7 +50,7 @@
<tr>
<td><div class="tabletext">${(termType.get("description",locale))?if_exists}</div></td>
<td><div class="tabletext">${term.termValue?if_exists}</div></td>
- <td><div class="tabletext"><#if uom?has_content>${uom.description?if_exists}<#else> </#if></div></td>
+ <td><div class="tabletext"><#if uom?has_content>${uom.get("description",locale)?if_exists}<#else> </#if></div></td>
<td align="right">
<a href="<@ofbizUrl>EditBillingAccountTerms?billingAccountId=${term.billingAccountId}&billingAccountTermId=${term.billingAccountTermId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonEdit}]</a>
<a href="<@ofbizUrl>removeBillingAccountTerm?billingAccountId=${term.billingAccountId}&billingAccountTermId=${term.billingAccountTermId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonRemove}]</a>
@@ -91,7 +91,7 @@
<select class="selectBox" name="uomId">
<option></option>
<#list uoms as uom>
- <option value="${uom.uomId}" <#if termData?has_content && termData.uomId?default("") == uom.uomId>SELECTED</#if>>${uom.description?if_exists}</option>
+ <option value="${uom.uomId}" <#if termData?has_content && termData.uomId?default("") == uom.uomId>SELECTED</#if>>${uom.get("description",locale)?if_exists}</option>
</#list>
</select>
</td>
Modified: trunk/applications/accounting/webapp/accounting/billingaccount/FindBillingAccount.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/billingaccount/FindBillingAccount.ftl 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/webapp/accounting/billingaccount/FindBillingAccount.ftl 2006-06-30 22:27:08 UTC (rev 7917)
@@ -50,7 +50,7 @@
<tr>
<td><div class="tabletext">${billingAccount.billingAccountId}</div></td>
<td><div class="tabletext"><@ofbizCurrency amount=billingAccount.accountLimit isoCode=billingAccount.accountCurrencyUomId/></div></td>
- <td><div class="tabletext">${roleType.description}</div></td>
+ <td><div class="tabletext">${roleType.get("description",locale)}</div></td>
<td align="right">
<a href="<@ofbizUrl>EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonEdit}</a>
</td>
Modified: trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml 2006-06-30 22:27:08 UTC (rev 7917)
@@ -59,7 +59,7 @@
</field>
<field name="roleTypeId" parameter-name="roleTypeId" widget-style="selectBox">
<drop-down>
- <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${roleTypeId}">
+ <entity-options entity-name="RoleType" key-field-name="roleTypeId" description="${description}">
<entity-order-by field-name="roleTypeId"/>
</entity-options>
</drop-down>
@@ -163,8 +163,8 @@
<alt-target use-when="glAccount==null" target="createGlAccount"/>
<auto-fields-service service-name="updateGlAccount" map-name=""/>
- <field use-when="glAccount!=null" name="glAccountId" tooltip="This cannot be changed without re-creating the GL Account."><display/></field>
- <field use-when="glAccount==null&&glAccountId!=null" name="glAccountId" tooltip="Could not find GlAccount with ID [${glAccountId}]"><text size="20" maxlength="20"/></field>
+ <field use-when="glAccount!=null" name="glAccountId" tooltip="${uiLabelMap.AccountingNotModificationRecrationGlAccount}"><display/></field>
+ <field use-when="glAccount==null&&glAccountId!=null" name="glAccountId" tooltip="${uiLabelMap.AccountingCouldNotFindGlAccount} [${glAccountId}]"><text size="20" maxlength="20"/></field>
<!-- this to be taken care of with auto-fields-service as soon as it uses entity field info too -->
<field use-when="glAccount==null&&glAccountId==null" name="glAccountId"><text size="20" maxlength="20"/></field>
@@ -211,10 +211,10 @@
<!-- this is used to list AcctgTransEntries and can be called either by using an acctgTransId or a glAccountId -->
<form name="ListAcctgTransEntries" type="list" list-name="entries" default-entity-name="AcctgTransEntry"
default-title-style="tableheadtext" default-tooltip-style="tabletext" default-widget-style="tabletext">
- <field name="acctgTransId" title="Acctg Trans">
+ <field name="acctgTransId">
<hyperlink also-hidden="false" description="${acctgTransId}" target="ListAcctgTransEntries?acctgTransId=${acctgTransId}"/>
</field>
- <field name="acctgTransEntrySeqId" title="Seq Id"><display/></field>
+ <field name="acctgTransEntrySeqId"><display/></field>
<field name="glAccountId">
<display-entity entity-name="GlAccount" description="${accountName}">
<sub-hyperlink target="ListGlAccountEntries?glAccountId=${glAccountId}" description="[${glAccountId}]" link-style="tabletext"/>
@@ -223,13 +223,13 @@
<field name="description"><display/></field>
<field name="voucherRef"><display/></field>
<field name="partyId"><display/></field>
- <field name="organizationPartyId" title="Organization"><display/></field>
+ <field name="organizationPartyId"><display/></field>
<field name="productId"><display/></field>
<field name="debitCreditFlag"><display/></field>
<field name="amount"><display/></field>
- <field name="reconcileStatusId" title="Reconciled?"><display/></field>
- <field name="settlementTermId" title="Settlement"><display/></field>
- <field name="isSummary" title="Summary?"><display/></field>
+ <field name="reconcileStatusId"><display/></field>
+ <field name="settlementTermId"><display/></field>
+ <field name="isSummary"><display/></field>
</form>
<form name="GlAccountsNavForm" type="single" target="" title="GL Accounts" default-map-name="journal"
Modified: trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml 2006-06-30 22:27:08 UTC (rev 7917)
@@ -329,7 +329,7 @@
</entity-options>
</drop-down>
</field>
- <field name="productMaintSeqId" title="Product Maintenance" tooltip="Only use if applicable, can use Maintenance Type instead">
+ <field name="productMaintSeqId" tooltip="${uiLabelMap.AccountingFixedAssetMaintMessage2}">
<drop-down allow-empty="true" >
<entity-options description="${maintName}" entity-name="ProductMaint">
<entity-constraint name="productId" operator="equals" value="${fixedAsset.instanceOfProductId}"/>
@@ -337,7 +337,7 @@
</entity-options>
</drop-down>
</field>
- <field name="productMaintTypeId" title="${uiLabelMap.AccountingFixedAssetMaintType}" tooltip="If the Product Maintenance is specified, this will be set/reset automatically">
+ <field name="productMaintTypeId" title="${uiLabelMap.AccountingFixedAssetMaintType}" tooltip="${uiLabelMap.AccountingFixedAssetMaintMessage1}">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="ProductMaintType">
<entity-order-by field-name="productMaintTypeId"/>
Modified: trunk/applications/accounting/widget/AccountingScreens.xml
===================================================================
--- trunk/applications/accounting/widget/AccountingScreens.xml 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/widget/AccountingScreens.xml 2006-06-30 22:27:08 UTC (rev 7917)
@@ -200,7 +200,7 @@
<screen name="ListGlAccountEntries">
<section>
<actions>
- <set field="title" value="View GL Account Entries"/>
+ <set field="titleProperty" value="PageTitleViewGlAccountEntries"/>
<set field="tabButtonItem" value="ListGlAccountOrganization"/>
<set field="glAccountId" from-field="requestParameters.glAccountId"/>
<entity-and entity-name="AcctgTransEntry" list-name="entries">
@@ -223,7 +223,7 @@
<screen name="ListAcctgTransEntries">
<section>
<actions>
- <set field="title" value="View Accounting Transaction"/>
+ <set field="titleProperty" value="PageTitleViewAccountingTransaction"/>
<set field="headerItem" value="chartofaccounts"/>
<set field="acctgTransId" from-field="requestParameters.acctgTransId"/>
<entity-and entity-name="AcctgTransEntry" list-name="entries">
@@ -249,8 +249,7 @@
<screen name="AddGlAccount">
<section>
<actions>
- <set field="title" value="Add Gl Account"/>
- <set field="titleProperty" value=""/>
+ <set field="titleProperty" value="PageTitleAddGlAccount"/>
<set field="tabButtonItem" value=""/>
<set field="labelTitleProperty" value=""/>
</actions>
@@ -298,7 +297,7 @@
</entity-one>
</actions>
<widgets>
- <label text="Account Name: ${currentValue.accountName}"/>
+ <label text="${uiLabelMap.FormFieldTitle_accountName}: ${currentValue.accountName}"/>
</widgets>
</section>
</screen>
Modified: trunk/applications/accounting/widget/AdminScreens.xml
===================================================================
--- trunk/applications/accounting/widget/AdminScreens.xml 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/widget/AdminScreens.xml 2006-06-30 22:27:08 UTC (rev 7917)
@@ -23,9 +23,10 @@
<screen name="ListCompanies">
<section>
<actions>
- <set field="title" value="Available Internal Organizations"/>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="titleProperty" value="AccountingAvailableInternalOrganizations"/>
<set field="headerItem" value="companies"/>
- <set field="labelTitleProperty" value="Internal Organizations"/>
+ <set field="labelTitleProperty" value="${uiLabelMap.AccountingAvailableInternalOrganizations}"/>
<entity-condition entity-name="PartyRole" list-name="parties">
<condition-expr field-name="roleTypeId" operator="equals" value="INTERNAL_ORGANIZATIO"/>
</entity-condition>
@@ -42,8 +43,10 @@
<screen name="TimePeriods">
<section>
- <actions>
- <set field="labelTitleProperty" value="Time Periods"/>
+ <actions>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="titleProperty" value="TimePeriod"/>
+ <set field="labelTitleProperty" value="${uiLabelMap.TimePeriod}"/>
<set field="tabButtonItem" value="TimePeriods"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<entity-condition entity-name="CustomTimePeriod" list-name="openTimePeriods">
@@ -77,8 +80,10 @@
<screen name="PartyAcctgPreference">
<section>
- <actions>
- <set field="labelTitleProperty" value="Accounting Preferences"/>
+ <actions>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="titleProperty" value="AccountingPreference"/>
+ <set field="labelTitleProperty" value="${uiLabelMap.AccountingPreference}"/>
<set field="tabButtonItem" value="PartyAcctgPreference"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId"/>
<set field="partyId" from-field="parameters.organizationPartyId"/>
@@ -96,9 +101,10 @@
<screen name="ListUnpostedAcctgTrans">
<section>
<actions>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<set field="tabButtonItem" value="ListUnpostedAcctgTrans"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
- <set field="labelTitleProperty" value="Un-posted Accounting Transactions"/>
+ <set field="labelTitleProperty" value="${uiLabelMap.PageTitleUnpostedTransactions}"/>
<set field="partyId" from-field="parameters.organizationPartyId"/>
<entity-condition entity-name="AcctgTrans" list-name="transactions">
<condition-expr field-name="isPosted" operator="not-equals" value="Y"/>
@@ -119,7 +125,9 @@
<screen name="ViewFXConversions">
<section>
<actions>
- <set field="labelTitleProperty" value="Foreign Exchange Rates"/>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="titleProperty" value="AccountingFX"/>
+ <set field="labelTitleProperty" value="${uiLabelMap.AccountingFX}"/>
<set field="tabButtonItem" value="ViewFXConversions"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" global="true"/>
<!-- TODO: If UomConversionDated is ever used for another type of conversion besides currencies or if some currencies are
@@ -145,7 +153,9 @@
<screen name="GlAccountSalInvoice">
<section>
<actions>
- <set field="title" value="GL Account Assignments"/>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="titleProperty" value="AccountingGlAccountAssignments"/>
+ <set field="labelTitleProperty" value="${uiLabelMap.AccountingGlAccountAssignments}"/>
<set field="tabButtonItem" value="GlAccountAssignment"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" />
</actions>
@@ -153,9 +163,9 @@
<decorator-screen name="CommonAdminDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
- <container><label style="head1">Sales Invoice type to Revenue GL Account Number assignmentlist</label></container>
+ <container><label style="head1">${uiLabelMap.AccountingSalesInvoiceToRevenue}</label></container>
<include-form name="ListSalInvoiceItemTypeGlAssignments" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
- <container><label style="head1">Assign Sales Invoice type to Revenue GL Account Number</label></container>
+ <container><label style="head1">${uiLabelMap.AccountingAssignSalesInvoiceToRevenue}</label></container>
<include-form name="AddSalInvoiceItemTypeGlAssignment" location="component://accounting/webapp/accounting/admin/AdminForms.xml"/>
</container>
</decorator-section>
@@ -167,6 +177,7 @@
<screen name="GlAccountPurInvoice">
<section>
<actions>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<set field="tabButtonItem" value="GlAccountAssignment"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" />
</actions>
@@ -189,6 +200,7 @@
<screen name="GlAccountTypePaymentType">
<section>
<actions>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<set field="tabButtonItem" value="GlAccountAssignment"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" />
</actions>
@@ -209,6 +221,7 @@
<screen name="GlAccountNrPaymentMethod">
<section>
<actions>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<set field="tabButtonItem" value="GlAccountAssignment"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" />
</actions>
@@ -254,7 +267,8 @@
<screen name="ListChecksToPrint">
<section>
<actions>
- <set field="title" value="Checks to Print"/>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="titleProperty" value="AccountingPrintChecks"/>
<set field="tabButtonItem" value="ChecksTabButton"/>
<set field="checksTabButtonItem" value="PrintChecksTabButton"/>
<set field="organizationPartyId" from-field="parameters.organizationPartyId" />
@@ -293,6 +307,7 @@
<screen name="ListChecksToSend">
<section>
<actions>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
<set field="title" value="Mark Checks Sent"/>
<set field="tabButtonItem" value="ChecksTabButton"/>
<set field="checksTabButtonItem" value="SendChecksTabButton"/>
Modified: trunk/applications/accounting/widget/CommonScreens.xml
===================================================================
--- trunk/applications/accounting/widget/CommonScreens.xml 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/widget/CommonScreens.xml 2006-06-30 22:27:08 UTC (rev 7917)
@@ -238,7 +238,7 @@
<widgets>
<include-menu name="TaxAuthorityTabBar" location="component://accounting/widget/TaxAuthorityMenus.xml"/>
<container><link target="EditTaxAuthority" text="${uiLabelMap.AccountingNewTaxAuthority}" style="buttontext"/></container>
- <label style="head1" text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: Tax Authority Party "${taxAuthPartyName.firstName} ${taxAuthPartyName.lastName} ${taxAuthPartyName.groupName}" [${uiLabelMap.CommonId}:${taxAuthPartyId}], Geo "${taxAuthGeo.geoName}" [${uiLabelMap.CommonId}:${taxAuthGeoId}] ${${extraFunctionName}}"/>
+ <label style="head1" text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${uiLabelMap.AccountingTaxAuthorityParty} "${taxAuthPartyName.firstName} ${taxAuthPartyName.lastName} ${taxAuthPartyName.groupName}" [${uiLabelMap.CommonId}:${taxAuthPartyId}], ${uiLabelMap.CommonGeo} "${taxAuthGeo.geoName}" [${uiLabelMap.CommonId}:${taxAuthGeoId}] ${${extraFunctionName}}"/>
</widgets>
</section>
</widgets>
Modified: trunk/applications/accounting/widget/FixedAssetScreens.xml
===================================================================
--- trunk/applications/accounting/widget/FixedAssetScreens.xml 2006-06-30 22:22:30 UTC (rev 7916)
+++ trunk/applications/accounting/widget/FixedAssetScreens.xml 2006-06-30 22:27:08 UTC (rev 7917)
@@ -228,9 +228,9 @@
<screen name="ListFixedAssetMaints">
<section>
<actions>
- <set field="titleProperty" value="List Fixed Asset Maintenance"/>
+ <set field="titleProperty" value="PageTitleListFixedAssetMaints"/>
<set field="tabButtonItem" value="ListFixedAssetMaints"/>
- <set field="labelTitleProperty" value="List Fixed Asset Maintenance"/>
+ <set field="labelTitleProperty" value="PageTitleListFixedAssetMaints"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
<set field="fromDate" from-field="parameters.fromDate"/>
<entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
@@ -248,9 +248,9 @@
<screen name="EditFixedAssetMaint">
<section>
<actions>
- <set field="titleProperty" value="Edit Fixed Asset Maintenance"/>
+ <set field="titleProperty" value="PageTitleEditFixedAssetMaintenance"/>
<set field="tabButtonItem" value="ListFixedAssetMaints"/>
- <set field="labelTitleProperty" value="Edit Fixed Asset Maintenance"/>
+ <set field="labelTitleProperty" value="PageTitleEditFixedAssetMaintenance"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
<set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/>
<entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
@@ -271,9 +271,9 @@
<screen name="EditFixedAssetMaintMeters">
<section>
<actions>
- <set field="titleProperty" value="Edit Fixed Asset MaintMeter"/>
+ <set field="titleProperty" value="PageTitleEditFixedAssetMaintenance"/>
<set field="tabButtonItem" value="ListFixedAssetMaints"/>
- <set field="labelTitleProperty" value="Edit Fixed Asset MaintMeter"/>
+ <set field="labelTitleProperty" value="PageTitleEditFixedAssetMaintenance"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
<set field="maintHistSeqId" from-field="parameters.maintHistSeqId"/>
<entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
More information about the Svn
mailing list