svn commit: r984399 [7/16] - in /ofbiz/branches/jquery: ./ applications/accounting/config
Locked
svn commit: r984399 [7/16] - in /ofbiz/branches/jquery: ./ applications/accounting/config
 
|
Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/cart/LookupBulkAddSupplierProducts.groovy Wed Aug 11 13:22:40 2010 @@ -137,4 +137,4 @@ for (supplierProduct in supplierProducts } } context.productListSize = newProductList.size(); -context.productList = newProductList; \ No newline at end of file +context.productList = newProductList; Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CompareProducts.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CompareProducts.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CompareProducts.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/CompareProducts.groovy Wed Aug 11 13:22:40 2010 @@ -77,4 +77,4 @@ compareList.each { product -> } productFeatureTypeIds.each { productFeatureTypeId -> productFeatureTypeMap[productFeatureTypeId] = delegator.findOne("ProductFeatureType", [productFeatureTypeId : productFeatureTypeId], true); -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy Wed Aug 11 13:22:40 2010 @@ -481,4 +481,4 @@ if (orderItems) { orderAdjustmentId = orderAdjustment.orderAdjustmentId; } } - context.orderAdjustmentId = orderAdjustmentId; \ No newline at end of file + context.orderAdjustmentId = orderAdjustmentId; Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/order/ShipGroups.groovy Wed Aug 11 13:22:40 2010 @@ -21,7 +21,7 @@ import javolution.util.FastMap; import javolution.util.FastList; import org.ofbiz.base.util.UtilMisc; -import org.ofbiz.common.CommonWorkers; +import org.ofbiz.entity.util.EntityTypeUtil; import org.ofbiz.entity.util.EntityUtil; orderId = parameters.orderId; @@ -108,8 +108,8 @@ shipGroups.each { shipGroup -> line.quantityShipped = quantityShipped; line.quantityOpen = quantityOpen; - if (CommonWorkers.hasParentType(delegator, "ProductType", "productTypeId", product.productTypeId, "parentTypeId", "MARKETING_PKG")) { - assocType = CommonWorkers.hasParentType(delegator, "ProductType", "productTypeId", product.productTypeId, "parentTypeId", "MARKETING_PKG_AUTO") ? "MANUF_COMPONENT" : "PRODUCT_COMPONENT"; + if (EntityTypeUtil.hasParentType(delegator, "ProductType", "productTypeId", product.productTypeId, "parentTypeId", "MARKETING_PKG")) { + assocType = EntityTypeUtil.hasParentType(delegator, "ProductType", "productTypeId", product.productTypeId, "parentTypeId", "MARKETING_PKG_AUTO") ? "MANUF_COMPONENT" : "PRODUCT_COMPONENT"; sublines = expandProductGroup(product, quantityInGroup, quantityShipped, quantityOpen, assocType); line.expandedList = sublines; } Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/reports/OrderByChannel.groovy Wed Aug 11 13:22:40 2010 @@ -28,4 +28,4 @@ if(request.getParameter("saleChannel")){ request.setAttribute("birtParameters", birtParameters); -return "success"; \ No newline at end of file +return "success"; Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHistory.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHistory.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHistory.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/return/ReturnHistory.groovy Wed Aug 11 13:22:40 2010 @@ -38,4 +38,4 @@ returnHistoryList.each { returnHistory - orderReturnItemHistories.add(returnHistory); } } -context.orderReturnItemHistories = orderReturnItemHistories; \ No newline at end of file +context.orderReturnItemHistories = orderReturnItemHistories; Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/controller.xml Wed Aug 11 13:22:40 2010 @@ -1563,6 +1563,12 @@ under the License. <response name="success" type="view" value="ListOrderHeaders"/> <response name="error" type="view" value="ListOrderHeaders"/> </request-map> + <request-map uri="createOrderItemShipGroup"> + <security https="true" auth="true"/> + <event type="service" invoke="createOrderItemShipGroup"/> + <response name="success" type="view" value="orderview"/> + <response name="error" type="view" value="orderview"/> + </request-map> <request-map uri="updateOrderItemShipGroup"> <security https="true" auth="true"/> <event type="service" invoke="updateOrderItemShipGroup"/> Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Wed Aug 11 13:22:40 2010 @@ -149,7 +149,7 @@ under the License. <div> <a href="/catalog/control/EditProductInventoryItems?productId=${productId}" class="buttontext"><b>${uiLabelMap.ProductInventory}</b></a>: ${uiLabelMap.ProductAtp} = ${availableToPromiseMap.get(productId)}, ${uiLabelMap.ProductQoh} = ${quantityOnHandMap.get(productId)} - <#if Static["org.ofbiz.common.CommonWorkers"].hasParentType(delegator, "ProductType", "productTypeId", product.productTypeId, "parentTypeId", "MARKETING_PKG")> + <#if Static["org.ofbiz.entity.util.EntityTypeUtil"].hasParentType(delegator, "ProductType", "productTypeId", product.productTypeId, "parentTypeId", "MARKETING_PKG")> ${uiLabelMap.ProductMarketingPackageATP} = ${mktgPkgATPMap.get(productId)}, ${uiLabelMap.ProductMarketingPackageQOH} = ${mktgPkgQOHMap.get(productId)} <#if ( mktgPkgATPMap.get(cartLine.getProductId()) < cartLine.getQuantity()) && (shoppingCart.getOrderType() == 'SALES_ORDER')> <#assign backOrdered = cartLine.getQuantity() - mktgPkgATPMap.get(cartLine.getProductId())/> Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/shipsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/shipsettings.ftl?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/shipsettings.ftl (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/shipsettings.ftl Wed Aug 11 13:22:40 2010 @@ -30,7 +30,7 @@ under the License. <table width='100%' border='0' cellspacing='0' cellpadding='0' class="boxboutside"> <tr> <td> - <a href="<@ofbizUrl>setShipping?createNewShipGroup=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonCreateNew} ${uiLabelMap.OrderShipGroup}</a> + <a href="<@ofbizUrl>setShipping?createNewShipGroup=Y</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateShipGroup}</a> <#list 1..cart.getShipGroupSize() as currIndex> Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/orderitems.ftl (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/orderitems.ftl Wed Aug 11 13:22:40 2010 @@ -137,7 +137,7 @@ under the License. ${qohQuantity} (${uiLabelMap.ProductAtp}: ${atpQuantity}) </td> </tr> - <#if (product != null) && (product.productTypeId != null) && Static["org.ofbiz.common.CommonWorkers"].hasParentType(delegator, "ProductType", "productTypeId", product.productTypeId, "parentTypeId", "MARKETING_PKG")> + <#if (product != null) && (product.productTypeId != null) && Static["org.ofbiz.entity.util.EntityTypeUtil"].hasParentType(delegator, "ProductType", "productTypeId", product.productTypeId, "parentTypeId", "MARKETING_PKG")> <tr> <td>${uiLabelMap.ProductMarketingPackageQOH}</td> <td style="padding-left: 15px; text-align: left;"> Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Wed Aug 11 13:22:40 2010 @@ -171,6 +171,12 @@ under the License. <li><a href="<@ofbizUrl>cancelOrderItem?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCancelAllItems}</a></li> --> <li><a href="<@ofbizUrl>editOrderItems?${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderEditItems}</a></li> + <li> + <form name="createOrderItemShipGroup" method="post" action="<@ofbizUrl>createOrderItemShipGroup</@ofbizUrl>"> + <input type="hidden" name="orderId" value="${orderId}"/> + </form> + <a href="javascript:document.createOrderItemShipGroup.submit()" class="buttontext">${uiLabelMap.OrderCreateShipGroup}</a> + </li> </#if> <li><a href="<@ofbizUrl>loadCartFromOrder?${paramString}&finalizeMode=init</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateAsNewOrder}</a></li> <#if orderHeader.statusId == "ORDER_COMPLETED"> @@ -203,7 +209,6 @@ under the License. <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId?if_exists}"/> <table class="basic-table" cellspacing='0'> - <#if shipGroup.contactMechId?has_content> <tr> <td align="right" valign="top" width="15%"> <span class="label"> ${uiLabelMap.OrderAddress}</span> @@ -230,17 +235,15 @@ under the License. </div> </td> </tr> - </#if> <#-- the setting of shipping method is only supported for sales orders at this time --> - <#if orderHeader.orderTypeId == "SALES_ORDER" && shipGroup.shipmentMethodTypeId?has_content> + <#if orderHeader.orderTypeId == "SALES_ORDER"> <tr> <td align="right" valign="top" width="15%"> <span class="label"> <b>${uiLabelMap.CommonMethod}</b></span> </td> <td width="5"> </td> <td valign="top" width="80%"> - <#if shipGroup.carrierPartyId?has_content || shipmentMethodType?has_content> <div> <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> <#-- passing the shipmentMethod value as the combination of two fields value @@ -248,7 +251,11 @@ under the License. "@" symbol. --> <select name="shipmentMethod"> + <#if shipGroup.shipmentMethodTypeId?has_content> <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId?if_exists}"><#if shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId?if_exists}</#if> ${shipmentMethodType.get("description",locale)?default("")}</option> + <#else> + <option value=""/> + </#if> <#list productStoreShipmentMethList as productStoreShipmentMethod> <#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId> <#if productStoreShipmentMethod.partyId?has_content || productStoreShipmentMethod?has_content> @@ -260,12 +267,11 @@ under the License. <#if shipGroup.carrierPartyId != "_NA_"> ${shipGroup.carrierPartyId?if_exists} </#if> - ${shipmentMethodType.get("description",locale)?default("")} + ${shipmentMethodType?if_exists.get("description",locale)?default("")} </#if> </div> - </#if> </td> - </tr> + </tr> </#if> <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> <tr> @@ -277,12 +283,12 @@ under the License. </td> </tr> </#if> - <#if !shipGroup.contactMechId?has_content && !shipGroup.shipmentMethodTypeId?has_content> - <#assign noShipment = "true"> - <tr> - <td colspan="3" align="center">${uiLabelMap.OrderNotShipped}</td> - </tr> - </#if> + <#if !shipGroup.contactMechId?has_content && !shipGroup.shipmentMethodTypeId?has_content> + <#assign noShipment = "true"> + <tr> + <td colspan="3" align="center">${uiLabelMap.OrderNotShipped}</td> + </tr> + </#if> </table> </form> <div id="newShippingAddressForm" class="popup" style="display: none;"> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/CustRequestScreens.xml Wed Aug 11 13:22:40 2010 @@ -694,4 +694,4 @@ under the License. </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/FieldLookupForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/FieldLookupForms.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/FieldLookupForms.xml Wed Aug 11 13:22:40 2010 @@ -535,4 +535,4 @@ under the License. </field> <field name="shoppingListTypeId"><display-entity entity-name="ShoppingListType" also-hidden="true"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/LookupScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/LookupScreens.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/LookupScreens.xml Wed Aug 11 13:22:40 2010 @@ -261,4 +261,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderDeliveryScheduleForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderDeliveryScheduleForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderDeliveryScheduleForms.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderDeliveryScheduleForms.xml Wed Aug 11 13:22:40 2010 @@ -50,4 +50,4 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderForms.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderForms.xml Wed Aug 11 13:22:40 2010 @@ -247,4 +247,4 @@ under the License. </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderHeaderScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderHeaderScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderHeaderScreens.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderHeaderScreens.xml Wed Aug 11 13:22:40 2010 @@ -91,4 +91,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderMenus.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderMenus.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderMenus.xml Wed Aug 11 13:22:40 2010 @@ -339,4 +339,4 @@ under the License. </menu-item> </menu> -</menus> \ No newline at end of file +</menus> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderReturnScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderReturnScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderReturnScreens.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderReturnScreens.xml Wed Aug 11 13:22:40 2010 @@ -342,4 +342,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderShopListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderShopListForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderShopListForms.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderShopListForms.xml Wed Aug 11 13:22:40 2010 @@ -46,4 +46,4 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml Wed Aug 11 13:22:40 2010 @@ -538,4 +538,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/QuoteForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/QuoteForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/QuoteForms.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/QuoteForms.xml Wed Aug 11 13:22:40 2010 @@ -456,4 +456,4 @@ under the License. <field name="note"><textarea/></field> <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/QuoteScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/QuoteScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/QuoteScreens.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/QuoteScreens.xml Wed Aug 11 13:22:40 2010 @@ -693,4 +693,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/QuoteWorkEffortForms.xml Wed Aug 11 13:22:40 2010 @@ -79,4 +79,4 @@ under the License. <submit button-type="text-link"/> </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/QuoteWorkEffortScreens.xml Wed Aug 11 13:22:40 2010 @@ -135,4 +135,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/ReportForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/ReportForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/ReportForms.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/ReportForms.xml Wed Aug 11 13:22:40 2010 @@ -284,4 +284,4 @@ under the License. <form name="CouponSalesReport" type="single" target="CouponSalesReport.pdf" target-window="_BLANK"> <field name="submit" title="${uiLabelMap.CommonRun}"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/RequirementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/RequirementForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/RequirementForms.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/RequirementForms.xml Wed Aug 11 13:22:40 2010 @@ -400,4 +400,4 @@ under the License. <submit button-type="button"/> </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml Wed Aug 11 13:22:40 2010 @@ -1214,6 +1214,7 @@ </property> <property key="FormFieldTitle_requirePasswordChange"> <value xml:lang="en">Require Password Change</value> + <value xml:lang="fr">Changement mot de passe obligatoire</value> <value xml:lang="hi_IN">पासवरà¥à¤¡ परिवरà¥à¤¤à¤¿à¤¤ à¤à¤¿à¤¯à¤¾ à¤à¤¾à¤¨à¤¾ à¤à¤¾à¤¹à¤¿à¤</value> <value xml:lang="it">Richiesto cambio password</value> <value xml:lang="pt_BR">Pedir alteração de senha</value> Modified: ofbiz/branches/jquery/applications/party/data/PartyGeoPointData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/data/PartyGeoPointData.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/data/PartyGeoPointData.xml (original) +++ ofbiz/branches/jquery/applications/party/data/PartyGeoPointData.xml Wed Aug 11 13:22:40 2010 @@ -49,4 +49,4 @@ under the License. elevationUomId="LEN_m" information="A testing GeoPoint for contactMechId=FRENCHCUSTOMER (FrenchCustomer)" /> -</entity-engine-xml> \ No newline at end of file +</entity-engine-xml> Modified: ofbiz/branches/jquery/applications/party/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/entitydef/entitymodel.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jquery/applications/party/entitydef/entitymodel.xml Wed Aug 11 13:22:40 2010 @@ -2344,7 +2344,7 @@ under the License. <alias entity-alias="PTY" name="partyId"/> <alias entity-alias="PTY" name="partyTypeId"/> <alias entity-alias="PTY" name="description"/> - <alias entity-alias="PTY" name="statusId"/> + <alias entity-alias="PTY" name="partyStatusId" field="statusId"/> <alias entity-alias="PER" name="firstName"/> <alias entity-alias="PER" name="middleName"/> <alias entity-alias="PER" name="lastName"/> @@ -2599,10 +2599,10 @@ under the License. <view-link entity-alias="PR" rel-entity-alias="RT"> <key-map field-name="roleTypeId"/> </view-link> - <view-link entity-alias="PTY" rel-entity-alias="PCM"> + <view-link entity-alias="PTY" rel-entity-alias="PCM" rel-optional="true"> <key-map field-name="partyId"/> </view-link> - <view-link entity-alias="PCM" rel-entity-alias="CM"> + <view-link entity-alias="PCM" rel-entity-alias="CM" rel-optional="true"> <key-map field-name="contactMechId"/> </view-link> <view-link entity-alias="PCM" rel-entity-alias="PA" rel-optional="true"> Modified: ofbiz/branches/jquery/applications/party/entitydef/entitymodel_old.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/entitydef/entitymodel_old.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/entitydef/entitymodel_old.xml (original) +++ ofbiz/branches/jquery/applications/party/entitydef/entitymodel_old.xml Wed Aug 11 13:22:40 2010 @@ -52,4 +52,4 @@ under the License. <key-map field-name="workEffortId"/> </relation> </entity> -</entitymodel> \ No newline at end of file +</entitymodel> Modified: ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml (original) +++ ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/test/PartyContactMechTests.xml Wed Aug 11 13:22:40 2010 @@ -405,4 +405,4 @@ under the License. </assert> <check-errors/> </simple-method> -</simple-methods> \ No newline at end of file +</simple-methods> Modified: ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/test/PartyTests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/test/PartyTests.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/test/PartyTests.xml (original) +++ ofbiz/branches/jquery/applications/party/script/org/ofbiz/party/test/PartyTests.xml Wed Aug 11 13:22:40 2010 @@ -299,4 +299,4 @@ under the License. </assert> <check-errors/> </simple-method> -</simple-methods> \ No newline at end of file +</simple-methods> Modified: ofbiz/branches/jquery/applications/party/src/org/ofbiz/party/party/PartyWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/src/org/ofbiz/party/party/PartyWorker.java?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/src/org/ofbiz/party/party/PartyWorker.java (original) +++ ofbiz/branches/jquery/applications/party/src/org/ofbiz/party/party/PartyWorker.java Wed Aug 11 13:22:40 2010 @@ -97,7 +97,7 @@ public class PartyWorker { // generate the sequenced number and pad Long seq = delegator.getNextSeqIdLong(clubSeqName); - clubId = clubId + UtilFormatOut.formatPaddedNumber(seq.longValue(), (length - prefix.length() - 1)); + clubId = clubId + UtilFormatOut.formatPaddedNumber(seq.longValue(), (length - clubId.length() - 1)); // get the check digit int check = UtilValidate.getLuhnCheckDigit(clubId); @@ -213,7 +213,7 @@ public class PartyWorker { String stateProvinceGeoId, String postalCode, String postalCodeExt, String countryGeoId, String firstName, String middleName, String lastName) throws GeneralException { - List<GenericValue> matching = findMatchingPartyAndPostalAddress(delegator, address1, address2, city, stateProvinceGeoId, postalCode, + List<GenericValue> matching = findMatchingPersonPostalAddresses(delegator, address1, address2, city, stateProvinceGeoId, postalCode, postalCodeExt, countryGeoId, firstName, middleName, lastName); GenericValue v = EntityUtil.getFirst(matching); if (v != null) { @@ -222,15 +222,97 @@ public class PartyWorker { return null; } + /** Finds all matching PartyAndPostalAddress records based on the values provided. Excludes party records with a statusId of PARTY_DISABLED. Results are ordered by descending PartyContactMech.fromDate. + * The matching process is as follows: + * 1. Calls {@link #findMatchingPartyPostalAddress(Delegator, String, String, String, String, String, String, String, String)} to retrieve a list of address matched PartyAndPostalAddress records. Results are limited to Parties of type PERSON. + * 2. For each matching PartyAndPostalAddress record, the Person record for the Party is then retrieved and an upper case comparison is performed against the supplied firstName, lastName and if provided, middleName. + * + * @param delegator Delegator instance + * @param address1 PostalAddress.address1 to match against (Required). + * @param address2 Optional PostalAddress.address2 to match against. + * @param city PostalAddress.city value to match against (Required). + * @param stateProvinceGeoId Optional PostalAddress.stateProvinceGeoId value to match against. If null or "**" is passed then the value will be ignored during matching. "NA" can be passed in place of "_NA_". + * @param postalCode PostalAddress.postalCode value to match against. Cannot be null but can be skipped by passing a value starting with an "*". If the length of the supplied string is 10 characters and the string contains a "-" then the postal code will be split at the "-" and the second half will be used as the postalCodeExt. + * @param postalCodeExt Optional PostalAddress.postalCodeExt value to match against. Will be overridden if a postalCodeExt value is retrieved from postalCode as described above. + * @param countryGeoId Optional PostalAddress.countryGeoId value to match against. + * @param firstName Person.firstName to match against (Required). + * @param middleName Optional Person.middleName to match against. + * @param lastName Person.lastName to match against (Required). + * @return List of PartyAndPostalAddress GenericValue objects that match the supplied criteria. + * @throws GeneralException + */ + public static List<GenericValue> findMatchingPersonPostalAddresses(Delegator delegator, String address1, String address2, String city, + String stateProvinceGeoId, String postalCode, String postalCodeExt, String countryGeoId, + String firstName, String middleName, String lastName) throws GeneralException { + // return list + List<GenericValue> returnList = FastList.newInstance(); + + // address information + if (firstName == null || lastName == null) { + throw new IllegalArgumentException(); + } + + List<GenericValue> validFound = findMatchingPartyPostalAddress(delegator, address1, address2, city, stateProvinceGeoId, postalCode, postalCodeExt, countryGeoId, "PERSON"); + + if (UtilValidate.isNotEmpty(validFound)) { + for (GenericValue partyAndAddr: validFound) { + String partyId = partyAndAddr.getString("partyId"); + if (UtilValidate.isNotEmpty(partyId)) { + GenericValue p = delegator.findByPrimaryKey("Person", UtilMisc.toMap("partyId", partyId)); + if (p != null) { + String fName = p.getString("firstName"); + String lName = p.getString("lastName"); + String mName = p.getString("middleName"); + if (lName.toUpperCase().equals(lastName.toUpperCase())) { + if (fName.toUpperCase().equals(firstName.toUpperCase())) { + if (mName != null && middleName != null) { + if (mName.toUpperCase().equals(middleName.toUpperCase())) { + returnList.add(partyAndAddr); + } + } else if (middleName == null) { + returnList.add(partyAndAddr); + } + } + } + } + } + } + } + + return returnList; + } + + /** + * @deprecated Renamed to {@link #findMatchingPersonPartyAndPostalAddress(Delegator, String, String, String, String, String, String, String, String, String, String)} + */ + @Deprecated public static List<GenericValue> findMatchingPartyAndPostalAddress(Delegator delegator, String address1, String address2, String city, String stateProvinceGeoId, String postalCode, String postalCodeExt, String countryGeoId, String firstName, String middleName, String lastName) throws GeneralException { + return PartyWorker.findMatchingPersonPostalAddresses(delegator, address1, address2, city, stateProvinceGeoId, postalCode, postalCodeExt, countryGeoId, firstName, middleName, lastName); + } - // return list - List<GenericValue> returnList = FastList.newInstance(); + /** + * Finds all matching parties based on the values provided. Excludes party records with a statusId of PARTY_DISABLED. Results are ordered by descending PartyContactMech.fromDate. + * 1. Candidate addresses are found by querying PartyAndPostalAddress using the supplied city and if provided, stateProvinceGeoId, postalCode, postalCodeExt and countryGeoId + * 2. In-memory address line comparisons are then performed against the supplied address1 and if provided, address2. Address lines are compared after the strings have been converted using {@link #makeMatchingString(Delegator, String)}. + * + * @param delegator Delegator instance + * @param address1 PostalAddress.address1 to match against (Required). + * @param address2 Optional PostalAddress.address2 to match against. + * @param city PostalAddress.city value to match against (Required). + * @param stateProvinceGeoId Optional PostalAddress.stateProvinceGeoId value to match against. If null or "**" is passed then the value will be ignored during matching. "NA" can be passed in place of "_NA_". + * @param postalCode PostalAddress.postalCode value to match against. Cannot be null but can be skipped by passing a value starting with an "*". If the length of the supplied string is 10 characters and the string contains a "-" then the postal code will be split at the "-" and the second half will be used as the postalCodeExt. + * @param postalCodeExt Optional PostalAddress.postalCodeExt value to match against. Will be overridden if a postalCodeExt value is retrieved from postalCode as described above. + * @param countryGeoId Optional PostalAddress.countryGeoId value to match against. + * @param partyTypeId Optional Party.partyTypeId to match against. + * @return List of PartyAndPostalAddress GenericValue objects that match the supplied criteria. + * @throws GenericEntityException + */ + public static List<GenericValue> findMatchingPartyPostalAddress(Delegator delegator, String address1, String address2, String city, + String stateProvinceGeoId, String postalCode, String postalCodeExt, String countryGeoId, String partyTypeId) throws GenericEntityException { - // address information - if (firstName == null || lastName == null || address1 == null || city == null || postalCode == null) { + if (address1 == null || city == null || postalCode == null) { throw new IllegalArgumentException(); } @@ -258,7 +340,6 @@ public class PartyWorker { addrExprs.add(EntityCondition.makeCondition("postalCodeExt", EntityOperator.EQUALS, postalCodeExt)); } - city = city.replaceAll("'", "\\\\'"); addrExprs.add(EntityCondition.makeCondition(EntityFunction.UPPER_FIELD("city"), EntityOperator.EQUALS, EntityFunction.UPPER(city))); if (countryGeoId != null) { @@ -269,76 +350,67 @@ public class PartyWorker { addrExprs.add(EntityCondition.makeCondition(EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, null), EntityOperator.OR, EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "PARTY_DISABLED"))); + if (partyTypeId != null) { + addrExprs.add(EntityCondition.makeCondition("partyTypeId", EntityOperator.EQUALS, partyTypeId)); + } + List<String> sort = UtilMisc.toList("-fromDate"); EntityCondition addrCond = EntityCondition.makeCondition(addrExprs, EntityOperator.AND); List<GenericValue> addresses = EntityUtil.filterByDate(delegator.findList("PartyAndPostalAddress", addrCond, null, sort, null, false)); //Debug.log("Checking for matching address: " + addrCond.toString() + "[" + addresses.size() + "]", module); + if (UtilValidate.isEmpty(addresses)) { + // No address matches, return an empty list + return addresses; + } + List<GenericValue> validFound = FastList.newInstance(); - if (UtilValidate.isNotEmpty(addresses)) { - // check the address line - for (GenericValue address: addresses) { - // address 1 field - String addr1Source = PartyWorker.makeMatchingString(delegator, address1); - String addr1Target = PartyWorker.makeMatchingString(delegator, address.getString("address1")); - - if (addr1Target != null) { - Debug.log("Comparing address1 : " + addr1Source + " / " + addr1Target, module); - if (addr1Target.equals(addr1Source)) { - - // address 2 field - if (address2 != null) { - String addr2Source = PartyWorker.makeMatchingString(delegator, address2); - String addr2Target = PartyWorker.makeMatchingString(delegator, address.getString("address2")); - if (addr2Target != null) { - Debug.log("Comparing address2 : " + addr2Source + " / " + addr2Target, module); - - if (addr2Source.equals(addr2Target)) { - Debug.log("Matching address2; adding valid address", module); - validFound.add(address); - //validParty.put(address.getString("partyId"), address.getString("contactMechId")); - } - } - } else { - if (address.get("address2") == null) { - Debug.log("No address2; adding valid address", module); + // check the address line + for (GenericValue address: addresses) { + // address 1 field + String addr1Source = PartyWorker.makeMatchingString(delegator, address1); + String addr1Target = PartyWorker.makeMatchingString(delegator, address.getString("address1")); + + if (addr1Target != null) { + Debug.log("Comparing address1 : " + addr1Source + " / " + addr1Target, module); + if (addr1Target.equals(addr1Source)) { + + // address 2 field + if (address2 != null) { + String addr2Source = PartyWorker.makeMatchingString(delegator, address2); + String addr2Target = PartyWorker.makeMatchingString(delegator, address.getString("address2")); + if (addr2Target != null) { + Debug.log("Comparing address2 : " + addr2Source + " / " + addr2Target, module); + + if (addr2Source.equals(addr2Target)) { + Debug.log("Matching address2; adding valid address", module); validFound.add(address); //validParty.put(address.getString("partyId"), address.getString("contactMechId")); } } - } - } - } - - if (UtilValidate.isNotEmpty(validFound)) { - for (GenericValue partyAndAddr: validFound) { - String partyId = partyAndAddr.getString("partyId"); - if (UtilValidate.isNotEmpty(partyId)) { - GenericValue p = delegator.findByPrimaryKey("Person", UtilMisc.toMap("partyId", partyId)); - if (p != null) { - String fName = p.getString("firstName"); - String lName = p.getString("lastName"); - String mName = p.getString("middleName"); - if (lName.toUpperCase().equals(lastName.toUpperCase())) { - if (fName.toUpperCase().equals(firstName.toUpperCase())) { - if (mName != null && middleName != null) { - if (mName.toUpperCase().equals(middleName.toUpperCase())) { - returnList.add(partyAndAddr); - } - } else if (middleName == null) { - returnList.add(partyAndAddr); - } - } - } + } else { + if (address.get("address2") == null) { + Debug.log("No address2; adding valid address", module); + validFound.add(address); + //validParty.put(address.getString("partyId"), address.getString("contactMechId")); } } } } } - - return returnList; + return validFound; } + /** + * Converts the supplied String into a String suitable for address line matching. + * Performs the following transformations on the supplied String: + * - Converts to upper case + * - Retrieves all records from the AddressMatchMap table and replaces all occurrences of addressMatchMap.mapKey with addressMatchMap.mapValue using upper case matching. + * - Removes all non-word characters from the String i.e. everything except A-Z, 0-9 and _ + * @param delegator A Delegator instance + * @param address The address String to convert + * @return The converted Address + */ public static String makeMatchingString(Delegator delegator, String address) { if (address == null) { return null; Modified: ofbiz/branches/jquery/applications/party/testdef/PartyContactMechTests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/testdef/PartyContactMechTests.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/testdef/PartyContactMechTests.xml (original) +++ ofbiz/branches/jquery/applications/party/testdef/PartyContactMechTests.xml Wed Aug 11 13:22:40 2010 @@ -29,4 +29,4 @@ <simple-method-test location="component://party/script/org/ofbiz/party/test/PartyContactMechTests.xml"/> </test-case> -</test-suite> \ No newline at end of file +</test-suite> Modified: ofbiz/branches/jquery/applications/party/testdef/PartyTests.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/testdef/PartyTests.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/testdef/PartyTests.xml (original) +++ ofbiz/branches/jquery/applications/party/testdef/PartyTests.xml Wed Aug 11 13:22:40 2010 @@ -25,4 +25,4 @@ <simple-method-test location="component://party/script/org/ofbiz/party/test/PartyTests.xml"/> </test-case> -</test-suite> \ No newline at end of file +</test-suite> Modified: ofbiz/branches/jquery/applications/party/testdef/data/PartyContactMechTestData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/testdef/data/PartyContactMechTestData.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/testdef/data/PartyContactMechTestData.xml (original) +++ ofbiz/branches/jquery/applications/party/testdef/data/PartyContactMechTestData.xml Wed Aug 11 13:22:40 2010 @@ -27,4 +27,4 @@ under the License. <ContactMech contactMechId="9126" contactMechTypeId="EMAIL_ADDRESS" infoString="[hidden email]"/> <PartyContactMech partyId="DemoCustomer" contactMechId="9126" fromDate="2001-05-13 00:00:00.000" allowSolicitation="Y"/> <PartyContactMechPurpose partyId="DemoCustomer" contactMechId="9126" contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2001-05-13 00:00:00.000"/> -</entity-engine-xml> \ No newline at end of file +</entity-engine-xml> Modified: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/communication/FindCommEventContactMechs.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/communication/FindCommEventContactMechs.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/communication/FindCommEventContactMechs.groovy (original) +++ ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/communication/FindCommEventContactMechs.groovy Wed Aug 11 13:22:40 2010 @@ -40,4 +40,4 @@ if (parameters.communicationEventTypeId) targetEmailAddresses = EntityUtil.filterByDate(targetEmailAddresses, UtilDateTime.nowTimestamp(), "contactFromDate", "contactThruDate", true); context.targetEmailAddresses = targetEmailAddresses; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy (original) +++ ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy Wed Aug 11 13:22:40 2010 @@ -29,4 +29,4 @@ if (parameters.communicationEventId) { ]); context.projectMgrExists = ComponentConfig.componentExists("projectmgr"); -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/communication/ListCommunications.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/communication/ListCommunications.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/communication/ListCommunications.groovy (original) +++ ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/communication/ListCommunications.groovy Wed Aug 11 13:22:40 2010 @@ -51,4 +51,4 @@ context.eventListSize = events.size(); context.highIndex = events.size(); context.viewSize = events.size(); context.lowIndex = 1; -context.viewIndex = 1; \ No newline at end of file +context.viewIndex = 1; Modified: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/EditPaymentMethod.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/EditPaymentMethod.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/EditPaymentMethod.groovy (original) +++ ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/EditPaymentMethod.groovy Wed Aug 11 13:22:40 2010 @@ -54,4 +54,4 @@ context.donePage = parameters.DONE_PAGE paymentMethodData = paymentResults.paymentMethod; if (!tryEntity.booleanValue()) paymentMethodData = parameters; if (!paymentMethodData) paymentMethodData = new HashMap(); -if (paymentMethodData) context.paymentMethodData = paymentMethodData; \ No newline at end of file +if (paymentMethodData) context.paymentMethodData = paymentMethodData; Modified: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/FindMatches.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/FindMatches.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/FindMatches.groovy (original) +++ ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/FindMatches.groovy Wed Aug 11 13:22:40 2010 @@ -41,7 +41,7 @@ if (match) { return; } - context.matches = PartyWorker.findMatchingPartyAndPostalAddress(delegator, address1, address2, city, + context.matches = PartyWorker.findMatchingPersonPostalAddresses(delegator, address1, address2, city, state, postalCode, null, null, firstName, null, lastName); context.addressString = PartyWorker.makeMatchingString(delegator, address1); Modified: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetContactMechs.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetContactMechs.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetContactMechs.groovy (original) +++ ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetContactMechs.groovy Wed Aug 11 13:22:40 2010 @@ -21,4 +21,4 @@ import org.ofbiz.party.contact.ContactMe partyId = partyId ?: parameters.partyId; showOld = "true".equals(parameters.SHOW_OLD); -context.contactMeches = ContactMechWorker.getPartyContactMechValueMaps(delegator, partyId, showOld); \ No newline at end of file +context.contactMeches = ContactMechWorker.getPartyContactMechValueMaps(delegator, partyId, showOld); Modified: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetCurrentCart.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetCurrentCart.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetCurrentCart.groovy (original) +++ ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetCurrentCart.groovy Wed Aug 11 13:22:40 2010 @@ -27,4 +27,4 @@ savedCart = EntityUtil.getFirst(delegato if (savedCart) { context.savedCartListId = savedCart.shoppingListId; context.savedCartItems = savedCart.getRelated("ShoppingListItem"); -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetLoyaltyPoints.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetLoyaltyPoints.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetLoyaltyPoints.groovy (original) +++ ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetLoyaltyPoints.groovy Wed Aug 11 13:22:40 2010 @@ -34,4 +34,4 @@ if (partyId) { context.monthsToInclude = monthsToInclude; context.totalSubRemainingAmount = result.totalSubRemainingAmount; context.totalOrders = result.totalOrders; -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy (original) +++ ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/GetMyCompany.groovy Wed Aug 11 13:22:40 2010 @@ -28,4 +28,4 @@ if (userLogin) { } else { context.myCompanyId = userLogin.partyId; } -} \ No newline at end of file +} Modified: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy (original) +++ ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/StatusCondition.groovy Wed Aug 11 13:22:40 2010 @@ -23,4 +23,4 @@ exprList = [EntityCondition.makeConditio EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, null)]; condList = EntityCondition.makeCondition(exprList, EntityOperator.AND); context.andCondition = EntityCondition.makeCondition([condList, EntityCondition.makeCondition("statusId", EntityOperator.EQUALS, null)], EntityOperator.OR); - \ No newline at end of file + Modified: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedPaymentsForParty.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedPaymentsForParty.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedPaymentsForParty.groovy (original) +++ ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/UnAppliedPaymentsForParty.groovy Wed Aug 11 13:22:40 2010 @@ -73,4 +73,4 @@ while (payment = payIterator.next()) { } payIterator.close(); -context.paymentList = paymentList; \ No newline at end of file +context.paymentList = paymentList; Modified: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy (original) +++ ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy Wed Aug 11 13:22:40 2010 @@ -33,4 +33,4 @@ if (!partyId && userLoginId) { context.showOld = "true".equals(parameters.SHOW_OLD); context.partyId = partyId; context.party = delegator.findByPrimaryKey("Party", [partyId : partyId]); -context.nowStr = UtilDateTime.nowTimestamp().toString(); \ No newline at end of file +context.nowStr = UtilDateTime.nowTimestamp().toString(); Modified: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/visit/VisitDetails.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/visit/VisitDetails.groovy?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/visit/VisitDetails.groovy (original) +++ ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/visit/VisitDetails.groovy Wed Aug 11 13:22:40 2010 @@ -62,4 +62,4 @@ context.viewIndex = viewIndex; context.viewSize = viewSize; context.listSize = listSize; context.lowIndex = lowIndex; -context.highIndex = highIndex; \ No newline at end of file +context.highIndex = highIndex; Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/CommonScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/CommonScreens.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/CommonScreens.xml Wed Aug 11 13:22:40 2010 @@ -190,4 +190,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/LookupForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/LookupForms.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/LookupForms.xml Wed Aug 11 13:22:40 2010 @@ -433,4 +433,4 @@ under the License. <field name="noConditionFind"><hidden value="Y"/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationForms.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationForms.xml Wed Aug 11 13:22:40 2010 @@ -148,4 +148,4 @@ under the License. </hyperlink> </field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationScreens.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyClassificationScreens.xml Wed Aug 11 13:22:40 2010 @@ -145,4 +145,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyContactListForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyContactListForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyContactListForms.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyContactListForms.xml Wed Aug 11 13:22:40 2010 @@ -105,4 +105,4 @@ under the License. <field name="contactMechTypeId" title="${uiLabelMap.PartyContactMechType}"><display-entity description="${description}" entity-name="ContactMechType"/></field> <field name="marketingCampaignId"><display-entity entity-name="MarketingCampaign" description="${campaignName}"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyInvitationScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyInvitationScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyInvitationScreens.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyInvitationScreens.xml Wed Aug 11 13:22:40 2010 @@ -196,4 +196,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyScreens.xml Wed Aug 11 13:22:40 2010 @@ -1146,4 +1146,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PaymentMethodForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PaymentMethodForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/PaymentMethodForms.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/PaymentMethodForms.xml Wed Aug 11 13:22:40 2010 @@ -29,4 +29,4 @@ under the License. <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="backHome" also-hidden="false" description="[${uiLabelMap.CommonCancelDone}]"/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PaymentMethodScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PaymentMethodScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/PaymentMethodScreens.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/PaymentMethodScreens.xml Wed Aug 11 13:22:40 2010 @@ -149,4 +149,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/SecurityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/SecurityForms.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/SecurityForms.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/SecurityForms.xml Wed Aug 11 13:22:40 2010 @@ -223,4 +223,4 @@ under the License. </field> <field name="View Cert" title="${uiLabelMap.PartyViewCert}"><submit/></field> </form> -</forms> \ No newline at end of file +</forms> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/SecurityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/SecurityScreens.xml?rev=984399&r1=984398&r2=984399&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/SecurityScreens.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/SecurityScreens.xml Wed Aug 11 13:22:40 2010 @@ -221,4 +221,4 @@ under the License. </widgets> </section> </screen> -</screens> \ No newline at end of file +</screens> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |