You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2008/10/09 19:33:36 UTC
svn commit: r703210 - in /ofbiz/trunk/applications/workeffort:
data/WorkEffortTypeData.xml
script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
servicedef/services.xml widget/WorkEffortForms.xml
Author: adrianc
Date: Thu Oct 9 10:33:36 2008
New Revision: 703210
URL: http://svn.apache.org/viewvc?rev=703210&view=rev
Log:
Small fixups in work effort fixed asset assignment.
Modified:
ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
ofbiz/trunk/applications/workeffort/servicedef/services.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
Modified: ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml?rev=703210&r1=703209&r2=703210&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml (original)
+++ ofbiz/trunk/applications/workeffort/data/WorkEffortTypeData.xml Thu Oct 9 10:33:36 2008
@@ -123,7 +123,7 @@
<StatusType description="Fixed Asset Assignment Status" hasTable="N" statusTypeId="FA_ASGN_STATUS"/>
<StatusItem description="Requested" sequenceId="01" statusCode="REQUESTED" statusId="FA_ASGN_REQUESTED" statusTypeId="FA_ASGN_STATUS"/>
<StatusItem description="Assigned" sequenceId="02" statusCode="ASSIGNED" statusId="FA_ASGN_ASSIGNED" statusTypeId="FA_ASGN_STATUS"/>
- <StatusItem description="Request Declined" sequenceId="03" statusCode="DECLINED" statusId="FA_ASGN_DECLINED" statusTypeId="FA_ASGN_STATUS"/>
+ <StatusItem description="Request Denied" sequenceId="03" statusCode="DENIED" statusId="FA_ASGN_DENIED" statusTypeId="FA_ASGN_STATUS"/>
<!-- Status items for WorkEffortFixedAssetAssign.availabilityStatusId -->
<StatusType description="Work Effort Fixed Asset Availability" hasTable="N" statusTypeId="WEFA_AVAILABILITY"/>
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml?rev=703210&r1=703209&r2=703210&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml Thu Oct 9 10:33:36 2008
@@ -918,11 +918,12 @@
if there is no actual start date, default to now (to the current date and time) -->
<if-empty field="parameters.fromDate">
<entity-one entity-name="WorkEffort" value-name="prodRunTask" />
+ <now-timestamp-to-env env-name="newWEFixedAssetAssign.fromDate"/>
+ <if-not-empty field="prodRunTask.estimatedStartDate">
+ <set field="newWEFixedAssetAssign.fromDate" from-field="prodRunTask.estimatedStartDate" />
+ </if-not-empty>
<if-not-empty field="prodRunTask.actualStartDate">
<set field="newWEFixedAssetAssign.fromDate" from-field="prodRunTask.actualStartDate" />
- <else>
- <now-timestamp-to-env env-name="newWEFixedAssetAssign.fromDate"/>
- </else>
</if-not-empty>
</if-empty>
<create-value value-name="newWEFixedAssetAssign" />
Modified: ofbiz/trunk/applications/workeffort/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/servicedef/services.xml?rev=703210&r1=703209&r2=703210&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/workeffort/servicedef/services.xml Thu Oct 9 10:33:36 2008
@@ -473,7 +473,7 @@
with a work effort (e.g. a production run task)</description>
<auto-attributes include="pk" mode="IN" optional="false" />
<auto-attributes include="nonpk" mode="IN" optional="true" />
- <override name="fromDate" optional="true" />
+ <override name="fromDate" optional="true" mode="IN"/>
</service>
<service name="updateWorkEffortFixedAssetAssign" engine="simple" auth="true"
default-entity-name="WorkEffortFixedAssetAssign"
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=703210&r1=703209&r2=703210&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Thu Oct 9 10:33:36 2008
@@ -1117,11 +1117,14 @@
<field name="allocatedCost"><text/></field>
<field name="comments"><text size="60" maxlength="255"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field>
+ <field name="deleteLink" title=" " widget-style="buttontext">
+ <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortFixedAssetAssign?workEffortId=${workEffortId}&fixedAssetId=${fixedAssetId}&fromDate=${fromDate}"/>
+ </field>
</form>
- <form name="EditWorkEffortFixedAssetAssign" default-map-name="workEffortFixedAssetAssign" target="updateWorkEffortFixedAssetAssign" title="" type="single"
+ <form name="EditWorkEffortFixedAssetAssign" target="createWorkEffortFixedAssetAssign" type="single"
header-row-style="header-row" default-table-style="basic-table">
- <alt-target target="createWorkEffortFixedAssetAssign" use-when="workEffortFixedAssetAssign==null"/>
+<!-- <alt-target target="updateWorkEffortFixedAssetAssign" use-when="workEffortFixedAssetAssign!=null"/> -->
<field name="workEffortId"><hidden/></field>
<field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field>
<field name="fromDate"><date-time/></field>