svn commit: r522294 - in /ofbiz/trunk: applications/accounting/widget/FixedAssetScreens.xml applications/accounting/widget/Menus.xml specialpurpose/assetmaint/widget/AssetmaintScreens.xml specialpurpose/assetmaint/widget/Menus.xml

[jleroux]

Author: jleroux
Date: Sun Mar 25 09:18:15 2007
New Revision: 522294

URL: http://svn.apache.org/viewvc?view=rev&rev=522294
Log:
A patch from Anil K Patel "Add Orders Tab to FixedAssetMaint and clean up Tab 
selection" (https://issues.apache.org/jira/browse/OFBIZ-842).
Minor code modifications.

Modified:
    ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
    ofbiz/trunk/applications/accounting/widget/Menus.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml

Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?view=diff&rev=522294&r1=522293&r2=522294
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Sun Mar 25 
09:18:15 2007
@@ -226,7 +226,8 @@
         <section>
             <actions>
                 <set field="titleProperty" 
value="PageTitleEditFixedAssetMaintenance"/>
-                <set field="tabButtonItem" value="ListFixedAssetMaints"/>
+                <set field="tabButtonItem" value="ListFixedAssetMaints"/>      
          
+                <set field="tabButtonItemFixedAssetMaint" 
value="EditFixedAssetMaint"/>
                 <set field="labelTitleProperty" 
value="PageTitleEditFixedAssetMaintenance"/>
                 <set field="fixedAssetId" 
from-field="parameters.fixedAssetId"/>
                 <set field="maintHistSeqId" 
from-field="parameters.maintHistSeqId"/>
@@ -249,7 +250,8 @@
         <section>
             <actions>
                 <set field="titleProperty" 
value="PageTitleEditFixedAssetMaintenance"/>
-                <set field="tabButtonItem" value="ListFixedAssetMaints"/>
+                <set field="tabButtonItem" value="ListFixedAssetMaints"/>      
          
+                <set field="tabButtonItemFixedAssetMaint" 
value="EditFixedAssetMaintMeters"/>
                 <set field="labelTitleProperty" 
value="PageTitleEditFixedAssetMaintenance"/>
                 <set field="fixedAssetId" 
from-field="parameters.fixedAssetId"/>
                 <set field="maintHistSeqId" 
from-field="parameters.maintHistSeqId"/>
@@ -293,6 +295,7 @@
             <actions>
                 <set field="titleProperty" 
value="PageTitleEditFixedAssetMaintenance"/>
                 <set field="tabButtonItem" value="ListFixedAssetMaints"/>      
          
+                <set field="tabButtonItemFixedAssetMaint" 
value="EditFixedAssetMaintOrders"/>                
                 <set field="labelTitleProperty" 
value="PageTitleEditFixedAssetMaintenance"/>
                 <set field="fixedAssetId" 
from-field="parameters.fixedAssetId"/>
                 <set field="maintHistSeqId" 
from-field="parameters.maintHistSeqId"/>

Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?view=diff&rev=522294&r1=522293&r2=522294
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/Menus.xml Sun Mar 25 09:18:15 
2007
@@ -333,11 +333,11 @@
             <link target="printChecks.pdf?paymentId=${payment.paymentId}"/>
         </menu-item>
     </menu>
-    <menu name="FixedAssetMaintTabBar" default-menu-item-name="overview"> 
-        <menu-item name="editFixedAssetMaint" 
title="${uiLabelMap.AccountingFixedAssetMaint}">
+    <menu name="FixedAssetMaintTabBar" 
selected-menuitem-context-field-name="tabButtonItemFixedAssetMaint" 
default-menu-item-name="EditFixedAssetMaint"> 
+        <menu-item name="EditFixedAssetMaint" 
title="${uiLabelMap.AccountingFixedAssetMaint}">
             <link 
target="EditFixedAssetMaint?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/>
         </menu-item>
-        <menu-item name="editFixedAssetMeter" 
title="${uiLabelMap.AccountingFixedAssetMaintMeters}">
+        <menu-item name="EditFixedAssetMaintMeters" 
title="${uiLabelMap.AccountingFixedAssetMaintMeters}">
             <link 
target="EditFixedAssetMaintMeters?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/>
         </menu-item>
         <menu-item name="EditFixedAssetMaintOrders" 
title="${uiLabelMap.AccountingFixedAssetMaintOrders}">

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?view=diff&rev=522294&r1=522293&r2=522294
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml 
(original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Sun Mar 
25 09:18:15 2007
@@ -50,7 +50,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="Edit WorkOrder"/>
-                <set field="tabButtonItem" value="EditFixedAssetMaint"/>
+                <set field="tabButtonItemFixedAssetMaint" 
value="EditFixedAssetMaint"/>
                 <set field="fixedAssetId" 
from-field="parameters.fixedAssetId"/>
                 <set field="maintHistSeqId" 
from-field="parameters.maintHistSeqId"/>
                 <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
@@ -88,7 +88,7 @@
         <section>
             <actions>
                 <set field="titleProperty" 
value="PageTitleEditFixedAssetMaintenance"/>
-                <set field="tabButtonItem" value="EditFixedAssetMeter"/>
+                <set field="tabButtonItemFixedAssetMaint" 
value="EditFixedAssetMeter"/>
                 <set field="labelTitleProperty" 
value="PageTitleEditFixedAssetMaintenance"/>
                 <set field="fixedAssetId" 
from-field="parameters.fixedAssetId"/>
                 <set field="maintHistSeqId" 
from-field="parameters.maintHistSeqId"/>
@@ -109,7 +109,7 @@
     <screen name="EditWorkEfforts">
         <section>
             <actions>
-                <set field="tabButtonItem" value="EditWorkEfforts"/>
+                <set field="tabButtonItemFixedAssetMaint" 
value="EditWorkEfforts"/>
                 <script 
location="component://assetmaint/webapp/assetmaint/WEB-INF/actions/workeffort/EditWorkEfforts.bsh"/>
                
             </actions>
             <widgets>
@@ -140,7 +140,7 @@
         <section>
             <actions>
                 <set field="titleProperty" 
value="PageTitleListWorkEffortTimeEntries"/>
-                <set field="tabButtonItem" value="EditWorkEffortTimeEntries"/>
+                <set field="tabButtonItemFixedAssetMaint" 
value="EditWorkEffortTimeEntries"/>
                 <set field="labelTitleProperty" 
value="PageTitleListWorkEffortTimeEntries"/>
                 
                 <set field="workEffortId" 
from-field="parameters.workEffortId"/>
@@ -167,7 +167,7 @@
         <section>
             <actions>
                 <set field="titleProperty" 
value="PageTitleListWorkEffortNotes"/>
-                <set field="tabButtonItem" value="EditWorkEffortNotes"/>
+                <set field="tabButtonItemFixedAssetMaint" 
value="EditWorkEffortNotes"/>
                 <set field="labelTitleProperty" 
value="PageTitleListWorkEffortNotes"/>
 
                 <set field="workEffortId" 
from-field="parameters.workEffortId"/>
@@ -194,7 +194,7 @@
         <section>
             <actions>
                 <set field="titleProperty" value="PageTitleListItemIssuance"/>
-                <set field="tabButtonItem" value="EditItemIssuances"/>
+                <set field="tabButtonItemFixedAssetMaint" 
value="EditItemIssuances"/>
                 <set field="labelTitleProperty" 
value="PageTitleListItemIssuance"/>
 
                 <set field="fixedAssetId" 
from-field="parameters.fixedAssetId"/>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml?view=diff&rev=522294&r1=522293&r2=522294
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml Sun Mar 25 09:18:15 
2007
@@ -45,7 +45,7 @@
         </menu-item>
     </menu>
 
-    <menu name="FixedAssetMaintTabBar" 
default-menu-item-name="EditFixedAssetMaint"> 
+    <menu name="FixedAssetMaintTabBar" 
selected-menuitem-context-field-name="tabButtonItemFixedAssetMaint" 
default-menu-item-name="EditFixedAssetMaint"> 
         <menu-item name="EditFixedAssetMaint" 
title="${uiLabelMap.AccountingFixedAssetMaint}">
             <link 
target="EditFixedAssetMaint?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/>
         </menu-item>
@@ -63,6 +63,9 @@
         </menu-item>
         <menu-item name="EditItemIssuances" 
title="${uiLabelMap.FixedAssetMaintItemIssuance}">
             <link 
target="EditItemIssuances?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/>
+        </menu-item>
+        <menu-item name="EditFixedAssetMaintOrders" 
title="${uiLabelMap.AccountingFixedAssetMaintOrders}">
+            <link 
target="EditFixedAssetMaintOrders?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/>
         </menu-item>
     </menu>