svn commit: r889851 [11/17] - in /ofbiz/branches/addbirt: ./ applications/accounting/config
Locked
svn commit: r889851 [11/17] - in /ofbiz/branches/addbirt: ./ applications/accounting/config
 
|
Modified: ofbiz/branches/addbirt/applications/order/script/org/ofbiz/order/order/OrderServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/script/org/ofbiz/order/order/OrderServices.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/order/script/org/ofbiz/order/order/OrderServices.xml (original) +++ ofbiz/branches/addbirt/applications/order/script/org/ofbiz/order/order/OrderServices.xml Fri Dec 11 23:11:39 2009 @@ -1072,9 +1072,17 @@ </call-service> </if-compare> <if-compare field="keepAddressBook" operator="equals" value="Y"> - <call-service service-name="createPartyPostalAddress" in-map-name="billToAddressCtx"> - <result-to-field result-name="contactMechId" field="parameters.billToContactMechId"/> - </call-service> + <make-value entity-name="PostalAddress" value-field="newValue"/> + <set-pk-fields value-field="newValue" map="billToAddressCtx"/> + <set-nonpk-fields value-field="newValue" map="billToAddressCtx"/> + <entity-one entity-name="PostalAddress" value-field="oldValue" auto-field-map="false"> + <field-map field-name="contactMechId" from-field="billToAddressCtx.contactMechId"/> + </entity-one> + <if-compare-field field="oldValue" to-field="newValue" operator="not-equals" type="Object"> + <call-service service-name="createPartyPostalAddress" in-map-name="billToAddressCtx"> + <result-to-field result-name="contactMechId" field="parameters.billToContactMechId"/> + </call-service> + </if-compare-field> </if-compare> <log level="info" message="Billing Postal Address created billToContactMechId is ${parameters.billToContactMechId}"/> </else> Modified: ofbiz/branches/addbirt/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original) +++ ofbiz/branches/addbirt/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Fri Dec 11 23:11:39 2009 @@ -716,11 +716,16 @@ // Fetch the ProductStore GenericValue productStore = null; GenericValue orderHeader = null; - GenericValue returnItem = EntityUtil.getFirst(returnItems); - try { - orderHeader = returnItem.getRelatedOne("OrderHeader"); - } catch (GenericEntityException e) { - return ServiceUtil.returnError(e.getMessage()); + GenericValue returnItem = null; + if (UtilValidate.isNotEmpty(returnItems)) { + returnItem = EntityUtil.getFirst(returnItems); + } + if (UtilValidate.isNotEmpty(returnItem)) { + try { + orderHeader = returnItem.getRelatedOne("OrderHeader"); + } catch (GenericEntityException e) { + return ServiceUtil.returnError(e.getMessage()); + } } if (orderHeader != null) { OrderReadHelper orderReadHelper = new OrderReadHelper(orderHeader); Modified: ofbiz/branches/addbirt/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java (original) +++ ofbiz/branches/addbirt/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java Fri Dec 11 23:11:39 2009 @@ -803,8 +803,8 @@ giftMessage = request.getParameter(shipGroupIndex + "_gift_message"); isGift = request.getParameter(shipGroupIndex + "_is_gift"); internalCode = request.getParameter("internalCode"); // FIXME - shipBeforeDate = request.getParameter(shipGroupIndex + "_shipBeforeDate"); - shipAfterDate = request.getParameter(shipGroupIndex + "_shipAfterDate"); + shipBeforeDate = request.getParameter("sgi" + shipGroupIndex + "_shipBeforeDate"); + shipAfterDate = request.getParameter("sgi" + shipGroupIndex + "_shipAfterDate"); internalOrderNotes = request.getParameter("internal_order_notes"); shippingNotes = request.getParameter("shippingNotes"); Modified: ofbiz/branches/addbirt/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java (original) +++ ofbiz/branches/addbirt/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartEvents.java Fri Dec 11 23:11:39 2009 @@ -250,7 +250,7 @@ //Check for virtual products if (ProductWorker.isVirtual(delegator, productId)) { - if ("VV_FEATURETREE".equals(ProductWorker.getProductvirtualVariantMethod(delegator, productId))) { + if ("VV_FEATURETREE".equals(ProductWorker.getProductVirtualVariantMethod(delegator, productId))) { // get the selected features. List<String> selectedFeatures = new LinkedList<String>(); java.util.Enumeration paramNames = request.getParameterNames(); @@ -464,7 +464,8 @@ if (surveyResponseId != null) { surveyResponses = UtilMisc.toList(surveyResponseId); } else { - Map surveyContext = UtilHttp.getParameterMap(request); + String origParamMapId = UtilHttp.stashParameterMap(request); + Map<String, Object> surveyContext = UtilMisc.<String, Object>toMap("_ORIG_PARAM_MAP_ID_", origParamMapId); GenericValue userLogin = cart.getUserLogin(); String partyId = null; if (userLogin != null) { @@ -1184,6 +1185,8 @@ String termDaysStr = request.getParameter("termDays"); String textValue = request.getParameter("textValue"); + GenericValue termType = null; + Delegator delegator = (Delegator) request.getAttribute("delegator"); BigDecimal termValue = null; Long termDays = null; @@ -1192,6 +1195,18 @@ request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resource_error, "OrderOrderTermTypeIsRequired", locale)); return "error"; } + + try { + termType = delegator.findOne("TermType", UtilMisc.toMap("termTypeId", termTypeId), false); + } catch (GenericEntityException gee) { + request.setAttribute("_ERROR_MESSAGE_", gee.getMessage()); + return "error"; + } + + if (("FIN_PAYMENT_TERM".equals(termTypeId) && UtilValidate.isEmpty(termDaysStr)) || (UtilValidate.isNotEmpty(termType) && "FIN_PAYMENT_TERM".equals(termType.get("parentTypeId")) && UtilValidate.isEmpty(termDaysStr))) { + request.setAttribute("_ERROR_MESSAGE_", UtilProperties.getMessage(resource_error, "OrderOrderTermDaysIsRequired", locale)); + return "error"; + } if (UtilValidate.isNotEmpty(termValueStr)) { try { Modified: ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SetCheckOutTabBar.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SetCheckOutTabBar.groovy?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SetCheckOutTabBar.groovy (original) +++ ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/entry/SetCheckOutTabBar.groovy Fri Dec 11 23:11:39 2009 @@ -28,22 +28,22 @@ // ---------------------------------- // The ordered list of steps is prepared here // ---------------------------------- -checkoutSteps.add([label : "OrderOrderItems", uri : "/orderentry", enabled : "Y"]) +checkoutSteps.add([label : "OrderOrderItems", uri : "orderentry", enabled : "Y"]) if ("PURCHASE_ORDER".equals(shoppingCart.getOrderType())) { - checkoutSteps.add([label : "OrderOrderTerms", uri : "/setOrderTerm", enabled : "Y"]) + checkoutSteps.add([label : "OrderOrderTerms", uri : "setOrderTerm", enabled : "Y"]) } -checkoutSteps.add([label : "FacilityShipping", uri : "/setShipping", enabled : "Y"]) +checkoutSteps.add([label : "FacilityShipping", uri : "setShipping", enabled : "Y"]) if (shoppingCart.getShipGroupSize() > 1) { - checkoutSteps.add([label : "OrderShipGroups", uri : "/SetItemShipGroups", enabled : "Y"]) + checkoutSteps.add([label : "OrderShipGroups", uri : "SetItemShipGroups", enabled : "Y"]) } -checkoutSteps.add([label : "CommonOptions", uri : "/setOptions", enabled : "Y"]) +checkoutSteps.add([label : "CommonOptions", uri : "setOptions", enabled : "Y"]) if ("SALES_ORDER".equals(shoppingCart.getOrderType())) { - checkoutSteps.add([label : "OrderOrderTerms", uri : "/setOrderTerm", enabled : "Y"]) - checkoutSteps.add([label : "AccountingPayment", uri : "/setBilling", enabled : "Y"]) + checkoutSteps.add([label : "OrderOrderTerms", uri : "setOrderTerm", enabled : "Y"]) + checkoutSteps.add([label : "AccountingPayment", uri : "setBilling", enabled : "Y"]) } -checkoutSteps.add([label : "PartyParties", uri : "/setAdditionalParty", enabled : "Y"]) -checkoutSteps.add([label : "OrderReviewOrder", uri : "/confirmOrder", enabled : "Y"]) +checkoutSteps.add([label : "PartyParties", uri : "setAdditionalParty", enabled : "Y"]) +checkoutSteps.add([label : "OrderReviewOrder", uri : "confirmOrder", enabled : "Y"]) // --------------------------------------- Modified: ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy (original) +++ ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/entry/catalog/ProductDetail.groovy Fri Dec 11 23:11:39 2009 @@ -150,7 +150,8 @@ productSurvey = ProductStoreWorker.getProductSurveys(delegator, productStoreId, productId, "CART_ADD"); if (productSurvey) { survey = EntityUtil.getFirst(productSurvey); - surveyContext = UtilHttp.getParameterMap(request); + origParamMapId = UtilHttp.stashParameterMap(request); + surveyContext = ["_ORIG_PARAM_MAP_ID_" : origParamMapId]; surveyPartyId = userLogin?.partyId; wrapper = new ProductStoreSurveyWrapper(survey, surveyPartyId, surveyContext); context.surveyWrapper = wrapper; Modified: ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy (original) +++ ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy Fri Dec 11 23:11:39 2009 @@ -114,7 +114,14 @@ grandTotal = OrderReadHelper.getOrderGrandTotal(orderItems, orderAdjustments); context.grandTotal = grandTotal; + canceledPromoOrderItem = [:]; orderItemList = orderReadHelper.getOrderItems(); + orderItemList.each { orderItem -> + if("Y".equals(orderItem.get("isPromo")) && "ITEM_CANCELLED".equals(orderItem.get("statusId"))) { + canceledPromoOrderItem = orderItem; + } + orderItemList.remove(canceledPromoOrderItem); + } context.orderItemList = orderItemList; shippingAddress = orderReadHelper.getShippingAddress(); Modified: ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ ofbiz/branches/addbirt/applications/order/webapp/ordermgr/WEB-INF/controller.xml Fri Dec 11 23:11:39 2009 @@ -428,7 +428,7 @@ </request-map> <request-map uri="additemsurvey"> <security https="true" auth="true"/> - <event type="service" invoke="createSurveyResponse"/> + <event type="java" invoke="createSurveyResponseAndRestoreParameters" path="org.ofbiz.content.survey.SurveyEvents"/> <response name="success" type="request" value="additem"/> <response name="error" type="request" value="orderentry"/> </request-map> @@ -528,7 +528,7 @@ </request-map> <request-map uri="addGiftCertificateSurvey"> <security https="true" auth="false"/> - <event type="service" invoke="createSurveyResponse"/> + <event type="java" invoke="createSurveyResponseAndRestoreParameters" path="org.ofbiz.content.survey.SurveyEvents"/> <response name="success" type="request" value="additem"/> <response name="error" type="view" value="AddGiftCertificate"/> </request-map> Modified: ofbiz/branches/addbirt/applications/order/webapp/ordermgr/entry/optionsettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/webapp/ordermgr/entry/optionsettings.ftl?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/order/webapp/ordermgr/entry/optionsettings.ftl (original) +++ ofbiz/branches/addbirt/applications/order/webapp/ordermgr/entry/optionsettings.ftl Fri Dec 11 23:11:39 2009 @@ -25,6 +25,28 @@ <table width='100%' border='0' cellspacing='0' cellpadding='0' class='boxbottom'> <tr> <td> + <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0"> + <tr> + <td colspan="2"> + <h2>${uiLabelMap.OrderInternalNote}</h2> + </td> + <td colspan="2"> + <h2>${uiLabelMap.OrderShippingNotes}</h2> + </td> + </tr> + <tr> + <td colspan="2"> + <textarea cols="30" rows="3" name="internal_order_notes"></textarea> + </td> + <td colspan="2"> + <textarea cols="30" rows="3" name="shippingNotes"></textarea> + </td> + </tr> + </table> + </td> + </tr> + <tr> + <td> <form method="post" action="<@ofbizUrl>finalizeOrder</@ofbizUrl>" name="checkoutsetupform"> <input type="hidden" name="finalizeMode" value="options"/> <#list 1..cart.getShipGroupSize() as currIndex> @@ -37,29 +59,7 @@ <#assign supplier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", supplierPartyId))?if_exists /> <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td colspan="2"> - <table width="100%" cellpadding="1" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td colspan="2"> - <h2>${uiLabelMap.OrderInternalNote}</h2> - </td> - <td colspan="2"> - <h2>${uiLabelMap.OrderShippingNotes}</h2> - </td> - </tr> - <tr> - <td colspan="2"> - <textarea cols="30" rows="3" name="internal_order_notes"></textarea> - </td> - <td colspan="2"> - <textarea cols="30" rows="3" name="shippingNotes"></textarea> - </td> - </tr> - </table> - </td> - </tr> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr/></td></tr> <tr> <td colspan="2"> <h1><b>${uiLabelMap.OrderShipGroup} ${uiLabelMap.CommonNbr} ${currIndex}</b><#if supplier?has_content> - ${supplier.groupName?default(supplier.partyId)}</#if></h1> @@ -67,6 +67,11 @@ </tr> <#if cart.getOrderType() != "PURCHASE_ORDER"> + <tr> + <td colspan="2"> + <h2>${uiLabelMap.ProductShipmentMethod}</h2> + </td> + </tr> <#assign shipEstimateWrapper = Static["org.ofbiz.order.shoppingcart.shipping.ShippingEstimateWrapper"].getWrapper(dispatcher, cart, 0)> <#assign carrierShipmentMethods = shipEstimateWrapper.getShippingMethods()> <#list carrierShipmentMethods as carrierShipmentMethod> @@ -103,7 +108,6 @@ </td> </tr> </#if> - <tr><td colspan='2'><hr/></td></tr> <#else> <input type='hidden' name='${shipGroupIndex?default("0")}_shipping_method' value="NO_SHIPPING@_NA_"> </#if> @@ -128,7 +132,32 @@ <div>${uiLabelMap.FacilityShipAvailable}</div> </td> </tr> - <tr><td colspan="2"><hr/></td></tr> + <tr> + <td colspan="2"> + <h2>${uiLabelMap.OrderShipBeforeDate}</h2> + </td> + </tr> + <tr> + <td colspan="2"> + <div> + <input type="text" size="25" maxlength="30" name="sgi${shipGroupIndex?default('0')}_shipBeforeDate"/> + <a href="javascript:call_cal(document.checkoutsetupform.sgi${shipGroupIndex?default("0")}_shipBeforeDate,'');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a> + </div> + </td> + </tr> + <tr> + <td colspan="2"> + <h2>${uiLabelMap.OrderShipAfterDate}</h2> + </td> + </tr> + <tr> + <td colspan="2"> + <div> + <input type="text" size="25" maxlength="30" name="sgi${shipGroupIndex?default('0')}_shipAfterDate"/> + <a href="javascript:call_cal(document.checkoutsetupform.sgi${shipGroupIndex?default("0")}_shipAfterDate,'');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a> + </div> + </td> + </tr> <tr> <td colspan="2"> <h2>${uiLabelMap.FacilitySpecialInstructions}</h2> @@ -154,7 +183,6 @@ </td> </tr> </#if> - <tr><td colspan="2"><hr /></td></tr> <tr> <td colspan="2"> <h2>${uiLabelMap.OrderGiftMessage}</h2> Modified: ofbiz/branches/addbirt/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl (original) +++ ofbiz/branches/addbirt/applications/order/webapp/ordermgr/order/orderReportContactMechs.fo.ftl Fri Dec 11 23:11:39 2009 @@ -39,8 +39,14 @@ <#if postalAddress.attnName?has_content><fo:block>${postalAddress.attnName?if_exists}</fo:block></#if> <fo:block>${postalAddress.address1?if_exists}</fo:block> <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2?if_exists}</fo:block></#if> - <fo:block>${postalAddress.city?if_exists}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId} </#if><#if postalAddress.postalCode?has_content>${postalAddress.postalCode}</#if></fo:block> - <fo:block>${postalAddress.countryGeoId?if_exists}</fo:block> + <fo:block> + <#assign stateGeo = (delegator.findOne("Geo", {"geoId", postalAddress.stateProvinceGeoId?if_exists}, false))?if_exists /> + ${postalAddress.city}<#if stateGeo?has_content>, ${stateGeo.geoName?if_exists}</#if> ${postalAddress.postalCode?if_exists} + </fo:block> + <fo:block> + <#assign countryGeo = (delegator.findOne("Geo", {"geoId", postalAddress.countryGeoId?if_exists}, false))?if_exists /> + <#if countryGeo?has_content>${countryGeo.geoName?if_exists}</#if> + </fo:block> </#if> </fo:table-cell> <#else> @@ -69,7 +75,14 @@ <#if postalAddress.attnName?has_content><fo:block>${postalAddress.attnName?if_exists}</fo:block></#if> <fo:block>${postalAddress.address1?if_exists}</fo:block> <#if postalAddress.address2?has_content><fo:block>${postalAddress.address2?if_exists}</fo:block></#if> - <fo:block>${postalAddress.city?if_exists}<#if postalAddress.stateProvinceGeoId?has_content>, ${postalAddress.stateProvinceGeoId} </#if><#if postalAddress.postalCode?has_content>${postalAddress.postalCode}</#if></fo:block> + <fo:block> + <#assign stateGeo = (delegator.findOne("Geo", {"geoId", postalAddress.stateProvinceGeoId?if_exists}, false))?if_exists /> + ${postalAddress.city}<#if stateGeo?has_content>, ${stateGeo.geoName?if_exists}</#if> ${postalAddress.postalCode?if_exists} + </fo:block> + <fo:block> + <#assign countryGeo = (delegator.findOne("Geo", {"geoId", postalAddress.countryGeoId?if_exists}, false))?if_exists /> + <#if countryGeo?has_content>${countryGeo.geoName?if_exists}</#if> + </fo:block> </#if> </fo:table-cell> </#if> Modified: ofbiz/branches/addbirt/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/branches/addbirt/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Fri Dec 11 23:11:39 2009 @@ -517,7 +517,9 @@ </td> </form> </#if> - <#if shipGroup.shipAfterDate?has_content> + <form name="setShipGroupDates_${shipGroup.shipGroupSeqId}" method="post" action="<@ofbizUrl>updateOrderItemShipGroup</@ofbizUrl>"> + <input type="hidden" name="orderId" value="${orderHeader.orderId}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> <tr><td colspan="3"><hr/></td></tr> <tr> <td align="right" valign="top" width="15%"> @@ -525,22 +527,22 @@ </td> <td width="5"> </td> <td valign="top" width="80%"> - ${shipGroup.shipAfterDate} + <input type="text" size="23" name="shipAfterDate" value="${shipGroup.shipAfterDate?if_exists}"/> + <a href="javascript:call_cal(document.setShipGroupDates_${shipGroup.shipGroupSeqId}.shipAfterDate,'');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a> </td> </tr> - </#if> - <#if shipGroup.shipByDate?has_content> - <tr><td colspan="3"><hr/></td></tr> - <tr> + <tr> <td align="right" valign="top" width="15%"> <span class="label"> ${uiLabelMap.OrderShipBeforeDate}<span> </td> <td width="5"> </td> <td valign="top" width="80%"> - ${shipGroup.shipByDate} + <input type="text" size="23" name="shipByDate" value="${shipGroup.shipByDate?if_exists}"/> + <a href="javascript:call_cal(document.setShipGroupDates_${shipGroup.shipGroupSeqId}.shipByDate,'');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.OrderCalendarClickHereForCalendar}"/></a> + <input type="submit" value="${uiLabelMap.CommonUpdate}"/> </td> </tr> - </#if> + </form> <#assign shipGroupShipments = shipGroup.getRelated("PrimaryShipment")> <#if shipGroupShipments?has_content> <tr><td colspan="3"><hr/></td></tr> @@ -575,7 +577,7 @@ </#if> <#-- shipment actions --> - <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && ((orderHeader.statusId == "ORDER_APPROVED") || (orderHeader.statusId == "ORDER_SENT"))> + <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session) && ((orderHeader.statusId == "ORDER_CREATED") || (orderHeader.statusId == "ORDER_APPROVED") || (orderHeader.statusId == "ORDER_SENT"))> <#-- Manual shipment options --> @@ -584,22 +586,26 @@ <td colspan="3" valign="top" width="100%" align="center"> <#if orderHeader.orderTypeId == "SALES_ORDER"> <#if !shipGroup.supplierPartyId?has_content> - <a href="/facility/control/PackOrder?facilityId=${storeFacilityId?if_exists}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a> + <#if orderHeader.statusId == "ORDER_APPROVED"> + <a href="/facility/control/PackOrder?facilityId=${storeFacilityId?if_exists}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup}</a> <br/> - <a href="javascript:document.createShipment.submit()" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup}</a> - <form name="createShipment" method="post" action="/facility/control/createShipment"> + </#if> + <a href="javascript:document.createShipment_${shipGroup.shipGroupSeqId}.submit()" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup}</a> + <form name="createShipment_${shipGroup.shipGroupSeqId}" method="post" action="/facility/control/createShipment"> <input type="hidden" name="primaryOrderId" value="${orderId}"/> <input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> <input type="hidden" name="statusId" value="SHIPMENT_INPUT"> <input type="hidden" name="facilityId" value=${storeFacilityId?if_exists}> + <input type="hidden" name="estimatedShipDate" value="${shipGroup.shipByDate?if_exists}"/> </form> </#if> <#else> + <#if (orderHeader.statusId == "ORDER_APPROVED") || (orderHeader.statusId == "ORDER_SENT")> <#assign facilities = facilitiesForShipGroup.get(shipGroup.shipGroupSeqId)> <#if facilities?has_content> <div> - <a href="javascript:document.createShipment2.submit()" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup}</a> - <form name="createShipment2" method="post" action="/facility/control/createShipment"> + <a href="javascript:document.createShipment2_${shipGroup.shipGroupSeqId}.submit()" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup}</a> + <form name="createShipment2_${shipGroup.shipGroupSeqId}" method="post" action="/facility/control/createShipment"> <input type="hidden" name="primaryOrderId" value="${orderId}"/> <input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> <input type="hidden" name="shipmentTypeId" value="PURCHASE_SHIPMENT"/> @@ -617,13 +623,13 @@ </div> <#else> <a href="javascript:document.quickDropShipOrder_${shipGroup_index}.submit();" class="buttontext">${uiLabelMap.ProductShipmentQuickComplete}</a> - <a href="javascript:document.createShipment3.submit();" class="buttontext">${uiLabelMap.OrderNewDropShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a> + <a href="javascript:document.createShipment3_${shipGroup.shipGroupSeqId}.submit();" class="buttontext">${uiLabelMap.OrderNewDropShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a> <form name="quickDropShipOrder_${shipGroup_index}" method="post" action="<@ofbizUrl>quickDropShipOrder</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderId}"/> <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> <input type="hidden" name="externalLoginKey" value="${externalLoginKey}"> </form> - <form name="createShipment3" method="post" action="/facility/control/createShipment"> + <form name="createShipment3_${shipGroup.shipGroupSeqId}" method="post" action="/facility/control/createShipment"> <input type="hidden" name="primaryOrderId" value="${orderId}"/> <input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> <input type="hidden" name="shipmentTypeId" value="DROP_SHIPMENT"> @@ -631,6 +637,7 @@ <input type="hidden" name="externalLoginKey" value="${externalLoginKey}"> </form> </#if> + </#if> </#if> </td> </tr> Modified: ofbiz/branches/addbirt/applications/order/webapp/ordermgr/return/returnItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/order/webapp/ordermgr/return/returnItems.ftl (original) +++ ofbiz/branches/addbirt/applications/order/webapp/ordermgr/return/returnItems.ftl Fri Dec 11 23:11:39 2009 @@ -56,12 +56,13 @@ </div> </td> <#if (adjEditable)> - <td align='right'><a href="<@ofbizUrl>removeReturnAdjustment?returnAdjustmentId=${returnAdjustment.returnAdjustmentId}&returnId=${returnAdjustment.returnId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRemove}</a></td> + <td align='right'><a href='javascript:document.removeReturnAdjustment_${rowCountForAdjRemove}.submit()' class='buttontext'>${uiLabelMap.CommonRemove}</a></td> <#else> <td> </td> </#if> <#if (adjEditable)> <#assign rowCount = rowCount + 1> + <#assign rowCountForAdjRemove = rowCountForAdjRemove + 1> </#if> <#assign returnTotal = returnTotal + returnAdjustment.amount?default(0)> </tr> @@ -139,6 +140,7 @@ </tr> <#assign returnTotal = 0.0> <#assign rowCount = 0> + <#assign rowCountForAdjRemove = 0> <form method="post" action="<@ofbizUrl>updateReturnItems</@ofbizUrl>"> <input type="hidden" name="_useRowSubmit" value="Y"> <#if returnItems?has_content> @@ -322,6 +324,14 @@ </form> </#list> </#if> + <#if returnAdjustments?has_content> + <#list returnAdjustments as returnAdjustment> + <form name="removeReturnAdjustment_${returnAdjustment_index}" method="post" action="<@ofbizUrl>removeReturnAdjustment</@ofbizUrl>"> + <input type="hidden" name="returnId" value="${returnAdjustment.returnId}"/> + <input type="hidden" name="returnAdjustmentId" value="${returnAdjustment.returnAdjustmentId}"/> + </form> + </#list> + </#if> <#if (returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED") && (rowCount > 0)> <br/> <form name="acceptReturn" method="post" action="<@ofbizUrl>/updateReturn</@ofbizUrl>"> Modified: ofbiz/branches/addbirt/applications/order/widget/ordermgr/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/widget/ordermgr/FieldLookupForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/order/widget/ordermgr/FieldLookupForms.xml (original) +++ ofbiz/branches/addbirt/applications/order/widget/ordermgr/FieldLookupForms.xml Fri Dec 11 23:11:39 2009 @@ -115,7 +115,7 @@ <field name="grandTotal"><range-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="listLookupOrderHeaderAndShipInfo" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupOrderHeaderAndShipInfo"> @@ -179,7 +179,7 @@ <field name="grandTotal"><range-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="lookupCustRequest" target="LookupCustRequest" title="" type="single" @@ -225,7 +225,7 @@ <field name="lastModifiedByUserLogin"><hidden/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="listLookupCustRequest" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupCustRequest"> @@ -270,7 +270,7 @@ <field name="priority"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="listLookupCustRequestItem" list-name="listIt" title="" type="list" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" paginate-target="LookupCustRequestItem"> Modified: ofbiz/branches/addbirt/applications/order/widget/ordermgr/OrderEntryForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/widget/ordermgr/OrderEntryForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/order/widget/ordermgr/OrderEntryForms.xml (original) +++ ofbiz/branches/addbirt/applications/order/widget/ordermgr/OrderEntryForms.xml Fri Dec 11 23:11:39 2009 @@ -25,7 +25,7 @@ <field name="partyId" title="${uiLabelMap.PartySupplier}"><lookup target-form-name="LookupPartyName"/></field> <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field> <field name="requirementByDate"><date-find type="date"/></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="RequirementsList" type="multi" use-row-submit="true" target="addRequirementsToCart" title="" list-name="requirementsForSupplier" default-title-style="tableheadtext" default-widget-style="tabletext" default-tooltip-style="tabletext" Modified: ofbiz/branches/addbirt/applications/order/widget/ordermgr/RequirementForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/widget/ordermgr/RequirementForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/order/widget/ordermgr/RequirementForms.xml (original) +++ ofbiz/branches/addbirt/applications/order/widget/ordermgr/RequirementForms.xml Fri Dec 11 23:11:39 2009 @@ -49,7 +49,7 @@ <field name="description"><text-find/></field> <field name="requirementStartDate" title="${uiLabelMap.OrderRequirementStartDate}"><date-find type="date"/></field> <field name="requiredByDate" title="${uiLabelMap.OrderRequirementByDate}"><date-find type="date"/></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"> <submit button-type="button"/> </field> </form> @@ -231,7 +231,7 @@ <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field> <field name="requirementStartDate"><date-find type="date"/></field> <field name="requiredByDate"><date-find type="date"/></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"> <submit button-type="button"/> </field> </form> @@ -284,7 +284,7 @@ </field> <field name="productId" title="${uiLabelMap.ProductProductId}"><lookup target-form-name="LookupProduct"/></field> <field name="requirementByDate"><date-find type="date"/></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ApprovedProductRequirementsList" type="list" title="" list-name="requirementsForSupplier" paginate-target="RequirementsForSupplier" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> Modified: ofbiz/branches/addbirt/applications/order/widget/ordermgr/ReturnForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/order/widget/ordermgr/ReturnForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/order/widget/ordermgr/ReturnForms.xml (original) +++ ofbiz/branches/addbirt/applications/order/widget/ordermgr/ReturnForms.xml Fri Dec 11 23:11:39 2009 @@ -144,7 +144,7 @@ <date-find/> </field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"> + <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"> <submit button-type="button"/> </field> </form> Modified: ofbiz/branches/addbirt/applications/party/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/party/servicedef/services.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/party/servicedef/services.xml (original) +++ ofbiz/branches/addbirt/applications/party/servicedef/services.xml Fri Dec 11 23:11:39 2009 @@ -79,8 +79,6 @@ <attribute name="description" type="String" mode="IN" optional="true"/> <attribute name="externalId" type="String" mode="IN" optional="true"/> <attribute name="statusId" type="String" mode="IN" optional="true"/> - <override name="firstName" optional="false"/> - <override name="lastName" optional="false"/> </service> <service name="createPersonAndUserLogin" engine="simple" require-new-transaction="true" location="component://party/script/org/ofbiz/party/party/PartySimpleMethods.xml" invoke="createPersonAndUserLogin" auth="false"> @@ -680,7 +678,7 @@ <auto-attributes mode="IN" include="pk"/> </service> <service name="createPartyIdentifications" engine="simple" default-entity-name="PartyIdentification" - location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="updatePartyNameFromPerson"> + location="component://party/script/org/ofbiz/party/party/PartyServices.xml" invoke="createPartyIdentifications"> <description>create many identifications with format in map identifications : [partyType : TYPE, TYPE : value]</description> <permission-service service-name="partyBasePermissionCheck" main-action="CREATE"/> <attribute name="partyId" mode="IN" type="String"/> Propchange: ofbiz/branches/addbirt/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Dec 11 23:11:39 2009 @@ -1,2 +1,2 @@ /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456 -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:885100-885662 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:831205-889845 Modified: ofbiz/branches/addbirt/applications/party/webapp/partymgr/static/partymgr.css URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/party/webapp/partymgr/static/partymgr.css?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/party/webapp/partymgr/static/partymgr.css (original) +++ ofbiz/branches/addbirt/applications/party/webapp/partymgr/static/partymgr.css Fri Dec 11 23:11:39 2009 @@ -33,3 +33,8 @@ float: right; width: 47%; } + +.profile-bottom { +float: left; +width: 100%; +} Modified: ofbiz/branches/addbirt/applications/party/widget/partymgr/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/party/widget/partymgr/LookupForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/party/widget/partymgr/LookupForms.xml (original) +++ ofbiz/branches/addbirt/applications/party/widget/partymgr/LookupForms.xml Fri Dec 11 23:11:39 2009 @@ -34,7 +34,7 @@ <field name="lastName" title="${uiLabelMap.PartyLastName}"><text-find/></field> <field name="groupName" title="${uiLabelMap.PartyGroupName}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> <form name="listLookupPartyName" type="list" list-name="listIt" paginate-target="LookupPartyName" @@ -69,7 +69,7 @@ <field name="lastName" title="${uiLabelMap.PartyLastName}"><text-find/></field> <field name="groupName" title="${uiLabelMap.PartyGroupName}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> <form name="listLookupPartyEmail" type="list" list-name="listIt" paginate-target="LookupPartyEmail" @@ -106,7 +106,7 @@ <field name="lastName" title="${uiLabelMap.PartyLastName}"><text-find/></field> <field name="groupName" title="${uiLabelMap.PartyGroupName}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> <form name="listLookupCustomerName" type="list" list-name="listIt" paginate-target="LookupCustomerName" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -144,7 +144,7 @@ <field name="lastName" title="${uiLabelMap.PartyLastName}"><text-find/></field> <field name="groupName" title="${uiLabelMap.PartyGroupName}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> <form name="listLookupCustomerNameForSalesRep" type="list" list-name="listIt" paginate-target="LookupCustomerNameForSalesRep" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> @@ -176,7 +176,7 @@ <field name="firstName" title="${uiLabelMap.PartyFirstName}"><text-find/></field> <field name="lastName" title="${uiLabelMap.PartyLastName}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> <form name="listLookupPerson" type="list" list-name="listIt" paginate-target="LookupPerson" @@ -207,7 +207,7 @@ <field name="groupName" title="${uiLabelMap.PartyGroupName}"><text-find/></field> <field name="createdDate" title="${uiLabelMap.PartyCreatedDate}"><date-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> <form name="listLookupPartyAndUserLoginAndPerson" type="list" list-name="listIt" paginate-target="LookupPartyAndUserLoginAndPerson" @@ -237,7 +237,7 @@ <field name="groupName" title="${uiLabelMap.PartyGroupName}"><text-find/></field> <field name="createdDate" title="${uiLabelMap.PartyCreatedDate}"><date-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> <form name="listLookupUserLoginAndPartyDetails" type="list" list-name="listIt" paginate-target="LookupUserLoginAndPartyDetails" @@ -291,7 +291,7 @@ </drop-down> </field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> <form name="listLookupPartyClassificationGroup" type="list" list-name="listIt" @@ -405,7 +405,7 @@ <field name="paPostalCode"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="submitButton" title="${uiLabelMap.CommonLookup}"><submit button-type="button"/></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> <form name="listLookupContactMech" type="list" list-name="listIt" paginate-target="LookupContactMech" Modified: ofbiz/branches/addbirt/applications/party/widget/partymgr/PartyInvitationForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/party/widget/partymgr/PartyInvitationForms.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/party/widget/partymgr/PartyInvitationForms.xml (original) +++ ofbiz/branches/addbirt/applications/party/widget/partymgr/PartyInvitationForms.xml Fri Dec 11 23:11:39 2009 @@ -37,7 +37,7 @@ </field> <field name="performSearch"><hidden value="Y"/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> - <field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> <form name="ListPartyInvitations" type="list" list-name="listIt" default-entity-name="PartyInvitation" Modified: ofbiz/branches/addbirt/applications/product/config/ImageProperties.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/addbirt/applications/product/config/ImageProperties.xml?rev=889851&r1=889850&r2=889851&view=diff ============================================================================== --- ofbiz/branches/addbirt/applications/product/config/ImageProperties.xml (original) +++ ofbiz/branches/addbirt/applications/product/config/ImageProperties.xml Fri Dec 11 23:11:39 2009 @@ -1,38 +1,38 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- -Licensed to the Apache Software Foundation (ASF) under one -or more contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. The ASF licenses this file -to you under the Apache License, Version 2.0 (the -"License"); you may not use this file except in compliance -with the License. You may obtain a copy of the License at - -http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, -software distributed under the License is distributed on an -"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -KIND, either express or implied. See the License for the -specific language governing permissions and limitations -under the License. ---> -<imageSize xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <format name="extension" value="jpg"/> - <size name="small"> - <dimension name="height" value="100"/> - <dimension name="width" value="100"/> - </size> - <size name="medium"> - <dimension name="height" value="200"/> - <dimension name="width" value="200"/> - </size> - <size name="large"> - <dimension name="height" value="600"/> - <dimension name="width" value="600"/> - </size> - <size name="detail"> - <dimension name="height" value="1500"/> - <dimension name="width" value="1500"/> - </size> -</imageSize> +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<imageSize xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <format name="extension" value="jpg"/> + <size name="small"> + <dimension name="height" value="100"/> + <dimension name="width" value="100"/> + </size> + <size name="medium"> + <dimension name="height" value="200"/> + <dimension name="width" value="200"/> + </size> + <size name="large"> + <dimension name="height" value="600"/> + <dimension name="width" value="600"/> + </size> + <size name="detail"> + <dimension name="height" value="1500"/> + <dimension name="width" value="1500"/> + </size> +</imageSize> Propchange: ofbiz/branches/addbirt/applications/product/config/ImageProperties.xml ------------------------------------------------------------------------------ svn:eol-style = native |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |