You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 12:17:33 UTC
svn commit: r730096 [2/2] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/admin/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accounting/script/org/ofbiz/accounting/fixedasset/
applications/account...
Modified: ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml (original)
+++ ofbiz/trunk/applications/workeffort/script/org/ofbiz/workeffort/timesheet/TimesheetServices.xml Tue Dec 30 03:17:32 2008
@@ -180,7 +180,7 @@
<field-map field-name="partyId" from-field="timeEntry.partyId"/>
</entity-and>
<if-not-empty field="partyRates">
- <first-from-list entry-name="partyRate" list-name="partyRates"/>
+ <first-from-list entry="partyRate" list="partyRates"/>
<if-not-empty field="partyRate.percentageUsed">
<calculate field-name="timeEntry.hours" type="Double">
<calcop operator="multiply" field-name="timeEntry.hours">
@@ -217,7 +217,7 @@
<set field="invoiceItemMap.description" value="${workEffort.workEffortName} [Task:${workEffort.workEffortId}]"/>
<get-related value-name="workEffort" relation-name="CustRequestWorkEffort" list-name="custRequestWorkEfforts"/>
<if-not-empty field="custRequestWorkEfforts">
- <first-from-list entry-name="custRequestWorkEffort" list-name="custRequestWorkEfforts"/>
+ <first-from-list entry="custRequestWorkEffort" list="custRequestWorkEfforts"/>
<get-related-one value-name="custRequestWorkEffort" relation-name="CustRequest" to-value-name="custRequest"/>
<if-not-empty field="custRequest">
<set field="invoiceItemMap.description" value="${custRequest.custRequestName} [CRQ:${custRequest.custRequestId}]"/>
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=730096&r1=730095&r2=730096&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 Tue Dec 30 03:17:32 2008
@@ -254,7 +254,7 @@
<field-map field-name="roleTypeId" from-field="parameters.roleTypeId"/>
</entity-and>
<if-not-empty field="currentAssignments">
- <first-from-list entry-name="firstAssignment" list-name="currentAssignments"/>
+ <first-from-list entry="firstAssignment" list="currentAssignments"/>
<add-error>
<fail-property resource="WorkEffortUiLabels" property="WorkEffortPartyAssignmentError"/>
</add-error>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml Tue Dec 30 03:17:32 2008
@@ -53,7 +53,7 @@
</condition-list>
</condition-list>
</entity-condition>
- <first-from-list entry-name="countyGeo" list-name="geoList"/>
+ <first-from-list entry="countyGeo" list="geoList"/>
<if-not-empty field="countyGeo">
<!-- We found a county, now just save off the ID -->
<set field="postalAddress.countyGeoId" from-field="countyGeo.geoId"/>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml Tue Dec 30 03:17:32 2008
@@ -93,7 +93,7 @@
<!-- sort by descending fromDate to get newest (biggest) first -->
<order-by field-name="-fromDate"/>
</entity-condition>
- <first-from-list list="uomConversions" entry-name="uomConversion"/>
+ <first-from-list list="uomConversions" entry="uomConversion"/>
<!-- if no conversion found with specified purpose, try w/o purpose -->
<if-empty field="uomConversion">
@@ -110,7 +110,7 @@
</condition-list>
<order-by field-name="-fromDate"/>
</entity-condition>
- <first-from-list list="uomConversions" entry-name="uomConversion"/>
+ <first-from-list list="uomConversions" entry="uomConversion"/>
</if-not-empty>
</if-empty>
</if-empty>
Modified: ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml (original)
+++ ofbiz/trunk/framework/example/script/org/ofbiz/example/example/ExampleServices.xml Tue Dec 30 03:17:32 2008
@@ -29,7 +29,7 @@
<field-map field-name="exampleId" from-field="parameters.exampleId"/>
<order-by field-name="-statusDate"/>
</entity-and>
- <first-from-list entry-name="oldExampleStatus" list-name="oldExampleStatusList"/>
+ <first-from-list entry="oldExampleStatus" list="oldExampleStatusList"/>
<if-not-empty field="oldExampleStatus">
<set field="oldExampleStatus.statusEndDate" from-field="nowTimestamp"/>
<store-value value-name="oldExampleStatus"/>
Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/MyPageServices.xml Tue Dec 30 03:17:32 2008
@@ -32,7 +32,7 @@
<entity-and entity-name="PartyAndUserLogin" list-name="partyUserLogin">
<field-map field-name="partyId" from-field="custReq.fromPartyId"/>
</entity-and>
- <first-from-list entry-name="partyUserLogin" list-name="partyUserLogin"/>
+ <first-from-list entry="partyUserLogin" list="partyUserLogin"/>
<entity-one entity-name="UserPreference" value-name="userPref">
<field-map field-name="userLoginId" value="${partyUserLogin.userLoginId}"/>
<field-map field-name="userPrefTypeId" value="sendCustRequestEmail"/>
@@ -60,7 +60,7 @@
<entity-and entity-name="ProductStoreEmailSetting" list-name="storeEmail">
<field-map field-name="emailType" value="PRDS_CUST_CONFIRM"/>
</entity-and>
- <first-from-list entry-name="storeEmail" list-name="storeEmail"/>
+ <first-from-list entry="storeEmail" list="storeEmail"/>
<set field="statusCustReq" value="COMPLETED"/>
</then>
</if>
@@ -74,7 +74,7 @@
<entity-and entity-name="ProductStoreEmailSetting" list-name="storeEmail">
<field-map field-name="emailType" value="PRDS_CUST_CREATED"/>
</entity-and>
- <first-from-list entry-name="storeEmail" list-name="storeEmail"/>
+ <first-from-list entry="storeEmail" list="storeEmail"/>
<set field="statusCustReq" value="ACCEPTED"/>
</then>
</else-if>
@@ -99,7 +99,7 @@
<entity-and list="webSites" entity-name="WebSite">
<field-map field-name="productStoreId" from-field="storeEmail.productStoreId" />
</entity-and>
- <first-from-list entry-name="webSite" list-name="webSites" />
+ <first-from-list entry="webSite" list="webSites" />
<entity-one entity-name="UserLogin" value-name="userLoginSystem">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Tue Dec 30 03:17:32 2008
@@ -320,7 +320,7 @@
<field-map field-name="originalPortalPageId" from-field="mainPortalPageId"/>
<field-map field-name="ownerUserLoginId" from-field="userLogin.userLoginId"/>
</entity-and>
- <first-from-list entry-name="getMyportal" list-name="getMainPage"/>
+ <first-from-list entry="getMyportal" list="getMainPage"/>
<if-empty field="getMainPage">
<set field="portalPageId" value="MYPORTAL"/>
</if-empty>
Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/MyPortalServices.xml Tue Dec 30 03:17:32 2008
@@ -32,7 +32,7 @@
<entity-and entity-name="PartyAndUserLogin" list-name="partyUserLogin">
<field-map field-name="partyId" from-field="custReq.fromPartyId"/>
</entity-and>
- <first-from-list entry-name="partyUserLogin" list-name="partyUserLogin"/>
+ <first-from-list entry="partyUserLogin" list="partyUserLogin"/>
<entity-one entity-name="UserPreference" value-name="userPref">
<field-map field-name="userLoginId" value="${partyUserLogin.userLoginId}"/>
<field-map field-name="userPrefTypeId" value="sendCustRequestEmail"/>
@@ -60,7 +60,7 @@
<entity-and entity-name="ProductStoreEmailSetting" list-name="storeEmail">
<field-map field-name="emailType" value="PRDS_CUST_CONFIRM"/>
</entity-and>
- <first-from-list entry-name="storeEmail" list-name="storeEmail"/>
+ <first-from-list entry="storeEmail" list="storeEmail"/>
<set field="statusCustReq" value="COMPLETED"/>
</then>
</if>
@@ -74,7 +74,7 @@
<entity-and entity-name="ProductStoreEmailSetting" list-name="storeEmail">
<field-map field-name="emailType" value="PRDS_CUST_CREATED"/>
</entity-and>
- <first-from-list entry-name="storeEmail" list-name="storeEmail"/>
+ <first-from-list entry="storeEmail" list="storeEmail"/>
<set field="statusCustReq" value="ACCEPTED"/>
</then>
</else-if>
@@ -99,7 +99,7 @@
<entity-and list="webSites" entity-name="WebSite">
<field-map field-name="productStoreId" from-field="storeEmail.productStoreId" />
</entity-and>
- <first-from-list entry-name="webSite" list-name="webSites" />
+ <first-from-list entry="webSite" list="webSites" />
<entity-one entity-name="UserLogin" value-name="userLoginSystem">
<field-map field-name="userLoginId" value="system"/>
</entity-one>
Modified: ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml?rev=730096&r1=730095&r2=730096&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/script/org/ofbiz/project/ProjectPermissionServices.xml Tue Dec 30 03:17:32 2008
@@ -154,19 +154,19 @@
<entity-and list="custRequests" entity-name="WorkEffortCustRequestView">
<field-map field-name="workEffortId" from-field="taskId"/>
</entity-and>
- <first-from-list list="custRequests" entry-name="custRequest"/>
+ <first-from-list list="custRequests" entry="custRequest"/>
<entity-and entity-name="PartyRelationship" list-name="accounts">
<field-map field-name="roleTypeIdFrom" value="ACCOUNT"/>
<field-map field-name="roleTypeIdTo" value="CONTACT"/>
<field-map field-name="partyIdTo" from-field="custRequest.fromPartyId"/>
</entity-and>
- <first-from-list list="accounts" entry-name="accountCustReq"/>
+ <first-from-list list="accounts" entry="accountCustReq"/>
<entity-and entity-name="PartyRelationship" list-name="accounts">
<field-map field-name="roleTypeIdFrom" value="ACCOUNT"/>
<field-map field-name="roleTypeIdTo" value="CONTACT"/>
<field-map field-name="partyIdTo" from-field="parameters.userLogin.partyId"/>
</entity-and>
- <first-from-list list="accounts" entry-name="accountLogin"/>
+ <first-from-list list="accounts" entry="accountLogin"/>
<if>
<condition>
<or>
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=730096&r1=730095&r2=730096&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 03:17:32 2008
@@ -67,7 +67,7 @@
</entity-and>
<!-- end current record if required -->
<if-not-empty field="workEffortPartyAssignments">
- <first-from-list entry-name="workEffortPartyAssignment" list-name="workEffortPartyAssignments"/>
+ <first-from-list entry="workEffortPartyAssignment" list="workEffortPartyAssignments"/>
<if-compare-field field="updProjectRole.newPartyId" operator="not-equals" to-field="workEffortPartyAssignment.partyId">
<now-timestamp-to-env env-name="workEffortPartyAssignment.thruDate"/>
<store-value value-name="workEffortPartyAssignment"/>
@@ -254,7 +254,7 @@
<clear-field field-name="task.estimatedCompletionDate"/>
</iterate>
- <first-from-list entry-name="task" list-name="tasks"/>
+ <first-from-list entry="task" list="tasks"/>
<set field="startDate" from-field="task.actualStartDate"/>
<set field="taskId" from-field="task.workEffortId"/>
<else>
@@ -394,7 +394,7 @@
<field-map field-name="workEffortId" from-field="projectId"/>
<field-map field-name="partyId" from-field="timesheet.partyId"/>
</entity-and>
- <first-from-list entry-name="projectAssign" list-name="projectAssigns"/>
+ <first-from-list entry="projectAssign" list="projectAssigns"/>
<set field="parameters.partyId" from-field="timesheet.partyId"/>
<set field="parameters.roleTypeId" from-field="projectAssign.roleTypeId"/>
<set field="parameters.statusId" value="PAS_ASSIGNED"/>
@@ -461,7 +461,7 @@
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
<field-map field-name="partyId" from-field="timesheet.partyId"/>
</entity-and>
- <first-from-list entry-name="alreadyAssign" list-name="assigns"/>
+ <first-from-list entry="alreadyAssign" list="assigns"/>
<if-compare field="alreadyAssign.statusId" value="PAS_COMPLETED" operator="not-equals">
<set field="upStat.partyId" from-field="timesheet.partyId"/>
<set field="upStat.statusId" value="PAS_COMPLETED"/>
@@ -633,7 +633,7 @@
<field-map field-name="sequenceId" from-field="highInfo.sequenceId"/>
<field-map field-name="statusTypeId" value="PROJECT_TASK_STATUS"/>
</entity-and>
- <first-from-list entry-name="status" list-name="statusses"/>
+ <first-from-list entry="status" list="statusses"/>
<set field="highInfo.currentStatusId" from-field="status.statusId"/>
<!-- make sure these statusvalues do not influence the total status if there are other active ones -->
@@ -710,7 +710,7 @@
<field-map field-name="sequenceId" from-field="highInfo.sequenceId"/>
<field-map field-name="statusTypeId" value="PROJECT_TASK_STATUS"/>
</entity-and>
- <first-from-list entry-name="status" list-name="statusses"/>
+ <first-from-list entry="status" list="statusses"/>
<clear-field field-name="highInfo.sequenceId"/>
<set field="highInfo.currentStatusId" from-field="status.statusId"/>
@@ -1050,7 +1050,7 @@
</condition-list>
</entity-condition>
<if-not-empty field="partyRates">
- <first-from-list entry-name="partyRate" list-name="partyRates"/>
+ <first-from-list entry="partyRate" list="partyRates"/>
<if-not-empty field="partyRate.percentageUsed">
<calculate field-name="actual.hours">
<calcop operator="multiply" field-name="actual.hours">
@@ -1196,7 +1196,7 @@
</entity-condition>
<if-not-empty field="timesheets">
<!-- use existing timesheet -->
- <first-from-list entry-name="timesheet" list-name="timesheets"/>
+ <first-from-list entry="timesheet" list="timesheets"/>
<if-compare field="timesheet.statusId" value="TIMESHEET_IN_PROCESS" operator="equals">
<set field="parameters.timesheetId" from-field="timesheet.timesheetId"/>
<else>
@@ -1220,7 +1220,7 @@
<field-map field-name="partyId" from-field="parameters.partyId"/>
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
- <first-from-list entry-name="taskRole" list-name="taskRoles"/>
+ <first-from-list entry="taskRole" list="taskRoles"/>
<set field="parameters.roleTypeId" from-field="taskRole.roleTypeId"/>
<set field="parameters.statusId" value="PAS_ASSIGNED"/>
<call-simple-method method-name="assignPartyToWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/>