svn commit: r489999 - in /incubator/ofbiz/trunk/applica
Locked
 
|
Author: jacopoc
Date: Sat Dec 23 23:51:17 2006 New Revision: 489999 URL: http://svn.apache.org/viewvc?view=rev&rev=489999 Log: A bunch of fixes for html validation for the order view screen; no functional changes. Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl?view=diff&rev=489999&r1=489998&r2=489999 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordercontactinfo.ftl Sat Dec 23 23:51:17 2006 @@ -51,9 +51,9 @@ </#if> <#if partyId?exists> <span> (<a href="${customerDetailLink}${partyId}" target="partymgr" class="buttontext">${partyId}</a>)</span> - <span align="right"> - <a href="<@ofbizUrl>/orderentry?partyId=${partyId}&orderTypeId=${orderHeader.orderTypeId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNewOrder}</a> - <a href="<@ofbizUrl>/findorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderOtherOrders}</a> + <span> + <a href="<@ofbizUrl>/orderentry?partyId=${partyId}&orderTypeId=${orderHeader.orderTypeId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderNewOrder}</a> + <a href="<@ofbizUrl>/findorders?lookupFlag=Y&hideFields=Y&partyId=${partyId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderOtherOrders}</a> </span> </#if> </div> @@ -63,7 +63,7 @@ <#assign contactMech = orderContactMechValueMap.contactMech> <#assign contactMechPurpose = orderContactMechValueMap.contactMechPurposeType> <#--<#assign partyContactMech = orderContactMechValueMap.partyContactMech>--> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${contactMechPurpose.get("description",locale)}</b></div> @@ -86,16 +86,16 @@ <#if (addr1.indexOf(" ") > 0)> <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))> <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)> - <a target="_blank" href="http://www.whitepages.com/find_person_results.pl?fid=a&s_n=${addressNum}&s_a=${addressOther}&c=${postalAddress.city?if_exists}&s=${postalAddress.stateProvinceGeoId?if_exists}&x=29&y=18" class="buttontext">(lookup:whitepages.com)</a> + <a target="_blank" href="http://www.whitepages.com/find_person_results.pl?fid=a&s_n=${addressNum}&s_a=${addressOther}&c=${postalAddress.city?if_exists}&s=${postalAddress.stateProvinceGeoId?if_exists}&x=29&y=18" class="buttontext">(lookup:whitepages.com)</a> </#if> </#if> </div> <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED"))> <form name="updateOrderContactMech" method="post" action="<@ofbizUrl>updateOrderContactMech</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"> - <input type="hidden" name="contactMechPurposeTypeId" value="${contactMechPurpose.contactMechPurposeTypeId?if_exists}"> - <input type="hidden" name="oldContactMechId" value="${contactMech.contactMechId?if_exists}"> - <hr class="sepbar"> + <input type="hidden" name="orderId" value="${orderId?if_exists}"/> + <input type="hidden" name="contactMechPurposeTypeId" value="${contactMechPurpose.contactMechPurposeTypeId?if_exists}"/> + <input type="hidden" name="oldContactMechId" value="${contactMech.contactMechId?if_exists}"/> + <hr class="sepbar"/> <div><@partyPostalAddress postalContactMechList = postalContactMechList?if_exists contactMechPurposeTypeId = contactMechPurpose.contactMechPurposeTypeId?if_exists contactPostalAddress=postalAddress?if_exists/><input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/></div> </form> </#if> @@ -107,15 +107,15 @@ <#if telecomNumber.areaCode?exists>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber} <#--<#if partyContactMech.extension?exists>ext ${partyContactMech.extension}</#if>--> <#if !telecomNumber.countryCode?exists || telecomNumber.countryCode == "011" || telecomNumber.countryCode == "1"> - <a target="_blank" href="http://www.anywho.com/qry/wp_rl?npa=${telecomNumber.areaCode?if_exists}&telephone=${telecomNumber.contactNumber?if_exists}&btnsubmit.x=20&btnsubmit.y=8" class="buttontext">(lookup:anywho.com)</a> - <a target="_blank" href="http://whitepages.com/find_person_results.pl?fid=p&ac=${telecomNumber.areaCode}&s=&p=${telecomNumber.contactNumber}&pt=b&x=40&y=9" class="buttontext">(lookup:whitepages.com)</a> + <a target="_blank" href="http://www.anywho.com/qry/wp_rl?npa=${telecomNumber.areaCode?if_exists}&telephone=${telecomNumber.contactNumber?if_exists}&btnsubmit.x=20&btnsubmit.y=8" class="buttontext">(lookup:anywho.com)</a> + <a target="_blank" href="http://whitepages.com/find_person_results.pl?fid=p&ac=${telecomNumber.areaCode}&s=&p=${telecomNumber.contactNumber}&pt=b&x=40&y=9" class="buttontext">(lookup:whitepages.com)</a> </#if> </div> <#elseif contactMech.contactMechTypeId == "EMAIL_ADDRESS"> <div class="tabletext"> ${contactMech.infoString} <#if security.hasEntityPermission("ORDERMGR", "_SEND_CONFIRMATION", session)> - <br/>(<a href="<@ofbizUrl>confirmationmailedit?orderId=${orderId}&partyId=${partyId}&sendTo=${contactMech.infoString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderSendConfirmationEmail}</a>) + <br/>(<a href="<@ofbizUrl>confirmationmailedit?orderId=${orderId}&partyId=${partyId}&sendTo=${contactMech.infoString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderSendConfirmationEmail}</a>) <#else> <a href="mailto:${contactMech.infoString}" class="buttontext">(${uiLabelMap.OrderSendEmail})</a> </#if> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?view=diff&rev=489999&r1=489998&r2=489999 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Sat Dec 23 23:51:17 2006 @@ -43,7 +43,7 @@ <div class="tabletext">${orderHeader.orderName}</div> </td> </tr> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> </#if> <#-- order status history --> <tr> @@ -54,7 +54,7 @@ <td align="left" valign="top" width="80%"> <div class="tabletext">${uiLabelMap.OrderCurrentStatus}: ${currentStatus.get("description",locale)}</div> <#if orderHeaderStatuses?has_content> - <hr class="sepbar"> + <hr class="sepbar"/> <#list orderHeaderStatuses as orderHeaderStatus> <#assign loopStatusItem = orderHeaderStatus.getRelatedOne("StatusItem")> <div class="tabletext"> @@ -64,7 +64,7 @@ </#if> </td> </tr> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderDateOrdered}</b></div> @@ -76,7 +76,7 @@ </div> </td> </tr> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.CommonCurrency}</b></div> @@ -89,7 +89,7 @@ </td> </tr> <#if orderHeader.internalCode?has_content> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderInternalCode}</b></div> @@ -102,7 +102,7 @@ </td> </tr> </#if> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderSalesChannel}</b></div> @@ -119,7 +119,7 @@ </div> </td> </tr> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderProductStore}</b></div> @@ -135,7 +135,7 @@ </div> </td> </tr> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderOriginFacility}</b></div> @@ -151,7 +151,7 @@ </div> </td> </tr> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderCreatedBy}</b></div> @@ -169,7 +169,7 @@ </tr> <#if distributorId?exists> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderDistributor}</b></div> @@ -184,7 +184,7 @@ </tr> </#if> <#if affiliateId?exists> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderAffiliate}</b></div> @@ -200,7 +200,7 @@ </#if> <#if orderContentWrapper.get("IMAGE_URL")?has_content> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderImage}</b></div> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?view=diff&rev=489999&r1=489998&r2=489999 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Sat Dec 23 23:51:17 2006 @@ -29,7 +29,7 @@ <a href="<@ofbizUrl>editOrderItems?${paramString}</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderEditItems}</a> </#if> <#if returnableItems?has_content> - <a href="<@ofbizUrl>quickreturn?orderId=${orderId}&party_id=${partyId?if_exists}&returnHeaderTypeId=${returnHeaderTypeId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderCreateReturn}</a> + <a href="<@ofbizUrl>quickreturn?orderId=${orderId}&party_id=${partyId?if_exists}&returnHeaderTypeId=${returnHeaderTypeId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.OrderCreateReturn}</a> </#if> </div> </#if> @@ -54,7 +54,7 @@ <#list orderItemList as orderItem> <#assign orderItemContentWrapper = Static["org.ofbiz.order.order.OrderContentWrapper"].makeOrderContentWrapper(orderItem, request)> <#assign orderItemShipGrpInvResList = orderReadHelper.getOrderItemShipGrpInvResList(orderItem)> - <tr><td colspan="8"><hr class="sepbar"></td></tr> + <tr><td colspan="8"><hr class="sepbar"/></td></tr> <tr> <#assign orderItemType = orderItem.getRelatedOne("OrderItemType")?if_exists> <#assign productId = orderItem.productId?if_exists> @@ -78,7 +78,7 @@ <a href="/catalog/control/EditProduct?productId=${productId}" class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a> <a href="/ecommerce/control/product?product_id=${productId}" class="buttontext" target="_blank">${uiLabelMap.EcommerceEcommerce}</a> <#if orderItemContentWrapper.get("IMAGE_URL")?has_content> - <a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderItemSeqId=${orderItem.orderItemSeqId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a> + <a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderItemSeqId=${orderItem.orderItemSeqId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a> </#if> </div> @@ -98,7 +98,7 @@ <div class="tabletext" style="margin-top: 15px; margin-left: 20px;"> <table cellspacing="0" cellpadding="0" border="0"> <tr><td style="text-align: right; padding-bottom: 10px;"> - <a class="buttontext" href="/catalog/control/EditProductInventoryItems?productId=${productId}&showAllFacilities=Y&externalLoginKey=${externalLoginKey}" target="_blank">${uiLabelMap.ProductInventory}</a> + <a class="buttontext" href="/catalog/control/EditProductInventoryItems?productId=${productId}&showAllFacilities=Y&externalLoginKey=${externalLoginKey}" target="_blank">${uiLabelMap.ProductInventory}</a> </td><td> </td></tr> <tr><td align="left">${uiLabelMap.OrderRequiredForSO}</td> <td style="padding-left: 15px; text-align: left;">${requiredQuantity}</td></tr> @@ -146,7 +146,7 @@ </td> <#-- QUANTITY --> - <td align="right" valign="top" nowrap> + <td align="right" valign="top" nowrap="nowrap"> <table> <tr valign="top"> <td> @@ -178,21 +178,21 @@ </table> </td> - <td align="right" valign="top" nowrap> - <div class="tabletext" nowrap><@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/> / <@ofbizCurrency amount=orderItem.unitListPrice isoCode=currencyUomId/></div> + <td align="right" valign="top" nowrap="nowrap"> + <div class="tabletext"><@ofbizCurrency amount=orderItem.unitPrice isoCode=currencyUomId/> / <@ofbizCurrency amount=orderItem.unitListPrice isoCode=currencyUomId/></div> </td> - <td align="right" valign="top" nowrap> - <div class="tabletext" nowrap><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentsTotal(orderItem, orderAdjustments, true, false, false) isoCode=currencyUomId/></div> + <td align="right" valign="top" nowrap="nowrap"> + <div class="tabletext"><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemAdjustmentsTotal(orderItem, orderAdjustments, true, false, false) isoCode=currencyUomId/></div> </td> - <td align="right" valign="top" nowrap> + <td align="right" valign="top" nowrap="nowrap"> <#if orderItem.statusId != "ITEM_CANCELLED"> - <div class="tabletext" nowrap><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemSubTotal(orderItem, orderAdjustments) isoCode=currencyUomId/></div> + <div class="tabletext"><@ofbizCurrency amount=Static["org.ofbiz.order.order.OrderReadHelper"].getOrderItemSubTotal(orderItem, orderAdjustments) isoCode=currencyUomId/></div> <#else> - <div class="tabletext" nowrap><@ofbizCurrency amount=0.00 isoCode=currencyUomId/></div> + <div class="tabletext"><@ofbizCurrency amount=0.00 isoCode=currencyUomId/></div> </#if> </td> <td> </td> - <td align="right" valign="top" nowrap> + <td align="right" valign="top"> </td> </#if> @@ -208,7 +208,7 @@ <div class="tabletext"> <#if orderItem.orderItemTypeId != "RENTAL_ORDER_ITEM"> <b><i>${uiLabelMap.ManufacturingProductionRun}</i>:</b> - <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${workEffort.workEffortId}</a> + <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${workEffort.workEffortId}</a> </#if> ${uiLabelMap.CommonFrom}: ${workEffort.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonTo}: ${workEffort.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.OrderNumberOfPersons}: ${workEffort.reservPersons?default("")} </div> @@ -278,7 +278,7 @@ <td colspan="9"> <div class="tabletext"> <b><i>${uiLabelMap.OrderLinkedToQuote}</i>:</b> - <a href="<@ofbizUrl>EditQuoteItem?quoteId=${linkedQuote.quoteId}"eItemSeqId=${linkedQuote.quoteItemSeqId}</@ofbizUrl>" class="buttontext" style="font-size: xx-small;">${linkedQuote.quoteId}-${linkedQuote.quoteItemSeqId}</a> + <a href="<@ofbizUrl>EditQuoteItem?quoteId=${linkedQuote.quoteId}&quoteItemSeqId=${linkedQuote.quoteItemSeqId}</@ofbizUrl>" class="buttontext" style="font-size: xx-small;">${linkedQuote.quoteId}-${linkedQuote.quoteItemSeqId}</a> </div> </td> </tr> @@ -295,7 +295,7 @@ <b><i>${uiLabelMap.OrderAdjustment}</i>:</b> <b>${adjustmentType.get("description",locale)}</b>: ${orderItemAdjustment.get("description",locale)?if_exists} <#if orderItemAdjustment.comments?has_content>(${orderItemAdjustment.comments?default("")})</#if> - <#if orderItemAdjustment.productPromoId?has_content><a href="/catalog/control/EditProductPromo?productPromoId=${orderItemAdjustment.productPromoId}&externalLoginKey=${externalLoginKey}">${orderItemAdjustment.getRelatedOne("ProductPromo").getString("promoName")}</a></#if> + <#if orderItemAdjustment.productPromoId?has_content><a href="/catalog/control/EditProductPromo?productPromoId=${orderItemAdjustment.productPromoId}&externalLoginKey=${externalLoginKey}">${orderItemAdjustment.getRelatedOne("ProductPromo").getString("promoName")}</a></#if> <#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX"> <#if orderItemAdjustment.primaryGeoId?has_content> <#assign primaryGeo = orderItemAdjustment.getRelatedOneCache("PrimaryGeo")/> @@ -352,7 +352,7 @@ <td align="right" colspan="2"> <div class="tabletext" style="font-size: xx-small;"> <b><i>${uiLabelMap.CommonSurveys}</i>:</b> - <a href="/content/control/ViewSurveyResponses?surveyResponseId=${survey.surveyResponseId}&surveyId=${survey.surveyId}<#if survey.partyId?exists>&partyId=${survey.partyId}</#if>&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${survey.surveyId}</a> + <a href="/content/control/ViewSurveyResponses?surveyResponseId=${survey.surveyResponseId}&surveyId=${survey.surveyId}<#if survey.partyId?exists>&partyId=${survey.partyId}</#if>&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${survey.surveyId}</a> </div> </td> <td> </td> @@ -396,7 +396,7 @@ <td> </td> <td> </td> <td> </td> - <td align="right" valign="top" nowrap> + <td align="right" valign="top"> </td> </tr> @@ -410,7 +410,7 @@ <td align="right" colspan="2"> <div class="tabletext" style="font-size: xx-small;"> <b><i>${uiLabelMap.FacilityInventory}</i>:</b> - <a href="/facility/control/EditInventoryItem?inventoryItemId=${orderItemShipGrpInvRes.inventoryItemId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${orderItemShipGrpInvRes.inventoryItemId}</a> + <a href="/facility/control/EditInventoryItem?inventoryItemId=${orderItemShipGrpInvRes.inventoryItemId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${orderItemShipGrpInvRes.inventoryItemId}</a> <b><i>${uiLabelMap.OrderShipGroup}</i>:</b> ${orderItemShipGrpInvRes.shipGroupSeqId} </div> </td> @@ -435,7 +435,7 @@ <#list orderShipments as orderShipment> <tr> <td align="right" colspan="2"> - <div class="tabletext" style="font-size: xx-small;"><b><i>${uiLabelMap.OrderPlannedInShipment}</i>: </b><a target="facility" href="/facility/control/ViewShipment?shipmentId=${orderShipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${orderShipment.shipmentId}</a>: ${orderShipment.shipmentItemSeqId}</div> + <div class="tabletext" style="font-size: xx-small;"><b><i>${uiLabelMap.OrderPlannedInShipment}</i>: </b><a target="facility" href="/facility/control/ViewShipment?shipmentId=${orderShipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${orderShipment.shipmentId}</a>: ${orderShipment.shipmentItemSeqId}</div> </td> <td align="center"> <div class="tabletext" style="font-size: xx-small;">${orderShipment.quantity?string.number} </div> @@ -458,7 +458,7 @@ <div class="tabletext" style="font-size: xx-small;"> <#if itemIssuance.shipmentId?has_content> <b><i>${uiLabelMap.OrderIssuedToShipmentItem}</i>:</b> - <a target="facility" href="/facility/control/ViewShipment?shipmentId=${itemIssuance.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${itemIssuance.shipmentId}</a>:${itemIssuance.shipmentItemSeqId?if_exists} + <a target="facility" href="/facility/control/ViewShipment?shipmentId=${itemIssuance.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${itemIssuance.shipmentId}</a>:${itemIssuance.shipmentItemSeqId?if_exists} <#else> <b><i>${uiLabelMap.OrderIssuedWithoutShipment}</i></b> </#if> @@ -475,7 +475,7 @@ </#if> </#list> </#if> - <tr><td colspan="8"><hr class="sepbar"></td></tr> + <tr><td colspan="8"><hr class="sepbar"/></td></tr> <#list orderHeaderAdjustments as orderHeaderAdjustment> <#assign adjustmentType = orderHeaderAdjustment.getRelatedOne("OrderAdjustmentType")> <#assign adjustmentAmount = Static["org.ofbiz.order.order.OrderReadHelper"].calcOrderAdjustment(orderHeaderAdjustment, orderSubTotal)> @@ -484,7 +484,7 @@ <td align="right" colspan="5"> <div class="tabletext"><b>${adjustmentType.get("description",locale)}</b> ${orderHeaderAdjustment.comments?if_exists} ${orderHeaderAdjustment.get("description")?if_exists} : </div> </td> - <td align="right" nowrap> + <td align="right" nowrap="nowrap"> <div class="tabletext"><@ofbizCurrency amount=adjustmentAmount isoCode=currencyUomId/></div> </td> <td> </td> @@ -493,34 +493,34 @@ </#list> <#-- subtotal --> - <tr><td colspan=1></td><td colspan="8"><hr class="sepbar"></td></tr> + <tr><td colspan=1></td><td colspan="8"><hr class="sepbar"/></td></tr> <tr> <td align="right" colspan="5"><div class="tabletext"><b>${uiLabelMap.OrderItemsSubTotal}</b></div></td> - <td align="right" nowrap><div class="tabletext"><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></div></td> + <td align="right" nowrap="nowrap"><div class="tabletext"><@ofbizCurrency amount=orderSubTotal isoCode=currencyUomId/></div></td> </tr> <#-- other adjustments --> <tr> <td align="right" colspan="5"><div class="tabletext"><b>${uiLabelMap.OrderTotalOtherOrderAdjustments}</b></div></td> - <td align="right" nowrap><div class="tabletext"><@ofbizCurrency amount=otherAdjAmount isoCode=currencyUomId/></div></td> + <td align="right" nowrap="nowrap"><div class="tabletext"><@ofbizCurrency amount=otherAdjAmount isoCode=currencyUomId/></div></td> </tr> <#-- shipping adjustments --> <tr> <td align="right" colspan="5"><div class="tabletext"><b>${uiLabelMap.OrderTotalShippingAndHandling}</b></div></td> - <td align="right" nowrap><div class="tabletext"><@ofbizCurrency amount=shippingAmount isoCode=currencyUomId/></div></td> + <td align="right" nowrap="nowrap"><div class="tabletext"><@ofbizCurrency amount=shippingAmount isoCode=currencyUomId/></div></td> </tr> <#-- tax adjustments --> <tr> <td align="right" colspan="5"><div class="tabletext"><b>${uiLabelMap.OrderTotalSalesTax}</b></div></td> - <td align="right" nowrap><div class="tabletext"><@ofbizCurrency amount=taxAmount isoCode=currencyUomId/></div></td> + <td align="right" nowrap="nowrap"><div class="tabletext"><@ofbizCurrency amount=taxAmount isoCode=currencyUomId/></div></td> </tr> <#-- grand total --> <tr> <td align="right" colspan="5"><div class="tabletext"><b>${uiLabelMap.OrderTotalDue}</b></div></td> - <td align="right" nowrap> + <td align="right" nowrap="nowrap"> <div class="tabletext"><@ofbizCurrency amount=grandTotal isoCode=currencyUomId/></div> </td> </tr> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?view=diff&rev=489999&r1=489998&r2=489999 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Sat Dec 23 23:51:17 2006 @@ -26,7 +26,7 @@ <#assign pmBillingAddress = {}> <#assign oppStatusItem = orderPaymentPreference.getRelatedOne("StatusItem")> <#if outputted?default("false") == "true"> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> </#if> <#assign outputted = "true"> <#-- try the paymentMethod first; if paymentMethodId is specified it overrides paymentMethodTypeId --> @@ -238,7 +238,7 @@ </#if> </#if> <#if pmBillingAddress?has_content> - <tr><td> </td><td> </td><td colspan="5"><hr class="sepbar"></td></tr> + <tr><td> </td><td> </td><td colspan="5"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> </div> @@ -262,7 +262,7 @@ <#-- billing account --> <#if billingAccount?exists> <#if outputted?default("false") == "true"> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> </#if> <tr> <td align="right" valign="top" width="15%"> @@ -276,11 +276,11 @@ <td width="5"> </td> <td align="left" valign="top" width="80%"> <div class="tabletext"> - #<a href="/accounting/control/EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}&externalLoginKey=${externalLoginKey}" class="buttontext">${billingAccount.billingAccountId}</a> - ${billingAccount.description?if_exists} + #<a href="/accounting/control/EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}&externalLoginKey=${externalLoginKey}" class="buttontext">${billingAccount.billingAccountId}</a> - ${billingAccount.description?if_exists} </div> </td> </tr> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderPurchaseOrderNumber}</b></div> @@ -294,7 +294,7 @@ <#-- invoices --> <#if invoices?has_content> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderInvoices}</b></div> @@ -314,9 +314,9 @@ </tr> </#if> <#if (!orderHeader.statusId.equals("ORDER_COMPLETED")) && !(orderHeader.statusId.equals("ORDER_REJECTED")) && !(orderHeader.statusId.equals("ORDER_CANCELLED")) && (paymentMethodValueMaps?has_content)> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <form name="addPaymentMethodToOrder" method="post" action="<@ofbizUrl>addPaymentMethodToOrder</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"> + <input type="hidden" name="orderId" value="${orderId?if_exists}"/> <tr> <td width="15%" align="right" nowrap><div class="tableheadtext">${uiLabelMap.AccountingPaymentMethod} </div></td> <td width="5"> </td> Modified: incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl URL: http://svn.apache.org/viewvc/incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?view=diff&rev=489999&r1=489998&r2=489999 ============================================================================== --- incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ incubator/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Sat Dec 23 23:51:17 2006 @@ -24,101 +24,102 @@ <div class="boxhead"> ${uiLabelMap.OrderShipmentInformation} - ${shipGroup.shipGroupSeqId}</div> </div> <div class="screenlet-body"> - <table width="100%" border="0" cellpadding="1" cellspacing="0"> - <form name="updateOrderItemShipGroup" method="post" action="<@ofbizUrl>updateOrderItemShipGroup</@ofbizUrl>"> - <input type="hidden" name="orderId" value="${orderId?if_exists}"> - <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId?if_exists}"> - <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"> - <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId?if_exists}"> - <#if shipGroup.contactMechId?has_content> - <tr> - <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.OrderAddress}</b></div> - </td> - <td width="5"> </td> - <td align="left" valign="top" width="80%"> - <div class="tabletext"> - <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> - <select name="contactMechId" class="selectBox"> - <option SELECTED value="${shipGroup.contactMechId?if_exists}">${(shipGroupAddress.address1)?default("")} - ${shipGroupAddress.city?default("")}</option> - <#if shippingContactMechList?has_content> - <option DISABLED value=""></option> - <#list shippingContactMechList as shippingContactMech> - <#assign shippingPostalAddress = shippingContactMech.getRelatedOne("PostalAddress")?if_exists> - <#if shippingContactMech.contactMechId?has_content> - <option value="${shippingContactMech.contactMechId?if_exists}">${(shippingPostalAddress.address1)?default("")} - ${shippingPostalAddress.city?default("")}</option> - </#if> - </#list> - </#if> - </select> - <#else> - ${(shipGroupAddress.address1)?default("")} - </#if> - </div> - </td> - </tr> - </#if> - - <#if shipGroup.shipmentMethodTypeId?has_content> - <tr> - <td align="right" valign="top" width="15%"> - <div class="tabletext"> <b>${uiLabelMap.CommonMethod}</b></div> - </td> - <td width="5"> </td> - <td align="left" valign="top" width="80%"> - <#if shipGroup.carrierPartyId?has_content || shipmentMethodType?has_content> - <div class="tabletext"> - <#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 - i.e shipmentMethodTypeId & carrierPartyId and this two field values are separated bye - "@" symbol. - --> - <select name="shipmentMethod" class="selectBox"> - <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId?if_exists}"><#if shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId?if_exists}</#if> ${shipmentMethodType.get("description",locale)?default("")}</option> - <#list productStoreShipmentMethList as productStoreShipmentMethod> - <#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId> - <#if productStoreShipmentMethod.partyId?has_content || productStoreShipmentMethod?has_content> - <option value="${shipmentMethodTypeAndParty?if_exists}"><#if productStoreShipmentMethod.partyId != "_NA_">${productStoreShipmentMethod.partyId?if_exists}</#if> ${productStoreShipmentMethod.get("description",locale)?default("")}</option> + <form name="updateOrderItemShipGroup" method="post" action="<@ofbizUrl>updateOrderItemShipGroup</@ofbizUrl>"> + <input type="hidden" name="orderId" value="${orderId?if_exists}"/> + <input type="hidden" name="shipGroupSeqId" value="${shipGroup.shipGroupSeqId?if_exists}"/> + <input type="hidden" name="contactMechPurposeTypeId" value="SHIPPING_LOCATION"/> + <input type="hidden" name="oldContactMechId" value="${shipGroup.contactMechId?if_exists}"/> + <table width="100%" border="0" cellpadding="1" cellspacing="0"> + <#if shipGroup.contactMechId?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.OrderAddress}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> + <select name="contactMechId" class="selectBox"> + <option SELECTED value="${shipGroup.contactMechId?if_exists}">${(shipGroupAddress.address1)?default("")} - ${shipGroupAddress.city?default("")}</option> + <#if shippingContactMechList?has_content> + <option DISABLED value=""></option> + <#list shippingContactMechList as shippingContactMech> + <#assign shippingPostalAddress = shippingContactMech.getRelatedOne("PostalAddress")?if_exists> + <#if shippingContactMech.contactMechId?has_content> + <option value="${shippingContactMech.contactMechId?if_exists}">${(shippingPostalAddress.address1)?default("")} - ${shippingPostalAddress.city?default("")}</option> + </#if> + </#list> + </#if> + </select> + <#else> + ${(shipGroupAddress.address1)?default("")} + </#if> + </div> + </td> + </tr> + </#if> + + <#if shipGroup.shipmentMethodTypeId?has_content> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> <b>${uiLabelMap.CommonMethod}</b></div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <#if shipGroup.carrierPartyId?has_content || shipmentMethodType?has_content> + <div class="tabletext"> + <#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 + i.e shipmentMethodTypeId & carrierPartyId and this two field values are separated bye + "@" symbol. + --> + <select name="shipmentMethod" class="selectBox"> + <option value="${shipGroup.shipmentMethodTypeId}@${shipGroup.carrierPartyId?if_exists}"><#if shipGroup.carrierPartyId != "_NA_">${shipGroup.carrierPartyId?if_exists}</#if> ${shipmentMethodType.get("description",locale)?default("")}</option> + <#list productStoreShipmentMethList as productStoreShipmentMethod> + <#assign shipmentMethodTypeAndParty = productStoreShipmentMethod.shipmentMethodTypeId + "@" + productStoreShipmentMethod.partyId> + <#if productStoreShipmentMethod.partyId?has_content || productStoreShipmentMethod?has_content> + <option value="${shipmentMethodTypeAndParty?if_exists}"><#if productStoreShipmentMethod.partyId != "_NA_">${productStoreShipmentMethod.partyId?if_exists}</#if> ${productStoreShipmentMethod.get("description",locale)?default("")}</option> + </#if> + </#list> + </select> + <#else> + <#if shipGroup.carrierPartyId != "_NA_"> + ${shipGroup.carrierPartyId?if_exists} </#if> - </#list> - </select> - <#else> - <#if shipGroup.carrierPartyId != "_NA_"> - ${shipGroup.carrierPartyId?if_exists} - </#if> - ${shipmentMethodType.get("description",locale)?default("")} + ${shipmentMethodType.get("description",locale)?default("")} + </#if> + </div> + </#if> + </td> + </tr> </#if> - </div> - </#if> - </td> - </tr> - </#if> - <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> - <tr> - <td align="right" valign="top" width="15%"> - <div class="tabletext"> </div> - </td> - <td width="5"> </td> - <td align="left" valign="top" width="80%"> - <div class="tabletext"> - <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/> - </div> - </td> - </tr> - </#if> - </form> - <#if !shipGroup.contactMechId?has_content && !shipGroup.shipmentMethodTypeId?has_content> - <#assign noShipment = "true"> - <tr> - <td colspan="3" align="center"> - <div class="tableheadtext">${uiLabelMap.OrderNotShipped}</div> - </td> - </tr> - </#if> - + <#if orderHeader?has_content && orderHeader.statusId != "ORDER_CANCELLED" && orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_REJECTED"> + <tr> + <td align="right" valign="top" width="15%"> + <div class="tabletext"> </div> + </td> + <td width="5"> </td> + <td align="left" valign="top" width="80%"> + <div class="tabletext"> + <input type="submit" value="${uiLabelMap.CommonUpdate}" class="smallSubmit"/> + </div> + </td> + </tr> + </#if> + <#if !shipGroup.contactMechId?has_content && !shipGroup.shipmentMethodTypeId?has_content> + <#assign noShipment = "true"> + <tr> + <td colspan="3" align="center"> + <div class="tableheadtext">${uiLabelMap.OrderNotShipped}</div> + </td> + </tr> + </#if> + </table> + </form> + <table width="100%" border="0" cellpadding="1" cellspacing="0"> <#if shipGroup.supplierPartyId?has_content> <#assign supplier = delegator.findByPrimaryKey("PartyGroup", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", shipGroup.supplierPartyId))?if_exists /> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.ProductDropShipment} - ${uiLabelMap.PartySupplier}</b></div> @@ -132,7 +133,7 @@ <#-- tracking number --> <#if shipGroup.trackingNumber?has_content || orderShipmentInfoSummaryList?has_content> - <tr><td colspan="7"><hr class='sepbar'></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderTrackingNumber}</b></div> @@ -159,7 +160,7 @@ </tr> </#if> <#if shipGroup.maySplit?has_content && noShipment?default("false") != "true"> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderSplittingPreference}</b></div> @@ -170,7 +171,7 @@ <#if shipGroup.maySplit?upper_case == "N"> ${uiLabelMap.FacilityWaitEntireOrderReady} <#if security.hasEntityPermission("ORDERMGR", "_UPDATE", session)> - <#if orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED"><a href="<@ofbizUrl>allowordersplit?shipGroupSeqId=${shipGroup.shipGroupSeqId}&${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderAllowSplit}</a></#if> + <#if orderHeader.statusId != "ORDER_COMPLETED" && orderHeader.statusId != "ORDER_CANCELLED"><a href="<@ofbizUrl>allowordersplit?shipGroupSeqId=${shipGroup.shipGroupSeqId}&${paramString}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderAllowSplit}</a></#if> </#if> <#else> ${uiLabelMap.FacilityShipAvailable} @@ -180,7 +181,7 @@ </tr> </#if> <#if shipGroup.shippingInstructions?has_content> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.CommonInstructions}</b></div> @@ -192,7 +193,7 @@ </tr> </#if> <#if shipGroup.isGift?has_content && noShipment?default("false") != "true"> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderGift}?</b></div> @@ -206,7 +207,7 @@ </tr> </#if> <#if shipGroup.giftMessage?has_content> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderGiftMessage}</b></div> @@ -218,7 +219,7 @@ </tr> </#if> <#if shipGroup.shipAfterDate?has_content> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderShipAfterDate}</b></div> @@ -230,7 +231,7 @@ </tr> </#if> <#if shipGroup.shipByDate?has_content> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderShipBeforeDate}</b></div> @@ -243,7 +244,7 @@ </#if> <#assign shipGroupShipments = shipGroup.getRelated("PrimaryShipment")> <#if shipGroupShipments?has_content> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.FacilityShipments}</b></div> @@ -251,7 +252,7 @@ <td width="5"> </td> <td align="left" valign="top" width="80%"> <#list shipGroupShipments as shipment> - <div class="tabletext">${uiLabelMap.OrderNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipment.shipmentId}</a> <a href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductPackingSlip}</a></div> + <div class="tabletext">${uiLabelMap.OrderNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipment.shipmentId}</a> <a href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductPackingSlip}</a></div> </#list> </td> </tr> @@ -262,7 +263,7 @@ <#-- Special shipment options --> <#if security.hasEntityPermission("FACILITY", "_CREATE", session)> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <#if orderHeader.orderTypeId == "PURCHASE_ORDER"><b>${uiLabelMap.ProductDestinationFacility}</b></#if></div> @@ -287,7 +288,7 @@ <option value="${facility.facilityId}">${facility.facilityName}</option> </#list> </select> - <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderQuickReceivePurchaseOrder}"> + <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderQuickReceivePurchaseOrder}"/> </form> </#if> </#if> @@ -297,7 +298,7 @@ </#if> <#-- Manual shipment options --> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> </div> @@ -307,31 +308,30 @@ <#if orderHeader.orderTypeId == "SALES_ORDER"> <#if !shipGroup.supplierPartyId?has_content> - <div class="tabletext"><a href="/facility/control/PackOrder?facilityId=${storeFacilityId?if_exists}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a></div> - <div class="tabletext"><a href="/facility/control/createShipment?primaryOrderId=${orderId}&primaryShipGroupSeqId=${shipGroup.shipGroupSeqId}&statusId=SHIPMENT_INPUT&originFacilityId=${storeFacilityId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a></div> + <div class="tabletext"><a href="/facility/control/PackOrder?facilityId=${storeFacilityId?if_exists}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a></div> + <div class="tabletext"><a href="/facility/control/createShipment?primaryOrderId=${orderId}&primaryShipGroupSeqId=${shipGroup.shipGroupSeqId}&statusId=SHIPMENT_INPUT&originFacilityId=${storeFacilityId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a></div> </#if> <#else> - <div class="tabletext"> <#assign facilities = facilitiesForShipGroup.get(shipGroup.shipGroupSeqId)> <#if facilities?has_content> - <form action="/facility/control/createShipment" method="GET"> - <input type="hidden" name="primaryOrderId" value="${orderId}"/> - <input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> - <input type="hidden" name="shipmentTypeId" value="PURCHASE_SHIPMENT"/> - <input type="hidden" name="statusId" value="PURCH_SHIP_CREATED"/> - <input type="hidden" name="externalLoginKey" value="${externalLoginKey}"/> - <select name="destinationFacilityId" class="selectBox"> - <#list facilities as facility> - <option value="${facility.facilityId}">${facility.facilityName}</option> - </#list> - </select> - <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderNewShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]"> - </div> - </form> + <div class="tabletext"> + <form action="/facility/control/createShipment" method="GET"> + <input type="hidden" name="primaryOrderId" value="${orderId}"/> + <input type="hidden" name="primaryShipGroupSeqId" value="${shipGroup.shipGroupSeqId}"/> + <input type="hidden" name="shipmentTypeId" value="PURCHASE_SHIPMENT"/> + <input type="hidden" name="statusId" value="PURCH_SHIP_CREATED"/> + <input type="hidden" name="externalLoginKey" value="${externalLoginKey}"/> + <select name="destinationFacilityId" class="selectBox"> + <#list facilities as facility> + <option value="${facility.facilityId}">${facility.facilityName}</option> + </#list> + </select> + <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderNewShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]"/> + </form> + </div> <#else> <div class="tabletext"><a href="/facility/control/createShipment?primaryOrderId=${orderId}&primaryShipGroupSeqId=${shipGroup.shipGroupSeqId}&shipmentTypeId=DROP_SHIPMENT&statusId=PURCH_SHIP_CREATED&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.OrderNewDropShipmentForShipGroup} [${shipGroup.shipGroupSeqId}]</a></div> </#if> - </div> </#if> </td> </tr> @@ -340,7 +340,7 @@ <#-- Refunds/Returns for Sales Orders and Delivery Schedules --> <#if !shipGroup_has_next> - <tr><td colspan="7"><hr class="sepbar"></td></tr> + <tr><td colspan="7"><hr class="sepbar"/></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> @@ -354,8 +354,8 @@ <div class="tabletext"><a href="<@ofbizUrl>OrderDeliveryScheduleInfo?orderId=${orderId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderViewEditDeliveryScheduleInfo}</a></div> </#if> <#if security.hasEntityPermission("ORDERMGR", "_RETURN", session) && orderHeader.statusId == "ORDER_COMPLETED"> - <div><a href="<@ofbizUrl>quickRefundOrder?orderId=${orderId}&receiveReturn=true&returnHeaderTypeId=${returnHeaderTypeId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickRefundEntireOrder}</a></div> - <div><a href="<@ofbizUrl>quickreturn?orderId=${orderId}&party_id=${partyId?if_exists}&returnHeaderTypeId=${returnHeaderTypeId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateReturn}</a></div> + <div><a href="<@ofbizUrl>quickRefundOrder?orderId=${orderId}&receiveReturn=true&returnHeaderTypeId=${returnHeaderTypeId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderQuickRefundEntireOrder}</a></div> + <div><a href="<@ofbizUrl>quickreturn?orderId=${orderId}&party_id=${partyId?if_exists}&returnHeaderTypeId=${returnHeaderTypeId}</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateReturn}</a></div> </#if> </#if> </td> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |