[OFBiz] SVN: r7592 - in trunk/applications/accounting: config webapp/accounting/invoice widget
hansbak@svn.ofbiz.org
hansbak at svn.ofbiz.org
Mon May 15 03:28:34 CDT 2006
Author: hansbak
Date: 2006-05-15 03:27:44 -0500 (Mon, 15 May 2006)
New Revision: 7592
Modified:
trunk/applications/accounting/config/AccountingUiLabels.properties
trunk/applications/accounting/config/AccountingUiLabels_nl.properties
trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl
trunk/applications/accounting/widget/AccountingPrintForms.xml
Log:
invoice pdf is now loalized but waiting on orderheader to be committed which is used here too...
Modified: trunk/applications/accounting/config/AccountingUiLabels.properties
===================================================================
--- trunk/applications/accounting/config/AccountingUiLabels.properties 2006-05-15 06:26:00 UTC (rev 7591)
+++ trunk/applications/accounting/config/AccountingUiLabels.properties 2006-05-15 08:27:44 UTC (rev 7592)
@@ -20,6 +20,15 @@
de=German
nl=Dutch
+# items to be moved to the common uiLabels
+CommonNoPostalAddress=No postal address defined
+CommonTelephoneAbbr=Tel
+CommonWebsite=Website
+CommonFinBankName=Bank
+CommonRouting=Routing
+CommonBankAccntNrAbbr=AccntNr
+CommonQty=Qty
+
AccountingPermissionError=Security Error\: to run ${methodShortDescription} you must have the ACCOUNTING${securityAction} or ACCOUNTING_ADMIN permission
AcctgGlPartyLabel=GL Party :
@@ -109,10 +118,12 @@
AccountingCreatePermissionError=Security Error: to run createGlAccount you must have the ACCOUNTING_CREATE or ACCOUNTING_ADMIN permission<br>
AccountingCreditCard=Credit Card
AccountingCustomer=Customer
+AccountingCustNr=Cust.Nr
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
AccountingDescription=Description
+AccountingDescr=Descr
AccountingDueDate=Due Date
AccountingEditPayment=Edit Payment
AccountingEffective=Effective
@@ -160,8 +171,11 @@
AccountingIgnoreInvoiceItems=Ignore Invoice Items
AccountingIncomeStatement=Income Statement
AccountingInformation=Information
+AccountingInvNr=Inv.Nr
AccountingInvoice=Invoice
+AccountingInvoiceCapitals=INVOICE
AccountingInvoiceDate=Invoice Date
+AccountingInvoiceDateAbbr=Inv. Date
AccountingInvoiceHeader=Header
AccountingInvoiceID=InvoiceID
AccountingInvoiceItem=Invoice Item
@@ -187,6 +201,7 @@
AccountingInvoices=Invoices
AccountingInvoicesFound=Invoices Found
AccountingInvoicesMenu=Invoices
+AccountingItemNr=ItemNr
AccountingLastNameCard=Last Name on Card
AccountingLiabilities=Liabilities
AccountingListInvoicesNotYetApplied=Possible invoices to apply
@@ -222,6 +237,7 @@
AccountingNewTaxAuthority=New Tax Authority
AccountingNewTaxAuthorityPartyInfo=New Tax Authority Party Info
AccountingNoAccount=No Account
+AccountingNoGenBilAddressFound=No general/billing address found for party:
AccountingNoBillingAccount=No Billing Account
AccountingNoBillingAccountFound=No billing accounts found.
AccountingNoBillingAccountRole=No billing account roles exist.
@@ -235,6 +251,7 @@
AccountingOfflinePayment=Offline Payment
AccountingOpenPayments=Open
AccountingOrders=Orders
+AccountingOrderNr=Order #
AccountingOrderPaymentPreferenceId=Accounting Order Payment Preference Id
AccountingPaidDate=Paid Date
AccountingPartyBilledFrom=Party Billed From
@@ -303,6 +320,7 @@
AccountingTextData=Text Data
AccountingThruDate=Thru Date
AccountingTitleTransfer=Title Transfer
+AccountingTotalCapital=TOTAL
AccountingTransactions=Transactions
AccountingTransactionType=Transaction Type
AccountingTransactionTypeNotYetSupported=This transaction type is not yet supported
@@ -316,6 +334,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.
+AccountingUnitPrice=Unit Price
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
Modified: trunk/applications/accounting/config/AccountingUiLabels_nl.properties
===================================================================
--- trunk/applications/accounting/config/AccountingUiLabels_nl.properties 2006-05-15 06:26:00 UTC (rev 7591)
+++ trunk/applications/accounting/config/AccountingUiLabels_nl.properties 2006-05-15 08:27:44 UTC (rev 7592)
@@ -20,6 +20,16 @@
de=Duits
nl=Nederlands
+
+# items to be moved to the common uiLabels
+CommonNoPostalAddress=Geen postadres gedefinieerd
+CommonTelephoneAbbr=Tel
+CommonWebsite=Website
+CommonFinBankName=Bank
+CommonRouting=Routing
+CommonBankAccntNrAbbr=Rek.Nr
+CommonQty=Aan- tal
+
AccountingPermissionError=Toegangs fout\: Om ${methodShortDescription} te gebruiken moet u de ACCOUNTING${securityAction} of ACCOUNTING_ADMIN permissie bezitten
AcctgGlPartyLabel=GL Partij :
@@ -71,20 +81,20 @@
AccountingAuthorize=Machtig
AccountingBalanceSheet=Balance table
AccountingBankName=Bank Naam
-AccountingBilling=Facturatie
+AccountingBilling=Fakturatie
AccountingBillingAccount=Faktuur rekening
-AccountingBillingAccountId=Fact.Reken.Nr
-AccountingBillingAccountInvoices=Facturen voor faktuurrekening
+AccountingBillingAccountId=Fakt.Reken.Nr
+AccountingBillingAccountInvoices=Fakturen voor faktuurrekening
AccountingBillingAccountOnly=Betaal alleen op rekening
AccountingBillingAccountPayments=Rekening betalingen
AccountingBillingAccounts=Faktuur rekening
-AccountingBillingAcct=Fact.Rekg.
+AccountingBillingAcct=Fakt.Rekg.
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
+AccountingBillUpTo=Fakt. maximaal
AccountingCapture=Opvangen
AccountingCardNumber=Kaart nummer
AccountingCardType=Kaart type
@@ -106,10 +116,13 @@
AccountingCreatePaymentPermissionError=Toegangsfout : Om een betaling aan te maken is PAY_INFO_CREATE of PAY_INFO_ADMIN permissie vereist
AccountingCreatePermissionError=Toegangsfout: to run createGlAccount you must have the ACCOUNTING_CREATE or ACCOUNTING_ADMIN permission<br>
AccountingCreditCard=Crediet kaart
+AccountingCustNr=Klant Nr
+AccountingCustomer=Klant
AccountingDataExchange=Data overdracht
AccountingDebitCreditMustEqual=Debet and Credit totalen moeten overeenkomen om te kunnen boeken in het grootboek
AccountingDeleteBillingAccountTermPermissionError=Security Error : to run removeBillingAccountTerm you must have the ACCOUNTING_DELETE or ACCOUNTING_ADMIN permission
AccountingDescription=Beschrijving
+AccountingDescr=Beschr
AccountingDueDate=Uiterste datum
AccountingEditPayment=Wijzig betaling
AccountingEffective=Effectief
@@ -118,7 +131,7 @@
AccountingEmptyForMaxAmount=Leeg laten voor de maximale waarde
AccountingEquities=Equities
AccountingExpirationDate=Verval Datum
-AccountingFindInvoices=Zoek facturen
+AccountingFindInvoices=Zoek fakturen
AccountingFindPayment=Zoek betaling
AccountingFindPayments=Zoek betalingen
AccountingFirstNameCard=Voornaam op de kaart
@@ -156,8 +169,11 @@
AccountingIgnoreInvoiceItems=Wijs toe aan de gehele faktuur
AccountingIncomeStatement=Inkomen
AccountingInformation=Informatie
+AccountingInvNr=Fakt.Nr
AccountingInvoice=Faktuur
+AccountingInvoiceCapitals=FAKTUUR
AccountingInvoiceDate=Faktuur Datum
+AccountingInvoiceDateAbbr=Fakt. Datum
AccountingInvoiceHeader=Faktuur Detail
AccountingInvoiceID=Faktuur Nr.
AccountingInvoiceItem=Faktuur item
@@ -181,15 +197,16 @@
AccountingInvoiceStatusToWriteoff=Status naar 'Afgeschreven'
AccountingInvoiceTotal=Faktuur totaal
AccountingInvoices=Fakturen
-AccountingInvoicesFound=Facturen gevonden
+AccountingInvoicesFound=Fakturen gevonden
AccountingInvoicesMenu=Fakturen
+AccountingItemNr=ItemNr
AccountingLastNameCard=Achternaam op de kaart
AccountingLiabilities=Lasten
AccountingLineTotal=Lijn totaal
-AccountingListInvoicesNotYetApplied=Mogelijke facturen om toe te wijzen
+AccountingListInvoicesNotYetApplied=Mogelijke fakturen om toe te wijzen
AccountingListPaymentsNotYetApplied=Mogelijke betalingen om toe te wijzen
AccountingLeaveEmptyForMaximumAmount=Laat leeg voor het maximaal mogelijke bedrag
-AccountingLookupInvoices=Facturen opzoeken
+AccountingLookupInvoices=Fakturen opzoeken
AccountingLookupPayment=Betalingen opzoeken
AccountingMainMenu=Begin
AccountingMainPage=Boekhouding begin pagina
@@ -213,6 +230,7 @@
AccountingNewTaxAuthority=Nieuwe Belasting Instantie
AccountingNewTaxAuthorityPartyInfo=Nieuwe Belasting Instantie party info
AccountingNoAccount=Geen Rekening
+AccountingNoGenBilAddressFound=Geen alg/fakt. adres gevonden voor partij:
AccountingNoBillingAccount=Geen faktuur rekening
AccountingNoBillingAccountFound=Geen faktuur rekening gevonden
AccountingNoBillingAccountRole=Er bestaan geen faktuur rekening rollen
@@ -226,9 +244,10 @@
AccountingOfflinePayment=offline betaling
AccountingOpenPayments=Open
AccountingOrders=Orders
+AccountingOrderNr=Order #
AccountingPaidDate=Betaal datum
-AccountingPartyBilledFrom=Factuur van
-AccountingPartyBilledTo=Factuur naar
+AccountingPartyBilledFrom=Faktuur van
+AccountingPartyBilledTo=Faktuur naar
AccountingPartyIdFrom=Van Partij Nr
AccountingPartyIdTo=Naar Partij Nr
AccountingPartyRoleList=Partij Rol List
@@ -292,6 +311,8 @@
AccountingTrialBalance=Test Balans
AccountingToParty=Naar partij
AccountingToPartyId=Naar party nr
+AccountingTotalCapital=TOTAAL
+AccountingUnitPrice=Prijs per eenheid
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 faktuurrekening rol aan te passen is ACCOUNTING_UPDATE or ACCOUNTING_ADMIN permissie nodig
@@ -407,9 +428,9 @@
AccountingNoOrderItemsToInvoice=Geen bestellingsregels, kan geen faktuur aanmaken.
AccountingNoOrderHeader=Geen bestellings kop, kan geen faktuur aanmaken.
AccountingErrorCreatingInvoiceFromOrder=Probleem met het aanmaken van de faktuur vanaf de bestelling
-AccountingIllegalValuesPassedToCreateInvoiceService=Verkeerde waarden aan de aanmaken factur dienst toegevoerd.
+AccountingIllegalValuesPassedToCreateInvoiceService=Verkeerde waarden aan de aanmaken faktuur 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}
+AccountingEntityDataProblemCreatingInvoiceFromOrderItems=Entity/Gegevens probleem bij het maken van fakturen voor een bestelling: ${reason}
AccountingServiceOtherProblemCreatingInvoiceFromOrderItems=Dienst/ander probleem bij het aanmaken van de faktuur vanaf een bestelling: ${reason}
AccountingTroubleCreateInvoicesFromShipmentsService=Problemen bij het aanroepen van de createInvoicesFromShipments service; faktuur niet aangemaakt voor de verzending [${shipmentId}]
AccountingShipmentsOfDifferentTypes=Verschillende types verzending gevonden; verzending [${tmpShipmentId}] met het type [${shipmentTypeId}] is van een verschillend type van de vorige.
Modified: trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl 2006-05-15 06:26:00 UTC (rev 7591)
+++ trunk/applications/accounting/webapp/accounting/invoice/viewInvoice.fo.ftl 2006-05-15 08:27:44 UTC (rev 7592)
@@ -46,7 +46,7 @@
<fo:table-body>
<fo:table-row >
<fo:table-cell>
- <fo:block>To: </fo:block>
+ <fo:block>${uiLabelMap.CommonTo}: </fo:block>
<#if billingAddress?has_content>
<#assign billingPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billingParty.partyId, "compareDate", invoice.invoiceDate, "userLogin", userLogin))/>
<fo:block>${billingPartyNameResult.fullName?default(billingAddress.toName)?default("Billing Name Not Found")}</fo:block>
@@ -59,7 +59,7 @@
</#if>
<fo:block>${billingAddress.postalCode?if_exists} ${billingAddress.city?if_exists}</fo:block>
<#else>
- <fo:block>No general/billing address found for party: ${billingParty.partyId}</fo:block>
+ <fo:block>${uiLabelMap.AccountingNoGenBilAddressFound}${billingParty.partyId}</fo:block>
</#if>
</fo:table-cell>
<fo:table-cell>
@@ -69,30 +69,30 @@
<fo:table-body>
<fo:table-row>
<fo:table-cell>
- <fo:block number-columns-spanned="2" font-weight="bold">INVOICE</fo:block>
+ <fo:block number-columns-spanned="2" font-weight="bold">${uiLabelMap.AccountingInvoiceCapitals}</fo:block>
</fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell><fo:block>Inv.Date</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>${uiLabelMap.AccountingInvoiceDateAbbr}:</fo:block></fo:table-cell>
<fo:table-cell><fo:block>${invoiceDate?if_exists}</fo:block></fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell><fo:block>Cust.Nr</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>${uiLabelMap.AccountingCustNr}:</fo:block></fo:table-cell>
<fo:table-cell><fo:block><#if invoice?has_content>${billingParty.partyId}</#if></fo:block></fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell><fo:block>Inv.Nr</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>${uiLabelMap.AccountingInvNr}:</fo:block></fo:table-cell>
<fo:table-cell><fo:block><#if invoice?has_content>${invoice.invoiceId}</#if></fo:block></fo:table-cell>
</fo:table-row>
<fo:table-row>
- <fo:table-cell><fo:block>Descr.</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>${uiLabelMap.AccountingDescr}:</fo:block></fo:table-cell>
<fo:table-cell><fo:block><#if invoice?has_content>${invoice.description?if_exists}</#if></fo:block></fo:table-cell>
</fo:table-row>
<!--fo:table-row>
- <fo:table-cell><fo:block>Status</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>${uiLabelMap.CommonStatus}</fo:block></fo:table-cell>
<fo:table-cell><fo:block font-weight="bold">${invoiceStatus.description}</fo:block></fo:table-cell>
</fo:table-row-->
</fo:table-body>
@@ -115,7 +115,7 @@
<fo:table-body>
<fo:table-row>
<fo:table-cell>
- <fo:block font-size="10pt" font-weight="bold">Order #:</fo:block>
+ <fo:block font-size="10pt" font-weight="bold">${uiLabelMap.AccountingOrderNr}:</fo:block>
</fo:table-cell>
<fo:table-cell>
<fo:block font-size ="10pt" font-weight="bold"><#list orders as order> ${order} </#list></fo:block>
@@ -152,22 +152,22 @@
<fo:table-header height="14px">
<fo:table-row>
<fo:table-cell border-bottom-style="solid" border-bottom-width="thin" border-bottom-color="black">
- <fo:block font-weight="bold">ItemNr</fo:block>
+ <fo:block font-weight="bold">${uiLabelMap.AccountingItemNr}</fo:block>
</fo:table-cell>
<fo:table-cell border-bottom-style="solid" border-bottom-width="thin" border-bottom-color="black">
- <fo:block font-weight="bold">Product</fo:block>
+ <fo:block font-weight="bold">${uiLabelMap.AccountingProduct}</fo:block>
</fo:table-cell>
<fo:table-cell border-bottom-style="solid" border-bottom-width="thin" border-bottom-color="black">
- <fo:block font-weight="bold">Description</fo:block>
+ <fo:block font-weight="bold">${uiLabelMap.CommonDescription}</fo:block>
</fo:table-cell>
<fo:table-cell border-bottom-style="solid" border-bottom-width="thin" border-bottom-color="black">
- <fo:block font-weight="bold" text-align="center">Qty</fo:block>
+ <fo:block font-weight="bold" text-align="center">${uiLabelMap.CommonQty}</fo:block>
</fo:table-cell>
<fo:table-cell border-bottom-style="solid" border-bottom-width="thin" border-bottom-color="black">
- <fo:block font-weight="bold" text-align="center">Unit Price</fo:block>
+ <fo:block font-weight="bold" text-align="center">${uiLabelMap.AccountingUnitPrice}</fo:block>
</fo:table-cell>
<fo:table-cell border-bottom-style="solid" border-bottom-width="thin" border-bottom-color="black">
- <fo:block font-weight="bold" text-align="center">Amount</fo:block>
+ <fo:block font-weight="bold" text-align="center">${uiLabelMap.CommonAmount}</fo:block>
</fo:table-cell>
</fo:table-row>
</fo:table-header>
@@ -239,7 +239,7 @@
<fo:table-cell number-columns-spanned="4">
</fo:table-cell>
<fo:table-cell background-color="#EEEEEE">
- <fo:block font-weight="bold">TOTAL</fo:block>
+ <fo:block font-weight="bold">${uiLabelMap.AccountingTotalCapital}</fo:block>
</fo:table-cell>
<fo:table-cell text-align="right">
<fo:block font-weight="bold"><@ofbizCurrency amount=invoiceTotal isoCode=invoice.currencyUomId?if_exists/></fo:block>
Modified: trunk/applications/accounting/widget/AccountingPrintForms.xml
===================================================================
--- trunk/applications/accounting/widget/AccountingPrintForms.xml 2006-05-15 06:26:00 UTC (rev 7591)
+++ trunk/applications/accounting/widget/AccountingPrintForms.xml 2006-05-15 08:27:44 UTC (rev 7592)
@@ -28,6 +28,10 @@
<actions>
<set field="title" value="Invoice"/>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/editInvoice.bsh"/>
+ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
</actions>
<widgets>
<platform-specific>
More information about the Svn
mailing list