Author: adrianc
Date: Wed Jul 22 21:02:08 2009
New Revision: 796878
URL: http://svn.apache.org/viewvc?rev=796878&view=rev
Log:
Fixed broken fixed asset calendars.
Modified:
ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
Modified: ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml?rev=796878&r1=796877&r2=796878&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FixedAssetScreens.xml Wed Jul 22
21:02:08 2009
@@ -75,6 +75,8 @@
<section>
<actions>
<set field="headerItem" value="ListFixedAssets"/>
+ <set field="fixedAssetId" from-field="fixedAsset.fixedAssetId"
default-value="${parameters.fixedAssetId}"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -248,6 +250,39 @@
<set field="fixedAssetId"
from-field="parameters.fixedAssetId"/>
</actions>
<widgets>
+ <section>
+ <condition>
+ <if-compare field="parameters.period"
operator="equals" value="day"/>
+ </condition>
+ <actions>
+ <set field="titleProperty"
value="PageTitleCalendarDay"/>
+ <set field="tabButtonItem" value="day"/>
+ </actions>
+ <widgets/>
+ </section>
+ <section>
+ <condition>
+ <or>
+ <if-compare field="parameters.period"
operator="equals" value="week"/>
+ <if-empty field="parameters.period"/>
+ </or>
+ </condition>
+ <actions>
+ <set field="titleProperty"
value="PageTitleCalendarWeek"/>
+ <set field="tabButtonItem" value="week"/>
+ </actions>
+ <widgets/>
+ </section>
+ <section>
+ <condition>
+ <if-compare field="parameters.period"
operator="equals" value="month"/>
+ </condition>
+ <actions>
+ <set field="titleProperty"
value="PageTitleCalendarMonth"/>
+ <set field="tabButtonItem" value="month"/>
+ </actions>
+ <widgets/>
+ </section>
<decorator-screen name="CommonFixedAssetDecorator"
location="${parameters.fixedAssetDecoratorLocation}">
<decorator-section name="body">
<include-screen name="Calendar"
location="component://workeffort/widget/CalendarScreens.xml"/>
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml?rev=796878&r1=796877&r2=796878&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/CommonScreens.xml Wed Jul 22
21:02:08 2009
@@ -94,6 +94,7 @@
<actions>
<set field="headerItem" value="ListFixedAssets"/>
<set field="fixedAssetId" from-field="fixedAsset.fixedAssetId"
default-value="${parameters.fixedAssetId}"/>
+ <entity-one entity-name="FixedAsset" value-field="fixedAsset"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -136,23 +137,6 @@
</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>
