svn commit: r730183 [6/6] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r730183 [6/6] - in /ofbiz/trunk: applications/accounting/script
 
|
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=730183&r1=730182&r2=730183&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 09:12:15 2008 @@ -86,7 +86,7 @@ <check-errors/> <entity-one entity-name="Timesheet" value-field="timesheet"/> - <get-related value-field="timesheet" relation-name="TimeEntry" list-name="timeEntryList"/> + <get-related value-field="timesheet" relation-name="TimeEntry" list="timeEntryList"/> <if-empty field="parameters.invoiceId"> <set-service-fields service-name="createInvoice" map="parameters" to-map="createInvoiceMap"/> @@ -118,7 +118,7 @@ <set field="createInvoiceMap.invoiceTypeId" value="SALES_INVOICE"/> <set field="createInvoiceMap.statusId" value="INVOICE_IN_PROCESS"/> <call-service service-name="createInvoice" in-map-name="createInvoiceMap"> - <result-to-field result-name="invoiceId" field-name="parameters.invoiceId"/> + <result-to-field result-name="invoiceId" field="parameters.invoiceId"/> </call-service> <field-to-result field="parameters.invoiceId" result-name="invoiceId"/> </if-empty> @@ -144,7 +144,7 @@ </simple-method> <simple-method method-name="createTimeEntryInvoiceItemsInline" short-description="createTimeEntryInvoiceItemsInline"> <set field="orderBy[]" value="rateTypeId"/> - <get-related value-name="workEffort" relation-name="TimeEntry" list-name="timeEntryList" order-by-list-name="orderBy"/> + <get-related value-field="workEffort" relation-name="TimeEntry" list-name="timeEntryList" order-by-list="orderBy"/> <set field="invoiceItemMap.invoiceId" from-field="parameters.invoiceId"/> <set field="invoiceItemMap.taxableFlag" value="N"/> <set field="invoiceItemMap.invoiceItemTypeId" value="INV_TE_ITEM"/> @@ -182,13 +182,13 @@ <if-not-empty field="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"> - <calcop operator="get" field-name="partyRate.percentageUsed"/> + <calculate field="timeEntry.hours" type="Double"> + <calcop operator="multiply" field="timeEntry.hours"> + <calcop operator="get" field="partyRate.percentageUsed"/> </calcop> </calculate> - <calculate field-name="timeEntry.hours" type="Double"> - <calcop operator="divide" field-name="timeEntry.hours"> + <calculate field="timeEntry.hours" type="Double"> + <calcop operator="divide" field="timeEntry.hours"> <number value="100"/> </calcop> </calculate> @@ -215,10 +215,10 @@ <set field="invoiceItemMap.amount" from-field="rateAmount" default-value="0.0" type="Double"/> <if-compare field="parameters.combineInvoiceItem" operator="equals" value="Y" > <set field="invoiceItemMap.description" value="${workEffort.workEffortName} [Task:${workEffort.workEffortId}]"/> - <get-related value-name="workEffort" relation-name="CustRequestWorkEffort" list-name="custRequestWorkEfforts"/> + <get-related value-field="workEffort" relation-name="CustRequestWorkEffort" list="custRequestWorkEfforts"/> <if-not-empty field="custRequestWorkEfforts"> <first-from-list entry="custRequestWorkEffort" list="custRequestWorkEfforts"/> - <get-related-one value-name="custRequestWorkEffort" relation-name="CustRequest" to-value-name="custRequest"/> + <get-related-one value-name="custRequestWorkEffort" relation-name="CustRequest" to-value-field="custRequest"/> <if-not-empty field="custRequest"> <set field="invoiceItemMap.description" value="${custRequest.custRequestName} [CRQ:${custRequest.custRequestId}]"/> </if-not-empty> @@ -226,16 +226,16 @@ <set field="invoiceItemMap.quantity" from-field="timeEntry.hours" default-value="0.0" type="Double"/> <clear-field field="invoiceItemMap.invoiceItemSeqId"/><!-- make sure a new one is created --> <call-service service-name="createInvoiceItem" in-map-name="invoiceItemMap"> - <result-to-field result-name="invoiceItemSeqId" field-name="invoiceItemMap.invoiceItemSeqId"/> + <result-to-field result-name="invoiceItemSeqId" field="invoiceItemMap.invoiceItemSeqId"/> </call-service> </if-compare> </then> <else> <if-compare field="parameters.combineInvoiceItem" operator="equals" value="Y" > <!-- or combine them when it is the same rate --> - <calculate field-name="invoiceItemMap.quantity"> - <calcop operator="get" field-name="invoiceItemMap.quantity"/> - <calcop operator="add" field-name="timeEntry.hours"/> + <calculate field="invoiceItemMap.quantity"> + <calcop operator="get" field="invoiceItemMap.quantity"/> + <calcop operator="add" field="timeEntry.hours"/> </calculate> <call-service service-name="updateInvoiceItem" in-map-name="invoiceItemMap"/> </if-compare> @@ -252,7 +252,7 @@ <set field="invoiceItemMap.quantity" from-field="timeEntry.hours" default-value="0.0" type="Double"/> <clear-field field="invoiceItemMap.invoiceItemSeqId"/><!-- make sure a new one is created --> <call-service service-name="createInvoiceItem" in-map-name="invoiceItemMap"> - <result-to-field result-name="invoiceItemSeqId" field-name="invoiceItemMap.invoiceItemSeqId"/> + <result-to-field result-name="invoiceItemSeqId" field="invoiceItemMap.invoiceItemSeqId"/> </call-service> </if-compare> <!-- update the time entry --> @@ -346,7 +346,7 @@ <set field="getRate.rateCurrencyUomId" from-field="parameters.currencyUomId"/> <set field="getRate.rateTypeId" from-field="timeEntry.rateTypeId"/> <if-empty field="timeEntry.partyId"> - <get-related-one value-name="timeEntry" relation-name="Timesheet" to-value-name="timesheet"/> + <get-related-one value-name="timeEntry" relation-name="Timesheet" to-value-field="timesheet"/> <if-not-empty field="timesheet"> <set field="getRate.partyId" from-field="timesheet.partyId"/> </if-not-empty> @@ -380,7 +380,7 @@ </if-empty> <!-- check if the status is in progress... --> <if-compare field="timesheet.statusId" value="TIMESHEET_IN_PROCESS" operator="not-equals"> - <get-related-one value-name="timesheet" relation-name="StatusItem" to-value-name="statusItem"/> + <get-related-one value-name="timesheet" relation-name="StatusItem" to-value-field="statusItem"/> <add-error><fail-message message="Can only update Timesheet, when status is in-process...current status: ${statusItem.description}"/></add-error> <log level="info" message="Can only update Timesheet, when status is in-process...is now: ${timesheet.statusId}"/> </if-compare> 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=730183&r1=730182&r2=730183&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 09:12:15 2008 @@ -342,7 +342,7 @@ <set from-field="parameters.workEffortId" field="newValue.workEffortId"/> <set-nonpk-fields map="parameters" value-field="newValue"/> <field-to-result field="contactMechId" map-name="newValue"/> - <field-to-request field-name="contactMechId" map-name="newValue"/> + <field-to-request field="contactMechId" map-name="newValue"/> <create-value value-field="newValue"/> </simple-method> @@ -380,7 +380,7 @@ </if-compare-field> <field-to-result field="contactMechId" map-name="newWorkEffortContactMech"/> - <field-to-request field-name="contactMechId" map-name="newWorkEffortContactMech"/> + <field-to-request field="contactMechId" map-name="newWorkEffortContactMech"/> </simple-method> <simple-method method-name="deleteWorkEffortContactMech" short-description="Delete a WorkEffortContactMech"> @@ -421,7 +421,7 @@ <call-service in-map-name="context2" break-on-error="true" service-name="createWorkEffortContactMech"> <default-message>WorkEffort Contact Mechanism successfully created</default-message> </call-service> - <field-to-request field-name="contactMechId" map-name="newValue"/> + <field-to-request field="contactMechId" map-name="newValue"/> <field-to-result field="contactMechId" map-name="newValue"/> </simple-method> @@ -431,7 +431,7 @@ processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/> <call-service in-map-name="context" service-name="updatePostalAddress"> <default-message>Postal Address successfully updated</default-message> - <result-to-field result-name="contactMechId" map-name="newValue" field-name="contactMechId" /> + <result-to-field result-name="contactMechId" map-name="newValue" field="contactMechId" /> </call-service> <call-map-processor xml-resource="org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml" processor-name="workEffortContactMech" in-map-name="parameters" out-map-name="context2"/> @@ -441,7 +441,7 @@ <call-service in-map-name="context2" service-name="updateWorkEffortContactMech"> <default-message>WorkEffort Contact Mechanism successfully updated</default-message> </call-service> - <field-to-request field-name="contactMechId" map-name="newValue"/> + <field-to-request field="contactMechId" map-name="newValue"/> <field-to-result field="contactMechId" map-name="newValue"/> </simple-method> @@ -472,7 +472,7 @@ <call-service in-map-name="context2" break-on-error="true" service-name="createWorkEffortContactMech"> <default-message>WorkEffort Contact Mechanism successfully created</default-message> </call-service> - <field-to-request field-name="contactMechId" map-name="newValue"/> + <field-to-request field="contactMechId" map-name="newValue"/> <field-to-result field="contactMechId" map-name="newValue"/> </simple-method> @@ -482,7 +482,7 @@ processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/> <call-service in-map-name="context" service-name="updateTelecomNumber"> <default-message>Telecom Number successfully updated</default-message> - <result-to-field result-name="contactMechId" map-name="newValue" field-name="contactMechId" /> + <result-to-field result-name="contactMechId" map-name="newValue" field="contactMechId" /> </call-service> <call-map-processor xml-resource="org/ofbiz/workeffort/workeffort/WorkflowMapProcessors.xml" @@ -494,7 +494,7 @@ <default-message>Party Contact Mechanism successfully updated</default-message> </call-service> <log level="info" message="Setting result id: ${newValue.contactMechId}"/> - <field-to-request field-name="contactMechId" map-name="newValue"/> + <field-to-request field="contactMechId" map-name="newValue"/> <field-to-result field="contactMechId" map-name="newValue"/> </simple-method> @@ -603,7 +603,7 @@ <set-service-fields service-name="createWorkEffort" map="parameters" to-map="createWorkeEffortParams"/> <call-service in-map="createWorkeEffortParams" service-name="createWorkEffort"> <result-to-result result-name="workEffortId"/> - <result-to-field result-name="workEffortId" field-name="workEffortIdTo"/> + <result-to-field result-name="workEffortId" field="workEffortIdTo"/> </call-service> <set field="parameters.workEffortIdTo" from-field="workEffortIdTo"/> </if-empty> @@ -675,9 +675,9 @@ <entity-one entity-name="WorkEffortInventoryAssign" value-field="foundEntity"/> <if-not-empty field="foundEntity"> - <calculate field-name="foundEntity.quantity" type="Double"> - <calcop field-name="foundEntity.quantity" operator="get"/> - <calcop field-name="parameters.quantity" operator="get"/> + <calculate field="foundEntity.quantity" type="Double"> + <calcop field="foundEntity.quantity" operator="get"/> + <calcop field="parameters.quantity" operator="get"/> </calculate> <store-value value-name="foundEntity"/> <else> @@ -1224,7 +1224,7 @@ <field-map field-name="userLoginId" value="system"/> </entity-one> <call-service service-name="createWorkEffort" in-map-name="createEventMap"> - <result-to-field result-name="workEffortId" field-name="workEffortId" map-name="eventMap"/> + <result-to-field result-name="workEffortId" field="eventMap.workEffortId"/> </call-service> <call-simple-method method-name="testUpdateEventService"/> <entity-one entity-name="WorkEffort" value-field="workEffort"> @@ -1261,7 +1261,7 @@ <field-map field-name="userLoginId" value="system"/> </entity-one> <call-service service-name="createWorkEffort" in-map-name="createProjectMap"> - <result-to-field result-name="workEffortId" field-name="workEffortId" map-name="projectMap"/> + <result-to-field result-name="workEffortId" field="projectMap.workEffortId"/> </call-service> <call-simple-method method-name="testUpdateProjectService"/> <call-simple-method method-name="testCreateWorkEffortNoteService"/> @@ -1306,7 +1306,7 @@ <field-map field-name="userLoginId" value="system"/> </entity-one> <call-service service-name="createWorkEffortNote" in-map-name="createWorkEffortNoteMap"> - <result-to-field result-name="noteId" field-name="noteId" map-name="workEffortNoteMap"/> + <result-to-field result-name="noteId" field="workEffortNoteMap.noteId"/> </call-service> <check-errors/> </simple-method> 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=730183&r1=730182&r2=730183&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 09:12:15 2008 @@ -53,7 +53,7 @@ </entity-one> <call-service service-name="createExample" in-map-name="createExampleMap"> - <result-to-field result-name="exampleId" field-name="exampleId"/> + <result-to-field result-name="exampleId" field="exampleId"/> </call-service> <entity-one entity-name="Example" value-field="example"/> Modified: ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml?rev=730183&r1=730182&r2=730183&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml Tue Dec 30 09:12:15 2008 @@ -25,7 +25,7 @@ short-description="Create FixedAssetMaint and Update Schedule information in WorkEffort"> <set-service-fields map="parameters" service-name="createFixedAssetMaint" to-map="createFixedAssetMaintCtx"/> <call-service service-name="createFixedAssetMaint" in-map="createFixedAssetMaintCtx"> - <result-to-field result-name="maintHistSeqId" map-name="findAssetMaintLookup" field-name="maintHistSeqId"/> + <result-to-field result-name="maintHistSeqId" map-name="findAssetMaintLookup" field="maintHistSeqId"/> <result-to-request result-name="maintHistSeqId"/> </call-service> <check-errors/> Modified: ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml?rev=730183&r1=730182&r2=730183&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml (original) +++ ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml Tue Dec 30 09:12:15 2008 @@ -47,7 +47,7 @@ <set value="hhFacility Receipt" field="receiveCtx.comments"/> <set from-field="nowTimestamp" field="receiveCtx.datetimeReceived"/> <set value="NON_SERIAL_INV_ITEM" field="receiveCtx.inventoryItemTypeId"/> - <calculate field-name="quantityRejected" map-name="receiveCtx" type="Double"> + <calculate field="quantityRejected" map-name="receiveCtx" type="Double"> <number value="0"/> </calculate> <call-service service-name="receiveInventoryProduct" in-map-name="receiveCtx"/> Modified: ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml?rev=730183&r1=730182&r2=730183&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml Tue Dec 30 09:12:15 2008 @@ -116,7 +116,7 @@ <entity-condition list="commEvents" entity-name="CommunicationEvent" /> <set field="count" value="0" type="Integer" /> <iterate entry="commEvent" list="commEvents"> - <get-related value-name="commEvent" relation-name="CommunicationEventRole" list-name="roles" /> + <get-related value-field="commEvent" relation-name="CommunicationEventRole" list="roles"/> <if-empty field="roles"> <!--partyId To --> <if-not-empty field="commEvent.partyIdTo"> @@ -156,9 +156,9 @@ <set field="commRole.statusId" value="COM_ROLE_COMPLETED"/> <create-value value-field="commRole" /> </if-not-empty> - <calculate field-name="count"> + <calculate field="count"> <number value="1" /> - <calcop operator="add" field-name="count" /> + <calcop operator="add" field="count" /> </calculate> </if-empty> </iterate> @@ -211,7 +211,7 @@ <set field="data._uploadedFile_fileName" from-field="formInput.imageFileName"/> <set field="data._uploadedFile_contentType" from-field="formInput.formInput.mimeTypeId"/> <call-service service-name="createDataResource" in-map-name="data"> - <result-to-field result-name="dataResourceId" field-name="dataResourceId" map-name="parameters"/> + <result-to-field result-name="dataResourceId" field="parameters.dataResourceId"/> </call-service> <log level="always" message=" DataResource : ${parameters.dataResourceId}"></log> @@ -231,7 +231,7 @@ <set field="contentMap.contentTypeId" from-field="formInput.formInput.contentTypeId"/> <set field="contentMap.dataResourceId" from-field="parameters.dataResourceId"/> <call-service service-name="createContentFromDataResource" in-map-name="contentMap"> - <result-to-field result-name="contentId" field-name="contentId" map-name="parameters"/> + <result-to-field result-name="contentId" field="parameters.contentId"/> </call-service> <log level="always" message=" Content : ${parameters.contentId}"></log> @@ -247,14 +247,14 @@ <set field="contentAssoc.contentId" from-field="parameters.contentId"/> <set field="contentAssoc.communicationEventId" from-field="formInput.formInput.communicationEventId"/> <call-service service-name="createCommEventContentAssoc" in-map-name="contentAssoc"> - <result-to-field result-name="fromDate" field-name="fromDate"/> + <result-to-field result-name="fromDate" field="fromDate"/> </call-service> <!-- Return to request --> <set field="communicationEventTypeId" from-field="formInput.formInput.communicationEventTypeId"/> <set field="communicationEventId" from-field="formInput.formInput.communicationEventId"/> - <field-to-request field-name="communicationEventId" request-name="communicationEventId"/> - <field-to-request field-name="communicationEventTypeId" request-name="communicationEventTypeId"/> + <field-to-request field="communicationEventId" request-name="communicationEventId"/> + <field-to-request field="communicationEventTypeId" request-name="communicationEventTypeId"/> </simple-method> @@ -279,14 +279,14 @@ <set field="contentAssoc.contentId" from-field="formInput.formInput.contentId"/> <set field="contentAssoc.communicationEventId" from-field="formInput.formInput.communicationEventId"/> <call-service service-name="createCommEventContentAssoc" in-map-name="contentAssoc"> - <result-to-field result-name="fromDate" field-name="fromDate"/> + <result-to-field result-name="fromDate" field="fromDate"/> </call-service> <!-- Return to request --> <set field="communicationEventTypeId" from-field="formInput.formInput.communicationEventTypeId"/> <set field="communicationEventId" from-field="formInput.formInput.communicationEventId"/> - <field-to-request field-name="communicationEventTypeId" request-name="communicationEventTypeId"/> - <field-to-request field-name="communicationEventId" request-name="communicationEventId"/> + <field-to-request field="communicationEventTypeId" request-name="communicationEventTypeId"/> + <field-to-request field="communicationEventId" request-name="communicationEventId"/> </simple-method> </simple-methods> 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=730183&r1=730182&r2=730183&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 09:12:15 2008 @@ -94,7 +94,7 @@ </entity-one> <set field="getPartyEmail.partyId" from-field="custReq.fromPartyId"/> <call-service service-name="getPartyEmail" in-map-name="getPartyEmail"> - <result-to-field result-name="emailAddress" field-name="emailParams.sendTo"/> + <result-to-field result-name="emailAddress" field="emailParams.sendTo"/> </call-service> <entity-and list="webSites" entity-name="WebSite"> <field-map field-name="productStoreId" from-field="storeEmail.productStoreId" /> 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=730183&r1=730182&r2=730183&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 09:12:15 2008 @@ -118,8 +118,8 @@ <set field="count" value="0" type="Integer"/> <iterate entry="commEvent" list="commEvents"> <log level="always" message="====processing: ${commEvent.communicationEventId}"/> - <get-related value-name="commEvent" relation-name="CommunicationEventRole" - list-name="roles"/> + <get-related value-field="commEvent" relation-name="CommunicationEventRole" + list="roles"/> <if-empty field="roles"> <!--partyId To --> <if-not-empty field="commEvent.partyIdTo"> @@ -161,9 +161,9 @@ <set field="commRole.statusId" value="COM_ROLE_COMPLETED"/> <create-value value-field="commRole"/> </if-not-empty> - <calculate field-name="count"> + <calculate field="count"> <number value="1"/> - <calcop operator="add" field-name="count"/> + <calcop operator="add" field="count"/> </calculate> </if-empty> </iterate> @@ -220,7 +220,7 @@ <set field="data._uploadedFile_fileName" from-field="formInput.imageFileName"/> <set field="data._uploadedFile_contentType" from-field="formInput.formInput.mimeTypeId"/> <call-service service-name="createDataResource" in-map-name="data"> - <result-to-field result-name="dataResourceId" field-name="dataResourceId" + <result-to-field result-name="dataResourceId" field="dataResourceId" map-name="parameters"/> </call-service> <log level="always" message=" DataResource : ${parameters.dataResourceId}"/> @@ -243,7 +243,7 @@ <set field="contentMap.contentTypeId" from-field="formInput.formInput.contentTypeId"/> <set field="contentMap.dataResourceId" from-field="parameters.dataResourceId"/> <call-service service-name="createContentFromDataResource" in-map-name="contentMap"> - <result-to-field result-name="contentId" field-name="contentId" map-name="parameters"/> + <result-to-field result-name="contentId" field="parameters.contentId"/> </call-service> <log level="always" message=" Content : ${parameters.contentId}"/> @@ -263,15 +263,15 @@ <set field="contentAssoc.communicationEventId" from-field="formInput.formInput.communicationEventId"/> <call-service service-name="createCommEventContentAssoc" in-map-name="contentAssoc"> - <result-to-field result-name="fromDate" field-name="fromDate"/> + <result-to-field result-name="fromDate" field="fromDate"/> </call-service> <!-- Return to request --> <set field="communicationEventTypeId" from-field="formInput.formInput.communicationEventTypeId"/> <set field="communicationEventId" from-field="formInput.formInput.communicationEventId"/> - <field-to-request field-name="communicationEventId" request-name="communicationEventId"/> - <field-to-request field-name="communicationEventTypeId" + <field-to-request field="communicationEventId" request-name="communicationEventId"/> + <field-to-request field="communicationEventTypeId" request-name="communicationEventTypeId"/> </simple-method> @@ -301,16 +301,16 @@ <set field="contentAssoc.communicationEventId" from-field="formInput.formInput.communicationEventId"/> <call-service service-name="createCommEventContentAssoc" in-map-name="contentAssoc"> - <result-to-field result-name="fromDate" field-name="fromDate"/> + <result-to-field result-name="fromDate" field="fromDate"/> </call-service> <!-- Return to request --> <set field="communicationEventTypeId" from-field="formInput.formInput.communicationEventTypeId"/> <set field="communicationEventId" from-field="formInput.formInput.communicationEventId"/> - <field-to-request field-name="communicationEventTypeId" + <field-to-request field="communicationEventTypeId" request-name="communicationEventTypeId"/> - <field-to-request field-name="communicationEventId" request-name="communicationEventId"/> + <field-to-request field="communicationEventId" request-name="communicationEventId"/> </simple-method> <!--Create simple-method of getPortalPageId--> @@ -327,6 +327,6 @@ <if-not-empty field="getMainPage"> <set field="portalPageId" from-field="getMyportal.portalPageId"/> </if-not-empty> - <field-to-request field-name="portalPageId" request-name="portalPageId"/> + <field-to-request field="portalPageId" request-name="portalPageId"/> </simple-method> </simple-methods> 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=730183&r1=730182&r2=730183&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 09:12:15 2008 @@ -94,7 +94,7 @@ </entity-one> <set field="getPartyEmail.partyId" from-field="custReq.fromPartyId"/> <call-service service-name="getPartyEmail" in-map-name="getPartyEmail"> - <result-to-field result-name="emailAddress" field-name="emailParams.sendTo"/> + <result-to-field result-name="emailAddress" field="emailParams.sendTo"/> </call-service> <entity-and list="webSites" entity-name="WebSite"> <field-map field-name="productStoreId" from-field="storeEmail.productStoreId" /> 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=730183&r1=730182&r2=730183&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 09:12:15 2008 @@ -308,12 +308,12 @@ </if-empty> </iterate> <set field="taskId" from-field="preDesessorId"/> - <calculate field-name="taskDays"> - <calcop operator="divide" field-name="higestHours"/> + <calculate field="taskDays"> + <calcop operator="divide" field="higestHours"/> <number value="8"/> </calculate> - <calculate field-name="taskDays"> - <calcop operator="multiply" field-name="taskDays"/> + <calculate field="taskDays"> + <calcop operator="multiply" field="taskDays"/> <number value="-1"/> </calculate> <call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="addDaysToTimestamp" ret-field-name="startDate"> @@ -340,13 +340,13 @@ <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"/> + <get-related value-field="project" relation-name="ChildWorkEffort" list="phases"/> <if-not-empty field="phases"> <iterate entry="phase" list="phases"> - <get-related value-name="phase" relation-name="ChildWorkEffort" list-name="tasks"/> + <get-related value-field="phase" relation-name="ChildWorkEffort" list="tasks"/> <if-not-empty field="tasks"> <iterate entry="task" list="tasks"> - <get-related value-name="task" relation-name="ToWorkEffortAssoc" list-name="t.prevTasks"/> + <get-related value-field="task" relation-name="ToWorkEffortAssoc" list="t.prevTasks"/> <if-empty field="t.prevTasks"> <!-- no predecessors so i can set the dates --> <now-timestamp-to-env env-name="upd.estimatedStartDate"/> @@ -409,7 +409,7 @@ <store-value value-name="workEffort"/> </if-empty> - <get-related value-name="timesheet" relation-name="TimeEntry" list-name="timeEntries"/> + <get-related value-field="timesheet" relation-name="TimeEntry" list="timeEntries"/> <!-- update existing entries --> <set field="hours" value="0" type="Double"/> @@ -484,7 +484,7 @@ <field-map field-name="workEffortId" from-field="parameters.taskId"/> </entity-one> <if-not-empty field="task"> - <get-related-one value-name="task" relation-name="ParentWorkEffort" to-value-name="phase"/> + <get-related-one value-name="task" relation-name="ParentWorkEffort" to-value-field="phase"/> <else> <return/> </else> @@ -495,7 +495,7 @@ </entity-one> </else> </if-not-empty> - <get-related-one value-name="phase" relation-name="ParentWorkEffort" to-value-name="project"/> + <get-related-one value-name="phase" relation-name="ParentWorkEffort" to-value-field="project"/> <field-to-result field="project.workEffortId" result-name="projectId"/> <field-to-result field="project.workEffortName" result-name="projectName"/> <field-to-result field="phase.workEffortId" result-name="phaseId"/> @@ -537,8 +537,8 @@ <set field="newProjectId" from-field="newEntity.workEffortId"/> <!-- copy assigned parties --> - <get-related value-name="project" relation-name="WorkEffortPartyAssignment" list-name="partiesAll"/> - <filter-list-by-date list-name="partiesAll" to-list-name="parties"/> + <get-related value-field="project" relation-name="WorkEffortPartyAssignment" list="partiesAll"/> + <filter-list-by-date list-name="partiesAll" to-list="parties"/> <if-not-empty field="parties"> <iterate entry="party" list="parties"> <set field="parameters.workEffortId" from-field="newProjectId"/> @@ -549,7 +549,7 @@ </iterate> </if-not-empty> - <get-related value-name="project" relation-name="ChildWorkEffort" list-name="phases"/> + <get-related value-field="project" relation-name="ChildWorkEffort" list="phases"/> <if-not-empty field="phases"> <iterate entry="phase" list="phases"> <clear-field field="newPhase"/> @@ -566,7 +566,7 @@ <call-simple-method method-name="createWorkEffort" xml-resource="component://workeffort/script/org/ofbiz/workeffort/workeffort/WorkEffortSimpleServices.xml"/> <set field="newPhaseId" from-field="newEntity.workEffortId"/> - <get-related value-name="phase" relation-name="ChildWorkEffort" list-name="tasks"/> + <get-related value-field="phase" relation-name="ChildWorkEffort" list="tasks"/> <if-not-empty field="tasks"> <iterate entry="task" list="tasks"> <clear-field field="newTask"/> @@ -610,10 +610,10 @@ <set field="highInfo.createdDate" from-field="project.createdDate"/> <set field="highInfo.parentProjectId" from-field="parentProject.workEffortId"/> <!-- loop through the related phases and tasks --> - <get-related value-name="project" relation-name="ChildWorkEffort" list-name="phases"/> + <get-related value-field="project" relation-name="ChildWorkEffort" list="phases"/> <if-not-empty field="phases"> <iterate entry="phase" list="phases"> - <get-related value-name="phase" relation-name="ChildWorkEffort" list-name="tasks"/> + <get-related value-field="phase" relation-name="ChildWorkEffort" list="tasks"/> <if-not-empty field="tasks"> <iterate entry="lowInfo" list="tasks"> <if-compare field="lowInfo.currentStatusId" value="PTS_COMPLETED" operator="not-equals"> @@ -689,7 +689,7 @@ <set field="highInfo.scopeEnumId" from-field="phase.scopeEnumId"/> <!-- loop through the related tasks and combine information --> - <get-related value-name="phase" relation-name="ChildWorkEffort" list-name="tasks"/> + <get-related value-field="phase" relation-name="ChildWorkEffort" list="tasks"/> <if-not-empty field="tasks"> <iterate entry="lowInfo" list="tasks"> <if-compare field="lowInfo.currentStatusId" value="PTS_COMPLETED" operator="not-equals"> @@ -890,7 +890,7 @@ <!-- get the planned hours --> <set field="lowInfo" from-field="task"/> <set field="hoursPartyId" from-field="task.partyId"/> - <get-related-one value-name="task" relation-name="WorkEffort" to-value-name="lowInfo"/> + <get-related-one value-name="task" relation-name="WorkEffort" to-value-field="lowInfo"/> <call-simple-method method-name="getHours"/> <set field="taskParty.plannedHours" from-field="highInfo.plannedHours"/> <set field="taskParty.actualHours" from-field="highInfo.actualHours"/> @@ -966,12 +966,12 @@ <!-- if lowlevel type equals TASK then get create the status first --> <if-compare field="lowInfo.workEffortTypeId" value="TASK" operator="equals"> <if-compare field="lowInfo.currentStatusId" value="PTS_CREATED" operator="equals"> - <get-related value-name="lowInfo" relation-name="WorkEffortPartyAssignment" list-name="assignsAll"/> - <filter-list-by-date list-name="assignsAll" to-list-name="assigns"/> + <get-related value-field="lowInfo" relation-name="WorkEffortPartyAssignment" list="assignsAll"/> + <filter-list-by-date list-name="assignsAll" to-list="assigns"/> <if-not-empty field="assigns"> <set field="lowInfo.currentStatusId" value="PTS_CREATED_AS"/><!-- task is assigned --> </if-not-empty> - <get-related value-name="lowInfo" relation-name="TimeEntry" list-name="entries"/> + <get-related value-field="lowInfo" relation-name="TimeEntry" list="entries"/> <if-not-empty field="entries"> <set field="lowInfo.currentStatusId" value="PTS_CREATED_IP"/><!-- task is in progress --> </if-not-empty> @@ -1012,14 +1012,14 @@ <!-- input is 'lowInfo' map output is 'highInfo map --> <!-- hoursPartyId: if provided only the hours of that party --> <!-- add the planned hours together --> - <get-related value-name="lowInfo" relation-name="WorkEffortSkillStandard" list-name="estimates"/> + <get-related value-field="lowInfo" relation-name="WorkEffortSkillStandard" list="estimates"/> <if-not-empty field="estimates"> <iterate entry="estimate" list="estimates"> <if-not-empty field="estimate.estimatedDuration"> <if-not-empty field="highInfo.plannedHours"> - <calculate field-name="highInfo.plannedHours"> - <calcop operator="add" field-name="estimate.estimatedDuration"> - <calcop operator="get" field-name="highInfo.plannedHours"/> + <calculate field="highInfo.plannedHours"> + <calcop operator="add" field="estimate.estimatedDuration"> + <calcop operator="get" field="highInfo.plannedHours"/> </calcop> </calculate> <else> @@ -1030,11 +1030,11 @@ </iterate> </if-not-empty> <!-- get the actual billed / non billed hours --> - <get-related value-name="lowInfo" relation-name="TimeEntry" list-name="actuals"/> + <get-related value-field="lowInfo" relation-name="TimeEntry" list="actuals"/> <if-not-empty field="actuals"> <iterate entry="actual" list="actuals"> <if-not-empty field="actual.hours"> - <get-related-one value-name="actual" relation-name="Timesheet" to-value-name="timesheet"/> + <get-related-one value-name="actual" relation-name="Timesheet" to-value-field="timesheet"/> <!-- check if only a part of the registered hours need to be taken into account --> <set field="originalActualHours" from-field="actual.hours"/> @@ -1052,13 +1052,13 @@ <if-not-empty field="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"> - <calcop operator="get" field-name="partyRate.percentageUsed"/> + <calculate field="actual.hours"> + <calcop operator="multiply" field="actual.hours"> + <calcop operator="get" field="partyRate.percentageUsed"/> </calcop> </calculate> - <calculate field-name="actual.hours"> - <calcop operator="divide" field-name="actual.hours"> + <calculate field="actual.hours"> + <calcop operator="divide" field="actual.hours"> <number value="100"/> </calcop> </calculate> @@ -1076,9 +1076,9 @@ </condition> <then> <if-not-empty field="highInfo.originalActualHours"> - <calculate field-name="highInfo.originalActualHours"> - <calcop operator="get" field-name="highInfo.originalActualHours"> - <calcop operator="add" field-name="originalActualHours"/> + <calculate field="highInfo.originalActualHours"> + <calcop operator="get" field="highInfo.originalActualHours"> + <calcop operator="add" field="originalActualHours"/> </calcop> </calculate> <else> @@ -1086,9 +1086,9 @@ </else> </if-not-empty> <if-not-empty field="highInfo.actualHours"> - <calculate field-name="highInfo.actualHours"> - <calcop operator="get" field-name="highInfo.actualHours"> - <calcop operator="add" field-name="actual.hours"/> + <calculate field="highInfo.actualHours"> + <calcop operator="get" field="highInfo.actualHours"> + <calcop operator="add" field="actual.hours"/> </calcop> </calculate> <else> @@ -1097,9 +1097,9 @@ </if-not-empty> <if-empty field="actual.invoiceId"> <if-not-empty field="highInfo.actualNonBilledHours"> - <calculate field-name="highInfo.actualNonBilledHours"> - <calcop operator="get" field-name="highInfo.actualNonBilledHours"> - <calcop operator="add" field-name="actual.hours"/> + <calculate field="highInfo.actualNonBilledHours"> + <calcop operator="get" field="highInfo.actualNonBilledHours"> + <calcop operator="add" field="actual.hours"/> </calcop> </calculate> <else> @@ -1111,9 +1111,9 @@ </if> <!-- keep also a general total for the actual hours of all participants --> <if-not-empty field="highInfo.actualTotalHours"> - <calculate field-name="highInfo.actualTotalHours"> - <calcop operator="add" field-name="actual.hours"> - <calcop operator="get" field-name="highInfo.actualTotalHours"/> + <calculate field="highInfo.actualTotalHours"> + <calcop operator="add" field="actual.hours"> + <calcop operator="get" field="highInfo.actualTotalHours"/> </calcop> </calculate> <else> @@ -1123,9 +1123,9 @@ <!-- keep also a general total for the actual hours of all participants however not yet billed --> <if-empty field="actual.invoiceId"> <if-not-empty field="highInfo.actualNonBilledTotalHours"> - <calculate field-name="highInfo.actualNonBilledTotalHours"> - <calcop operator="add" field-name="actual.hours"> - <calcop operator="get" field-name="highInfo.actualNonBilledTotalHours"/> + <calculate field="highInfo.actualNonBilledTotalHours"> + <calcop operator="add" field="actual.hours"> + <calcop operator="get" field="highInfo.actualNonBilledTotalHours"/> </calcop> </calculate> <else> @@ -1274,7 +1274,7 @@ <set field="addTaskToNewInvoice.combineInvoiceItem" value="Y"/> <set field="addTaskToNewInvoice.thruDate" from-field="parameters.thruDate"/> <call-service service-name="addWorkEffortTimeToNewInvoice" in-map-name="addTaskToNewInvoice"> - <result-to-field result-name="invoiceId" field-name="parameters.invoiceId"/> + <result-to-field result-name="invoiceId" field="parameters.invoiceId"/> </call-service> <set field="addTaskToInvoice.combineInvoiceItem" value="Y"/> <field-to-result field="parameters.invoiceId" result-name="invoiceId"/> 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=730183&r1=730182&r2=730183&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 09:12:15 2008 @@ -22,14 +22,14 @@ <simple-method method-name="CreateCustRequestAndAssignTaskToPerson" short-description=""> <set-service-fields service-name="createCustRequest" map="parameters" to-map="createCust"/> <call-service service-name="createCustRequest" in-map="createCust"> - <result-to-field result-name="custRequestId" field-name="custRequestId"/> + <result-to-field result-name="custRequestId" field="custRequestId"/> </call-service> <if-not-empty field="parameters.workEffortParentId"> <set-service-fields service-name="createWorkEffort" map="parameters" to-map="createTask" /> <set field="createTask.custRequestId" from-field="custRequestId"/> <set field="createTask.workEffortName" from-field="parameters.custRequestName"/> <call-service service-name="createWorkEffort" in-map-name="createTask" > - <result-to-field result-name="workEffortId" field-name="workEffortId"/> + <result-to-field result-name="workEffortId" field="workEffortId"/> </call-service> <set field="updCust.statusId" value="CRQ_REVIEWED"/> <set field="updCust.custRequestId" from-field="custRequestId"/> @@ -115,7 +115,7 @@ <set field="inMap._uploadedFile_contentType" from-field="formInput.formInput.mimeTypeId"/> <call-service service-name="createContentFromUploadedFile" in-map-name="inMap"> - <result-to-field result-name="contentId" field-name="context.contentId"/> + <result-to-field result-name="contentId" field="context.contentId"/> </call-service> <if-empty field="formInput.formInput.workEffortId"> @@ -138,12 +138,12 @@ </call-map-processor> <call-service service-name="createWorkEffortContent" in-map-name="workEffortContext"> - <result-to-field result-name="contentId" field-name="contentId"/> + <result-to-field result-name="contentId" field="contentId"/> </call-service> <!-- set the partyId in the request --> - <field-to-request field-name="workEffortId" map-name="context" request-name="workEffortId"/> - <field-to-request field-name="projectId" map-name="context" request-name="projectId"/> - <field-to-request field-name="contentId" request-name="contentId"/> + <field-to-request field="workEffortId" map-name="context" request-name="workEffortId"/> + <field-to-request field="projectId" map-name="context" request-name="projectId"/> + <field-to-request field="contentId" request-name="contentId"/> </simple-method> <!-- Update workEffort content --> @@ -164,7 +164,7 @@ <set field="inMap.contentId" from-field="formInput.formInput.contentId"/> <set field="inMap.dataResourceId" from-field="content.dataResourceId"/> <call-service service-name="updateContentAndUploadedFile" in-map-name="inMap"> - <result-to-field result-name="contentId" field-name="context.contentId"/> + <result-to-field result-name="contentId" field="context.contentId"/> </call-service> <if-empty field="formInput.formInput.workEffortId"> <if-not-empty field="formInput.formInput.projectId"> @@ -176,8 +176,8 @@ </if-empty> <!-- set the partyId in the request --> - <field-to-request field-name="workEffortId" request-name="workEffortId"/> - <field-to-request field-name="projectId" request-name="projectId"/> - <field-to-request field-name="contentId" map-name="context"/> + <field-to-request field="workEffortId" request-name="workEffortId"/> + <field-to-request field="projectId" request-name="projectId"/> + <field-to-request field="contentId" map-name="context"/> </simple-method> </simple-methods> Modified: ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml?rev=730183&r1=730182&r2=730183&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml (original) +++ ofbiz/trunk/specialpurpose/webpos/script/org/ofbiz/webpos/event/PaymentEvents.xml Tue Dec 30 09:12:15 2008 @@ -484,8 +484,8 @@ </if-not-empty> </if-compare> </if-not-empty> - <calculate field-name="payment" type="Integer"> - <calcop field-name="payment" operator="add"/> + <calculate field="payment" type="Integer"> + <calcop field="payment" operator="add"/> <number value="1"/> </calculate> </then> @@ -578,8 +578,8 @@ </if-compare> </if-not-empty> </if-not-empty> - <calculate field-name="payment" type="Integer"> - <calcop field-name="payment" operator="add"/> + <calculate field="payment" type="Integer"> + <calcop field="payment" operator="add"/> <number value="1"/> </calculate> </then> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |