Author: buscob
Date: Sat Nov 14 08:41:35 2009
New Revision: 836143
URL: http://svn.apache.org/viewvc?rev=836143&view=rev
Log:
Moved TabBar menus to tabbar decorator-section for Invoices and Payments screens
Modified:
ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml?rev=836143&r1=836142&r2=836143&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/InvoiceScreens.xml Sat Nov 14
08:41:35 2009
@@ -31,6 +31,20 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="tabbar">
+ <section>
+ <condition>
+ <and>
+ <if-service-permission
service-name="acctgInvoicePermissionCheck" main-action="VIEW"/>
+ <not><if-empty
field="parameters.invoiceId"/></not>
+ </and>
+ </condition>
+ <widgets>
+ <include-menu name="InvoiceTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
+
<decorator-section name="body">
<section>
<condition>
@@ -40,7 +54,6 @@
<section>
<condition><not><if-empty
field="parameters.invoiceId"/></not></condition>
<widgets>
- <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}}"/>
Modified: ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml?rev=836143&r1=836142&r2=836143&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/PaymentScreens.xml Sat Nov 14
08:41:35 2009
@@ -28,6 +28,16 @@
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="tabbar">
+ <section>
+ <condition>
+ <if-has-permission permission="ACCOUNTING"
action="_VIEW"/>
+ </condition>
+ <widgets>
+ <include-menu name="PaymentTabBar"
location="component://accounting/widget/AccountingMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<!-- do check for ACCOUNTING, _VIEW permission -->
@@ -35,7 +45,6 @@
<if-has-permission permission="ACCOUNTING"
action="_VIEW"/>
</condition>
<widgets>
- <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}}"/>
