Author: ashish
Date: Thu Jul 2 12:45:02 2009
New Revision: 790569
URL: http://svn.apache.org/viewvc?rev=790569&view=rev
Log:
Applied fix from trunk revision: 790567
Applied patch from jira issue OFBIZ-2684 (In Accounting invoice section the
InvoiceSubBar Menu all options are not working properly, convert it to ftl, so
that all functionality can be run.)
There is bug in the Menu Widget code and it will be handled in separate issue
created and referred on the above jira issue.
For now I have commented out the code of Menus.xml from InvoiceScreens.xml file
and on fixing this bug in menu widget code the artifact will be reused again.
Thanks Rishi for your contribution on this.
Added:
ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/InvoiceSubTabBar.ftl
- copied unchanged from r790567,
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/InvoiceSubTabBar.ftl
Modified:
ofbiz/branches/release09.04/applications/accounting/widget/InvoiceScreens.xml
Modified:
ofbiz/branches/release09.04/applications/accounting/widget/InvoiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/widget/InvoiceScreens.xml?rev=790569&r1=790568&r2=790569&view=diff
==============================================================================
---
ofbiz/branches/release09.04/applications/accounting/widget/InvoiceScreens.xml
(original)
+++
ofbiz/branches/release09.04/applications/accounting/widget/InvoiceScreens.xml
Thu Jul 2 12:45:02 2009
@@ -41,7 +41,8 @@
<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="InvoiceSubTabBar" location="component://accounting/widget/Menus.xml"/-->
+
<platform-specific><html><html-template
location="component://accounting/webapp/accounting/invoice/InvoiceSubTabBar.ftl"/></html></platform-specific>
<container style="leftclear">
<label style="h1"
text="${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}:
${invoice.description} [${invoiceId}] ${${extraFunctionName}}"/>
</container>
@@ -73,7 +74,8 @@
<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/Menus.xml"/-->
+
<platform-specific><html><html-template
location="component://accounting/webapp/accounting/invoice/InvoiceSubTabBar.ftl"/></html></platform-specific>
<container style="clear"/>
</decorator-section>
<decorator-section name="search-options">
