[OFBiz] SVN: r7752 - in trunk/applications/accounting: webapp/accounting/fixedasset widget

[jonesde@svn.ofbiz.org]

Author: jonesde
Date: 2006-06-07 21:32:04 -0500 (Wed, 07 Jun 2006)
New Revision: 7752

Modified:
   trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
   trunk/applications/accounting/widget/CommonScreens.xml
Log:
Applied patch from Anil Patel with link to FixedAssetMaint WorkEffort; small label cleanup to reuse label in the workeffort component

Modified: trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml
===================================================================
--- trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml	2006-06-07 15:28:01 UTC (rev 7751)
+++ trunk/applications/accounting/webapp/accounting/fixedasset/FixedAssetForms.xml	2006-06-08 02:32:04 UTC (rev 7752)
@@ -362,7 +362,9 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="scheduleWorkEffortId"><lookup target-form-name="LookupWorkEffort"/></field>
+        <field name="scheduleWorkEffortId" title="${uiLabelMap.WorkEffortWorkEffort}" widget-style="buttontext">
+            <hyperlink target="/workeffort/control/WorkEffortSummary?workEffortId=${fixedAssetMaint.scheduleWorkEffortId}" also-hidden="false" description="${fixedAssetMaint.scheduleWorkEffortId}" target-type="inter-app"/>            
+        </field>
         <field name="purchaseOrderId"><lookup target-form-name="LookupOrderHeader"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>

Modified: trunk/applications/accounting/widget/CommonScreens.xml
===================================================================
--- trunk/applications/accounting/widget/CommonScreens.xml	2006-06-07 15:28:01 UTC (rev 7751)
+++ trunk/applications/accounting/widget/CommonScreens.xml	2006-06-08 02:32:04 UTC (rev 7752)
@@ -23,8 +23,9 @@
         <section>
             <actions>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
 
                 <set field="layoutSettings.companyName" from-field="uiLabelMap.AccountingCompanyName" global="true"/>