svn commit: r805012 [5/11] - in /ofbiz/branches/executionconte
Locked
svn commit: r805012 [5/11] - in /ofbiz/branches/executionconte
 
|
Modified: ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original) +++ ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Mon Aug 17 15:42:56 2009 @@ -183,10 +183,10 @@ } if (product == null) { - Map messageMap = UtilMisc.toMap("productId", productId ); + Map messageMap = UtilMisc.toMap("productId", productId); String excMsg = UtilProperties.getMessage(resource_error, "item.product_not_found", - messageMap , cart.getLocale() ); + messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new ItemNotFoundException(excMsg); @@ -199,7 +199,7 @@ "productId", product.getString("productId")); String excMsg = UtilProperties.getMessage(resource_error, "item.cannot_add_product_virtual", - messageMap , cart.getLocale() ); + messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new CartItemModifyException(excMsg); @@ -214,7 +214,7 @@ "productId", product.getString("productId")); String excMsg = UtilProperties.getMessage(resource_error, "item.cannot_add_product_not_configured_correctly", - messageMap , cart.getLocale() ); + messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new CartItemModifyException(excMsg); @@ -333,8 +333,8 @@ } if (product == null) { - Map messageMap = UtilMisc.toMap("productId", productId ); - String excMsg = UtilProperties.getMessage(resource_error, "item.product_not_found", messageMap , cart.getLocale() ); + Map messageMap = UtilMisc.toMap("productId", productId); + String excMsg = UtilProperties.getMessage(resource_error, "item.product_not_found", messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new ItemNotFoundException(excMsg); @@ -425,7 +425,7 @@ "productId", product.getString("productId")); String excMsg = UtilProperties.getMessage(resource_error, "item.cannot_add_product_virtual", - messageMap , cart.getLocale() ); + messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new CartItemModifyException(excMsg); @@ -440,7 +440,7 @@ "productId", product.getString("productId")); String excMsg = UtilProperties.getMessage(resource_error, "item.cannot_add_product_not_yet_available", - messageMap , cart.getLocale() ); + messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new CartItemModifyException(excMsg); @@ -452,7 +452,7 @@ "productId", product.getString("productId")); String excMsg = UtilProperties.getMessage(resource_error, "item.cannot_add_product_no_longer_available", - messageMap , cart.getLocale() ); + messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new CartItemModifyException(excMsg); @@ -467,7 +467,7 @@ "productId", product.getString("productId")); String excMsg = UtilProperties.getMessage(resource_error, "item.cannot_add_product_no_longer_available", - messageMap , cart.getLocale() ); + messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new CartItemModifyException(excMsg); @@ -481,7 +481,7 @@ Map messageMap = UtilMisc.toMap("productName", product.getString("productName"), "productId", product.getString("productId")); String excMsg = UtilProperties.getMessage(resource_error, "item.cannot_add_product_not_configured_correctly", - messageMap , cart.getLocale() ); + messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new CartItemModifyException(excMsg); } @@ -492,20 +492,20 @@ if ("ASSET_USAGE".equals(product.getString("productTypeId"))) { if (reservStart == null) { String excMsg = UtilProperties.getMessage(resource_error, "item.missing_reservation_starting_date", - cart.getLocale() ); + cart.getLocale()); throw new CartItemModifyException(excMsg); } if (reservStart.before(UtilDateTime.nowTimestamp())) { String excMsg = UtilProperties.getMessage(resource_error, "item.reservation_from_tomorrow", - cart.getLocale() ); + cart.getLocale()); throw new CartItemModifyException(excMsg); } newItem.setReservStart(reservStart); if (reservLength.compareTo(BigDecimal.ONE) < 0) { String excMsg = UtilProperties.getMessage(resource_error, "item.number_of_days", - cart.getLocale() ); + cart.getLocale()); throw new CartItemModifyException(excMsg); } newItem.setReservLength(reservLength); @@ -516,7 +516,7 @@ Map messageMap = UtilMisc.toMap("reservMaxPersons", product.getString("reservMaxPersons"), "reservPersons", reservPersons); String excMsg = UtilProperties.getMessage(resource_error, "item.maximum_number_of_person_renting", - messageMap, cart.getLocale() ); + messageMap, cart.getLocale()); Debug.logInfo(excMsg,module); throw new CartItemModifyException(excMsg); @@ -540,7 +540,7 @@ Map messageMap = UtilMisc.toMap("productId", product.getString("productId"), "availableMessage", isAvailable); String excMsg = UtilProperties.getMessage(resource_error, "item.product_not_available", - messageMap, cart.getLocale() ); + messageMap, cart.getLocale()); Debug.logInfo(excMsg, module); throw new CartItemModifyException(isAvailable); } @@ -921,7 +921,7 @@ } catch (GenericEntityException e) { Debug.logWarning(e, module); } - if (techDataCalendarExcDay == null ) { + if (techDataCalendarExcDay == null) { //Debug.logInfo(" No exception day record found, available: " + fixedAsset.getString("productionCapacity") + " Requested now: " + quantity, module); if (fixedAsset.get("productionCapacity") != null && fixedAsset.getBigDecimal("productionCapacity").compareTo(quantity) < 0) resultMessage = resultMessage.concat(exceptionDateStartTime.toString().substring(0, 10) + ", "); @@ -983,7 +983,7 @@ if (this.isPromo) { Map messageMap = UtilMisc.toMap("productName", this.getName(), "productId", productId); - String excMsg = UtilProperties.getMessage(resource, "OrderCannotChangeQuantityInPromotion", messageMap , cart.getLocale() ); + String excMsg = UtilProperties.getMessage(resource, "OrderCannotChangeQuantityInPromotion", messageMap , cart.getLocale()); throw new CartItemModifyException(excMsg); } @@ -997,7 +997,7 @@ Map messageMap = UtilMisc.toMap("requestedQuantity", UtilFormatOut.formatQuantity(quantity.doubleValue()), "productName", this.getName(), "productId", productId); - String excMsg = UtilProperties.getMessage(resource, "OrderDoNotHaveEnoughProducts", messageMap , cart.getLocale() ); + String excMsg = UtilProperties.getMessage(resource, "OrderDoNotHaveEnoughProducts", messageMap , cart.getLocale()); Debug.logWarning(excMsg, module); throw new CartItemModifyException(excMsg); } @@ -1846,7 +1846,7 @@ BigDecimal[] sizeInfo = { height, width, depth }; Arrays.sort(sizeInfo); - return ( sizeInfo[0].add(sizeInfo[0]) ).add( sizeInfo[1].add(sizeInfo[1]) ).add(sizeInfo[2]); + return (sizeInfo[0].add(sizeInfo[0])).add(sizeInfo[1].add(sizeInfo[1])).add(sizeInfo[2]); } else { // non-product items have 0 size return BigDecimal.ZERO; @@ -1970,7 +1970,7 @@ BigDecimal persons = this.getReservPersons(); BigDecimal rentalValue = BigDecimal.ZERO; if (persons.compareTo(BigDecimal.ONE) > 0) { - if (persons.compareTo(new BigDecimal("2")) > 0 ) { + if (persons.compareTo(new BigDecimal("2")) > 0) { persons = persons.subtract(new BigDecimal("2")); if (getReservNthPPPerc().compareTo(BigDecimal.ZERO) > 0) { rentalValue = persons.multiply(getReservNthPPPerc()); @@ -1984,7 +1984,7 @@ } } rentalValue = rentalValue.add(new BigDecimal("100")); // add final 100 percent for first person - // Debug.log("rental parameters....Nbr of persons:" + getReservPersons() + " extra% 2nd person:" + getReserv2ndPPPerc()+ " extra% Nth person:" + getReservNthPPPerc() + " total rental adjustment:" + rentalValue/100 * getReservLength() ); + // Debug.log("rental parameters....Nbr of persons:" + getReservPersons() + " extra% 2nd person:" + getReserv2ndPPPerc()+ " extra% Nth person:" + getReservNthPPPerc() + " total rental adjustment:" + rentalValue/100 * getReservLength()); return rentalValue.movePointLeft(2).multiply(getReservLength()); // return total rental adjustment } @@ -2326,8 +2326,8 @@ } if ((this.attributes != null && attributes != null) && - ( (this.attributes.size() != attributes.size()) || - !(this.attributes.equals(attributes)) )) { + ((this.attributes.size() != attributes.size()) || + !(this.attributes.equals(attributes)))) { return false; } Modified: ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java (original) +++ ofbiz/branches/executioncontext20090812/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java Mon Aug 17 15:42:56 2009 @@ -293,7 +293,7 @@ serviceName = null; } } - if (( serviceName != null)) { + if ((serviceName != null)) { String configProps = storeShipMeth.getString("configProps"); if (UtilValidate.isNotEmpty(serviceName)) { // prepare the external service context @@ -335,7 +335,7 @@ EntityCondition.makeCondition("contactMechPurposeTypeId", EntityOperator.IN, UtilMisc.toList("SHIP_ORIG_LOCATION", "GENERAL_LOCATION")), EntityUtil.getFilterByDateExpr("contactFromDate", "contactThruDate"), EntityUtil.getFilterByDateExpr("purposeFromDate", "purposeThruDate") - ); + ); EntityConditionList<EntityCondition> ecl = EntityCondition.makeCondition(conditions, EntityOperator.AND); List<GenericValue> addresses = delegator.findList("PartyContactWithPurpose", ecl, null, UtilMisc.toList("contactMechPurposeTypeId DESC"), null, false); Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/WEB-INF/controller.xml Mon Aug 17 15:42:56 2009 @@ -21,6 +21,7 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> <include location="component://common/webcommon/WEB-INF/common-controller.xml"/> + <include location="component://commonext/webapp/WEB-INF/controller.xml"/> <description>Order Manager Module Site Configuration File</description> <owner>Copyright 2001-2009 The Apache Software Foundation</owner> Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/OrderEntryCheckOutTabBar.ftl Mon Aug 17 15:42:56 2009 @@ -46,5 +46,5 @@ </#if> </#list> </ul> - <br class="clear" /> + <br class="clear" /> </div> Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Mon Aug 17 15:42:56 2009 @@ -236,25 +236,25 @@ } <#if product.virtualVariantMethodEnum?if_exists == "VV_FEATURETREE" && featureLists?has_content> - function checkRadioButton() { - var block1 = document.getElementById("addCart1"); - var block2 = document.getElementById("addCart2"); - <#list featureLists as featureList> - <#list featureList as feature> - <#if feature_index == 0> - var myList = document.getElementById("FT${feature.productFeatureTypeId}"); - if (myList.options[0].selected == true){ - block1.style.display = "none"; - block2.style.display = "block"; - return; - } - <#break> - </#if> - </#list> - </#list> - block1.style.display = "block"; - block2.style.display = "none"; - } + function checkRadioButton() { + var block1 = document.getElementById("addCart1"); + var block2 = document.getElementById("addCart2"); + <#list featureLists as featureList> + <#list featureList as feature> + <#if feature_index == 0> + var myList = document.getElementById("FT${feature.productFeatureTypeId}"); + if (myList.options[0].selected == true){ + block1.style.display = "none"; + block2.style.display = "block"; + return; + } + <#break> + </#if> + </#list> + </#list> + block1.style.display = "block"; + block2.style.display = "none"; + } </#if> //--> </script> Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/entry/setAdditionalParty.ftl Mon Aug 17 15:42:56 2009 @@ -36,7 +36,7 @@ <tr> <td align="right"> <input type="radio" name="additionalPartyType" value="Person" onclick="<#if additionalPartyType?exists>javascript:document.quickAddPartyForm.additionalPartyId.value='';</#if>document.quickAddPartyForm.submit()"<#if (additionalPartyType?exists && additionalPartyType == "Person")> checked="checked"</#if>> - </td> + </td> <td> <div>${uiLabelMap.CommonPerson}</div> </td> Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/appendorderitem.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/appendorderitem.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/appendorderitem.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/appendorderitem.ftl Mon Aug 17 15:42:56 2009 @@ -79,13 +79,13 @@ <tr> <td class="label">${uiLabelMap.OrderShipGroup}</td> <td><select name="shipGroupSeqId"> - <#list shipGroups as shipGroup> - <option value="${shipGroup.shipGroupSeqId}">${shipGroup.shipGroupSeqId}</option> - </#list> - </select> - </td> + <#list shipGroups as shipGroup> + <option value="${shipGroup.shipGroupSeqId}">${shipGroup.shipGroupSeqId}</option> + </#list> + </select> + </td> </tr> - </#if> + </#if> <tr> <td class="label">${uiLabelMap.OrderDesiredDeliveryDate}</td> <td> Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/editorderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/editorderitems.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/order/editorderitems.ftl Mon Aug 17 15:42:56 2009 @@ -195,12 +195,12 @@ <#-- now update/cancel reason and comment field --> <#if orderItem.statusId != "ITEM_CANCELLED" && orderItem.statusId != "ITEM_COMPLETED" && ("Y" != orderItem.isPromo?if_exists)> <tr><td colspan="8"><span class="label">${uiLabelMap.OrderReturnReason}</span> - <select name="irm_${orderItem.orderItemSeqId}"> - <option value=""> </option> - <#list orderItemChangeReasons as reason> - <option value="${reason.enumId}">${reason.get("description",locale)?default(reason.enumId)}</option> - </#list> - </select> + <select name="irm_${orderItem.orderItemSeqId}"> + <option value=""> </option> + <#list orderItemChangeReasons as reason> + <option value="${reason.enumId}">${reason.get("description",locale)?default(reason.enumId)}</option> + </#list> + </select> <span class="label">${uiLabelMap.CommonComments}</span> <input type="text" name="icm_${orderItem.orderItemSeqId}" value="" size="30" maxlength="60"/> <#if (orderHeader.orderTypeId == 'PURCHASE_ORDER')> Modified: ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/reports/reportlist.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/reports/reportlist.ftl?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/reports/reportlist.ftl (original) +++ ofbiz/branches/executioncontext20090812/applications/order/webapp/ordermgr/reports/reportlist.ftl Mon Aug 17 15:42:56 2009 @@ -47,13 +47,13 @@ <td><div>Report:</div></td> <td> <SELECT NAME="groupName" tabindex="14" CLASS="stateSelectBox"> - <OPTION VALUE="orderStatus"></OPTION> - <OPTION VALUE="orderStatus">Orders by Order Status</OPTION> - <OPTION VALUE="ship">Orders by Ship Method</OPTION> - <OPTION VALUE="payment">Orders by Payment Method</OPTION> - <OPTION VALUE="adjustment">Order Items by Adjustment</OPTION> - <OPTION VALUE="itemStatus">Order Items by Status</OPTION> - <OPTION VALUE="product">Order Items by Product</OPTION> + <OPTION VALUE="orderStatus"></OPTION> + <OPTION VALUE="orderStatus">Orders by Order Status</OPTION> + <OPTION VALUE="ship">Orders by Ship Method</OPTION> + <OPTION VALUE="payment">Orders by Payment Method</OPTION> + <OPTION VALUE="adjustment">Order Items by Adjustment</OPTION> + <OPTION VALUE="itemStatus">Order Items by Status</OPTION> + <OPTION VALUE="product">Order Items by Product</OPTION> </SELECT> </td> </tr> @@ -85,13 +85,13 @@ <td><div>Report:</div></td> <td> <SELECT NAME="groupName" tabindex="14" CLASS="stateSelectBox"> - <OPTION VALUE="orderStatus"></OPTION> - <OPTION VALUE="orderStatus">Orders by Order Status</OPTION> - <OPTION VALUE="ship">Orders by Ship Method</OPTION> - <OPTION VALUE="payment">Orders by Payment Method</OPTION> - <OPTION VALUE="adjustment">Order Items by Adjustment</OPTION> - <OPTION VALUE="itemStatus">Order Items by Status</OPTION> - <OPTION VALUE="product">Order Items by Product</OPTION> + <OPTION VALUE="orderStatus"></OPTION> + <OPTION VALUE="orderStatus">Orders by Order Status</OPTION> + <OPTION VALUE="ship">Orders by Ship Method</OPTION> + <OPTION VALUE="payment">Orders by Payment Method</OPTION> + <OPTION VALUE="adjustment">Order Items by Adjustment</OPTION> + <OPTION VALUE="itemStatus">Order Items by Status</OPTION> + <OPTION VALUE="product">Order Items by Product</OPTION> </SELECT> </td> </tr> Modified: ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/communication/CommunicationEventServices.java Mon Aug 17 15:42:56 2009 @@ -128,10 +128,10 @@ boolean isMultiPart = false; List <GenericValue> comEventContents = communicationEvent.getRelated("CommEventContentAssoc"); if (UtilValidate.isNotEmpty(comEventContents)) { - isMultiPart = true; + isMultiPart = true; List<Map<String, ? extends Object>> bodyParts = FastList.newInstance(); if (UtilValidate.isNotEmpty(communicationEvent.getString("content"))) { - bodyParts.add(UtilMisc.<String, Object>toMap("content", communicationEvent.getString("content"), "type", communicationEvent.getString("contentMimeTypeId"))); + bodyParts.add(UtilMisc.<String, Object>toMap("content", communicationEvent.getString("content"), "type", communicationEvent.getString("contentMimeTypeId"))); } for (GenericValue comEventContent : comEventContents) { GenericValue content = comEventContent.getRelatedOne("FromContent"); @@ -139,7 +139,7 @@ ByteBuffer dataContent = DataResourceWorker.getContentAsByteBuffer(delegator, dataResource.getString("dataResourceId"), null, null, locale, null); bodyParts.add(UtilMisc.<String, Object>toMap("content", dataContent.array(), "type", dataResource.getString("mimeTypeId"), "filename", dataResource.getString("dataResourceName"))); } - sendMailParams.put("bodyParts", bodyParts); + sendMailParams.put("bodyParts", bodyParts); } else { sendMailParams.put("body", communicationEvent.getString("content")); } @@ -165,29 +165,29 @@ String sendBcc = null; List <GenericValue> commRoles = communicationEvent.getRelated("CommunicationEventRole"); if (UtilValidate.isNotEmpty(commRoles)) { - for (GenericValue commRole : commRoles) { // 'from' and 'to' already defined on communication event - if (commRole.getString("partyId").equals(communicationEvent.getString("partyIdFrom")) || commRole.getString("partyId").equals(communicationEvent.getString("partyIdTo"))) { - continue; - } - GenericValue contactMech = commRole.getRelatedOne("ContactMech"); - if (UtilValidate.isNotEmpty(contactMech) && UtilValidate.isNotEmpty(contactMech.getString("infoString"))) { - if ("ADDRESSEE".equals(commRole.getString("roleTypeId"))) { - sendTo += "," + contactMech.getString("infoString"); - } else if ("CC".equals(commRole.getString("roleTypeId"))) { - if (sendCc != null) { - sendCc += "," + contactMech.getString("infoString"); - } else { - sendCc = contactMech.getString("infoString"); - } - } else if ("BCC".equals(commRole.getString("roleTypeId"))) { - if (sendBcc != null) { - sendBcc += "," + contactMech.getString("infoString"); - } else { - sendBcc = contactMech.getString("infoString"); - } - } - } - } + for (GenericValue commRole : commRoles) { // 'from' and 'to' already defined on communication event + if (commRole.getString("partyId").equals(communicationEvent.getString("partyIdFrom")) || commRole.getString("partyId").equals(communicationEvent.getString("partyIdTo"))) { + continue; + } + GenericValue contactMech = commRole.getRelatedOne("ContactMech"); + if (UtilValidate.isNotEmpty(contactMech) && UtilValidate.isNotEmpty(contactMech.getString("infoString"))) { + if ("ADDRESSEE".equals(commRole.getString("roleTypeId"))) { + sendTo += "," + contactMech.getString("infoString"); + } else if ("CC".equals(commRole.getString("roleTypeId"))) { + if (sendCc != null) { + sendCc += "," + contactMech.getString("infoString"); + } else { + sendCc = contactMech.getString("infoString"); + } + } else if ("BCC".equals(commRole.getString("roleTypeId"))) { + if (sendBcc != null) { + sendBcc += "," + contactMech.getString("infoString"); + } else { + sendBcc = contactMech.getString("infoString"); + } + } + } + } } sendMailParams.put("communicationEventId", communicationEventId); @@ -247,7 +247,7 @@ sendEmailToContactListContext.put("userLogin", userLogin); try { dispatcher.runAsync("sendEmailToContactList", sendEmailToContactListContext); - } catch ( GenericServiceException e ) { + } catch (GenericServiceException e) { String errMsg = UtilProperties.getMessage(resource, "commeventservices.errorCallingSendEmailToContactListService", locale); Debug.logError(e, errMsg, module); errorMessages.add(errMsg); @@ -770,17 +770,17 @@ // select the plain text bodypart String messageBody = null; if (wrapper.getMainPartCount() > 1) { - for (int ind=0; ind < wrapper.getMainPartCount(); ind++) { - BodyPart p = wrapper.getPart(ind + ""); - if (p.getContentType().toLowerCase().indexOf("text/plain") > -1) { - messageBody = (String) p.getContent(); - break; - } - } + for (int ind=0; ind < wrapper.getMainPartCount(); ind++) { + BodyPart p = wrapper.getPart(ind + ""); + if (p.getContentType().toLowerCase().indexOf("text/plain") > -1) { + messageBody = (String) p.getContent(); + break; + } + } } - if (messageBody == null ) { - messageBody = wrapper.getMessageBody(); + if (messageBody == null) { + messageBody = wrapper.getMessageBody(); } commEventMap.put("content", messageBody); Modified: ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/contact/ContactMechServices.java Mon Aug 17 15:42:56 2009 @@ -972,7 +972,7 @@ GenericDelegator delegator = ctx.getDelegator(); GenericValue userLogin = (GenericValue) context.get("userLogin"); String partyId = (String)context.get("partyId"); - if (UtilValidate.isEmpty(partyId) ) { + if (UtilValidate.isEmpty(partyId)) { if (userLogin != null) { partyId = userLogin.getString("partyId"); } else { @@ -983,7 +983,7 @@ boolean showOld = (bShowOld != null && bShowOld.booleanValue()) ? true : false; String contactMechTypeId = (String)context.get("contactMechTypeId"); List<Map<String, Object>> valueMaps = ContactMechWorker.getPartyContactMechValueMaps(delegator, partyId, showOld, contactMechTypeId); - result.put("valueMaps", valueMaps ); + result.put("valueMaps", valueMaps); return result; } Modified: ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/party/PartyServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/party/PartyServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/party/PartyServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/party/PartyServices.java Mon Aug 17 15:42:56 2009 @@ -212,38 +212,38 @@ GenericValue party = delegator.findByPrimaryKey("Party", UtilMisc.toMap("partyId", partyId)); if (party.get("statusId") == null) { // old records - party.set("statusId", "PARTY_ENABLED"); + party.set("statusId", "PARTY_ENABLED"); } - String oldStatusId = party.getString("statusId"); + String oldStatusId = party.getString("statusId"); if (!party.getString("statusId").equals(statusId)) { - // check that status is defined as a valid change - GenericValue statusValidChange = delegator.findByPrimaryKey("StatusValidChange", UtilMisc.toMap("statusId", party.getString("statusId"), "statusIdTo", statusId)); - if (statusValidChange == null) { - String errorMsg = "Cannot change party status from " + party.getString("statusId") + " to " + statusId; - Debug.logWarning(errorMsg, module); - return ServiceUtil.returnError(errorMsg); - } - - party.set("statusId", statusId); - party.store(); - - // record this status change in PartyStatus table - GenericValue partyStatus = delegator.makeValue("PartyStatus", UtilMisc.toMap("partyId", partyId, "statusId", statusId, "statusDate", statusDate)); - partyStatus.create(); - - // disable all userlogins for this user when the new status is disabled - if (("PARTY_DISABLED").equals(statusId)) { - List <GenericValue> userLogins = delegator.findByAnd("UserLogin", UtilMisc.toMap("partyId", partyId)); - for(GenericValue userLogin : userLogins) { - if (!"N".equals(userLogin.getString("enabled"))) { - userLogin.set("enabled", "N"); - userLogin.set("disabledDateTime", UtilDateTime.nowTimestamp()); - userLogin.store(); - } - } - } + // check that status is defined as a valid change + GenericValue statusValidChange = delegator.findByPrimaryKey("StatusValidChange", UtilMisc.toMap("statusId", party.getString("statusId"), "statusIdTo", statusId)); + if (statusValidChange == null) { + String errorMsg = "Cannot change party status from " + party.getString("statusId") + " to " + statusId; + Debug.logWarning(errorMsg, module); + return ServiceUtil.returnError(errorMsg); + } + + party.set("statusId", statusId); + party.store(); + + // record this status change in PartyStatus table + GenericValue partyStatus = delegator.makeValue("PartyStatus", UtilMisc.toMap("partyId", partyId, "statusId", statusId, "statusDate", statusDate)); + partyStatus.create(); + + // disable all userlogins for this user when the new status is disabled + if (("PARTY_DISABLED").equals(statusId)) { + List <GenericValue> userLogins = delegator.findByAnd("UserLogin", UtilMisc.toMap("partyId", partyId)); + for(GenericValue userLogin : userLogins) { + if (!"N".equals(userLogin.getString("enabled"))) { + userLogin.set("enabled", "N"); + userLogin.set("disabledDateTime", UtilDateTime.nowTimestamp()); + userLogin.store(); + } + } + } } Map<String, Object> results = ServiceUtil.returnSuccess(); @@ -290,7 +290,7 @@ // update status by separate service String oldStatusId = party.getString("statusId"); if (party.get("statusId") == null) { // old records - party.set("statusId", "PARTY_ENABLED"); + party.set("statusId", "PARTY_ENABLED"); } person.setNonPKFields(context); Modified: ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/party/PartyWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/party/PartyWorker.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/party/PartyWorker.java (original) +++ ofbiz/branches/executioncontext20090812/applications/party/src/org/ofbiz/party/party/PartyWorker.java Mon Aug 17 15:42:56 2009 @@ -389,7 +389,7 @@ partyList.addAll(associatedParties); while (UtilValidate.isNotEmpty(associatedParties)) { List<GenericValue> currentAssociatedParties = FastList.newInstance(); - for (GenericValue associatedParty : associatedParties ) { + for (GenericValue associatedParty : associatedParties) { EntityConditionList innerExprs = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("partyIdFrom", associatedParty.get("partyIdTo")), EntityCondition.makeCondition("partyRelationshipTypeId", partyRelationshipTypeId)), EntityOperator.AND); Modified: ofbiz/branches/executioncontext20090812/applications/party/webapp/partymgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/party/webapp/partymgr/WEB-INF/controller.xml Mon Aug 17 15:42:56 2009 @@ -21,6 +21,7 @@ <site-conf xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/site-conf.xsd"> <include location="component://common/webcommon/WEB-INF/common-controller.xml"/> + <include location="component://commonext/webapp/WEB-INF/controller.xml"/> <description>Party Manager Module Site Configuration File</description> <owner>Copyright 2001-2009 The Apache Software Foundation</owner> Modified: ofbiz/branches/executioncontext20090812/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/config/ProductUiLabels.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/product/config/ProductUiLabels.xml Mon Aug 17 15:42:56 2009 @@ -2561,7 +2561,7 @@ <value xml:lang="de">Eine Lagereinrichtung</value> <value xml:lang="en">One Inventory Facility</value> <value xml:lang="es">Un solo almacén de inventario</value> - <value xml:lang="fr">Une seul lieu de stockage</value> + <value xml:lang="fr">Un seul lieu de stockage</value> <value xml:lang="it">Una Stabilimento Inventario</value> <value xml:lang="ro">Un Compartiment Inventar</value> <value xml:lang="ru">Ðдин Ñклад ТÐЦ</value> Modified: ofbiz/branches/executioncontext20090812/applications/product/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/entitydef/entitymodel.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/entitydef/entitymodel.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/product/entitydef/entitymodel.xml Mon Aug 17 15:42:56 2009 @@ -585,20 +585,20 @@ <key-map field-name="configItemId"/> </relation> </entity> - <view-entity entity-name="ProductConfigAndProduct" - package-name="org.ofbiz.product.config" - title="Product Config And Product View Entity, to be able to see which products use a certain configuration item"> - <member-entity entity-alias="PDC" entity-name="ProductConfig"/> - <member-entity entity-alias="PD" entity-name="Product"/> - <alias-all entity-alias="PDC"> - <exclude field="description"/> - <exclude field="longDescription"/> - </alias-all> - <alias-all entity-alias="PD"/> - <view-link entity-alias="PDC" rel-entity-alias="PD"> - <key-map field-name="productId"/> - </view-link> - </view-entity> + <view-entity entity-name="ProductConfigAndProduct" + package-name="org.ofbiz.product.config" + title="Product Config And Product View Entity, to be able to see which products use a certain configuration item"> + <member-entity entity-alias="PDC" entity-name="ProductConfig"/> + <member-entity entity-alias="PD" entity-name="Product"/> + <alias-all entity-alias="PDC"> + <exclude field="description"/> + <exclude field="longDescription"/> + </alias-all> + <alias-all entity-alias="PD"/> + <view-link entity-alias="PDC" rel-entity-alias="PD"> + <key-map field-name="productId"/> + </view-link> + </view-entity> <entity entity-name="ProductConfigItem" package-name="org.ofbiz.product.config" title="Product Configuration Question Entity"> Modified: ofbiz/branches/executioncontext20090812/applications/product/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/ofbiz-component.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/ofbiz-component.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/product/ofbiz-component.xml Mon Aug 17 15:42:56 2009 @@ -33,6 +33,7 @@ <entity-resource type="eca" reader-name="main" loader="main" location="entitydef/eecas.xml"/> <entity-resource type="data" reader-name="seed-initial" loader="main" location="data/ProductScheduledServices.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductTypeData.xml"/> + <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductHelpData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ShipmentTypeData.xml"/> <entity-resource type="data" reader-name="seed" loader="main" location="data/ProductSecurityData.xml"/> <entity-resource type="data" reader-name="demo" loader="main" location="data/ProductUserDemoData.xml"/> Modified: ofbiz/branches/executioncontext20090812/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/product/script/org/ofbiz/shipment/shipment/ShipmentServices.xml Mon Aug 17 15:42:56 2009 @@ -132,9 +132,20 @@ <set from-field="parameters.statusId" field="newStatusValue.statusId"/> <set from-field="parameters.shipmentId" field="newStatusValue.shipmentId"/> <now-timestamp field="newStatusValue.statusDate"/> + <if-empty field="parameters.eventDate"> + <now-timestamp field="newStatusValue.statusDate"/> + <else> + <set field="newStatusValue.statusDate" from-field="parameters.eventDate"/> + </else> + </if-empty> <create-value value-field="newStatusValue"/> <else> - <now-timestamp field="shipmentStatus.statusDate"/> + <if-empty field="parameters.eventDate"> + <now-timestamp field="shipmentStatus.statusDate"/> + <else> + <set field="shipmentStatus.statusDate" from-field="parameters.eventDate"/> + </else> + </if-empty> <store-value value-field="shipmentStatus"/> </else> </if-empty> @@ -1350,6 +1361,7 @@ </entity-one> <!-- should never be empty - referential integrity enforced --> + <set field="eventDate" from-field="parameters.eventDate"/> <call-simple-method method-name="createShipmentForFacilityAndShipGroup"/> </iterate> @@ -1568,6 +1580,7 @@ <then> <!-- update the shipment status to packed --> <set from-field="shipment.shipmentId" field="packedContext.shipmentId"/> + <set from-field="eventDate" field="packedContext.eventDate"/> <set value="SHIPMENT_PACKED" field="packedContext.statusId"/> <call-service service-name="updateShipment" in-map-name="packedContext"/> <!-- update the shipment status to shipped --> Modified: ofbiz/branches/executioncontext20090812/applications/product/servicedef/services_shipment.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/servicedef/services_shipment.xml?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/servicedef/services_shipment.xml (original) +++ ofbiz/branches/executioncontext20090812/applications/product/servicedef/services_shipment.xml Mon Aug 17 15:42:56 2009 @@ -76,6 +76,7 @@ <attribute name="orderId" type="String" mode="IN" optional="false"/> <attribute name="originFacilityId" type="String" mode="IN" optional="true"/> <attribute name="setPackedOnly" type="String" mode="IN" optional="true"/> + <attribute name="eventDate" type="Timestamp" mode="IN" optional="true"/> <!-- A List of Maps, each with a shipmentId,a facilityId, and a shipGroupSeqId for each shipment created --> <attribute name="shipmentShipGroupFacilityList" type="List" mode="OUT" optional="false"/> </service> @@ -153,6 +154,7 @@ <exclude field-name="lastModifiedByUserLogin"/> </auto-attributes> <attribute name="shipmentTypeId" type="String" mode="INOUT" optional="true"/> + <attribute name="eventDate" type="Timestamp" mode="IN" optional="true"/> <attribute name="oldStatusId" type="String" mode="OUT" optional="true"/> <attribute name="oldPrimaryOrderId" type="String" mode="OUT" optional="true"/> <attribute name="oldOriginFacilityId" type="String" mode="OUT" optional="true"/> Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/category/CategoryWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/category/CategoryWorker.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/category/CategoryWorker.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/category/CategoryWorker.java Mon Aug 17 15:42:56 2009 @@ -470,7 +470,7 @@ catContentWrappers.put(productCategoryId, catContentWrapper); List<GenericValue> subCat = getRelatedCategoriesRet(request, "subCatList", productCategoryId, true); if (subCat != null) { - getCategoryContentWrappers(catContentWrappers, subCat, request ); + getCategoryContentWrappers(catContentWrappers, subCat, request); } } } Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java Mon Aug 17 15:42:56 2009 @@ -486,7 +486,7 @@ if (UtilValidate.isNotEmpty(defaultConfigOptionId)) { for(ConfigOption oneOption : getOptions()) { String currentConfigOptionId = oneOption.getId(); - if (defaultConfigOptionId.compareToIgnoreCase(currentConfigOptionId) == 0 ) { + if (defaultConfigOptionId.compareToIgnoreCase(currentConfigOptionId) == 0 ) { return oneOption; } } Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java Mon Aug 17 15:42:56 2009 @@ -919,7 +919,7 @@ EntityCondition.makeCondition("statusId", EntityOperator.IN, UtilMisc.toList("ORDER_COMPLETED", "ORDER_APPROVED", "ORDER_HELD")), EntityCondition.makeCondition("orderTypeId", EntityOperator.EQUALS, "SALES_ORDER"), EntityCondition.makeCondition("orderDate", EntityOperator.GREATER_THAN_EQUAL_TO, checkTime) - ), + ), EntityOperator.AND), null, null, null, null); } catch (GenericEntityException e2) { @@ -956,7 +956,7 @@ EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId), EntityCondition.makeCondition("workEffortTypeId", EntityOperator.EQUALS, "PROD_ORDER_TASK"), EntityCondition.makeCondition("actualCompletionDate", EntityOperator.GREATER_THAN_EQUAL_TO, checkTime) - ), + ), EntityOperator.AND), null, null, null, null); } catch (GenericEntityException e1) { Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/inventory/InventoryWorker.java Mon Aug 17 15:42:56 2009 @@ -112,7 +112,7 @@ EntityCondition.makeCondition("orderStatusId", EntityOperator.NOT_EQUAL, "ORDER_COMPLETED"), EntityCondition.makeCondition("orderStatusId", EntityOperator.NOT_EQUAL, "ORDER_REJECTED"), EntityCondition.makeCondition("orderStatusId", EntityOperator.NOT_EQUAL, "ORDER_CANCELLED") - ); + ); if (productIds.size() > 0) { condList.add(EntityCondition.makeCondition("productId", EntityOperator.IN, productIds)); } Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/price/PriceServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/price/PriceServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/price/PriceServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/price/PriceServices.java Mon Aug 17 15:42:56 2009 @@ -687,19 +687,19 @@ BigDecimal taxPercentage = (BigDecimal) calcTaxForDisplayResult.get("taxPercentage"); BigDecimal taxMultiplier = ONE_BASE.add(taxPercentage.divide(PERCENT_SCALE, taxCalcScale)); if (result.get("listPrice") != null) { - result.put("listPrice", ((BigDecimal) result.get("listPrice")).multiply(taxMultiplier).setScale( taxFinalScale, taxRounding )); + result.put("listPrice", ((BigDecimal) result.get("listPrice")).multiply(taxMultiplier).setScale(taxFinalScale, taxRounding)); } if (result.get("defaultPrice") != null) { - result.put("defaultPrice", ((BigDecimal) result.get("defaultPrice")).multiply(taxMultiplier).setScale( taxFinalScale, taxRounding )); + result.put("defaultPrice", ((BigDecimal) result.get("defaultPrice")).multiply(taxMultiplier).setScale(taxFinalScale, taxRounding)); } if (result.get("averageCost") != null) { - result.put("averageCost", ((BigDecimal) result.get("averageCost")).multiply(taxMultiplier).setScale( taxFinalScale, taxRounding )); + result.put("averageCost", ((BigDecimal) result.get("averageCost")).multiply(taxMultiplier).setScale(taxFinalScale, taxRounding)); } if (result.get("promoPrice") != null) { - result.put("promoPrice", ((BigDecimal) result.get("promoPrice")).multiply(taxMultiplier).setScale( taxFinalScale, taxRounding )); + result.put("promoPrice", ((BigDecimal) result.get("promoPrice")).multiply(taxMultiplier).setScale(taxFinalScale, taxRounding)); } if (result.get("competitivePrice") != null) { - result.put("competitivePrice", ((BigDecimal) result.get("competitivePrice")).multiply(taxMultiplier).setScale( taxFinalScale, taxRounding )); + result.put("competitivePrice", ((BigDecimal) result.get("competitivePrice")).multiply(taxMultiplier).setScale(taxFinalScale, taxRounding)); } } catch (GenericServiceException e) { String errMsg = "Error calculating VAT tax (with calcTaxForDisplay service): " + e.toString(); Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductEvents.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductEvents.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductEvents.java Mon Aug 17 15:42:56 2009 @@ -183,7 +183,7 @@ Map<String, String> messageMap = UtilMisc.toMap("numProds", Integer.toString(numProds)); messageMap.put("errProds", Integer.toString(errProds)); errMsg = UtilProperties.getMessage(resource,"productevents.keyword_creation_complete_for_products_with_errors", messageMap, UtilHttp.getLocale(request)); - request.setAttribute( "_ERROR_MESSAGE_", errMsg); + request.setAttribute("_ERROR_MESSAGE_", errMsg); return "error"; } } Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductSearchEvents.java Mon Aug 17 15:42:56 2009 @@ -80,7 +80,7 @@ GenericValue searchResultView = null; while ((searchResultView = eli.next()) != null) { String productId = searchResultView.getString("mainProductId"); - numRemoved += delegator.removeByAnd("ProductCategoryMember", UtilMisc.toMap("productCategoryId", productCategoryId, "productId", productId )) ; + numRemoved += delegator.removeByAnd("ProductCategoryMember", UtilMisc.toMap("productCategoryId", productCategoryId, "productId", productId)) ; } eli.close(); Map<String, String> messageMap = UtilMisc.toMap("numRemoved", Integer.toString(numRemoved)); @@ -143,7 +143,7 @@ while ((searchResultView = eli.next()) != null) { String productId = searchResultView.getString("mainProductId"); //get all tuples that match product and category - List<GenericValue> pcmList = delegator.findByAnd("ProductCategoryMember", UtilMisc.toMap("productCategoryId", productCategoryId, "productId", productId )); + List<GenericValue> pcmList = delegator.findByAnd("ProductCategoryMember", UtilMisc.toMap("productCategoryId", productCategoryId, "productId", productId)); //set those thrudate to that specificed maybe remove then add new one for (GenericValue pcm: pcmList) { @@ -413,14 +413,14 @@ String productId = searchResultView.getString("mainProductId"); productMap.put("productId", productId); - List<GenericValue> productFeaturesCustomRaw = delegator.findByAnd("ProductFeatureAndAppl", UtilMisc.toMap("productId", productId, "productFeatureTypeId", "HAZMAT") ); + List<GenericValue> productFeaturesCustomRaw = delegator.findByAnd("ProductFeatureAndAppl", UtilMisc.toMap("productId", productId, "productFeatureTypeId", "HAZMAT")); List<GenericValue> productFeaturesCustom = EntityUtil.filterByDate(productFeaturesCustomRaw); productMap.put("productFeatureCustom", EntityUtil.getFirst(productFeaturesCustom)); List<GenericValue> productCategoriesRaw = delegator.findByAnd("ProductCategoryAndMember", UtilMisc.toMap("productId", productId)); List<GenericValue> productCategories = EntityUtil.filterByDate(productCategoriesRaw); productMap.put("productCategories", productCategories); - List<GenericValue> productFeaturesRaw = delegator.findByAnd("ProductFeatureAndAppl", UtilMisc.toMap("productId", productId) ); + List<GenericValue> productFeaturesRaw = delegator.findByAnd("ProductFeatureAndAppl", UtilMisc.toMap("productId", productId)); List<GenericValue> productFeatures = EntityUtil.filterByDate(productFeaturesRaw); productMap.put("productFeatures", productFeatures); productExportList.add(productMap); Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductServices.java Mon Aug 17 15:42:56 2009 @@ -481,7 +481,7 @@ UtilMisc.toList( EntityCondition.makeCondition("productId", productId), EntityCondition.makeCondition("productIdTo", productId) - ), EntityJoinOperator.OR); + ), EntityJoinOperator.OR); cond = EntityCondition.makeCondition(cond, EntityCondition.makeCondition("productAssocTypeId", type)); productAssocs = delegator.findList("ProductAssoc", cond, null, orderBy, null, true); } else { Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductUtilServices.java Mon Aug 17 15:42:56 2009 @@ -70,7 +70,7 @@ EntityCondition.makeCondition("isVariant", EntityOperator.EQUALS, "Y"), EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.NOT_EQUAL, null), EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.LESS_THAN_EQUAL_TO, nowTimestamp) - ), EntityOperator.AND); + ), EntityOperator.AND); EntityListIterator eliOne = delegator.find("Product", conditionOne, null, null, null, null); GenericValue productOne = null; int numSoFarOne = 0; @@ -100,7 +100,7 @@ EntityCondition condition = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("isVirtual", EntityOperator.EQUALS, "Y"), EntityCondition.makeCondition(EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.GREATER_THAN_EQUAL_TO, nowTimestamp)) - ), EntityOperator.AND); + ), EntityOperator.AND); EntityListIterator eli = delegator.find("Product", condition, null, null, null, null); GenericValue product = null; int numSoFar = 0; @@ -138,7 +138,7 @@ EntityCondition condition = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.NOT_EQUAL, null), EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.LESS_THAN_EQUAL_TO, nowTimestamp) - ), EntityOperator.AND); + ), EntityOperator.AND); EntityListIterator eli = delegator.find("Product", condition, null, null, null, null); GenericValue product = null; int numSoFar = 0; @@ -186,7 +186,7 @@ EntityCondition condition = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN, nowTimestamp), EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null) - ), EntityOperator.AND); + ), EntityOperator.AND); EntityCondition havingCond = EntityCondition.makeCondition("productIdCount", EntityOperator.GREATER_THAN, Long.valueOf(1)); EntityListIterator eli = delegator.findListIteratorByCondition(dve, condition, havingCond, UtilMisc.toList("productId", "productCategoryId", "productIdCount"), null, null); GenericValue pcm = null; @@ -245,7 +245,7 @@ EntityCondition condition = EntityCondition.makeCondition(UtilMisc.toList( EntityCondition.makeCondition("productAssocTypeId", EntityOperator.EQUALS, "PRODUCT_VARIANT"), EntityCondition.makeCondition(EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.GREATER_THAN, nowTimestamp)) - ), EntityOperator.AND); + ), EntityOperator.AND); EntityCondition havingCond = EntityCondition.makeCondition("productIdToCount", EntityOperator.EQUALS, Long.valueOf(1)); EntityListIterator eliOne = delegator.findListIteratorByCondition(dve, condition, havingCond, UtilMisc.toList("productId", "productIdToCount"), null, null); List<GenericValue> valueList = eliOne.getCompleteList(); @@ -281,7 +281,7 @@ EntityCondition.makeCondition(EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("salesDiscontinuationDate", EntityOperator.GREATER_THAN, nowTimestamp)), EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, nowTimestamp), EntityCondition.makeCondition(EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("thruDate", EntityOperator.GREATER_THAN_EQUAL_TO, nowTimestamp)) - ), EntityOperator.AND); + ), EntityOperator.AND); EntityListIterator eliMulti = delegator.findListIteratorByCondition(dve, conditionWithDates, havingCond, UtilMisc.toList("productId", "productIdToCount"), null, null); List<GenericValue> valueMultiList = eliMulti.getCompleteList(); eliMulti.close(); @@ -665,7 +665,7 @@ EntityCondition.makeCondition("productId", EntityOperator.EQUALS, productId), EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, nowTimestamp), EntityCondition.makeCondition(EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("thruDate", EntityOperator.GREATER_THAN_EQUAL_TO, nowTimestamp)) - ), EntityOperator.AND); + ), EntityOperator.AND); EntityListIterator productFeatureAndApplEli = delegator.find("ProductFeatureAndAppl", condition, null, null, null, null); GenericValue productFeatureAndAppl = null; while ((productFeatureAndAppl = (GenericValue) productFeatureAndApplEli.next()) != null) { @@ -715,7 +715,7 @@ EntityCondition.makeCondition("productFeatureGroupId", EntityOperator.EQUALS, productFeatureGroupId), EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, nowTimestamp), EntityCondition.makeCondition(EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("thruDate", EntityOperator.GREATER_THAN_EQUAL_TO, nowTimestamp)) - ), EntityOperator.AND); + ), EntityOperator.AND); if (delegator.findCountByCondition("ProductFeatureGroupAppl", condition, null, null) == 0) { // if no valid ones, create one GenericValue productFeatureGroupAppl = delegator.makeValue("ProductFeatureGroupAppl", UtilMisc.toMap("productFeatureGroupId", productFeatureGroupId, "productFeatureId", productFeatureId, "fromDate", nowTimestamp)); @@ -731,7 +731,7 @@ EntityCondition.makeCondition("productCategoryId", EntityOperator.EQUALS, subProductCategoryId), EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, nowTimestamp), EntityCondition.makeCondition(EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("thruDate", EntityOperator.GREATER_THAN_EQUAL_TO, nowTimestamp)) - ), EntityOperator.AND); + ), EntityOperator.AND); EntityListIterator productFeatureCatGrpApplEli = delegator.find("ProductFeatureCatGrpAppl", condition, null, null, null, null); GenericValue productFeatureCatGrpAppl = null; while ((productFeatureCatGrpAppl = productFeatureCatGrpApplEli.next()) != null) { @@ -741,7 +741,7 @@ EntityCondition.makeCondition("productFeatureGroupId", EntityOperator.EQUALS, productFeatureGroupId), EntityCondition.makeCondition("fromDate", EntityOperator.LESS_THAN_EQUAL_TO, nowTimestamp), EntityCondition.makeCondition(EntityCondition.makeCondition("thruDate", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("thruDate", EntityOperator.GREATER_THAN_EQUAL_TO, nowTimestamp)) - ), EntityOperator.AND); + ), EntityOperator.AND); if (delegator.findCountByCondition("ProductFeatureCatGrpAppl", checkCondition, null, null) == 0) { // if no valid ones, create one GenericValue productFeatureGroupAppl = delegator.makeValue("ProductFeatureCatGrpAppl", UtilMisc.toMap("productFeatureGroupId", productFeatureGroupId, "productCategoryId", productCategoryId, "fromDate", nowTimestamp)); Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductWorker.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductWorker.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/product/ProductWorker.java Mon Aug 17 15:42:56 2009 @@ -892,7 +892,7 @@ * @return * @throws GenericEntityException */ - public static List<GenericValue> findProductsById( GenericDelegator delegator, + public static List<GenericValue> findProductsById(GenericDelegator delegator, String idToFind, String goodIdentificationTypeId, boolean searchProductFirst, boolean searchAllId) throws GenericEntityException { @@ -927,7 +927,7 @@ return productsFound; } - public static List<GenericValue> findProductsById( GenericDelegator delegator, String idToFind, String goodIdentificationTypeId) + public static List<GenericValue> findProductsById(GenericDelegator delegator, String idToFind, String goodIdentificationTypeId) throws GenericEntityException { return findProductsById(delegator, idToFind, goodIdentificationTypeId, true, false); } Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/subscription/SubscriptionServices.java Mon Aug 17 15:42:56 2009 @@ -229,7 +229,7 @@ GenericValue orderHeader = null; try { List<GenericValue> orderRoleList = delegator.findByAnd("OrderRole", UtilMisc.toMap("orderId", orderId, "roleTypeId", "END_USER_CUSTOMER")); - if (orderRoleList.size() > 0 ) { + if (orderRoleList.size() > 0) { GenericValue orderRole = orderRoleList.get(0); String partyId = (String) orderRole.get("partyId"); subContext.put("partyId", partyId); Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/test/InventoryItemTransferTest.java Mon Aug 17 15:42:56 2009 @@ -53,7 +53,7 @@ String statusId = "IXF_REQUESTED"; String inventoryItemId = "9005"; ctx.put("inventoryItemId", inventoryItemId); - ctx.put("statusId", statusId ); + ctx.put("statusId", statusId); ctx.put("facilityId", "WebStoreWarehouse"); ctx.put("facilityIdTo", "WebStoreWarehouse"); ctx.put("receiveDate", UtilDateTime.nowTimestamp()); Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/test/StockMovesTest.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/test/StockMovesTest.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/test/StockMovesTest.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/product/test/StockMovesTest.java Mon Aug 17 15:42:56 2009 @@ -72,7 +72,7 @@ Map<String, Object> ppsmCtx = FastMap.newInstance(); ppsmCtx.put("productId", "GZ-2644"); ppsmCtx.put("facilityId", "WebStoreWarehouse"); - ppsmCtx.put("locationSeqId","TLTLTLUL01" ); + ppsmCtx.put("locationSeqId","TLTLTLUL01"); ppsmCtx.put("targetLocationSeqId", "TLTLTLLL01"); ppsmCtx.put("quantityMoved", new BigDecimal("5")); ppsmCtx.put("userLogin", userLogin); Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Mon Aug 17 15:42:56 2009 @@ -413,7 +413,7 @@ } BigDecimal total = BigDecimal.ZERO; - if (productId != null ) { + if (productId != null) { for (PackingSessionLine line: this.getLines()) { if (productId.equals(line.getProductId())) { if (packageSeq == -1 || packageSeq == line.getPackageSeq()) { @@ -918,9 +918,9 @@ serviceContext.put("shippableTotal", shippableTotal); serviceResult = getDispatcher().runSync("calcShipmentCostEstimate", serviceContext); - } catch ( GenericEntityException e ) { + } catch (GenericEntityException e) { Debug.logError(e, module); - } catch ( GenericServiceException e ) { + } catch (GenericServiceException e) { Debug.logError(e, module); } Modified: ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java?rev=805012&r1=805011&r2=805012&view=diff ============================================================================== --- ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java (original) +++ ofbiz/branches/executioncontext20090812/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java Mon Aug 17 15:42:56 2009 @@ -184,7 +184,7 @@ } storeAll.add(0, weightBreak); } - catch ( Exception e ) { + catch (Exception e) { Debug.logError(e, module); } } @@ -284,7 +284,7 @@ Debug.logError(e, module); return ServiceUtil.returnError("Cannot get shipping address entity"); } - } else if ( shippingPostalCode != null) { + } else if (shippingPostalCode != null) { shipAddress = delegator.makeValue("PostalAddress"); shipAddress.set("countryGeoId", shippingCountryCode); shipAddress.set("postalCodeGeoId", shippingPostalCode); @@ -541,7 +541,7 @@ Debug.logError(e, "Unable to lookup feature/group" + fields, module); } if (appl != null) { - featureSurcharge = featureSurcharge.add( shippableTotal.multiply( featurePercent.movePointLeft(2) ).multiply(quantity) ); + featureSurcharge = featureSurcharge.add(shippableTotal.multiply(featurePercent.movePointLeft(2)).multiply(quantity)); featureSurcharge = featureSurcharge.add(featurePrice.multiply(quantity)); } } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |