svn commit: r678066 - in /ofbiz/trunk/applications/orde
Locked
 
|
Author: lektran
Date: Fri Jul 18 15:31:54 2008 New Revision: 678066 URL: http://svn.apache.org/viewvc?rev=678066&view=rev Log: A few more bsh -> groovy conversions Added: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy - copied, changed from r678039, ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/PaymentSetup.groovy - copied, changed from r678039, ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/paymentsetup.bsh ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/OrderTaskList.groovy - copied, changed from r678039, ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/ordertasklist.bsh Removed: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnList.bsh ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/paymentsetup.bsh ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/ordertasklist.bsh Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml Copied: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy (from r678039, ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh) URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy?p2=ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy&p1=ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh&r1=678039&r2=678066&rev=678066&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy Fri Jul 18 15:31:54 2008 @@ -24,70 +24,62 @@ import org.ofbiz.order.order.OrderReadHelper; import java.math.BigDecimal; -dispatcher = request.getAttribute("dispatcher"); -delegator = request.getAttribute("delegator"); -returnId = request.getParameter("returnId"); -if (returnId == null) { - returnId = request.getAttribute("returnId"); -} -if (returnId == null) return; -context.put("returnId", returnId); +returnId = parameters.returnId; +if (!returnId) return; +context.returnId = returnId; -orderId = request.getParameter("orderId"); -context.put("orderId", orderId); +orderId = parameters.orderId; +context.orderId = orderId; -returnHeader = delegator.findByPrimaryKey("ReturnHeader", UtilMisc.toMap("returnId", returnId)); -context.put("returnHeader", returnHeader); +returnHeader = delegator.findByPrimaryKey("ReturnHeader", [returnId : returnId]); +context.returnHeader = returnHeader; -returnItems = delegator.findByAnd("ReturnItem", UtilMisc.toMap("returnId", returnId)); -context.put("returnItems", returnItems); +returnItems = delegator.findByAnd("ReturnItem", [returnId : returnId]); +context.returnItems = returnItems; // these are just the adjustments not associated directly with a return item--the rest are gotten with a .getRelated on the returnItems in the .FTL -returnAdjustments = delegator.findByAnd("ReturnAdjustment", UtilMisc.toMap("returnId", returnId, "returnItemSeqId", "_NA_"), UtilMisc.toList("returnItemSeqId", "returnAdjustmentTypeId")); -context.put("returnAdjustments", returnAdjustments); +returnAdjustments = delegator.findByAnd("ReturnAdjustment", [returnId : returnId, returnItemSeqId : "_NA_"], ["returnItemSeqId", "returnAdjustmentTypeId"]); +context.returnAdjustments = returnAdjustments; + +returnTypes = delegator.findList("ReturnType", null, null, ["sequenceId"], null, false); +context.returnTypes = returnTypes; + +itemStatus = delegator.findByAnd("StatusItem", [statusTypeId : "INV_SERIALIZED_STTS"], ["statusId", "description"]); +context.itemStatus = itemStatus; + +returnReasons = delegator.findList("ReturnReason", null, null, ["sequenceId"], null, false); +context.returnReasons = returnReasons; -returnTypes = delegator.findList("ReturnType", null, null, UtilMisc.toList("sequenceId"), null, false); -context.put("returnTypes", returnTypes); +itemStts = delegator.findByAnd("StatusItem", [statusTypeId : "INV_SERIALIZED_STTS"], ["sequenceId"]); +context.itemStts = itemStts; -itemStatus = delegator.findByAnd("StatusItem", UtilMisc.toMap("statusTypeId", "INV_SERIALIZED_STTS"), - UtilMisc.toList("statusId", "description")); -context.put("itemStatus", itemStatus); - -returnReasons = delegator.findList("ReturnReason", null, null, UtilMisc.toList("sequenceId"), null, false); -context.put("returnReasons", returnReasons); - -itemStts = delegator.findByAnd("StatusItem", UtilMisc.toMap("statusTypeId", "INV_SERIALIZED_STTS"), UtilMisc.toList("sequenceId")); -context.put("itemStts", itemStts); - -returnItemTypeMap = delegator.findByAnd("ReturnItemTypeMap", UtilMisc.toMap("returnHeaderTypeId", "CUSTOMER_RETURN")); -iter = returnItemTypeMap.iterator(); -typeMap = new HashMap(); -while (iter.hasNext()) { - value = iter.next(); - typeMap.put(value.getString("returnItemMapKey"), value.getString("returnItemTypeId")); +returnItemTypeMap = delegator.findByAnd("ReturnItemTypeMap", [returnHeaderTypeId : "CUSTOMER_RETURN"]); +typeMap = [:]; +returnItemTypeMap.each { value -> + typeMap[value.returnItemMapKey] = value.returnItemTypeId; } -context.put("returnItemTypeMap", typeMap); +context.returnItemTypeMap = typeMap; -if (orderId != null) { - order = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", orderId)); - Map returnRes = dispatcher.runSync("getReturnableItems", UtilMisc.toMap("orderId", orderId)); - context.put("returnableItems", returnRes.get("returnableItems")); - - orh = new OrderReadHelper(order); - context.put("orh", orh); - context.put("orderHeaderAdjustments", orh.getAvailableOrderHeaderAdjustments()); +if (orderId) { + order = delegator.findByPrimaryKey("OrderHeader", [orderId : orderId]); + returnRes = dispatcher.runSync("getReturnableItems", [orderId : orderId]); + context.returnableItems = returnRes.returnableItems; + + orh = new OrderReadHelper(order); + context.orh = orh; + context.orderHeaderAdjustments = orh.getAvailableOrderHeaderAdjustments(); // get the order shipping amount - Map shipRes = dispatcher.runSync("getOrderShippingAmount", UtilMisc.toMap("orderId", orderId)); - BigDecimal shippingAmount = shipRes.get("shippingAmount"); - context.put("shippingAmount", shippingAmount); + shipRes = dispatcher.runSync("getOrderShippingAmount", [orderId : orderId]); + shippingAmount = shipRes.shippingAmount; + context.shippingAmount = shippingAmount; } -partyOrders = delegator.findByAnd("OrderHeaderAndRoles", UtilMisc.toMap("roleTypeId", "PLACING_CUSTOMER", "partyId", returnHeader.getString("fromPartyId")), UtilMisc.toList("orderId")); -context.put("partyOrders", partyOrders); +partyOrders = delegator.findByAnd("OrderHeaderAndRoles", [roleTypeId : "PLACING_CUSTOMER", partyId : returnHeader.fromPartyId], ["orderId"]); +context.partyOrders = partyOrders; // get the list of return shipments associated to the return -EntityFindOptions findOptions = new EntityFindOptions(); +findOptions = new EntityFindOptions(); findOptions.setDistinct(true); -List returnShipmentIds = delegator.findList("ReturnItemShipment", EntityCondition.makeCondition("returnId", returnId), UtilMisc.toSet("shipmentId"), null, findOptions, true); -context.put("returnShipmentIds", returnShipmentIds); +returnShipmentIds = delegator.findList("ReturnItemShipment", EntityCondition.makeCondition("returnId", returnId), ["shipmentId"] as Set, null, findOptions, true); +context.returnShipmentIds = returnShipmentIds; Copied: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/PaymentSetup.groovy (from r678039, ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/paymentsetup.bsh) URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/PaymentSetup.groovy?p2=ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/PaymentSetup.groovy&p1=ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/paymentsetup.bsh&r1=678039&r2=678066&rev=678066&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/paymentsetup.bsh (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/setup/PaymentSetup.groovy Fri Jul 18 15:31:54 2008 @@ -20,28 +20,26 @@ import org.ofbiz.entity.*; import org.ofbiz.base.util.*; -delegator = request.getAttribute("delegator"); +paymentSetup = delegator.findList("WebSitePaymentSettingView", null, null, ["webSiteId", "paymentMethodTypeId"], null, false); +context.paymentSetups = paymentSetup; -paymentSetup = delegator.findList("WebSitePaymentSettingView", null, null, UtilMisc.toList("webSiteId", "paymentMethodTypeId"), null, false); -context.put("paymentSetups", paymentSetup); - -webSiteId = request.getParameter("webSiteId"); -paymentMethodTypeId = request.getParameter("paymentMethodTypeId"); +webSiteId = parameters.webSiteId; +paymentMethodTypeId = parameters.paymentMethodTypeId; webSitePayment = null; -if (webSiteId != null && paymentMethodTypeId != null) { - webSitePayment = delegator.findByPrimaryKey("WebSitePaymentSettingView", UtilMisc.toMap("webSiteId", webSiteId, "paymentMethodTypeId", paymentMethodTypeId)); +if (webSiteId && paymentMethodTypeId) { + webSitePayment = delegator.findByPrimaryKey("WebSitePaymentSettingView", [webSiteId : webSiteId, paymentMethodTypeId : paymentMethodTypeId]); } -context.put("webSitePayment", webSitePayment); - -webSites = delegator.findList("WebSite", null, null, UtilMisc.toList("siteName"), null, false); -context.put("webSites", webSites); +context.webSitePayment = webSitePayment; + +webSites = delegator.findList("WebSite", null, null, ["siteName"], null, false); +context.webSites = webSites; -paymentMethodTypes = delegator.findList("PaymentMethodType", null, null, UtilMisc.toList("description"), null, false); -context.put("paymentMethodTypes", paymentMethodTypes); +paymentMethodTypes = delegator.findList("PaymentMethodType", null, null, ["description"], null, false); +context.paymentMethodTypes = paymentMethodTypes; payInfo = UtilHttp.getParameterMap(request); -if (webSitePayment != null) { +if (webSitePayment) { payInfo = webSitePayment; } -context.put("payInfo", payInfo); +context.payInfo = payInfo; Copied: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/OrderTaskList.groovy (from r678039, ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/ordertasklist.bsh) URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/OrderTaskList.groovy?p2=ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/OrderTaskList.groovy&p1=ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/ordertasklist.bsh&r1=678039&r2=678066&rev=678066&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/ordertasklist.bsh (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/task/OrderTaskList.groovy Fri Jul 18 15:31:54 2008 @@ -23,14 +23,12 @@ import org.ofbiz.base.util.*; import org.ofbiz.order.task.*; -delegator = request.getAttribute("delegator"); -userLogin = session.getAttribute("userLogin"); -context.put("userLogin", userLogin); +context.userLogin = userLogin; // create the sort order -sort = request.getParameter("sort"); -sortOrder = UtilMisc.toList("currentStatusId", "-priority", "orderDate"); -if (sort != null) { +sort = parameters.sort; +sortOrder = ["currentStatusId", "-priority", "orderDate"]; +if (sort) { if (sort.equals("name")) { sortOrder.add(0, "firstName"); sortOrder.add(0, "lastName"); @@ -41,73 +39,67 @@ } } -partyBase = UtilMisc.toList(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "CAL_ACCEPTED"), EntityCondition.makeCondition("wepaPartyId", EntityOperator.EQUALS, userLogin.getString("partyId"))); -partyRole = UtilMisc.toList(EntityCondition.makeCondition("orderRoleTypeId", EntityOperator.EQUALS, "PLACING_CUSTOMER"), EntityCondition.makeCondition("orderRoleTypeId", EntityOperator.EQUALS, "SUPPLIER_AGENT")); -partyExpr = UtilMisc.toList(EntityCondition.makeCondition(partyBase, EntityOperator.AND), EntityCondition.makeCondition(partyRole, EntityOperator.OR)); +partyBase = [EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, "CAL_ACCEPTED"), EntityCondition.makeCondition("wepaPartyId", EntityOperator.EQUALS, userLogin.partyId)]; +partyRole = [EntityCondition.makeCondition("orderRoleTypeId", EntityOperator.EQUALS, "PLACING_CUSTOMER"), EntityCondition.makeCondition("orderRoleTypeId", EntityOperator.EQUALS, "SUPPLIER_AGENT")]; +partyExpr = [EntityCondition.makeCondition(partyBase, EntityOperator.AND), EntityCondition.makeCondition(partyRole, EntityOperator.OR)]; partyCond = EntityCondition.makeCondition(partyExpr, EntityOperator.AND); partyTasks = delegator.findList("OrderTaskList", partyCond, null, sortOrder, null, false); -if (partyTasks != null) partyTasks = EntityUtil.filterByDate(partyTasks); -context.put("partyTasks", partyTasks); +if (partyTasks) partyTasks = EntityUtil.filterByDate(partyTasks); +context.partyTasks = partyTasks; // Build a map of orderId and currency -orderCurrencyMap = new HashMap(); -ptIter = partyTasks.iterator(); -while (ptIter.hasNext()) { - ptItem = ptIter.next(); - orderHeader = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", ptItem.get("orderId"))); - orderCurrencyMap.put( ptItem.get("orderId"), orderHeader.get("currencyUom") ); +orderCurrencyMap = [:]; +partyTasks.each { ptItem -> + orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : ptItem.orderId]); + orderCurrencyMap[ptItem.orderId] = orderHeader.currencyUom; } // get this user's roles -partyRoles = delegator.findByAnd("PartyRole", UtilMisc.toMap("partyId", userLogin.getString("partyId"))); - +partyRoles = delegator.findByAnd("PartyRole", [partyId = userLogin.partyId]); + // build the role list -pri = partyRoles.iterator(); -pRolesList = new ArrayList(); -while (pri.hasNext()) { - partyRole = (GenericValue) pri.next(); - if (!partyRole.getString("roleTypeId").equals("_NA_")) - pRolesList.add(EntityCondition.makeCondition("roleTypeId", EntityOperator.EQUALS, partyRole.getString("roleTypeId"))); +pRolesList = []; +partyRoles.each { partyRole -> + if (!partyRole.roleTypeId.equals("_NA_")) + pRolesList.add(EntityCondition.makeCondition("roleTypeId", EntityOperator.EQUALS, partyRole.roleTypeId)); } -custList = UtilMisc.toList(EntityCondition.makeCondition("orderRoleTypeId", EntityOperator.EQUALS, "PLACING_CUSTOMER"), EntityCondition.makeCondition("orderRoleTypeId", EntityOperator.EQUALS, "SUPPLIER_AGENT")); -baseList = UtilMisc.toList(EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "CAL_CANCELLED"), EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "CAL_COMPLETED"), EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "CAL_DELEGATED")); -expressions = new LinkedList(); -if (custList.size() > 0) expressions.add(EntityCondition.makeCondition(custList, EntityOperator.OR)); -if (pRolesList.size() > 0) expressions.add(EntityCondition.makeCondition(pRolesList, EntityOperator.OR)); -if (baseList.size() > 0) expressions.add(EntityCondition.makeCondition(baseList, EntityOperator.AND)); +custList = [EntityCondition.makeCondition("orderRoleTypeId", EntityOperator.EQUALS, "PLACING_CUSTOMER"), EntityCondition.makeCondition("orderRoleTypeId", EntityOperator.EQUALS, "SUPPLIER_AGENT")]; +baseList = [EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "CAL_CANCELLED"), EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "CAL_COMPLETED"), EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "CAL_DELEGATED")]; +expressions = []; +expressions.add(EntityCondition.makeCondition(custList, EntityOperator.OR)); +if (pRolesList) expressions.add(EntityCondition.makeCondition(pRolesList, EntityOperator.OR)); +expressions.add(EntityCondition.makeCondition(baseList, EntityOperator.AND)); conditions = EntityCondition.makeCondition(expressions, EntityOperator.AND); // invoke the query roleTasks = delegator.findList("OrderTaskList", conditions, null, sortOrder, null, false); -if (roleTasks != null) roleTasks = EntityUtil.filterByAnd(roleTasks, baseList); -if (roleTasks != null) roleTasks = EntityUtil.filterByDate(roleTasks); -context.put("roleTasks", roleTasks); +roleTasks = EntityUtil.filterByAnd(roleTasks, baseList); +roleTasks = EntityUtil.filterByDate(roleTasks); +context.roleTasks = roleTasks; // Add to the map of orderId and currency -rtIter = roleTasks.iterator(); -while (rtIter.hasNext()) { - rtItem = rtIter.next(); - orderHeader = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", rtItem.get("orderId"))); - orderCurrencyMap.put( rtItem.get("orderId"), orderHeader.get("currencyUom") ); +roleTasks.each { rtItem -> + orderHeader = delegator.findByPrimaryKey("OrderHeader", [orderId : rtItem.orderId]); + orderCurrencyMap[rtItem.orderId] = orderHeader.currencyUom; } -context.put("orderCurrencyMap", orderCurrencyMap); +context.orderCurrencyMap = orderCurrencyMap; -context.put("now", UtilDateTime.nowTimestamp()); +context.now = nowTimestamp; // purchase order schedule -poList = delegator.findByAnd("OrderHeaderAndRoles", UtilMisc.toMap("partyId", userLogin.get("partyId"), "orderTypeId", "PURCHASE_ORDER")); +poList = delegator.findByAnd("OrderHeaderAndRoles", [partyId : userLogin.partyId, orderTypeId : "PURCHASE_ORDER"]); poIter = poList.iterator(); listedPoIds = new HashSet(); while (poIter.hasNext()) { poGv = poIter.next(); - poOrderId = poGv.get("orderId"); + poOrderId = poGv.orderId; if (listedPoIds.contains(poOrderId)) { poIter.remove(); } else { listedPoIds.add(poOrderId); } } -context.put("poList", poList); +context.poList = poList; Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml?rev=678066&r1=678065&r2=678066&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderPrintScreens.xml Fri Jul 18 15:31:54 2008 @@ -94,7 +94,7 @@ <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh"/> + <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy"/> </actions> <widgets> <decorator-screen name="FoReportDecorator" location="component://common/widget/CommonScreens.xml"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml?rev=678066&r1=678065&r2=678066&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml Fri Jul 18 15:31:54 2008 @@ -132,7 +132,7 @@ <actions> <set field="titleProperty" value="PageTitleReturnList"/> <set field="headerItem" value="return"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/returnList.bsh"/> + <entity-condition list-name="returnList" entity-name="ReturnHeader"/> </actions> <widgets> <decorator-screen name="CommonOrderReturnDecorator"> @@ -166,7 +166,7 @@ <set field="titleProperty" value="PageTitleReturnItems"/> <set field="headerItem" value="return"/> <set field="tabButtonItem" value="OrderReturnItems"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/returnItems.bsh"/> + <script location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnItems.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderReturnDecorator"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml?rev=678066&r1=678065&r2=678066&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderSetupScreens.xml Fri Jul 18 15:31:54 2008 @@ -38,7 +38,7 @@ <actions> <set field="title" value="Payment Settings"/> <set field="headerItem" value="setup"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/setup/paymentsetup.bsh"/> + <script location="component://order/webapp/ordermgr/WEB-INF/actions/setup/PaymentSetup.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderTaskDecorator"> Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml?rev=678066&r1=678065&r2=678066&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/OrderTaskScreens.xml Fri Jul 18 15:31:54 2008 @@ -86,7 +86,7 @@ <actions> <set field="titleProperty" value="OrderOrderTaskList"/> <set field="headerItem" value="tasklist"/> - <script location="component://order/webapp/ordermgr/WEB-INF/actions/task/ordertasklist.bsh"/> + <script location="component://order/webapp/ordermgr/WEB-INF/actions/task/OrderTaskList.groovy"/> </actions> <widgets> <decorator-screen name="CommonOrderTaskDecorator"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |