svn commit: r915647 - in /ofbiz/trunk/applications/accounting/widget: AccountingMenus.xml InvoiceScreens.xml

[hansbak-2]

Author: hansbak
Date: Wed Feb 24 03:06:47 2010
New Revision: 915647

URL: http://svn.apache.org/viewvc?rev=915647&view=rev
Log:
combine 2 invoice menus together in one menu

Modified:
    ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
    ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml

Modified: ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml?rev=915647&r1=915646&r2=915647&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Wed Feb 24 03:06:47 2010
@@ -46,16 +46,6 @@
         <menu-item name="companies" title="${uiLabelMap.AccountingOrgGlSettings}"><link target="ListCompanies"/></menu-item>
     </menu>
 
-    <menu name="InvoiceApplTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
-            default-menu-item-name="viewInvoices">
-        <menu-item name="findInvoices" title="${uiLabelMap.CommonFind}">
-            <link target="findInvoices"/>
-        </menu-item>
-        <menu-item name="commissionRun" title="${uiLabelMap.AccountingCommissionRun}">
-            <link target="CommissionRun"/>
-        </menu-item>
-    </menu>
-
     <menu name="InvoiceTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
         <menu-item name="find" title="${uiLabelMap.CommonFind}">
             <link target="findInvoices"/>
@@ -154,6 +144,11 @@
                 <parameter param-name="invoiceId" from-field="invoice.invoiceId"/>
             </link>
         </menu-item>
+        
+        <menu-item name="commissionRun" title="${uiLabelMap.AccountingCommissionRun}">
+            <link target="CommissionRun"/>
+        </menu-item>
+        
     </menu>
     
     <menu name="InvoiceSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected">

Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=915647&r1=915646&r2=915647&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Wed Feb 24 03:06:47 2010
@@ -33,16 +33,8 @@
                 <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="pre-body">
                         <section>
-                            <widgets>
-                               <include-menu name="InvoiceApplTabBar" location="component://accounting/widget/AccountingMenus.xml"/>
-                            </widgets>
-                        </section>
-                        <section>
                             <condition>
-                                <and>
-                                    <if-service-permission service-name="acctgInvoicePermissionCheck" main-action="VIEW"/>
-                                    <not><if-empty field="parameters.invoiceId"/></not>
-                                </and>
+                                <if-service-permission service-name="acctgInvoicePermissionCheck" main-action="VIEW"/>
                             </condition>
                             <widgets>
                                 <include-menu name="InvoiceTabBar" location="component://accounting/widget/AccountingMenus.xml"/>