You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2008/06/14 08:03:15 UTC
svn commit: r667748 [15/16] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/cost/
applications/accounting/script/org/ofbiz/accounting/finaccount/
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=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008
@@ -28,7 +28,7 @@
<field-to-result field-name="newEntity.timesheetId" result-name="timesheetId"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="newEntity.statusId">
+ <if-empty field="newEntity.statusId">
<set field="newEntity.statusId" value="TIMESHEET_IN_PROCESS"/>
</if-empty>
<create-value value-name="newEntity"/>
@@ -48,7 +48,7 @@
<remove-value value-name="timesheet"/>
</simple-method>
<simple-method method-name="createTimesheetForThisWeek" short-description="Create Timesheet For This Week of no date provided, otherwise for a specific week">
- <if-empty field-name="parameters.requiredDate">
+ <if-empty field="parameters.requiredDate">
<now-timestamp-to-env env-name="nowTimestamp"/>
<else>
<set field="nowTimestamp" from-field="parameters.requiredDate"/>
@@ -66,7 +66,7 @@
<field-map field-name="fromDate" env-name="parameters.fromDate"/>
<field-map field-name="thruDate" env-name="parameters.thruDate"/>
</entity-and>
- <if-empty field-name="timesheets">
+ <if-empty field="timesheets">
<call-simple-method method-name="createTimesheet"/>
<else>
<add-error><fail-message message="Time sheet already exist, not created an other one."/></add-error>
@@ -88,7 +88,7 @@
<entity-one entity-name="Timesheet" value-name="timesheet"/>
<get-related value-name="timesheet" relation-name="TimeEntry" list-name="timeEntryList"/>
- <if-empty field-name="parameters.invoiceId">
+ <if-empty field="parameters.invoiceId">
<set-service-fields service-name="createInvoice" map-name="parameters" to-map-name="createInvoiceMap"/>
<set field="createInvoiceMap.invoiceTypeId" value="SALES_INVOICE"/>
<set field="createInvoiceMap.statusId" value="INVOICE_IN_PROCESS"/>
@@ -102,7 +102,7 @@
</if-empty>
<entity-one entity-name="Invoice" value-name="invoice"/>
- <if-empty field-name="invoice">
+ <if-empty field="invoice">
<add-error><fail-message message="Could not find invoice with ID [${invoiceId}], not adding Timesheet Entries to it."/></add-error>
<check-errors/>
</if-empty>
@@ -116,7 +116,7 @@
<entity-one entity-name="WorkEffort" value-name="workEffort"/>
<get-related value-name="workEffort" relation-name="TimeEntry" list-name="timeEntryList"/>
- <if-empty field-name="parameters.invoiceId">
+ <if-empty field="parameters.invoiceId">
<set-service-fields service-name="createInvoice" map-name="parameters" to-map-name="createInvoiceMap"/>
<set field="createInvoiceMap.invoiceTypeId" value="SALES_INVOICE"/>
<set field="createInvoiceMap.statusId" value="INVOICE_IN_PROCESS"/>
@@ -130,7 +130,7 @@
</if-empty>
<entity-one entity-name="Invoice" value-name="invoice"/>
- <if-empty field-name="invoice">
+ <if-empty field="invoice">
<add-error><fail-message message="Could not find invoice with ID [${invoiceId}], not adding Timesheet Entries to it."/></add-error>
<check-errors/>
</if-empty>
@@ -140,7 +140,7 @@
<simple-method method-name="createTimeEntryInvoiceItemsInline" short-description="createTimeEntryInvoiceItemsInline">
<iterate entry-name="timeEntry" list-name="timeEntryList">
<!-- only add to invoice if it is not already on an invoice; may want to make this smarter in the future to see if invoice cancelled or some such -->
- <if-empty field-name="timeEntry.invoiceId">
+ <if-empty field="timeEntry.invoiceId">
<clear-field field-name="createInvoiceItemMap"/>
<clear-field field-name="getTimeEntryRate"/>
<clear-field field-name="rateAmount"/>
@@ -196,7 +196,7 @@
<field-to-result field-name="newEntity.timeEntryId" result-name="timeEntryId"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="newEntity.fromDate">
+ <if-empty field="newEntity.fromDate">
<call-class-method class-name="org.ofbiz.base.util.UtilDateTime" method-name="getDayStart" ret-field-name="newEntity.fromDate">
<field field-name="nowTimestamp" type="java.sql.Timestamp"/>
</call-class-method>
@@ -227,7 +227,7 @@
<entity-one entity-name="TimeEntry" value-name="timeEntry"/>
<!-- first try the WorkEffortAssignmentRate -->
- <if-not-empty field-name="timeEntry.workEffortId">
+ <if-not-empty field="timeEntry.workEffortId">
<entity-condition entity-name="WorkEffortAssignmentRate" list-name="workEffortAssignmentRateList">
<condition-list combine="and">
<condition-expr field-name="workEffortId" env-name="timeEntry.workEffortId"/>
@@ -238,13 +238,13 @@
</entity-condition>
<filter-list-by-date list-name="workEffortAssignmentRateList" all-same="true"/>
<first-from-list entry-name="workEffortAssignmentRate" list-name="workEffortAssignmentRateList"/>
- <if-not-empty field-name="workEffortAssignmentRate">
+ <if-not-empty field="workEffortAssignmentRate">
<set field="rateAmount" from-field="workEffortAssignmentRate.rate"/>
</if-not-empty>
</if-not-empty>
<!-- no rateAmount yet, try PartyRate -->
- <if-empty field-name="rateAmount">
+ <if-empty field="rateAmount">
<entity-condition entity-name="PartyRate" list-name="partyRateList">
<condition-list combine="and">
<condition-expr field-name="partyId" env-name="timeEntry.partyId"/>
@@ -254,7 +254,7 @@
</entity-condition>
<filter-list-by-date list-name="partyRateList" all-same="true"/>
<first-from-list entry-name="partyRate" list-name="partyRateList"/>
- <if-not-empty field-name="partyRate">
+ <if-not-empty field="partyRate">
<set field="rateAmount" from-field="partyRate.rate"/>
</if-not-empty>
</if-empty>
@@ -267,22 +267,22 @@
<if>
<condition>
<or>
- <not><if-empty field-name="parameters.timesheetId"/></not>
- <not><if-empty field-name="lookedUpValue.timesheetId"/></not>
+ <not><if-empty field="parameters.timesheetId"/></not>
+ <not><if-empty field="lookedUpValue.timesheetId"/></not>
</or>
</condition>
<then>
- <if-empty field-name="parameters.timesheetId">
+ <if-empty field="parameters.timesheetId">
<set field="parameters.timesheetId" from-field="lookedUpValue.timesheetId"/>
</if-empty>
<entity-one entity-name="Timesheet" value-name="timesheet"/>
- <if-empty field-name="timesheet">
+ <if-empty field="timesheet">
<add-error><fail-message message="Timesheet could not be found, timesheetId: ${parameters.timesheetId}"/></add-error>
<log level="info" message="Timesheet not found, timesheet: ${parameters.timesheetId}"/>
<check-errors/>
</if-empty>
<!-- check if the status is in progress... -->
- <if-compare field-name="timesheet.statusId" value="TIMESHEET_IN_PROCESS" operator="not-equals">
+ <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"/>
<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}"/>
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=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008
@@ -34,7 +34,7 @@
<simple-method method-name="createWorkEffort" short-description="Create Work Effort">
<make-value value-name="newEntity" entity-name="WorkEffort"/>
- <if-empty field-name="parameters.workEffortId">
+ <if-empty field="parameters.workEffortId">
<sequenced-id-to-env sequence-name="WorkEffort" env-name="newEntity.workEffortId"/>
<else>
<set field="newEntity.workEffortId" from-field="parameters.workEffortId"/>
@@ -61,7 +61,7 @@
<create-value value-name="newWorkEffortStatus"/>
<!-- Attach the workeffort to a requirement if passed -->
- <if-not-empty field-name="requirementId" map-name="parameters">
+ <if-not-empty field="parameters.requirementId">
<make-value value-name="workFullfillment" entity-name="WorkRequirementFulfillment"/>
<set from-field="newEntity.workEffortId" field="workFullfillment.workEffortId"/>
<set from-field="parameters.requirementId" field="workFullfillment.requirementId"/>
@@ -77,7 +77,7 @@
<!-- <set from-field="workEffortId" map-name="parameters" to-map-name="findWepaMap"/>
<set from-field="partyId" map-name="userLogin" to-map-name="findWepaMap"/>
<find-by-and entity-name="WorkEffortPartyAssignment" map-name="findWepaMap" list-name="wepaList"/>
- <if-empty field-name="wepaList">
+ <if-empty field="wepaList">
<check-permission permission="WORKEFFORTMGR" action="_UPDATE"><fail-message message="Security Error: to run updateWorkEffort you must have the WORKEFFORTMGR_UPDATE or WORKEFFORTMGR_ADMIN permission"/></check-permission>
<check-errors/>
</if-empty>-->
@@ -91,19 +91,19 @@
<if>
<condition>
<and>
- <not><if-empty field-name="parameters.currentStatusId"/></not>
- <if-compare-field field-name="parameters.currentStatusId" operator="not-equals" to-field-name="lookedUpValue.currentStatusId"/>
+ <not><if-empty field="parameters.currentStatusId"/></not>
+ <if-compare-field field="parameters.currentStatusId" to-field="lookedUpValue.currentStatusId" operator="not-equals"/>
</and>
</condition>
<then>
- <if-not-empty field-name="lookedUpValue.currentStatusId">
+ <if-not-empty field="lookedUpValue.currentStatusId">
<!-- check if the status change is a valid change -->
<entity-and entity-name="StatusValidChange" list-name="validChange">
<field-map field-name="statusId" env-name="lookedUpValue.currentStatusId"/>
<field-map field-name="statusIdTo" env-name="parameters.currentStatusId"/>
</entity-and>
- <if-empty field-name="validChange">
+ <if-empty field="validChange">
<add-error><fail-message message="The status change from ${lookedUpValue.currentStatusId} to ${parameters.currentStatusId} is not a valid change"/></add-error>
<log level="error" message="The status change from ${lookedUpValue.currentStatusId} to ${parameters.currentStatusId} is not a valid change"/>
<check-errors/>
@@ -123,11 +123,11 @@
<set-nonpk-fields map-name="parameters" value-name="lookedUpValue"/>
<!-- only save if something has changed -->
- <if-compare-field field-name="lookedUpValue" operator="not-equals" to-field-name="savedValue" type="Object">
+ <if-compare-field field="lookedUpValue" to-field="savedValue" operator="not-equals" type="Object">
<!-- only set lastModifiedDate after comparing new & old to see if anything has changed -->
<set from-field="nowTimestamp" field="lookedUpValue.lastModifiedDate"/>
<set from-field="userLogin.userLoginId" field="lookedUpValue.lastModifiedByUserLogin"/>
- <if-not-empty field-name="lookedUpValue.revisionNumber">
+ <if-not-empty field="lookedUpValue.revisionNumber">
<calculate field-name="lookedUpValue.revisionNumber" type="Long">
<calcop operator="get" field-name="lookedUpValue.revisionNumber"/>
<number value="1"/>
@@ -145,7 +145,7 @@
<field-map field-name="workEffortId" env-name="parameters.workEffortId"/>
<field-map field-name="partyId" env-name="userLogin.partyId"/>
</entity-and>
- <if-empty field-name="wepaList">
+ <if-empty field="wepaList">
<check-permission permission="WORKEFFORTMGR" action="_DELETE"><fail-message message="Security Error: to run deleteWorkEffort you must have the WORKEFFORTMGR_DELETE or WORKEFFORTMGR_ADMIN permission"/></check-permission>
<check-errors/>
</if-empty>
@@ -173,12 +173,12 @@
<make-value entity-name="CommunicationEventWorkEff" value-name="lookupMap"/>
<set-pk-fields map-name="parameters" value-name="lookupMap"/>
<find-by-primary-key entity-name="CommunicationEventWorkEff" map-name="lookupMap" value-name="eventWe"/>
- <if-not-empty field-name="workEffortId" map-name="eventWe">
+ <if-not-empty field="eventWe.workEffortId">
<set-nonpk-fields map-name="parameters" value-name="eventWe"/>
<set field="eventWe.description" from-field="parameters.relationDescription"/>
<store-value value-name="eventWe"/>
</if-not-empty>
- <if-empty field-name="workEffortId" map-name="eventWe">
+ <if-empty field="eventWe.workEffortId">
<set-nonpk-fields map-name="parameters" value-name="lookupMap"/>
<set field="eventWe.description" from-field="parameters.relationDescription"/>
<create-value value-name="lookupMap"/>
@@ -194,7 +194,7 @@
<make-value entity-name="CommunicationEventWorkEff" value-name="communicationEventWorkEff"/>
<set-pk-fields value-name="communicationEventWorkEff" map-name="parameters"/>
<find-by-primary-key entity-name="CommunicationEventWorkEff" map-name="communicationEventWorkEff" value-name="communicationEventWorkEff"/>
- <if-empty field-name="communicationEventWorkEff">
+ <if-empty field="communicationEventWorkEff">
<add-error><fail-message message="ERROR: Cannot update specified contact info because it does not correspond to the specified work effort"/></add-error>
</if-empty>
<check-errors/>
@@ -209,7 +209,7 @@
<make-value entity-name="CommunicationEventWorkEff" value-name="communicationEventWorkEff"/>
<set-pk-fields value-name="communicationEventWorkEff" map-name="parameters"/>
<find-by-primary-key entity-name="CommunicationEventWorkEff" map-name="communicationEventWorkEff" value-name="communicationEventWorkEff"/>
- <if-empty field-name="communicationEventWorkEff">
+ <if-empty field="communicationEventWorkEff">
<add-error><fail-message message="ERROR: Cannot delete specified contact info because it does not correspond to the specified work effort"/></add-error>
</if-empty>
<check-errors/>
@@ -225,7 +225,7 @@
<field-map field-name="partyId" env-name="parameters.partyId"/>
<field-map field-name="roleTypeId" env-name="parameters.roleTypeId"/>
</entity-and>
- <if-not-empty field-name="currentAssignments">
+ <if-not-empty field="currentAssignments">
<first-from-list entry-name="firstAssignment" list-name="currentAssignments"/>
<add-error>
<fail-property resource="WorkEffortUiLabels" property="WorkEffortPartyAssignmentError"/>
@@ -238,12 +238,12 @@
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="newEntity.fromDate">
+ <if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="newEntity.fromDate"/>
</if-empty>
<field-to-result field-name="newEntity.fromDate" result-name="fromDate"/>
- <if-not-empty field-name="parameters.statusId">
+ <if-not-empty field="parameters.statusId">
<now-timestamp-to-env env-name="newEntity.statusDateTime"/>
<call-class-method class-name="org.ofbiz.workeffort.workeffort.WorkEffortPartyAssignmentServices" method-name="updateWorkflowEngine">
<field field-name="newEntity" type="org.ofbiz.entity.GenericValue"/>
@@ -256,7 +256,7 @@
<simple-method method-name="updatePartyToWorkEffortAssignment" short-description="Update WorkEffortPartyAssignment entity">
<entity-one entity-name="WorkEffortPartyAssignment" value-name="workEffortPartyAssignment"/>
<!-- to be dropped later (use now workEffortGenericPermission)
- <if-compare-field field-name="userLogin.partyId" operator="not-equals" to-field-name="workEffortPartyAssignment.partyId">
+ <if-compare-field field="userLogin.partyId" to-field="workEffortPartyAssignment.partyId" operator="not-equals">
<check-permission permission="WORKEFFORTMGR" action="_UPDATE">
<fail-message message="You cannot update this Work Effort Party Assignment, you must either be associated with it or have administration permission."/>
</check-permission>
@@ -266,7 +266,7 @@
<set from-field="workEffortPartyAssignment.statusId" field="oldStatusId"/>
<set-nonpk-fields map-name="parameters" value-name="workEffortPartyAssignment"/>
- <if-compare-field field-name="parameters.statusId" operator="not-equals" to-field-name="oldStatusId">
+ <if-compare-field field="parameters.statusId" to-field="oldStatusId" operator="not-equals">
<now-timestamp-to-env env-name="workEffortPartyAssignment.statusDateTime"/>
<call-class-method class-name="org.ofbiz.workeffort.workeffort.WorkEffortPartyAssignmentServices" method-name="updateWorkflowEngine" >
<field field-name="workEffortPartyAssignment" type="org.ofbiz.entity.GenericValue"/>
@@ -289,8 +289,8 @@
<!-- Create a WorkEffortContactMech -->
<simple-method method-name="createWorkEffortContactMech" short-description="Create a WorkEffortContactMech">
<make-value value-name="newValue" entity-name="WorkEffortContactMech"/>
- <if-empty map-name="parameters" field-name="contactMechId">
- <if-not-empty field-name="parameters.partyId">
+ <if-empty field="parameters.contactMechId">
+ <if-not-empty field="parameters.partyId">
<set-service-fields service-name="createPartyContactMech" map-name="parameters" to-map-name="context"/>
<call-service service-name="createPartyContactMech" in-map-name="context">
<default-message>Party Contact Mechanism successfully created.</default-message>
@@ -322,7 +322,7 @@
<make-value entity-name="WorkEffortContactMech" value-name="newWorkEffortContactMech"/>
<!-- Find old value -->
<entity-one entity-name="WorkEffortContactMech" value-name="workEffortContactMech"/>
- <if-empty field-name="workEffortContactMech">
+ <if-empty field="workEffortContactMech">
<add-error><fail-message message="ERROR: Cannot update specified contact info because it does not correspond to the specified work effort"/></add-error>
</if-empty>
<check-errors/>
@@ -330,7 +330,7 @@
<clone-value value-name="workEffortContactMech" new-value-name="newWorkEffortContactMech"/>
<!-- If we already have a new contactMechId don't update ContactMech -->
- <if-empty map-name="parameters" field-name="newContactMechId">
+ <if-empty field="parameters.newContactMechId">
<log level="info" message="Calling map procs"/>
<call-map-processor xml-resource="org/ofbiz/party/contact/ContactMechMapProcs.xml"
processor-name="updateContactMech" in-map-name="parameters" out-map-name="context"/>
@@ -345,7 +345,7 @@
</else>
</if-empty>
- <if-compare-field field-name="contactMechId" map-name="parameters" to-map-name="newWorkEffortContactMech" operator="not-equals">
+ <if-compare-field to-field="newWorkEffortContactMech." field="parameters.contactMechId" operator="not-equals">
<set-nonpk-fields value-name="newWorkEffortContactMech" map-name="parameters" set-if-null="false"/>
<create-value value-name="newWorkEffortContactMech"/>
<remove-value value-name="workEffortContactMech"/>
@@ -358,7 +358,7 @@
<simple-method method-name="deleteWorkEffortContactMech" short-description="Delete a WorkEffortContactMech">
<!-- Find old value -->
<entity-one entity-name="WorkEffortContactMech" value-name="workEffortContactMech"/>
- <if-empty field-name="workEffortContactMech">
+ <if-empty field="workEffortContactMech">
<add-error><fail-message message="ERROR: Cannot delete specified contact info because it does not correspond to the specified work effort"/></add-error>
</if-empty>
<check-errors/>
@@ -368,7 +368,7 @@
<simple-method method-name="createWorkEffortPostalAddress" short-description="Create a PostalAddress for WorkEffort">
<make-value entity-name="WorkEffortContactMech" value-name="newValue"/>
<log level="info" message="Creating postal address"/>
- <if-not-empty map-name="parameters" field-name="addToParty">
+ <if-not-empty field="parameters.addToParty">
<call-map-processor xml-resource="org/ofbiz/party/contact/PartyContactMechMapProcs.xml"
processor-name="postalAddress" in-map-name="parameters" out-map-name="context"/>
<call-service service-name="createPartyPostalAddress" in-map-name="context">
@@ -420,7 +420,7 @@
<simple-method method-name="createWorkEffortTelecomNumber" short-description="Create a TelecomNumber for WorkEffort">
<make-value entity-name="WorkEffortContactMech" value-name="newValue"/>
<log level="info" message="Creating telecom number"/>
- <if-not-empty map-name="parameters" field-name="addToParty">
+ <if-not-empty field="parameters.addToParty">
<call-map-processor xml-resource="org/ofbiz/party/contact/PartyContactMechMapProcs.xml"
processor-name="telecomNumber" in-map-name="parameters" out-map-name="context"/>
<call-service service-name="createPartyTelecomNumber" in-map-name="context">
@@ -494,7 +494,7 @@
</simple-method>
<simple-method method-name="quickAssignPartyToWorkEffort" short-description="Quick Assign Party To WorkEffort as Owner">
- <if-not-empty field-name="quickAssignPartyId" map-name="parameters">
+ <if-not-empty field="parameters.quickAssignPartyId">
<now-timestamp-to-env env-name="nowTimestamp"/>
<!-- add a party assignment for the creator of the event, use the list method and let the EE do the update or create... -->
<make-value value-name="newPartyRole" entity-name="PartyRole"/>
@@ -513,7 +513,7 @@
</if-not-empty>
</simple-method>
<simple-method method-name="quickAssignPartyToWorkEffortWithRole" short-description="Quick Assign Party To WorkEffort">
- <if-not-empty field-name="parameters.quickAssignPartyId">
+ <if-not-empty field="parameters.quickAssignPartyId">
<!-- add a party assignment for the creator of the event, use the list method and let the EE do the update or create... -->
<make-value value-name="newPartyRole" entity-name="PartyRole"/>
<set from-field="parameters.quickAssignPartyId" field="newPartyRole.partyId"/>
@@ -535,7 +535,7 @@
<sequenced-id-to-env sequence-name="NoteData" env-name="newEntity.noteId"/>
<field-to-result field-name="newEntity.noteId" result-name="noteId"/>
<set from-field="parameters.noteInfo" field="newEntity.noteInfo"/>
- <if-not-empty field-name="parameters.noteParty">
+ <if-not-empty field="parameters.noteParty">
<set from-field="parameters.noteParty" field="newEntity.noteParty"/>
<else>
<set field="newEntity.noteParty" from-field="parameters.userLogin.userLoginId"></set>
@@ -558,17 +558,17 @@
<store-value value-name="lookedUpValue"/>
</simple-method>
<simple-method method-name="createWorkEffortAndAssoc" short-description="Create a WorkEffort and association">
- <if-empty field-name="parameters.fromDate">
+ <if-empty field="parameters.fromDate">
<now-timestamp-to-env env-name="parameters.fromDate"/>
<else>
<entity-one entity-name="WorkEffortAssoc" value-name="lookedUpValue"/>
</else>
</if-empty>
- <if-not-empty field-name="lookedUpValue">
+ <if-not-empty field="lookedUpValue">
<add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortAssocIdAlreadyExist"/></add-error>
<check-errors/>
<else>
- <if-empty field-name="parameters.workEffortIdTo">
+ <if-empty field="parameters.workEffortIdTo">
<set-service-fields service-name="createWorkEffort" map-name="parameters" to-map-name="createWorkeEffortParams"/>
<call-service in-map-name="createWorkeEffortParams" service-name="createWorkEffort">
<result-to-result result-name="workEffortId"/>
@@ -583,21 +583,21 @@
</simple-method>
<simple-method method-name="createWorkEffortAssoc" short-description="Create a WorkEffort association">
- <if-empty field-name="parameters.fromDate">
+ <if-empty field="parameters.fromDate">
<now-timestamp-to-env env-name="parameters.fromDate"/>
<else>
<entity-one entity-name="WorkEffortAssoc" value-name="lookedUpValue"/>
</else>
</if-empty>
- <if-not-empty field-name="lookedUpValue">
+ <if-not-empty field="lookedUpValue">
<add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortAssocIdAlreadyExist"/></add-error>
<check-errors/>
<else>
<make-value value-name="newEntity" entity-name="WorkEffortAssoc"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="newEntity.sequenceNum">
+ <if-empty field="newEntity.sequenceNum">
<set field="newEntity.sequenceNum" value="0" type="Long"/>
</if-empty>
<create-value value-name="newEntity"/>
@@ -616,13 +616,13 @@
<simple-method method-name="createWorkEffortGoodStandard" short-description="Create a link between a WorkEffort and a Product">
<entity-one entity-name="WorkEffortGoodStandard" value-name="lookedUpValue"/>
- <if-not-empty field-name="lookedUpValue">
+ <if-not-empty field="lookedUpValue">
<add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortGoodStandardAlreadyExist"/></add-error>
<check-errors/>
<else>
<make-value value-name="newEntity" entity-name="WorkEffortGoodStandard"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="newEntity.fromDate">
+ <if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="newEntity.fromDate"/>
</if-empty>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
@@ -643,7 +643,7 @@
<set value="Create or update WorkEffortInventoryAssign" field="operationName"/>
<entity-one entity-name="WorkEffortInventoryAssign" value-name="foundEntity"/>
- <if-not-empty field-name="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"/>
@@ -663,7 +663,7 @@
<make-value entity-name="CustRequestWorkEffort" value-name="lookupMap"/>
<set-pk-fields map-name="parameters" value-name="lookupMap"/>
<find-by-primary-key entity-name="CustRequestWorkEffort" map-name="lookupMap" value-name="custRequestWorkEffort"/>
- <if-not-empty field-name="custRequestWorkEffort">
+ <if-not-empty field="custRequestWorkEffort">
<add-error><fail-message message="ERROR: CustRequestWorkEffort [${parameters.custRequestId}][${parameters.workEffortId}] already exists."/></add-error>
<check-errors/>
</if-not-empty>
@@ -673,7 +673,7 @@
</simple-method>
<simple-method method-name="deleteWorkEffortRequest" short-description="Delete a CustRequestWorkEffort">
<entity-one entity-name="CustRequestWorkEffort" value-name="custRequestWorkEffort"/>
- <if-empty field-name="custRequestWorkEffort">
+ <if-empty field="custRequestWorkEffort">
<add-error><fail-message message="ERROR: CustRequestWorkEffort [${parameters.custRequestId}][${parameters.workEffortId}] does not exist."/></add-error>
<check-errors/>
</if-empty>
@@ -685,7 +685,7 @@
<make-value entity-name="CustRequestItemWorkEffort" value-name="lookupMap"/>
<set-pk-fields map-name="parameters" value-name="lookupMap"/>
<find-by-primary-key entity-name="QuoteWorkEffort" map-name="lookupMap" value-name="custRequestItemWorkEffort"/>
- <if-not-empty field-name="custRequestItemWorkEffort">
+ <if-not-empty field="custRequestItemWorkEffort">
<add-error><fail-message message="ERROR: CustRequestItemWorkEffort [${parameters.custRequestItemSeqId}][${parameters.workEffortId}] already exists."/></add-error>
<check-errors/>
</if-not-empty>
@@ -694,7 +694,7 @@
</simple-method>
<simple-method method-name="deleteWorkEffortRequestItem" short-description="Delete a CustRequestItemWorkEffort">
<entity-one entity-name="CustRequestItemWorkEffort" value-name="custRequestItemWorkEffort"/>
- <if-empty field-name="custRequestItemSeqId" map-name="custRequestItemWorkEffort">
+ <if-empty field="custRequestItemWorkEffort.custRequestItemSeqId">
<add-error><fail-message message="ERROR: CustRequestItemWorkEffort [${parameters.custRequestItemSeqId}][${parameters.workEffortId}] does not exist."/></add-error>
<check-errors/>
</if-empty>
@@ -704,7 +704,7 @@
<make-value entity-name="CustRequestItem" value-name="lookupMap"/>
<set-pk-fields map-name="parameters" value-name="lookupMap"/>
<find-by-primary-key entity-name="CustRequestItem" map-name="lookupMap" value-name="custRequestItem"/>
- <if-not-empty field-name="custRequestItem">
+ <if-not-empty field="custRequestItem">
<set field="custRequestItemExists" value="true"/>
<field-to-result field-name="custRequestItemExists"/>
<log level="always" message="custRequestItemExists: ${custRequestItemExists}" />
@@ -719,7 +719,7 @@
<make-value entity-name="QuoteWorkEffort" value-name="lookupMap"/>
<set-pk-fields map-name="parameters" value-name="lookupMap"/>
<find-by-primary-key entity-name="QuoteWorkEffort" map-name="lookupMap" value-name="quoteWorkEffort"/>
- <if-not-empty field-name="quoteWorkEffort">
+ <if-not-empty field="quoteWorkEffort">
<add-error><fail-message message="ERROR: QuoteWorkEffort [${parameters.quoteId}][${parameters.workEffortId}] already exists."/></add-error>
<check-errors/>
</if-not-empty>
@@ -729,7 +729,7 @@
</simple-method>
<simple-method method-name="deleteWorkEffortQuote" short-description="Delete a QuoteWorkEffort">
<entity-one entity-name="QuoteWorkEffort" value-name="quoteWorkEffort"/>
- <if-empty field-name="quoteWorkEffort">
+ <if-empty field="quoteWorkEffort">
<add-error><fail-message message="ERROR: QuoteWorkEffort [${parameters.quoteId}][${parameters.workEffortId}] does not exist."/></add-error>
<check-errors/>
</if-empty>
@@ -741,7 +741,7 @@
<make-value entity-name="WorkRequirementFulfillment" value-name="lookupMap"/>
<set-pk-fields map-name="parameters" value-name="lookupMap"/>
<find-by-primary-key entity-name="WorkRequirementFulfillment" map-name="lookupMap" value-name="workRequirementFulfillment"/>
- <if-not-empty field-name="workRequirementFulfillment">
+ <if-not-empty field="workRequirementFulfillment">
<add-error><fail-message message="ERROR: WorkRequirementFulfillment [${parameters.requirementId}][${parameters.workEffortId}] already exists."/></add-error>
<check-errors/>
</if-not-empty>
@@ -751,7 +751,7 @@
</simple-method>
<simple-method method-name="deleteWorkRequirementFulfillment" short-description="Delete a WorkRequirementFulfillment">
<entity-one entity-name="WorkRequirementFulfillment" value-name="workRequirementFulfillment"/>
- <if-empty field-name="workRequirementFulfillment">
+ <if-empty field="workRequirementFulfillment">
<add-error><fail-message message="ERROR: WorkRequirementFulfillment [${parameters.requirementId}][${parameters.workEffortId}] does not exist."/></add-error>
<check-errors/>
</if-empty>
@@ -763,7 +763,7 @@
<make-value entity-name="ShoppingListWorkEffort" value-name="lookupMap"/>
<set-pk-fields map-name="parameters" value-name="lookupMap"/>
<find-by-primary-key entity-name="ShoppingListWorkEffort" map-name="lookupMap" value-name="shoppingListWorkEffort"/>
- <if-not-empty field-name="shoppingListWorkEffort">
+ <if-not-empty field="shoppingListWorkEffort">
<add-error><fail-message message="ERROR: ShoppingListWorkEffort [${parameters.shoppingListId}][${parameters.workEffortId}] already exists."/></add-error>
<check-errors/>
</if-not-empty>
@@ -773,7 +773,7 @@
</simple-method>
<simple-method method-name="deleteShoppingListWorkEffort" short-description="Delete a ShoppingListWorkEffort">
<entity-one entity-name="ShoppingListWorkEffort" value-name="shoppingListWorkEffort"/>
- <if-empty field-name="shoppingListWorkEffort">
+ <if-empty field="shoppingListWorkEffort">
<add-error><fail-message message="ERROR: ShoppingListWorkEffort [${parameters.shoppingListId}][${parameters.workEffortId}] does not exist."/></add-error>
<check-errors/>
</if-empty>
@@ -785,7 +785,7 @@
<make-value entity-name="OrderHeaderWorkEffort" value-name="lookupMap"/>
<set-pk-fields map-name="parameters" value-name="lookupMap"/>
<find-by-primary-key entity-name="OrderHeaderWorkEffort" map-name="lookupMap" value-name="orderWorkEffort"/>
- <if-not-empty field-name="orderWorkEffort">
+ <if-not-empty field="orderWorkEffort">
<add-error><fail-message message="ERROR: OrderHeaderWorkEffort [${parameters.orderId}][${parameters.workEffortId}] already exists."/></add-error>
<check-errors/>
</if-not-empty>
@@ -795,7 +795,7 @@
</simple-method>
<simple-method method-name="deleteOrderHeaderWorkEffort" short-description="Delete a OrderHeaderWorkEffort">
<entity-one entity-name="OrderHeaderWorkEffort" value-name="orderWorkEffort"/>
- <if-empty field-name="orderWorkEffort">
+ <if-empty field="orderWorkEffort">
<add-error><fail-message message="ERROR: OrderHeaderWorkEffort [${parameters.orderId}][${parameters.workEffortId}] does not exist."/></add-error>
<check-errors/>
</if-empty>
@@ -828,7 +828,7 @@
</check-permission>
<check-errors />
<entity-one entity-name="WorkEffortFixedAssetStd" value-name="lookedUpValue" />
- <if-not-empty field-name="lookedUpValue">
+ <if-not-empty field="lookedUpValue">
<add-error>
<fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortFixedAssetAlreadyExist"/>
</add-error>
@@ -867,7 +867,7 @@
</check-permission>
<check-errors />
<entity-one entity-name="WorkEffortFixedAssetAssign" value-name="lookedUpValue" />
- <if-not-empty field-name="lookedUpValue">
+ <if-not-empty field="lookedUpValue">
<add-error>
<fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortFixedAssetAsgAlreadyExist"/>
</add-error>
@@ -877,9 +877,9 @@
<set-nonpk-fields map-name="parameters" value-name="newWEFixedAssetAssign" />
<!-- if the user hasn't specified a fromDate, set it from the actual start date of the task
if there is no actual start date, default to now (to the current date and time) -->
- <if-empty map-name="parameters" field-name="fromDate">
+ <if-empty field="parameters.fromDate">
<entity-one entity-name="WorkEffort" value-name="prodRunTask" />
- <if-not-empty map-name="prodRunTask" field-name="actualStartDate">
+ <if-not-empty field="prodRunTask.actualStartDate">
<set field="newWEFixedAssetAssign.fromDate" from-field="prodRunTask.actualStartDate" />
<else>
<now-timestamp-to-env env-name="newWEFixedAssetAssign.fromDate"/>
@@ -922,7 +922,7 @@
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="fromDate" map-name="newEntity">
+ <if-empty field="newEntity.fromDate">
<now-timestamp-to-env env-name="nowTimestamp"/>
<set field="newEntity.fromDate" from-field="nowTimestamp"/>
</if-empty>
@@ -959,7 +959,7 @@
</check-permission>
<check-errors />
<entity-one entity-name="WorkEffortReview" value-name="lookedUpValue"/>
- <if-not-empty field-name="lookedUpValue">
+ <if-not-empty field="lookedUpValue">
<add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortReviewAlreadyExist"/></add-error>
<check-errors/>
<else>
@@ -967,7 +967,7 @@
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<set-pk-fields map-name="parameters" value-name="newEntity"/>
- <if-empty field-name="reviewDate" map-name="newEntity">
+ <if-empty field="newEntity.reviewDate">
<now-timestamp-to-env env-name="nowTimestamp"/>
<set field="newEntity.reviewDate" from-field="nowTimestamp"/>
</if-empty>
@@ -999,7 +999,7 @@
if it is the WorkEffort entity itself triggering this action, then a worokEffort parameter
will be passed and we can save a few cycles looking that up -->
<set from-field="parameters.workEffort" field="workEffort"/>
- <if-empty field-name="workEffort">
+ <if-empty field="workEffort">
<set from-field="parameters.workEffortId" field="findWorkEffortMap.workEffortId"/>
<find-by-primary-key entity-name="WorkEffort" map-name="findWorkEffortMap" value-name="workEffort"/>
</if-empty>
@@ -1016,14 +1016,14 @@
</check-permission>
<check-errors />
<entity-one entity-name="WorkEffortKeyword" value-name="lookedUpValue"/>
- <if-not-empty field-name="lookedUpValue">
+ <if-not-empty field="lookedUpValue">
<add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortWorkEffortKeywordAlreadyExist"/></add-error>
<else>
<make-value value-name="newEntity" entity-name="WorkEffortKeyword"/>
- <if-empty field-name="parameters.workEffortId">
+ <if-empty field="parameters.workEffortId">
<add-error><fail-property resource="WorkEffortUiLabels" property="WorkEffortIdMissing"/></add-error>
</if-empty>
- <if-empty field-name="parameters.keyword">
+ <if-empty field="parameters.keyword">
<add-error><fail-property resource="ProductUiLabels" property="productevents.keyword_missing"/></add-error>
</if-empty>
<check-errors/>
@@ -1065,7 +1065,7 @@
<check-errors />
<set from-field="parameters.workEffortId" field="findWorkEffortMap.workEffortId"/>
<find-by-primary-key entity-name="WorkEffort" map-name="findWorkEffortMap" value-name="workEffortInstance"/>
- <if-not-empty field-name="workEffortId" map-name="workEffortInstance">
+ <if-not-empty field="workEffortInstance.workEffortId">
<remove-related relation-name="WorkEffortKeyword" value-name="workEffortInstance"></remove-related>
</if-not-empty>
<check-errors/>
@@ -1094,7 +1094,7 @@
<!-- set up entity filter for workEffortAssoc-->
<set field="workEffortAssocFindContext.workEffortIdFrom" from-field="parameters.oldWorkEffortId"/>
<set field="reverseWorkEffortFindContext.workEffortIdTo" from-field="parameters.oldWorkEffortId"/>
- <if-not-empty field-name="duplicateWorkEffortAssocs" map-name="parameters">
+ <if-not-empty field="parameters.duplicateWorkEffortAssocs">
<find-by-and entity-name="WorkEffortAssoc" map-name="workEffortAssocFindContext" list-name="foundValues"/>
<iterate entry-name="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
@@ -1114,7 +1114,7 @@
<!-- set up entity filter -->
<set field="workEffortFindContext.workEffortId" from-field="parameters.oldWorkEffortId"/>
- <if-not-empty field-name="duplicateWorkEffortNotes" map-name="parameters">
+ <if-not-empty field="parameters.duplicateWorkEffortNotes">
<find-by-and entity-name="WorkEffortNote" map-name="workEffortFindContext" list-name="foundValues"/>
<iterate entry-name="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
@@ -1122,7 +1122,7 @@
<create-value value-name="newTempValue"/>
</iterate>
</if-not-empty>
- <if-not-empty field-name="duplicateWorkEffortContents" map-name="parameters">
+ <if-not-empty field="parameters.duplicateWorkEffortContents">
<find-by-and entity-name="WorkEffortContent" map-name="workEffortFindContext" list-name="foundValues"/>
<iterate entry-name="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
@@ -1130,7 +1130,7 @@
<create-value value-name="newTempValue"/>
</iterate>
</if-not-empty>
- <if-not-empty field-name="duplicateWorkEffortAssignmentRates" map-name="parameters">
+ <if-not-empty field="parameters.duplicateWorkEffortAssignmentRates">
<find-by-and entity-name="WorkEffortAssignmentRate" map-name="workEffortFindContext" list-name="foundValues"/>
<iterate entry-name="foundValue" list-name="foundValues">
<clone-value value-name="foundValue" new-value-name="newTempValue"/>
@@ -1139,18 +1139,18 @@
</iterate>
</if-not-empty>
- <if-not-empty field-name="removeWorkEffortAssocs" map-name="parameters">
+ <if-not-empty field="parameters.removeWorkEffortAssocs">
<remove-by-and entity-name="WorkEffortAssoc" map-name="workEffortAssocFindContext"/>
<!-- small difference here, also do the reverse assocs... -->
<remove-by-and entity-name="WorkEffortAssoc" map-name="reverseWorkEffortFindContext"/>
</if-not-empty>
- <if-not-empty field-name="removeWorkEffortContents" map-name="parameters">
+ <if-not-empty field="parameters.removeWorkEffortContents">
<remove-by-and entity-name="WorkEffortContent" map-name="workEffortFindContext"/>
</if-not-empty>
- <if-not-empty field-name="removeWorkEffortNotes" map-name="parameters">
+ <if-not-empty field="parameters.removeWorkEffortNotes">
<remove-by-and entity-name="WorkEffortNote" map-name="workEffortFindContext"/>
</if-not-empty>
- <if-not-empty field-name="removeWorkEffortAssignmentRates" map-name="parameters">
+ <if-not-empty field="parameters.removeWorkEffortAssignmentRates">
<remove-by-and entity-name="WorkEffortAssignmentRate" map-name="workEffortFindContext"/>
</if-not-empty>
</simple-method>
@@ -1198,11 +1198,11 @@
<field-map field-name="workEffortId" env-name="eventMap.workEffortId"/>
</entity-one>
<assert>
- <not><if-empty field-name="workEffort"/></not>
- <if-compare-field field-name="workEffort.workEffortId" operator="equals" to-field-name="eventMap.workEffortId"/>
- <if-compare-field field-name="workEffort.workEffortTypeId" operator="equals" to-field-name="updateEventMap.workEffortTypeId"/>
- <if-compare-field field-name="workEffort.workEffortName" operator="equals" to-field-name="updateEventMap.workEffortName"/>
- <if-compare-field field-name="workEffort.currentStatusId" operator="equals" to-field-name="updateEventMap.currentStatusId"/>
+ <not><if-empty field="workEffort"/></not>
+ <if-compare-field field="workEffort.workEffortId" to-field="eventMap.workEffortId" operator="equals"/>
+ <if-compare-field field="workEffort.workEffortTypeId" to-field="updateEventMap.workEffortTypeId" operator="equals"/>
+ <if-compare-field field="workEffort.workEffortName" to-field="updateEventMap.workEffortName" operator="equals"/>
+ <if-compare-field field="workEffort.currentStatusId" to-field="updateEventMap.currentStatusId" operator="equals"/>
</assert>
<check-errors/>
</simple-method>
@@ -1239,16 +1239,16 @@
<field-map field-name="noteId" env-name="workEffortNoteMap.noteId"/>
</entity-one>
<assert>
- <not><if-empty field-name="workEffort"/></not>
- <if-compare-field field-name="workEffort.workEffortId" operator="equals" to-field-name="projectMap.workEffortId"/>
- <if-compare-field field-name="workEffort.workEffortTypeId" operator="equals" to-field-name="updateProjectMap.workEffortTypeId"/>
- <if-compare-field field-name="workEffort.workEffortName" operator="equals" to-field-name="updateProjectMap.workEffortName"/>
- <if-compare-field field-name="workEffort.currentStatusId" operator="equals" to-field-name="updateProjectMap.currentStatusId"/>
+ <not><if-empty field="workEffort"/></not>
+ <if-compare-field field="workEffort.workEffortId" to-field="projectMap.workEffortId" operator="equals"/>
+ <if-compare-field field="workEffort.workEffortTypeId" to-field="updateProjectMap.workEffortTypeId" operator="equals"/>
+ <if-compare-field field="workEffort.workEffortName" to-field="updateProjectMap.workEffortName" operator="equals"/>
+ <if-compare-field field="workEffort.currentStatusId" to-field="updateProjectMap.currentStatusId" operator="equals"/>
</assert>
<assert>
- <not><if-empty field-name="noteData"/></not>
- <if-compare-field field-name="noteData.noteParty" operator="equals" to-field-name="createWorkEffortNoteMap.noteParty"/>
- <if-compare-field field-name="noteData.noteInfo" operator="equals" to-field-name="createWorkEffortNoteMap.noteInfo"/>
+ <not><if-empty field="noteData"/></not>
+ <if-compare-field field="noteData.noteParty" to-field="createWorkEffortNoteMap.noteParty" operator="equals"/>
+ <if-compare-field field="noteData.noteInfo" to-field="createWorkEffortNoteMap.noteInfo" operator="equals"/>
</assert>
<check-errors/>
</simple-method>
@@ -1291,12 +1291,12 @@
</call-service>
<assert>
<not>
- <if-empty field-name="contactMechId">
+ <if-empty field="contactMechId">
<log level="info" message="========contactMechId ${contactMechId} found null============================"/>
</if-empty>
</not>
<not>
- <if-empty field-name="oldContactMechId">
+ <if-empty field="oldContactMechId">
<log level="info" message="========oldContactMechId ${oldContactMechId} found null============================"/>
</if-empty>
</not>
@@ -1316,12 +1316,12 @@
</call-service>
<assert>
<not>
- <if-empty field-name="contactMechId">
+ <if-empty field="contactMechId">
<log level="info" message="========contactMechId ${contactMechId} found null============================"/>
</if-empty>
</not>
<not>
- <if-empty field-name="oldContactMechId">
+ <if-empty field="oldContactMechId">
<log level="info" message="========oldContactMechId ${oldContactMechId} found null============================"/>
</if-empty>
</not>
@@ -1343,7 +1343,7 @@
</call-service>
<assert>
<not>
- <if-empty field-name="contactMechId">
+ <if-empty field="contactMechId">
<log level="info" message="========contactMechId ${contactMechId} found null============================"/>
</if-empty>
</not>
@@ -1377,12 +1377,12 @@
<field-map field-name="communicationEventId" env-name="commEventMap.communicationEventId"/>
</entity-one>
<assert>
- <not><if-empty field-name="communicationEvent"/></not>
- <if-compare-field field-name="communicationEvent.communicationEventId" operator="equals" to-field-name="commEventMap.communicationEventId"/>
- <if-compare-field field-name="communicationEvent.communicationEventTypeId" operator="equals" to-field-name="updateCommEventMap.communicationEventTypeId"/>
- <if-compare-field field-name="communicationEvent.statusId" operator="equals" to-field-name="updateCommEventMap.statusId"/>
- <if-compare-field field-name="communicationEvent.partyIdFrom" operator="equals" to-field-name="updateCommEventMap.partyIdFrom"/>
- <if-compare-field field-name="communicationEvent.contactMechTypeId" operator="equals" to-field-name="updateCommEventMap.contactMechTypeId"/>
+ <not><if-empty field="communicationEvent"/></not>
+ <if-compare-field field="communicationEvent.communicationEventId" to-field="commEventMap.communicationEventId" operator="equals"/>
+ <if-compare-field field="communicationEvent.communicationEventTypeId" to-field="updateCommEventMap.communicationEventTypeId" operator="equals"/>
+ <if-compare-field field="communicationEvent.statusId" to-field="updateCommEventMap.statusId" operator="equals"/>
+ <if-compare-field field="communicationEvent.partyIdFrom" to-field="updateCommEventMap.partyIdFrom" operator="equals"/>
+ <if-compare-field field="communicationEvent.contactMechTypeId" to-field="updateCommEventMap.contactMechTypeId" operator="equals"/>
</assert>
<check-errors/>
</simple-method>
@@ -1416,12 +1416,12 @@
<field-map field-name="custRequestId" env-name="requestMap.custRequestId"/>
</entity-one>
<assert>
- <not><if-empty field-name="custRequest"/></not>
- <if-compare-field field-name="custRequest.custRequestId" operator="equals" to-field-name="requestMap.custRequestId"/>
- <if-compare-field field-name="custRequest.custRequestTypeId" operator="equals" to-field-name="updateRequestMap.custRequestTypeId"/>
- <if-compare-field field-name="custRequest.statusId" operator="equals" to-field-name="updateRequestMap.statusId"/>
- <if-compare-field field-name="custRequest.priority" operator="equals" to-field-name="updateRequestMap.priority"/>
- <if-compare-field field-name="custRequest.fromPartyId" operator="equals" to-field-name="updateRequestMap.fromPartyId"/>
+ <not><if-empty field="custRequest"/></not>
+ <if-compare-field field="custRequest.custRequestId" to-field="requestMap.custRequestId" operator="equals"/>
+ <if-compare-field field="custRequest.custRequestTypeId" to-field="updateRequestMap.custRequestTypeId" operator="equals"/>
+ <if-compare-field field="custRequest.statusId" to-field="updateRequestMap.statusId" operator="equals"/>
+ <if-compare-field field="custRequest.priority" to-field="updateRequestMap.priority" operator="equals"/>
+ <if-compare-field field="custRequest.fromPartyId" to-field="updateRequestMap.fromPartyId" operator="equals"/>
</assert>
<check-errors/>
</simple-method>
@@ -1438,4 +1438,4 @@
<call-service service-name="updateCustRequest" in-map-name="updateRequestMap"/>
<check-errors/>
</simple-method>
-</simple-methods>
\ No newline at end of file
+</simple-methods>
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=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CdyneServices.xml Fri Jun 13 23:03:12 2008
@@ -26,10 +26,10 @@
<if>
<condition>
<and>
- <not><if-empty field-name="postalAddress"/></not>
+ <not><if-empty field="postalAddress"/></not>
<!-- Make sure this address in the USA, required for this CDyne service -->
- <if-compare field-name="postalAddress.countryGeoId" operator="equals" value="USA"/>
- <if-empty field-name="postalAddress.countyGeoId"/>
+ <if-compare field="postalAddress.countryGeoId" operator="equals" value="USA"/>
+ <if-empty field="postalAddress.countyGeoId"/>
</and>
</condition>
<then>
@@ -54,7 +54,7 @@
</condition-list>
</entity-condition>
<first-from-list entry-name="countyGeo" list-name="geoList"/>
- <if-not-empty field-name="countyGeo">
+ <if-not-empty field="countyGeo">
<!-- We found a county, now just save off the ID -->
<set field="postalAddress.countyGeoId" from-field="countyGeo.geoId"/>
<store-value value-name="postalAddress"/>
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=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/CommonServices.xml Fri Jun 13 23:03:12 2008
@@ -61,12 +61,12 @@
<simple-method method-name="convertUom" short-description="Convert UOM values" login-required="false">
<!-- base case: if both uomIds are the same, return the original value -->
- <if-compare-field field-name="parameters.uomId" operator="equals" to-field-name="parameters.uomIdTo">
+ <if-compare-field field="parameters.uomId" to-field="parameters.uomIdTo" operator="equals">
<field-to-result field-name="parameters.originalValue" result-name="convertedValue"/>
<return/>
</if-compare-field>
- <if-empty field-name="parameters.asOfDate">
+ <if-empty field="parameters.asOfDate">
<now-timestamp-to-env env-name="nowTimestamp"/>
<set field="asOfDate" from-field="nowTimestamp"/>
<else>
@@ -78,7 +78,7 @@
<entity-one entity-name="UomConversion" value-name="uomConversion" auto-field-map="true" use-cache="true"/>
<!-- if not found, try the dated uom conversion entity -->
- <if-empty field-name="uomConversion">
+ <if-empty field="uomConversion">
<entity-condition entity-name="UomConversionDated" list-name="uomConversions" use-cache="true">
<condition-list combine="and">
<condition-expr field-name="uomId" env-name="parameters.uomId"/>
@@ -96,13 +96,13 @@
</if-empty>
<log level="verbose" message="using conversion factor=${uomConversion.conversionFactor}"/>
- <if-empty field-name="uomConversion">
+ <if-empty field="uomConversion">
<!-- if still no uom conversion entity, then no conversion is possible -->
<add-error><fail-property property="NoUomConversionFound" resource="CommonUiLabels"/></add-error>
<check-errors/>
<else>
<!-- Do custom conversion, if we have customMethodId -->
- <if-not-empty field-name="uomConversion.customMethodId"> <!-- custom conversion? -->
+ <if-not-empty field="uomConversion.customMethodId"> <!-- custom conversion? -->
<log level="verbose" message="using custom conversion customMethodId=${uomConversion.customMethodId}"/>
<set field="customParms" from-field="parameters"/>
<set field="customParms.uomConversion" from-field="uomConversion"/>
@@ -123,7 +123,7 @@
<!-- round result, if UomConversion[Dated] so specifies -->
<set field="roundingMode" from-field="uomConversion.roundingMode"/>
- <if-not-empty field-name="uomConversion.roundingMode">
+ <if-not-empty field="uomConversion.roundingMode">
<calculate field-name="roundedValue" type="Double" decimal-scale="${uomConversion.decimalScale}" rounding-mode="${roundingMode}">
<calcop operator="get" field-name="convertedValue"/>
</calculate>
@@ -143,7 +143,7 @@
<set field="customMethodId" from-field="parameters.uomConversion.customMethodId"/>
<entity-one entity-name="CustomMethod" value-name="customMethod" auto-field-map="true" use-cache="true"/>
- <if-empty field-name="customMethod.customMethodName">
+ <if-empty field="customMethod.customMethodName">
<add-error> <fail-property property="NoCustomMethodName" resource="CommonUiLabels"/> </add-error>
<check-errors/>
<else>
@@ -157,7 +157,7 @@
</simple-method>
<simple-method method-name="getFileUploadProgressStatus" short-description="Look up progress made in File Upload process">
<set field="uploadProgressListener" from-field="parameters.uploadProgressListener"/>
- <if-not-empty field-name="uploadProgressListener">
+ <if-not-empty field="uploadProgressListener">
<call-object-method obj-field-name="uploadProgressListener" method-name="getContentLength" ret-field-name="parameters.contentLength"/>
<field-to-result field-name="parameters.contentLength" result-name="contentLength"/>
<call-object-method obj-field-name="uploadProgressListener" method-name="getBytesRead" ret-field-name="parameters.bytesRead"/>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/LookupServices.xml Fri Jun 13 23:03:12 2008
@@ -21,10 +21,10 @@
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
<simple-method method-name="lookupParty" short-description="Lookup a party">
- <if-not-empty field-name="firstName" map-name="parameters">
+ <if-not-empty field="parameters.firstName">
<set from-field="parameters.firstName" field="LookupMap.firstName"/>
</if-not-empty>
- <if-not-empty field-name="lastName" map-name="parameters">
+ <if-not-empty field="parameters.lastName">
<set from-field="parameters.lastName" field="LookupMap.lastName"/>
</if-not-empty>
<find-by-and entity-name="Person" map-name="LookupMap" list-name="parties" />
@@ -33,7 +33,7 @@
<set from-field="party.partyId" field="resultEntry.value"/>
<field-to-list field-name="resultEntry" list-name="lookupResult"/>
</iterate>
- <if-empty field-name="parties">
+ <if-empty field="parties">
<set value="No match" field="resultEntry.label"/>
<set value="" field="resultEntry.value"/>
<field-to-list field-name="resultEntry" list-name="lookupResult"/>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/period/PeriodServices.xml Fri Jun 13 23:03:12 2008
@@ -55,7 +55,7 @@
</simple-method>
<simple-method method-name="findCustomTimePeriods" short-description="Find a CustomTimePeriod">
- <if-not-empty field-name="parameters.organizationPartyId">
+ <if-not-empty field="parameters.organizationPartyId">
<!-- walk up the tree and find all party groups that this is a member of, and include the periods for all of them -->
<set from-field="parameters.organizationPartyId" field="getParentOrganizationsCallMap.organizationPartyId"/>
<call-service service-name="getParentOrganizations" in-map-name="getParentOrganizationsCallMap">
@@ -81,7 +81,7 @@
</iterate>
</if-not-empty>
- <if-compare field-name="parameters.excludeNoOrganizationPeriods" operator="not-equals" value="Y">
+ <if-compare field="parameters.excludeNoOrganizationPeriods" operator="not-equals" value="Y">
<entity-condition entity-name="CustomTimePeriod" list-name="generalCustomTimePeriodList">
<condition-list combine="and">
<condition-list combine="or">
@@ -102,7 +102,7 @@
<!--
* We might want to implement this sometime in the future, but for now is not needed
* go through the list and check each one to see if it has a child in the list, if so don't copy it
- <if-compare field-name="parameters.excludeParentPeriods" operator="equals" value="Y"></if-compare>
+ <if-compare field="parameters.excludeParentPeriods" operator="equals" value="Y"></if-compare>
-->
<field-to-result field-name="listSoFar" result-name="customTimePeriodList"/>
Modified: ofbiz/trunk/framework/common/script/org/ofbiz/common/permission/CommonPermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/script/org/ofbiz/common/permission/CommonPermissionServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/script/org/ofbiz/common/permission/CommonPermissionServices.xml (original)
+++ ofbiz/trunk/framework/common/script/org/ofbiz/common/permission/CommonPermissionServices.xml Fri Jun 13 23:03:12 2008
@@ -22,18 +22,18 @@
<simple-method method-name="genericBasePermissionCheck" short-description="Basic Permission check">
<!-- allow mainAction to be set from outside methods or direct to the service -->
- <if-empty field-name="mainAction">
+ <if-empty field="mainAction">
<set field="mainAction" from-field="parameters.mainAction"/>
- <if-empty field-name="mainAction">
+ <if-empty field="mainAction">
<add-error><fail-property resource="CommonUiLabels" property="CommonPermissionMainActionAttributeMissing"/></add-error>
</if-empty>
</if-empty>
<check-errors/>
<!-- allow primary permission to be set from outside methods or direct to the service -->
- <if-empty field-name="primaryPermission">
+ <if-empty field="primaryPermission">
<set field="primaryPermission" from-field="parameters.primaryPermission"/>
- <if-empty field-name="primaryPermission">
+ <if-empty field="primaryPermission">
<add-error><fail-property resource="CommonUiLabels" property="CommonPermissionPrimaryPermissionMissing"/></add-error>
</if-empty>
</if-empty>
@@ -41,10 +41,10 @@
<log level="info" message="Checking for primary permission ${primaryPermission}_${mainAction}"/>
<!-- allow alt permission to be set from outside methods or direct to the service -->
- <if-empty field-name="altPermission">
+ <if-empty field="altPermission">
<set field="altPermission" from-field="parameters.altPermission"/>
</if-empty>
- <if-not-empty field-name="altPermission">
+ <if-not-empty field="altPermission">
<log level="info" message="Checking for alternate permission ${altPermission}_${mainAction}"/>
<set field="altPermissionList" value=", ${altPermission}_${mainAction}, ${altPermission}_ADMIN"/>
</if-not-empty>
@@ -52,7 +52,7 @@
<!-- set up called service name -->
<set field="resourceDescription" from-field="parameters.resourceDescription"/>
- <if-empty field-name="resourceDescription">
+ <if-empty field="resourceDescription">
<property-to-field resource="CommonUiLabels" property="CommonPermissionThisOperation" field-name="resourceDescription"/>
</if-empty>
Modified: ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml (original)
+++ ofbiz/trunk/framework/entityext/script/org/ofbiz/entityext/synchronization/EntitySyncServices.xml Fri Jun 13 23:03:12 2008
@@ -49,7 +49,7 @@
<!-- TODO: add some code to make sure, as much as possible, that this really isn't running -->
<set field="lookupPKMap.entitySyncId" from-field="parameters.entitySyncId"/>
<find-by-primary-key entity-name="EntitySync" map-name="lookupPKMap" value-name="valueToStore"/>
- <if-compare field-name="valueToStore.runStatusId" operator="equals" value="ESR_RUNNING">
+ <if-compare field="valueToStore.runStatusId" operator="equals" value="ESR_RUNNING">
<set field="valueToStore.runStatusId" value="ESR_NOT_STARTED"/>
<store-value value-name="valueToStore"/>
</if-compare>
Modified: ofbiz/trunk/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml (original)
+++ ofbiz/trunk/framework/example/script/org/ofbiz/example/ExamplePermissionServices.xml Fri Jun 13 23:03:12 2008
@@ -23,7 +23,7 @@
<simple-method method-name="exampleGenericPermission" short-description="Main permission logic">
<set field="mainAction" from-field="parameters.mainAction"/>
- <if-empty field-name="mainAction">
+ <if-empty field="mainAction">
<add-error><fail-message message="In the permission-service element for the exampleGenericPermission service the main-action attribute was missing but is required"/></add-error>
<check-errors/>
</if-empty>
Modified: ofbiz/trunk/framework/example/script/org/ofbiz/example/feature/ExampleFeatureServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/script/org/ofbiz/example/feature/ExampleFeatureServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/script/org/ofbiz/example/feature/ExampleFeatureServices.xml (original)
+++ ofbiz/trunk/framework/example/script/org/ofbiz/example/feature/ExampleFeatureServices.xml Fri Jun 13 23:03:12 2008
@@ -56,7 +56,7 @@
<set-pk-fields map-name="parameters" value-name="newEntity"/>
<set-nonpk-fields map-name="parameters" value-name="newEntity"/>
<!-- fromDate is part of the PK, but optional in the service def, so make sure something is there -->
- <if-empty field-name="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
+ <if-empty field="newEntity.fromDate"><now-timestamp-to-env env-name="newEntity.fromDate"/></if-empty>
<create-value value-name="newEntity"/>
</simple-method>
<simple-method method-name="updateExampleFeatureAppl" short-description="update a ExampleFeatureAppl">
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=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/script/org/ofbiz/assetmaint/FixedAssetMaintEvents.xml Fri Jun 13 23:03:12 2008
@@ -23,13 +23,13 @@
<simple-method method-name="createFixedAssetMaintUpdateWorkEffort" login-required="true"
short-description="Create FixedAssetMaint and Update Schedule information in WorkEffort">
- <if-empty field-name="parameters.fixedAssetId">
+ <if-empty field="parameters.fixedAssetId">
<add-error><fail-property resource="AssetMaintUiLabels" property="AccountingFixedAssetIdRequiredError"/></add-error>
</if-empty>
- <if-not-empty field-name="parameters.fixedAssetId">
+ <if-not-empty field="parameters.fixedAssetId">
<set from-field="parameters.fixedAssetId" field="fixedAssetExistsMap.fixedAssetId"/>
<find-by-primary-key entity-name="FixedAsset" map-name="fixedAssetExistsMap" value-name="existingFixedAssset"/>
- <if-empty field-name="existingFixedAssset">
+ <if-empty field="existingFixedAssset">
<add-error><fail-property resource="AssetMaintUiLabels" property="AccountingFixedAssetIdInvalidError"/></add-error>
</if-empty>
</if-not-empty>
@@ -58,7 +58,7 @@
<set-service-fields map-name="parameters" service-name="updateFixedAssetMaint" to-map-name="updateFixedAssetMaintCtx"/>
<call-service service-name="updateFixedAssetMaint" in-map-name="updateFixedAssetMaintCtx"/>
<check-errors/>
- <if-compare field-name="parameters.statusId" operator="equals" value="FAM_CANCELLED">
+ <if-compare field="parameters.statusId" operator="equals" value="FAM_CANCELLED">
<set field="updateWorkEffortCtx.currentStatusId" value="CAL_CANCELLED"/>
</if-compare>
<set from-field="parameters.scheduleWorkEffortId" field="updateWorkEffortCtx.workEffortId"/>
Modified: ofbiz/trunk/specialpurpose/bi/script/org/ofbiz/bi/DimensionServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/script/org/ofbiz/bi/DimensionServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/script/org/ofbiz/bi/DimensionServices.xml (original)
+++ ofbiz/trunk/specialpurpose/bi/script/org/ofbiz/bi/DimensionServices.xml Fri Jun 13 23:03:12 2008
@@ -29,7 +29,7 @@
<entity-and entity-name="CurrencyDimension" list-name="currencyDims">
<field-map field-name="currencyId" env-name="currency.uomId"/>
</entity-and>
- <if-not-empty field-name="currencyDims">
+ <if-not-empty field="currencyDims">
<iterate list-name="currencyDims" entry-name="currencyDim">
<set field="currencyDim.description" from-field="currency.description"/>
<store-value value-name="currencyDim"/>
@@ -47,7 +47,7 @@
<simple-method method-name="prepareProductDimensionData" short-description="">
<entity-one entity-name="Product" value-name="product"/>
- <if-empty field-name="product">
+ <if-empty field="product">
<add-error><fail-message message="Product with id [${productId}] doesn't exist."/></add-error>
</if-empty>
<check-errors/>
Modified: ofbiz/trunk/specialpurpose/bi/script/org/ofbiz/bi/FactServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/bi/script/org/ofbiz/bi/FactServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/bi/script/org/ofbiz/bi/FactServices.xml (original)
+++ ofbiz/trunk/specialpurpose/bi/script/org/ofbiz/bi/FactServices.xml Fri Jun 13 23:03:12 2008
@@ -23,11 +23,11 @@
<simple-method method-name="loadSalesInvoiceFact" short-description="">
<entity-one entity-name="Invoice" value-name="invoice"/>
- <if-empty field-name="invoice">
+ <if-empty field="invoice">
<add-error><fail-message message="Invoice with id [${parameters.invoiceId}] doesn't exist."/></add-error>
</if-empty>
<check-errors/>
- <if-compare field-name="invoice.invoiceTypeId" operator="equals" value="SALES_INVOICE">
+ <if-compare field="invoice.invoiceTypeId" operator="equals" value="SALES_INVOICE">
<set field="andConditions.invoiceItemTypeId" value="INV_FPROD_ITEM"/>
<get-related relation-name="InvoiceItem" value-name="invoice" list-name="invoiceItems" map-name="andConditions"/>
<iterate list-name="invoiceItems" entry-name="invoiceItem">
@@ -41,39 +41,39 @@
<simple-method method-name="loadSalesInvoiceItemFact" short-description="">
<set field="invoice" from-field="parameters.invoice"/>
<set field="invoiceItem" from-field="parameters.invoiceItem"/>
- <if-empty field-name="invoice">
+ <if-empty field="invoice">
<entity-one entity-name="Invoice" value-name="invoice"/>
</if-empty>
- <if-empty field-name="invoiceItem">
+ <if-empty field="invoiceItem">
<entity-one entity-name="InvoiceItem" value-name="invoiceItem"/>
</if-empty>
- <if-empty field-name="invoice">
+ <if-empty field="invoice">
<add-error><fail-message message="Invoice with id [${parameters.invoiceId}] doesn't exist."/></add-error>
</if-empty>
- <if-empty field-name="invoiceItem">
+ <if-empty field="invoiceItem">
<add-error><fail-message message="The Invoice Item with id [${parameters.invoiceItemSeqId}] doesn't exist."/></add-error>
</if-empty>
<check-errors/>
- <if-compare field-name="invoice.invoiceTypeId" operator="equals" value="SALES_INVOICE">
+ <if-compare field="invoice.invoiceTypeId" operator="equals" value="SALES_INVOICE">
<entity-one entity-name="SalesInvoiceItemFact" value-name="fact" auto-field-map="false">
<field-map field-name="invoiceId" env-name="invoiceItem.invoiceId"/>
<field-map field-name="invoiceItemSeqId" env-name="invoiceItem.invoiceItemSeqId"/>
</entity-one>
<!-- key handling -->
- <if-empty field-name="fact">
+ <if-empty field="fact">
<make-value entity-name="SalesInvoiceItemFact" value-name="fact"/>
<set field="fact.invoiceId" from-field="invoice.invoiceId"/>
<set field="fact.invoiceItemSeqId" from-field="invoiceItem.invoiceItemSeqId"/>
<!-- conversion of the invoice date -->
- <if-not-empty field-name="invoice.invoiceDate">
+ <if-not-empty field="invoice.invoiceDate">
<clear-field field-name="inMap"/>
<set field="inMap.dimensionEntityName" value="DateDimension"/>
<set field="inMap.naturalKeyFields.dateValue" from-field="invoice.invoiceDate"/>
<call-service service-name="getDimensionIdFromNaturalKey" in-map-name="inMap">
<result-to-field result-name="dimensionId" field-name="fact.invoiceDateDimId"/>
</call-service>
- <if-empty field-name="fact.invoiceDateDimId">
+ <if-empty field="fact.invoiceDateDimId">
<set field="fact.invoiceDateDimId" value="_NF_"/>
</if-empty>
<else>
@@ -81,14 +81,14 @@
</else>
</if-not-empty>
<!-- conversion of the product id -->
- <if-not-empty field-name="invoiceItem.productId">
+ <if-not-empty field="invoiceItem.productId">
<clear-field field-name="inMap"/>
<set field="inMap.dimensionEntityName" value="ProductDimension"/>
<set field="inMap.naturalKeyFields.productId" from-field="invoiceItem.productId"/>
<call-service service-name="getDimensionIdFromNaturalKey" in-map-name="inMap">
<result-to-field result-name="dimensionId" field-name="fact.productDimId"/>
</call-service>
- <if-empty field-name="fact.productDimId">
+ <if-empty field="fact.productDimId">
<set field="fact.productDimId" value="_NF_"/>
</if-empty>
<else>
@@ -96,14 +96,14 @@
</else>
</if-not-empty>
<!-- conversion of the invoice currency -->
- <if-not-empty field-name="invoice.currencyUomId">
+ <if-not-empty field="invoice.currencyUomId">
<clear-field field-name="inMap"/>
<set field="inMap.dimensionEntityName" value="CurrencyDimension"/>
<set field="inMap.naturalKeyFields.currencyId" from-field="invoice.currencyUomId"/>
<call-service service-name="getDimensionIdFromNaturalKey" in-map-name="inMap">
<result-to-field result-name="dimensionId" field-name="fact.origCurrencyDimId"/>
</call-service>
- <if-empty field-name="fact.origCurrencyDimId">
+ <if-empty field="fact.origCurrencyDimId">
<set field="fact.origCurrencyDimId" value="_NF_"/>
</if-empty>
<else>
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=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml (original)
+++ ofbiz/trunk/specialpurpose/hhfacility/script/org/ofbiz/hhfacility/FacilityServices.xml Fri Jun 13 23:03:12 2008
@@ -24,12 +24,12 @@
<simple-method method-name="tc_ProductExists" short-description="Check Product Exists" login-required="false">
<set from-field="parameters.productId" field="productIdMap.productId"/>
<find-by-primary-key entity-name="Product" map-name="productIdMap" value-name="product"/>
- <if-not-empty field-name="product.productId">
+ <if-not-empty field="product.productId">
<log level="info" message="Found product ID ${parameters.productId}, "/>
<!-- <log level="info"><string value="Product Details are: "/><field field-name="product"/></log> -->
<return response-code="success"/> <!-- all done -->
</if-not-empty>
- <if-empty field-name="product.productId">
+ <if-empty field="product.productId">
<log level="info" message="No product found for ID ${parameters.productId}, "/>
<add-error error-list-name="errorMessageList"><fail-message message="Product not found"/></add-error>
<return response-code="error"/> <!-- all done -->
Modified: ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml?rev=667748&r1=667747&r2=667748&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/script/org/ofbiz/oagis/OagisMessageServices.xml Fri Jun 13 23:03:12 2008
@@ -27,7 +27,7 @@
<!-- make sure it doesn't already exist: motivation: if it already exists we'll get a HUGE error message on the create with the whole XML file in it if debug is on for that, so we want a smaller error message -->
<find-by-primary-key map-name="newEntity" value-name="currentOagisMessageInfo"/>
- <if-not-empty field-name="currentOagisMessageInfo">
+ <if-not-empty field="currentOagisMessageInfo">
<add-error><fail-message message="This message was already received, ie we have a duplicate combined ID for the message: ${newEntity}"/></add-error>
<check-errors/>
</if-not-empty>
@@ -65,7 +65,7 @@
<set field="createOagisMsgErrCtx.component" from-field="parameters.component"/>
<set field="createOagisMsgErrCtx.task" from-field="parameters.task"/>
<set field="createOagisMsgErrCtx.referenceId" from-field="parameters.referenceId"/>
- <if-not-empty field-name="parameters.errorMapList">
+ <if-not-empty field="parameters.errorMapList">
<iterate list-name="parameters.errorMapList" entry-name="errorMap">
<set field="createOagisMsgErrCtx.description" from-field="errorMap.description"/>
<set field="createOagisMsgErrCtx.reasonCode" from-field="errorMap.reasonCode"/>