svn commit: r419735 - in /incubator/ofbiz/trunk/applications/accounting: config/ webapp/accounting/WEB-INF/ webapp/accounting/fixedasset/ widget/

[hansbak-2]

Author: hansbak
Date: Thu Jul  6 15:59:25 2006
New Revision: 419735

URL: http://svn.apache.org/viewvc?rev=419735&view=rev
Log:
contribution from Anil Patel to show children of a fixed asset OFBIZ-79

Removed:
    incubator/ofbiz/trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetTabBar.ftl
Modified:
    incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
    incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
    incubator/ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml
    incubator/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
    incubator/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
    incubator/ofbiz/trunk/applications/accounting/widget/Menus.xml

Modified: incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties?rev=419735&r1=419734&r2=419735&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties (original)
+++ incubator/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.properties Thu Jul  6 15:59:25 2006
@@ -153,6 +153,7 @@
 AccountingFiscalMonth12=12-Dec
 AccountingFixedAsset=Fixed Asset
 AccountingFixedAssetCalendar=Calendar
+AccountingFixedAssetChildren=Children
 AccountingFixedAssetEdit=Create/Update Fixed Asset
 AccountingFixedAssetId=Fixed Asset Id
 AccountingFixedAssetName=Fixed Asset Name
@@ -425,6 +426,7 @@
 PageTitleListAgreementItems=List Agreement Items
 PageTitleListAgreementTerms=List Agreement Terms
 PageTitleListFixedAssets=List Fixed Assets
+PageTitleListFixedAssetChildren=Fixed Asset Children
 PageTitleListFixedAssetCalendar=List Fixed Asset Calendar
 PageTitleListFixedAssetMaints=List Fixed Asset Maints
 PageTitleListFixedAssetProducts=List Fixed Asset Products

Modified: incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=419735&r1=419734&r2=419735&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Thu Jul  6 15:59:25 2006
@@ -589,6 +589,7 @@
         <response name="error" type="view" value="EditFixedAssetRollup"/>
     </request-map>
    <!-- ================ FixedAsset Standard Costs Requests ================= -->
+    <request-map uri="FixedAssetChildren"><security https="true" auth="true"/><response name="success" type="view" value="FixedAssetChildren"/></request-map>
     <request-map uri="ListFixedAssetStdCosts"><security https="true" auth="true"/><response name="success" type="view" value="ListFixedAssetStdCosts"/></request-map>
     <request-map uri="EditFixedAssetStdCost"><security https="true" auth="true"/><response name="success" type="view" value="EditFixedAssetStdCost"/></request-map>
     
@@ -1235,6 +1236,7 @@
     <view-map name="ListFixedAssetsRollUp" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetRollUp"/>
     <view-map name="ListFixedAssetStdCosts" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#ListFixedAssetStdCosts"/>
     <view-map name="EditFixedAssetStdCost" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#EditFixedAssetStdCost"/>
+    <view-map name="FixedAssetChildren" type="screen" page="component://accounting/widget/FixedAssetScreens.xml#FixedAssetChildren"/>
     <!-- agreements -->
     <view-map name="FindAgreement" type="screen" page="component://accounting/widget/AgreementScreens.xml#FindAgreement"/>
     <view-map name="EditAgreement" type="screen" page="component://accounting/widget/AgreementScreens.xml#EditAgreement"/>

Modified: incubator/ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml?rev=419735&r1=419734&r2=419735&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml Thu Jul  6 15:59:25 2006
@@ -48,9 +48,25 @@
                 <entity-and entity-name="GlAccount" >
                     <field-map field-name="parentGlAccountId" env-name="glAccountId" />
                 </entity-and>
-
             </sub-node>
         </node>
     </tree>
-    
+    <tree name="TreeFixedAsset" root-node-name="node-root" entity-name="FixedAsset"
+        default-render-style="expand-collapse" default-wrap-style="treeWrapper">
+        <node name="node-root"  render-style="simple">
+            <sub-node node-name="node-body">
+                <entity-and entity-name="FixedAsset" >
+                    <field-map field-name="parentFixedAssetId"  env-name="fixedAssetId" />
+                </entity-and >
+            </sub-node>
+        </node>
+        <node name="node-body" wrap-style="treewrapper">
+            <link style="treeitem" target="FixedAssetChildren?fixedAssetId=${fixedAssetId}&amp;trail=${fixedAssetId}" text="${fixedAssetId} ${fixedAssetName} ${instanceOfProductId} ${fixedAssetTypeId} " />
+            <sub-node node-name="node-body" >
+                <entity-and entity-name="FixedAsset" >
+                    <field-map field-name="parentFixedAssetId" env-name="fixedAssetId" />
+                </entity-and>
+            </sub-node>
+        </node>
+    </tree>
 </trees>

Modified: incubator/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml?rev=419735&r1=419734&r2=419735&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/widget/CommonScreens.xml Thu Jul  6 15:59:25 2006
@@ -189,9 +189,7 @@
                                 <section>
                                     <condition><not><if-empty field-name="fixedAssetId"/></not></condition>
                                     <widgets>
-                                        <platform-specific>
-                                            <html><html-template location="component://accounting/webapp/accounting/fixedasset/FixedAssetTabBar.ftl"/></html>
-                                        </platform-specific>
+                                        <include-menu name="FixedAssetTabBar" location="component://accounting/widget/Menus.xml"/>
                                         <label style="head1" text="${uiLabelMap.${labelTitleProperty}} ${uiLabelMap.CommonFor}: ${fixedAsset.fixedAssetName} [${uiLabelMap.CommonId}:${fixedAssetId}]  ${${extraFunctionName}}"/>
                                     </widgets>
                                 </section>

Modified: incubator/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=419735&r1=419734&r2=419735&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Thu Jul  6 15:59:25 2006
@@ -289,4 +289,25 @@
             </widgets>
         </section>
     </screen>
+    <!-- Fixed Asset Children -->
+    <screen name="FixedAssetChildren">
+        <section>
+            <actions>
+                <set field="titleProperty" value="PageTitleListFixedAssetChildren"/>
+                <set field="tabButtonItem" value="FixedAssetChildren"/>
+                <set field="labelTitleProperty" value="PageTitleListFixedAssetChildren"/>
+                <set field="fixedAssetId" from-field="parameters.fixedAssetId"/>
+                <set field="trail" from-field="parameters.trail" default-value="${parameters.fixedAssetId}"/>
+                <set field="fixedAssetId" from-field="parameters.trail"/>
+                <entity-one entity-name="FixedAsset" value-name="fixedAsset"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonFixedAssetDecorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-tree name="TreeFixedAsset" location="component://accounting/widget/AccountingTrees.xml" />
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
 </screens>

Modified: incubator/ofbiz/trunk/applications/accounting/widget/Menus.xml
URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=419735&r1=419734&r2=419735&view=diff
==============================================================================
--- incubator/ofbiz/trunk/applications/accounting/widget/Menus.xml (original)
+++ incubator/ofbiz/trunk/applications/accounting/widget/Menus.xml Thu Jul  6 15:59:25 2006
@@ -340,6 +340,34 @@
             <link target="EditFixedAssetMaintMeters?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/>
         </menu-item>
     </menu>  
+    <menu name="FixedAssetTabBar" default-menu-item-name="EditFixedAsset" default-selected-style="tabButtonSelected"
+        default-title-style="tabButton" default-tooltip-style="tabletext" default-widget-style="tabButton"
+        orientation="horizontal" type="simple">
+        <menu-item name="EditFixedAsset" title="${uiLabelMap.AccountingFixedAsset}">
+            <link target="EditFixedAsset?fixedAssetId=${fixedAssetId}"/>
+        </menu-item>
+        <menu-item name="FixedAssetChildren" title="${uiLabelMap.AccountingFixedAssetChildren}">
+            <link target="FixedAssetChildren?fixedAssetId=${fixedAssetId}&amp;trail=${fixedAssetId}"/>
+        </menu-item>
+        <menu-item name="ListFixedAssetProducts" title="${uiLabelMap.AccountingFixedAssetProducts}">
+            <link target="ListFixedAssetProducts?fixedAssetId=${fixedAssetId}"/>
+        </menu-item>
+        <menu-item name="ListFixedAssetCalendar" title="${uiLabelMap.AccountingFixedAssetCalendar}">
+            <link target="ListFixedAssetCalendar?fixedAssetId=${fixedAssetId}"/>
+        </menu-item>
+        <menu-item name="ListFixedAssetStdCosts" title="${uiLabelMap.AccountingFixedAssetStdCosts}">
+            <link target="ListFixedAssetStdCosts?fixedAssetId=${fixedAssetId}"/>
+        </menu-item>
+        <menu-item name="EditFixedAssetIdents" title="${uiLabelMap.AccountingFixedAssetIdents}">
+            <link target="EditFixedAssetIdents?fixedAssetId=${fixedAssetId}"/>
+        </menu-item>
+        <menu-item name="EditFixedAssetRegistrations" title="${uiLabelMap.AccountingFixedAssetRegistrations}">
+            <link target="EditFixedAssetRegistrations?fixedAssetId=${fixedAssetId}"/>
+        </menu-item>
+        <menu-item name="ListFixedAssetMaints" title="${uiLabelMap.AccountingFixedAssetMaints}">
+            <link target="ListFixedAssetMaints?fixedAssetId=${fixedAssetId}"/>
+        </menu-item>
+    </menu>
     
 </menus>