You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/04/03 08:38:11 UTC
svn commit: r761537 - in /ofbiz/trunk/applications/order/widget/ordermgr:
CommonScreens.xml Menus.xml RequestMenus.xml RequestScreens.xml
Author: hansbak
Date: Fri Apr 3 06:38:10 2009
New Revision: 761537
URL: http://svn.apache.org/viewvc?rev=761537&view=rev
Log:
move request menu into general ordermenu, only show createquote from request if the quote type is ok
Removed:
ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml
Modified:
ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml
ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
Modified: ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=761537&r1=761536&r2=761537&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml Fri Apr 3 06:38:10 2009
@@ -69,10 +69,10 @@
<not><if-empty field="custRequest"/></not>
</condition>
<widgets>
- <include-menu name="RequestTabBar" location="component://order/widget/ordermgr/RequestMenus.xml"/>
+ <include-menu name="RequestTabBar" location="component://order/widget/ordermgr/Menus.xml"/>
</widgets>
</section>
- <include-menu name="RequestSubTabBar" location="component://order/widget/ordermgr/RequestMenus.xml"/>
+ <include-menu name="RequestSubTabBar" location="component://order/widget/ordermgr/Menus.xml"/>
<container>
<section>
<condition>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml?rev=761537&r1=761536&r2=761537&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml Fri Apr 3 06:38:10 2009
@@ -201,4 +201,91 @@
</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">
+ <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
+ </link>
+ </menu-item>
+ <menu-item name="editRequest" title="${uiLabelMap.OrderRequest}">
+ <link target="request">
+ <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
+ </link>
+ </menu-item>
+ <menu-item name="requestroles" title="${uiLabelMap.OrderRequestRoles}">
+ <link target="requestroles">
+ <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
+ </link>
+ </menu-item>
+ <menu-item name="requestitems" title="${uiLabelMap.OrderRequestItems}">
+ <link target="/requestitems">
+ <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
+ </link>
+ </menu-item>
+ <menu-item name="custRequestContent" title="${uiLabelMap.OrderRequestContent}">
+ <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"/>
+ </and>
+ </condition>
+ <link target="EditCustRequestContent">
+ <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
+ </link>
+ </menu-item>
+ </menu>
+
+ <menu name="RequestSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+ menu-container-style="button-bar button-style-2 no-clear">
+ <menu-item name="newRequest" title="${uiLabelMap.OrderNewRequest}">
+ <link target="EditRequest"/>
+ </menu-item>
+ <menu-item name="createQuoteFromRequest" title="${uiLabelMap.OrderCreateQuoteFromRequest}">
+ <condition>
+ <and>
+ <not><if-empty field="custRequest"/></not>
+ <if-compare field="custRequest" operator="equals" value="RF_QUOTE"/>
+ </and>
+ </condition>
+ <link target="createQuoteFromCustRequest">
+ <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
+ </link>
+ </menu-item>
+ </menu>
+
+ <menu name="RequestScreenletMenu" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"
+ menu-container-style="button-bar button-style-2 no-clear">
+ <menu-item name="newRequest" title="${uiLabelMap.OrderNewRequest}">
+ <link target="EditRequest"/>
+ </menu-item>
+ </menu>
+
+ <menu name="editrequestitemmenu" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="requestitem" title="${uiLabelMap.OrderRequestItem}">
+ <link id="requestitem" target="requestitem">
+ <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
+ <parameter param-name="custRequestItemSeqId" from-field="custRequestItem.custRequestItemSeqId"/>
+ </link>
+ </menu-item>
+ <menu-item name="requestitemnotes" title="${uiLabelMap.OrderRequestItemNotes}">
+ <link id="requestitemnotes" target="requestitemnotes">
+ <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
+ <parameter param-name="custRequestItemSeqId" from-field="custRequestItem.custRequestItemSeqId"/>
+ </link>
+ </menu-item>
+ <menu-item name="requestitemquotes" title="${uiLabelMap.OrderRequestItemQuotes}">
+ <link id="requestitemquotes" target="RequestItemQuotes">
+ <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
+ <parameter param-name="custRequestItemSeqId" from-field="custRequestItem.custRequestItemSeqId"/>
+ </link>
+ </menu-item>
+ <menu-item name="workeffortrequirements" title="${uiLabelMap.OrderRequestItemWorkEffort}">
+ <link id="workeffortrequirements" target="requestitemrequirements">
+ <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/>
+ <parameter param-name="custRequestItemSeqId" from-field="custRequestItem.custRequestItemSeqId"/>
+ </link>
+ </menu-item>
+ </menu>
+
</menus>
\ No newline at end of file
Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=761537&r1=761536&r2=761537&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Fri Apr 3 06:38:10 2009
@@ -537,7 +537,7 @@
</condition>
<widgets>
<screenlet title="${uiLabelMap.OrderIncomingCustRequests}" navigation-menu-name="RequestScreenletMenu">
- <include-menu name="RequestScreenletMenu" location="component://order/widget/ordermgr/RequestMenus.xml"/>
+ <include-menu name="RequestScreenletMenu" location="component://order/widget/ordermgr/Menus.xml"/>
<include-form name="ListRequestList" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
</widgets>