You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2009/12/23 18:36:57 UTC
svn commit: r893582 - in /ofbiz/trunk/applications/order:
webapp/ordermgr/quote/CreateOrderQuote.ftl widget/ordermgr/OrderMenus.xml
widget/ordermgr/QuoteScreens.xml
Author: erwan
Date: Wed Dec 23 17:36:54 2009
New Revision: 893582
URL: http://svn.apache.org/viewvc?rev=893582&view=rev
Log:
Removing a ftl menu file to have all the items complying to the XML menu style and creating the corresponding sub menu for the viewQuote screen
Removed:
ofbiz/trunk/applications/order/webapp/ordermgr/quote/CreateOrderQuote.ftl
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/OrderMenus.xml
ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderMenus.xml?rev=893582&r1=893581&r2=893582&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderMenus.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderMenus.xml Wed Dec 23 17:36:54 2009
@@ -201,6 +201,35 @@
</menu-item>
</menu>
+ <menu name="QuoteSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="quoteReport" title="${uiLabelMap.CommonReports}">
+ <link target="QuoteReport">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ </link>
+ </menu-item>
+ <menu-item name="editQuoteReportMail" title="${uiLabelMap.CommonSendReportByMail}">
+ <link target="EditQuoteReportMail">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ <parameter param-name="emailType" value="PRDS_QUO_CONFIRM"/>
+ </link>
+ </menu-item>
+ <menu-item name="editQuote" title="${uiLabelMap.OrderCreateOrderQuote}">
+ <link target="EditQuote"/>
+ </menu-item>
+ <menu-item name="createOrder" title="${uiLabelMap.OrderCreateOrder}">
+ <condition disabled-style="disabled">
+ <and>
+ <not><if-empty field="quote"/></not>
+ <if-compare operator="equals" value="QUO_APPROVED" field="quote.statusId"/>
+ </and>
+ </condition>
+ <link target="loadCartFromQuote">
+ <parameter param-name="quoteId" from-field="quote.quoteId"/>
+ <parameter param-name="finalizeMode" value="init"/>
+ </link>
+ </menu-item>
+ </menu>
+
<menu name="RequestTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
<menu-item name="ViewRequest" title="${uiLabelMap.OrderRequestOverview}">
<link target="ViewRequest">
@@ -211,8 +240,8 @@
<condition>
<and>
<not><if-empty field="custRequest"/></not>
- <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
- <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
+ <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
+ <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
</and>
</condition>
<link target="request">
Modified: ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml?rev=893582&r1=893581&r2=893582&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/QuoteScreens.xml Wed Dec 23 17:36:54 2009
@@ -74,17 +74,8 @@
<decorator-screen name="CommonQuoteDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<container>
- <link target="QuoteReport" text="${uiLabelMap.CommonReports}" style="buttontext">
- <parameter param-name="quoteId" from-field="quote.quoteId"/>
- </link>
- <link target="EditQuoteReportMail" text="${uiLabelMap.CommonSendReportByMail}" style="buttontext">
- <parameter param-name="quoteId" from-field="quote.quoteId"/>
- <parameter param-name="emailType" value="PRDS_QUO_CONFIRM"/>
- </link>
+ <include-menu name="QuoteSubTabBar" location="component://order/widget/ordermgr/OrderMenus.xml"/>
</container>
- <platform-specific>
- <html><html-template location="component://order/webapp/ordermgr/quote/CreateOrderQuote.ftl"/></html>
- </platform-specific>
<include-screen name="ViewQuoteTemplate"/>
<screenlet title="${uiLabelMap.OrderCopyQuote}">
<platform-specific>