Author: hansbak
Date: Fri Jan 22 03:17:28 2010
New Revision: 901966
URL: http://svn.apache.org/viewvc?rev=901966&view=rev
Log:
show commission run screen button from ap also in accounting
Modified:
ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml
ofbiz/trunk/applications/accounting/widget/CommonScreens.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=901966&r1=901965&r2=901966&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/AccountingMenus.xml Fri Jan 22
03:17:28 2010
@@ -46,6 +46,16 @@
<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"/>
Modified: ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=901966&r1=901965&r2=901966&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Fri Jan 22
03:17:28 2010
@@ -287,4 +287,12 @@
</section>
</screen>
+ <screen name="CommonApInvoiceDecorator"><!-- used for invoice commission
runs -->
+ <section>
+ <widgets>
+ <include-screen name="CommonInvoiceDecorator"
location="component://accounting/widget/InvoiceScreens.xml"/>
+ </widgets>
+ </section>
+ </screen>
+
</screens>
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=901966&r1=901965&r2=901966&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Fri Jan 22
03:17:28 2010
@@ -33,6 +33,11 @@
<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"/>
@@ -71,7 +76,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="FindInvoices">
<section>
<actions>
