Author: buscob
Date: Thu Oct 22 21:17:14 2009
New Revision: 828855
URL: http://svn.apache.org/viewvc?rev=828855&view=rev
Log:
Part of OFBIZ-3067 - Menus and form widget files location
Accounting component
Renamed accounting/widget/Menus.xml to accounting/widget/AccountingMenus.xml
Renamed accounting/widget/ap/Menus.xml to accounting/widget/ap/ApMenus.xml
Added:
ofbiz/trunk/applications/accounting/widget/AgreementMenus.xml
- copied unchanged from r828854,
ofbiz/trunk/applications/accounting/widget/Menus.xml
ofbiz/trunk/applications/accounting/widget/ap/ApMenus.xml
Removed:
ofbiz/trunk/applications/accounting/widget/Menus.xml
ofbiz/trunk/applications/accounting/widget/ap/Menus.xml
Modified:
ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
ofbiz/trunk/applications/accounting/widget/GlScreens.xml
ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=828855&r1=828854&r2=828855&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Thu Oct 22
21:17:14 2009
@@ -41,13 +41,13 @@
<not><if-empty
field="agreement"/></not>
</condition>
<widgets>
- <include-menu name="AgreementTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="AgreementTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<section>
<condition>
<not><if-empty
field="agreementItem"/></not>
</condition>
<widgets>
- <include-menu
name="AgreementItemTabBar" location="component://accounting/widget/Menus.xml"/>
+ <include-menu
name="AgreementItemTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
</widgets>
</section>
<container>
Modified: ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml?rev=828855&r1=828854&r2=828855&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/BillingAccountScreens.xml Thu
Oct 22 21:17:14 2009
@@ -38,7 +38,7 @@
<not><if-empty
field="billingAccount"/></not>
</condition>
<widgets>
- <include-menu
name="BillingAccountTabBar" location="component://accounting/widget/Menus.xml"/>
+ <include-menu
name="BillingAccountTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
</widgets>
</section>
<decorator-section-include name="body"/>
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=828855&r1=828854&r2=828855&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Thu Oct 22
21:17:14 2009
@@ -40,7 +40,7 @@
<!--<set field="layoutSettings.headerImageUrl"
value="/images/ofbiz_logo.gif" global="true"/>-->
<set field="activeApp" value="accounting" global="true"/>
<set field="applicationMenuName" value="AccountingAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://accounting/widget/Menus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="component://accounting/widget/AccountingMenus.xml" global="true"/>
<set field="applicationTitle"
value="${uiLabelMap.AccountingManagerApplication}" global="true"/>
</actions>
<widgets>
@@ -70,7 +70,7 @@
</and>
</condition>
<widgets>
- <include-menu name="PaymentGroupTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="PaymentGroupTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
</widgets>
</section>
</decorator-section>
@@ -86,7 +86,7 @@
<not><if-empty
field="paymentGroup"/></not>
</condition>
<widgets>
- <include-menu
name="PaymentGroupSubTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu
name="PaymentGroupSubTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<container
style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor}
${paymenGroup.paymentGroupName} [${paymentGroupId}]</label></container>
</widgets>
<fail-widgets>
@@ -119,7 +119,7 @@
<not><if-empty
field="organizationPartyId"/></not>
</condition>
<widgets>
- <include-menu name="PartyTopTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="PartyTopTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<decorator-section-include name="body"/>
</widgets>
</section>
@@ -140,8 +140,8 @@
<widgets>
<decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="OrganizationAccountingTabBar"
location="component://accounting/widget/Menus.xml"/>
- <include-menu
name="OrganizationAccountingReportsTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="OrganizationAccountingTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
+ <include-menu
name="OrganizationAccountingReportsTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<container>
<label
style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${currentOrganization.groupName} [${organizationPartyId}]</label>
</container>
@@ -163,8 +163,8 @@
<widgets>
<decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="OrganizationAccountingTabBar"
location="component://accounting/widget/Menus.xml"/>
- <include-menu name="PartyAccountingChecksTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="OrganizationAccountingTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
+ <include-menu name="PartyAccountingChecksTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<container>
<label style="h1">${uiLabelMap.CommonFor}:
${currentOrganization.groupName} [${organizationPartyId}]</label>
</container>
@@ -228,7 +228,7 @@
<section>
<widgets>
<container>
- <include-menu name="GlobalGLSettingMenus"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="GlobalGLSettingMenus"
location="component://accounting/widget/AccountingMenus.xml"/>
</container>
</widgets>
</section>
Modified: ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml?rev=828855&r1=828854&r2=828855&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountScreens.xml Thu Oct 22
21:17:14 2009
@@ -40,10 +40,10 @@
<section>
<condition><not><if-empty
field="finAccountId"/></not></condition>
<widgets>
- <include-menu name="FinAccountTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="FinAccountTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
</widgets>
<fail-widgets>
- <include-menu
name="FinAccountMainTabBar" location="component://accounting/widget/Menus.xml"/>
+ <include-menu
name="FinAccountMainTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
</fail-widgets>
</section>
</widgets>
@@ -75,7 +75,7 @@
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
<container style="button-bar">
- <include-menu
name="FinAccountSubTabBar" location="component://accounting/widget/Menus.xml"/>
+ <include-menu
name="FinAccountSubTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
</container>
</decorator-section>
<decorator-section name="search-options">
Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=828855&r1=828854&r2=828855&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Thu Oct 22
21:17:14 2009
@@ -86,7 +86,7 @@
<not><if-empty field="fixedAssetId"/></not>
</condition>
<widgets>
- <include-menu name="FixedAssetTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="FixedAssetTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
</widgets>
</section>
<decorator-section-include name="pre-body"/>
@@ -328,7 +328,7 @@
<section>
<condition><not><if-empty
field="maintHistSeqId"/></not></condition>
<widgets>
- <include-menu name="FixedAssetMaintTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="FixedAssetMaintTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=828855&r1=828854&r2=828855&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Thu Oct 22
21:17:14 2009
@@ -32,7 +32,7 @@
<widgets>
<decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="OrganizationAccountingTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="OrganizationAccountingTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<container>
<label
style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${currentOrganization.groupName} [${organizationPartyId}]</label>
</container>
@@ -60,7 +60,7 @@
<section>
<widgets>
<screenlet
title="${uiLabelMap.AccountingPartyAccountsSummary}">
- <include-menu
location="component://accounting/widget/Menus.xml" name="PartyGlShortCuts"/>
+ <include-menu
location="component://accounting/widget/AccountingMenus.xml"
name="PartyGlShortCuts"/>
</screenlet>
</widgets>
</section>
@@ -301,7 +301,7 @@
<not><if-empty field="acctgTransId"/></not>
</condition>
<widgets>
- <include-menu
location="component://accounting/widget/Menus.xml"
name="EditGlAcctgTransSubTabBar"/>
+ <include-menu
location="component://accounting/widget/AccountingMenus.xml"
name="EditGlAcctgTransSubTabBar"/>
<section>
<condition>
<if-compare
field="acctgTrans.isPosted" operator="equals" value="Y"/>
Modified: ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml?rev=828855&r1=828854&r2=828855&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlSetupScreens.xml Thu Oct 22
21:17:14 2009
@@ -32,13 +32,13 @@
<widgets>
<decorator-screen name="CommonPartyDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="PartyAdminTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="PartyAdminTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<section>
<condition>
<if-compare field="tabButtonItem"
operator="equals" value="GlAccountAssignment"/>
</condition>
<widgets>
- <include-menu name="PartyAdminAssignTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="PartyAdminAssignTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
</widgets>
</section>
<container>
@@ -599,7 +599,7 @@
</condition>
<widgets>
<container
style="h1"><label>${uiLabelMap.FormFieldTitle_editGlAccountCategory}</label></container>
- <include-menu name="GlAccountCategoryTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="GlAccountCategoryTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
</widgets>
<fail-widgets>
<container
style="h1"><label>${uiLabelMap.FormFieldTitle_newGlAccountCategory}</label></container>
@@ -625,7 +625,7 @@
<decorator-section name="body">
<screenlet>
<container
style="h1"><label>${uiLabelMap.FormFieldTitle_editGlAccountCategoryMember}</label></container>
- <include-menu name="GlAccountCategoryTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="GlAccountCategoryTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<include-form name="ListGlAccountCategoryMember"
location="component://accounting/widget/GlSetupForms.xml"/>
<include-form name="AddGlAccountCategoryMember"
location="component://accounting/widget/GlSetupForms.xml"/>
</screenlet>
Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml?rev=828855&r1=828854&r2=828855&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsScreens.xml Thu
Oct 22 21:17:14 2009
@@ -34,7 +34,7 @@
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="GlAccountTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="GlAccountTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<container>
<!-- label style="h1">List Accounts</label
-->
@@ -71,7 +71,7 @@
<if-has-permission permission="CATALOG"
action="_VIEW"/>
</condition -->
<widgets>
- <include-menu name="GlAccountTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="GlAccountTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<container>
<label
style="h1">${uiLabelMap[labelTitleProperty]} ${product.internalName}
[${uiLabelMap.CommonId}:${productId}]</label>
@@ -106,7 +106,7 @@
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="GlSettingTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="GlSettingTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
</widgets>
</section>
<screenlet title="${uiLabelMap.AcctgAssignGlAccount}">
@@ -139,11 +139,11 @@
<section>
<widgets>
<container>
- <include-menu name="GlobalGLSettingMenus"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="GlobalGLSettingMenus"
location="component://accounting/widget/AccountingMenus.xml"/>
</container>
</widgets>
</section>
- <include-menu name="GlSettingTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="GlSettingTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<screenlet title="${uiLabelMap.AcctgNavigateAccts}">
<include-tree name="GlAccountTree"
location="component://accounting/widget/AccountingTrees.xml"/>
</screenlet>
@@ -195,7 +195,7 @@
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="GlAccountTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="GlAccountTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<screenlet
title="${uiLabelMap.PageTitleViewAccountingTransaction}">
<include-tree name="GlAccountTree"
location="component://accounting/widget/AccountingTrees.xml"/>
</screenlet>
@@ -248,7 +248,7 @@
<widgets>
<decorator-screen name="GlobalGLSettingsDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <include-menu name="GlSettingTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="GlSettingTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<screenlet title="${uiLabelMap[labelTitleProperty]}">
<container style="button-bar">
<link target="ListGlAccountsReport"
text="${uiLabelMap.CommonPrint}" style="buttontext"/>
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=828855&r1=828854&r2=828855&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Thu Oct 22
21:17:14 2009
@@ -40,8 +40,8 @@
<section>
<condition><not><if-empty
field="parameters.invoiceId"/></not></condition>
<widgets>
- <include-menu name="InvoiceTabBar"
location="component://accounting/widget/Menus.xml"/>
- <include-menu name="InvoiceSubTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="InvoiceTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
+ <include-menu name="InvoiceSubTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<container style="leftclear">
<label style="h1"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${invoice.description} [${invoiceId}] ${${extraFunctionName}}"/>
</container>
@@ -73,7 +73,7 @@
<widgets>
<decorator-screen name="FindScreenDecorator"
location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
- <include-menu name="InvoiceSubTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="InvoiceSubTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<container style="clear"/>
</decorator-section>
<decorator-section name="search-options">
Modified:
ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml?rev=828855&r1=828854&r2=828855&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
(original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentGatewayConfigScreens.xml
Thu Oct 22 21:17:14 2009
@@ -33,7 +33,7 @@
<decorator-section name="body">
<section>
<widgets>
- <include-menu
name="PaymentGatewayConfigTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu
name="PaymentGatewayConfigTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<container>
<label
style="h1">${uiLabelMap[labelTitleProperty]}</label>
</container>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=828855&r1=828854&r2=828855&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Thu Oct 22
21:17:14 2009
@@ -35,8 +35,8 @@
<if-has-permission permission="ACCOUNTING"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu name="PaymentTabBar"
location="component://accounting/widget/Menus.xml"/>
- <include-menu name="PaymentSubTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="PaymentTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
+ <include-menu name="PaymentSubTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<container style="leftclear">
<label style="h1"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}]
${${extraFunctionName}}"/>
</container>
Modified: ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml?rev=828855&r1=828854&r2=828855&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/TransactionScreens.xml Thu Oct
22 21:17:14 2009
@@ -34,7 +34,7 @@
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="TransactionsTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="TransactionsTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<container>
<label
style="h1">${uiLabelMap[labelTitleProperty]}</label>
Added: ofbiz/trunk/applications/accounting/widget/ap/ApMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/ApMenus.xml?rev=828855&view=auto
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/ApMenus.xml (added)
+++ ofbiz/trunk/applications/accounting/widget/ap/ApMenus.xml Thu Oct 22
21:17:14 2009
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd";>
+ <menu name="ApAppBar" title="${uiLabelMap.AccountingApManager}"
extends="CommonAppBarMenu"
extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="agreements"
title="${uiLabelMap.AccountingAgreements}"><link
target="FindAgreement"/></menu-item>
+ <menu-item name="invoices"
title="${uiLabelMap.AccountingInvoicesMenu}"><link
target="FindApInvoices"/></menu-item>
+ <menu-item name="payments"
title="${uiLabelMap.AccountingPaymentsMenu}"><link
target="findPayments"/></menu-item>
+ <menu-item name="apPaymentGroups"
title="${uiLabelMap.AccountingApPaymentGroupMenu}"><link
target="FindApPaymentGroups"/></menu-item>
+ <menu-item name="findVendors" title="${uiLabelMap.PartyVendor}
${uiLabelMap.CommonList}"><link target="findVendors"/></menu-item>
+ <menu-item name="reports"
title="${uiLabelMap.AccountingReports}"><link target="listReports"/></menu-item>
+ </menu>
+ <menu name="ApMainAgreementMenu" type="simple"
default-selected-style="selected">
+ <menu-item name="findAgreement"
title="${uiLabelMap.AccountingAgreementAvailable}"><link
target="FindAgreement"></link></menu-item>
+ </menu>
+ <menu name="ApMainVendorMenu" type="simple"
default-selected-style="selected">
+ <menu-item name="listVendors" title="${uiLabelMap.CommonShowAll}
${uiLabelMap.PartyVendor}"><link target="findVendors"></link></menu-item>
+ </menu>
+ <menu name="ApMainReportMenu" type="simple"
default-selected-style="selected">
+ <menu-item name="listReport" title="${uiLabelMap.CommonShowAll}
${uiLabelMap.AccountingReports}"><link target="listReports"></link></menu-item>
+ </menu>
+ <menu name="ApMainPaymentTypeMenu" type="simple"
default-selected-style="selected">
+ <menu-item name="findPayment"
title="${uiLabelMap.AccountingShowPayments} ${paymentType.description}">
+ <link target="findPayments">
+ <parameter param-name="lookupFlag" value="Y"/>
+ </link>
+ </menu-item>
+ </menu>
+ <menu name="ApMainPaymentMethodTypeMenu" type="simple"
default-selected-style="selected">
+ <menu-item name="findPayment"
title="${uiLabelMap.AccountingShowPayments} ${paymentMethodType.description}">
+ <link target="findPayments">
+ <parameter param-name="lookupFlag" value="Y"/>
+ </link>
+ </menu-item>
+ </menu>
+ <menu name="ApMainPaymentStatusMenu" type="simple"
default-selected-style="selected">
+ <menu-item name="findPayment"
title="${uiLabelMap.AccountingShowPayments} ${paymentsStatus.description}">
+ <link target="findPayments">
+ <parameter param-name="lookupFlag" value="Y"/>
+ </link>
+ </menu-item>
+ </menu>
+ <menu name="ApMainInvoiceTypeMenu" type="simple"
default-selected-style="selected">
+ <menu-item name="findInvoice"
title="${uiLabelMap.AccountingShowInvoices} ${invoiceType.description}">
+ <link target="FindApInvoices">
+ <parameter param-name="lookupFlag" value="Y"/>
+ </link>
+ </menu-item>
+ </menu>
+ <menu name="ApMainInvoiceStatusMenu" type="simple"
default-selected-style="selected">
+ <menu-item name="findInvoice"
title="${uiLabelMap.AccountingShowInvoices} ${invoicesStatus.description}">
+ <link target="FindApInvoices">
+ <parameter param-name="lookupFlag" value="Y"/>
+ </link>
+ </menu-item>
+ </menu>
+
+ <menu name="ApInvoiceTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
+ default-menu-item-name="viewInvoices">
+ <menu-item name="viewInvoices" title="${uiLabelMap.CommonMain}">
+ <link target="FindApInvoices"/>
+ </menu-item>
+ <menu-item name="purchaseInvoices"
title="${uiLabelMap.AccountingPurchaseInvoices}">
+ <link target="FindPurchaseInvoices"/>
+ </menu-item>
+ <menu-item name="commissionRun"
title="${uiLabelMap.AccountingCommissionRun}">
+ <link target="CommissionRun"/>
+ </menu-item>
+ </menu>
+
+ <menu name="ApReportTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
+ default-menu-item-name="viewInvoices">
+ <menu-item name="viewReports" title="${uiLabelMap.CommonMain}">
+ <link target="listReports"/>
+ </menu-item>
+ <menu-item name="commissionReport"
title="${uiLabelMap.AccountingCommissionReport}">
+ <link target="FindCommissions"/>
+ </menu-item>
+ </menu>
+</menus>
Modified: ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml?rev=828855&r1=828854&r2=828855&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/CommonScreens.xml Thu Oct 22
21:17:14 2009
@@ -28,7 +28,7 @@
<set field="layoutSettings.companyName"
from-field="uiLabelMap.AccountingApCompanyName" global="true"/>
<set field="layoutSettings.companySubtitle"
from-field="uiLabelMap.AccountingCompanySubtitle" global="true"/>
<set field="applicationMenuName" value="ApAppBar"
global="true"/>
- <set field="applicationMenuLocation"
value="component://accounting/widget/ap/Menus.xml" global="true"/>
+ <set field="applicationMenuLocation"
value="component://accounting/widget/ap/ApMenus.xml" global="true"/>
<set field="applicationTitle"
value="${uiLabelMap.AccountingApManagerApplication}" global="true"/>
<set field="invoiceMenuLocation"
value="component://accounting/widget/ap/ApInvoiceMenus.xml" global="true"/>
</actions>
@@ -69,7 +69,7 @@
<label
style="h1">${uiLabelMap.AccountingAgreements}</label>
<section>
<widgets>
- <include-menu
name="ApMainAgreementMenu"
location="component://accounting/widget/ap/Menus.xml"/>
+ <include-menu
name="ApMainAgreementMenu"
location="component://accounting/widget/ap/ApMenus.xml"/>
</widgets>
</section>
</container>
@@ -77,7 +77,7 @@
<label style="h1">${uiLabelMap.PartyVendor}
${uiLabelMap.CommonList}</label>
<section>
<widgets>
- <include-menu name="ApMainVendorMenu"
location="component://accounting/widget/ap/Menus.xml"/>
+ <include-menu name="ApMainVendorMenu"
location="component://accounting/widget/ap/ApMenus.xml"/>
</widgets>
</section>
</container>
@@ -87,7 +87,7 @@
<label
style="h1">${uiLabelMap.AccountingReports}</label>
<section>
<widgets>
- <include-menu name="ApMainReportMenu"
location="component://accounting/widget/ap/Menus.xml"/>
+ <include-menu name="ApMainReportMenu"
location="component://accounting/widget/ap/ApMenus.xml"/>
</widgets>
</section>
</container>
@@ -100,7 +100,7 @@
<iterate-section list="paymentTypes"
entry="paymentType">
<section>
<widgets>
- <include-menu
name="ApMainPaymentTypeMenu"
location="component://accounting/widget/ap/Menus.xml"/>
+ <include-menu
name="ApMainPaymentTypeMenu"
location="component://accounting/widget/ap/ApMenus.xml"/>
</widgets>
</section>
</iterate-section>
@@ -109,7 +109,7 @@
<iterate-section
list="paymentMethodTypes" entry="paymentMethodType">
<section>
<widgets>
- <include-menu
name="ApMainPaymentMethodTypeMenu"
location="component://accounting/widget/ap/Menus.xml"/>
+ <include-menu
name="ApMainPaymentMethodTypeMenu"
location="component://accounting/widget/ap/ApMenus.xml"/>
</widgets>
</section>
</iterate-section>
@@ -120,7 +120,7 @@
<iterate-section list="paymentStatus"
entry="paymentsStatus">
<section>
<widgets>
- <include-menu
name="ApMainPaymentStatusMenu"
location="component://accounting/widget/ap/Menus.xml"/>
+ <include-menu
name="ApMainPaymentStatusMenu"
location="component://accounting/widget/ap/ApMenus.xml"/>
</widgets>
</section>
</iterate-section>
@@ -135,7 +135,7 @@
<iterate-section list="invoiceTypes"
entry="invoiceType">
<section>
<widgets>
- <include-menu
name="ApMainInvoiceTypeMenu"
location="component://accounting/widget/ap/Menus.xml"/>
+ <include-menu
name="ApMainInvoiceTypeMenu"
location="component://accounting/widget/ap/ApMenus.xml"/>
</widgets>
</section>
</iterate-section>
@@ -144,7 +144,7 @@
<iterate-section list="invoiceStatus"
entry="invoicesStatus">
<section>
<widgets>
- <include-menu
name="ApMainInvoiceStatusMenu"
location="component://accounting/widget/ap/Menus.xml"/>
+ <include-menu
name="ApMainInvoiceStatusMenu"
location="component://accounting/widget/ap/ApMenus.xml"/>
</widgets>
</section>
</iterate-section>
@@ -222,7 +222,7 @@
<decorator-section name="body">
<section>
<widgets>
- <include-menu
location="component://accounting/widget/ap/Menus.xml" name="ApInvoiceTabBar"/>
+ <include-menu
location="component://accounting/widget/ap/ApMenus.xml" name="ApInvoiceTabBar"/>
<container style="clear"/>
<decorator-section-include name="body"/>
</widgets>
@@ -247,8 +247,8 @@
<if-has-permission permission="ACCOUNTING"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu name="PaymentTabBar"
location="component://accounting/widget/Menus.xml"/>
- <include-menu name="PaymentSubTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="PaymentTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
+ <include-menu name="PaymentSubTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<label style="h2"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}]
${${extraFunctionName}}"/>
<decorator-section-include name="body"/>
</widgets>
@@ -277,7 +277,7 @@
<decorator-section name="pre-body">
<section>
<widgets>
- <include-menu name="PaymentGroupTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="PaymentGroupTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
</widgets>
</section>
</decorator-section>
@@ -289,7 +289,7 @@
<not><if-empty
field="paymentGroup"/></not>
</condition>
<widgets>
- <include-menu
name="PaymentGroupSubTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu
name="PaymentGroupSubTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<container
style="h1"><label>${uiLabelMap.AccountingPaymentGroupOverviewFor}
${paymenGroup.paymentGroupName} [${paymentGroupId}]</label></container>
</widgets>
<fail-widgets>
@@ -334,7 +334,7 @@
<decorator-section name="body">
<section>
<widgets>
- <include-menu name="ApReportTabBar"
location="component://accounting/widget/ap/Menus.xml"/>
+ <include-menu name="ApReportTabBar"
location="component://accounting/widget/ap/ApMenus.xml"/>
<container style="clear"/>
<decorator-section-include name="body"/>
</widgets>
Modified: ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml?rev=828855&r1=828854&r2=828855&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ar/CommonScreens.xml Thu Oct 22
21:17:14 2009
@@ -88,8 +88,8 @@
<if-has-permission permission="ACCOUNTING"
action="_VIEW"/>
</condition>
<widgets>
- <include-menu name="PaymentTabBar"
location="component://accounting/widget/Menus.xml"/>
- <include-menu name="PaymentSubTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="PaymentTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
+ <include-menu name="PaymentSubTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<label style="h2"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonId}:[${paymentId}]
${${extraFunctionName}}"/>
<decorator-section-include name="body"/>
</widgets>
@@ -133,7 +133,7 @@
<decorator-section name="pre-body">
<section>
<widgets>
- <include-menu name="PaymentGroupTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu name="PaymentGroupTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
</widgets>
</section>
</decorator-section>
@@ -145,7 +145,7 @@
<not><if-empty
field="paymentGroup"/></not>
</condition>
<widgets>
- <include-menu
name="PaymentGroupSubTabBar"
location="component://accounting/widget/Menus.xml"/>
+ <include-menu
name="PaymentGroupSubTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
<container
style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor}
${paymenGroup.paymentGroupName} [${paymentGroupId}]</label></container>
</widgets>
<fail-widgets>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml?rev=828855&r1=828854&r2=828855&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml Thu Oct 22 21:17:14
2009
@@ -28,7 +28,7 @@
<menu-item name="facility" title="${uiLabelMap.ProductFacility}"><link
target="FindFacility"/></menu-item>
</menu>
- <menu name="FixedAssetTabBar" extends="FixedAssetTabBar"
extends-resource="component://accounting/widget/Menus.xml">
+ <menu name="FixedAssetTabBar" extends="FixedAssetTabBar"
extends-resource="component://accounting/widget/AccountingMenus.xml">
<menu-item name="EditProductMaints"
title="${uiLabelMap.AssetMaintProductMaint}">
<condition><not><if-empty
field="fixedAsset.instanceOfProductId"/></not></condition>
<link target="EditProductMaints">
@@ -38,7 +38,7 @@
</menu-item>
</menu>
- <menu name="FixedAssetMaintTabBar" extends="FixedAssetMaintTabBar"
extends-resource="component://accounting/widget/Menus.xml">
+ <menu name="FixedAssetMaintTabBar" extends="FixedAssetMaintTabBar"
extends-resource="component://accounting/widget/AccountingMenus.xml">
<menu-item name="EditWorkEfforts"
title="${uiLabelMap.WorkEffortAllTasks}">
<link target="EditWorkEfforts">
<parameter param-name="fixedAssetId"
from-field="fixedAssetMaint.fixedAssetId"/>
