Author: lektran
Date: Fri Feb 9 01:54:31 2007 New Revision: 505233 URL: http://svn.apache.org/viewvc?view=rev&rev=505233 Log: Applied patch from Anil K Patel, OFBIZ-705. Tab bar is now shown when New FixedAssetMaint is created in Asset Maint component and also when TimeEntry is deleted. The patch also includes a minor lookup form change. Modified: ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Modified: ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml?view=diff&rev=505233&r1=505232&r2=505233 ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml Fri Feb 9 01:54:31 2007 @@ -37,7 +37,9 @@ <set-service-fields map-name="parameters" service-name="createFixedAssetMaint" to-map-name="createFixedAssetMaintCtx"/> <call-service service-name="createFixedAssetMaint" in-map-name="createFixedAssetMaintCtx"> <result-to-field result-name="maintHistSeqId" map-name="findAssetMaintLookup" field-name="maintHistSeqId"/> + <result-to-request result-name="maintHistSeqId"/> </call-service> + <set from-field="parameters.fixedAssetId" field="findAssetMaintLookup.fixedAssetId"/> <find-by-primary-key entity-name="FixedAssetMaint" map-name="findAssetMaintLookup" value-name="findAssetMaint"/> <set from-field="findAssetMaint.scheduleWorkEffortId" field="updateWorkEffortCtx.workEffortId"/> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml?view=diff&rev=505233&r1=505232&r2=505233 ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Fri Feb 9 01:54:31 2007 @@ -173,7 +173,7 @@ <sub-hyperlink target="EditTimesheet?timesheetId=${timesheetId}" link-style="buttontext" description="TS:${timesheetId}"/> </lookup> </field> - <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field> + <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPerson" default-value="${timesheet.partyId}"/></field> <field name="rateTypeId" title="${uiLabelMap.TimesheetRateType}" widget-style="selectBox"> <drop-down> <entity-options entity-name="RateType" description="${description}"> @@ -187,7 +187,7 @@ <field name="comments"><text size="60"/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink target="deleteWorkEffortTimeEntry?workEffortId=${workEffortId}&timeEntryId=${timeEntryId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="deleteWorkEffortTimeEntry?maintHistSeqId=${maintHistSeqId}&fixedAssetId=${fixedAssetId}&workEffortId=${workEffortId}&timeEntryId=${timeEntryId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> |
Free forum by Nabble | Edit this page |