svn commit: r786952 - in /ofbiz/trunk: applications/workeffort/widget/WorkEffortMenus.xml specialpurpose/assetmaint/widget/CommonScreens.xml

[hansbak-2]

Author: hansbak
Date: Sun Jun 21 08:34:18 2009
New Revision: 786952

URL: http://svn.apache.org/viewvc?rev=786952&view=rev
Log:
make the changed calendar screens also working in the asset maintenance component

Modified:
    ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
    ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml

Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml?rev=786952&r1=786951&r2=786952&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Sun Jun 21 08:34:18 2009
@@ -149,7 +149,7 @@
             <link target="${parameters._LAST_VIEW_NAME_}?period=day&amp;start=${nextMillis}&amp;fixedAssetId=${parameters.fixedAssetId}"/>
         </menu-item>
         <menu-item name="toDay" title="${uiLabelMap.CommonToday}">
-            <link target="${parameters._LAST_VIEW_NAME_}?paeriod=day&amp;fixedAssetId=${parameters.fixedAssetId}"/>
+            <link target="${parameters._LAST_VIEW_NAME_}?period=day&amp;fixedAssetId=${parameters.fixedAssetId}"/>
         </menu-item>
         <menu-item name="prev" title="${uiLabelMap.WorkEffortPreviousDay}">
             <link target="${parameters._LAST_VIEW_NAME_}?period=day&amp;start=${prevMillis}&amp;fixedAssetId=${parameters.fixedAssetId}"/>
@@ -208,7 +208,7 @@
                     <not><if-empty field="parameters.period"/></not>
                 </and>
             </condition>
-            <link target="${parameters._LAST_VIEW_NAME_}?period=day"/>
+            <link target="${parameters._LAST_VIEW_NAME_}?period=day&amp;fixedAssetId=${parameters.fixedAssetId}"/>
         </menu-item>
         <menu-item name="dummy" title="--------">
             <condition>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=786952&r1=786951&r2=786952&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Sun Jun 21 08:34:18 2009
@@ -136,6 +136,23 @@
             </widgets>
         </section>
     </screen>
-
+    <screen name="CommonCalendarDecorator">
+        <section>
+            <actions>
+                <set field="tabButtonItem" value="ListFixedAssetCalendar"/>
+                <script location="component://accounting/webapp/accounting/WEB-INF/actions/fixedasset/ViewCalendar.groovy"/>
+                <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="CommonFixedAssetDecorator">
+                    <decorator-section name="body">
+                        <!--include-menu name="FixedAssetCalendarTabBar" location="component://accounting/widget/Menus.xml"/-->
+                        <decorator-section-include name="body"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
 </screens>