You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/12/30 18:12:17 UTC
svn commit: r730183 [2/6] - in /ofbiz/trunk:
applications/accounting/script/org/ofbiz/accounting/agreement/
applications/accounting/script/org/ofbiz/accounting/finaccount/
applications/accounting/script/org/ofbiz/accounting/invoice/
applications/accoun...
Modified: ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml (original)
+++ ofbiz/trunk/applications/content/script/org/ofbiz/content/website/WebSiteServices.xml Tue Dec 30 09:12:15 2008
@@ -163,7 +163,7 @@
<set field="cnt.contentName" value="${webSite.siteName} ${wct.description}"/>
<set field="cnt.contentTypeId" value="WEB_SITE_PUB_PT"/>
<call-service service-name="createContent" in-map-name="cnt">
- <result-to-field result-name="contentId" field-name="wcc.contentId"/>
+ <result-to-field result-name="contentId" field="wcc.contentId"/>
</call-service>
<set field="wcc.webSiteId" from-field="webSite.webSiteId"/>
@@ -181,7 +181,7 @@
<set field="cnt.contentName" value="${webSite.siteName} ${wct.description}"/>
<set field="cnt.contentTypeId" value="WEB_SITE_PUB_PT"/>
<call-service service-name="createContent" in-map-name="cnt">
- <result-to-field result-name="contentId" field-name="wcc.contentId"/>
+ <result-to-field result-name="contentId" field="wcc.contentId"/>
</call-service>
<set field="wcc.webSiteId" from-field="webSite.webSiteId"/>
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Tue Dec 30 09:12:15 2008
@@ -290,7 +290,7 @@
<!-- the above copy is okay since we checked already that they are the same -->
<call-service service-name="createPersonAndUserLogin" in-map-name="personUserLoginContext">
<result-to-field result-name="partyId" map-name="tempMap"/>
- <result-to-field field-name="createdUserLogin" result-name="newUserLogin"/>
+ <result-to-field field="createdUserLogin" result-name="newUserLogin"/>
</call-service>
<set-current-user-login value-name="createdUserLogin"/>
@@ -412,7 +412,7 @@
<find-by-primary-key map="storeEmailLookup" entity-name="ProductStoreEmailSetting" value-field="storeEmail"/>
<if-not-empty field="storeEmail.bodyScreenLocation">
<!-- prepare the email context -->
- <get-related-one value-name="createdUserLogin" relation-name="Person" to-value-name="personObj"/>
+ <get-related-one value-name="createdUserLogin" relation-name="Person" to-value-field="personObj"/>
<set from-field="createdUserLogin" field="emailCtx.userLogin"/>
<set from-field="personObj" field="emailCtx.person"/>
<!-- prepare the notification service context -->
@@ -431,7 +431,7 @@
<!-- tell the control servlet that we just logged in the user... -->
<set value="TRUE" field="_LOGIN_PASSED_"/>
- <field-to-request field-name="_LOGIN_PASSED_"/>
+ <field-to-request field="_LOGIN_PASSED_"/>
</simple-method>
<!-- =========================================== -->
@@ -876,7 +876,7 @@
<set field="createUpdatePersonCtx.partyId" from-field="userLogin.partyId"/>
<call-service service-name="createUpdatePerson" in-map-name="createUpdatePersonCtx">
<result-to-request result-name="partyId"/>
- <result-to-field result-name="partyId" field-name="parameters.partyId"/>
+ <result-to-field result-name="partyId" field="parameters.partyId"/>
</call-service>
<set field="partyId" from-field="parameters.partyId"/>
@@ -894,9 +894,9 @@
<set-service-fields service-name="createUpdateShippingAddress" map="parameters" to-map="shipToAddressCtx"/>
<set field="shipToAddressCtx.userLogin" from-field="userLogin"/>
<call-service service-name="createUpdateShippingAddress" in-map-name="shipToAddressCtx">
- <result-to-field result-name="contactMechId" field-name="parameters.shipToContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.shipToContactMechId"/>
</call-service>
- <field-to-request field-name="parameters.shipToContactMechId" request-name="shipToContactMechId"/>
+ <field-to-request field="parameters.shipToContactMechId" request-name="shipToContactMechId"/>
<!-- Create Update Shipping Telecom Number -->
<call-map-processor xml-resource="org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml"
@@ -910,9 +910,9 @@
<set field="createUpdateTelecomNumberCtx.roleTypeId" from-field="parameters.roleTypeId"/>
<set field="createUpdateTelecomNumberCtx.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/>
<call-service service-name="createUpdateTelecomNumber" in-map-name="createUpdateTelecomNumberCtx">
- <result-to-field result-name="contactMechId" field-name="parameters.shipToPhoneContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.shipToPhoneContactMechId"/>
</call-service>
- <field-to-request field-name="parameters.shipToPhoneContactMechId" request-name="shipToPhoneContactMechId"/>
+ <field-to-request field="parameters.shipToPhoneContactMechId" request-name="shipToPhoneContactMechId"/>
<!-- Create Update email address -->
<call-map-processor xml-resource="org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml"
@@ -924,9 +924,9 @@
<set field="createUpdateEmailCtx.userLogin" from-field="userLogin"/>
<set field="createUpdateEmailCtx.partyId" from-field="parameters.partyId"/>
<call-service service-name="createUpdateEmailAddress" in-map-name="createUpdateEmailCtx">
- <result-to-field result-name="contactMechId" field-name="parameters.emailContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.emailContactMechId"/>
</call-service>
- <field-to-request field-name="parameters.emailContactMechId" request-name="emailContactMechId"/>
+ <field-to-request field="parameters.emailContactMechId" request-name="emailContactMechId"/>
<!-- Set partyId, in shoppingCart -->
<call-object-method obj-field-name="shoppingCart" method-name="setUserLogin">
@@ -1025,7 +1025,7 @@
</if-compare>
</else>
</if-empty>
- <field-to-request field-name="userLogin" request-name="userLogin"/>
+ <field-to-request field="userLogin" request-name="userLogin"/>
<log level="info" message="userLogin is ${userLogin}"/>
</simple-method>
@@ -1077,7 +1077,7 @@
<clear-field field="shippingOptionMap"/>
</iterate>
<set field="parameters.shippingOptions" from-field="shippingOptions"/>
- <field-to-request field-name="parameters.shippingOptions" request-name="shippingOptions"/>
+ <field-to-request field="parameters.shippingOptions" request-name="shippingOptions"/>
</simple-method>
<simple-method method-name="setShippingOption" short-description="Set shipping method" login-required="false">
@@ -1108,7 +1108,7 @@
<field-map field-name="partyId" from-field="carrierPartyId"/>
<field-map field-name="roleTypeId" value="CARRIER"/>
</entity-one>
- <field-to-request field-name="shipmentMethod.description" request-name="shippingDescription"/>
+ <field-to-request field="shipmentMethod.description" request-name="shippingDescription"/>
<set field="shoppingCart" from-field="parameters.shoppingCart"/>
<if-empty field="shoppingCart">
@@ -1149,9 +1149,9 @@
parameters.put("cartGrandTotal", cartGrandTotal);
]]></call-bsh>
- <field-to-request field-name="parameters.shippingTotal" request-name="shippingTotal"/>
- <field-to-request field-name="parameters.cartGrandTotal" request-name="cartGrandTotal"/>
- <field-to-request field-name="parameters.totalSalesTax" request-name="totalSalesTax"/>
+ <field-to-request field="parameters.shippingTotal" request-name="shippingTotal"/>
+ <field-to-request field="parameters.cartGrandTotal" request-name="cartGrandTotal"/>
+ <field-to-request field="parameters.totalSalesTax" request-name="totalSalesTax"/>
<log level="info" message="Shipping total is : ${parameters.shippingTotal}"/>
<log level="info" message="Cart Grand total is : ${parameters.cartGrandTotal}"/>
<log level="info" message="Total sale tax is : ${parameters.totalSalesTax}"/>
@@ -1193,9 +1193,9 @@
<set-service-fields service-name="createUpdateBillingAddress" map="parameters" to-map="billToAddressCtx"/>
<set field="billToAddressCtx.userLogin" from-field="userLogin"/>
<call-service service-name="createUpdateBillingAddress" in-map-name="billToAddressCtx">
- <result-to-field result-name="contactMechId" field-name="parameters.billToContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.billToContactMechId"/>
</call-service>
- <field-to-request field-name="parameters.billToContactMechId" request-name="billToContactMechId"/>
+ <field-to-request field="parameters.billToContactMechId" request-name="billToContactMechId"/>
<!-- Create Update Billing Telecom Number -->
<call-map-processor xml-resource="org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml"
@@ -1209,22 +1209,22 @@
<set field="createUpdateTelecomNumberCtx.roleTypeId" from-field="parameters.roleTypeId"/>
<set field="createUpdateTelecomNumberCtx.contactMechPurposeTypeId" from-field="parameters.contactMechPurposeTypeId"/>
<call-service service-name="createUpdateTelecomNumber" in-map-name="createUpdateTelecomNumberCtx">
- <result-to-field result-name="contactMechId" field-name="parameters.billToPhoneContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.billToPhoneContactMechId"/>
</call-service>
- <field-to-request field-name="parameters.billToPhoneContactMechId" request-name="billToPhoneContactMechId"/>
+ <field-to-request field="parameters.billToPhoneContactMechId" request-name="billToPhoneContactMechId"/>
<!-- Create Update credit card -->
<set-service-fields service-name="createUpdateCreditCard" map="parameters" to-map="creditCardContext"/>
<set field="creditCardContext.contactMechId" from-field="parameters.billToContactMechId"/>
<call-service service-name="createUpdateCreditCard" in-map-name="creditCardContext">
- <result-to-field result-name="paymentMethodId" field-name="parameters.paymentMethodId"/>
+ <result-to-field result-name="paymentMethodId" field="parameters.paymentMethodId"/>
</call-service>
<!--============== Set Payment Method ================-->
<set field="paymentMethodId" from-field="parameters.paymentMethodId"/>
<set field="cardSecurityCode" from-field="parameters.cardSecurityCode"/>
<field-to-session field-name="userLogin" session-name="userLogin"/>
- <field-to-request field-name="parameters.paymentMethodId" request-name="paymentMethodId"/>
+ <field-to-request field="parameters.paymentMethodId" request-name="paymentMethodId"/>
<call-bsh>
<![CDATA[
import org.ofbiz.order.shoppingcart.ShoppingCart;
@@ -1251,7 +1251,7 @@
<!-- create person -->
<set-service-fields service-name="createPerson" map="personCtx" to-map="createPersonCtx"/>
<call-service service-name="createPerson" in-map="createPersonCtx">
- <result-to-field result-name="partyId" field-name="partyId"/>
+ <result-to-field result-name="partyId" field="partyId"/>
</call-service>
<set field="parameters.partyId" from-field="partyId"/>
@@ -1269,7 +1269,7 @@
<set field="emailAddressCtx.userLogin" from-field="parameters.userLogin"/>
<set field="emailAddressCtx.contactMechPurposeTypeId" from-field="parameters.emailContactMechPurposeTypeId"/>
<call-service service-name="createPartyEmailAddress" in-map-name="emailAddressCtx">
- <result-to-field result-name="contactMechId" field-name="emailContactMechId"/>
+ <result-to-field result-name="contactMechId" field="emailContactMechId"/>
</call-service>
<log level="info" message="Email Contact Created emailContactMechId is ${emailContactMechId}"/>
@@ -1282,7 +1282,7 @@
<set field="shipToAddressCtx.setBillingPurpose" value="Y"/>
</if-compare>
<call-service service-name="createPostalAddressAndPurposes" in-map-name="shipToAddressCtx">
- <result-to-field result-name="contactMechId" field-name="shipToContactMechId"/>
+ <result-to-field result-name="contactMechId" field="shipToContactMechId"/>
</call-service>
<log level="info" message="Shipping address created with contactMechId ${shipToContactMechId}"/>
@@ -1292,7 +1292,7 @@
<set field="shipToTelecomNumberCtx.contactMechPurposeTypeId" value="PHONE_SHIPPING"/>
<!-- call create telecom service -->
<call-service service-name="createPartyTelecomNumber" in-map-name="shipToTelecomNumberCtx">
- <result-to-field result-name="contactMechId" field-name="parameters.shipToTelecomContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.shipToTelecomContactMechId"/>
</call-service>
<log level="info" message="Shipping telecom number is created with contactMechId ${parameters.shipToTelecomContactMechId}"/>
@@ -1305,7 +1305,7 @@
<set field="billToAddressCtx.setBillingPurpose" value="Y"/>
<set field="billToAddressCtx.productStoreId" from-field="parameters.productStoreId"/>
<call-service service-name="createPostalAddressAndPurposes" in-map-name="billToAddressCtx">
- <result-to-field result-name="contactMechId" field-name="billToContactMechId"/>
+ <result-to-field result-name="contactMechId" field="billToContactMechId"/>
</call-service>
<log level="info" message="Billing address created with contactMechId ${billToContactMechId}"/>
<else>
@@ -1320,7 +1320,7 @@
<set field="billToTelecomNumberCtx.contactMechPurposeTypeId" value="PHONE_BILLING"/>
<!-- call create telecom service -->
<call-service service-name="createPartyTelecomNumber" in-map-name="billToTelecomNumberCtx">
- <result-to-field result-name="contactMechId" field-name="billToTelecomContactMechId"/>
+ <result-to-field result-name="contactMechId" field="billToTelecomContactMechId"/>
</call-service>
</simple-method>
@@ -1334,7 +1334,7 @@
<set field="createUpdatePersonCtx.partyId" from-field="userLogin.partyId"/>
<call-service service-name="createUpdatePerson" in-map-name="createUpdatePersonCtx">
<result-to-request result-name="partyId"/>
- <result-to-field result-name="partyId" field-name="parameters.partyId"/>
+ <result-to-field result-name="partyId" field="parameters.partyId"/>
</call-service>
<if-compare field="productStore.usePrimaryEmailUsername" operator="equals" value="Y">
@@ -1353,7 +1353,7 @@
<set field="createUpdateEmailCtx.userLogin" from-field="userLogin"/>
<set field="createUpdateEmailCtx.partyId" from-field="parameters.partyId"/>
<call-service service-name="createUpdateEmailAddress" in-map-name="createUpdateEmailCtx">
- <result-to-field result-name="contactMechId" field-name="parameters.emailContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.emailContactMechId"/>
</call-service>
</simple-method>
Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original)
+++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Tue Dec 30 09:12:15 2008
@@ -296,7 +296,7 @@
<if-empty field="parameters.partyId">
<!-- call the create person service -->
<call-service service-name="createPerson" in-map-name="personContext">
- <result-to-field result-name="partyId" field-name="partyId"/>
+ <result-to-field result-name="partyId" field="partyId"/>
<result-to-request result-name="partyId"/>
</call-service>
<if-empty field="userLogin">
@@ -355,7 +355,7 @@
<if-empty field="parameters.shippingContactMechId">
<set field="shippingAddressContext.contactMechPurposeTypeId" from-field="parameters.shippingContactMechPurposeTypeId" default-value="SHIPPING_LOCATION"/>
<call-service service-name="createPartyPostalAddress" in-map-name="shippingAddressContext">
- <result-to-field result-name="contactMechId" field-name="parameters.shippingContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.shippingContactMechId"/>
</call-service>
<if-compare value="Y" field="parameters.useShippingPostalAddressForBilling" operator="equals">
<set field="addressPurposeContext.partyId" from-field="partyId"/>
@@ -367,7 +367,7 @@
<set field="shippingAddressContext.contactMechId" from-field="parameters.shippingContactMechId"/>
<!-- call the update address service -->
<call-service service-name="updatePartyPostalAddress" in-map-name="shippingAddressContext">
- <result-to-field result-name="contactMechId" field-name="parameters.shippingContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.shippingContactMechId"/>
</call-service>
</else>
</if-empty>
@@ -378,13 +378,13 @@
<!-- create the Billing location -->
<set field="billingAddressContext.contactMechPurposeTypeId" from-field="parameters.billingContactMechPurposeTypeId" default-value="BILLING_LOCATION"/>
<call-service service-name="createPartyPostalAddress" in-map-name="billingAddressContext">
- <result-to-field result-name="contactMechId" field-name="parameters.billingContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.billingContactMechId"/>
</call-service>
<else>
<set field="billingAddressContext.contactMechId" from-field="parameters.billingContactMechId"/>
<!-- call the update address service -->
<call-service service-name="updatePartyPostalAddress" in-map-name="billingAddressContext">
- <result-to-field result-name="contactMechId" field-name="parameters.billingContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.billingContactMechId"/>
</call-service>
</else>
</if-empty>
@@ -397,13 +397,13 @@
<set field="homePhoneContext.contactMechPurposeTypeId" value="PHONE_HOME"/>
<!-- call create telecom service -->
<call-service service-name="createPartyTelecomNumber" in-map-name="homePhoneContext">
- <result-to-field result-name="contactMechId" field-name="parameters.homePhoneContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.homePhoneContactMechId"/>
</call-service>
<else>
<set field="homePhoneContext.contactMechId" from-field="parameters.homePhoneContactMechId"/>
<!-- call update telecom service -->
<call-service service-name="updatePartyTelecomNumber" in-map-name="homePhoneContext">
- <result-to-field result-name="contactMechId" field-name="parameters.homePhoneContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.homePhoneContactMechId"/>
</call-service>
</else>
</if-empty>
@@ -416,13 +416,13 @@
<set field="workPhoneContext.contactMechPurposeTypeId" value="PHONE_WORK"/>
<!-- call create telecom service -->
<call-service service-name="createPartyTelecomNumber" in-map-name="workPhoneContext">
- <result-to-field result-name="contactMechId" field-name="parameters.workPhoneContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.workPhoneContactMechId"/>
</call-service>
<else>
<set field="workPhoneContext.contactMechId" from-field="parameters.workPhoneContactMechId"/>
<!-- call update telecom service -->
<call-service service-name="updatePartyTelecomNumber" in-map-name="workPhoneContext">
- <result-to-field result-name="contactMechId" field-name="parameters.workPhoneContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.workPhoneContactMechId"/>
</call-service>
</else>
</if-empty>
@@ -435,13 +435,13 @@
<set field="faxPhoneContext.contactMechPurposeTypeId" value="FAX_NUMBER"/>
<!-- call create telecom service -->
<call-service service-name="createPartyTelecomNumber" in-map-name="faxPhoneContext">
- <result-to-field result-name="contactMechId" field-name="parameters.faxPhoneContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.faxPhoneContactMechId"/>
</call-service>
<else>
<set field="faxPhoneContext.contactMechId" from-field="parameters.faxPhoneContactMechId"/>
<!-- call update telecom service -->
<call-service service-name="updatePartyTelecomNumber" in-map-name="faxPhoneContext">
- <result-to-field result-name="contactMechId" field-name="parameters.faxPhoneContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.faxPhoneContactMechId"/>
</call-service>
</else>
</if-empty>
@@ -453,13 +453,13 @@
<set field="mobilePhoneContext.contactMechPurposeTypeId" value="PHONE_MOBILE"/>
<!-- call create telecom service -->
<call-service service-name="createPartyTelecomNumber" in-map-name="mobilePhoneContext">
- <result-to-field result-name="contactMechId" field-name="parameters.mobilePhoneContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.mobilePhoneContactMechId"/>
</call-service>
<else>
<set field="mobilePhoneContext.contactMechId" from-field="parameters.mobilePhoneContactMechId"/>
<!-- call update telecom service -->
<call-service service-name="updatePartyTelecomNumber" in-map-name="mobilePhoneContext">
- <result-to-field result-name="contactMechId" field-name="parameters.mobilePhoneContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.mobilePhoneContactMechId"/>
</call-service>
</else>
</if-empty>
@@ -470,13 +470,13 @@
<if-empty field="parameters.emailContactMechId">
<set field="emailContext.contactMechPurposeTypeId" value="PRIMARY_EMAIL" />
<call-service service-name="createPartyEmailAddress" in-map-name="emailContext">
- <result-to-field result-name="contactMechId" field-name="parameters.emailContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.emailContactMechId"/>
</call-service>
<else>
<set field="emailContext.contactMechId" from-field="parameters.emailContactMechId"/>
<!-- call update Email address -->
<call-service service-name="updatePartyEmailAddress" in-map-name="emailContext">
- <result-to-field result-name="contactMechId" field-name="parameters.emailContactMechId"/>
+ <result-to-field result-name="contactMechId" field="parameters.emailContactMechId"/>
</call-service>
</else>
</if-empty>
@@ -563,7 +563,7 @@
</else>
</if-compare>
<!-- set the partyId in the request -->
- <field-to-request field-name="partyId" request-name="partyId"/>
+ <field-to-request field="partyId" request-name="partyId"/>
</simple-method>
<simple-method method-name="processShipOptions" short-description="Process Ship Options; to be called as a Request Event" login-required="false">
Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml?rev=730183&r1=730182&r2=730183&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml (original)
+++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/jobshopmgt/ProductionRunServices.xml Tue Dec 30 09:12:15 2008
@@ -174,11 +174,11 @@
<!-- instead of updating InventoryItem, add an InventoryItemDetail -->
<set from-field="lastNonSerInventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/>
<set from-field="parameters.workEffortId" field="createDetailMap.workEffortId"/>
- <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double">
- <calcop field-name="parameters.quantityNotIssued" operator="negative"/>
+ <calculate field="createDetailMap.availableToPromiseDiff" type="Double">
+ <calcop field="parameters.quantityNotIssued" operator="negative"/>
</calculate>
- <calculate field-name="createDetailMap.quantityOnHandDiff" type="Double">
- <calcop field-name="parameters.quantityNotIssued" operator="negative"/>
+ <calculate field="createDetailMap.quantityOnHandDiff" type="Double">
+ <calcop field="parameters.quantityNotIssued" operator="negative"/>
</calculate>
<set field="createDetailMap.reasonEnumId" from-field="parameters.reasonEnumId"/>
<set field="createDetailMap.description" from-field="parameters.description"/>
@@ -194,7 +194,7 @@
<set field="createInvItemInMap.facilityId" from-field="workEffort.facilityId"/>
<set field="createInvItemInMap.inventoryItemTypeId" value="NON_SERIAL_INV_ITEM"/>
<call-service service-name="createInventoryItem" in-map-name="createInvItemInMap">
- <result-to-field result-name="inventoryItemId" field-name="createInvItemOutMap.inventoryItemId"/>
+ <result-to-field result-name="inventoryItemId" field="createInvItemOutMap.inventoryItemId"/>
</call-service>
<!-- create ItemIssuance record -->
@@ -207,11 +207,11 @@
<!-- also create a detail record with the quantities -->
<set field="createDetailMap.inventoryItemId" from-field="createInvItemOutMap.inventoryItemId"/>
<set field="createDetailMap.workEffortId" from-field="parameters.workEffortId"/>
- <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double">
- <calcop field-name="parameters.quantityNotIssued" operator="negative"/>
+ <calculate field="createDetailMap.availableToPromiseDiff" type="Double">
+ <calcop field="parameters.quantityNotIssued" operator="negative"/>
</calculate>
- <calculate field-name="createDetailMap.quantityOnHandDiff" type="Double">
- <calcop field-name="parameters.quantityNotIssued" operator="negative"/>
+ <calculate field="createDetailMap.quantityOnHandDiff" type="Double">
+ <calcop field="parameters.quantityNotIssued" operator="negative"/>
</calculate>
<set field="createDetailMap.reasonEnumId" from-field="parameters.reasonEnumId"/>
<set field="createDetailMap.description" from-field="parameters.description"/>
@@ -219,7 +219,7 @@
<clear-field field="createDetailMap"/>
</else>
</if-not-empty>
- <calculate field-name="quantityNotIssued" map-name="parameters"><number value="0"/></calculate>
+ <calculate field="quantityNotIssued" map-name="parameters"><number value="0"/></calculate>
</if-compare>
<if-not-empty field="workEffortGoodStandard">
<entity-and list="issuances" entity-name="WorkEffortAndInventoryAssign">
@@ -227,10 +227,10 @@
<field-map field-name="productId" from-field="workEffortGoodStandard.productId"/>
</entity-and>
<iterate list="issuances" entry="issuance">
- <calculate field-name="totalIssuance">
+ <calculate field="totalIssuance">
<calcop operator="add">
- <calcop field-name="issuance.quantity" operator="get"/>
- <calcop field-name="totalIssuance" operator="get"/>
+ <calcop field="issuance.quantity" operator="get"/>
+ <calcop field="totalIssuance" operator="get"/>
</calcop>
</calculate>
</iterate>
@@ -253,12 +253,12 @@
<!-- create ItemIssuance record -->
<set from-field="parameters.workEffortId" field="issuanceCreateMap.workEffortId"/>
<set from-field="inventoryItem.inventoryItemId" field="issuanceCreateMap.inventoryItemId"/>
- <calculate field-name="quantity" map-name="issuanceCreateMap"><number value="1"/></calculate>
+ <calculate field="quantity" map-name="issuanceCreateMap"><number value="1"/></calculate>
<call-service service-name="assignInventoryToWorkEffort" in-map-name="issuanceCreateMap"/>
<clear-field field="issuanceCreateMap"/>
- <calculate field-name="parameters.quantityNotIssued">
- <calcop field-name="parameters.quantityNotIssued" operator="subtract"><number value="1.0"/></calcop>
+ <calculate field="parameters.quantityNotIssued">
+ <calcop field="parameters.quantityNotIssued" operator="subtract"><number value="1.0"/></calcop>
</calculate>
</if-compare>
</if-compare>
@@ -301,20 +301,20 @@
<set from-field="inventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/>
<set from-field="parameters.workEffortId" field="createDetailMap.workEffortId"/>
<!-- update availableToPromiseDiff AND quantityOnHandDiff since this is an issuance -->
- <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double">
- <calcop field-name="parameters.deductAmount" operator="negative"/>
+ <calculate field="createDetailMap.availableToPromiseDiff" type="Double">
+ <calcop field="parameters.deductAmount" operator="negative"/>
</calculate>
- <calculate field-name="createDetailMap.quantityOnHandDiff" type="Double">
- <calcop field-name="parameters.deductAmount" operator="negative"/>
+ <calculate field="createDetailMap.quantityOnHandDiff" type="Double">
+ <calcop field="parameters.deductAmount" operator="negative"/>
</calculate>
<set field="createDetailMap.reasonEnumId" from-field="parameters.reasonEnumId"/>
<set field="createDetailMap.description" from-field="parameters.description"/>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
<clear-field field="createDetailMap"/>
- <calculate field-name="quantityNotIssued" map-name="parameters">
- <calcop operator="subtract" field-name="parameters.quantityNotIssued">
- <calcop operator="get" field-name="parameters.deductAmount"/>
+ <calculate field="quantityNotIssued" map-name="parameters">
+ <calcop operator="subtract" field="parameters.quantityNotIssued">
+ <calcop operator="get" field="parameters.deductAmount"/>
</calcop>
</calculate>
<set field="balanceInventoryItemsInMap.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
@@ -344,7 +344,7 @@
<!-- create ItemIssuance record -->
<set field="issuanceCreateMap.workEffortId" from-field="parameters.workEffortId"/>
<set field="issuanceCreateMap.inventoryItemId" from-field="inventoryItem.inventoryItemId"/>
- <calculate field-name="quantity" map-name="issuanceCreateMap"><number value="1"/></calculate>
+ <calculate field="quantity" map-name="issuanceCreateMap"><number value="1"/></calculate>
<call-service service-name="assignInventoryToWorkEffort" in-map-name="issuanceCreateMap"/>
<field-to-result field="issuanceCreateMap.quantity" result-name="quantityIssued"/>
</if-compare>
@@ -383,17 +383,17 @@
<set from-field="inventoryItem.inventoryItemId" field="createDetailMap.inventoryItemId"/>
<set from-field="parameters.workEffortId" field="createDetailMap.workEffortId"/>
<!-- update availableToPromiseDiff AND quantityOnHandDiff since this is an issuance -->
- <calculate field-name="createDetailMap.availableToPromiseDiff" type="Double">
- <calcop field-name="deductAmount" operator="negative"/>
+ <calculate field="createDetailMap.availableToPromiseDiff" type="Double">
+ <calcop field="deductAmount" operator="negative"/>
</calculate>
- <calculate field-name="createDetailMap.quantityOnHandDiff" type="Double">
- <calcop field-name="deductAmount" operator="negative"/>
+ <calculate field="createDetailMap.quantityOnHandDiff" type="Double">
+ <calcop field="deductAmount" operator="negative"/>
</calculate>
<call-service service-name="createInventoryItemDetail" in-map-name="createDetailMap"/>
<field-to-result field="deductAmount" result-name="quantityIssued"/>
</then>
<else>
- <calculate field-name="deductAmount"><number value="0"/></calculate>
+ <calculate field="deductAmount"><number value="0"/></calculate>
<field-to-result field="deductAmount" result-name="quantityIssued"/>
</else>
</if>
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=730183&r1=730182&r2=730183&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 Tue Dec 30 09:12:15 2008
@@ -30,7 +30,7 @@
processor-name="copyRoutingTask" in-map-name="lookedUpValue" out-map-name="context"/>
<call-service service-name="createWorkEffort" in-map-name="context">
<default-message resource="ManufacturingUiLabels" property="ManufacturingRoutingTaskCopiedSuccessfully"/>
- <result-to-field result-name="workEffortId" map-name="parameters" field-name="workEffortIdTo"/>
+ <result-to-field result-name="workEffortId" map-name="parameters" field="workEffortIdTo"/>
</call-service>
</if-compare>
<if-empty field="parameters.fromDate">
@@ -41,7 +41,7 @@
<check-errors/>
<set value="Y" field="context1.create"/>
<call-service service-name="checkRoutingTaskAssoc" in-map-name="context1">
- <result-to-field result-name="sequenceNumNotOk" field-name="sequenceNumNotOk"/>
+ <result-to-field result-name="sequenceNumNotOk" field="sequenceNumNotOk"/>
</call-service>
<if-compare field="sequenceNumNotOk" operator="equals" value="Y">
<add-error>
@@ -62,7 +62,7 @@
processor-name="routingTaskAssoc" in-map-name="parameters" out-map-name="context1"/>
<check-errors/>
<call-service service-name="checkRoutingTaskAssoc" in-map-name="context1">
- <result-to-field result-name="sequenceNumNotOk" field-name="sequenceNumNotOk"/>
+ <result-to-field result-name="sequenceNumNotOk" field="sequenceNumNotOk"/>
</call-service>
<if-compare field="sequenceNumNotOk" operator="equals" value="Y">
<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=730183&r1=730182&r2=730183&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 Tue Dec 30 09:12:15 2008
@@ -66,7 +66,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="TechDataCalendar"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
- <get-related value-name="lookupPKMap" relation-name="TechDataCalendarExcDay" list-name="relatedResultList" />
+ <get-related value-field="lookupPKMap" relation-name="TechDataCalendarExcDay" list="relatedResultList" />
<first-from-list entry="relatedResult" list="relatedResultList"/>
<if-not-empty field="relatedResult">
<add-error>
@@ -74,7 +74,7 @@
</add-error>
<check-errors/>
</if-not-empty>
- <get-related value-name="lookupPKMap" relation-name="TechDataCalendarExcWeek" list-name="relatedResultList" />
+ <get-related value-field="lookupPKMap" relation-name="TechDataCalendarExcWeek" list="relatedResultList" />
<first-from-list entry="relatedResult" list="relatedResultList"/>
<if-not-empty field="relatedResult">
<add-error>
@@ -123,7 +123,7 @@
<check-errors/>
<make-value value-field="lookupPKMap" entity-name="TechDataCalendarWeek"/>
<set-pk-fields map="parameters" value-field="lookupPKMap"/>
- <get-related value-name="lookupPKMap" relation-name="TechDataCalendar" list-name="relatedResultList" />
+ <get-related value-field="lookupPKMap" relation-name="TechDataCalendar" list="relatedResultList" />
<first-from-list entry="relatedResult" list="relatedResultList"/>
<if-not-empty field="relatedResult">
<add-error>
@@ -131,7 +131,7 @@
</add-error>
<check-errors/>
</if-not-empty>
- <get-related value-name="lookupPKMap" relation-name="TechDataCalendarExcWeek" list-name="relatedResultList" />
+ <get-related value-field="lookupPKMap" relation-name="TechDataCalendarExcWeek" list="relatedResultList" />
<first-from-list entry="relatedResult" list="relatedResultList"/>
<if-not-empty field="relatedResult">
<add-error>
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=730183&r1=730182&r2=730183&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 Tue Dec 30 09:12:15 2008
@@ -234,7 +234,7 @@
<entity-one entity-name="ContactList" value-field="contactList"/>
<entity-one entity-name="ContactListParty" value-field="contactListParty"/>
- <get-related-one value-name="contactListParty" relation-name="PreferredContactMech" to-value-field="preferredContactMech"/>
+ <get-related-one value-field="contactListParty" relation-name="PreferredContactMech" to-value-field="preferredContactMech"/>
<if>
<condition>
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=730183&r1=730182&r2=730183&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 Tue Dec 30 09:12:15 2008
@@ -146,10 +146,10 @@
<if-not-empty field="parameters.returnId">
<set field="returnHeaderFindContext.returnId" from-field="parameters.returnId" />
<find-by-primary-key entity-name="ReturnHeader" value-field="returnHeader" map="returnHeaderFindContext"/>
- <get-related list-name="returnItems" relation-name="ReturnItem" value-name="returnHeader"/>
+ <get-related list="returnItems" relation-name="ReturnItem" value-field="returnHeader"/>
<log level="info" message="Return items lists are : ${returnItems}"/>
<iterate list="returnItems" entry="returnItem">
- <get-related-one relation-name="OrderHeader" value-name="returnItem" to-value-name="orderHeader"/>
+ <get-related-one relation-name="OrderHeader" value-name="returnItem" to-value-field="orderHeader"/>
<set field="trackingCodeOrderFindContext.orderId" from-field="orderHeader.orderId"/>
<!-- set field="trackingCodeOrderFindContext.trackingCodeTypeId" value="PARTNER_MGD"/-->
<!-- get the siteId ,trackingCodeId from TrackingCodeOrder -->
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=730183&r1=730182&r2=730183&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 Tue Dec 30 09:12:15 2008
@@ -28,7 +28,7 @@
<call-map-processor processor-name="person" in-map-name="parameters" out-map-name="personCtx"
xml-resource="org/ofbiz/party/party/PartyMapProcs.xml"/>
<call-service service-name="createPerson" in-map-name="personCtx">
- <result-to-field result-name="partyId" field-name="partyId"/>
+ <result-to-field result-name="partyId" field="partyId"/>
<result-to-result result-name="partyId" service-result-name="partyId"/>
</call-service>
<if-not-empty field="parameters.roleTypeId">
@@ -48,7 +48,7 @@
<set field="emailAddressCtx.partyId" from-field="partyId"/>
<set field="emailAddressCtx.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
<call-service service-name="createPartyEmailAddress" in-map-name="emailAddressCtx">
- <result-to-field result-name="contactMechId" field-name="emailContactMechId"/>
+ <result-to-field result-name="contactMechId" field="emailContactMechId"/>
</call-service>
</if-not-empty>
</else>
@@ -130,7 +130,7 @@
<call-service service-name="setPartyStatus" in-map-name="updatePartyCtx"/>
<field-to-result field="partyIdTo" result-name="partyId"/>
- <field-to-request field-name="partyIdTo" request-name="partyId"/>
+ <field-to-request field="partyIdTo" request-name="partyId"/>
</if-compare-field>
</simple-method>
</simple-methods>
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=730183&r1=730182&r2=730183&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 Tue Dec 30 09:12:15 2008
@@ -29,7 +29,7 @@
<call-map-processor processor-name="person" in-map-name="parameters" out-map-name="personCtx"
xml-resource="org/ofbiz/party/party/PartyMapProcs.xml"/>
<call-service service-name="createPerson" in-map-name="personCtx">
- <result-to-field result-name="partyId" field-name="partyId"/>
+ <result-to-field result-name="partyId" field="partyId"/>
<result-to-result result-name="partyId" service-result-name="partyId"/>
</call-service>
<if-not-empty field="parameters.roleTypeId">
@@ -49,7 +49,7 @@
<set field="emailAddressCtx.partyId" from-field="partyId"/>
<set field="emailAddressCtx.contactMechPurposeTypeId" value="PRIMARY_EMAIL"/>
<call-service service-name="createPartyEmailAddress" in-map-name="emailAddressCtx">
- <result-to-field result-name="contactMechId" field-name="emailContactMechId"/>
+ <result-to-field result-name="contactMechId" field="emailContactMechId"/>
</call-service>
</if-not-empty>
</else>
@@ -78,7 +78,7 @@
<call-map-processor processor-name="partyGroup" in-map-name="parameters" out-map-name="partyGroupCtx"
xml-resource="org/ofbiz/party/party/PartyMapProcs.xml"/>
<call-service service-name="createPartyGroup" in-map-name="partyGroupCtx">
- <result-to-field result-name="partyId" field-name="partyGroupPartyId"/>
+ <result-to-field result-name="partyId" field="partyGroupPartyId"/>
</call-service>
<set field="createPartyRoleCtx.partyId" from-field="partyGroupPartyId"/>
<set field="createPartyRoleCtx.roleTypeId" value="ACCOUNT_LEAD"/>
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=730183&r1=730182&r2=730183&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 Tue Dec 30 09:12:15 2008
@@ -83,12 +83,12 @@
<find-by-primary-key entity-name="UserLogin" map="systemMap" value-field="systemLogin"/>
<set field="partyAccountingPreferencesCallMap.userLogin" from-field="systemLogin"/>
<call-service service-name="getPartyAccountingPreferences" in-map-name="partyAccountingPreferencesCallMap">
- <result-to-field result-name="partyAccountingPreference" field-name="partyAcctgPreference"/>
+ <result-to-field result-name="partyAccountingPreference" field="partyAcctgPreference"/>
</call-service>
<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"/>
+ <result-to-field result-name="invoiceId" field="newEntity.returnId"/>
</call-service>
<else>
@@ -159,7 +159,7 @@
<!-- end debugging block -->
<!-- this is used to make sure we don't return a negative amount -->
- <calculate field-name="returnTotalAmount"><number value="0.0"/></calculate>
+ <calculate field="returnTotalAmount"><number value="0.0"/></calculate>
<!-- check them all to make sure that the return total does not exceed order total. -->
<iterate entry="returnItem" list="returnItems">
@@ -181,11 +181,11 @@
</if>
<check-errors/>
<!-- tally up the return total amount -->
- <calculate field-name="returnTotalAmount">
- <calcop field-name="returnTotalAmount" operator="add">
+ <calculate field="returnTotalAmount">
+ <calcop field="returnTotalAmount" operator="add">
<calcop operator="multiply">
- <calcop operator="get" field-name="returnPrice" map-name="returnItem"/>
- <calcop operator="get" field-name="returnQuantity" map-name="returnItem"/>
+ <calcop operator="get" field="returnPrice" map-name="returnItem"/>
+ <calcop operator="get" field="returnQuantity" map-name="returnItem"/>
</calcop>
</calcop>
</calculate>
@@ -194,11 +194,11 @@
<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>
+ <calculate field="returnTotalCtx.adjustment" type="BigDecimal"><number value="0.0"/></calculate>
<call-service service-name="getOrderAvailableReturnedTotal" in-map-name="returnTotalCtx">
- <result-to-field result-name="availableReturnTotal" field-name="availableReturnTotal"/>
- <result-to-field result-name="returnTotal" field-name="returnTotal"/>
- <result-to-field result-name="orderTotal" field-name="orderTotal"/>
+ <result-to-field result-name="availableReturnTotal" field="availableReturnTotal"/>
+ <result-to-field result-name="returnTotal" field="returnTotal"/>
+ <result-to-field result-name="orderTotal" field="orderTotal"/>
</call-service>
<log level="info" message="Available amount for return on order #${returnItem.orderId} is [${availableReturnTotal}] (orderTotal = [${orderTotal}] - returnTotal = [${returnTotal}]"/>
@@ -233,9 +233,9 @@
<field-map field-name="returnId" from-field="returnHeader.returnId"/>
</entity-and>
<iterate entry="returnAdjustment" list="returnAdjustments">
- <calculate field-name="returnTotalAmount">
- <calcop field-name="returnTotalAmount" operator="add">
- <calcop operator="get" field-name="amount" map-name="returnAdjustment"/>
+ <calculate field="returnTotalAmount">
+ <calcop field="returnTotalAmount" operator="add">
+ <calcop operator="get" field="amount" map-name="returnAdjustment"/>
</calcop>
</calculate>
</iterate>
@@ -319,8 +319,8 @@
<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"/>
- <result-to-field result-name="returnablePrice" field-name="returnablePrice"/>
+ <result-to-field result-name="returnableQuantity" field="returnableQuantity"/>
+ <result-to-field result-name="returnablePrice" field="returnablePrice"/>
</call-service>
</if-not-empty>
@@ -352,10 +352,10 @@
<!-- Workaround for bug: returnPrice=16.99, returnablePrice=16.9894 => OrderReturnPriceCannotExceedThePurchasePrice -->
<set field="epsilon" value="0.01" type="Double"/>
<set field="zero" value="0.0" type="Double"/>
- <calculate field-name="returnPriceDelta" type="Double">
+ <calculate field="returnPriceDelta" type="Double">
<calcop operator="subtract">
- <calcop operator="get" field-name="returnPrice" map-name="parameters"/>
- <calcop operator="get" field-name="returnablePrice"/>
+ <calcop operator="get" field="returnPrice" map-name="parameters"/>
+ <calcop operator="get" field="returnablePrice"/>
</calcop>
</calculate>
@@ -388,8 +388,8 @@
<set value="1" field="newEntity.returnItemSeqId"/>
<else>
<first-from-list entry="newestItem" list="currentItems"/>
- <calculate field-name="returnItemSeqId" map-name="newEntity" type="Integer">
- <calcop field-name="returnItemSeqId" map-name="newestItem" operator="add">
+ <calculate field="returnItemSeqId" map-name="newEntity" type="Integer">
+ <calcop field="returnItemSeqId" map-name="newestItem" operator="add">
<number value="1"/>
</calcop>
</calculate>
@@ -414,7 +414,7 @@
<then>
<!-- create return adjustments for all adjustments associated with the order item -->
<if-not-empty field="orderItem">
- <get-related value-name="orderItem" relation-name="OrderAdjustment" list-name="orderAdjustments"/>
+ <get-related value-field="orderItem" relation-name="OrderAdjustment" list="orderAdjustments"/>
<iterate entry="orderAdjustment" list="orderAdjustments">
<clear-field field="returnAdjCtx"/>
<set field="returnAdjCtx.returnId" from-field="parameters.returnId"/>
@@ -539,14 +539,14 @@
<find-by-and entity-name="ShipmentReceipt" map-name="lookupPKMap" list-name="shipmentReceipts"/>
<iterate list="shipmentReceipts" entry="receipt">
<if-empty field="totalsMap.${receipt.returnItemSeqId}">
- <calculate field-name="${receipt.returnItemSeqId}" map-name="totalsMap">
+ <calculate field="${receipt.returnItemSeqId}" map-name="totalsMap">
<number value="0"/>
</calculate>
</if-empty>
- <calculate field-name="${receipt.returnItemSeqId}" map-name="totalsMap" type="Double">
- <calcop field-name="${receipt.returnItemSeqId}" map-name="totalsMap" operator="add">
- <calcop field-name="quantityAccepted" map-name="receipt" operator="get"/>
- <calcop field-name="quantityRejected" map-name="receipt" operator="get"/>
+ <calculate field="${receipt.returnItemSeqId}" map-name="totalsMap" type="Double">
+ <calcop field="${receipt.returnItemSeqId}" map-name="totalsMap" operator="add">
+ <calcop field="quantityAccepted" map-name="receipt" operator="get"/>
+ <calcop field="quantityRejected" map-name="receipt" operator="get"/>
</calcop>
</calculate>
@@ -598,7 +598,7 @@
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="shipmentReceipts" entry="receipt">
- <get-related-one relation-name="Shipment" value-name="receipt" to-value-name="shipment"/>
+ <get-related-one relation-name="Shipment" value-name="receipt" to-value-field="shipment"/>
<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"/>
@@ -675,7 +675,7 @@
<set from-field="returnHeaderTypeId" field="createHeaderCtx.returnHeaderTypeId"/>
<!-- get the return to party for customer return and return from party for vendor return from the product store -->
- <get-related-one relation-name="ProductStore" value-name="orderHeader" to-value-name="productStore"/>
+ <get-related-one relation-name="ProductStore" value-name="orderHeader" to-value-field="productStore"/>
<if-compare field="returnHeaderTypeId" operator="equals" value="CUSTOMER_RETURN">
<set field="createHeaderCtx.fromPartyId" from-field="orderRole.partyId"/>
<set field="createHeaderCtx.toPartyId" from-field="productStore.payToPartyId"/>
@@ -726,8 +726,8 @@
<!-- get the returnable price and quantity -->
<set from-field="orderItem" field="itemCheckMap.orderItem"/>
<call-service service-name="getReturnableQuantity" in-map-name="itemCheckMap">
- <result-to-field result-name="returnableQuantity" field-name="returnQuantity" map-name="newItemCtx"/>
- <result-to-field result-name="returnablePrice" field-name="returnPrice" map-name="newItemCtx"/>
+ <result-to-field result-name="returnableQuantity" field="newItemCtx.returnQuantity"/>
+ <result-to-field result-name="returnablePrice" field="newItemCtx.returnPrice"/>
</call-service>
<!-- get the matching return item type from the order item type -->
@@ -798,9 +798,9 @@
<set field="orderAvailableCtx.orderId" from-field="orderHeader.orderId"/>
<set field="orderAvailableCtx.countNewReturnItems" value="true" type="Boolean"/> <!-- very important: if this is not set, getOrderAvailableReturnedTotal would not count the return items we just created -->
<call-service service-name="getOrderAvailableReturnedTotal" in-map-name="orderAvailableCtx">
- <result-to-field result-name="availableReturnTotal" field-name="availableReturnTotal"/>
- <result-to-field result-name="returnTotal" field-name="returnTotal"/>
- <result-to-field result-name="orderTotal" field-name="orderTotal"/>
+ <result-to-field result-name="availableReturnTotal" field="availableReturnTotal"/>
+ <result-to-field result-name="returnTotal" field="returnTotal"/>
+ <result-to-field result-name="orderTotal" field="orderTotal"/>
</call-service>
<log level="info" message="OrderTotal [${orderTotal}] - ReturnTotal [${returnTotal}] = available Return Total [${availableReturnTotal}]"/>
@@ -846,7 +846,7 @@
<if-empty field="parameters.returnId">
<set-service-fields service-name="createReturnHeader" map="parameters" to-map="returnHeaderInMap"/>
<call-service service-name="createReturnHeader" in-map="returnHeaderInMap">
- <result-to-field result-name="returnId" field-name="returnId"/>
+ <result-to-field result-name="returnId" field="returnId"/>
</call-service>
<check-errors/>
<set field="parameters.returnId" from-field="returnId"/>
@@ -854,8 +854,8 @@
</if-empty>
<set-service-fields service-name="createReturnItemOrAdjustment" map="parameters" to-map="createReturnItemOrAdjustmentInMap"/>
<call-service service-name="createReturnItemOrAdjustment" in-map="createReturnItemOrAdjustmentInMap">
- <result-to-field result-name="returnAdjustmentId" field-name="returnAdjustmentId"/>
- <result-to-field result-name="returnItemSeqId" field-name="returnItemSeqId"/>
+ <result-to-field result-name="returnAdjustmentId" field="returnAdjustmentId"/>
+ <result-to-field result-name="returnItemSeqId" field="returnItemSeqId"/>
</call-service>
<check-errors/>
<field-to-result field="returnAdjustmentId" result-name="returnAdjustmentId"/>
@@ -897,10 +897,10 @@
</condition>
<then>
<!-- get the returned order item -->
- <get-related-one value-name="returnItem" relation-name="OrderItem" to-value-name="orderItem"/>
+ <get-related-one value-name="returnItem" relation-name="OrderItem" to-value-field="orderItem"/>
<!-- get the order items of the replacement order associated to the returned item -->
<set field="oiaMap.orderItemAssocTypeId" value="REPLACEMENT"/>
- <get-related value-name="orderItem" relation-name="FromOrderItemAssoc" map-name="oiaMap" list-name="replacementOrderItems"/>
+ <get-related value-field="orderItem" relation-name="FromOrderItemAssoc" map-name="oiaMap" list="replacementOrderItems"/>
<iterate list="replacementOrderItems" entry="replacementOrderItem">
<set field="orderItemMap.orderId" from-field="replacementOrderItem.toOrderId"/>
<set field="orderItemMap.orderItemSeqId" from-field="replacementOrderItem.toOrderItemSeqId"/>