svn commit: r667748 [5/16] - in /ofbiz/trunk: applications/accounting/script
Locked
svn commit: r667748 [5/16] - in /ofbiz/trunk: applications/accounting/script
 
|
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=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008 @@ -28,10 +28,10 @@ <set from-field="productStore.allowPassword" field="allowPassword"/> <set from-field="productStore.defaultPassword" field="defaultPassword"/> - <if-empty field-name="allowPassword"> + <if-empty field="allowPassword"> <set field="allowPassword" value="Y"/> </if-empty> - <if-empty field-name="defaultPassword"> + <if-empty field="defaultPassword"> <set field="defaultPassword" value="ungssblepswd"/> </if-empty> @@ -41,21 +41,21 @@ <now-timestamp-to-env env-name="nowStamp"/> <set value="CUSTOMER" field="parameters.roleTypeId"/> - <if-compare field-name="allowPassword" operator="not-equals" value="Y"> + <if-compare field="allowPassword" operator="not-equals" value="Y"> <set from-field="defaultPassword" field="parameters.PASSWORD"/> <set from-field="defaultPassword" field="parameters.CONFIRM_PASSWORD"/> <set value="No hint set, account not yet enabled" field="parameters.PASSWORD_HINT"/> </if-compare> - <if-compare field-name="productStore.usePrimaryEmailUsername" operator="equals" value="Y"> + <if-compare field="productStore.usePrimaryEmailUsername" operator="equals" value="Y"> <set field="parameters.USERNAME" from-field="parameters.CUSTOMER_EMAIL"/> </if-compare> <!-- if username and/or password should be lowercased, do that now --> - <if-compare field-name="username_lowercase" operator="equals" value="true"> + <if-compare field="username_lowercase" operator="equals" value="true"> <call-object-method obj-field-name="USERNAME" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="USERNAME" ret-map-name="parameters"/> </if-compare> - <if-compare field-name="password_lowercase" operator="equals" value="true"> + <if-compare field="password_lowercase" operator="equals" value="true"> <call-object-method obj-field-name="PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="PASSWORD" ret-map-name="parameters"/> <call-object-method obj-field-name="CONFIRM_PASSWORD" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="CONFIRM_PASSWORD" ret-map-name="parameters"/> </if-compare> @@ -73,10 +73,10 @@ <process field="PASSWORD_HINT"><copy to-field="passwordHint"/></process> </simple-map-processor> </call-map-processor> - <if-not-empty field-name="userLoginId" map-name="userLoginContext"> + <if-not-empty field="userLoginContext.userLoginId"> <set from-field="userLoginContext.userLoginId" field="userLoginExistsMap.userLoginId"/> <find-by-primary-key entity-name="UserLogin" map-name="userLoginExistsMap" value-name="existingUserLogin"/> - <if-not-empty field-name="existingUserLogin"> + <if-not-empty field="existingUserLogin"> <string-to-list string="Username in use, please choose another." message-field-name="USERNAME" list-name="error_list"/> </if-not-empty> </if-not-empty> @@ -121,7 +121,7 @@ <set from-field="parameters.roleTypeId" field="partyRoleContext.roleTypeId"/> <!-- Create the Postal Address --> - <if-compare field-name="USE_ADDRESS" map-name="parameters" operator="equals" value="false"> + <if-compare field="parameters.USE_ADDRESS" operator="equals" value="false"> <!-- address not used, do nothing --> <else> <call-map-processor in-map-name="parameters" out-map-name="addressContext"> @@ -154,13 +154,13 @@ <process field="CUSTOMER_ADDRESS_ALLOW_SOL"><copy to-field="allowSolicitation"/></process> </simple-map-processor> </call-map-processor> - <if-compare value="USA" operator="equals" field-name="CUSTOMER_COUNTRY" map-name="parameters"> - <if-empty field-name="CUSTOMER_STATE" map-name="parameters"> + <if-compare value="USA" operator="equals" field="parameters.CUSTOMER_COUNTRY"> + <if-empty field="parameters.CUSTOMER_STATE"> <string-to-list string="State is missing, and is required for an address in the United States." message-field-name="CUSTOMER_STATE" list-name="error_list"/> </if-empty> </if-compare> - <if-compare value="CAN" operator="equals" field-name="CUSTOMER_COUNTRY" map-name="parameters"> - <if-empty field-name="CUSTOMER_STATE" map-name="parameters"> + <if-compare value="CAN" operator="equals" field="parameters.CUSTOMER_COUNTRY"> + <if-empty field="parameters.CUSTOMER_STATE"> <string-to-list string="State is missing, and is required for an address in the Canada." message-field-name="CUSTOMER_STATE" list-name="error_list"/> </if-empty> </if-compare> @@ -168,7 +168,7 @@ </if-compare> <!-- Create the Home Phone --> - <if-not-empty field-name="CUSTOMER_HOME_CONTACT" map-name="parameters"> + <if-not-empty field="parameters.CUSTOMER_HOME_CONTACT"> <call-map-processor in-map-name="parameters" out-map-name="homePhoneContext"> <simple-map-processor name="newTelecomNumber"> <process field="roleTypeId"><copy/></process> @@ -182,7 +182,7 @@ </if-not-empty> <!-- Create the Work Phone --> - <if-not-empty field-name="CUSTOMER_WORK_CONTACT" map-name="parameters"> + <if-not-empty field="parameters.CUSTOMER_WORK_CONTACT"> <call-map-processor in-map-name="parameters" out-map-name="workPhoneContext"> <simple-map-processor name="newTelecomNumber"> <process field="roleTypeId"><copy/></process> @@ -196,7 +196,7 @@ </if-not-empty> <!-- Create the Fax Phone --> - <if-not-empty field-name="CUSTOMER_FAX_CONTACT" map-name="parameters"> + <if-not-empty field="parameters.CUSTOMER_FAX_CONTACT"> <call-map-processor in-map-name="parameters" out-map-name="faxPhoneContext"> <simple-map-processor name="newTelecomNumber"> <process field="roleTypeId"><copy/></process> @@ -210,7 +210,7 @@ </if-not-empty> <!-- Create the Mobile Phone --> - <if-not-empty field-name="CUSTOMER_MOBILE_CONTACT" map-name="parameters"> + <if-not-empty field="parameters.CUSTOMER_MOBILE_CONTACT"> <call-map-processor in-map-name="parameters" out-map-name="mobilePhoneContext"> <simple-map-processor name="newTelecomNumber"> <process field="roleTypeId"><copy/></process> @@ -224,10 +224,10 @@ </if-not-empty> <!-- Check for required Phone --> - <if-compare field-name="REQUIRE_PHONE" map-name="parameters" operator="equals" value="true"> - <if-empty field-name="CUSTOMER_HOME_CONTACT" map-name="parameters"> - <if-empty field-name="CUSTOMER_WORK_CONTACT" map-name="parameters"> - <if-empty field-name="CUSTOMER_MOBILE_CONTACT" map-name="parameters"> + <if-compare field="parameters.REQUIRE_PHONE" operator="equals" value="true"> + <if-empty field="parameters.CUSTOMER_HOME_CONTACT"> + <if-empty field="parameters.CUSTOMER_WORK_CONTACT"> + <if-empty field="parameters.CUSTOMER_MOBILE_CONTACT"> <call-map-processor in-map-name="parameters" out-map-name="dummymap"> <simple-map-processor name="checkRequiredPhone"> <process field="REQUIRED_PHONE"> @@ -244,7 +244,7 @@ <!-- Create the email address --> <!-- Check for required E-Mail --> - <if-compare field-name="REQUIRE_EMAIL" map-name="parameters" operator="not-equals" value="false"> + <if-compare field="parameters.REQUIRE_EMAIL" operator="not-equals" value="false"> <call-map-processor in-map-name="parameters" out-map-name="emailContext"> <simple-map-processor name="newEmail"> <process field="roleTypeId"><copy/></process> @@ -308,7 +308,7 @@ <call-service service-name="createPartyRole" in-map-name="partyRoleContext" include-user-login="true"/> <!-- shipping address --> - <if-compare field-name="USE_ADDRESS" map-name="parameters" operator="equals" value="false"> + <if-compare field="parameters.USE_ADDRESS" operator="equals" value="false"> <!-- address not used, do nothing --> <else> <call-service service-name="createPartyPostalAddress" in-map-name="addressContext"> @@ -325,7 +325,7 @@ </if-compare> <!-- home phone --> - <if-not-empty field-name="CUSTOMER_HOME_CONTACT" map-name="parameters"> + <if-not-empty field="parameters.CUSTOMER_HOME_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="homePhoneContext"> <result-to-field result-name="contactMechId" map-name="homePhonePurposeContext"/> </call-service> @@ -335,7 +335,7 @@ </if-not-empty> <!-- work phone --> - <if-not-empty field-name="CUSTOMER_WORK_CONTACT" map-name="parameters"> + <if-not-empty field="parameters.CUSTOMER_WORK_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="workPhoneContext"> <result-to-field result-name="contactMechId" map-name="workPhonePurposeContext"/> </call-service> @@ -345,7 +345,7 @@ </if-not-empty> <!-- fax phone --> - <if-not-empty field-name="CUSTOMER_FAX_CONTACT" map-name="parameters"> + <if-not-empty field="parameters.CUSTOMER_FAX_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="faxPhoneContext"> <result-to-field result-name="contactMechId" map-name="faxPhonePurposeContext"/> </call-service> @@ -355,7 +355,7 @@ </if-not-empty> <!-- mobile phone --> - <if-not-empty field-name="CUSTOMER_MOBILE_CONTACT" map-name="parameters"> + <if-not-empty field="parameters.CUSTOMER_MOBILE_CONTACT"> <call-service service-name="createPartyTelecomNumber" in-map-name="mobilePhoneContext"> <result-to-field result-name="contactMechId" map-name="mobilePhonePurposeContext"/> </call-service> @@ -365,7 +365,7 @@ </if-not-empty> <!-- email address --> - <if-not-empty field-name="emailAddress" map-name="emailContext"> + <if-not-empty field="emailContext.emailAddress"> <call-service service-name="createPartyEmailAddress" in-map-name="emailContext"> <result-to-field result-name="contactMechId" map-name="emailPurposeContext"/> </call-service> @@ -375,10 +375,10 @@ </if-not-empty> <!-- club number --> - <if-not-empty field-name="REQUIRE_CLUB" map-name="parameters"> + <if-not-empty field="parameters.REQUIRE_CLUB"> <set from-field="tempMap.partyId" field="personLookup.partyId"/> <find-by-primary-key map-name="personLookup" value-name="personVo" entity-name="Person"/> - <if-empty field-name="CLUB_NUMBER" map-name="parameters"> + <if-empty field="parameters.CLUB_NUMBER"> <call-bsh><![CDATA[ clubId = org.ofbiz.party.party.PartyWorker.createClubId(delegator, "999", 13); parameters.put("CLUB_NUMBER", clubId); @@ -389,7 +389,7 @@ </if-not-empty> <!-- now finished, log in the user and set the cart's partyId to that of the newly created customer ... --> - <if-compare field-name="allowPassword" operator="equals" value="Y"> + <if-compare field="allowPassword" operator="equals" value="Y"> <call-bsh><![CDATA[ org.ofbiz.webapp.control.LoginWorker.doBasicLogin(createdUserLogin, request); org.ofbiz.webapp.control.LoginWorker.autoLoginSet(request, response); @@ -402,11 +402,11 @@ </if-compare> <!-- send off the registration email --> - <if-not-empty field-name="emailAddress" map-name="emailContext"> + <if-not-empty field="emailContext.emailAddress"> <set from-field="parameters.emailProductStoreId" field="storeEmailLookup.productStoreId"/> <set value="PRDS_CUST_REGISTER" field="storeEmailLookup.emailType"/> <find-by-primary-key map-name="storeEmailLookup" entity-name="ProductStoreEmailSetting" value-name="storeEmail"/> - <if-not-empty field-name="bodyScreenLocation" map-name="storeEmail"> + <if-not-empty field="storeEmail.bodyScreenLocation"> <!-- prepare the email context --> <get-related-one value-name="createdUserLogin" relation-name="Person" to-value-name="personObj"/> <set from-field="createdUserLogin" field="emailCtx.userLogin"/> @@ -435,7 +435,7 @@ <!-- =========================================== --> <simple-method method-name="processCustomerSettings" short-description="Process Customer Settings; to be called as a Request Event" login-required="false"> - <if-empty field-name="parameters.partyId"> + <if-empty field="parameters.partyId"> <call-simple-method method-name="createAnonymousCustomer"/> <else> <call-simple-method method-name="updateCustomer"/> @@ -447,7 +447,7 @@ <session-to-field field-name="cart" session-name="shoppingCart"/> <session-to-field field-name="userLogin" session-name="userLogin"/> <log level="info" message="userLogin in Env ${userLogin} in parameters.userLogin ${parameters.userLogin}"/> - <if-empty field-name="userLogin"> + <if-empty field="userLogin"> <call-object-method obj-field-name="session" method-name="removeAttribute"> <string value="autoUserLogin"/> </call-object-method> @@ -456,7 +456,7 @@ <string value="autoName"/> </call-object-method> <check-errors/> - <if-not-empty field-name="cart"> + <if-not-empty field="cart"> <call-bsh><![CDATA[ // clear out the login fields from the cart try { @@ -467,13 +467,13 @@ ]]></call-bsh> </if-not-empty> <set from-field="tempMap.partyId" field="partyId" /> - <if-not-empty field-name="partyId"> + <if-not-empty field="partyId"> <set field="lookupKeyValue.userLoginId" value="anonymous"/> <find-by-primary-key map-name="lookupKeyValue" entity-name="UserLogin" value-name="userLogin"/> - <if-not-empty field-name="userLogin"> + <if-not-empty field="userLogin"> <set field="userLogin.partyId" from-field="partyId"/> <field-to-session field-name="userLogin" session-name="userLogin" /> - <if-not-empty field-name="cart"> + <if-not-empty field="cart"> <call-object-method obj-field-name="cart" method-name="setOrderPartyId"> <field field-name="partyId"/> </call-object-method> @@ -503,7 +503,7 @@ <now-timestamp-to-env env-name="nowStamp"/> <!-- setup the party/person --> - <if-not-empty field-name="parameters.birthDateYear"> + <if-not-empty field="parameters.birthDateYear"> <set field="parameters.birthDate" value="${parameters.birthDateYear}-${parameters.birthDateMonth}-${parameters.birthDateDay}"/> </if-not-empty> <call-map-processor in-map-name="parameters" out-map-name="personMap"> @@ -594,7 +594,7 @@ <simple-method method-name="createUpdateCustomerInfo" short-description="Create or Update Customer Info" login-required="false"> <!-- update the email address --> - <if-not-empty field-name="parameters.emailContactMechId"> + <if-not-empty field="parameters.emailContactMechId"> <set field="emailMap.partyId" from-field="partyId"/> <set field="emailMap.contactMechId" from-field="parameters.emailContactMechId"/> <!-- call the update email service --> @@ -610,14 +610,14 @@ <!-- create home phone --> - <if-not-empty field-name="parameters.homePhoneContactMechId"> + <if-not-empty field="parameters.homePhoneContactMechId"> <set field="homePhoneMap.partyId" from-field="partyId"/> <set field="homePhoneMap.contactMechId" from-field="parameters.homePhoneContactMechId"/> <!-- 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 field="homePhoneMap.partyId" from-field="partyId"/> <set field="homePhoneMap.contactMechPurposeTypeId" value="PHONE_HOME"/> <!-- call create telecom service --> @@ -627,14 +627,14 @@ </if-not-empty> <!-- create work phone --> - <if-not-empty field-name="parameters.workPhoneContactMechId"> + <if-not-empty field="parameters.workPhoneContactMechId"> <set field="workPhoneMap.partyId" from-field="partyId"/> <set field="workPhoneMap.contactMechId" from-field="parameters.workPhoneContactMechId"/> <!-- 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 field="workPhoneMap.partyId" from-field="partyId"/> <set field="workPhoneMap.contactMechPurposeTypeId" value="PHONE_WORK"/> <!-- call create telecom service --> @@ -644,7 +644,7 @@ </if-not-empty> </simple-method> <simple-method method-name="updateCustomer" short-description="Update Customer" login-required="true"> - <if-empty field-name="parameters.partyId"><add-error><fail-message message="No partyId passed, cannot Update Customer"/></add-error></if-empty> + <if-empty field="parameters.partyId"><add-error><fail-message message="No partyId passed, cannot Update Customer"/></add-error></if-empty> <call-simple-method method-name="validateCustomerInfo"/> @@ -674,13 +674,13 @@ <log level="info" message="CreatePerson : ${tempMap.partyId}"/> <!-- 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> @@ -697,7 +697,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) --> @@ -735,20 +735,20 @@ <process field="monthsAtAddress"><convert type="Long" to-field="monthsWithContactMech"><fail-message message="Months at address not a valid number: ${parameters.monthsAtAddress}"/></convert></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"> <string-to-list string="State is missing, and is required for an address in the United States." message-field-name="CUSTOMER_STATE" list-name="error_list"/> </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"> <string-to-list string="State is missing, and is required for an address in the Canada." message-field-name="CUSTOMER_STATE" list-name="error_list"/> </if-empty> </if-compare> <check-errors/> <!-- shipping address --> - <if-not-empty field-name="parameters.shippingContactMechId"> + <if-not-empty field="parameters.shippingContactMechId"> <set field="addressContext.partyId" from-field="partyId"/> <set field="addressContext.contactMechId" from-field="parameters.shippingContactMechId"/> <!-- call the update address service --> @@ -775,7 +775,7 @@ </else> </if-not-empty> <session-to-field field-name="cart" session-name="shoppingCart"/> - <if-not-empty field-name="cart"> + <if-not-empty field="cart"> <call-object-method obj-field-name="cart" method-name="addContactMech"> <string value="SHIPPING_LOCATION"/> <field field-name="addressContext.contactMechId"/> @@ -795,7 +795,7 @@ } ]]></call-bsh> <session-to-field field-name="cart" session-name="shoppingCart"/> - <if-not-empty field-name="cart"> + <if-not-empty field="cart"> <set field="shipmentMethodTypeId" from-field="parameters.shipmentMethodTypeId" /> <call-object-method obj-field-name="cart" method-name="setShipmentMethodTypeId"> <field field-name="shipmentMethodTypeId"/> @@ -807,35 +807,35 @@ </call-object-method> <set field="maySplit" from-field="parameters.may_split" type="Boolean"/> - <if-not-empty field-name="maySplit"> + <if-not-empty field="maySplit"> <call-object-method obj-field-name="cart" method-name="setMaySplit"> <field field-name="maySplit" type="Boolean"/> </call-object-method> </if-not-empty> <set field="shippingInstruction" from-field="parameters.shipping_instructions" type="String"/> - <if-not-empty field-name="shippingInstruction"> + <if-not-empty field="shippingInstruction"> <call-object-method obj-field-name="cart" method-name="setShippingInstructions"> <field field-name="shippingInstruction" type="String"/> </call-object-method> </if-not-empty> <set field="correspondingPoId" from-field="parameters.correspondingPoId"/> - <if-not-empty field-name="correspondingPoId"> + <if-not-empty field="correspondingPoId"> <call-object-method obj-field-name="cart" method-name="setPoNumber"> <field field-name="correspondingPoId" type="String"/> </call-object-method> </if-not-empty> <set field="isGift" from-field="parameters.is_gift" type="Boolean"/> - <if-not-empty field-name="isGift"> + <if-not-empty field="isGift"> <call-object-method obj-field-name="cart" method-name="setIsGift"> <field field-name="isGift" type="Boolean"/> </call-object-method> </if-not-empty> <set field="giftMessage" from-field="parameters.gift_message" type="String"/> - <if-not-empty field-name="giftMessage"> + <if-not-empty field="giftMessage"> <call-object-method obj-field-name="cart" method-name="setGiftMessage"> <field field-name="giftMessage" type="String"/> </call-object-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=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008 @@ -32,23 +32,23 @@ <set field="default_user_password" value="ungssblepsswd" /> <now-timestamp-to-env env-name="nowStamp"/> - <if-compare field-name="create_allow_password" operator="not-equals" value="true"> + <if-compare field="create_allow_password" operator="not-equals" value="true"> <set field="parameters.password" from-field="default_user_password" /> <set field="parameters.confirmPassword" from-field="default_user_password" /> <set field="parameters.passwordHint" value="No hint set, accout not yet enabled" /> </if-compare> <!-- if username and/or password should be lowercased, do that now --> - <if-compare field-name="username_lowercase" operator="equals" value="true"> + <if-compare field="username_lowercase" operator="equals" value="true"> <call-object-method obj-field-name="username" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="username" ret-map-name="parameters"/> </if-compare> - <if-compare field-name="password_lowercase" operator="equals" value="true"> + <if-compare field="password_lowercase" operator="equals" value="true"> <call-object-method obj-field-name="password" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="password" ret-map-name="parameters"/> <call-object-method obj-field-name="confirmPassword" obj-map-name="parameters" method-name="toLowerCase" ret-field-name="confirmPassword" ret-map-name="parameters"/> </if-compare> <!-- Create the UserLogin Record --> - <if-not-empty field-name="userLoginId" map-name="parameters"> + <if-not-empty field="parameters.userLoginId"> <call-map-processor in-map-name="parameters" out-map-name="userLoginContext"> <simple-map-processor name="newUserLogin"> <process field="userLoginId"><copy to-field="userLoginId"/><not-empty><fail-property resource="PartyUiLabels" property="PartyUserNameMissing"/></not-empty></process> @@ -61,10 +61,10 @@ <process field="passwordHint"><copy to-field="passwordHint"/></process> </simple-map-processor> </call-map-processor> - <if-not-empty field-name="userLoginId" map-name="userLoginContext"> + <if-not-empty field="userLoginContext.userLoginId"> <set field=" userLoginExistsMap.userLoginId" from-field="userLoginContext.userLoginId" /> <find-by-primary-key entity-name="UserLogin" map-name="userLoginExistsMap" value-name="existingUserLogin"/> - <if-not-empty field-name="existingUserLogin"> + <if-not-empty field="existingUserLogin"> <set field="tempErrorMessage" value="Username in use, please choose another." /> <field-to-list field-name="tempErrorMessage" list-name="error_list"/> </if-not-empty> @@ -83,7 +83,7 @@ org.ofbiz.common.login.LoginServices.checkNewPassword(newUserLogin, null, password, confirmPassword, passwordHint, error_list, true, locale); ]]></call-bsh> <else> - <if-compare field-name="require_login" operator="equals" value="true"> + <if-compare field="require_login" operator="equals" value="true"> <add-error><fail-property resource="PartyUiLabels" property="PartyUserNameMissing"/></add-error> <check-errors/> </if-compare> @@ -104,7 +104,7 @@ </call-map-processor> <!-- Create the Home Phone --> - <if-not-empty field-name="homeContactNumber" map-name="parameters"> + <if-not-empty field="parameters.homeContactNumber"> <call-map-processor in-map-name="parameters" out-map-name="homePhoneContext"> <simple-map-processor name="newTelecomNumber"> <process field="roleTypeId"><copy/></process> @@ -118,7 +118,7 @@ </if-not-empty> <!-- Create the Work Phone --> - <if-not-empty field-name="workContactNumber" map-name="parameters"> + <if-not-empty field="parameters.workContactNumber"> <call-map-processor in-map-name="parameters" out-map-name="workPhoneContext"> <simple-map-processor name="newTelecomNumber"> <process field="roleTypeId"><copy/></process> @@ -132,7 +132,7 @@ </if-not-empty> <!-- Create the Fax Phone --> - <if-not-empty field-name="faxContactNumber" map-name="parameters"> + <if-not-empty field="parameters.faxContactNumber"> <call-map-processor in-map-name="parameters" out-map-name="faxPhoneContext"> <simple-map-processor name="newTelecomNumber"> <process field="roleTypeId"><copy/></process> @@ -146,7 +146,7 @@ </if-not-empty> <!-- Create the Mobile Phone --> - <if-not-empty field-name="mobileContactNumber" map-name="parameters"> + <if-not-empty field="parameters.mobileContactNumber"> <call-map-processor in-map-name="parameters" out-map-name="mobilePhoneContext"> <simple-map-processor name="newTelecomNumber"> <process field="roleTypeId"><copy/></process> @@ -160,10 +160,10 @@ </if-not-empty> <!-- Check for required Phone --> - <if-compare field-name="require_phone" operator="equals" value="true"> - <if-empty field-name="homeContactNumber" map-name="parameters"> - <if-empty field-name="workContactNumber" map-name="parameters"> - <if-empty field-name="mobileContactNumber" map-name="parameters"> + <if-compare field="require_phone" operator="equals" value="true"> + <if-empty field="parameters.homeContactNumber"> + <if-empty field="parameters.workContactNumber"> + <if-empty field="parameters.mobileContactNumber"> <call-map-processor in-map-name="parameters" out-map-name="dummymap"> <simple-map-processor name="checkRequiredPhone"> <process field="requiredPhone"> @@ -186,8 +186,8 @@ </call-map-processor> <!-- Check for required E-Mail --> - <if-compare field-name="require_email" operator="equals" value="true"> - <if-empty field-name="emailAddress" map-name="emailContext"> + <if-compare field="require_email" operator="equals" value="true"> + <if-empty field="emailContext.emailAddress"> <call-map-processor in-map-name="emailContext" out-map-name="dummymap"> <simple-map-processor name="checkRequiredEmail"> <process field="emailAddress"> @@ -196,7 +196,7 @@ </simple-map-processor> </call-map-processor> </if-empty> - <if-not-empty field-name="emailAddress" map-name="emailContext"> + <if-not-empty field="emailContext.emailAddress"> <call-map-processor in-map-name="emailContext" out-map-name="dummymap"> <simple-map-processor name="checkRequiredEmailFormat"> <process field="emailAddress"> @@ -213,8 +213,8 @@ <set field="partyRoleContext.roleTypeId" from-field="parameters.roleTypeId" /> <!-- Create the Postal Address --> - <if-compare field-name="shipToPostalAddress" operator="equals" value="true"> - <if-empty field-name="shipToName" map-name="parameters"> + <if-compare field="shipToPostalAddress" operator="equals" value="true"> + <if-empty field="parameters.shipToName"> <set field="parameters.shipToName" value="${personContext.firstName} ${personContext.middleName} ${personContext.lastName}" /> </if-empty> <call-map-processor in-map-name="parameters" out-map-name="shippingAddressContext"> @@ -231,24 +231,24 @@ <process field="shipToPostalAddressAllowSol"><copy to-field="allowSolicitation"/></process> </simple-map-processor> </call-map-processor> - <if-compare value="USA" operator="equals" field-name="shipToCountryGeoId" map-name="parameters"> - <if-empty field-name="shipToStateProvinceGeoId" map-name="parameters"> + <if-compare value="USA" operator="equals" field="parameters.shipToCountryGeoId"> + <if-empty field="parameters.shipToStateProvinceGeoId"> <set field="tempErrorMessage" value="State is missing, and is required for an address in the United States." /> <field-to-list field-name="tempErrorMessage" list-name="error_list"/> </if-empty> </if-compare> - <if-compare value="CAN" operator="equals" field-name="shipToCountryGeoId" map-name="parameters"> - <if-empty field-name="shipToStateProvinceGeoId" map-name="parameters"> + <if-compare value="CAN" operator="equals" field="parameters.shipToCountryGeoId"> + <if-empty field="parameters.shipToStateProvinceGeoId"> <set field="tempErrorMessage" value="State is missing, and is required for an address in Canada." /> <field-to-list field-name="tempErrorMessage" list-name="error_list"/> </if-empty> </if-compare> </if-compare> - <if-compare value="Y" field-name="parameters.useShippingPostalAddressForBilling" operator="not-equals"> + <if-compare value="Y" field="parameters.useShippingPostalAddressForBilling" operator="not-equals"> <!-- Check the flag if Second Postal address is not same as First So create Another Postal Address --> - <if-compare field-name="billToPostalAddress" operator="equals" value="true"> - <if-empty field-name="billToName" map-name="parameters"> + <if-compare field="billToPostalAddress" operator="equals" value="true"> + <if-empty field="parameters.billToName"> <set field="parameters.billToName" value="${personContext.firstName} ${personContext.middleName} ${personContext.lastName}" /> </if-empty> <call-map-processor in-map-name="parameters" out-map-name="billingAddressContext"> @@ -265,14 +265,14 @@ <process field="billToPostalAddressAllowSol"><copy to-field="allowSolicitation"/></process> </simple-map-processor> </call-map-processor> - <if-compare value="USA" operator="equals" field-name="billToCountryGeoId" map-name="parameters"> - <if-empty field-name="billToStateProvinceGeoId" map-name="parameters"> + <if-compare value="USA" operator="equals" field="parameters.billToCountryGeoId"> + <if-empty field="parameters.billToStateProvinceGeoId"> <set field="tempErrorMessage" value="State is missing, and is required for an address in the United States." /> <field-to-list field-name="tempErrorMessage" list-name="error_list"/> </if-empty> </if-compare> - <if-compare value="CAN" operator="equals" field-name="billToCountryGeoId" map-name="parameters"> - <if-empty field-name="billToStateProvinceGeoId" map-name="parameters"> + <if-compare value="CAN" operator="equals" field="parameters.billToCountryGeoId"> + <if-empty field="parameters.billToStateProvinceGeoId"> <set field="tempErrorMessage" value="State is missing, and is required for an address in Canada." /> <field-to-list field-name="tempErrorMessage" list-name="error_list"/> </if-empty> @@ -293,14 +293,14 @@ <!-- see if we should continue now... --> <check-errors/> - <if-empty field-name="parameters.partyId"> + <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-request result-name="partyId"/> </call-service> - <if-empty field-name="userLogin"> - <if-empty field-name="newUserLogin"> + <if-empty field="userLogin"> + <if-empty field="newUserLogin"> <!-- the rest of the methods require a userLogin object; so if we are anonymous lets fake it --> <set field="ulLookup.userLoginId" value="anonymous"/> <find-by-primary-key entity-name="UserLogin" map-name="ulLookup" value-name="userLogin"/> @@ -311,7 +311,7 @@ </else> </if-empty> <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="partyId"/> </if-compare> </else> @@ -337,7 +337,7 @@ <set field="mobilePhoneContext.partyId" from-field="partyId" /> <set field="emailContext.partyId" from-field="partyId" /> - <if-not-empty field-name="newUserLogin"> + <if-not-empty field="newUserLogin"> <!-- If password encryption is enabled, encrpyt it now --> <call-bsh><![CDATA[ boolean useEncryption = "true".equals(org.ofbiz.base.util.UtilProperties.getPropertyValue("security", "password.encrypt")); @@ -351,13 +351,13 @@ <create-value value-name="partyDataSource"/> <!-- add contactMechPurposeTypeId for first Postal Address --> - <if-compare field-name="shipToPostalAddress" operator="equals" value="true"> - <if-empty field-name="parameters.shippingContactMechId"> + <if-compare field="shipToPostalAddress" operator="equals" value="true"> + <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"/> </call-service> - <if-compare value="Y" field-name="parameters.useShippingPostalAddressForBilling" operator="equals"> + <if-compare value="Y" field="parameters.useShippingPostalAddressForBilling" operator="equals"> <set field="addressPurposeContext.partyId" from-field="partyId"/> <set field="addressPurposeContext.contactMechPurposeTypeId" from-field="parameters.billingContactMechPurposeTypeId" default-value="BILLING_LOCATION"/> <set field="addressPurposeContext.contactMechId" from-field="parameters.shippingContactMechId"/> @@ -373,8 +373,8 @@ </if-empty> </if-compare> - <if-compare value="Y" field-name="parameters.useShippingPostalAddressForBilling" operator="not-equals"> - <if-empty field-name="parameters.billingContactMechId"> + <if-compare value="Y" field="parameters.useShippingPostalAddressForBilling" operator="not-equals"> + <if-empty field="parameters.billingContactMechId"> <!-- 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"> @@ -391,8 +391,8 @@ </if-compare> <!-- home phone --> - <if-not-empty field-name="homeContactNumber" map-name="parameters"> - <if-empty field-name="parameters.homePhoneContactMechId"> + <if-not-empty field="parameters.homeContactNumber"> + <if-empty field="parameters.homePhoneContactMechId"> <!-- create home phone --> <set field="homePhoneContext.contactMechPurposeTypeId" value="PHONE_HOME"/> <!-- call create telecom service --> @@ -410,8 +410,8 @@ </if-not-empty> <!-- work phone --> - <if-not-empty field-name="workContactNumber" map-name="parameters"> - <if-empty field-name="parameters.workPhoneContactMechId"> + <if-not-empty field="parameters.workContactNumber"> + <if-empty field="parameters.workPhoneContactMechId"> <!-- create work phone --> <set field="workPhoneContext.contactMechPurposeTypeId" value="PHONE_WORK"/> <!-- call create telecom service --> @@ -429,8 +429,8 @@ </if-not-empty> <!-- fax phone --> - <if-not-empty field-name="faxContactNumber" map-name="parameters"> - <if-empty field-name="parameters.faxPhoneContactMechId"> + <if-not-empty field="parameters.faxContactNumber"> + <if-empty field="parameters.faxPhoneContactMechId"> <!-- create fax phone --> <set field="faxPhoneContext.contactMechPurposeTypeId" value="FAX_NUMBER"/> <!-- call create telecom service --> @@ -448,8 +448,8 @@ </if-not-empty> <!-- mobile phone --> - <if-not-empty field-name="mobileContactNumber" map-name="parameters"> - <if-empty field-name="parameters.mobilePhoneContactMechId"> + <if-not-empty field="parameters.mobileContactNumber"> + <if-empty field="parameters.mobilePhoneContactMechId"> <set field="mobilePhoneContext.contactMechPurposeTypeId" value="PHONE_MOBILE"/> <!-- call create telecom service --> <call-service service-name="createPartyTelecomNumber" in-map-name="mobilePhoneContext"> @@ -466,8 +466,8 @@ </if-not-empty> <!-- email address --> - <if-not-empty field-name="emailAddress" map-name="parameters"> - <if-empty field-name="emailContactMechId" map-name="parameters"> + <if-not-empty field="parameters.emailAddress"> + <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"/> @@ -498,7 +498,7 @@ <!-- see if we should continue now... --> <session-to-field field-name="cart" session-name="shoppingCart"/> <session-to-field field-name="userLogin" session-name="userLogin"/> - <if-empty field-name="userLogin"> + <if-empty field="userLogin"> <call-object-method obj-field-name="session" method-name="removeAttribute"> <string value="autoUserLogin"/> </call-object-method> @@ -507,7 +507,7 @@ <string value="autoName"/> </call-object-method> <check-errors/> - <if-not-empty field-name="cart"> + <if-not-empty field="cart"> <call-bsh><![CDATA[ // clear out the login fields from the cart try { @@ -518,13 +518,13 @@ ]]></call-bsh> </if-not-empty> <set from-field="partyId" field="partyId" /> - <if-not-empty field-name="partyId"> + <if-not-empty field="partyId"> <set field="lookupKeyValue.userLoginId" value="anonymous"/> <find-by-primary-key map-name="lookupKeyValue" entity-name="UserLogin" value-name="userLogin"/> - <if-not-empty field-name="userLogin"> + <if-not-empty field="userLogin"> <set field="userLogin.partyId" from-field="partyId"/> <field-to-session field-name="userLogin" session-name="userLogin" /> - <if-not-empty field-name="cart"> + <if-not-empty field="cart"> <call-object-method obj-field-name="cart" method-name="setOrderPartyId"> <field field-name="partyId"/> </call-object-method> @@ -542,7 +542,7 @@ </if-empty> <check-errors/> - <if-not-empty field-name="cart"> + <if-not-empty field="cart"> <call-object-method obj-field-name="cart" method-name="addContactMech"> <string value="SHIPPING_LOCATION"/> <field field-name="parameters.shippingContactMechId"/> @@ -553,10 +553,10 @@ </if-not-empty> - <if-compare value="Y" field-name="parameters.useShippingPostalAddressForBilling" operator="not-equals"> + <if-compare value="Y" field="parameters.useShippingPostalAddressForBilling" operator="not-equals"> <field-to-session field-name="parameters.billingContactMechId" session-name="billingContactMechId"></field-to-session> <else> - <if-not-empty field-name="cart"> + <if-not-empty field="cart"> <call-object-method obj-field-name="cart" method-name="getShippingContactMechId" ret-field-name="shippingContactMechId"/> </if-not-empty> <field-to-session field-name="shippingContactMechId" session-name="billingContactMechId"></field-to-session> @@ -575,7 +575,7 @@ } ]]></call-bsh> <session-to-field field-name="cart" session-name="shoppingCart"/> - <if-not-empty field-name="cart"> + <if-not-empty field="cart"> <set field="shipmentMethodTypeId" from-field="parameters.shipmentMethodTypeId" /> <call-object-method obj-field-name="cart" method-name="setShipmentMethodTypeId"> <field field-name="shipmentMethodTypeId"/> @@ -592,14 +592,14 @@ </call-object-method> <set field="shippingInstruction" from-field="parameters.shipping_instructions" type="String"/> - <if-not-empty field-name="shippingInstruction"> + <if-not-empty field="shippingInstruction"> <call-object-method obj-field-name="cart" method-name="setShippingInstructions"> <field field-name="shippingInstruction" type="String"/> </call-object-method> </if-not-empty> <set field="correspondingPoId" from-field="parameters.correspondingPoId" type="String"/> - <if-not-empty field-name="correspondingPoId"> + <if-not-empty field="correspondingPoId"> <call-object-method obj-field-name="cart" method-name="setPoNumber"> <field field-name="correspondingPoId" type="String"/> </call-object-method> @@ -611,7 +611,7 @@ </call-object-method> <set field="giftMessage" from-field="parameters.gift_message" type="String"/> - <if-not-empty field-name="giftMessage"> + <if-not-empty field="giftMessage"> <call-object-method obj-field-name="cart" method-name="setGiftMessage"> <field field-name="giftMessage" type="String"/> </call-object-method> Modified: ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml (original) +++ ofbiz/trunk/applications/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml Fri Jun 13 23:03:12 2008 @@ -83,7 +83,7 @@ processor-name="newAffilFax" in-map-name="parameters" out-map-name="fax_context"/> <check-errors/> - <if-not-empty field-name="contactNumber" map-name="fax_context"> + <if-not-empty field="fax_context.contactNumber"> <call-service service-name="createTelecomNumber" in-map-name="fax_context"> <result-to-field result-name="contactMechId" map-name="parameters"/> </call-service> @@ -93,7 +93,7 @@ <call-map-processor xml-resource="org/ofbiz/ecommerce/misc/AffiliateMapProcs.xml" processor-name="newAffilFaxPurpose" in-map-name="parameters" out-map-name="faxp_context"/> <check-errors/> - <if-not-empty field-name="contactNumber" map-name="faxp_context"> + <if-not-empty field="faxp_context.contactNumber"> <call-service service-name="createPartyContactMechPurpose" in-map-name="faxp_context"/> </if-not-empty> Modified: ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml (original) +++ ofbiz/trunk/applications/humanres/script/org/ofbiz/humanres/HumanResServices.xml Fri Jun 13 23:03:12 2008 @@ -71,8 +71,8 @@ <if> <condition> <and> - <if-compare-field field-name="partySkill.partyId" operator="equals" to-field-name="parameters.partyId"/> - <if-compare-field field-name="partySkill.skillTypeId" operator="equals" to-field-name="parameters.skillTypeId"/> + <if-compare-field field="partySkill.partyId" to-field="parameters.partyId" operator="equals"/> + <if-compare-field field="partySkill.skillTypeId" to-field="parameters.skillTypeId" operator="equals"/> </and> </condition> <then> @@ -142,7 +142,7 @@ <make-value entity-name="PerformanceNote" value-name="newEntity"/> <set-pk-fields value-name="newEntity" map-name="parameters"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> @@ -164,7 +164,7 @@ <make-value entity-name="PersonTraining" value-name="newEntity"/> <set-pk-fields value-name="newEntity" map-name="parameters"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> @@ -187,7 +187,7 @@ <make-value entity-name="Employment" value-name="newEntity"/> <set-pk-fields value-name="newEntity" map-name="parameters"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> @@ -231,7 +231,7 @@ <make-value entity-name="PartyBenefit" value-name="newEntity"/> <set-pk-fields value-name="newEntity" map-name="parameters"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> @@ -255,7 +255,7 @@ <simple-method method-name="createPayGrade" short-description="Create a Pay Grade"> <make-value entity-name="PayGrade" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-not-empty field-name="parameters.payGradeId"> + <if-not-empty field="parameters.payGradeId"> <set field="newEntity.payGradeId" from-field="parameters.payGradeId"/> <else> <sequenced-id-to-env sequence-name="PayGrade" env-name="newEntity.payGradeId"/> @@ -280,7 +280,7 @@ <make-value entity-name="PayHistory" value-name="newEntity"/> <set-pk-fields value-name="newEntity" map-name="parameters"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> @@ -405,7 +405,7 @@ <make-value entity-name="EmplPositionFulfillment" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> @@ -427,13 +427,13 @@ <make-value entity-name="EmplPositionReportingStruct" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> <if> <condition> - <if-compare-field field-name="parameters.emplPositionIdManagedBy" operator="not-equals" to-field-name="parameters.emplPositionIdReportingTo"/> + <if-compare-field field="parameters.emplPositionIdManagedBy" to-field="parameters.emplPositionIdReportingTo" operator="not-equals"/> </condition> <then> <create-value value-name="newEntity"/> @@ -462,7 +462,7 @@ <make-value entity-name="EmplPositionResponsibility" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> @@ -484,7 +484,7 @@ <make-value entity-name="ValidResponsibility" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.fromDate"> + <if-empty field="newEntity.fromDate"> <now-timestamp-to-env env-name="nowTimeStamp"/> <set field="newEntity.fromDate" from-field="nowTimeStamp"/> </if-empty> @@ -524,7 +524,7 @@ <simple-method method-name="createEmployee" short-description="Create New Employee"> <set field="parameters.roleTypeId" value="EMPLOYEE"/> <call-simple-method method-name="createPersonRoleAndContactMechs" xml-resource="org/ofbiz/party/party/PartySimpleMethods.xml"/> - <if-not-empty field-name="parameters.partyIdFrom"> + <if-not-empty field="parameters.partyIdFrom"> <set field="partyRelationshipCtx.partyId" from-field="partyId"/> <set field="partyRelationshipCtx.partyIdFrom" from-field="parameters.partyIdFrom"/> <set field="partyRelationshipCtx.partyIdTo" from-field="partyId"/> @@ -533,7 +533,7 @@ <set field="partyRelationshipCtx.relationshipName" value="EMPLOYMENT"/> <set field="partyRelationshipCtx.fromDate" from-field="parameters.fromDate"/> <now-timestamp-to-env env-name="nowTimestamp"/> - <if-empty field-name="partyRelationshipCtx.fromDate"> + <if-empty field="partyRelationshipCtx.fromDate"> <set field="partyRelationshipCtx.fromDate" from-field="nowTimestamp"/> </if-empty> <call-service service-name="createPartyRelationship" in-map-name="partyRelationshipCtx"/> @@ -546,7 +546,7 @@ <make-value entity-name="ResponsibilityType" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.responsibilityTypeId"> + <if-empty field="newEntity.responsibilityTypeId"> <sequenced-id-to-env sequence-name="ResponsibilityType" env-name="newEntity.responsibilityTypeId"/> </if-empty> <field-to-result field-name="newEntity.responsibilityTypeId" result-name="responsibilityTypeId"/> @@ -567,7 +567,7 @@ <simple-method method-name="createTerminationType" short-description="Create a TerminationType"> <make-value entity-name="TerminationType" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.terminationTypeId"> + <if-empty field="newEntity.terminationTypeId"> <sequenced-id-to-env sequence-name="TerminationType" env-name="newEntity.terminationTypeId"/> </if-empty> <field-to-result field-name="newEntity.terminationTypeId" result-name="terminationTypeId"/> @@ -588,7 +588,7 @@ <simple-method method-name="createEmplPositionType" short-description="Create a PositionType"> <make-value entity-name="EmplPositionType" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.emplPositionTypeId"> + <if-empty field="newEntity.emplPositionTypeId"> <sequenced-id-to-env sequence-name="EmplPositionType" env-name="newEntity.emplPositionTypeId"/> </if-empty> <field-to-result field-name="newEntity.emplPositionTypeId" result-name="emplPositionTypeId"/> @@ -658,7 +658,7 @@ <make-value entity-name="EmplLeaveType" value-name="newEntity"/> <set-pk-fields map-name="parameters" value-name="newEntity"/> <set-nonpk-fields map-name="parameters" value-name="newEntity"/> - <if-empty field-name="newEntity.leaveTypeId"> + <if-empty field="newEntity.leaveTypeId"> <sequenced-id-to-env sequence-name="EmplLeaveType" env-name="newEntity.leaveTypeId"/> </if-empty> <field-to-result field-name="newEntity.leaveTypeId" result-name="leaveTypeId"/> @@ -675,4 +675,4 @@ <entity-one entity-name="EmplLeaveType" value-name="lookedUpValue"/> <remove-value value-name="lookedUpValue"/> </simple-method> -</simple-methods> \ No newline at end of file +</simple-methods> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomFormulas.xml Fri Jun 13 23:03:12 2008 @@ -53,7 +53,7 @@ <calcop operator="get" field-name="arguments.width"/> </calcop> </calculate> - <if-compare-field field-name="quantityInt" to-field-name="quantityDou" operator="less"> + <if-compare-field field="quantityInt" to-field="quantityDou" operator="less"> <calculate field-name="quantity"> <calcop operator="add"> <calcop operator="get" field-name="quantityInt"/> Modified: ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml?rev=667748&r1=667747&r2=667748&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml (original) +++ ofbiz/trunk/applications/manufacturing/script/org/ofbiz/manufacturing/bom/BomSimpleMethods.xml Fri Jun 13 23:03:12 2008 @@ -22,21 +22,21 @@ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd"> <!-- ProductAssoc --> <simple-method method-name="createBOMAssoc" short-description="Create Product to Product Association"> - <if-empty field-name="parameters.fromDate"> + <if-empty field="parameters.fromDate"> <now-timestamp-to-env env-name="parameters.fromDate"/> </if-empty> <set field="" from-field=""/> <set field="searchDuplicatedAncestorContext.productId" from-field="parameters.productId"/> <set field="searchDuplicatedAncestorContext.productIdTo" from-field="parameters.productIdTo"/> - <if-not-empty field-name="parameters.fromDate"> + <if-not-empty field="parameters.fromDate"> <set field="searchDuplicatedAncestorContext.fromDate" from-field="parameters.fromDate"/> </if-not-empty> <set field="searchDuplicatedAncestorContext.productAssocTypeId" from-field="parameters.productAssocTypeId"/> <call-service service-name="searchDuplicatedAncestor" in-map-name="searchDuplicatedAncestorContext"> <result-to-field result-name="duplicatedProductAssoc" field-name="duplicatedProductAssoc"/> </call-service> - <if-not-empty field-name="duplicatedProductAssoc"> + <if-not-empty field="duplicatedProductAssoc"> <set field="productToProduct[]" from-field="duplicatedProductAssoc.productId"/> <set field="productToProduct[]" from-field="duplicatedProductAssoc.productIdTo"/> <property-to-field property="ManufacturingDuplicatedComponentInBOM" resource="ManufacturingUiLabels" field-name="errorMessage" arg-list-name="productToProduct"/> @@ -60,7 +60,7 @@ </simple-method> <simple-method method-name="eventEditBOM" short-description="Add, update, delete components in BOM"> - <if-compare value="UPDATE" field-name="UPDATE_MODE" map-name="parameters" operator="equals"> + <if-compare value="UPDATE" field="parameters.UPDATE_MODE" operator="equals"> <set-service-fields service-name="updateProductAssoc" map-name="parameters" to-map-name="context"/> <call-map-processor xml-resource="org/ofbiz/manufacturing/bom/BomMapProcs.xml" processor-name="prepareUpdateBOMAssoc" @@ -69,7 +69,7 @@ <call-service service-name="updateProductAssoc" in-map-name="context"/> <check-errors/> </if-compare> - <if-compare value="CREATE" field-name="UPDATE_MODE" map-name="parameters" operator="equals"> + <if-compare value="CREATE" field="parameters.UPDATE_MODE" operator="equals"> <set-service-fields service-name="createBOMAssoc" map-name="parameters" to-map-name="context"/> <call-map-processor xml-resource="org/ofbiz/manufacturing/bom/BomMapProcs.xml" processor-name="prepareUpdateBOMAssoc" @@ -78,14 +78,14 @@ <call-service service-name="createBOMAssoc" in-map-name="context"> <result-to-field field-name="errorMessage" result-name="errorMessage"/> </call-service> - <if-not-empty field-name="errorMessage"> + <if-not-empty field="errorMessage"> <add-error> <fail-message message="${errorMessage}"/> </add-error> </if-not-empty> <!--<check-errors/>--> </if-compare> - <if-compare value="DELETE" field-name="UPDATE_MODE" map-name="parameters" operator="equals"> + <if-compare value="DELETE" field="parameters.UPDATE_MODE" operator="equals"> <set-service-fields service-name="deleteProductAssoc" map-name="parameters" to-map-name="context"/> <call-map-processor xml-resource="org/ofbiz/manufacturing/bom/BomMapProcs.xml" processor-name="prepareDeleteProductAssoc" @@ -94,7 +94,7 @@ <call-service service-name="deleteProductAssoc" in-map-name="context"/> <check-errors/> </if-compare> - <if-compare value="COPY" field-name="UPDATE_MODE" map-name="parameters" operator="equals"> + <if-compare value="COPY" field="parameters.UPDATE_MODE" operator="equals"> <set-service-fields service-name="copyBOMAssocs" map-name="parameters" to-map-name="context"/> <call-service service-name="copyBOMAssocs" in-map-name="context"/> <check-errors/> @@ -121,14 +121,14 @@ <make-value value-name="lookupPKMap" entity-name="ProductManufacturingRule"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="ProductManufacturingRule" map-name="lookupPKMap" value-name="newEntity"/> - <if-not-empty field-name="ruleId" map-name="newEntity"> + <if-not-empty field="newEntity.ruleId"> <add-error> <fail-property resource="ManufacturingUiLabels" property="ManufacturingMachineGroupIdAlreadyExist"/> </add-error> <check-errors/> <else> <make-value value-name="newEntity" entity-name="ProductManufacturingRule"/> - <if-empty field-name="parameters.ruleId"> + <if-empty field="parameters.ruleId"> <sequenced-id-to-env sequence-name="ProductManufacturingRule" env-name="parameters.ruleId"/> </if-empty> <set-pk-fields map-name="parameters" value-name="newEntity"/> @@ -146,7 +146,7 @@ <make-value value-name="lookupPKMap" entity-name="ProductManufacturingRule"/> <set-pk-fields map-name="parameters" value-name="lookupPKMap"/> <find-by-primary-key entity-name="ProductManufacturingRule" map-name="lookupPKMap" value-name="lookedUpValue"/> - <if-not-empty field-name="lookedUpValue.ruleId"> + <if-not-empty field="lookedUpValue.ruleId"> <remove-value value-name="lookedUpValue"/> </if-not-empty> </simple-method> 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=667748&r1=667747&r2=667748&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 Fri Jun 13 23:03:12 2008 @@ -25,14 +25,14 @@ <simple-method method-name="issueProductionRunTask" short-description="Issues the Inventory for a Production Run Task" login-required="false"> <entity-one entity-name="WorkEffort" value-name="workEffort"/> - <if-empty field-name="parameters.failIfItemsAreNotAvailable"> + <if-empty field="parameters.failIfItemsAreNotAvailable"> <set field="parameters.failIfItemsAreNotAvailable" value="Y"/> </if-empty> - <if-empty field-name="parameters.failIfItemsAreNotOnHand"> + <if-empty field="parameters.failIfItemsAreNotOnHand"> <set field="parameters.failIfItemsAreNotOnHand" value="Y"/> </if-empty> - <if-not-empty field-name="workEffort"> - <if-compare value="PRUN_CANCELLED" operator="not-equals" field-name="currentStatusId" map-name="workEffort"> + <if-not-empty field="workEffort"> + <if-compare value="PRUN_CANCELLED" operator="not-equals" field="workEffort.currentStatusId"> <set from-field="parameters.workEffortId" field="lookupComponentsMap.workEffortId"/> <set value="WEGS_CREATED" field="lookupComponentsMap.statusId"/> <set field="lookupComponentsMap.workEffortGoodStdTypeId" value="PRUNT_PROD_NEEDED"/> @@ -41,7 +41,7 @@ <filter-list-by-date list-name="components"/> <!-- now go through each work effort good standard and call a service to issue the inventory --> <iterate list-name="components" entry-name="component"> - <if-not-empty field-name="component.productId"> + <if-not-empty field="component.productId"> <clear-field field-name="callSvcMap"/> <set-service-fields to-map-name="callSvcMap" service-name="issueProductionRunTaskComponent" map-name="component"/> <set from-field="reserveOrderEnumId" field="callSvcMap.reserveOrderEnumId"/> @@ -56,7 +56,7 @@ </if-not-empty> </simple-method> <simple-method method-name="issueProductionRunTaskComponent" short-description="Issues the Inventory for a Production Run Task Component" login-required="false"> - <if-empty field-name="parameters.fromDate"> + <if-empty field="parameters.fromDate"> <set from-field="parameters.productId" field="productId"/> <set from-field="parameters.quantity" field="estimatedQuantity" default-value="0.0" type="Double"/> <else> @@ -67,7 +67,7 @@ <field-map field-name="workEffortGoodStdTypeId" value="PRUNT_PROD_NEEDED"/> </entity-one> <set from-field="workEffortGoodStandard.productId" field="productId"/> - <if-empty field-name="parameters.quantity"> + <if-empty field="parameters.quantity"> <set from-field="workEffortGoodStandard.estimatedQuantity" field="estimatedQuantity"/> <else> <set from-field="parameters.quantity" field="estimatedQuantity" default-value="0.0" type="Double"/> @@ -77,20 +77,20 @@ </if-empty> <!-- kind of like the inventory reservation routine, find InventoryItems to issue from, but instead of doing the reservation just create an issuance and an inventory item detail for the change --> - <if-not-empty field-name="productId"> + <if-not-empty field="productId"> <now-timestamp-to-env env-name="nowTimestamp"/> <!-- NOTE: the inventory will be issued from the WorkEffort.facilityId --> <entity-one entity-name="WorkEffort" value-name="workEffort"/> <!-- before we do the find, put together the orderBy list based on which reserveOrderEnumId is specified --> - <if-compare value="INVRO_FIFO_EXP" operator="equals" field-name="reserveOrderEnumId" map-name="parameters"> + <if-compare value="INVRO_FIFO_EXP" operator="equals" field="parameters.reserveOrderEnumId"> <set value="+expireDate" field="orderByString"/> <else> - <if-compare value="INVRO_LIFO_EXP" operator="equals" field-name="reserveOrderEnumId" map-name="parameters"> + <if-compare value="INVRO_LIFO_EXP" operator="equals" field="parameters.reserveOrderEnumId"> <set value="-expireDate" field="orderByString"/> <else> - <if-compare value="INVRO_LIFO_REC" operator="equals" field-name="reserveOrderEnumId" map-name="parameters"> + <if-compare value="INVRO_LIFO_REC" operator="equals" field="parameters.reserveOrderEnumId"> <set value="+datetimeReceived" field="orderByString"/> <else> <!-- the default reserveOrderEnumId is INVRO_FIFO_REC, ie FIFO based on date received --> @@ -106,14 +106,14 @@ <set from-field="productId" field="lookupFieldMap.productId"/> <set from-field="workEffort.facilityId" field="lookupFieldMap.facilityId"/> <!-- if locationSeqId is passed, then only the inventory items in the location are considered --> - <if-not-empty field-name="parameters.locationSeqId"> + <if-not-empty field="parameters.locationSeqId"> <set from-field="parameters.locationSeqId" field="lookupFieldMap.locationSeqId"/> </if-not-empty> <find-by-and entity-name="InventoryItem" map-name="lookupFieldMap" list-name="primaryInventoryItemList" order-by-list-name="orderByList"/> <set from-field="primaryInventoryItemList" field="inventoryItemList"/> <!-- if secondaryLocationSeqId is also passed, then also the inventory items in the secondary location are considered, after the ones in the main location --> - <if-not-empty field-name="parameters.locationSeqId"> - <if-not-empty field-name="parameters.secondaryLocationSeqId"> + <if-not-empty field="parameters.locationSeqId"> + <if-not-empty field="parameters.secondaryLocationSeqId"> <set from-field="parameters.secondaryLocationSeqId" field="lookupFieldMap.locationSeqId"/> <find-by-and entity-name="InventoryItem" map-name="lookupFieldMap" list-name="secondaryInventoryItemList" order-by-list-name="orderByList"/> <list-to-list list-name="secondaryInventoryItemList" to-list-name="inventoryItemList"/> @@ -131,14 +131,14 @@ <if> <condition> <and> - <if-compare field-name="parameters.failIfItemsAreNotAvailable" operator="not-equals" value="Y" type="String"/> - <if-compare field-name="parameters.quantityNotIssued" operator="greater" value="0" type="Double"/> + <if-compare field="parameters.failIfItemsAreNotAvailable" operator="not-equals" value="Y" type="String"/> + <if-compare field="parameters.quantityNotIssued" operator="greater" value="0" type="Double"/> </and> </condition> <then> <set field="parameters.useReservedItems" value="Y"/> <iterate entry-name="inventoryItem" list-name="inventoryItemList"> - <if-compare field-name="parameters.quantityNotIssued" operator="greater" value="0" type="Double"> + <if-compare field="parameters.quantityNotIssued" operator="greater" value="0" type="Double"> <refresh-value value-name="inventoryItem"/> <!-- this is a little trick to get the InventoryItem value object without doing a query, possible since all fields on InventoryItem are also on InventoryItemAndLocation with the same names --> <call-simple-method method-name="issueProductionRunTaskComponentInline"/> @@ -148,12 +148,12 @@ </if> <!-- if quantityNotIssued is not 0, then pull it from the last non-serialized inventory item found, in the quantityNotIssued field --> - <if-compare field-name="parameters.quantityNotIssued" operator="not-equals" value="0" type="Double"> + <if-compare field="parameters.quantityNotIssued" operator="not-equals" value="0" type="Double"> <if> <condition> <or> - <if-compare field-name="parameters.failIfItemsAreNotAvailable" operator="equals" value="Y" type="String"/> - <if-compare field-name="parameters.failIfItemsAreNotOnHand" operator="equals" value="Y" type="String"/> + <if-compare field="parameters.failIfItemsAreNotAvailable" operator="equals" value="Y" type="String"/> + <if-compare field="parameters.failIfItemsAreNotOnHand" operator="equals" value="Y" type="String"/> </or> </condition> <then> @@ -162,7 +162,7 @@ </then> </if> <check-errors/> - <if-not-empty field-name="lastNonSerInventoryItem"> + <if-not-empty field="lastNonSerInventoryItem"> <!-- create ItemIssuance record --> <set from-field="parameters.workEffortId" field="issuanceCreateMap.workEffortId"/> <set from-field="lastNonSerInventoryItem.inventoryItemId" field="issuanceCreateMap.inventoryItemId"/> @@ -221,7 +221,7 @@ </if-not-empty> <calculate field-name="quantityNotIssued" map-name="parameters"><number value="0"/></calculate> </if-compare> - <if-not-empty field-name="workEffortGoodStandard"> + <if-not-empty field="workEffortGoodStandard"> <entity-and list-name="issuances" entity-name="WorkEffortAndInventoryAssign"> <field-map field-name="workEffortId" env-name="workEffortGoodStandard.workEffortId"/> <field-map field-name="productId" env-name="workEffortGoodStandard.productId"/> @@ -234,7 +234,7 @@ </calcop> </calculate> </iterate> - <if-compare-field field-name="workEffortGoodStandard.estimatedQuantity" operator="less-equals" to-field-name="totalIssuance" type="Double"> + <if-compare-field field="workEffortGoodStandard.estimatedQuantity" to-field="totalIssuance" operator="less-equals" type="Double"> <set value="WEGS_COMPLETED" field="workEffortGoodStandard.statusId"/> <store-value value-name="workEffortGoodStandard"/> </if-compare-field> @@ -243,9 +243,9 @@ </simple-method> <simple-method method-name="issueProductionRunTaskComponentInline" short-description="Does a issuance for one InventoryItem, meant to be called in-line"> <!-- only do something with this inventoryItem if there is more inventory to issue --> - <if-compare field-name="parameters.quantityNotIssued" operator="greater" value="0" type="Double"> - <if-compare value="SERIALIZED_INV_ITEM" operator="equals" field-name="inventoryItemTypeId" map-name="inventoryItem"> - <if-compare value="INV_AVAILABLE" operator="equals" field-name="statusId" map-name="inventoryItem"> + <if-compare field="parameters.quantityNotIssued" operator="greater" value="0" type="Double"> + <if-compare value="SERIALIZED_INV_ITEM" operator="equals" field="inventoryItem.inventoryItemTypeId"> + <if-compare value="INV_AVAILABLE" operator="equals" field="inventoryItem.statusId"> <!-- change status on inventoryItem --> <set value="INV_DELIVERED" field="inventoryItem.statusId"/> <store-value value-name="inventoryItem"/> @@ -265,22 +265,22 @@ <if> <condition> <and> - <if-empty field-name="inventoryItem.statusId"/> - <if-compare field-name="inventoryItem.inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"/> + <if-empty field="inventoryItem.statusId"/> + <if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"/> </and> </condition> <then> - <if-compare field-name="parameters.useReservedItems" operator="equals" value="Y"> + <if-compare field="parameters.useReservedItems" operator="equals" value="Y"> <set field="inventoryItemQuantity" from-field="inventoryItem.quantityOnHandTotal"/> <else> <set field="inventoryItemQuantity" from-field="inventoryItem.availableToPromiseTotal"/> </else> </if-compare> - <if-not-empty field-name="inventoryItemQuantity"> + <if-not-empty field="inventoryItemQuantity"> <!-- reduce atp on inventoryItem if availableToPromise greater than 0, if not the code at the end of this method will handle it --> - <if-compare field-name="inventoryItemQuantity" operator="greater" value="0" type="Double"> - <if-compare-field field-name="parameters.quantityNotIssued" operator="greater" to-field-name="inventoryItemQuantity" type="Double"> + <if-compare field="inventoryItemQuantity" operator="greater" value="0" type="Double"> + <if-compare-field field="parameters.quantityNotIssued" to-field="inventoryItemQuantity" operator="greater" type="Double"> <set from-field="inventoryItemQuantity" field="parameters.deductAmount"/> <else> <set from-field="parameters.quantityNotIssued" field="parameters.deductAmount"/> @@ -332,8 +332,8 @@ <simple-method method-name="issueInventoryItemToWorkEffort" short-description="Issue one InventoryItem to a WorkEffort"> <set field="inventoryItem" from-field="parameters.inventoryItem"/> <field-to-result field-name="inventoryItem.productId" result-name="finishedProductId"/> - <if-compare value="SERIALIZED_INV_ITEM" operator="equals" field-name="inventoryItem.inventoryItemTypeId"> - <if-compare value="INV_AVAILABLE" operator="equals" field-name="inventoryItem.statusId"> + <if-compare value="SERIALIZED_INV_ITEM" operator="equals" field="inventoryItem.inventoryItemTypeId"> + <if-compare value="INV_AVAILABLE" operator="equals" field="inventoryItem.statusId"> <!-- change status on inventoryItem --> <set field="inventoryItem.statusId" value="INV_DELIVERED"/> <call-service service-name="updateInventoryItem" in-map-name="updateContext"/> @@ -349,17 +349,17 @@ <if> <condition> <and> - <if-compare field-name="inventoryItem.inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"/> - <not><if-empty field-name="inventoryItem.availableToPromiseTotal"/></not> - <if-compare field-name="inventoryItem.availableToPromiseTotal" operator="greater" value="0" type="Double"/> + <if-compare field="inventoryItem.inventoryItemTypeId" operator="equals" value="NON_SERIAL_INV_ITEM"/> + <not><if-empty field="inventoryItem.availableToPromiseTotal"/></not> + <if-compare field="inventoryItem.availableToPromiseTotal" operator="greater" value="0" type="Double"/> </and> </condition> <then> <if> <condition> <or> - <if-empty field-name="parameters.quantity"/> - <if-compare-field field-name="parameters.quantity" operator="greater" to-field-name="inventoryItem.availableToPromiseTotal" type="Double"/> + <if-empty field="parameters.quantity"/> + <if-compare-field field="parameters.quantity" to-field="inventoryItem.availableToPromiseTotal" operator="greater" type="Double"/> </or> </condition> <then> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |