svn commit: r730111 [6/6] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r730111 [6/6] - in /ofbiz/trunk: applications/accounting/script
 
|
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml?rev=730111&r1=730110&r2=730111&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectServices.xml Tue Dec 30 04:07:14 2008 @@ -139,7 +139,7 @@ </condition> <then> <!-- roleType and/or partyId changed: end old and create new assign--> - <entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/> + <entity-one entity-name="WorkEffortPartyAssignment" value-field="workEffortPartyAssignment"/> <set field="workEffortPartyAssignment.delegateReasonEnumId" from-field="parameters.delegateReasonEnumId"/> <set field="workEffortPartyAssignment.comments" from-field="parameters.comments"/> <set field="workEffortPartyAssignment.assignedByUserLoginId" from-field="userLogin.userLoginId"/> @@ -158,7 +158,7 @@ <else> <if-not-empty field="parameters.fromDate"> <!-- status changed or assignment ended --> - <entity-one entity-name="WorkEffortPartyAssignment" value-name="assignment"> + <entity-one entity-name="WorkEffortPartyAssignment" value-field="assignment"> <field-map field-name="workEffortId" from-field="parameters.workEffortId"/> <field-map field-name="partyId" from-field="parameters.partyId"/> <field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/> @@ -321,7 +321,7 @@ <field field-name="taskDays"/> </call-class-method> <else> - <entity-one entity-name="WorkEffort" value-name="workEffort"> + <entity-one entity-name="WorkEffort" value-field="workEffort"> <field-map field-name="workEffortId" from-field="taskId"/> </entity-one> <if-not-empty field="workEffortId.parentWorkEffortId"> @@ -337,7 +337,7 @@ <!-- create the tasklist --> - <entity-one entity-name="WorkEffort" value-name="project"> + <entity-one entity-name="WorkEffort" value-field="project"> <field-map field-name="workEffortId" from-field="parameters.projectId"/> </entity-one> <get-related value-name="project" relation-name="ChildWorkEffort" list-name="phases"/> @@ -357,7 +357,7 @@ </call-class-method> <set field="upd.workEffortId" from-field="task.workEffortId"/> <call-service service-name="updateWorkEffort" in-map-name="upd"/> - <entity-one entity-name="WorkEffort" value-name="newTask"> + <entity-one entity-name="WorkEffort" value-field="newTask"> <field-map field-name="workEffortId" from-field="task.workEffortId"/> </entity-one> <call-class-method class-name="org.ofbiz.project.Various" method-name="setDatesFollowingTasks"> @@ -378,7 +378,7 @@ <if-compare field="parameters.workEffortId" operator="equals" value="Totals"> <return/> </if-compare> - <entity-one entity-name="Timesheet" value-name="timesheet"/> + <entity-one entity-name="Timesheet" value-field="timesheet"/> <!-- check if party assigned to task, when not add with roletype of project, if assigned check status --> <entity-and entity-name="WorkEffortPartyAssignment" list-name="assigns" filter-by-date="true"> @@ -404,7 +404,7 @@ <!-- check if the actual start date is set, when not set it to todays date --> <if-empty field="project.actualStartDate"> - <entity-one entity-name="WorkEffort" value-name="workEffort"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> <now-timestamp-to-env env-name="workEffort.actualStartDate"/> <store-value value-name="workEffort"/> </if-empty> @@ -480,7 +480,7 @@ </if-empty> </if-empty> <if-not-empty field="parameters.taskId"> - <entity-one entity-name="WorkEffort" value-name="task"> + <entity-one entity-name="WorkEffort" value-field="task"> <field-map field-name="workEffortId" from-field="parameters.taskId"/> </entity-one> <if-not-empty field="task"> @@ -490,7 +490,7 @@ </else> </if-not-empty> <else> - <entity-one entity-name="WorkEffort" value-name="phase"> + <entity-one entity-name="WorkEffort" value-field="phase"> <field-map field-name="workEffortId" from-field="parameters.phaseId"/> </entity-one> </else> @@ -510,7 +510,7 @@ </simple-method> <simple-method method-name="copyProject" short-description="copy a project with related phases and tasks however no actual data"> - <entity-one entity-name="WorkEffort" value-name="project"> + <entity-one entity-name="WorkEffort" value-field="project"> <field-map field-name="workEffortId" from-field="parameters.projectId"/> </entity-one> @@ -596,7 +596,7 @@ <if-not-empty field="parameters.partyId"> <set field="parameters.hoursPartyId" from-field="parameters.partyId"/> </if-not-empty> - <entity-one entity-name="WorkEffort" value-name="project"> + <entity-one entity-name="WorkEffort" value-field="project"> <field-map field-name="workEffortId" from-field="parameters.projectId"/> </entity-one> <set field="highInfo.projectId" from-field="project.workEffortId"/> @@ -604,7 +604,7 @@ <set field="highInfo.projectDescription" from-field="project.description"/> <set field="highInfo.scopeEnumId" from-field="project.scopeEnumId"/> <set field="highInfo.createdStamp" from-field="project.createdStamp"/> - <entity-one entity-name="StatusItem" value-name="highSeq"> + <entity-one entity-name="StatusItem" value-field="highSeq"> <field-map field-name="statusId" from-field="project.currentStatusId"/> </entity-one> <set field="highInfo.createdDate" from-field="project.createdDate"/> @@ -678,7 +678,7 @@ <if-not-empty field="phases"> <iterate entry="phase" list="phases"> <!-- get the phase seq id --> - <entity-one entity-name="StatusItem" value-name="highSeq"> + <entity-one entity-name="StatusItem" value-field="highSeq"> <field-map field-name="statusId" from-field="phase.currentStatusId"/> </entity-one> <clear-field field="highInfo"/> @@ -770,7 +770,7 @@ </simple-method> <simple-method method-name="getProjectTask" short-description="get Project task information" login-required="true"> - <entity-one entity-name="WorkEffort" value-name="lowInfo"> + <entity-one entity-name="WorkEffort" value-field="lowInfo"> <field-map field-name="workEffortId" from-field="parameters.taskId"/> </entity-one> <set field="highInfo.taskId" from-field="lowInfo.workEffortId"/> @@ -812,7 +812,7 @@ <if-empty field="projectParty"> <set field="projectParty.partyId" from-field="task.partyId"/> - <entity-one entity-name="PartyNameView" value-name="partyNameView"> + <entity-one entity-name="PartyNameView" value-field="partyNameView"> <field-map field-name="partyId" from-field="task.partyId"/> </entity-one> <if-not-empty field="partyNameView"> @@ -875,7 +875,7 @@ <if-empty field="taskParty"> <set field="taskParty.partyId" from-field="task.partyId"/> - <entity-one entity-name="PartyNameView" value-name="partyNameView"> + <entity-one entity-name="PartyNameView" value-field="partyNameView"> <field-map field-name="partyId" from-field="task.partyId"/> </entity-one> <if-not-empty field="partyNameView"> @@ -978,7 +978,7 @@ </if-compare> </if-compare> - <entity-one entity-name="StatusItem" value-name="status"> + <entity-one entity-name="StatusItem" value-field="status"> <field-map field-name="statusId" from-field="lowInfo.currentStatusId"/> </entity-one> <if-empty field="highInfo.sequenceId"> @@ -1230,7 +1230,7 @@ <simple-method method-name="addProjectTimeToNewInvoice" short-description="add all reported time on all completed timesheets from all workefforts for a project"> <!-- recreate the invoice if still in preparation in order to correct errors. --> <if-compare operator="equals" value="Y" field="parameters.reCreate"> - <entity-one entity-name="Invoice" value-name="invoice"/> + <entity-one entity-name="Invoice" value-field="invoice"/> <if-empty field="invoice"> <add-error><fail-message message="Could not find invoice with ID [${parameters.invoiceId}], not adding Timesheet Entries to it."/></add-error> <check-errors/> Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml?rev=730111&r1=730110&r2=730111&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectSimpleEvents.xml Tue Dec 30 04:07:14 2008 @@ -44,19 +44,19 @@ </if-not-empty> </simple-method> <simple-method method-name="acceptRequestAndConnectToTask" short-description="Accept a customer request and connect to an existing task"> - <entity-one entity-name="WorkEffort" value-name="workEffort"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> <if-empty field="workEffort"> <add-error><fail-property resource="uiLabelMap" property="ProjectMgrErrorTaskNotFound"/></add-error> </if-empty> <if-compare field="workEffort.currentStatusId" value="PTS_CREATED" operator="not-equals"> <add-error><fail-property resource="uiLabelMap" property="ProjectMgrErrorTaskStatusWrong"/></add-error> </if-compare> - <entity-one entity-name="CustRequest" value-name="custRequest"/> + <entity-one entity-name="CustRequest" value-field="custRequest"/> <if-empty field="custRequest"> <add-error><fail-property resource="uiLabelMap" property="ProjectMgrErrorRequestNotFound"/></add-error> </if-empty> <if-compare field="custRequest.statusId" value="CRQ_ACCEPTED" operator="not-equals"> - <entity-one entity-name="StatusItem" value-name="status"> + <entity-one entity-name="StatusItem" value-field="status"> <field-map field-name="statusId" value="custRequest.statusId"/> </entity-one> <add-error><fail-property resource="uiLabelMap" property="ProjectMgrErrorRequestStatusWrong"/></add-error> @@ -69,7 +69,7 @@ <call-service service-name="createWorkEffortRequest" in-map-name="connectMap"/> </simple-method> <simple-method method-name="setTaskStatusToComplete" short-description="Set the task status to complete, if resources assigned that status will also be set to complete"> - <entity-one entity-name="WorkEffort" value-name="workEffort"/> + <entity-one entity-name="WorkEffort" value-field="workEffort"/> <if-empty field="workEffort"> <add-error><fail-property resource="uiLabelMap" property="ProjectMgrErrorTaskNotFound"/></add-error> </if-empty> @@ -154,7 +154,7 @@ <field field-name="request" type="javax.servlet.http.HttpServletRequest"/> <string value="dataResourceName"/> </call-class-method> - <entity-one entity-name="Content" value-name="content"> + <entity-one entity-name="Content" value-field="content"> <field-map field-name="contentId" from-field="formInput.formInput.contentId"/> </entity-one> <set-service-fields service-name="updateContentAndUploadedFile" map-name="formInput.formInput" to-map-name="inMap"/> Modified: ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml?rev=730111&r1=730110&r2=730111&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/ManagerEvents.xml Tue Dec 30 04:07:14 2008 @@ -202,7 +202,7 @@ <call-object-method obj-field-name="terminalState" method-name="getTimestamp" ret-field-name="openDate"> <field field-name="fieldName" type="String"/> </call-object-method> - <entity-one entity-name="OrderHeader" value-name="orderHeader"> + <entity-one entity-name="OrderHeader" value-field="orderHeader"> <field-map field-name="orderId" from-field="parameters.orderId"/> </entity-one> <if-not-empty field="orderHeader"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |