[OFBiz] SVN: r7447 - in trunk/applications/accounting: config webapp/accounting webapp/accounting/admin webapp/accounting/chartofaccounts webapp/accounting/fixedasset webapp/accounting/includes webapp/accounting/invoice webapp/accounting/payment widget
hansbak@svn.ofbiz.org
hansbak at svn.ofbiz.org
Fri Apr 28 20:30:11 CDT 2006
Author: hansbak
Date: 2006-04-28 20:29:29 -0500 (Fri, 28 Apr 2006)
New Revision: 7447
Modified:
trunk/applications/accounting/config/AccountingUiLabels.properties
trunk/applications/accounting/config/AccountingUiLabels_nl.properties
trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml
trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
trunk/applications/accounting/webapp/accounting/includes/appheader.ftl
trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
trunk/applications/accounting/webapp/accounting/main.ftl
trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl
trunk/applications/accounting/widget/AccountingScreens.xml
trunk/applications/accounting/widget/FixedAssetScreens.xml
trunk/applications/accounting/widget/TaxAuthorityForms.xml
trunk/applications/accounting/widget/TaxAuthorityMenus.xml
Log:
i18n patch for the accounting component from Marco Risaliti
Modified: trunk/applications/accounting/config/AccountingUiLabels.properties
===================================================================
--- trunk/applications/accounting/config/AccountingUiLabels.properties 2006-04-28 23:06:28 UTC (rev 7446)
+++ trunk/applications/accounting/config/AccountingUiLabels.properties 2006-04-29 01:29:29 UTC (rev 7447)
@@ -44,6 +44,7 @@
AccountingAssignPaymentToInvoice=Assign Payment to This Invoice
AccountingAddNewCreditCard=Add New Credit Card
AccountingAddNewEftAccount=Add New EFT Account
+AccountingAgreementAvailable=List Available Agreements
AccountingAgreement=Agreement
AccountingAgreementDate=Agreement Date
AccountingAgreementId=Agreement Id
@@ -88,10 +89,12 @@
AccountingCardType=Card Type
AccountingChartOfAcctsMenu=Chart of Accounts
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
+AccountingCreateAssignment=Create Assignment
AccountingCreateBillingAccount=Create Billing Account
AccountingCreateBillingAccountPermissionError=Security Error: to run createBillingAccount you must have the ACCOUNTING_CREATE or ACCOUNTING_ADMIN permission <br>
AccountingCreateBillingAccountRole=Create Billing Account Role
@@ -104,6 +107,7 @@
AccountingCreatePaymentPermissionError=Security Error : To Create a Payment you must either be the to or from party or have the PAY_INFO_CREATE or PAY_INFO_ADMIN permissions.
AccountingCreatePermissionError=Security Error: to run createGlAccount you must have the ACCOUNTING_CREATE or ACCOUNTING_ADMIN permission<br>
AccountingCreditCard=Credit Card
+AccountingCustomer=Customer
AccountingDataExchange=DataExchange
AccountingDebitCreditMustEqual=Debit and Credit Totals must be equal to post to GL.
AccountingDeleteBillingAccountTermPermissionError=Security Error : to run removeBillingAccountTerm you must have the ACCOUNTING_DELETE or ACCOUNTING_ADMIN permission
@@ -192,10 +196,14 @@
AccountingMainMenu=Main
AccountingMainPage=Accounting Manager Main Page
AccountingMainPageNote=Welcome to the Accounting Manager!
+AccountingMainPageNote1=NOTE
+AccountingMainPageNote2=A full accounting and financials component for OFBiz is available.
+AccountingMainPageNote3=Click here
+AccountingMainPageNote4=for complete details.
AccountingManagerApplication=Accounting Manager Application
AccountingManualJournalEntry=Manual Journal Entry
AccountingManualPostTrans=Manual Transactions Posting
-AccountingManualTransaction=Manual Transaction
+AccountingManualTransaction=Manual Electronic Transaction
AccountingMethod=Method
AccountingMiddleNameCard=Middle Name on Card
AccountingNameAccount=Name on Account
@@ -224,6 +232,7 @@
AccountingOfflinePayment=Offline Payment
AccountingOpenPayments=Open
AccountingOrders=Orders
+AccountingOrderPaymentPreferenceId=Accounting Order Payment Preference Id
AccountingPaidDate=Paid Date
AccountingPartyBilledFrom=Party Billed From
AccountingPartyBilledTo=Party Billed To
@@ -236,6 +245,7 @@
AccountingPaymentAlreadyReceived=Payment already received
AccountingPaymentApplicationParameterMissing=Payment application requires either an invoiceId, a billingAccountId, or a taxAuthGeoId
AccountingPaymentDate=Payment Date
+AccountingPaymentGatewayResponseId=Accounting Payment Gateway Response Id
AccountingPaymentID=PaymentID
AccountingPaymentHeader=Payment Header
AccountingPaymentIdTo=PaymentID to apply
@@ -262,6 +272,7 @@
AccountingPaymentTabStatusToReceived=Status to 'Received'
AccountingPaymentTabStatusToSent=Status to 'Sent'
AccountingPaymentType=Payment Type
+AccountingPermissionError=You do not have permission for this function.
AccountingPleaseSendPaymentTo=Please Send Payment To
AccountingPreference=Organization Accounting Preferences
AccountingPrefixCard=Prefix on Card
@@ -270,6 +281,7 @@
AccountingPrintChecksPermissionError=Security Error: to print checks, you must have the ACCOUNTING_PRINT_CHECKS permission
AccountingProduct=Product
AccountingProductId=Product Id
+AccountingProductRates=Product Rates
AccountingReceivePayment=Receive Payment
AccountingReferenceNumber=Reference Number
AccountingReports=Reports
@@ -278,6 +290,7 @@
AccountingRoleTypeIdTo=Role Type Id To
AccountingRoutingNumber=Routing Number
AccountingSendChecks=Mark Checks Sent
+AccountingStatus=Accounting Status
AccountingSuffixCard=Suffix on Card
AccountingTaxAuthorities=Tax Authorities
AccountingTaxAuthority=Tax Authority
@@ -288,6 +301,8 @@
AccountingThruDate=Thru Date
AccountingTitleTransfer=Title Transfer
AccountingTransactions=Transactions
+AccountingTransactionType=Transaction Type
+AccountingTransactionTypeNotYetSupported=This transaction type is not yet supported
AccountingTrialBalance=Trial Balance
AccountingToParty=To Party
AccountingToPartyId=To Party Id
@@ -298,6 +313,7 @@
AccountingUpdateBillingAccount=Update Billing Account
AccountingUpdateFX=Update Foreign Exchange Rates
AccountingUpdatePaymentPermissionError=Security Error : To Update a Payment you must either be the to or from party or have the PAY_INFO_UPDATE or PAY_INFO_ADMIN permissions.
+AccountingValidationPattern=Use regular expression validation pattern
AccountingViewPermissionError=You do not have permission to view this page. ("ACCOUNTING_VIEW" or "ACCOUNTING_ADMIN" needed)
AccountingFX=Foreign Exchange Rates
@@ -318,6 +334,9 @@
PageTitleEditBillingAccountPayments=Edit Billing Account Payments
PageTitleEditBillingAccountRoles=Edit Billing Account Roles
PageTitleEditBillingAccountTerms=Edit Billing Account Terms
+PageTitleEditFixedAsset=Edit Fixed Asset
+PageTitleEditFixedAssetIdents=Edit Fixed Asset Idents
+PageTitleEditFixedAssetRegistrations=Edit Fixed Asset Registrations
PageTitleEditFixedAssetStdCost=Edit Fixed Asset Standard Cost
PageTitleEditGlAccount=Edit GL Account
PageTitleEditGlobalGlAccount=Edit Global GL Account
@@ -325,12 +344,17 @@
PageTitleEditPayment=Edit Payment
PageTitleFindAgreement=Find Agreements
PageTitleFindBillingAccount=Find Billing Account(s)
+PageTitleFindGatewayResponses=Find Gateway Responses
PageTitleFindGlobalGlAccount=Find Global GL Account
PageTitleFindInvoice=Find Invoice
PageTitleFindPayment=Find Payment
PageTitleInvoiceOverview=Invoice Overview
+PageTitleListAccounts=List Accounts
PageTitleListAgreementItems=List Agreement Items
PageTitleListAgreementTerms=List Agreement Terms
+PageTitleListFixedAssets=List Fixed Assets
+PageTitleListFixedAssetCalendar=List Fixed Asset Calendar
+PageTitleListFixedAssetProducts=List Fixed Asset Products
PageTitleListFixedAssetStdCosts=List Fixed Asset Standard Costs
PageTitleListEditInvoiceApplications=List Edit Invoice Applications
PageTitleListInvoices=List Invoices
@@ -362,6 +386,8 @@
PartyTermType=Term Type
PartyTermValue=Term Value
+ProductProductStore=Product Store
+
Organization=Organization
FromTimePeriod=From Time Period
ThruTimePeriod=Thru Time Period
@@ -373,6 +399,10 @@
ByDate=By Date
AsOf=As Of
+CommonGeo=Geo
+CommonShow=Show
+CommonShowAll=Show all
+
FormFieldTitle_amountToApply=Amount to Apply
FormFieldTitle_applyButton=Apply
FormFieldTitle_applied=Applied
@@ -472,3 +502,97 @@
FormFieldTitle_emailAddressCc=Copy Emailadress
FormFieldTitle_subject=Subject
FormFieldTitle_bodyText=Email Body
+
+FormFieldTitle_agreementId=Agreement Id
+FormFieldTitle_agreementDate=Agreement Date
+FormFieldTitle_textData=Text Data
+FormFieldTitle_termValue=Term Value
+FormFieldTitle_termDays=Term Days
+FormFieldTitle_agreementText=Agreement Text
+FormFieldTitle_agreementImage=Agreement Image
+FormFieldTitle_currencyUomId=Currency Uom Id
+FormFieldTitle_contactMechId=Contact Mech Id
+FormFieldTitle_accountCurrencyUomId=Account Currency Uom Id
+FormFieldTitle_accountLimit=Account Limit
+FormFieldTitle_name=Name
+FormFieldTitle_percentage=Percentage
+FormFieldTitle_datetimePerformed=Date Time Performed
+FormFieldTitle_statusDate=Status Date
+FormFieldTitle_amountApplied=Amount Applied
+FormFieldTitle_inventoryItemId=Inventory Item Id
+FormFieldTitle_productFeatureId=Product Feature Id
+FormFieldTitle_taxableFlag=Taxable Flag
+FormFieldTitle_amount=Amount
+FormFieldTitle_taxAuthorityRateSeqId=Tax Authority Rate Seq Id
+FormFieldTitle_isPosted=Is Posted
+FormFieldTitle_glFiscalTypeId=Gl Fiscal Type Id
+FormFieldTitle_acctgTransTypeId=Acctg Trans Type Id
+FormFieldTitle_transactionDate=Transaction Date
+FormFieldTitle_shipmentId=Shipment Id
+FormFieldTitle_receiptId=Receipt Id
+FormFieldTitle_inventoryItemId=Inventory Item Id
+FormFieldTitle_physicalInventoryId=Physical Inventory Id
+FormFieldTitle_acctgTransId=Acctg Trans Id
+FormFieldTitle_acctgTransEntrySeqId=Acctg Trans Entry Seq Id
+FormFieldTitle_glAccountId=Gl Account Id
+FormFieldTitle_debitCreditFlag=Debit Credit Flag
+FormFieldTitle_organizationPartyId=Organization Party Id
+FormFieldTitle_glAccountTypeId=Gl Account Type Id
+FormFieldTitle_glAccountClassId=Gl Account Class Id
+FormFieldTitle_reconcileStatusId=Reconcile Status Id
+FormFieldTitle_acctgTransEntryTypeId=Acctg Trans Entry Type Id
+FormFieldTitle_partyId=Party Id
+FormFieldTitle_overrideGlAccountId=Override Gl Account Id
+FormFieldTitle_comments=Comments
+FormFieldTitle_effectiveDate=Effective Date
+FormFieldTitle_finAccountTransId=Fin Account Trans Id
+FormFieldTitle_orderPaymentPreferenceId=Order Payment Preference Id
+FormFieldTitle_paymentGatewayResponseId=Payment Gateway Response Id
+FormFieldTitle_paymentServiceTypeEnumId=Payment Service Type Enum Id
+FormFieldTitle_paymentMethodId=Payment Method Id
+FormFieldTitle_transCodeEnumId=Trans Code Enum Id
+FormFieldTitle_referenceNum=Reference Num
+FormFieldTitle_altReference=Alt Reference
+FormFieldTitle_subReference=Sub Reference
+FormFieldTitle_gatewayCode=Gateway Code
+FormFieldTitle_gatewayFlag=Gateway Flag
+FormFieldTitle_gatewayAvsResult=Gateway Avs Result
+FormFieldTitle_gatewayScoreResult=Gateway Score Result
+FormFieldTitle_gatewayMessage=Gateway Message
+FormFieldTitle_transactionDate=Transaction Date
+FormFieldTitle_glAccountTypeId=Gl Account Type Id
+FormFieldTitle_glAccountClassId=Gl Account Class Id
+FormFieldTitle_glResourceTypeId=Gl Resource Type Id
+FormFieldTitle_glXbrlClassId=Gl Xbrl Class Id
+FormFieldTitle_parentGlAccountId=Parent Gl Account Id
+FormFieldTitle_accountCode=Account Code
+FormFieldTitle_accountName=Account Name
+FormFieldTitle_postedBalance=Posted Balance
+FormFieldTitle_glAccountId=Gl Account Id
+FormFieldTitle_organizationPartyId=Organization Party Id
+FormFieldTitle_roleTypeId=Role Type Id
+FormFieldTitle_paymentId=Payment Id
+FormFieldTitle_produtId=Produt Id
+FormFieldTitle_debitGlAccountId=Debit Gl Account Id
+FormFieldTitle_creditGlAccountId=Credit Gl Account Id
+FormFieldTitle_glFiscalTypeId=Fiscal Gl Type Id
+FormFieldTitle_classEnumId=Class Enum Id
+FormFieldTitle_instanceOfProductId=Instance Of Product Id
+FormFieldTitle_fixedAssetName=Fixed Asset Name
+FormFieldTitle_dateAcquired=Date Acquired
+FormFieldTitle_dateLastServiced=Date Last Serviced
+FormFieldTitle_dateNextService=Date Next Service
+FormFieldTitle_productionCapacity=Production Capacity
+FormFieldTitle_calendarId=Calendar
+FormFieldTitle_serialNumber=Serial Number
+FormFieldTitle_registrationDate=Registration Date
+FormFieldTitle_amountUomId=Amount Uom Id
+FormFieldTitle_requireTaxIdForExemption=Require Tax Id For Exemption
+FormFieldTitle_taxIdFormatPattern=Tax Id Format Pattern
+FormFieldTitle_includeTaxInPrice=Include Tax In Price
+FormFieldTitle_toTaxAuthGeoId=To Tax Auth Geo Id
+FormFieldTitle_toTaxAuthPartyId=To Tax Auth Party Id
+FormFieldTitle_minItemPrice=Min Item Price
+FormFieldTitle_minPurchase=Min Purchase
+FormFieldTitle_taxShipping=Tax Shipping
+FormFieldTitle_taxPercentage=Tax Percentage
Modified: trunk/applications/accounting/config/AccountingUiLabels_nl.properties
===================================================================
--- trunk/applications/accounting/config/AccountingUiLabels_nl.properties 2006-04-28 23:06:28 UTC (rev 7446)
+++ trunk/applications/accounting/config/AccountingUiLabels_nl.properties 2006-04-29 01:29:29 UTC (rev 7447)
@@ -52,6 +52,7 @@
AccountingAgreementItemSeqId=Overeenkomst Item Nr
AccountingAgreementItem=Overeenkomst item
AccountingAgreementItems=Overeenkomst Items
++AccountingAgreementItemTypeId=Overeenkomst Item type Nr
AccountingAgreementPromoAppls=Promoties
AccountingAgreementTerms=Overeenkomst voorwaarden
AccountingAgreementTermId=Overeenkomst Voorw. Nr
@@ -71,17 +72,18 @@
AccountingBalanceSheet=Balance table
AccountingBankName=Bank Naam
AccountingBilling=Facturatie
-AccountingBillingAccount=Factuur rekening
+AccountingBillingAccount=Faktuur rekening
AccountingBillingAccountId=Fact.Reken.Nr
-AccountingBillingAccountInvoices=Facturen voor factuurrekening
+AccountingBillingAccountInvoices=Facturen voor faktuurrekening
AccountingBillingAccountOnly=Betaal alleen op rekening
AccountingBillingAccountPayments=Rekening betalingen
-AccountingBillingAccounts=Factuur rekening
+AccountingBillingAccounts=Faktuur rekening
AccountingBillingAcct=Fact.Rekg.
-AccountingBillingAddress=Factuur adres
-AccountingBillingContactMechId=Factuur Mechanisme
-AccountingBillingInformation=Factuur informatie
-AccountingBillingMenu=Factuur Rekening
+AccountingBillingAddress=Faktuur adres
+AccountingBillingContactMechId=Faktuur Mechanisme
+AccountingBillingContactMechIdMessage=Faktuur Adres; Voeg eerst partij rol toe, selecteer dan van het dropdown menu.
+AccountingBillingInformation=Faktuur informatie
+AccountingBillingMenu=Faktuur Rekening
AccountingBillUpTo=Fact. maximaal
AccountingCapture=Opvangen
AccountingCardNumber=Kaart nummer
@@ -92,9 +94,9 @@
AccountingCompanyNameAccount=Bedrijfsnaam op de rekening
AccountingCompanyNameCard=Bedrijfsnaam op de kaart
AccountingCompanySubtitle=Deel van de Open For Business Familie van Open Source Software
-AccountingCreateBillingAccount=Maak een nieuw factuur rekening aan
+AccountingCreateBillingAccount=Maak een nieuw faktuur rekening aan
AccountingCreateBillingAccountPermissionError=Toegangsfout: Om een nieuwe rekening aan te maken is ACCOUNTING_CREATE of ACCOUNTING_ADMIN permissie vereist <br>
-AccountingCreateBillingAccountRole=Maak een Factuur rekening rol aan
+AccountingCreateBillingAccountRole=Maak een Faktuur rekening rol aan
AccountingCreateBillingAccountRolePermissionError=Toegangsfout: om een nieuwe rol aan te maken is ACCOUNTING_CREATE of ACCOUNTING_ADMIN permissie nodig
AccountingCreateBillingAccountTerm=Create Billing Account Term
AccountingCreateBillingAccountTermPermissionError=Toegangsfout : om een betalingsvoorwaarde an te maken is ACCOUNTING_CREATE of ACCOUNTING_ADMIN permissie nodig
@@ -117,6 +119,7 @@
AccountingEquities=Equities
AccountingExpirationDate=Verval Datum
AccountingFindInvoices=Zoek facturen
+AccountingFindPayment=Zoek betaling
AccountingFindPayments=Zoek betalingen
AccountingFirstNameCard=Voornaam op de kaart
AccountingFixedAsset=Inventaris
@@ -136,6 +139,7 @@
AccountingFixedAssetTypeId=Inventaris type
AccountingFixedAssets=Inventaris
AccountingFixedAssetIdents=Inventaris nummers
+AccountingFixedAssetRegistrations=Registraties
AccountingFromParty=Vanaf partij
AccountingFromPartyId=Vanaf partij Nr
AccountingFX=Vreemde Wissel Valuta
@@ -149,18 +153,19 @@
AccountingGlAccountClass=GB reking klasse
AccountingGlAccountId=GB Rekeningen
AccountingHideFields=Verberg velden
-AccountingIgnoreInvoiceItems=Wijs toe aan de gehele factuur
+AccountingIgnoreInvoiceItems=Wijs toe aan de gehele faktuur
AccountingIncomeStatement=Inkomen
AccountingInformation=Informatie
AccountingInvoice=Faktuur
-AccountingInvoiceDate=Factuur Datum
+AccountingInvoiceDate=Faktuur Datum
AccountingInvoiceHeader=Faktuur Detail
AccountingInvoiceID=Faktuur Nr.
-AccountingInvoiceItem=Factuur item
+AccountingInvoiceItem=Faktuur item
AccountingInvoiceItemAdd=Voeg een nieuwe faktuurregel toe
AccountingInvoiceItemSeqId=Item Nr
AccountingInvoiceItems=Items
AccountingInvoiceOverview=Overzicht
+AccountingInvoicePaid=Betaald
AccountingInvoicePayments=Betalingen
AccountingInvoicePDF=PDF
AccountingInvoiceRoles=Rollen
@@ -210,7 +215,7 @@
AccountingNoAccount=Geen Rekening
AccountingNoBillingAccount=Geen faktuur rekening
AccountingNoBillingAccountFound=Geen faktuur rekening gevonden
-AccountingNoBillingAccountRole=Er bestaan geen factuur rekening rollen
+AccountingNoBillingAccountRole=Er bestaan geen faktuur rekening rollen
AccountingNoBillingAccountTerm=Er bestaan geen faktuurrekening voorwaarden
AccountingNocontactinformationset=Geen kontakt informatie bekend
AccountingNocurrentinvoicelineitems=Geen faktuur regels aanwezig
@@ -219,8 +224,11 @@
AccountingNoPaymentsfound=Geen betalingen gevonden
AccountingNoPaymentsApplicationsfound=Geen Toewijzingen gevonden
AccountingOfflinePayment=offline betaling
+AccountingOpenPayments=Open
AccountingOrders=Orders
AccountingPaidDate=Betaal datum
+AccountingPartyBilledFrom=Factuur van
+AccountingPartyBilledTo=Factuur naar
AccountingPartyIdFrom=Van Partij Nr
AccountingPartyIdTo=Naar Partij Nr
AccountingPartyRoleList=Partij Rol List
@@ -228,7 +236,7 @@
AccountingPartyMustBeInternalOrganization=Partij moet een interne organisatie zijn.
AccountingPayment=Betaling
AccountingPaymentAlreadyReceived=Betaling reeds ontvangen
-AccountingPaymentApplicationParameterMissing=Betalings toewijzing vereist tenminste een factuurnummer of een factuur rekening nr of een belasting instantie
+AccountingPaymentApplicationParameterMissing=Betalings toewijzing vereist tenminste een faktuurnummer of een faktuur rekening nr of een belasting instantie
AccountingPaymentDate=Betalingsdatum
AccountingPaymentHeader=Detail Informatie
AccountingPaymentID=Betalings Nr
@@ -286,8 +294,8 @@
AccountingToPartyId=Naar party nr
AccountingUpdateAvailability=Pas de beschikbaarheid aan
AccountingUpdateBillingAccountPermissionError=Toegangsfout : om accouttransacties aan te passen is ACCOUNTING_UPDATE or ACCOUNTING_ADMIN permissie vereist<br>
-AccountingUpdateBillingAccountRolePermissionError=Toegansfout : om een factuurrekening rol aan te passen is ACCOUNTING_UPDATE or ACCOUNTING_ADMIN permissie nodig
-AccountingUpdateBillingAccountTermPermissionError=Toegansfout :om een factuurrekening voorwaarde aan te passen is de ACCOUNTING_UPDATE or ACCOUNTING_ADMIN permissie nodig
+AccountingUpdateBillingAccountRolePermissionError=Toegansfout : om een faktuurrekening rol aan te passen is ACCOUNTING_UPDATE or ACCOUNTING_ADMIN permissie nodig
+AccountingUpdateBillingAccountTermPermissionError=Toegansfout :om een faktuurrekening voorwaarde aan te passen is de ACCOUNTING_UPDATE or ACCOUNTING_ADMIN permissie nodig
AccountingUpdateBillingAccount=Faktuur rekening aanpassen
AccountingUpdateFX=Vreemde valuta omrekening aanpassen
AccountingUpdatePaymentPermissionError=Toegangsfoutr : Om een betaling aan te passen is de PAY_INFO_UPDATE or PAY_INFO_ADMIN permissie vereist.
@@ -301,7 +309,10 @@
AccountingFixedAssetIdentTypeId=Inventaris identificatie type nr
AccountingFixedAssetIdentIdValue=Waarde
-PageTitleEditBillingAccount=Aanpassen factuur rekening
+PageTitleEditAgreement=Overeenkomst aanpassen
+PageTitleEditAgreementItem=Overeenkomst item aanpassen
+PageTitleEditAgreementTerm=Overeenkomst voorwaarde aanpassen
+PageTitleEditBillingAccount=Aanpassen faktuur rekening
PageTitleEditBillingAccountInvoices=Aanpassen faktuur rekening fakturen
PageTitleEditBillingAccountPayments=Aanpassen faktuur rekening betalingen
PageTitleEditBillingAccountRoles=Aanpassen faktuur rekening rollen
@@ -309,9 +320,15 @@
PageTitleEditFixedAssetStdCost=Aanpassen faktuur rekening vaste kosten
PageTitleEditGlAccount=Grootboekrekening aanpassen
PageTitleEditGlobalGlAccount=Globale Grootboekrekening aanpassen
+PageTitleEditInvoice=Faktuur annpassen
+PageTitleEditPayment=Betaling aanpassen
+PageTitleFindAgreement=Zoek overeenkomsten
PageTitleFindBillingAccount=Zoek faktuurrekening(en)
PageTitleFindGlobalGlAccount=Zoek globaal GB rekening
PageTitleListFixedAssetStdCosts=Lijst van inventaris vaste kosten
+PageTitleListEditInvoiceApplications=Lijst van faktuur toewijzingen
+PageTitleListInvoices=Faktuurlijst
+PageTitleListInvoiceRoles=Faktuurrollen
PageTitleLogin=Aanloggen
PageTitleLookupFixedAsset=Inventaris item opzoeken
PageTitleLookupProduct=Produkt opzoeken
@@ -329,6 +346,7 @@
PageTitleAddTaxAuthorityRateProduct=Nieuw Belastingsinstantie produkt tarief
PageTitleListTaxAuthorityParties=Lijst van Belastingsinstantie partijen
PageTitleEditTaxAuthorityPartyInfo=Aanpassen van Belastingsinstantie partij informatie
+PageTitleSendInvoicePerEmail=Faktuur per email toezenden
PartyPartyId=Partij Nr
PartyRoles=Rollen
@@ -356,13 +374,13 @@
FormFieldTitle_amountToApply=Nog toe te wijzen
FormFieldTitle_applyButton=Wijs toe
FormFieldTitle_applied=Toegewezen
-FormFieldTitle_billingAccountId=Factuur Rekening Nr
+FormFieldTitle_billingAccountId=Faktuur Rekening Nr
FormFieldTitle_dueDate=Uiterste betaaldatum
-FormFieldTitle_invoiceDate=Factuur Datum
-FormFieldTitle_invoiceId=Factuur Nr
+FormFieldTitle_invoiceDate=Faktuur Datum
+FormFieldTitle_invoiceId=Faktuur Nr
FormFieldTitle_invoiceItemSeqId=Regel Nr
-FormFieldTitle_invoiceItemTypeId=Factuur Regel Type
-FormFieldTitle_invoiceMessage=Factuur extra info
+FormFieldTitle_invoiceItemTypeId=Faktuur Regel Type
+FormFieldTitle_invoiceMessage=Faktuur extra info
FormFieldTitle_invoiceProcessing=Wijs aan gehele Invoice toe
FormFieldTitle_invoiceTypeId=Faktuur Type
FormFieldTitle_paidDate=Datum betaald
@@ -388,7 +406,7 @@
AccountingAritmeticPropertiesNotConfigured=Berekenings eigenschappen voor de boekhouddiensten zijn niet geconfigureerd, processen is gestopt."
AccountingNoOrderItemsToInvoice=Geen bestellingsregels, kan geen faktuur aanmaken.
AccountingNoOrderHeader=Geen bestellings kop, kan geen faktuur aanmaken.
-AccountingErrorCreatingInvoiceFromOrder=Probleem met het aanmaken van de factuur vanaf de bestelling
+AccountingErrorCreatingInvoiceFromOrder=Probleem met het aanmaken van de faktuur vanaf de bestelling
AccountingIllegalValuesPassedToCreateInvoiceService=Verkeerde waarden aan de aanmaken factur dienst toegevoerd.
AccountingErrorCreatingInvoiceFromOrderCheckPaymentAppl=Fout bij het aanmaken van de faktuur vanaf de bestelling bij het checken van de toewijzingen
AccountingEntityDataProblemCreatingInvoiceFromOrderItems=Entity/Gegevens probleem bij het maken van facturen voor een bestelling: ${reason}
@@ -409,7 +427,7 @@
AccountingProblemGettingPaymentApplication=Probleem bij het ophalen van toewijzingsrecords voor faktuur Nr [${invoiceId}]
AccountingCannotGetPaymentForApplication=Kan de betaling voor de toewijzing [${payAppl}] niet ophalen omdat ${msg}
AccountingProblemChangingInvoiceStatusTo=Probleem met het veranderen van de status van de faktuur naar ${newStatus}
-AccountingSpecifyInvoiceToPaymentBillingAccountTaxGeoId=Specificeer OF faktuur OF betaling OF factuurrekening OF belastingsinstantie....\n
+AccountingSpecifyInvoiceToPaymentBillingAccountTaxGeoId=Specificeer OF faktuur OF betaling OF faktuurrekening OF belastingsinstantie....\n
AccountingPaymentIdBlankNotSupplied=Betalingsnr leeg of niet aangegeven.....\n
AccountingPaymentRecordNotFound=Betaalingsnr [${paymentId}] niet gevonden....\n
AccountingPaymentCancelled=Betaling [${paymentId}] is geannuleerd en kan niet worden toegewezen\n
@@ -429,19 +447,19 @@
AccountingInvoiceLessRequested=Faktuur [${invoiceId} heeft ${invoiceApplyAvailable?currency(${isoCode})} om toe te wijzen echter ${amountApplied?currency(${isoCode})} is aangevraagd\n
AccountingInvoiceItemNotFound=Faktuur [${invoiceId}] met regel [${invoiceItemSeqId}] is niet gevonden\n
AccountingInvoiceItemPaymentCurrencyProblem=Valuta [${paymentCurrencyId}] van de betaling en faktuur [${itemCurrency}] komen niet overeen\n"
-AccountingInvoicePaymentCurrencyProblem=De valuta [${paymentCurrencyId}] van de betaling en de valuta [${invoiceCurrency}] van de factuur komen niet overeen\n
+AccountingInvoicePaymentCurrencyProblem=De valuta [${paymentCurrencyId}] van de betaling en de valuta [${invoiceCurrency}] van de faktuur komen niet overeen\n
AccountingInvoiceItemLessRequested=Invoice [${invoiceId} Item [${invoiceItemSeqId} has ${invoiceItemApplyAvailable?currency(${isoCode})} to apply but ${amountApplied?currency(${isoCode})} is requested\n
AccountingPaymentApplicationNotFound=Toewijzing [${paymentApplicationId}] niet gevonden\n
AccountingPaymentNotEnough=Betaling [${paymentId}] heeft een waarde (${paymentApplyAvailable?currency(${isoCode})} om toe te wijzen echter ${amountApplied?currency(${isoCode})} is dus te veel\n
AccountingInvoiceNotEnough=Aangevraagde waarde is ${tooMuch?currency(${isoCode})} te veel voor deze faktuur [${invoiceId}]\n
-AccountingInvoiceItemNotEnough=Aangevraagde waarde is ${tooMuch?currency(${isoCode})} te veel voor deze factuur [${invoiceId}] met regelnummer [${invoiceItemSeqId}]\n
-AccountingBillingAccountNotEnough=Factuurrekening [${billingAccountId}] heeft maar ${newBillingAccountApplyAvailable?currency(${isoCode})} beschikbaar, dus ${amountApplied?currency(${isoCode})} is te veel\n
+AccountingInvoiceItemNotEnough=Aangevraagde waarde is ${tooMuch?currency(${isoCode})} te veel voor deze faktuur [${invoiceId}] met regelnummer [${invoiceItemSeqId}]\n
+AccountingBillingAccountNotEnough=Faktuurrekening [${billingAccountId}] heeft maar ${newBillingAccountApplyAvailable?currency(${isoCode})} beschikbaar, dus ${amountApplied?currency(${isoCode})} is te veel\n
AccountingNoAmount=De aangevraagde toewijzing is "0" of niet aangegeven: geen bedrag toegewezen\n
AccountingApplicationSuccess=${amountApplied?currency(${isoCode})} van betaling [${paymentId}] is toegewezen ${toMessage}
AccountingApplicationToInvoice=aan faktuur [${invoiceId}]
AccountingApplicationToInvoiceItem=aan faktuur [${paymentApplication.invoiceId}] met regelnummer [${paymentApplication.invoiceItemSeqId}]
AccountingApplicationToPayment=aan betaling [${paymentId}]
-AccountingApplicationToBillingAccount=aan factuurrekening [${billingAccountId}]
+AccountingApplicationToBillingAccount=aan faktuurrekening [${billingAccountId}]
AccountingApplicationToTax=aan belastingsinstantie [${taxAuthGeoId}]
AccountingSuccessFull= zonder fouten
AccountingEmailScheduledToSend=Email bericht met de bijgevoegde faktuur [${parameters.invoiceId}] is ingeplanned om te verzenden
Modified: trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml 2006-04-28 23:06:28 UTC (rev 7446)
+++ trunk/applications/accounting/webapp/accounting/admin/AdminForms.xml 2006-04-29 01:29:29 UTC (rev 7447)
@@ -22,7 +22,7 @@
<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.Companies}" widget-style="tabletext"><display-entity entity-name="PartyGroup" description="${groupName}"/></field>
+ <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>
</form>
Modified: trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml 2006-04-28 23:06:28 UTC (rev 7446)
+++ trunk/applications/accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml 2006-04-29 01:29:29 UTC (rev 7447)
@@ -27,14 +27,14 @@
<form name="EditGlJournalEntry" type="single"
target="createGlJournalEntry" title="" default-map-name="journal"
default-title-style="tableheadtext" default-widget-style="inputBox" default-tooltip-style="tabletext">
- <field name="acctgTransTypeId" title="${uiLabelMap.AcctgTransType}" widget-style="selectBox">
+ <field name="acctgTransTypeId" title="${uiLabelMap.AccountingTransactionType}" widget-style="selectBox">
<drop-down>
<entity-options entity-name="AcctgTransType" description="${description}">
<entity-order-by field-name="acctgTransTypeId"/>
</entity-options>
</drop-down>
</field>
- <field name="glFiscalTypeId" title="${uiLabelMap.GLFiscalType}" widget-style="selectBox">
+ <field name="glFiscalTypeId" widget-style="selectBox">
<drop-down>
<entity-options entity-name="GlFiscalType" description="${description}">
<entity-order-by field-name="glFiscalTypeId"/>
@@ -67,14 +67,14 @@
<field name="invoiceId"><text size="20" maxlength="20"/></field>
<field name="paymentId"><text size="20" maxlength="20"/></field>
<field name="produtId"><text size="20" maxlength="20"/></field>
- <field name="debitGlAccountId" title="${uiLabelMap.AccountingDebitAcctgGlAcctLabel}" widget-style="selectBox">
+ <field name="debitGlAccountId" widget-style="selectBox">
<drop-down>
<entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}" key-field-name="glAccountId">
<entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
- <field name="creditGlAccountId" title="${uiLabelMap.AccountingCreditAcctgGlAcctLabel}" widget-style="selectBox">
+ <field name="creditGlAccountId" widget-style="selectBox">
<drop-down>
<entity-options entity-name="GlAccount" description="${glAccountId}: ${accountName}" key-field-name="glAccountId">
<entity-order-by field-name="glAccountId"/>
@@ -96,7 +96,7 @@
</service>
</actions>
<auto-fields-entity entity-name="GlAccountOrganization" default-field-type="display"/>
- <field name="glAccountId" title="Edit" widget-style="buttontext">
+ <field name="glAccountId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${glAccountId}" target="GlAccountNavigate?glAccountId=${glAccountId}"/>
</field>
</form>
@@ -109,7 +109,7 @@
<!-- field name="glAccountId" title="Edit" widget-style="buttontext" -->
- <field name="glAccountId" title="GlAccount" widget-style="selectBox">
+ <field name="glAccountId" widget-style="selectBox">
<drop-down>
<entity-options entity-name="GlAccount" description="${accountName}">
<entity-order-by field-name="accountName"/>
@@ -117,7 +117,7 @@
</drop-down>
</field>
<!-- field name="organizationPartyId" title="Party" widget-style="selectBox" -->
- <field name="partyId" parameter-name="organizationPartyId" title="Party" widget-style="selectBox">
+ <field name="partyId" parameter-name="organizationPartyId" widget-style="selectBox">
<drop-down>
<entity-options entity-name="PartyRoleAndPartyDetail" description="${partyId}" >
<!-- entity-options entity-name="PartyRoleAndPartyDetail" description="${organizationPartyId}" -->
@@ -126,7 +126,7 @@
</entity-options>
</drop-down>
</field>
- <field name="submitButton" title="Create Assignment" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="${uiLabelMap.AccountingCreateAssignment}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListGlAccount" default-title-style="tableheadtext"
@@ -141,7 +141,7 @@
</actions>
<auto-fields-entity entity-name="GlAccount" default-field-type="display"/>
- <field name="glAccountId" title="Edit" widget-style="buttontext">
+ <field name="glAccountId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${glAccountId}" target="GlAccountNavigate?glAccountId=${glAccountId}"/>
</field>
</form>
@@ -156,35 +156,35 @@
<!-- 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>
- <field name="glAccountTypeId" title="GL Account Type" widget-style="selectBox">
+ <field name="glAccountTypeId" widget-style="selectBox">
<drop-down allow-empty="false">
<entity-options entity-name="GlAccountType" description="${description}">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="glAccountClassId" title="GL Account Class" widget-style="selectBox">
+ <field name="glAccountClassId" widget-style="selectBox">
<drop-down allow-empty="false">
<entity-options entity-name="GlAccountClass" description="${description}">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="glResourceTypeId" title="GL Resource Type" widget-style="selectBox">
+ <field name="glResourceTypeId" widget-style="selectBox">
<drop-down allow-empty="false">
<entity-options entity-name="GlResourceType" description="${description}">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="glXbrlClassId" title="XBRL Class" widget-style="selectBox">
+ <field name="glXbrlClassId" widget-style="selectBox">
<drop-down allow-empty="true">
<entity-options entity-name="GlXbrlClass" description="${description}">
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
</field>
- <field name="parentGlAccountId" title="Parent GL Account" widget-style="selectBox">
+ <field name="parentGlAccountId" widget-style="selectBox">
<drop-down allow-empty="true">
<entity-options key-field-name="glAccountId" entity-name="GlAccount" description="[${glAccountId}] ${accountName}-${accountCode}">
<entity-order-by field-name="glAccountId"/>
Modified: trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml 2006-04-28 23:06:28 UTC (rev 7446)
+++ trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml 2006-04-29 01:29:29 UTC (rev 7447)
@@ -29,8 +29,8 @@
<field name="fixedAssetName" title="${uiLabelMap.AccountingFixedAssetName}">
<display/>
</field>
- <field name="fixedAssetTypeId" title="${uiLabelMap.AccountingFixedTypeId}"><display-entity entity-name="FixedAssetType"/></field>
- <field name="parentFixedAssetId" title="${uiLabelMap.AccountingFixedAssetParentId}">
+ <field name="fixedAssetTypeId"><display-entity entity-name="FixedAssetType"/></field>
+ <field name="parentFixedAssetId">
<display-entity entity-name="FixedAsset" key-field-name="fixedAssetId" description="${fixedAssetName}">
<sub-hyperlink target="EditFixedAsset?fixedAssetId=${parentFixedAssetId}" description="${parentFixedAssetId}" link-style="buttontext"/>
</display-entity>
@@ -56,7 +56,7 @@
</drop-down>
</field>
<field name="instanceOfProductId" title=""><lookup target-form-name="LookupProduct"/></field>
- <field name="classEnumId" title="Class Enum Id" widget-style="selectBox">
+ <field name="classEnumId" widget-style="selectBox">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId">
<entity-constraint name="enumTypeId" operator="equals" value="FXAST_CLASS"/>
@@ -80,7 +80,7 @@
</drop-down>
</field>
<!--<field name="calendarId"><hidden/></field>--> <!-- not show, can better be maintained by the system -->
- <field name="calendarId" title="${uiLabelMap.CommonCalendar}" widget-style="selectBox">
+ <field name="calendarId" widget-style="selectBox">
<drop-down allow-empty="true">
<entity-options entity-name="TechDataCalendar" description="[${calendarId}] ${description}">
<entity-order-by field-name="calendarId"/>
@@ -123,7 +123,7 @@
</entity-options>
</drop-down>
</field>
- <field name="quantityUomId" title="${uiLabelMap.CommonQuantityUom}" widget-style="selectBox">
+ <field name="quantityUomId" widget-style="selectBox">
<drop-down allow-empty="true">
<entity-options entity-name="UomAndType" key-field-name="uomId" description="[${typeDescription}] ${description}">
<entity-order-by field-name="uomTypeId"/>
Modified: trunk/applications/accounting/webapp/accounting/includes/appheader.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/includes/appheader.ftl 2006-04-28 23:06:28 UTC (rev 7446)
+++ trunk/applications/accounting/webapp/accounting/includes/appheader.ftl 2006-04-29 01:29:29 UTC (rev 7447)
@@ -47,7 +47,7 @@
<div class="col"><a href="<@ofbizUrl>FindGlobalGlAccount</@ofbizUrl>" class="${selectedLeftClassMap.chartofaccounts?default(unselectedLeftClassName)}">${uiLabelMap.AccountingChartOfAcctsMenu}</a></div>
<div class="col"><a href="<@ofbizUrl>ListFixedAssets</@ofbizUrl>" class="${selectedLeftClassMap.ListFixedAssets?default(unselectedLeftClassName)}">${uiLabelMap.AccountingFixedAssets}</a></div>
<div class="col"><a href="<@ofbizUrl>FindTaxAuthority</@ofbizUrl>" class="${selectedLeftClassMap.TaxAuthorities?default(unselectedLeftClassName)}">${uiLabelMap.AccountingTaxAuthorities}</a></div>
- <div class="col"><a href="<@ofbizUrl>ListCompanies</@ofbizUrl>" class="${selectedLeftClassMap.companies?default(unselectedLeftClassName)}">${uiLabelMap.Companies}</a></div>
+ <div class="col"><a href="<@ofbizUrl>ListCompanies</@ofbizUrl>" class="${selectedLeftClassMap.companies?default(unselectedLeftClassName)}">${uiLabelMap.AccountingCompanies}</a></div>
<#if userLogin?has_content>
<div class="col-right"><a href="<@ofbizUrl>logout</@ofbizUrl>" class="${selectedRightClassMap.logout?default(unselectedRightClassName)}">${uiLabelMap.CommonLogout}</a></div>
Modified: trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml 2006-04-28 23:06:28 UTC (rev 7446)
+++ trunk/applications/accounting/webapp/accounting/invoice/InvoiceForms.xml 2006-04-29 01:29:29 UTC (rev 7447)
@@ -23,6 +23,7 @@
<form name="FindInvoices" type="single"
target="findInvoices" title="Find and list invoices"
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="hideSearch"><hidden value="Y"/></field>
<field name="invoiceId"><text-find default-option="contains" ignore-case="true"/></field>
<field name="description"><text-find default-option="contains" ignore-case="true"/></field>
@@ -40,7 +41,6 @@
</field>
<field position="1" name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field>
<field position="2" name="partyIdTo" parameter-name="partyId"><lookup target-form-name="LookupPartyName"/></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="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -439,6 +439,6 @@
<field name="emailAddressCc" entry-name="ccEmailAddress" parameter-name="sendCc"><text/></field>
<field name="subject"><text default-value="Please find attached invoice."/></field>
<field name="bodyText"><textarea/></field>
- <field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="submitButton" title="Submit" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
</forms>
Modified: trunk/applications/accounting/webapp/accounting/main.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/main.ftl 2006-04-28 23:06:28 UTC (rev 7446)
+++ trunk/applications/accounting/webapp/accounting/main.ftl 2006-04-29 01:29:29 UTC (rev 7447)
@@ -28,7 +28,7 @@
<tr>
<td colspan="3">
<ul>
-<li><a href="<@ofbizUrl>FindAgreement</@ofbizUrl>">List Available Agreements</a></li>
+<li><a href="<@ofbizUrl>FindAgreement</@ofbizUrl>">${uiLabelMap.AccountingAgreementAvailable}</a></li>
</ul>
<br/>
</td>
@@ -40,7 +40,7 @@
<tr>
<td colspan="3">
<ul>
-<li><a href="<@ofbizUrl>FindBillingAccount</@ofbizUrl>">Show Customer Billing Accounts</a></li>
+<li><a href="<@ofbizUrl>FindBillingAccount</@ofbizUrl>">${uiLabelMap.CommonShow} ${uiLabelMap.AccountingCustomer} ${uiLabelMap.AccountingBillingAccount}</a></li>
</ul>
<br/>
</td>
@@ -53,7 +53,7 @@
<tr>
<td colspan="3">
<ul>
-<li><a href="<@ofbizUrl>ListFixedAssets</@ofbizUrl>">Show all Fixed Assets</a></li>
+<li><a href="<@ofbizUrl>ListFixedAssets</@ofbizUrl>">${uiLabelMap.CommonShowAll} ${uiLabelMap.AccountingFixedAssets}</a></li>
</ul>
<br/>
</td>
@@ -66,21 +66,21 @@
<tr valign="top">
<td>
<ul>
-<li><a href="<@ofbizUrl>findInvoices?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">Show All Invoices</a></li>
+<li><a href="<@ofbizUrl>findInvoices?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.CommonShowAll} ${uiLabelMap.AccountingInvoices}</a></li>
</ul>
</td>
<td>
<ul>
<#list invoiceTypes as invoiceType>
-<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">Show ${invoiceType.description} Invoices</a></li>
+<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&invoiceTypeId=${invoiceType.invoiceTypeId}</@ofbizUrl>">${uiLabelMap.CommonShow} ${invoiceType.description} ${uiLabelMap.AccountingInvoices}</a></li>
</#list>
</ul>
</td>
<td>
<ul>
<#list invoiceStatus as status>
-<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">Show ${status.description} Invoices</a></li>
+<li><a href="<@ofbizUrl>findInvoices?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.CommonShow} ${status.description} ${uiLabelMap.AccountingInvoices}</a></li>
</#list>
</ul>
</td>
@@ -93,14 +93,14 @@
<tr valign="top">
<td>
<ul>
-<li><a href="<@ofbizUrl>findPayments?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">Show all Payments</a></li>
+<li><a href="<@ofbizUrl>findPayments?noConditionFind=Y&lookupFlag=Y</@ofbizUrl>">${uiLabelMap.CommonShowAll} ${uiLabelMap.AccountingPayments}</a></li>
</ul>
</td>
<td>
<ul>
<#list paymentTypes as paymentType>
-<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentTypeId=${paymentType.paymentTypeId}</@ofbizUrl>">Show ${paymentType.get("description",locale)} Payments</a></li>
+<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentTypeId=${paymentType.paymentTypeId}</@ofbizUrl>">${uiLabelMap.CommonShow} ${paymentType.get("description",locale)} ${uiLabelMap.AccountingPayments}</a></li>
</#list>
</ul>
</td>
@@ -109,7 +109,7 @@
<td>
<ul>
<#list paymentMethodTypes as paymentMethodType>
-<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentMethodTypeId=${paymentMethodType.paymentMethodTypeId}</@ofbizUrl>">Show ${paymentMethodType.get("description",locale)} Payments</a></li>
+<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&paymentMethodTypeId=${paymentMethodType.paymentMethodTypeId}</@ofbizUrl>">${uiLabelMap.CommonShow} ${paymentMethodType.get("description",locale)} ${uiLabelMap.AccountingPayments}</a></li>
</#list>
</ul>
</td>
@@ -117,14 +117,14 @@
<td>
<ul>
<#list paymentStatus as status>
-<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">Show ${status.description} Payments</a></li>
+<li><a href="<@ofbizUrl>findPayments?lookupFlag=Y&statusId=${status.statusId}</@ofbizUrl>">${uiLabelMap.CommonShow} ${status.description} ${uiLabelMap.AccountingPayments}</a></li>
</#list>
</ul>
</td>
</tr>
</table>
-<p><b>NOTE</b><br/>
-A full accounting and financials component for OFBiz is available.
-<a href="http://www.opensourcestrategies.com/ofbiz/accounting.php">Click here</a> for complete details.</p>
+<p><b>${uiLabelMap.AccountingMainPageNote1}</b><br/>
+${uiLabelMap.AccountingMainPageNote2}
+<a href="http://www.opensourcestrategies.com/ofbiz/accounting.php">${uiLabelMap.AccountingMainPageNote3}</a> ${uiLabelMap.AccountingMainPageNote4}</p>
</div>
Modified: trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl 2006-04-28 23:06:28 UTC (rev 7446)
+++ trunk/applications/accounting/webapp/accounting/payment/manualTx.ftl 2006-04-29 01:29:29 UTC (rev 7447)
@@ -24,7 +24,7 @@
*@since 3.0
-->
-<div class="head1">Manual Electronic Transaction</div>
+<div class="head1">${uiLabelMap.AccountingManualTransaction}</div>
<br/>
<#if security.hasEntityPermission("MANUAL", "_PAYMENT", session)>
@@ -36,7 +36,7 @@
<table border='0' cellpadding='2' cellspacing='0'>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">Payment Method Type</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingPaymentMethodType}</div></td>
<td width="5"> </td>
<td width='74%'>
<#if paymentMethodType?has_content>
@@ -44,13 +44,13 @@
<input type="hidden" name="paymentMethodTypeId" value="${paymentMethodType.paymentMethodTypeId}">
<#else>
<select name="paymentMethodTypeId" class="selectBox">
- <option value="CREDIT_CARD">Credit Card</option>
+ <option value="CREDIT_CARD">${uiLabelMap.AccountingCreditCard}</option>
</select>
</#if>
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">Product Store</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.ProductProductStore}</div></td>
<td width="5"> </td>
<td width='74%'>
<#if currentStore?has_content>
@@ -66,7 +66,7 @@
</td>
</tr>
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">Transaction Type</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.AccountingTransactionType}</div></td>
<td width="5"> </td>
<td width='74%'>
<#if currentTx?has_content>
@@ -95,7 +95,7 @@
<#-- amount field -->
<#if txType != "PRDS_PAY_RELEASE">
<tr>
- <td width="26%" align="right" valign=middle><div class="tableheadtext">Amount</div></td>
+ <td width="26%" align="right" valign=middle><div class="tableheadtext">${uiLabelMap.CommonAmount}</div></td>
<td width="5"> </td>
<td width="74%">
<input type="text" class="inputBox" size="20" maxlength="30" name="amount">
@@ -108,14 +108,14 @@
<td width="26%" align="right" valign=middle> </td>
<td width="5"> </td>
<td width="74%">
- <input type="submit" value="Submit">
+ <input type="submit" value="${uiLabelMap.CommonSubmit}">
</td>
</tr>
<#elseif txType?has_content>
<tr>
<td colspan="3" align="center">
<br/>
- <div class="head2">This transaction type is not yet supported</div>
+ <div class="head2">${uiLabelMap.AccountingTransactionTypeNotYetSupported}</div>
<br/>
</td>
</tr>
@@ -123,5 +123,5 @@
</table>
</form>
<#else>
- <h3>You do not have permission for this function.</h3>
+ <h3>${uiLabelMap.AccountingPermissionError}</h3>
</#if>
Modified: trunk/applications/accounting/widget/AccountingScreens.xml
===================================================================
--- trunk/applications/accounting/widget/AccountingScreens.xml 2006-04-28 23:06:28 UTC (rev 7446)
+++ trunk/applications/accounting/widget/AccountingScreens.xml 2006-04-29 01:29:29 UTC (rev 7447)
@@ -102,10 +102,9 @@
<screen name="EditGlJournalEntry">
<section>
<actions>
- <set field="title" value="Edit GlJournal Entry"/>
- <set field="titleProperty" value="Edit Gl Journal Entry"/>
+ <set field="titleProperty" value="AcctgEditGlJournalEntry"/>
<set field="tabButtonItem" value="EditGlJournalEntry"/>
- <set field="labelTitleProperty" value="ListGlAccountOrganization"/>
+ <set field="labelTitleProperty" value="AcctgEditGlJournalEntry"/>
<!-- entity-condition entity-name="GlAccountOrganization" list-name="entityList" use-cache="true" >
<condition-expr field-name="glAccountId" operator="greater" value="0" />
</entity-condition -->
@@ -126,10 +125,9 @@
<screen name="ListGlAccountOrganization">
<section>
<actions>
- <set field="title" value="List GlAccountOrganization"/>
- <set field="titleProperty" value="List GlAccountOrganization"/>
+ <set field="titleProperty" value="AcctgListGlAcctOrg"/>
<set field="tabButtonItem" value="EditProduct"/>
- <set field="labelTitleProperty" value="ListGlAccountOrganization"/>
+ <set field="labelTitleProperty" value="AcctgListGlAcctOrg"/>
<set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/>
<set field="viewSize" from-field="parameters.VIEW_SIZE" type="Integer" default-value="50"/>
</actions>
@@ -147,10 +145,10 @@
<screen name="AssignGlAccount">
<section>
<actions>
- <set field="title" value="Assign GlAccount"/>
+ <set field="titleProperty" value="AcctgAssignGlAccount"/>
<!-- <set field="titleProperty" value=""/> -->
<set field="headerItem" value="chartofaccounts"/>
- <set field="labelTitleProperty" value="Assign Account"/>
+ <set field="labelTitleProperty" value="AcctgAssignGlAccount"/>
<!-- <set field="accountId" from-field="parameters.accountId"/> -->
</actions>
@@ -167,10 +165,10 @@
<screen name="GlAccountNavigate">
<section>
<actions>
- <set field="title" value="Navigate Gl Accounts"/>
+ <set field="titleProperty" value="AcctgNavigateAccts"/>
<!-- <set field="titleProperty" value=""/> -->
<set field="headerItem" value="chartofaccounts"/>
- <set field="labelTitleProperty" value="ListAccounts"/>
+ <set field="labelTitleProperty" value="AcctgNavigateAccts"/>
<!-- parameters includes requestAttributes and parameter map -->
<!-- requestParameters is just the parameter map -->
<set field="glAccountId" from-field="requestParameters.glAccountId"/>
@@ -270,11 +268,10 @@
<screen name="ListGlAccounts">
<section>
- <actions>
- <set field="title" value="List Accounts"/>
- <set field="titleProperty" value="List Accounts"/>
+ <actions>
+ <set field="titleProperty" value="PageTitleListAccounts"/>
<set field="tabButtonItem" value=""/>
- <set field="labelTitleProperty" value="ListAccounts"/>
+ <set field="labelTitleProperty" value="PageTitleListAccounts"/>
<!-- no longer works requies a fieldMap entity-and entity-name="GlAccount" list-name="entityList" use-cache="true" >
<limit-range start="0" size="20" />
</entity-and -->
Modified: trunk/applications/accounting/widget/FixedAssetScreens.xml
===================================================================
--- trunk/applications/accounting/widget/FixedAssetScreens.xml 2006-04-28 23:06:28 UTC (rev 7446)
+++ trunk/applications/accounting/widget/FixedAssetScreens.xml 2006-04-29 01:29:29 UTC (rev 7447)
@@ -24,7 +24,7 @@
<screen name="ListFixedAssets">
<section>
<actions>
- <set field="title" value="List Fixed Assets"/>
+ <set field="titleProperty" value="PageTitleListFixedAssets"/>
<set field="tabButtonItem" value="ListFixedAssets"/>
<entity-condition entity-name="FixedAsset" list-name="fixedAssets">
<!-- <condition-list>
@@ -52,7 +52,7 @@
<screen name="EditFixedAsset">
<section>
<actions>
- <set field="title" value="Edit Fixed Asset"/>
+ <set field="titleProperty" value="PageTitleEditFixedAsset"/>
<set field="tabButtonItem" value="EditFixedAsset"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
<entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
@@ -75,7 +75,7 @@
<actions>
<set field="titleProperty" value="PageTitleListFixedAssetProducts"/>
<set field="tabButtonItem" value="ListFixedAssetProducts"/>
- <set field="labelTitleProperty" value="Products"/>
+ <set field="labelTitleProperty" value="AccountingFixedAssetProducts"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
<entity-one entity-name="FixedAsset" value-name="fixedAsset">
@@ -107,7 +107,7 @@
<set field="layoutSettings.extraHead" value="<link rel='stylesheet' href='/images/calendarTable.css' type='text/css'>" global="true"/>
<set field="titleProperty" value="PageTitleListFixedAssetCalendar"/>
<set field="tabButtonItem" value="ListFixedAssetCalendar"/>
- <set field="labelTitleProperty" value="Calendar"/>
+ <set field="labelTitleProperty" value="AccountingFixedAssetCalendar"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
<entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
<script location="component://accounting/webapp/accounting/fixedasset/month.bsh"/>
@@ -141,7 +141,7 @@
<actions>
<set field="titleProperty" value="PageTitleListFixedAssetStdCosts"/>
<set field="tabButtonItem" value="ListFixedAssetStdCosts"/>
- <set field="labelTitleProperty" value="Standard costs"/>
+ <set field="labelTitleProperty" value="AccountingFixedAssetStdCosts"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
<entity-one entity-name="FixedAsset" value-name="fixedAsset" auto-field-map="true"/>
<entity-and entity-name="FixedAssetStdCost" list-name="fixedAssetStdCosts">
@@ -186,9 +186,9 @@
<screen name="EditFixedAssetIdents">
<section>
<actions>
- <set field="titleProperty" value="Edit Fixed Asset Idents"/>
+ <set field="titleProperty" value="PageTitleEditFixedAssetIdents"/>
<set field="tabButtonItem" value="EditFixedAssetIdents"/>
- <set field="labelTitleProperty" value="Edit Fixed Asset Idents"/>
+ <set field="labelTitleProperty" value="PageTitleEditFixedAssetIdents"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
<set field="fixedAssetIdentTypeId" from-field="parameters.fixedAssetIdentTypeId"/>
<entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
@@ -207,9 +207,9 @@
<screen name="EditFixedAssetRegistrations">
<section>
<actions>
- <set field="titleProperty" value="Edit Fixed Asset Registrations"/>
+ <set field="titleProperty" value="PageTitleEditFixedAssetRegistrations"/>
<set field="tabButtonItem" value="EditFixedAssetRegistrations"/>
- <set field="labelTitleProperty" value="Edit Fixed Asset Registrations"/>
+ <set field="labelTitleProperty" value="PageTitleEditFixedAssetRegistrations"/>
<set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
<set field="fromDate" from-field="parameters.fromDate"/>
<entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
Modified: trunk/applications/accounting/widget/TaxAuthorityForms.xml
===================================================================
--- trunk/applications/accounting/widget/TaxAuthorityForms.xml 2006-04-28 23:06:28 UTC (rev 7446)
+++ trunk/applications/accounting/widget/TaxAuthorityForms.xml 2006-04-29 01:29:29 UTC (rev 7447)
@@ -60,7 +60,7 @@
<field name="requireTaxIdForExemption" widget-style="smallSelect"><drop-down no-current-selected-key="Y"><option key="Y"/><option key="N"/></drop-down></field>
<field name="includeTaxInPrice" widget-style="smallSelect"><drop-down no-current-selected-key="N"><option key="Y"/><option key="N"/></drop-down></field>
- <field name="taxIdFormatPattern" tooltip="Use regular expression validation pattern"></field>
+ <field name="taxIdFormatPattern" tooltip="${uiLabelMap.AccountingValidationPattern}"></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -195,7 +195,7 @@
<field name="taxAuthPartyId"><hidden/></field>
<field name="taxAuthGeoId"><hidden/></field>
<field name="organizationPartyId" title="${uiLabelMap.PartyOrganizationPartyId}"><lookup target-form-name="LookupPartyName"/></field>
- <field name="glAccountId" title="${uiLabelMap.AccountGlAccountId}"><lookup target-form-name="LookupGlAccount"/></field>
+ <field name="glAccountId" title="${uiLabelMap.AccountingGlAccount}"><lookup target-form-name="LookupGlAccount"/></field>
<field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -314,7 +314,7 @@
<field name="taxAuthPartyId"><hidden/></field>
<field name="taxAuthGeoId"><hidden/></field>
- <field name="partyId" title="${uiLabelMap.TaxAuthorityPartyId}">
+ <field name="partyId">
<display-entity entity-name="PartyNameView" description="${firstName} ${middleName} ${lastName} ${groupName}">
<sub-hyperlink description="${partyId}" target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" link-style="buttontext"/>
</display-entity>
Modified: trunk/applications/accounting/widget/TaxAuthorityMenus.xml
===================================================================
--- trunk/applications/accounting/widget/TaxAuthorityMenus.xml 2006-04-28 23:06:28 UTC (rev 7446)
+++ trunk/applications/accounting/widget/TaxAuthorityMenus.xml 2006-04-29 01:29:29 UTC (rev 7447)
@@ -41,7 +41,7 @@
<menu-item name="EditTaxAuthorityGlAccounts" title="${uiLabelMap.AccountingGlAccs}">
<link target="EditTaxAuthorityGlAccounts?taxAuthPartyId=${taxAuthPartyId}&taxAuthGeoId=${taxAuthGeoId}"/>
</menu-item>
- <menu-item name="EditTaxAuthorityRateProducts" title="Product Rates">
+ <menu-item name="EditTaxAuthorityRateProducts" title="${uiLabelMap.AccountingProductRates}">
<link target="EditTaxAuthorityRateProducts?taxAuthPartyId=${taxAuthPartyId}&taxAuthGeoId=${taxAuthGeoId}"/>
</menu-item>
<menu-item name="ListTaxAuthorityParties" title="${uiLabelMap.PartyParties}">
More information about the Svn
mailing list