Author: ashish Date: Mon Mar 9 11:49:11 2015 New Revision: 1665197 URL: http://svn.apache.org/r1665197 Log: Reverting the recent commit, Mistakenly I committed the changes in 14.12 instead of committing it in trunk first.
Modified: ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy Modified: ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy?rev=1665197&r1=1665196&r2=1665197&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy (original) +++ ofbiz/branches/release14.12/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.groovy Mon Mar 9 11:49:11 2015 @@ -82,8 +82,6 @@ if (!paymentMethodTypeId || !paymentServ } if (paymentServiceTypeEnumId == "PRDS_PAY_EXTERNAL") { context.paymentCustomMethods = null; -} else if (customMethodsCond) { - context.paymentCustomMethods = from("CustomMethod").where(customMethodsCond).orderBy("description").queryList(); } else { - context.paymentCustomMethods = from("CustomMethod").orderBy("description").queryList(); + context.paymentCustomMethods = from("CustomMethod").where(customMethodsCond).orderBy("description").queryList(); }