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 13:11:35 UTC
svn commit: r730114 [2/2] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accounting/script/org/ofbiz/accounting/fixedasset/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accou...
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=730114&r1=730113&r2=730114&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 04:11:33 2008
@@ -61,7 +61,7 @@
<field field-name="nowTimestamp" type="java.sql.Timestamp"/>
</call-class-method>
<!-- check if timesheet already exists -->
- <entity-and entity-name="Timesheet" list-name="timesheets">
+ <entity-and entity-name="Timesheet" list="timesheets">
<field-map field-name="partyId" from-field="parameters.partyId"/>
<field-map field-name="fromDate" from-field="parameters.fromDate"/>
<field-map field-name="thruDate" from-field="parameters.thruDate"/>
@@ -175,7 +175,7 @@
</if-not-empty>
</if-empty>
<if-not-empty field="timeEntry.partyId">
- <entity-and entity-name="PartyRate" list-name="partyRates" filter-by-date="true">
+ <entity-and entity-name="PartyRate" list="partyRates" filter-by-date="true">
<field-map field-name="rateTypeId" from-field="timeEntry.rateTypeId"/>
<field-map field-name="partyId" from-field="timeEntry.partyId"/>
</entity-and>
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=730114&r1=730113&r2=730114&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 04:11:33 2008
@@ -128,7 +128,7 @@
<then>
<if-not-empty field="lookedUpValue.currentStatusId">
<!-- check if the status change is a valid change -->
- <entity-and entity-name="StatusValidChange" list-name="validChange">
+ <entity-and entity-name="StatusValidChange" list="validChange">
<field-map field-name="statusId" from-field="lookedUpValue.currentStatusId"/>
<field-map field-name="statusIdTo" from-field="parameters.currentStatusId"/>
</entity-and>
@@ -169,7 +169,7 @@
</simple-method>
<simple-method method-name="deleteWorkEffort" short-description="Delete Work Effort">
<!-- check permissions before moving on: if update or delete logged in user must be associated OR have the corresponding UPDATE or DELETE permissions -->
- <entity-and entity-name="WorkEffortPartyAssignment" list-name="wepaList">
+ <entity-and entity-name="WorkEffortPartyAssignment" list="wepaList">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
<field-map field-name="partyId" from-field="userLogin.partyId"/>
</entity-and>
@@ -248,7 +248,7 @@
<!-- WorkEffortPartyAssignment -->
<simple-method method-name="assignPartyToWorkEffort" short-description="Assign Party to Work Effort">
<!-- check if the requested party Assignment already exist -->
- <entity-and entity-name="WorkEffortPartyAssignment" list-name="currentAssignments" filter-by-date="true">
+ <entity-and entity-name="WorkEffortPartyAssignment" list="currentAssignments" filter-by-date="true">
<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"/>
@@ -1133,7 +1133,7 @@
<set from-field="parameters.workEffortId" field="newTempValue.workEffortIdFrom"/>
<create-value value-field="newTempValue"/>
</iterate>
- <entity-and entity-name="WorkEffortAssoc" list-name="foundValues">
+ <entity-and entity-name="WorkEffortAssoc" list="foundValues">
<field-map field-name="workEffortIdTo" from-field="parameters.oldWorkEffortId"/>
</entity-and>
<iterate entry="foundValue" list="foundValues">
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml?rev=730114&r1=730113&r2=730114&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/PortalPageServices.xml Tue Dec 30 04:11:33 2008
@@ -51,7 +51,7 @@
<entity-one entity-name="PortalPageColumn" value-field="column" auto-field-map="true" use-cache="true"/>
<if-not-empty field="column">
- <entity-and entity-name="PortalPagePortlet" list-name="portalPortletList">
+ <entity-and entity-name="PortalPagePortlet" list="portalPortletList">
<field-map field-name="portalPageId" from-field="column.portalPageId"/>
<field-map field-name="columnSeqId" from-field="column.columnSeqId"/>
</entity-and>
@@ -93,7 +93,7 @@
</simple-method>
<simple-method method-name="getPortletAttributes" short-description="Get all attributes of a Portlet" login-required="true">
- <entity-and entity-name="PortletAttribute" list-name="attributeList">
+ <entity-and entity-name="PortletAttribute" list="attributeList">
<field-map field-name="portalPageId" from-field="parameters.portalPageId"/>
<field-map field-name="portalPortletId" from-field="parameters.portalPortletId"/>
<field-map field-name="portletSeqId" from-field="parameters.portletSeqId"/>
@@ -126,7 +126,7 @@
<entity-one entity-name="PortalPage" value-field="portalPage" auto-field-map="true" use-cache="true"/>
<if-not-empty field="portalPage">
- <entity-and entity-name="PortalPageColumn" list-name="portalPageColumnList">
+ <entity-and entity-name="PortalPageColumn" list="portalPageColumnList">
<field-map field-name="portalPageId" from-field="portalPage.portalPageId"/>
</entity-and>
@@ -145,7 +145,7 @@
<simple-method method-name="getListPreferences" short-description="">
<set field="mainPortalPageId" from-field="parameters.mainPortalPageId"/>
- <entity-and entity-name="PortalPage" list-name="getMainPage">
+ <entity-and entity-name="PortalPage" list="getMainPage">
<field-map field-name="originalPortalPageId" from-field="mainPortalPageId"/>
<field-map field-name="ownerUserLoginId" from-field="userLogin.userLoginId"/>
</entity-and>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml?rev=730114&r1=730113&r2=730114&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/olap/CommonDimensionServices.xml Tue Dec 30 04:11:33 2008
@@ -23,11 +23,11 @@
<!-- OLAP Dimension -->
<simple-method method-name="loadCurrencyDimension" short-description="Initialize the CurrencyDimension using the update strategy of 'type 1'">
- <entity-and entity-name="Uom" list-name="currencies">
+ <entity-and entity-name="Uom" list="currencies">
<field-map field-name="uomTypeId" value="CURRENCY_MEASURE"/>
</entity-and>
<iterate list="currencies" entry="currency">
- <entity-and entity-name="CurrencyDimension" list-name="currencyDims">
+ <entity-and entity-name="CurrencyDimension" list="currencyDims">
<field-map field-name="currencyId" from-field="currency.uomId"/>
</entity-and>
<if-not-empty field="currencyDims">
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=730114&r1=730113&r2=730114&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 04:11:33 2008
@@ -25,7 +25,7 @@
<now-timestamp-to-env env-name="nowTimestamp"/>
<!-- find the most recent status record and set the statusEndDate -->
- <entity-and entity-name="ExampleStatus" list-name="oldExampleStatusList">
+ <entity-and entity-name="ExampleStatus" list="oldExampleStatusList">
<field-map field-name="exampleId" from-field="parameters.exampleId"/>
<order-by field-name="-statusDate"/>
</entity-and>
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=730114&r1=730113&r2=730114&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 04:11:33 2008
@@ -29,7 +29,7 @@
</condition>
<then>
<if-not-empty field="custReq.fromPartyId">
- <entity-and entity-name="PartyAndUserLogin" list-name="partyUserLogin">
+ <entity-and entity-name="PartyAndUserLogin" list="partyUserLogin">
<field-map field-name="partyId" from-field="custReq.fromPartyId"/>
</entity-and>
<first-from-list entry="partyUserLogin" list="partyUserLogin"/>
@@ -57,7 +57,7 @@
</or>
</condition>
<then>
- <entity-and entity-name="ProductStoreEmailSetting" list-name="storeEmail">
+ <entity-and entity-name="ProductStoreEmailSetting" list="storeEmail">
<field-map field-name="emailType" value="PRDS_CUST_CONFIRM"/>
</entity-and>
<first-from-list entry="storeEmail" list="storeEmail"/>
@@ -71,7 +71,7 @@
<if-compare field="custReq.statusId" value="CRQ_ACCEPTED" operator="equals"></if-compare>
</condition>
<then>
- <entity-and entity-name="ProductStoreEmailSetting" list-name="storeEmail">
+ <entity-and entity-name="ProductStoreEmailSetting" list="storeEmail">
<field-map field-name="emailType" value="PRDS_CUST_CREATED"/>
</entity-and>
<first-from-list entry="storeEmail" list="storeEmail"/>
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=730114&r1=730113&r2=730114&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 04:11:33 2008
@@ -316,7 +316,7 @@
<!--Create simple-method of getPortalPageId-->
<simple-method method-name="getPortalPageId" short-description="">
<set field="mainPortalPageId" value="MAINMYPORTAL"/>
- <entity-and entity-name="PortalPage" list-name="getMainPage">
+ <entity-and entity-name="PortalPage" list="getMainPage">
<field-map field-name="originalPortalPageId" from-field="mainPortalPageId"/>
<field-map field-name="ownerUserLoginId" from-field="userLogin.userLoginId"/>
</entity-and>
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=730114&r1=730113&r2=730114&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 04:11:33 2008
@@ -29,7 +29,7 @@
</condition>
<then>
<if-not-empty field="custReq.fromPartyId">
- <entity-and entity-name="PartyAndUserLogin" list-name="partyUserLogin">
+ <entity-and entity-name="PartyAndUserLogin" list="partyUserLogin">
<field-map field-name="partyId" from-field="custReq.fromPartyId"/>
</entity-and>
<first-from-list entry="partyUserLogin" list="partyUserLogin"/>
@@ -57,7 +57,7 @@
</or>
</condition>
<then>
- <entity-and entity-name="ProductStoreEmailSetting" list-name="storeEmail">
+ <entity-and entity-name="ProductStoreEmailSetting" list="storeEmail">
<field-map field-name="emailType" value="PRDS_CUST_CONFIRM"/>
</entity-and>
<first-from-list entry="storeEmail" list="storeEmail"/>
@@ -71,7 +71,7 @@
<if-compare field="custReq.statusId" value="CRQ_ACCEPTED" operator="equals"></if-compare>
</condition>
<then>
- <entity-and entity-name="ProductStoreEmailSetting" list-name="storeEmail">
+ <entity-and entity-name="ProductStoreEmailSetting" list="storeEmail">
<field-map field-name="emailType" value="PRDS_CUST_CREATED"/>
</entity-and>
<first-from-list entry="storeEmail" list="storeEmail"/>
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=730114&r1=730113&r2=730114&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 04:11:33 2008
@@ -155,13 +155,13 @@
<field-map field-name="workEffortId" from-field="taskId"/>
</entity-and>
<first-from-list list="custRequests" entry="custRequest"/>
- <entity-and entity-name="PartyRelationship" list-name="accounts">
+ <entity-and entity-name="PartyRelationship" list="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="accountCustReq"/>
- <entity-and entity-name="PartyRelationship" list-name="accounts">
+ <entity-and entity-name="PartyRelationship" list="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"/>
@@ -360,7 +360,7 @@
<set field="projectId" from-field="phase.workEffortParentId"/>
</if-empty>
<if-not-empty field="projectId">
- <entity-and entity-name="WorkEffortPartyAssignment" list-name="projectAssigns" filter-by-date="true" use-cache="true">
+ <entity-and entity-name="WorkEffortPartyAssignment" list="projectAssigns" filter-by-date="true" use-cache="true">
<field-map field-name="workEffortId" from-field="projectId"/>
<field-map field-name="partyId" from-field="partyId"/>
</entity-and>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -61,7 +61,7 @@
<simple-method method-name="updProjectRole"
short-description="update/create a specif role and type for a project
input map: updProjectRole.newPartyId, updProjectRole.roleTypeId">
- <entity-and entity-name="WorkEffortPartyAssignment" list-name="workEffortPartyAssignments" filter-by-date="true">
+ <entity-and entity-name="WorkEffortPartyAssignment" list="workEffortPartyAssignments" filter-by-date="true">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
<field-map field-name="roleTypeId" value="updProjectRole.roleTypeId"/>
</entity-and>
@@ -185,7 +185,7 @@
<simple-method method-name="updateTaskStatusToComplete"
short-description="Check partyassignments on a task, if all completes set task status to completed and set actual completiondate to now">
- <entity-and entity-name="WorkEffortPartyAssignment" list-name="assignments" filter-by-date="true">
+ <entity-and entity-name="WorkEffortPartyAssignment" list="assignments" filter-by-date="true">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
<!-- check if all open assignments were completed -->
@@ -266,7 +266,7 @@
<if-empty field="generalStartDate"/>
</condition>
<then>
- <entity-and entity-name="WorkEffortAssoc" list-name="assocs">
+ <entity-and entity-name="WorkEffortAssoc" list="assocs">
<field-map field-name="workEffortIdTo" from-field="taskId"/>
</entity-and>
<if-not-empty field="assocs">
@@ -381,7 +381,7 @@
<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">
+ <entity-and entity-name="WorkEffortPartyAssignment" list="assigns" filter-by-date="true">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
<field-map field-name="partyId" from-field="timesheet.partyId"/>
</entity-and>
@@ -390,7 +390,7 @@
<call-service service-name="getProjectIdAndNameFromTask" in-map-name="getpr">
<result-to-field result-name="projectId"/>
</call-service>
- <entity-and entity-name="WorkEffortPartyAssignment" list-name="projectAssigns" filter-by-date="true">
+ <entity-and entity-name="WorkEffortPartyAssignment" list="projectAssigns" filter-by-date="true">
<field-map field-name="workEffortId" from-field="projectId"/>
<field-map field-name="partyId" from-field="timesheet.partyId"/>
</entity-and>
@@ -457,7 +457,7 @@
<!-- update the assignment status if required -->
<if-compare field="parameters.checkComplete" value="Y" operator="equals">
- <entity-and entity-name="WorkEffortPartyAssignment" list-name="assigns" filter-by-date="true">
+ <entity-and entity-name="WorkEffortPartyAssignment" list="assigns" filter-by-date="true">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
<field-map field-name="partyId" from-field="timesheet.partyId"/>
</entity-and>
@@ -629,7 +629,7 @@
</if-not-empty>
<!-- translate squenceId back into statusId -->
- <entity-and entity-name="StatusItem" list-name="statusses">
+ <entity-and entity-name="StatusItem" list="statusses">
<field-map field-name="sequenceId" from-field="highInfo.sequenceId"/>
<field-map field-name="statusTypeId" value="PROJECT_TASK_STATUS"/>
</entity-and>
@@ -670,7 +670,7 @@
<if-empty field="parameters.projectId">
<return/>
</if-empty>
- <entity-and entity-name="WorkEffort" list-name="phases">
+ <entity-and entity-name="WorkEffort" list="phases">
<field-map field-name="workEffortTypeId" value="PHASE"/>
<field-map field-name="workEffortParentId" from-field="parameters.projectId"/>
<order-by field-name="workEffortName"/>
@@ -706,7 +706,7 @@
<call-simple-method method-name="createDates"/>
<!-- translate squenceId back into statusId -->
- <entity-and entity-name="StatusItem" list-name="statusses">
+ <entity-and entity-name="StatusItem" list="statusses">
<field-map field-name="sequenceId" from-field="highInfo.sequenceId"/>
<field-map field-name="statusTypeId" value="PROJECT_TASK_STATUS"/>
</entity-and>
@@ -745,7 +745,7 @@
<if-empty field="parameters.projectId">
<return/>
</if-empty>
- <entity-and entity-name="ProjectAndPhaseAndTask" list-name="tasks">
+ <entity-and entity-name="ProjectAndPhaseAndTask" list="tasks">
<field-map field-name="projectId" from-field="parameters.projectId"/>
<order-by field-name="phaseName"/>
<order-by field-name="workEffortName"/>
@@ -1216,7 +1216,7 @@
</if-empty>
</if-not-empty>
<!-- get role for this party in this project -->
- <entity-and entity-name="ProjectPartyAndPhaseAndTask" list-name="taskRoles" filter-by-date="true">
+ <entity-and entity-name="ProjectPartyAndPhaseAndTask" list="taskRoles" filter-by-date="true">
<field-map field-name="partyId" from-field="parameters.partyId"/>
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
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=730114&r1=730113&r2=730114&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:11:33 2008
@@ -77,7 +77,7 @@
<add-error><fail-property resource="uiLabelMap" property="ProjectMgrErrorTaskStatusWrong"/></add-error>
</if-compare>
<check-errors/>
- <entity-and entity-name="WorkEffortPartyAssignment" list-name="assigns" filter-by-date="true">
+ <entity-and entity-name="WorkEffortPartyAssignment" list="assigns" filter-by-date="true">
<field-map field-name="workEffortId" from-field="parameters.workEffortId"/>
</entity-and>
<!-- if all assigns are complete the task will be set to complete -->