svn commit: r764066 - /ofbiz/trunk/applications/orde
Locked
svn commit: r764066 - /ofbiz/trunk/applications/orde
 
|
Author: jleroux
Date: Fri Apr 10 21:36:41 2009 New Revision: 764066 URL: http://svn.apache.org/viewvc?rev=764066&view=rev Log: Reverted all changes done in r762149 since these were not for services calls Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=764066&r1=764065&r2=764066&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Fri Apr 10 21:36:41 2009 @@ -67,21 +67,10 @@ </div> <#if productId?exists> <div style="margin-top: 15px; margin-left: 10px;"> - <form name= "editProduct" method= "post" action= "/catalog/control/EditProduct"> - <input type= "hidden" name= "productId" value= "${productId}"> - <a href="javascript:document.editProduct.submit()"class="buttontext" target="_blank">${uiLabelMap.ProductCatalog}</a> - </form> - <form name= "viewProduct" method= "post" action= "/ecommerce/control/product"> - <input type= "hidden" name= "productId" value= "${productId}"> - <a href="javascript:document.viewProduct.submit()" class="buttontext" target="_blank">${uiLabelMap.OrderEcommerce}</a> - </form> + <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.OrderEcommerce}</a> <#if orderItemContentWrapper.get("IMAGE_URL")?has_content> - <form name= "viewImage" method= "post" action= "<@ofbizUrl>viewimage</@ofbizUrl>"> - <input type= "hidden" name= "orderId" value= "${orderId}"> - <input type= "hidden" name= "orderItemSeqId" value= "${orderItem.orderItemSeqId}"> - <input type= "hidden" name= "orderContentTypeId" value= "IMAGE_URL"> - <a href="javascript:document.viewImage.submit()" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a> - </form> + <a href="<@ofbizUrl>viewimage?orderId=${orderId}&orderItemSeqId=${orderItem.orderItemSeqId}&orderContentTypeId=IMAGE_URL</@ofbizUrl>" target="_orderImage" class="buttontext">${uiLabelMap.OrderViewImage}</a> </#if> </div> @@ -100,12 +89,7 @@ <div style="margin-top: 15px; margin-left: 20px;"> <table cellspacing="0" cellpadding="0" border="0"> <tr><td style="text-align: right; padding-bottom: 10px;"> - <form name= "EditProductInventoryItems" method= "post" action= "/catalog/control/EditProductInventoryItems"> - <input type= "hidden" name="productId" value= "${productId}"> - <input type= "hidden" name="showAllFacilities" value= "Y"> - <input type= "hidden" name="externalLoginKey" value= "${externalLoginKey}"> - <a class="buttontext" href="javascript:document.EditProductInventoryItems.submit()" target="_blank">${uiLabelMap.ProductInventory}</a> - </form> + <a class="buttontext" href="/catalog/control/EditProductInventoryItems?productId=${productId}&showAllFacilities=Y&externalLoginKey=${externalLoginKey}" target="_blank">${uiLabelMap.ProductInventory}</a> </td><td> </td></tr> <tr><td>${uiLabelMap.OrderRequiredForSO}</td> <td style="padding-left: 15px; text-align: left;">${requiredQuantity}</td></tr> @@ -150,11 +134,7 @@ <#assign returnHeader = returnItem.getRelatedOne("ReturnHeader")> <#if returnHeader.statusId != "RETURN_CANCELLED"> <div> - <font color="red">${uiLabelMap.OrderReturned}</font># - <form name= "returnMain" method= "post" action= "<@ofbizUrl>returnMain</@ofbizUrl>"> - <input type= "hidden" name= "returnId" value= "${returnItem.returnId}"> - <a href="javascript:document.returnMain.submit()" class="buttontext">${returnItem.returnId}</a> - </form> + <font color="red">${uiLabelMap.OrderReturned}</font> #<a href="<@ofbizUrl>returnMain?returnId=${returnItem.returnId}</@ofbizUrl>" class="buttontext">${returnItem.returnId}</a> </div> </#if> </#list> @@ -251,11 +231,7 @@ <div> <#if orderItem.orderItemTypeId != "RENTAL_ORDER_ITEM"> <span class="label">${uiLabelMap.ManufacturingProductionRun}</span> - <form name= "ShowProductionRun" method= "post" action= "/manufacturing/control/ShowProductionRun"> - <input type= "hidden" name= "productionRunId" value= "${workEffort.workEffortId}"> - <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}"> - <a href="javascript:document.ShowProductionRun.submit()" class="buttontext">${workEffort.workEffortId}</a> - </form> + <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}&externalLoginKey=${externalLoginKey}" class="buttontext">${workEffort.workEffortId}</a> ${uiLabelMap.OrderCurrentStatus} ${(delegator.findByPrimaryKeyCache("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId"))).get("description",locale))?if_exists} <#else> ${uiLabelMap.CommonFrom}: ${workEffort.estimatedStartDate?string("yyyy-MM-dd")} ${uiLabelMap.CommonTo}: ${workEffort.estimatedCompletionDate?string("yyyy-MM-dd")} ${uiLabelMap.OrderNumberOfPersons}: ${workEffort.reservPersons?default("")} @@ -283,10 +259,7 @@ <td colspan="6"> <div> <span class="label">${uiLabelMap.OrderLinkedToOrderItem}</span> (${linkedOrderItem.orderItemAssocTypeId}) - <form name= "orderview" method= "post" action= "/ordermgr/control/orderview"> - <input type= "hidden" name= "orderId" value= "${linkedOrderId}"> - <a href="javascript:document.orderview.submit()" class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description?if_exists} - </form> + <a href="/ordermgr/control/orderview?orderId=${linkedOrderId}" class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description?if_exists} </div> </td> </tr> @@ -303,10 +276,7 @@ <td colspan="6"> <div> <span class="label">${uiLabelMap.OrderLinkedFromOrderItem}</span> ${linkedOrderItem.orderItemAssocTypeId}) - <form name= "orderView" method= "post" action= "/ordermgr/control/orderview"> - <input type= "hidden" name= "orderId" value= "${linkedOrderId}"> - <a href="javascript:document.orderView.submit()"class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description?if_exists} - </form> + <a href="/ordermgr/control/orderview?orderId=${linkedOrderId}" class="buttontext">${linkedOrderId}/${linkedOrderItemSeqId}</a> ${linkedOrderItemValueStatus.description?if_exists} </div> </td> </tr> @@ -342,11 +312,7 @@ <td colspan="6"> <div> <span class="label">${uiLabelMap.OrderLinkedToQuote}</span> - <form name= "EditQuoteItem" method= "post" action= "<@ofbizUrl>EditQuoteItem</@ofbizUrl>"> - <input type= "hidden" name= "quoteId" value= "${linkedQuote.quoteId}"> - <input type= "hidden" name= "quoteItemSeqId" value= "${linkedQuote.quoteItemSeqId}"> - <a href="javascript:document.EditQuoteItem.submit()"class="buttontext">${linkedQuote.quoteId}-${linkedQuote.quoteItemSeqId}</a> - </form> + <a href="<@ofbizUrl>EditQuoteItem?quoteId=${linkedQuote.quoteId}&quoteItemSeqId=${linkedQuote.quoteItemSeqId}</@ofbizUrl>" class="buttontext">${linkedQuote.quoteId}-${linkedQuote.quoteItemSeqId}</a> </div> </td> </tr> @@ -361,15 +327,9 @@ <td align="right" colspan="2"> <div> <span class="label">${uiLabelMap.OrderAdjustment}</span> ${adjustmentType.get("description",locale)} - ${orderItemAdjustment.get("description",locale)?if_exists} + ${orderItemAdjustment.get("description",locale)?if_exists} <#if orderItemAdjustment.comments?has_content>(${orderItemAdjustment.comments?default("")})</#if> - <#if orderItemAdjustment.productPromoId?has_content> - <form name= "EditQuoteItem" method= "post" action= "/catalog/control/EditProductPromo"> - <input type= "hidden" name= "productPromoId" value= "${orderItemAdjustment.productPromoId}"> - <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}"> - <a href="javascript:document.EditQuoteItem.submit()">${orderItemAdjustment.getRelatedOne("ProductPromo").getString("promoName")}</a> - </form> - </#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")/> @@ -427,12 +387,7 @@ <td align="right" colspan="2"> <div> <span class="label">${uiLabelMap.CommonSurveys}</span> - <form name= "ViewSurveyResponses" method= "post" action= "/content/control/ViewSurveyResponses"> - <input type= "hidden" name= "surveyResponseId" value= "${survey.surveyResponseId}"> - <input type= "hidden" name= "surveyId" value= "${survey.surveyId}"> - <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}"> - <a href="javascript:document.ViewSurveyResponses.submit()" class="buttontext">${survey.surveyId}</a> - </form> + <a href="/content/control/ViewSurveyResponses?surveyResponseId=${survey.surveyResponseId}&surveyId=${survey.surveyId}&externalLoginKey=${externalLoginKey}" class="buttontext">${survey.surveyId}</a> </div> </td> <td colspan="5"> </td> @@ -498,13 +453,9 @@ <tr> <td align="right" colspan="2"> <div> - <span class="label">${uiLabelMap.FacilityInventory}</span> - <form name= "EditInventoryItem" method= "post" action= "/facility/control/EditInventoryItem"> - <input type= "hidden" name= "inventoryItemId" value= "${orderItemShipGrpInvRes.inventoryItemId}"> - <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}"> - <a href="javascript:document.EditInventoryItem.submit()">${orderItemShipGrpInvRes.inventoryItemId}</a> - </form> - <span class="label">${uiLabelMap.OrderShipGroup}</span> ${orderItemShipGrpInvRes.shipGroupSeqId} + <span class="label">${uiLabelMap.FacilityInventory}</span> + <a href="/facility/control/EditInventoryItem?inventoryItemId=${orderItemShipGrpInvRes.inventoryItemId}&externalLoginKey=${externalLoginKey}" class="buttontext">${orderItemShipGrpInvRes.inventoryItemId}</a> + <span class="label">${uiLabelMap.OrderShipGroup}</span> ${orderItemShipGrpInvRes.shipGroupSeqId} </div> </td> <td align="center"> @@ -528,13 +479,7 @@ <#list orderShipments as orderShipment> <tr> <td align="right" colspan="2"> - <div><span class="label">${uiLabelMap.OrderPlannedInShipment}</span> - <form name= "ViewShipmentOrder" method= "post" action= "/facility/control/ViewShipment"> - <input type= "hidden" name= "shipmentId" value= "${orderShipment.shipmentId}"> - <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}"> - <a target="facility" href="javascript:document.ViewShipmentOrder.submit()"class="buttontext">${orderShipment.shipmentId}</a>: ${orderShipment.shipmentItemSeqId} - </form> - </div> + <div><span class="label">${uiLabelMap.OrderPlannedInShipment}</span> <a target="facility" href="/facility/control/ViewShipment?shipmentId=${orderShipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${orderShipment.shipmentId}</a>: ${orderShipment.shipmentItemSeqId}</div> </td> <td align="center"> <div>${orderShipment.quantity?string.number} </div> @@ -553,11 +498,7 @@ <div> <#if itemIssuance.shipmentId?has_content> <span class="label">${uiLabelMap.OrderIssuedToShipmentItem}</span> - <form name= "ViewShipmentIssuance" method= "post" action= "/facility/control/ViewShipment"> - <input type= "hidden" name= "shipmentId" value= "${itemIssuance.shipmentId}"> - <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}"> - <a target="facility" href="javascript:document.ViewShipmentIssuance.submit()" class="buttontext">${itemIssuance.shipmentId}</a>: ${itemIssuance.shipmentItemSeqId?if_exists} - </form> + <a target="facility" href="/facility/control/ViewShipment?shipmentId=${itemIssuance.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${itemIssuance.shipmentId}</a>: ${itemIssuance.shipmentItemSeqId?if_exists} <#else> <span class="label">${uiLabelMap.OrderIssuedWithoutShipment}</span> </#if> @@ -580,13 +521,9 @@ <#if itemIssuance.inventoryItemId?has_content> <#assign inventoryItem = itemIssuance.getRelatedOne("InventoryItem")/> <span class="label">${uiLabelMap.FacilityInventory}</span> - <form name= "EditInventoryItem1" method= "post" action= "/facility/control/EditInventoryItem"> - <input type= "hidden" name= "inventoryItemId" value= "${itemIssuance.inventoryItemId}"> - <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}"> - <a href="javascript:document.EditInventoryItem1.submit()" class="buttontext">${itemIssuance.inventoryItemId}</a> - </form> + <a href="/facility/control/EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId}&externalLoginKey=${externalLoginKey}" class="buttontext">${itemIssuance.inventoryItemId}</a> <span class="label">${uiLabelMap.OrderShipGroup}</span> ${itemIssuance.shipGroupSeqId?if_exists} - <#if (inventoryItem.serialNumber?has_content)><br><span class="label">${uiLabelMap.ProductSerialNumber}</span> ${inventoryItem.serialNumber} </#if> + <#if (inventoryItem.serialNumber?has_content)><br><span class="label">${uiLabelMap.ProductSerialNumber}</span> ${inventoryItem.serialNumber} </#if> </#if> </div> </td> @@ -607,19 +544,11 @@ <div> <#if shipmentReceipt.shipmentId?has_content> <span class="label">${uiLabelMap.OrderShipmentReceived}</span> - <form name= "viewShipmentShipment" method= "post" action= "/facility/control/ViewShipment"> - <input type= "hidden" name= "shipmentId" value= "${shipmentReceipt.shipmentId}"> - <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}"> - <a target="facility" href="javascript:document.viewShipmentShipment.submit()" class="buttontext">${shipmentReceipt.shipmentId}</a>:${shipmentReceipt.shipmentItemSeqId?if_exists} - </form> + <a target="facility" href="/facility/control/ViewShipment?shipmentId=${shipmentReceipt.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipmentReceipt.shipmentId}</a>:${shipmentReceipt.shipmentItemSeqId?if_exists} </#if> ${shipmentReceipt.datetimeReceived} <span class="label">${uiLabelMap.FacilityInventory}</span> - <form name= "viewShipmentInventory" method= "post" action= "/facility/control/EditInventoryItem"> - <input type= "hidden" name= "inventoryItemId" value= "${shipmentReceipt.inventoryItemId}"> - <input type= "hidden" name= "externalLoginKey" value= "${externalLoginKey}"> - <a href="javascript:document.viewShipmentInventory.submit()" class="buttontext">${shipmentReceipt.inventoryItemId}</a> - </form> + <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipmentReceipt.inventoryItemId}</a> </div> </td> <td align="center"> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |