Author: ashish
Date: Sun Jun 29 22:11:36 2008
New Revision: 672707
URL:
http://svn.apache.org/viewvc?rev=672707&view=revLog:
Reverted the Data Model changes from Rev # 672246 as suggested by David.
For now I kept "reason" field in the WorkEffortStatus table as it is.
Discussion on it(reason field) can be done in Dev. mailing list to keep it
either Form text field or reasonEnumId.
Modified:
ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml
ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
Modified: ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml?rev=672707&r1=672706&r2=672707&view=diff==============================================================================
--- ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml (original)
+++ ofbiz/trunk/applications/workeffort/entitydef/entitymodel.xml Sun Jun 29 22:11:36 2008
@@ -245,7 +245,6 @@
<field name="showAsEnumId" type="id"></field>
<field name="sendNotificationEmail" type="indicator"></field>
<field name="description" type="description"></field>
- <field name="statusChangeNote" type="description"></field>
<field name="locationDesc" type="description"></field>
<field name="estimatedStartDate" type="date-time"></field>
<field name="estimatedCompletionDate" type="date-time"></field>
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=672707&r1=672706&r2=672707&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 Sun Jun 29 22:11:36 2008
@@ -115,7 +115,6 @@
<set from-field="lookedUpValue.workEffortId" field="newWorkEffortStatus.workEffortId"/>
<set from-field="parameters.currentStatusId" field="newWorkEffortStatus.statusId"/>
<set from-field="nowTimestamp" field="newWorkEffortStatus.statusDatetime"/>
- <set from-field="lookedUpValue.statusChangeNote" field="newWorkEffortStatus.reason"/>
<set from-field="userLogin.userLoginId" field="newWorkEffortStatus.setByUserLogin"/>
<create-value value-name="newWorkEffortStatus"/>
</then>
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=672707&r1=672706&r2=672707&view=diff==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sun Jun 29 22:11:36 2008
@@ -91,8 +91,6 @@
</field>
<field name="percentComplete" position="2"/>
- <field name="statusChangeNote" use-when="workEffort==null"><ignored/></field>
-
<field name="priority" position="1">
<drop-down allow-empty="true">
<option key="1" description="1 (${uiLabelMap.WorkEffortPriorityHigh})"/><option key="2"/><option key="3"/><option key="4"/><option key="5"/>
@@ -166,7 +164,6 @@
<sort-field name="workEffortPurposeTypeId"/>
<sort-field name="currentStatusId"/>
<sort-field name="percentComplete"/>
- <sort-field name="statusChangeNote"/>
<sort-field name="priority"/>
<sort-field name="scopeEnumId"/>
<sort-field name="estimatedStartDate"/>
Locked
