Author: jleroux Date: Sat Feb 21 12:01:37 2015 New Revision: 1661329 URL: http://svn.apache.org/r1661329 Log: "Applied fix from trunk for revision: 1661328" ------------------------------------------------------------------------ r1661328 | jleroux | 2015-02-21 13:01:06 +0100 (sam., 21 févr. 2015) | 3 lines
A patch from Arun Patidar for "Error on Sending confirm email from newly created order" https://issues.apache.org/jira/browse/OFBIZ-6075 It was just a typing error while replacing entity engine with entityQuery method ------------------------------------------------------------------------ Modified: ofbiz/branches/release14.12/ (props changed) ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/SendConfirmationEmail.groovy Propchange: ofbiz/branches/release14.12/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Feb 21 12:01:37 2015 @@ -8,4 +8,4 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031,1660053,1660389,1660444,1660579,1661303 +/ofbiz/trunk:1649393,1649742,1650240,1650583,1650642,1650678,1650882,1650887,1650938,1651593,1652361,1652706,1652725,1652731,1652739,1653248,1653456,1654175,1654273,1654509,1655046,1655668,1655979,1656185,1656198,1656445,1656983,1657323,1657506-1657507,1657514,1657714,1657790,1657848,1658364,1658662,1658882,1659224,1660031,1660053,1660389,1660444,1660579,1661303,1661328 Modified: ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/SendConfirmationEmail.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/SendConfirmationEmail.groovy?rev=1661329&r1=1661328&r2=1661329&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/SendConfirmationEmail.groovy (original) +++ ofbiz/branches/release14.12/applications/order/webapp/ordermgr/WEB-INF/actions/order/SendConfirmationEmail.groovy Sat Feb 21 12:01:37 2015 @@ -37,7 +37,7 @@ context.donePage = donePage; // Provide the correct order confirmation ProductStoreEmailSetting, if one exists orderHeader = from("OrderHeader").where("orderId", orderId).queryOne(); if (orderHeader.productStoreId) { - productStoreEmailSetting = from("ProductStoreEmailSetting").where("productStoreId", orderHeader.productStoreId, "emailType", emailType)context.queryOne(); + productStoreEmailSetting = from("ProductStoreEmailSetting").where("productStoreId", orderHeader.productStoreId, "emailType", emailType).queryOne(); if (productStoreEmailSetting) { context.productStoreEmailSetting = productStoreEmailSetting; }
