svn commit: r667748 [6/16] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r667748 [6/16] - in /ofbiz/trunk: applications/accounting/script
 
|
Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/routing/RoutingServices.xml Fri Jun 13 23:03:12 2008 @@ -25,21 +25,21 @@ <set from-field="parameters.productId" field="lookupRouting.productId"/> <set value="ROU_PROD_TEMPLATE" field="lookupRouting.workEffortGoodStdTypeId"/> <!-- If applicableDate has been passed use the value with all filter-by-date calls--> - <if-not-empty field-name="applicableDate" map-name="parameters"> + <if-not-empty field="parameters.applicableDate"> <set from-field="parameters.applicableDate" field="filterDate"/> <else> <now-timestamp-to-env env-name="filterDate"/> </else> </if-not-empty> <!-- If a workEffortId has been passed, use it to look up the desired routing--> - <if-not-empty field-name="workEffortId" map-name="parameters"> + <if-not-empty field="parameters.workEffortId"> <set from-field="parameters.workEffortId" field="lookupRouting.workEffortId"/> <find-by-and entity-name="WorkEffortGoodStandard" list-name="routings" map-name="lookupRouting"/> <filter-list-by-date list-name="routings" valid-date-name="filterDate"/> <first-from-list list-name="routings" entry-name="routingGS"/> <!-- If the routing is not associated with our product and it's a variant, then check to see if it's virtual product has the routing --> - <if-empty field-name="routingGS"> + <if-empty field="routingGS"> <entity-condition entity-name="ProductAssoc" list-name="virtualProductAssocList"> <condition-list combine="and"> <condition-expr field-name="productIdTo" env-name="parameters.productId" /> @@ -48,7 +48,7 @@ </entity-condition> <filter-list-by-date list-name="virtualProductAssocList" valid-date-name="filterDate"/> <first-from-list list-name="virtualProductAssocList" entry-name="virtualProductAssoc"/> - <if-not-empty field-name="virtualProductAssoc"> + <if-not-empty field="virtualProductAssoc"> <set from-field="virtualProductAssoc.productId" field="lookupRouting.productId"/> <find-by-and entity-name="WorkEffortGoodStandard" list-name="routings" map-name="lookupRouting"/> <!-- Consider the validity against a date passed as (optional) parameter --> @@ -65,7 +65,7 @@ <first-from-list list-name="routings" entry-name="routingGS"/> <!-- If there are no routings associated with our product and it's a variant, then check to see if it's virtual product has a routing --> - <if-empty field-name="routingGS"> + <if-empty field="routingGS"> <entity-condition entity-name="ProductAssoc" list-name="virtualProductAssocList"> <condition-list combine="and"> <condition-expr field-name="productIdTo" env-name="parameters.productId" /> @@ -74,7 +74,7 @@ </entity-condition> <filter-list-by-date list-name="virtualProductAssocList" valid-date-name="filterDate"/> <first-from-list list-name="virtualProductAssocList" entry-name="virtualProductAssoc"/> - <if-not-empty field-name="virtualProductAssoc"> + <if-not-empty field="virtualProductAssoc"> <set from-field="virtualProductAssoc.productId" field="lookupRouting.productId"/> <set value="ROU_PROD_TEMPLATE" field="lookupRouting.workEffortGoodStdTypeId"/> <find-by-and entity-name="WorkEffortGoodStandard" list-name="routings" map-name="lookupRouting"/> @@ -86,7 +86,7 @@ </if-empty> </else> </if-not-empty> - <if-not-empty field-name="routingGS"> + <if-not-empty field="routingGS"> <clear-field field-name="lookupRouting"/> <set from-field="routingGS.workEffortId" field="lookupRouting.workEffortId"/> <find-by-primary-key entity-name="WorkEffort" value-name="routing" map-name="lookupRouting"/> @@ -96,8 +96,8 @@ <if> <condition> <or> - <if-empty field-name="parameters.ignoreDefaultRouting"/> - <if-compare field-name="parameters.ignoreDefaultRouting" operator="equals" value="N"/> + <if-empty field="parameters.ignoreDefaultRouting"/> + <if-compare field="parameters.ignoreDefaultRouting" operator="equals" value="N"/> </or> </condition> <then> @@ -108,7 +108,7 @@ </if> </else> </if-not-empty> - <if-not-empty field-name="routing"> + <if-not-empty field="routing"> <set from-field="routing.workEffortId" field="lookupTasks.workEffortIdFrom"/> <string-to-list string="sequenceNum" list-name="tasksOrder"/> <set value="ROUTING_COMPONENT" field="lookupTasks.workEffortAssocTypeId"/> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleEvents.xml Fri Jun 13 23:03:12 2008 @@ -22,7 +22,7 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method method-name="addRoutingTaskAssoc" short-description="If copyTask field = Y create a copy of the routingTask, in all the case add a RoutingTaskAssociation"> - <if-compare field-name="parameters.copyTask" operator="equals" value="Y"> + <if-compare field="parameters.copyTask" operator="equals" value="Y"> <make-value value-name="lookupPKMap" entity-name="WorkEffort"/> <set field="lookupPKMap.workEffortId" from-field="parameters.workEffortIdTo"/> <find-by-primary-key entity-name="WorkEffort" map-name="lookupPKMap" value-name="lookedUpValue"/> @@ -33,7 +33,7 @@ <result-to-field result-name="workEffortId" map-name="parameters" field-name="workEffortIdTo"/> </call-service> </if-compare> - <if-empty field-name="fromDate" map-name="parameters"> + <if-empty field="parameters.fromDate"> <now-timestamp-to-env env-name="parameters.fromDate"/> </if-empty> <call-map-processor xml-resource="org/ofbiz/manufacturing/techdata/RoutingMapProcs.xml" @@ -43,7 +43,7 @@ <call-service service-name="checkRoutingTaskAssoc" in-map-name="context1"> <result-to-field result-name="sequenceNumNotOk" field-name="sequenceNumNotOk"/> </call-service> - <if-compare field-name="sequenceNumNotOk" operator="equals" value="Y"> + <if-compare field="sequenceNumNotOk" operator="equals" value="Y"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingTwoRoutingTaskWithSameSeqId"/> </add-error> @@ -64,7 +64,7 @@ <call-service service-name="checkRoutingTaskAssoc" in-map-name="context1"> <result-to-field result-name="sequenceNumNotOk" field-name="sequenceNumNotOk"/> </call-service> - <if-compare field-name="sequenceNumNotOk" operator="equals" value="Y"> + <if-compare field="sequenceNumNotOk" operator="equals" value="Y"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingTwoRoutingTaskWithSameSeqId"/> </add-error> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/techdata/RoutingSimpleServices.xml Fri Jun 13 23:03:12 2008 @@ -26,7 +26,7 @@ <make-value value-name="lookupPKMap" entity-name="TechDataCalendar"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendar" map-name="lookupPKMap" value-name="newEntity"/> - <if-not-empty field-name="calendarId" map-name="newEntity"> + <if-not-empty field="newEntity.calendarId"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarIdAlreadyExist"/> </add-error> @@ -35,7 +35,7 @@ <make-value value-name="lookupPKMap" entity-name="TechDataCalendarWeek"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarWeek" map-name="lookupPKMap" value-name="newEntity"/> - <if-empty field-name="calendarWeekId" map-name="newEntity"> + <if-empty field="newEntity.calendarWeekId"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarWeekIdNotExisting"/> </add-error> @@ -68,7 +68,7 @@ <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <get-related value-name="lookupPKMap" relation-name="TechDataCalendarExcDay" list-name="relatedResultList" /> <first-from-list entry-name="relatedResult" list-name="relatedResultList"/> - <if-not-empty field-name="relatedResult"> + <if-not-empty field="relatedResult"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarExceptionDayUseCalendar"/> </add-error> @@ -76,14 +76,14 @@ </if-not-empty> <get-related value-name="lookupPKMap" relation-name="TechDataCalendarExcWeek" list-name="relatedResultList" /> <first-from-list entry-name="relatedResult" list-name="relatedResultList"/> - <if-not-empty field-name="relatedResult"> + <if-not-empty field="relatedResult"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarExceptionWeekUseCalendar"/> </add-error> <check-errors/> </if-not-empty> <find-by-primary-key entity-name="TechDataCalendar" map-name="lookupPKMap" value-name="lookedUpValue"/> - <if-not-empty map-name="lookedUpValue" field-name="calendarWeekId"> + <if-not-empty field="lookedUpValue.calendarWeekId"> <remove-value value-name="lookedUpValue"/> </if-not-empty> </simple-method> @@ -94,7 +94,7 @@ <make-value value-name="lookupPKMap" entity-name="TechDataCalendarWeek"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarWeek" map-name="lookupPKMap" value-name="newEntity"/> - <if-not-empty field-name="calendarWeekId" map-name="newEntity"> + <if-not-empty field="newEntity.calendarWeekId"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarWeekIdAlreadyExist"/> </add-error> @@ -125,7 +125,7 @@ <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <get-related value-name="lookupPKMap" relation-name="TechDataCalendar" list-name="relatedResultList" /> <first-from-list entry-name="relatedResult" list-name="relatedResultList"/> - <if-not-empty field-name="relatedResult"> + <if-not-empty field="relatedResult"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarUseCalendarWeek"/> </add-error> @@ -133,14 +133,14 @@ </if-not-empty> <get-related value-name="lookupPKMap" relation-name="TechDataCalendarExcWeek" list-name="relatedResultList" /> <first-from-list entry-name="relatedResult" list-name="relatedResultList"/> - <if-not-empty field-name="relatedResult"> + <if-not-empty field="relatedResult"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarWeekExceptionUseCalendarWeek"/> </add-error> <check-errors/> </if-not-empty> <find-by-primary-key entity-name="TechDataCalendarWeek" map-name="lookupPKMap" value-name="lookedUpValue"/> - <if-not-empty map-name="lookedUpValue" field-name="calendarWeekId"> + <if-not-empty field="lookedUpValue.calendarWeekId"> <remove-value value-name="lookedUpValue"/> </if-not-empty> </simple-method> @@ -151,7 +151,7 @@ <make-value value-name="lookupPKMap" entity-name="TechDataCalendarExcDay"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarExcDay" map-name="lookupPKMap" value-name="newEntity"/> - <if-not-empty field-name="calendarId" map-name="newEntity"> + <if-not-empty field="newEntity.calendarId"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarExceptionDayIdAlreadyExist"/> </add-error> @@ -181,7 +181,7 @@ <make-value value-name="lookupPKMap" entity-name="TechDataCalendarExcDay"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarExcDay" map-name="lookupPKMap" value-name="lookedUpValue"/> - <if-not-empty map-name="lookedUpValue" field-name="calendarId"> + <if-not-empty field="lookedUpValue.calendarId"> <remove-value value-name="lookedUpValue"/> </if-not-empty> </simple-method> @@ -192,7 +192,7 @@ <make-value value-name="lookupPKMap" entity-name="TechDataCalendarExcWeek"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarExcWeek" map-name="lookupPKMap" value-name="newEntity"/> - <if-not-empty field-name="calendarId" map-name="newEntity"> + <if-not-empty field="newEntity.calendarId"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingCalendarExceptionWeekIdAlreadyExist"/> </add-error> @@ -222,7 +222,7 @@ <make-value value-name="lookupPKMap" entity-name="TechDataCalendarExcWeek"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="TechDataCalendarExcWeek" map-name="lookupPKMap" value-name="lookedUpValue"/> - <if-not-empty map-name="lookedUpValue" field-name="calendarId"> + <if-not-empty field="lookedUpValue.calendarId"> <remove-value value-name="lookedUpValue"/> </if-not-empty> </simple-method> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/campaign/CampaignServices.xml Fri Jun 13 23:03:12 2008 @@ -123,7 +123,7 @@ <if> <condition> <and> - <if-compare-field field-name="userLogin.partyId" operator="not-equals" to-field-name="parameters.partyId"/> + <if-compare-field field="userLogin.partyId" to-field="parameters.partyId" operator="not-equals"/> <not><if-has-permission permission="MARKETING" action="_CREATE"/></not> </and> </condition> @@ -147,7 +147,7 @@ <if> <condition> <and> - <if-compare-field field-name="userLogin.partyId" operator="not-equals" to-field-name="parameters.partyId"/> + <if-compare-field field="userLogin.partyId" to-field="parameters.partyId" operator="not-equals"/> <not><if-has-permission permission="MARKETING" action="_UPDATE"/></not> </and> </condition> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/contact/ContactListServices.xml Fri Jun 13 23:03:12 2008 @@ -26,7 +26,7 @@ <check-errors/> <make-value entity-name="ContactList" value-name="newEntity"/> - <if-empty field-name="parameters.contactListId"> + <if-empty field="parameters.contactListId"> <sequenced-id-to-env sequence-name="ContactList" env-name="newEntity.contactListId"/> <else> <set field="newEntity.contactListId" from-field="parameters.contactListId"/> @@ -55,11 +55,11 @@ <!-- ContactListParty methods --> <simple-method method-name="inlineCheckContactListMechType" short-description="inlineCheckContactListMechType"> <!-- check the preferredContactMechId, make sure it is the right type --> - <if-not-empty field-name="parameters.preferredContactMechId"> + <if-not-empty field="parameters.preferredContactMechId"> <entity-one entity-name="ContactMech" value-name="preferredContactMech" auto-field-map="false"> <field-map field-name="contactMechId" env-name="parameters.preferredContactMechId"/> </entity-one> - <if-compare-field field-name="preferredContactMech.contactMechTypeId" operator="not-equals" to-field-name="contactList.contactMechTypeId"> + <if-compare-field field="preferredContactMech.contactMechTypeId" to-field="contactList.contactMechTypeId" operator="not-equals"> <entity-one entity-name="ContactMechType" value-name="preferredContactMechType" auto-field-map="false"> <field-map field-name="contactMechTypeId" env-name="preferredContactMech.contactMechTypeId"/> </entity-one> @@ -75,8 +75,8 @@ <if> <condition> <and> - <if-compare field-name="contactList.contactMechTypeId" operator="not-equals" value="EMAIL_ADDRESS"/> - <if-compare field-name="parameters.statusId" operator="equals" value="CLPT_PENDING"/> + <if-compare field="contactList.contactMechTypeId" operator="not-equals" value="EMAIL_ADDRESS"/> + <if-compare field="parameters.statusId" operator="equals" value="CLPT_PENDING"/> </and> </condition> <then> @@ -89,7 +89,7 @@ <if> <condition> <and> - <if-compare-field field-name="userLogin.partyId" operator="not-equals" to-field-name="parameters.partyId"/> + <if-compare-field field="userLogin.partyId" to-field="parameters.partyId" operator="not-equals"/> <not><if-has-permission permission="MARKETING" action="_CREATE"/></not> </and> </condition> @@ -107,7 +107,7 @@ <make-value entity-name="ContactListParty" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> - <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"/> @@ -119,7 +119,7 @@ <if> <condition> <and> - <if-compare-field field-name="userLogin.partyId" operator="not-equals" to-field-name="parameters.partyId"/> + <if-compare-field field="userLogin.partyId" to-field="parameters.partyId" operator="not-equals"/> <not><if-has-permission permission="MARKETING" action="_UPDATE"/></not> </and> </condition> @@ -132,8 +132,8 @@ <call-simple-method method-name="inlineCheckContactListStatusParameter"/> <entity-one entity-name="ContactListParty" value-name="lookedUpValue"/> - <if-not-empty field-name="parameters.statusId"> - <if-compare-field field-name="parameters.statusId" operator="not-equals" to-field-name="lookedUpValue.statusId"> + <if-not-empty field="parameters.statusId"> + <if-compare-field field="parameters.statusId" to-field="lookedUpValue.statusId" operator="not-equals"> <!-- NOTE: must be parameters as this will have the new statusId, and it will have additional attributes like optInVerifyCode --> <set-service-fields service-name="createContactListPartyStatus" map-name="parameters" to-map-name="createContactListPartyStatusMap"/> <call-service service-name="createContactListPartyStatus" in-map-name="createContactListPartyStatusMap"/> @@ -163,7 +163,7 @@ <if> <condition> <and> - <if-compare-field field-name="userLogin.partyId" operator="not-equals" to-field-name="parameters.partyId"/> + <if-compare-field field="userLogin.partyId" to-field="parameters.partyId" operator="not-equals"/> <not><if-has-permission permission="MARKETING" action="_CREATE"/></not> <not><if-has-permission permission="MARKETING" action="_UPDATE"/></not> </and> @@ -181,12 +181,12 @@ <!-- if statusId is CLPT_PENDING, set optInVerifyCode; else if statusId is CLPT_ACCEPTED, make sure optInVerifyCode is the same as the last CLPT_PENDING --> <if> - <condition><if-compare field-name="newEntity.statusId" operator="equals" value="CLPT_PENDING"/></condition> + <condition><if-compare field="newEntity.statusId" operator="equals" value="CLPT_PENDING"/></condition> <then> <call-bsh><![CDATA[newEntity.set("optInVerifyCode", Long.toString(Math.round(9999999999L * Math.random())))]]></call-bsh> </then> <else-if> - <condition><if-compare field-name="newEntity.statusId" operator="equals" value="CLPT_ACCEPTED"/></condition> + <condition><if-compare field="newEntity.statusId" operator="equals" value="CLPT_ACCEPTED"/></condition> <then> <!-- look up the last ContactListPartyStatus with statusId=CLPT_PENDING --> <entity-condition entity-name="ContactListPartyStatus" list-name="lastContactListPartyStatusList"> @@ -201,9 +201,9 @@ <first-from-list entry-name="lastContactListPartyStatus" list-name="lastContactListPartyStatusList"/> <!-- only require an optInVerifyCode if there was one in place --> - <if-not-empty field-name="lastContactListPartyStatus.optInVerifyCode"> - <if-not-empty field-name="parameters.optInVerifyCode"> - <if-compare-field field-name="lastContactListPartyStatus.optInVerifyCode" operator="not-equals" to-field-name="parameters.optInVerifyCode"> + <if-not-empty field="lastContactListPartyStatus.optInVerifyCode"> + <if-not-empty field="parameters.optInVerifyCode"> + <if-compare-field field="lastContactListPartyStatus.optInVerifyCode" to-field="parameters.optInVerifyCode" operator="not-equals"> <add-error><fail-message message="The Opt-in Verify Code specified [${parameters.optInVerifyCode}] was not correct. Please check the code you were sent."/></add-error> </if-compare-field> <else> @@ -224,7 +224,7 @@ <if> <condition> <and> - <if-compare-field field-name="userLogin.partyId" operator="not-equals" to-field-name="parameters.partyId"/> + <if-compare-field field="userLogin.partyId" to-field="parameters.partyId" operator="not-equals"/> <not><if-has-permission permission="MARKETING" action="_VIEW"/></not> </and> </condition> @@ -239,10 +239,10 @@ <if> <condition> <and> - <not><if-empty field-name="contactList.verifyEmailFrom"></if-empty></not> - <not><if-empty field-name="contactList.verifyEmailSubject"></if-empty></not> - <not><if-empty field-name="contactList.verifyEmailScreen"></if-empty></not> - <not><if-empty field-name="contactList.verifyEmailWebSiteId"></if-empty></not> + <not><if-empty field="contactList.verifyEmailFrom"></if-empty></not> + <not><if-empty field="contactList.verifyEmailSubject"></if-empty></not> + <not><if-empty field="contactList.verifyEmailScreen"></if-empty></not> + <not><if-empty field="contactList.verifyEmailWebSiteId"></if-empty></not> </and> </condition> <then> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/segment/SegmentServices.xml Fri Jun 13 23:03:12 2008 @@ -186,8 +186,8 @@ <if> <condition> <and> - <if-empty field-name="segmentGroupViewRelatedPartiesList"/> - <!-- <if-empty field-name="segmentGroupViewRelatedPartiesClassList"/> --> + <if-empty field="segmentGroupViewRelatedPartiesList"/> + <!-- <if-empty field="segmentGroupViewRelatedPartiesClassList"/> --> </and> </condition> <then> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/test/TestServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/test/TestServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/test/TestServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/test/TestServices.xml Fri Jun 13 23:03:12 2008 @@ -60,10 +60,10 @@ <log level="info" message="======== Created contactListId [${contactListId}] ======="/> <entity-one entity-name="ContactList" value-name="contactList"/> <assert> - <not><if-empty field-name="contactList"/></not> - <if-compare-field field-name="contactList.contactListTypeId" operator="equals" to-field-name="contactListTypeId"/> - <if-compare-field field-name="contactList.contactListName" operator="equals" to-field-name="contactListName"/> - <if-compare-field field-name="contactList.contactMechTypeId" operator="equals" to-field-name="contactMechTypeId"/> + <not><if-empty field="contactList"/></not> + <if-compare-field field="contactList.contactListTypeId" to-field="contactListTypeId" operator="equals"/> + <if-compare-field field="contactList.contactListName" to-field="contactListName" operator="equals"/> + <if-compare-field field="contactList.contactMechTypeId" to-field="contactMechTypeId" operator="equals"/> </assert> <check-errors/> @@ -82,11 +82,11 @@ <entity-one entity-name="ContactList" value-name="contactList"/> <assert> - <not><if-empty field-name="contactList"/></not> - <if-compare-field field-name="contactList.contactListTypeId" operator="equals" to-field-name="contactListTypeId"/> - <if-compare-field field-name="contactList.contactListName" operator="equals" to-field-name="contactListName"/> - <if-compare-field field-name="contactList.contactMechTypeId" operator="equals" to-field-name="contactMechTypeId"/> + <not><if-empty field="contactList"/></not> + <if-compare-field field="contactList.contactListTypeId" to-field="contactListTypeId" operator="equals"/> + <if-compare-field field="contactList.contactListName" to-field="contactListName" operator="equals"/> + <if-compare-field field="contactList.contactMechTypeId" to-field="contactMechTypeId" operator="equals"/> </assert> <check-errors/> </simple-method> -</simple-methods> \ No newline at end of file +</simple-methods> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/marketing/tracking/TrackingCodeServices.xml Fri Jun 13 23:03:12 2008 @@ -143,7 +143,7 @@ </simple-method> <simple-method method-name="createTrackingCodeOrderReturns" short-description="Create TrackingCodeOrderReturn for all the Return Items with Orders that have trackingCodeOrder entry"> - <if-not-empty field-name="returnId" map-name="parameters"> + <if-not-empty field="parameters.returnId"> <set field="returnHeaderFindContext.returnId" from-field="parameters.returnId" /> <find-by-primary-key entity-name="ReturnHeader" value-name="returnHeader" map-name="returnHeaderFindContext"/> <get-related list-name="returnItems" relation-name="ReturnItem" value-name="returnHeader"/> @@ -157,7 +157,7 @@ <find-by-and entity-name="TrackingCodeOrder" list-name="trackingCodeOrders" map-name="trackingCodeOrderFindContext"/> <set field="trackingCodeOrder" from-field="trackingCodeOrders[0]"/> <log level="info" message="Create Tracking Code Order Return For ${trackingCodeOrder}"/> - <if-not-empty field-name="trackingCodeOrder"> + <if-not-empty field="trackingCodeOrder"> <set-service-fields to-map-name="trackingCodeOrderReturnContext" service-name="createTrackingCodeOrderReturn" map-name="trackingCodeOrder"/> <set field="trackingCodeOrderReturnContext.returnId" from-field="parameters.returnId"/> <set field="trackingCodeOrderReturnContext.orderId" from-field="trackingCodeOrder.orderId"/> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/account/AccountServices.xml Fri Jun 13 23:03:12 2008 @@ -20,15 +20,15 @@ <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="createAccount" short-description="create Account Group"> - <if-not-empty field-name="parameters.accountType"> + <if-not-empty field="parameters.accountType"> <set field="accountType" from-field="parameters.accountType"/> <else> <set field="accountType" value="GROUP"/> </else> </if-not-empty> <set field="parameters.roleTypeId" value="ACCOUNT"/> - <if-compare field-name="accountType" operator="equals" value="GROUP"> + <if-compare field="accountType" operator="equals" value="GROUP"> <call-simple-method method-name="createPartyGroupRoleAndContactMechs" xml-resource="org/ofbiz/party/party/PartySimpleMethods.xml"/> </if-compare> </simple-method> -</simple-methods> \ No newline at end of file +</simple-methods> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/contact/ContactServices.xml Fri Jun 13 23:03:12 2008 @@ -22,7 +22,7 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <simple-method short-description="Create Contact" method-name="createContact"> <set field="parameters.roleTypeId" value="CONTACT"/> - <if-compare field-name="parameters.quickAdd" operator="not-equals" value="true"> + <if-compare field="parameters.quickAdd" operator="not-equals" value="true"> <call-simple-method method-name="createPersonRoleAndContactMechs" xml-resource="org/ofbiz/party/party/PartySimpleMethods.xml"/> <else> <call-map-processor processor-name="person" in-map-name="parameters" out-map-name="personCtx" @@ -31,12 +31,12 @@ <result-to-field result-name="partyId" field-name="partyId"/> <result-to-result result-name="partyId" service-result-name="partyId"/> </call-service> - <if-not-empty field-name="parameters.roleTypeId"> + <if-not-empty field="parameters.roleTypeId"> <set field="createPartyRoleCtx.partyId" from-field="partyId"/> <set field="createPartyRoleCtx.roleTypeId" from-field="parameters.roleTypeId"/> <call-service service-name="createPartyRole" in-map-name="createPartyRoleCtx"/> </if-not-empty> - <if-not-empty field-name="parameters.emailAddress"> + <if-not-empty field="parameters.emailAddress"> <call-map-processor in-map-name="parameters" out-map-name="emailAddressCtx"> <simple-map-processor name="emailAddress"> <process field="emailAddress"> @@ -74,10 +74,10 @@ <set field="phoneContactMechId" from-field="parameters.phoneContactMechId"/> <set field="emailContactMechId" from-field="parameters.emailContactMechId"/> <set field="infoString" from-field="parameters.infoString"/> - <if-compare-field field-name="partyIdTo" operator="not-equals" to-field-name="partyId"> - <if-compare field-name="parameters.useAddress2" operator="equals" value="Y" > - <if-not-empty field-name="addrContactMechId"> - <if-not-empty field-name="addrContactMechIdTo"> + <if-compare-field field="partyIdTo" to-field="partyId" operator="not-equals"> + <if-compare field="parameters.useAddress2" operator="equals" value="Y"> + <if-not-empty field="addrContactMechId"> + <if-not-empty field="addrContactMechIdTo"> <set field="updatePartyContactMechCtx.partyId" from-field="partyIdTo"/> <set field="updatePartyContactMechCtx.contactMechTypeId" value="POSTAL_ADDRESS"/> <set field="updatePartyContactMechCtx.contactMechId" from-field="addrContactMechIdTo"/> @@ -92,9 +92,9 @@ <clear-field field-name="deletePartyContactMechCtx"/> </if-not-empty> </if-compare> - <if-compare field-name="parameters.useContactNum2" operator="equals" value="Y" > - <if-not-empty field-name="phoneContactMechId"> - <if-not-empty field-name="phoneContactMechIdTo"> + <if-compare field="parameters.useContactNum2" operator="equals" value="Y"> + <if-not-empty field="phoneContactMechId"> + <if-not-empty field="phoneContactMechIdTo"> <set field="updatePartyContactMechCtx.partyId" from-field="partyIdTo"/> <set field="updatePartyContactMechCtx.contactMechId" from-field="phoneContactMechIdTo"/> <set field="updatePartyContactMechCtx.contactMechTypeId" value="TELECOM_NUMBER"/> @@ -109,9 +109,9 @@ <clear-field field-name="deletePartyContactMechCtx"/> </if-not-empty> </if-compare> - <if-compare field-name="parameters.useEmail2" operator="equals" value="Y" > - <if-not-empty field-name="emailContactMechId"> - <if-not-empty field-name="emailContactMechIdTo"> + <if-compare field="parameters.useEmail2" operator="equals" value="Y"> + <if-not-empty field="emailContactMechId"> + <if-not-empty field="emailContactMechIdTo"> <set field="updatePartyContactMechCtx.partyId" from-field="partyIdTo"/> <set field="updatePartyContactMechCtx.contactMechId" from-field="emailContactMechIdTo"/> <set field="updatePartyContactMechCtx.contactMechTypeId" value="EMAIL_ADDRESS"/> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/lead/LeadServices.xml Fri Jun 13 23:03:12 2008 @@ -23,7 +23,7 @@ <simple-method method-name="createLead" short-description="create Lead Person or Lead Group"> <set field="parameters.roleTypeId" value="LEAD"/> - <if-compare field-name="parameters.quickAdd" operator="not-equals" value="Y"> + <if-compare field="parameters.quickAdd" operator="not-equals" value="Y"> <call-simple-method method-name="createPersonRoleAndContactMechs" xml-resource="org/ofbiz/party/party/PartySimpleMethods.xml"/> <else> <call-map-processor processor-name="person" in-map-name="parameters" out-map-name="personCtx" @@ -32,12 +32,12 @@ <result-to-field result-name="partyId" field-name="partyId"/> <result-to-result result-name="partyId" service-result-name="partyId"/> </call-service> - <if-not-empty field-name="parameters.roleTypeId"> + <if-not-empty field="parameters.roleTypeId"> <set field="createPartyRoleCtx.partyId" from-field="partyId"/> <set field="createPartyRoleCtx.roleTypeId" from-field="parameters.roleTypeId"/> <call-service service-name="createPartyRole" in-map-name="createPartyRoleCtx"/> </if-not-empty> - <if-not-empty field-name="parameters.emailAddress"> + <if-not-empty field="parameters.emailAddress"> <call-map-processor in-map-name="parameters" out-map-name="emailAddressCtx"> <simple-map-processor name="emailAddress"> <process field="emailAddress"> @@ -55,7 +55,7 @@ </else> </if-compare> - <if-not-empty field-name="userLogin.partyId"> + <if-not-empty field="userLogin.partyId"> <set field="createPartyRoleCtx.partyId" from-field="userLogin.partyId"/> <set field="createPartyRoleCtx.roleTypeId" value="OWNER"/> @@ -73,7 +73,7 @@ <call-service service-name="setPartyStatus" in-map-name="updatePartyCtx"/> </if-not-empty> <!-- Now create PartyGroup corresponding to the companyName, if its not null and then set up relationship of Person and PartyGroup as Employee and title --> - <if-not-empty field-name="parameters.groupName"> + <if-not-empty field="parameters.groupName"> <set field="parameters.partyTypeId" value="PARTY_GROUP"/> <call-map-processor processor-name="partyGroup" in-map-name="parameters" out-map-name="partyGroupCtx" xml-resource="org/ofbiz/party/party/PartyMapProcs.xml"/> @@ -98,7 +98,7 @@ </if-not-empty> <log level="verbose" message=" ${partyGroupPartyId}"></log> - <if-not-empty field-name="parameters.leadSource"> + <if-not-empty field="parameters.leadSource"> <make-value entity-name="DataSource" value-name="dataSource"/> <sequenced-id-to-env sequence-name="DataSource" env-name="dataSourceId"/> <set field="dataSource.dataSourceId" from-field="dataSourceId"/> @@ -131,7 +131,7 @@ <filter-list-by-date list-name="partyRelationships" to-list-name="partyRelationships"/> <first-from-list list-name="partyRelationships" entry-name="partyRelationship"/> - <if-not-empty field-name="partyRelationship"> + <if-not-empty field="partyRelationship"> <set-service-fields service-name="updatePartyRelationship" map-name="partyRelationship" to-map-name="deletePartyRelationship"/> <call-service service-name="deletePartyRelationship" in-map-name="deletePartyRelationship"/> <set field="partyGroupId" from-field="partyRelationship.partyIdFrom"/> @@ -140,7 +140,7 @@ </else> </if-not-empty> - <if-empty field-name="partyGroupId"> + <if-empty field="partyGroupId"> <add-error><fail-message message="Party Group ID not found in realtionship AND not supplied"/></add-error> </if-empty> <check-errors/> Modified: ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml (original) +++ ofbiz/trunk/applications/marketing/script/org/ofbiz/sfa/opportunity/OpportunityServices.xml Fri Jun 13 23:03:12 2008 @@ -23,7 +23,7 @@ <simple-method method-name="createOpportunity" short-description="Create Opportunity for SFA"> <make-value entity-name="SalesOpportunity" value-name="newEntity"/> - <if-empty field-name="parameters.salesOpportunityId"> + <if-empty field="parameters.salesOpportunityId"> <sequenced-id-to-env sequence-name="SalesOpportunity" env-name="parameters.salesOpportunityId"/> </if-empty> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CustomerEvents.xml Fri Jun 13 23:03:12 2008 @@ -58,7 +58,7 @@ </call-map-processor> <!-- Create the Postal Address --> - <if-compare field-name="parameters.useAddress" operator="equals" value="true"> + <if-compare field="parameters.useAddress" operator="equals" value="true"> <call-map-processor in-map-name="parameters" out-map-name="addressContext"> <simple-map-processor name="newAddress"> <make-in-string field="fullName"> @@ -91,15 +91,15 @@ <process field="allowSolicitation"><copy/></process> </simple-map-processor> </call-map-processor> - <if-compare value="USA" operator="equals" field-name="countryGeoId" map-name="parameters"> - <if-empty field-name="stateProvinceGeoId" map-name="parameters"> + <if-compare value="USA" operator="equals" field="parameters.countryGeoId"> + <if-empty field="parameters.stateProvinceGeoId"> <add-error> <fail-property resource="PartyUiLabels" property="PartyStateInUsMissing"/> </add-error> </if-empty> </if-compare> - <if-compare value="CAN" operator="equals" field-name="countryGeoId" map-name="parameters"> - <if-empty field-name="stateProvinceGeoId" map-name="parameters"> + <if-compare value="CAN" operator="equals" field="parameters.countryGeoId"> + <if-empty field="parameters.stateProvinceGeoId"> <add-error> <fail-property resource="PartyUiLabels" property="PartyProveinceInCanadaMissing"/> </add-error> @@ -142,14 +142,14 @@ <simple-method method-name="createUpdateCustomerInfo" short-description="Create Customer" login-required="false"> <!-- update the email address --> - <if-not-empty field-name="parameters.emailContactMechId"> + <if-not-empty field="parameters.emailContactMechId"> <set from-field="partyId" field="emailMap.partyId"/> <set from-field="parameters.emailContactMechId" field="emailMap.contactMechId"/> <!-- call the update email service --> <call-service service-name="updatePartyEmailAddress" in-map-name="emailMap"/> <else> <!-- create the email address --> - <if-not-empty field-name="parameters.emailAddress"> + <if-not-empty field="parameters.emailAddress"> <set from-field="partyId" field="emailMap.partyId"/> <set field="emailMap.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/> <!-- call the create email service --> @@ -160,14 +160,14 @@ <!-- create home phone --> - <if-not-empty field-name="parameters.homePhoneContactMechId"> + <if-not-empty field="parameters.homePhoneContactMechId"> <set from-field="partyId" field="homePhoneMap.partyId"/> <set from-field="parameters.homePhoneContactMechId" field="homePhoneMap.contactMechId"/> <!-- call update telecom service --> <call-service service-name="updatePartyTelecomNumber" in-map-name="homePhoneMap"/> <else> <!-- create home phone --> - <if-not-empty field-name="homeContactNumber" map-name="parameters"> + <if-not-empty field="parameters.homeContactNumber"> <set from-field="partyId" field="homePhoneMap.partyId"/> <set field="homePhoneMap.contactMechPurposeTypeId" value="PHONE_HOME"/> <!-- call create telecom service --> @@ -177,14 +177,14 @@ </if-not-empty> <!-- create work phone --> - <if-not-empty field-name="parameters.workPhoneContactMechId"> + <if-not-empty field="parameters.workPhoneContactMechId"> <set from-field="partyId" field="workPhoneMap.partyId"/> <set from-field="parameters.workPhoneContactMechId" field="workPhoneMap.contactMechId"/> <!-- call update telecom service --> <call-service service-name="updatePartyTelecomNumber" in-map-name="workPhoneMap"/> <else> <!-- create work phone --> - <if-not-empty field-name="workContactNumber" map-name="parameters"> + <if-not-empty field="parameters.workContactNumber"> <set from-field="partyId" field="workPhoneMap.partyId"/> <set field="workPhoneMap.contactMechPurposeTypeId" value="PHONE_WORK"/> <!-- call create telecom service --> @@ -194,7 +194,7 @@ </if-not-empty> <!-- shipping address --> - <if-not-empty field-name="parameters.shippingContactMechId"> + <if-not-empty field="parameters.shippingContactMechId"> <set from-field="partyId" field="addressContext.partyId"/> <set from-field="parameters.shippingContactMechId" field="addressContext.contactMechId"/> <!-- call the update address service --> @@ -203,7 +203,7 @@ <result-to-request result-name="contactMechId"/> </call-service> <else> - <if-compare field-name="parameters.useAddress" operator="equals" value="true"> + <if-compare field="parameters.useAddress" operator="equals" value="true"> <set from-field="partyId" field="addressContext.partyId"/> <call-service service-name="createPartyPostalAddress" in-map-name="addressContext"> <result-to-field result-name="contactMechId" map-name="addressPurposeContext"/> @@ -234,13 +234,13 @@ </call-service> <!-- the rest of the methods require a userLogin object; so if we are anonymous lets fake it --> - <if-empty field-name="userLogin"> + <if-empty field="userLogin"> <set field="ulLookup.userLoginId" value="anonymous"/> <find-by-primary-key entity-name="UserLogin" map-name="ulLookup" value-name="userLogin"/> <set field="userLogin.partyId" from-field="tempMap.partyId"/> <set-current-user-login value-name="userLogin"/> <else><!-- of an anonymous vistor is coming back, update the party id in the userLogin object --> - <if-compare field-name="userLogin.userLoginId" value="anonymous" operator="equals"> + <if-compare field="userLogin.userLoginId" value="anonymous" operator="equals"> <set field="userLogin.partyId" from-field="tempMap.partyId"/> </if-compare> </else> @@ -257,7 +257,7 @@ <call-simple-method method-name="createUpdateCustomerInfo"/> <!-- create userLogin --> - <if-not-empty field-name="userLoginId" map-name="parameters"> + <if-not-empty field="parameters.userLoginId"> <set field="loginMap.userLoginId" from-field="parameters.userLoginId"/> <!-- call create userLogin --> <!-- call reset password (to email a password) --> @@ -265,7 +265,7 @@ </simple-method> <simple-method method-name="updateCustomer" short-description="Update Customer" login-required="true"> - <if-empty field-name="parameters.partyId"><add-error><fail-property resource="EcommerceUiLabels" property="PartyNoPartyForUpdateCustomer"/></add-error></if-empty> + <if-empty field="parameters.partyId"><add-error><fail-property resource="EcommerceUiLabels" property="PartyNoPartyForUpdateCustomer"/></add-error></if-empty> <call-simple-method method-name="validateCustomerInfo"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/opportunity/OpportunityServices.xml Fri Jun 13 23:03:12 2008 @@ -100,4 +100,4 @@ <entity-one entity-name="SalesForecastDetail" value-name="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> -</simple-methods> \ No newline at end of file +</simple-methods> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderDeliveryServices.xml Fri Jun 13 23:03:12 2008 @@ -29,7 +29,7 @@ <make-value entity-name="OrderDeliverySchedule" value-name="schedule"/> <set-pk-fields map-name="parameters" value-name="schedule"/> - <if-empty field-name="orderItemSeqId" map-name="schedule"> + <if-empty field="schedule.orderItemSeqId"> <set value="_NA_" field="schedule.orderItemSeqId"/> </if-empty> @@ -75,7 +75,7 @@ <call-simple-method method-name="checkSupplierRelatedPermission"/> <check-errors/> - <if-empty field-name="parameters.orderItemSeqId"> + <if-empty field="parameters.orderItemSeqId"> <set field="parameters.orderItemSeqId" value="_NA_"/> </if-empty> @@ -109,7 +109,7 @@ <!-- set subject, contentType, templateName, templateData --> <set field="sendEmailMap.subject" value="Delivery Information Updated for Order #${orderDeliverySchedule.orderId}"/> - <if-compare field-name="orderDeliverySchedule.orderItemSeqId" operator="not-equals" value="_NA_"> + <if-compare field="orderDeliverySchedule.orderItemSeqId" operator="not-equals" value="_NA_"> <string-append string=" Item #${orderDeliverySchedule.orderItemSeqId}" field-name="subject" map-name="sendEmailMap"/> </if-compare> <set field="sendEmailMap.contentType" value="text/html"/> @@ -121,8 +121,8 @@ <if> <condition> <and> - <not><if-empty field-name="sendTo" map-name="sendEmailMap"/></not> - <not><if-empty field-name="sendFrom" map-name="sendEmailMap"/></not> + <not><if-empty field="sendEmailMap.sendTo"/></not> + <not><if-empty field="sendEmailMap.sendFrom"/></not> </and> </condition> <then> @@ -143,10 +143,10 @@ <!-- Should be called in-line to use its out parameter indicating whether the user has permission or not. --> <simple-method method-name="checkSupplierRelatedPermission" short-description="Check Supplier Related Permission"> - <if-empty field-name="callingMethodName"> + <if-empty field="callingMethodName"> <set value="this operation" field="callingMethodName"/> </if-empty> - <if-empty field-name="checkAction"> + <if-empty field="checkAction"> <set value="UPDATE" field="checkAction"/> </if-empty> <set field="hasSupplierRelatedPermission" value="false"/> @@ -164,7 +164,7 @@ <find-by-primary-key entity-name="OrderRole" map-name="lookupOrderRoleMap" value-name="permOrderRole"/> <if> <condition> - <if-empty field-name="permOrderRole"/> + <if-empty field="permOrderRole"/> </condition> <then> <set field="hasSupplierRelatedPermission" value="false"/> Modified: ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml (original) +++ ofbiz/trunk/applications/order/script/org/ofbiz/order/order/OrderReturnServices.xml Fri Jun 13 23:03:12 2008 @@ -27,7 +27,7 @@ <condition> <and> <not><if-has-permission permission="ORDERMGR" action="_CREATE"/></not> - <not><if-compare-field field-name="partyId" map-name="userLogin" operator="equals" to-field-name="fromPartyId" to-map-name="parameters"/></not> + <not><if-compare-field field="userLogin.partyId" to-field="parameters.fromPartyId" operator="equals"/></not> </and> </condition> <then> @@ -35,9 +35,9 @@ </then> </if> - <if-empty field-name="parameters.toPartyId"> + <if-empty field="parameters.toPartyId"> <!-- no toPartyId was specified. use destination facility to determine the party of the return --> - <if-not-empty field-name="parameters.destinationFacilityId"> + <if-not-empty field="parameters.destinationFacilityId"> <entity-one entity-name="Facility" value-name="destinationFacility" auto-field-map="false"> <field-map field-name="facilityId" env-name="parameters.destinationFacilityId"/> </entity-one> @@ -51,7 +51,7 @@ <field-map field-name="partyId" env-name="parameters.toPartyId"/> <field-map field-name="roleTypeId" value="INTERNAL_ORGANIZATIO"/> </entity-one> - <if-empty field-name="partyRole"> + <if-empty field="partyRole"> <add-error><fail-message message="Error: a return must be to a party in the role of internal organization"/></add-error> </if-empty> </else> @@ -59,7 +59,7 @@ <check-errors/> <!-- check the needs (auto) inventory receive flag (default to no) --> - <if-empty field-name="parameters.needsInventoryReceive"> + <if-empty field="parameters.needsInventoryReceive"> <set field="parameters.needsInventoryReceive" value="N"/> </if-empty> @@ -71,7 +71,7 @@ <call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap"> <result-to-field result-name="partyAccountingPreference" field-name="partyAcctgPreference"/> </call-service> - <if-compare field-name="partyAcctgPreference.useInvoiceIdForReturns" operator="equals" value="Y"> + <if-compare field="partyAcctgPreference.useInvoiceIdForReturns" operator="equals" value="Y"> <set field="getNextInvoiceIdMap.partyId" from-field="parameters.toPartyId"/> <call-service service-name="getNextInvoiceId" in-map-name="getNextInvoiceIdMap"> <result-to-field result-name="invoiceId" field-name="newEntity.returnId"/> @@ -93,11 +93,11 @@ </then> </if> - <if-empty field-name="newEntity.entryDate"> + <if-empty field="newEntity.entryDate"> <set from-field="nowTimestamp" field="newEntity.entryDate"/> </if-empty> - <if-empty field-name="newEntity.statusId"> + <if-empty field="newEntity.statusId"> <set value="RETURN_REQUESTED" field="newEntity.statusId"/> </if-empty> <set field="newEntity.createdBy" from-field="userLogin.userLoginId"/> @@ -113,7 +113,7 @@ <entity-one entity-name="ReturnHeader" value-name="returnHeader"/> <!-- test the total return amount vs the total order amount --> - <if-compare field-name="parameters.statusId" value="RETURN_ACCEPTED" operator="equals"> + <if-compare field="parameters.statusId" value="RETURN_ACCEPTED" operator="equals"> <!-- get the list of ReturnItems. Note: return may be associated with many different orders --> <entity-condition entity-name="ReturnItem" list-name="returnItems" distinct="true"> <condition-expr field-name="returnId" env-name="returnHeader.returnId"/> @@ -143,11 +143,11 @@ <if> <condition> <and> - <if-empty field-name="returnHeader.paymentMethodId"/> - <if-empty field-name="parameters.paymentMethodId"/><!-- because we haven't done the set-nonpk-fields yet, check this too --> + <if-empty field="returnHeader.paymentMethodId"/> + <if-empty field="parameters.paymentMethodId"/><!-- because we haven't done the set-nonpk-fields yet, check this too --> <or> - <if-compare field-name="returnItem.returnTypeId" operator="equals" value="RTN_CSREPLACE"/> - <if-compare field-name="returnItem.returnTypeId" operator="equals" value="RTN_REPAIR_REPLACE"/> + <if-compare field="returnItem.returnTypeId" operator="equals" value="RTN_CSREPLACE"/> + <if-compare field="returnItem.returnTypeId" operator="equals" value="RTN_REPAIR_REPLACE"/> </or> </and> </condition> @@ -167,7 +167,7 @@ </calculate> <!-- compare return vs order total --> - <if-not-empty field-name="returnItem.orderId"> + <if-not-empty field="returnItem.orderId"> <set field="returnTotalCtx.orderId" from-field="returnItem.orderId"/> <!-- no adjustment needed: adjustment is passed in to calculate the effect of an additional item on return total. --> <calculate field-name="returnTotalCtx.adjustment" type="BigDecimal"><number value="0.0"/></calculate> @@ -178,7 +178,7 @@ </call-service> <log level="info" message="Available amount for return on order #${returnItem.orderId} is [${availableReturnTotal}] (orderTotal = [${orderTotal}] - returnTotal = [${returnTotal}]"/> - <if-compare field-name="availableReturnTotal" operator="less" value="-0.01" type="BigDecimal"> + <if-compare field="availableReturnTotal" operator="less" value="-0.01" type="BigDecimal"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderReturnPriceCannotExceedTheOrderTotal"/></add-error> </if-compare> <check-errors/> @@ -191,15 +191,15 @@ <if> <condition> <and> - <not><if-empty field-name="parameters.statusId"></if-empty></not> - <if-compare-field operator="not-equals" field-name="parameters.statusId" to-field-name="returnHeader.statusId"/> + <not><if-empty field="parameters.statusId"></if-empty></not> + <if-compare-field operator="not-equals" field="parameters.statusId" to-field="returnHeader.statusId"/> </and> </condition> <then> <set field="statusIdTo" from-field="parameters.statusId"/> <set field="statusId" from-field="returnHeader.statusId"/> <entity-one entity-name="StatusValidChange" value-name="statusValidChange"/> - <if-empty field-name="statusValidChange"> + <if-empty field="statusValidChange"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderErrorReturnHeaderItemStatusNotChangedIsNotAValidChange"/></add-error> </if-empty> <check-errors/> @@ -215,7 +215,7 @@ </calcop> </calculate> </iterate> - <if-compare field-name="returnTotalAmount" operator="less" value="0" type="Double"> + <if-compare field="returnTotalAmount" operator="less" value="0" type="Double"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderReturnTotalCannotLessThanZero"/></add-error> </if-compare> <check-errors/> @@ -234,7 +234,7 @@ <condition> <and> <not><if-has-permission permission="ORDERMGR" action="_CREATE"/></not> - <not><if-compare-field field-name="partyId" map-name="userLogin" operator="equals" to-field-name="fromPartyId" to-map-name="returnHeader"/></not> + <not><if-compare-field field="userLogin.partyId" to-field="returnHeader.fromPartyId" operator="equals"/></not> </and> </condition> <then> @@ -243,13 +243,13 @@ </if> <check-errors/> - <if-empty field-name="returnItemTypeId" map-name="parameters"> - <if-not-empty field-name="returnItemMapKey" map-name="parameters"> + <if-empty field="parameters.returnItemTypeId"> + <if-not-empty field="parameters.returnItemMapKey"> <!-- find the item mapping --> </if-not-empty> </if-empty> - <if-empty field-name="returnItemTypeId" map-name="parameters"> + <if-empty field="parameters.returnItemTypeId"> <add-error><fail-message message="Return Item Type is not defined for this item; or no mapping was found."/></add-error> <check-errors/> </if-empty> @@ -257,11 +257,11 @@ <if> <condition> <and> - <if-empty field-name="returnHeader.paymentMethodId"/> - <if-compare field-name="returnHeader.statusId" operator="equals" value="RETURN_ACCEPTED"/> + <if-empty field="returnHeader.paymentMethodId"/> + <if-compare field="returnHeader.statusId" operator="equals" value="RETURN_ACCEPTED"/> <or> - <if-compare field-name="parameters.returnTypeId" operator="equals" value="RTN_CSREPLACE"/> - <if-compare field-name="parameters.returnTypeId" operator="equals" value="RTN_REPAIR_REPLACE"/> + <if-compare field="parameters.returnTypeId" operator="equals" value="RTN_CSREPLACE"/> + <if-compare field="parameters.returnTypeId" operator="equals" value="RTN_REPAIR_REPLACE"/> </or> </and> </condition> @@ -271,7 +271,7 @@ </if> <check-errors/> - <if-compare field-name="returnQuantity" map-name="parameters" operator="equals" value="0" type="Double"> + <if-compare field="parameters.returnQuantity" operator="equals" value="0" type="Double"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderNoReturnQuantityAvailablePreviousReturnsMayExist"/></add-error> <check-errors/> </if-compare> @@ -281,10 +281,10 @@ <set field="returnablePrice" value="0" type="Double"/> <!-- if an orderItemSeqId is provided, then find the corresponding orderItem --> - <if-not-empty field-name="parameters.orderItemSeqId"> + <if-not-empty field="parameters.orderItemSeqId"> <make-value value-name="itemLookup" entity-name="OrderItem"/> <set-pk-fields map-name="parameters" value-name="itemLookup"/> - <if-not-empty field-name="parameters.orderItemSeqId"> + <if-not-empty field="parameters.orderItemSeqId"> <find-by-primary-key entity-name="OrderItem" value-name="orderItem" map-name="itemLookup"/> <log level="info" message="Return item is an OrderItem - ${orderItem.orderItemSeqId}"/> </if-not-empty> @@ -292,7 +292,7 @@ <!-- get the returnableQuantity and returnablePrice: for orderItems, it's found by getReturnableQuantity; for adjustments, either order adjustments or manual adjustments, it's always 1 and based on input parameter --> - <if-not-empty field-name="orderItem"> + <if-not-empty field="orderItem"> <set field="serviceContext.orderItem" from-field="orderItem"/> <call-service service-name="getReturnableQuantity" in-map-name="serviceContext"> <result-to-field result-name="returnableQuantity" field-name="returnableQuantity"/> @@ -301,7 +301,7 @@ </if-not-empty> - <if-compare field-name="returnableQuantity" value="0" operator="greater" type="Double"> + <if-compare field="returnableQuantity" value="0" operator="greater" type="Double"> <!-- the user is only allowed to set a returnPrice if he has ORDERMGR_CREATE privilege, otherwise only the returnablePrice calculated by service is used --> <if> @@ -314,13 +314,13 @@ </if> <!-- make sure the returnQuantity is not greater than the returnableQuantity from service or the quantity on the original orderItem --> - <if-compare-field field-name="returnQuantity" map-name="parameters" operator="greater" to-field-name="returnableQuantity" type="Double"> + <if-compare-field field="parameters.returnQuantity" to-field="returnableQuantity" operator="greater" type="Double"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderRequestedReturnQuantityNotAvailablePreviousReturnsMayExist"/></add-error> </if-compare-field> <!-- SC 20060202: Is this really needed? Or does the above duplicate it. If not, we should remove it --> - <if-not-empty field-name="orderItem"> - <if-compare-field field-name="returnQuantity" map-name="parameters" operator="greater" to-field-name="quantity" to-map-name="orderItem" type="Double"> + <if-not-empty field="orderItem"> + <if-compare-field field="parameters.returnQuantity" to-field="orderItem.quantity" operator="greater" type="Double"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderReturnQuantityCannotExceedTheOrderedQuantity"/></add-error> </if-compare-field> </if-not-empty> @@ -336,8 +336,8 @@ </calculate> <!-- just checking greater-equals sometimes returns an error if the difference is actually zero --> - <if-compare-field field-name="returnPriceDelta" operator="not-equals" to-field-name="zero" type="Double"> - <if-compare-field field-name="returnPriceDelta" operator="greater-equals" to-field-name="epsilon" type="Double"> + <if-compare-field field="returnPriceDelta" to-field="zero" operator="not-equals" type="Double"> + <if-compare-field field="returnPriceDelta" to-field="epsilon" operator="greater-equals" type="Double"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderReturnPriceCannotExceedThePurchasePrice"/></add-error> </if-compare-field > </if-compare-field> @@ -360,7 +360,7 @@ <set from-field="parameters.returnId" field="lookupMap.returnId"/> <string-to-list string="-returnItemSeqId" list-name="orderBy"/> <find-by-and entity-name="ReturnItem" list-name="currentItems" map-name="lookupMap" order-by-list-name="orderBy"></find-by-and> - <if-empty field-name="currentItems"> + <if-empty field="currentItems"> <set value="1" field="newEntity.returnItemSeqId"/> <else> <first-from-list entry-name="newestItem" list-name="currentItems"/> @@ -383,13 +383,13 @@ <if> <condition> <or> - <if-empty field-name="parameters.includeAdjustments"/> - <if-compare field-name="parameters.includeAdjustments" operator="equals" value="Y"/> + <if-empty field="parameters.includeAdjustments"/> + <if-compare field="parameters.includeAdjustments" operator="equals" value="Y"/> </or> </condition> <then> <!-- create return adjustments for all adjustments associated with the order item --> - <if-not-empty field-name="orderItem"> + <if-not-empty field="orderItem"> <get-related value-name="orderItem" relation-name="OrderAdjustment" list-name="orderAdjustments"/> <iterate entry-name="orderAdjustment" list-name="orderAdjustments"> <clear-field field-name="returnAdjCtx"/> @@ -450,7 +450,7 @@ <set from-field="parameters.returnId" field="headerPKMap.returnId"/> <find-by-primary-key entity-name="ReturnHeader" map-name="headerPKMap" value-name="returnHeader"/> - <if-compare field-name="statusId" map-name="returnHeader" operator="not-equals" type="String" value="RETURN_REQUESTED"> + <if-compare field="returnHeader.statusId" operator="not-equals" type="String" value="RETURN_REQUESTED"> <add-error><fail-property resource="OrderErrorUiLabels" property="OrderCannotRemoveItemsOnceReturnIsApproved"/></add-error> <check-errors/> </if-compare> @@ -495,7 +495,7 @@ <set from-field="parameters.returnAdjustmentId" field="lookupPKMap.returnAdjustmentId"/> <find-by-primary-key entity-name="ReturnAdjustment" map-name="lookupPKMap" value-name="returnAdjustment"/> - <if-not-empty field-name="returnAdjustment"> + <if-not-empty field="returnAdjustment"> <remove-value value-name="returnAdjustment"/> </if-not-empty> </simple-method> @@ -508,7 +508,7 @@ <find-by-primary-key entity-name="ReturnHeader" map-name="lookupPKMap" value-name="returnHeader"/> <find-by-and entity-name="ShipmentReceipt" map-name="lookupPKMap" list-name="shipmentReceipts"/> <iterate list-name="shipmentReceipts" entry-name="receipt"> - <if-empty field-name="${receipt.returnItemSeqId}" map-name="totalsMap"> + <if-empty field="totalsMap.${receipt.returnItemSeqId}"> <calculate field-name="${receipt.returnItemSeqId}" map-name="totalsMap"> <number value="0"/> </calculate> @@ -526,7 +526,7 @@ </entity-one> <set field="returnItem.receivedQuantity" from-field="totalsMap.${receipt.returnItemSeqId}"/> - <if-compare-field field-name="totalsMap.${receipt.returnItemSeqId}" operator="greater-equals" to-field-name="returnItem.returnQuantity" type="Double"> + <if-compare-field field="totalsMap.${receipt.returnItemSeqId}" to-field="returnItem.returnQuantity" operator="greater-equals" type="Double"> <!-- update the status for the item --> <set field="returnItem.statusId" value="RETURN_RECEIVED"/> <store-value value-name="returnItem"/> @@ -553,8 +553,8 @@ <set field="allReceived" value="true"/> <find-by-and entity-name="ReturnItem" map-name="lookupPKMap" list-name="allReturnItems"/> <iterate list-name="allReturnItems" entry-name="item"> - <if-compare field-name="statusId" map-name="item" operator="not-equals" value="RETURN_RECEIVED"> - <if-not-empty field-name="orderItemSeqId" map-name="item"> + <if-compare field="item.statusId" operator="not-equals" value="RETURN_RECEIVED"> + <if-not-empty field="item.orderItemSeqId"> <!-- non-order items (i.e. adjustments) are not received --> <set value="false" field="allReceived"/> </if-not-empty> @@ -562,15 +562,15 @@ </iterate> <!-- if the items are all received, then update the return header, store the status history change, and set the shipment to received --> - <if-compare field-name="allReceived" operator="equals" value="true"> + <if-compare field="allReceived" operator="equals" value="true"> <!-- Go through all the items yet again and set their shipment status to PURCH_SHIP_RECEIVED (if it isn't already) This activates SECAS such as creating return invoices. This MUST be done before updating the return header so that the ReturnItemBillings are created and then whatever SECA binds to the return header update will have them. . --> <iterate list-name="shipmentReceipts" entry-name="receipt"> <get-related-one relation-name="Shipment" value-name="receipt" to-value-name="shipment"/> - <if-not-empty field-name="shipment.shipmentId"> - <if-compare field-name="statusId" map-name="shipment" operator="not-equals" value="RETURN_RECEIVED"> + <if-not-empty field="shipment.shipmentId"> + <if-compare field="shipment.statusId" operator="not-equals" value="RETURN_RECEIVED"> <set field="serviceInput.shipmentId" from-field="shipment.shipmentId"/> <set field="serviceInput.statusId" value="PURCH_SHIP_RECEIVED"/> <call-service service-name="updateShipment" in-map-name="serviceInput"/> @@ -610,7 +610,7 @@ <condition> <and> <not><if-has-permission permission="ORDERMGR" action="_CREATE"/></not> - <not><if-compare-field field-name="partyId" map-name="userLogin" operator="equals" to-field-name="fromPartyId" to-map-name="parameters"/></not> + <not><if-compare-field field="userLogin.partyId" to-field="parameters.fromPartyId" operator="equals"/></not> </and> </condition> <then> @@ -643,7 +643,7 @@ <get-related-one relation-name="ProductStore" value-name="orderHeader" to-value-name="productStore"/> <set from-field="productStore.payToPartyId" field="createHeaderCtx.toPartyId"/> - <if-empty field-name="destinationFacilityId" map-name="createHeaderCtx"> + <if-empty field="createHeaderCtx.destinationFacilityId"> <get-related-one value-name="orderHeader" relation-name="ProductStore" to-value-name="productStore"/> <set from-field="productStore.inventoryFacilityId" field="createHeaderCtx.destinationFacilityId"/> </if-empty> @@ -663,10 +663,10 @@ </condition-list> </entity-condition> - <if-empty field-name="returnReasonId" map-name="parameters"> + <if-empty field="parameters.returnReasonId"> <set value="RTN_NOT_WANT" field="parameters.returnReasonId"/> </if-empty> - <if-empty field-name="returnTypeId" map-name="parameters"> + <if-empty field="parameters.returnTypeId"> <set value="RTN_REFUND" field="parameters.returnTypeId"/> </if-empty> @@ -676,7 +676,7 @@ <set from-field="parameters.returnReasonId" field="newItemCtx.returnReasonId"/> <set from-field="parameters.returnTypeId" field="newItemCtx.returnTypeId"/> - <if-not-empty field-name="orderItem.productId"> + <if-not-empty field="orderItem.productId"> <set from-field="orderItem.productId" field="newItemCtx.productId"/> </if-not-empty> @@ -694,7 +694,7 @@ <!-- get the matching return item type from the order item type --> <set from-field="orderItem.orderItemTypeId" field="orderItemTypeId"/> - <if-compare field-name="orderItemTypeId" value="PRODUCT_ORDER_ITEM" operator="equals"> + <if-compare field="orderItemTypeId" value="PRODUCT_ORDER_ITEM" operator="equals"> <!-- Check if orderItemTypeId equals PRODUCT_ORDER_ITEM, if so, use ProductType and ReturnItemTypeMap to get ReturnItemType--> <entity-one entity-name="Product" value-name="product"> <field-map field-name="productId" env-name="orderItem.productId"/> @@ -714,7 +714,7 @@ </else> </if-compare> - <if-empty field-name="returnItemTypeId" map-name="returnItemTypeMapping" > + <if-empty field="returnItemTypeMapping.returnItemTypeId"> <add-error><fail-message message="No matching return item type map found for order item: [${orderItem}]"/></add-error> <check-errors/> <else> @@ -723,11 +723,11 @@ </if-empty> <!-- create the return item --> - <if-not-empty field-name="newItemCtx.orderAdjustmentId"> + <if-not-empty field="newItemCtx.orderAdjustmentId"> <log level="info" message="Found unexpected orderAdjustment:${newItemCtx.orderAdjustmentId}"/> <clear-field field-name="newItemCtx.orderAdjustmentId"/> </if-not-empty> - <if-compare field-name="newItemCtx.returnQuantity" value="0" operator="greater" type="Double"> + <if-compare field="newItemCtx.returnQuantity" value="0" operator="greater" type="Double"> <!-- otherwise, items which have been fully returned would still get passed in and then come back with an error --> <call-service service-name="createReturnItem" in-map-name="newItemCtx" include-user-login="true"/> <else> @@ -751,7 +751,7 @@ <entity-count entity-name="ReturnAdjustment" count-name="returnCount"> <condition-expr field-name="orderAdjustmentId" operator="equals" env-name="orderAdjustment.orderAdjustmentId"/> </entity-count> - <if-compare field-name="returnCount" value="0" operator="equals"> + <if-compare field="returnCount" value="0" operator="equals"> <log level="info" message="Create new return adjustment: ${returnAdjCtx}"/> <call-service service-name="createReturnAdjustment" in-map-name="returnAdjCtx" include-user-login="true"/> </if-compare> @@ -766,7 +766,7 @@ <log level="info" message="OrderTotal [${orderTotal}] - ReturnTotal [${returnTotal}] = available Return Total [${availableReturnTotal}]"/> <!-- create a manual balance adjustment based on the difference between order total and return total --> - <if-compare field-name="availableReturnTotal" operator="not-equals" value="0.00" type="BigDecimal"> + <if-compare field="availableReturnTotal" operator="not-equals" value="0.00" type="BigDecimal"> <set value="Balance Adjustment" field="balanceItemCtx.description"/> <set value="RET_MAN_ADJ" field="balanceItemCtx.returnAdjustmentTypeId"/> @@ -785,7 +785,7 @@ <call-service service-name="updateReturnHeader" in-map-name="updateHeaderCtx" include-user-login="true"/> <!-- auto-receive this return if we passed in the flag --> - <if-compare field-name="receiveReturn" map-name="parameters" operator="equals" value="true" type="Boolean"> + <if-compare field="parameters.receiveReturn" operator="equals" value="true" type="Boolean"> <set from-field="returnId" field="receiveCtx.returnId"/> <call-service service-name="quickReceiveReturn" in-map-name="receiveCtx"/> <else> @@ -798,7 +798,7 @@ </simple-method> <simple-method method-name="createReturnAndItemOrAdjustment" short-description="If returnId is null, create a return; then create Return Item or Adjustment based on the parameters passed in"> - <if-empty field-name="parameters.returnId"> + <if-empty field="parameters.returnId"> <set-service-fields service-name="createReturnHeader" map-name="parameters" to-map-name="returnHeaderInMap"/> <call-service service-name="createReturnHeader" in-map-name="returnHeaderInMap"> <result-to-field result-name="returnId" field-name="returnId"/> @@ -845,9 +845,9 @@ <if> <condition> <or> - <if-compare field-name="returnItem.returnTypeId" operator="equals" value="RTN_REPLACE"/> - <if-compare field-name="returnItem.returnTypeId" operator="equals" value="RTN_CSREPLACE"/> - <if-compare field-name="returnItem.returnTypeId" operator="equals" value="RTN_REPAIR_REPLACE"/> + <if-compare field="returnItem.returnTypeId" operator="equals" value="RTN_REPLACE"/> + <if-compare field="returnItem.returnTypeId" operator="equals" value="RTN_CSREPLACE"/> + <if-compare field="returnItem.returnTypeId" operator="equals" value="RTN_REPAIR_REPLACE"/> </or> </condition> <then> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |