[OFBiz] SVN: r7273 - in trunk/applications/accounting: config webapp/accounting/payment widget
hansbak@svn.ofbiz.org
hansbak at svn.ofbiz.org
Tue Apr 11 01:55:12 CDT 2006
Author: hansbak
Date: 2006-04-11 01:54:40 -0500 (Tue, 11 Apr 2006)
New Revision: 7273
Added:
trunk/applications/accounting/config/AccountingEntityLabels_nl.properties
trunk/applications/accounting/config/AccountingUiLabels_nl.properties
Removed:
trunk/applications/accounting/webapp/accounting/payment/PaymentTabBar.ftl
Modified:
trunk/applications/accounting/config/AccountingUiLabels.properties
trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
trunk/applications/accounting/widget/CommonScreens.xml
trunk/applications/accounting/widget/Menus.xml
trunk/applications/accounting/widget/PaymentScreens.xml
Log:
added some more localization and changed payment tabbar from ftl to xml
Added: trunk/applications/accounting/config/AccountingEntityLabels_nl.properties
===================================================================
--- trunk/applications/accounting/config/AccountingEntityLabels_nl.properties 2006-04-11 04:27:54 UTC (rev 7272)
+++ trunk/applications/accounting/config/AccountingEntityLabels_nl.properties 2006-04-11 06:54:40 UTC (rev 7273)
@@ -0,0 +1,14 @@
+PaymentMethodType.description.CERTIFIED_CHECK=Certificeerde Check
+PaymentMethodType.description.COMPANY_ACCOUNT=Bedrijfsrekening
+PaymentMethodType.description.COMPANY_CHECK=Bedrijfscheck
+PaymentMethodType.description.CREDIT_CARD=Credit Kaart
+PaymentMethodType.description.EFT_ACCOUNT=Bank transfer
+PaymentMethodType.description.EXT_BILLACT=Factuur rekening
+PaymentMethodType.description.EXT_COD=Betaling bij aflevering
+PaymentMethodType.description.EXT_OFFLINE=Offline betaling
+PaymentMethodType.description.EXT_PAYPAL=Paypal
+PaymentMethodType.description.EXT_WORLDPAY=WorldPay
+PaymentMethodType.description.GIFT_CARD=Geschenkcoupon
+PaymentMethodType.description.GIFT_CERTIFICATE=Geschenk certificaat
+PaymentMethodType.description.MONEY_ORDER=Money Order
+PaymentMethodType.description.PERSONAL_CHECK=Persoonlijke Check
Property changes on: trunk/applications/accounting/config/AccountingEntityLabels_nl.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ "Date Rev Author URL Id"
Name: svn:eol-style
+ native
Modified: trunk/applications/accounting/config/AccountingUiLabels.properties
===================================================================
--- trunk/applications/accounting/config/AccountingUiLabels.properties 2006-04-11 04:27:54 UTC (rev 7272)
+++ trunk/applications/accounting/config/AccountingUiLabels.properties 2006-04-11 06:54:40 UTC (rev 7273)
@@ -215,6 +215,12 @@
AccountingPaymentsMenu=Payments
AccountingPaymentsReceived=Payments received
AccountingPaymentsSend=Payments send
+AccountingPaymentTabApplications=Applications
+AccountingPaymentTabHeader=Header
+AccountingPaymentTabOverview=Overview
+AccountingPaymentTabStatusToConfirmed=Status to 'Confirmed'
+AccountingPaymentTabStatusToReceived=Status to 'Received'
+AccountingPaymentTabStatusToSent=Status to 'Sent'
AccountingPaymentType=Payment Type
AccountingPleaseSendPaymentTo=Please Send Payment To
AccountingPreference=Organization Accounting Preferences
Added: trunk/applications/accounting/config/AccountingUiLabels_nl.properties
===================================================================
--- trunk/applications/accounting/config/AccountingUiLabels_nl.properties 2006-04-11 04:27:54 UTC (rev 7272)
+++ trunk/applications/accounting/config/AccountingUiLabels_nl.properties 2006-04-11 06:54:40 UTC (rev 7273)
@@ -0,0 +1,317 @@
+en=Engels
+fr=Frans
+de=Duits
+nl=Nederlands
+
+AccountingPermissionError=Toegangs fout\: Om ${methodShortDescription} te gebruiken moet u de ACCOUNTING${securityAction} of ACCOUNTING_ADMIN permissie bezitten
+
+AcctgGlPartyLabel=GL Partij :
+AcctgGlAcctLabel=GB Rekening :
+AcctgEditGlJournalEntry=Journaalpost
+AcctgAssignGlAccount=Wijs een GB Rekening toe
+AcctgChartOfAcctsTabMenu=Chart of Accounts
+AcctgListGlAcctOrg=List GL Organization
+AcctgNavigateAccts=Navigate Accounts
+AcctgGlFiscalTypeLable=Fiscal Type :
+AcctgGlJrnlDescLabel=Description :
+AcctgGlJrnlIdLabel=GL Journal ID :
+AcctgGlJrnlIdToolTip=Non-editable System ID
+
+ListAccounts=List Gl Accounts
+
+AccountingAccount=Rekening
+AccountingAccountId=Rekening Nr
+AccountingAccountLimit= Limiet
+AccountingAccountId=Rekening Nr
+AccountingAccountLimit=Rekening Limiet
+AccountingAccountNumber=Rekening Number
+AccountingAccountType=Rekening Type
+AccountingAddNewCreditCard=Voeg een nieuwe creditkaart toe.
+AccountingAddNewEftAccount=Voeg een nieuw bankrekening toe
+AccountingAgreement=Overeenkomst
+AccountingAgreementDate=Datum Overeenkomst
+AccountingAgreementId=Overeenkomst Nr
+AccountingAgreementItemSeqId=Overeenkomst Item Nr
+AccountingAgreementItem=Overeenkomst item
+AccountingAgreementItems=Overeenkomst Items
+AccountingAgreementPromoAppls=Promoties
+AccountingAgreementTerms=Overeenkomst voorwaarden
+AccountingAgreementTermId=Overeenkomst Voorw. Nr
+AccountingAgreementTypeId=Overeenkomst Type Nr
+AccountingAgreements=Overeenkomsten
+AccountingAmount=Saldo
+AccountingAmountApplied=Toe te wijzen waarde
+AccountingAnyInvoiceStatus=Elke status
+AccountingAnyPaymentMethod=Elke betaalmethode
+AccountingAnyPaymentStatus=Elke betaalstatus
+AccountingApplications=Toewijzingen
+AccountingApplyToInvoiceItems=Wijs aan faktuur items toe
+AccountingAssets=Activa
+AccountingAuthorize=Machtig
+AccountingBalanceSheet=Balance table
+AccountingBankName=Bank Naam
+AccountingBilling=Facturatie
+AccountingBillingAccount=Factuur rekng
+AccountingBillingAccountId=Fact.Reken.Nr
+AccountingBillingAccountInvoices=Facturen voor factuurrekening
+AccountingBillingAccountOnly=Betaal alleen op rekening
+AccountingBillingAccountPayments=Rekening betalingen
+AccountingBillingAccounts=Factuur rekening
+AccountingBillingAcct=Fact.Rekg.
+AccountingBillingAddress=Factuur adres
+AccountingBillingContactMechId=Factuur Mechanisme
+AccountingBillingInformation=Factuur informatie
+AccountingBillingMenu=Factuur Rekening
+AccountingBillUpTo=Fact. maximaal
+AccountingCapture=Opvangen
+AccountingCardNumber=Kaart nummer
+AccountingCardType=Kaart type
+AccountingChartOfAcctsMenu=Rekeningposten
+AccountingComments=Opmerkingen
+AccountingCompanyName=OFBiz: Boekhouding
+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
+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
+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
+AccountingCreateNewCreditCard=Nieuwe Credit kaart aanmaken
+AccountingCreateNewEftAccount=Nieuwe Bank account aanmaken
+AccountingCreatePayment=Maak een nieuwe betaling aan
+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
+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
+AccountingDueDate=Uiterste datum
+AccountingEditPayment=Wijzig betaling
+AccountingEffective=Effectief
+AccountingEffectiveDate=Effectieve Datum
+AccountingEFTAccount=Bank rekening
+AccountingEmptyForMaxAmount=Leeg laten voor de maximale waarde
+AccountingEquities=Equities
+AccountingExpirationDate=Verval Datum
+AccountingFindInvoices=Zoek facturen
+AccountingFindPayments=Zoek betalingen
+AccountingFirstNameCard=Voornaam op de kaart
+AccountingFixedAsset=Inventaris
+AccountingFixedAssetCalendar=Kalender
+AccountingFixedAssetEdit=Aanmaken/veranderen inventaris
+AccountingFixedAssetId=Inventaris nr.
+AccountingFixedAssetName=Inventaris naam
+AccountingFixedAssetParent=Inventaris group
+AccountingFixedAssetParties=Partij Rollen
+AccountingFixedAssetProductNew=Wijs een nieuw product aan een inventaris nr toe
+AccountingFixedAssetProductType=Inventaris produkt type
+AccountingFixedAssetProducts=Produkten
+AccountingFixedAssetProductTypeId=Gebruikstype
+AccountingFixedAssetRollUp=RollUp
+AccountingFixedAssetStdCostTypeId=Standaard kosten type
+AccountingFixedAssetStdCosts=Standaard kosten
+AccountingFixedAssetTypeId=Inventaris type
+AccountingFixedAssets=Inventaris
+AccountingFixedAssetIdents=Inventaris nummers
+AccountingFromParty=Vanaf partij
+AccountingFromPartyId=Vanaf partij Nr
+AccountingFX=Vreemde Wissel Valuta
+AccountingGatewayResponse=Gateway antwoord
+AccountingGatewayResponses=Gateway antwoorden
+AccountingGlAcc=Grootboek Nr
+AccountingGlAccs=GB Rekeningen
+AccountingGlAccount=GB Rekening
+AccountingGlAccounts=GB Rekeningen
+AccountingGlAccountClass=GB reking klasse
+AccountingGlAccountId=GB Rekeningen
+AccountingHideFields=Verberg velden
+AccountingIgnoreInvoiceItems=Wijs toe aan de gehele factuur
+AccountingIncomeStatement=Inkomen
+AccountingInformation=Informatie
+AccountingInvoice=Faktuur
+AccountingInvoiceDate=Factuur Datum
+AccountingInvoiceHeader=Faktuur Algm
+AccountingInvoiceID=Faktuur Nr.
+AccountingInvoiceItem=Factuur item
+AccountingInvoiceItemSeqId=Item Nr
+AccountingInvoiceItems=Items
+AccountingInvoiceOverview=Overzicht
+AccountingInvoicePayments=Betalingen
+AccountingInvoicePDF=PDF
+AccountingInvoiceRoles=Rollen
+AccountingInvoiceStatus=Status
+AccountingInvoiceStatusToApproved=Status naar 'Goedgekeurd'
+AccountingInvoiceStatusToCancelled=Status naar 'Geannuleerd'
+AccountingInvoiceStatusToInProcess=Status naar 'In Process'
+AccountingInvoiceStatusToPaid=Status naar 'Voldaan'
+AccountingInvoiceStatusToReady=Status naar 'Gereed'
+AccountingInvoiceStatusToReceived=Status naar 'Ontvangen'
+AccountingInvoiceStatusToSent=Status naar 'Gestuurd'
+AccountingInvoiceStatusToWriteoff=Status naar 'Afgeschreven'
+AccountingInvoiceTotal=Faktuur totaal
+AccountingInvoices=Fakturen
+AccountingInvoicesFound=Facturen gevonden
+AccountingInvoicesMenu=Fakturen
+AccountingLastNameCard=Achternaam op de kaart
+AccountingLiabilities=Lasten
+AccountingLineTotal=Lijn totaal
+AccountingLookupInvoices=Ffacturen opzoeken
+AccountingLookupPayment=Betalingen opzoeken
+AccountingMainMenu=Begin
+AccountingMainPage=Boekhouding begin pagina
+AccountingMainPageNote=Welkom op de boekhouding pagina
+AccountingManagerApplication=Boekhoudinge toepassing
+AccountingManualJournalEntry=Manuele Journaal post
+AccountingManualPostTrans=Manuee posten
+AccountingManualTransaction=Manuele Transactie
+AccountingMethod=Methode
+AccountingMiddleNameCard=tussen naam op de kaart
+AccountingNameAccount=Naam genoemd op de rekening
+AccountingNetIncome=Netto inkomen
+AccountingNewAccount=Nieuwe rekening
+AccountingNewAgreement=Overeenkomst aanmaken
+AccountingNewAgreementItem=Overeenkomstregel aanmaken
+AccountingNewAgreementPromoAppl=Nieuw promotie toepassen
+AccountingNewAgreementTerm=Aanmaken van een nieuwe overeenkomstregel
+AccountingNewFixedAsset=Nieuwe inventaris nr
+AccountingNewFixedAssetStdCost=Nieuwe standaard kostepost
+AccountingNewPayment=Nieuwe betaling
+AccountingNewTaxAuthority=Nieuwe Belasting Instantie
+AccountingNewTaxAuthorityPartyInfo=Nieuwe Belasting Instantie party info
+AccountingNoAccount=Geen Rekening
+AccountingNoBillingAccount=Geen faktuur rekening
+AccountingNoBillingAccountFound=Geen faktuur rekening gevonden
+AccountingNoBillingAccountRole=Er bestaan geen factuur rekening rollen
+AccountingNoBillingAccountTerm=Er bestaan geen faktuurrekening voorwaarden
+AccountingNocontactinformationset=Geen kontakt informatie bekend
+AccountingNocurrentinvoicelineitems=Geen faktuur regels aanwezig
+AccountingNoInvoicesFound=Geen fakturen gevonden
+AccountingNoPaymentMethods=Geen betalingsmethoden bekend
+AccountingNoPaymentsfound=Geen betalingen gevonden
+AccountingOfflinePayment=offline betaling
+AccountingOrders=Orders
+AccountingPaidDate=Betaal datum
+AccountingPartyIdFrom=Van Partij Nr
+AccountingPartyIdTo=Naar Partij Nr
+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
+AccountingPaymentDate=Betalingsdatum
+AccountingPaymentID=Betalings Nr
+AccountingPaymentIdTo=BetalingsNr om toe te wijzen
+AccountingPaymentInformation=Betaling informatie
+AccountingPaymentMethodId=Betalingmethode
+AccountingPaymentMethodType=Type betalingmethode
+AccountingPaymentPreferenceId=Betaling voorkeursnummer
+AccountingPayments=Betalingen
+AccountingPaymentsFound=Betaling(en) gevonden
+AccountingPaymentsMenu=Betalingen
+AccountingPaymentsReceived=Betalingen ontvangen
+AccountingPaymentsSend=Betalinge gestuurd
+AccountingPaymentTabApplications=Toewijzingen
+AccountingPaymentTabHeader=Betaling
+AccountingPaymentTabOverview=Overzicht
+AccountingPaymentTabStatusToCancelled=Status naar 'Geannuleerd'
+AccountingPaymentTabStatusToConfirmed=Status naar 'Bevestigd'
+AccountingPaymentTabStatusToReceived=Status naar 'Ontvangen'
+AccountingPaymentTabStatusToSent=Status naar 'Verstuurd'
+AccountingPaymentType=Betalingstype
+AccountingPleaseSendPaymentTo=Stuur betaling naar
+AccountingPreference=Organisatie boekhoud voorkeuren
+AccountingPrefixCard=Prefix op de kaart
+AccountingPrintAsCheck=Druk als een check af
+AccountingPrintChecks=Checks om af te drukken
+AccountingPrintChecksPermissionError=Toegangsfout: om checks af te drukken is de ACCOUNTING_PRINT_CHECKS permissie nodig
+AccountingProduct=Produkt
+AccountingProductId=Produkt Nr
+AccountingReceivePayment=Ontvang betaling
+AccountingReferenceNumber=Referentie nummer
+AccountingReports=Reporten
+AccountingRoleType=Rol Type
+AccountingRoleTypeIdFrom=Van Rol Type Nr
+AccountingRoleTypeIdTo=Naar Rol Type Nr
+AccountingRoutingNumber=Routing Nummer
+AccountingSendChecks=Markeer Checks die zijn gestuurd
+AccountingSuffixCard=Achtervoegsel op de kaart
+AccountingTaxAuthorities=Belasting Instanties
+AccountingTaxAuthority=Belasting Instantie
+AccountingtaxAuthGeoId=Belasting instantie gebieds Nr
+AccountingTaxSummary=Belasting overzichts rapport
+AccountingTermTypeId=Vorwaarde type Nr
+AccountingTextData=Tekst Data
+AccountingThruDate=Tot Datum
+AccountingTitleTransfer=Eigedomsoverdracht
+AccountingTransactions=Transacties
+AccountingTrialBalance=Test Balans
+AccountingToParty=Naar partij
+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
+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.
+AccountingViewPermissionError=U hebt hebt geen toeganing to deze pagina. ("ACCOUNTING_VIEW" of "ACCOUNTING_ADMIN" vereist)
+AccountingFX=Vreemde valuta omrekening
+
+
+AccountingFixedAssetIdents=Inventaris indentificatie
+AccountingNewFixedAssetIdents=Maak een inventaris identificatie aan
+AccountingNewFixedAssetIdentsType=Maak een inventaris identificatie type aan
+AccountingFixedAssetIdentTypeId=Inventaris identificatie type nr
+AccountingFixedAssetIdentIdValue=Waarde
+
+PageTitleEditBillingAccount=Aanpassen factuur rekening
+PageTitleEditBillingAccountInvoices=Aanpassen faktuur rekening fakturen
+PageTitleEditBillingAccountPayments=Aanpassen faktuur rekening betalingen
+PageTitleEditBillingAccountRoles=Aanpassen faktuur rekening rollen
+PageTitleEditBillingAccountTerms=Aanpassen faktuur rekening voorwaarden
+PageTitleEditFixedAssetStdCost=Aanpassen faktuur rekening vaste kosten
+PageTitleEditGlAccount=Grootboekrekening aanpassen
+PageTitleEditGlobalGlAccount=Globale Grootboekrekening aanpassen
+PageTitleFindBillingAccount=Zoek faktuurrekening(en)
+PageTitleFindGlobalGlAccount=Zoek globaal GB rekening
+PageTitleListFixedAssetStdCosts=Lijst van inventaris vaste kosten
+PageTitleLogin=Aanloggen
+PageTitleLookupFixedAsset=Inventaris item opzoeken
+PageTitleLookupProduct=Produkt opzoeken
+PageTitleMain=Hoofdpagina
+
+PageTitleFindTaxAuthority=Zoek belastingsinstantie
+PageTitleEditTaxAuthority=Aanpassen belastingsinstantie
+PageTitleEditTaxAuthorityCategories=Aanpassen belasting instantie Produkt categorieën
+PageTitleAddTaxAuthorityCategory=Nieuwe belastinginstantie Produkt categorie
+PageTitleEditTaxAuthorityAssocs=Aanpassen belastingsinstantie verenigingen
+PageTitleAddTaxAuthorityAssoc=Nieuwe belastingsinstantie vereniging
+PageTitleEditTaxAuthorityGlAccounts=Aanpassen belastingsinstantie grootboek rekening
+PageTitleAddTaxAuthorityGlAccount=Nieuw belastingsinstantie grootboek rekening
+PageTitleEditTaxAuthorityRateProducts=Aanpassen Belastingsinstantie produkt tarief
+PageTitleAddTaxAuthorityRateProduct=Nieuw Belastingsinstantie produkt tarief
+PageTitleListTaxAuthorityParties=Lijst van Belastingsinstantie partijen
+PageTitleEditTaxAuthorityPartyInfo=Aanpassen van Belastingsinstantie partij informatie
+
+PartyPartyId=Partij Nr
+PartyRoles=Rollen
+PartyRoleTypeId=RolType Nr
+PartyTerms=Voorwaarden
+PartyTerm=Voorwaarde
+PartyTermType=Voorwaarde type
+PartyTermValue=Voorwaarde hoevelheid
+
+Organization=Organisatie
+FromTimePeriod=Vanaf
+ThruTimePeriod=Tot
+GlFiscalType=Fiscaal Type
+isClosed=GESLOTED
+isNotClosed=NIET GESLOTEN
+TimePeriod=Tijdsperiode
+ByTimePeriod=Voor de tijdsperiode
+ByDate=op datum
+AsOf=vanaf
+
+PaymentHeader_statusId=Status_nl
Property changes on: trunk/applications/accounting/config/AccountingUiLabels_nl.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ "Date Rev Author URL Id"
Name: svn:eol-style
+ native
Modified: trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml 2006-04-11 04:27:54 UTC (rev 7272)
+++ trunk/applications/accounting/webapp/accounting/payment/PaymentForms.xml 2006-04-11 06:54:40 UTC (rev 7273)
@@ -141,7 +141,7 @@
<form name="editPaymentApplications" default-title-style="tableheadtext" default-entity-name="PaymentApplication"
default-tooltip-style="tabletext" default-widget-style="tabletext"
- target="updatePaymentApplication" title="List payment Applications" type="list" separate-columns="true">
+ target="updatePaymentApplication" title="List payment Applications" type="list" separate-columns="false">
<actions>
<entity-condition entity-name="PaymentApplication">
<condition-list combine="or">
@@ -200,7 +200,7 @@
</form>
<form name="listPaymentsNotApplied" type="list" list-name="payments"
- target="updatePaymentApplication" title=""
+ target="updatePaymentApplication" title=""
default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext">
<actions>
<script location="component://accounting/webapp/accounting/WEB-INF/actions/payment/listNotAppliedPayments.bsh"/>
Deleted: trunk/applications/accounting/webapp/accounting/payment/PaymentTabBar.ftl
===================================================================
--- trunk/applications/accounting/webapp/accounting/payment/PaymentTabBar.ftl 2006-04-11 04:27:54 UTC (rev 7272)
+++ trunk/applications/accounting/webapp/accounting/payment/PaymentTabBar.ftl 2006-04-11 06:54:40 UTC (rev 7273)
@@ -1,56 +0,0 @@
-<#--
-$Id: $
-
-Copyright 2001-2006 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License"); you may not
-use this file except in compliance with the License. You may obtain a copy of
-the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
-under the License.
--->
-<#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if>
-<#assign unselectedClassName = "tabButton">
-<#assign selectedClassMap = {page.tabButtonItem?default("void") : "tabButtonSelected"}>
-
-<div class="tabContainer">
- <a href="<@ofbizUrl>paymentOverview?paymentId=${payment.paymentId}</@ofbizUrl>" class="${selectedClassMap.paymentOverview?default(unselectedClassName)}">Overview</a>
- <#-- Payments that are a matter of internal record keeping do not have statusId, so we check that first -->
- <#if payment.statusId?exists>
- <#if payment.statusId == "PMNT_NOT_PAID">
- <a href="<@ofbizUrl>editPayment?paymentId=${payment.paymentId}</@ofbizUrl>" class="${selectedClassMap.editPayment?default(unselectedClassName)}">Header</a>
- </#if>
- <#if payment.statusId == "PMNT_RECEIVED" || payment.statusId == "PMNT_SENT" || payment.statusId == "PMNT_NOT_PAID">
- <a href="<@ofbizUrl>editPaymentApplications?paymentId=${payment.paymentId}</@ofbizUrl>" class="${selectedClassMap.editPaymentApplications?default(unselectedClassName)}">Applications</a>
- </#if>
- <!--a href="<@ofbizUrl>payment.pdf?paymentId=${payment.paymentId}</@ofbizUrl>" class="${unselectedClassName}">${uiLabelMap.AccountingpaymentPDF}</a-->
- </#if>
-</div>
-<div>
-<a href="<@ofbizUrl>editPayment</@ofbizUrl>" class="buttontext">Create new Payment</a>
-<#-- Payments that are a matter of internal record keeping do not have statusId, so we check that first -->
-<#if payment.statusId?exists>
-<#if payment.statusId == "PMNT_NOT_PAID">
-<!-- the SENT status is only for disbursements -->
- <#if Static['org.ofbiz.accounting.util.UtilAccounting'].isDisbursement(payment)>
- <a href="<@ofbizUrl>setPaymentStatus?paymentId=${payment.paymentId}&statusId=PMNT_SENT</@ofbizUrl>" class="buttontext">Status to Sent</a>
- <#else>
-<!-- other payments (ie, receipts) can only be marked RECEIVED, not SENT -->
- <a href="<@ofbizUrl>setPaymentStatus?paymentId=${payment.paymentId}&statusId=PMNT_RECEIVED</@ofbizUrl>" class="buttontext">Status to Received</a>
- </#if>
-</#if>
-<#if payment.statusId == "PMNT_SENT" || payment.statusId == "PMNT_RECEIVED">
- <a href="<@ofbizUrl>setPaymentStatus?paymentId=${payment.paymentId}&statusId=PMNT_CONFIRMED</@ofbizUrl>" class="buttontext">Status to Confirm</a>
-</#if>
-<#if payment.statusId == "PMNT_NOT_PAID">
- <a href="javascript:confirmActionLink('You want to cancel this payment number ${payment.paymentId}?','setPaymentStatus?paymentId=${payment.paymentId}&statusId=PMNT_CANCELLED')" class="buttontext">Status to 'Cancelled'</a>
-</#if>
-</#if>
-</div>
-<br/>
Modified: trunk/applications/accounting/widget/CommonScreens.xml
===================================================================
--- trunk/applications/accounting/widget/CommonScreens.xml 2006-04-11 04:27:54 UTC (rev 7272)
+++ trunk/applications/accounting/widget/CommonScreens.xml 2006-04-11 06:54:40 UTC (rev 7273)
@@ -125,15 +125,9 @@
<if-has-permission permission="ACCOUNTING" action="_VIEW"/>
</condition>
<widgets>
- <section>
- <condition><not><if-empty field-name="paymentId"/></not></condition>
- <widgets>
- <platform-specific>
- <html><html-template location="component://accounting/webapp/accounting/payment/PaymentTabBar.ftl"/></html>
- </platform-specific>
- <label style="head1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonId}:${paymentId} ${${extraFunctionName}}</label>
- </widgets>
- </section>
+ <include-menu name="PaymentTabBar" location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="PaymentSubTabBar" location="component://accounting/widget/Menus.xml"/>
+ <label style="head1">${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonId}:${paymentId} ${${extraFunctionName}}</label>
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
Modified: trunk/applications/accounting/widget/Menus.xml
===================================================================
--- trunk/applications/accounting/widget/Menus.xml 2006-04-11 04:27:54 UTC (rev 7272)
+++ trunk/applications/accounting/widget/Menus.xml 2006-04-11 06:54:40 UTC (rev 7273)
@@ -223,6 +223,102 @@
</menu-item>
</menu>
+
+ <menu name="PaymentTabBar" default-menu-item-name="overview">
+ <menu-item name="paymentOverview" title="${uiLabelMap.AccountingPaymentTabOverview}">
+ <condition>
+ <not><if-empty field-name="payment.paymentId"/></not>
+ </condition>
+ <link target="paymentOverview?paymentId=${payment.paymentId}"/>
+ </menu-item>
+
+ <menu-item name="editPayment" title="${uiLabelMap.AccountingPaymentTabHeader}">
+ <condition>
+ <and>
+ <not><if-empty field-name="payment.paymentId"/></not>
+ <or>
+ <if-compare field-name="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
+ </or>
+ </and>
+ </condition>
+ <link target="editPayment?paymentId=${payment.paymentId}"/>
+ </menu-item>
+ <menu-item name="editPaymentApplications" title="${uiLabelMap.AccountingPaymentTabApplications}">
+ <condition>
+ <and>
+ <not><if-empty field-name="payment.paymentId"/></not>
+ <or>
+ <if-compare field-name="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
+ <if-compare field-name="payment.statusId" operator="equals" value="PMNT_RECEIVED"/>
+ <if-compare field-name="payment.statusId" operator="equals" value="PMNT_SENT"/>
+ </or>
+ </and>
+ </condition>
+ <link target="editPaymentApplications?paymentId=${payment.paymentId}"/>
+ </menu-item>
+ </menu>
+
+ <menu name="PaymentSubTabBar" default-title-style="buttontext">
+ <actions>
+ <set field="isDisbursement" value="${bsh:org.ofbiz.accounting.util.UtilAccounting.isDisbursement(payment)}"/>
+ </actions>
+ <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}">
+ <condition>
+ <not><if-empty field-name="payment.paymentId"/></not>
+ </condition>
+ <link target="editPayment"/>
+ </menu-item>
+ <menu-item name="statusToSend" title="${uiLabelMap.AccountingPaymentTabStatusToSent}">
+ <condition>
+ <and>
+ <not><if-empty field-name="payment.paymentId"/></not>
+ <if-compare field-name="isDisbursement" operator="equals" value="true"/>
+ <if-compare field-name="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
+ </and>
+ </condition>
+ <link target="setPaymentStatus?paymentId=${payment.paymentId}&statusId=PMNT_SENT"/>
+ </menu-item>
+ <menu-item name="statusToReceived" title="${uiLabelMap.AccountingPaymentTabStatusToReceived}">
+ <condition>
+ <and>
+ <not><if-empty field-name="payment.paymentId"/></not>
+ <if-compare field-name="isDisbursement" operator="equals" value="false"/>
+ <if-compare field-name="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
+ </and>
+ </condition>
+ <link target="setPaymentStatus?paymentId=${payment.paymentId}&statusId=PMNT_RECEIVED"/>
+ </menu-item>
+ <menu-item name="statusToCancelled" title="${uiLabelMap.AccountingPaymentTabStatusToCancelled}">
+ <condition>
+ <and>
+ <not><if-empty field-name="payment.paymentId"/></not>
+ <if-compare field-name="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
+ </and>
+ </condition>
+ <link target="javascript:confirmActionLink('You want to cancel this payment number ${payment.paymentId}?','setPaymentStatus?paymentId=${payment.paymentId}&statusId=PMNT_CANCELLED')" url-mode="plain"/>
+ </menu-item>
+ <menu-item name="statusToConfirmed" title="${uiLabelMap.AccountingPaymentTabStatusToConfirmed}">
+ <condition>
+ <and>
+ <not><if-empty field-name="payment.paymentId"/></not>
+ <or>
+ <if-compare field-name="payment.statusId" operator="equals" value="PMNT_RECEIVED"/>
+ <if-compare field-name="payment.statusId" operator="equals" value="PMNT_SENT"/>
+ </or>
+ </and>
+ </condition>
+ <link target="editPaymentApplications?paymentId=${payment.paymentId}"/>
+ </menu-item>
+ <menu-item name="printAsCheck" title="${uiLabelMap.AccountingPrintAsCheck}">
+ <condition>
+ <and>
+ <not><if-empty field-name="payment.paymentId"/></not>
+ <if-compare field-name="payment.statusId" operator="equals" value="PMNT_NOT_PAID"/>
+ </and>
+ </condition>
+ <link target="printChecks.pdf?paymentId=${payment.paymentId}"/>
+ </menu-item>
+ </menu>
</menus>
\ No newline at end of file
Modified: trunk/applications/accounting/widget/PaymentScreens.xml
===================================================================
--- trunk/applications/accounting/widget/PaymentScreens.xml 2006-04-11 04:27:54 UTC (rev 7272)
+++ trunk/applications/accounting/widget/PaymentScreens.xml 2006-04-11 06:54:40 UTC (rev 7273)
@@ -120,7 +120,6 @@
<container>
<label style="head1"> Header detailed information</label>
<link target="editPayment?paymentId=${paymentId}" text="${uiLabelMap.CommonUpdate}" style="buttontext"/>
- <link target="printChecks.pdf?paymentId=${paymentId}" text="${uiLabelMap.AccountingPrintAsCheck}" style="buttontext"/>
<include-form name="paymentHeader" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
</container>
<container>
@@ -136,7 +135,6 @@
<fail-widgets>
<container>
<label style="head1">Header Detailed Information</label>
- <link target="printChecks.pdf?paymentId=${paymentId}" text="${uiLabelMap.AccountingPrintAsCheck}" style="buttontext"/>
<include-form name="paymentHeader" location="component://accounting/webapp/accounting/payment/PaymentForms.xml"/>
</container>
<container>
More information about the Svn
mailing list