You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2013/05/13 22:05:48 UTC
svn commit: r1482065 - in /ofbiz/trunk:
applications/manufacturing/webapp/manufacturing/bom/
applications/order/webapp/ordermgr/entry/
applications/order/webapp/ordermgr/entry/cart/
applications/order/webapp/ordermgr/order/ applications/product/webapp/...
Author: doogie
Date: Mon May 13 20:05:47 2013
New Revision: 1482065
URL: http://svn.apache.org/r1482065
Log:
FIX: Start using ${externalKeyParam} everywhere consistently. I only
did what was included by the main ordermgr view order screen.
Modified:
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl
ofbiz/trunk/themes/flatgrey/includes/header.ftl
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl?rev=1482065&r1=1482064&r2=1482065&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/bom/BomSimulation.ftl Mon May 13 20:05:47 2013
@@ -110,7 +110,7 @@ under the License.
<#list productsData as productData>
<#assign node = productData.node>
<tr valign="middle"<#if alt_row> class="alternate-row"</#if>>
- <td><a href="/catalog/control/EditProduct?productId=${node.product.productId}&externalLoginKey=${externalLoginKey}" class="buttontext">${node.product.productId}</a></td>
+ <td><a href="/catalog/control/EditProduct?productId=${node.product.productId}${externalKeyParam}" class="buttontext">${node.product.productId}</a></td>
<td>${node.product.internalName?default(" ")}</td>
<td align="right">${node.quantity}</td>
<td align="right">${productData.qoh?if_exists}</td>
@@ -118,7 +118,7 @@ under the License.
<#if productData.unitCost?exists && (productData.unitCost > 0)>
<td align="right">${productData.unitCost?if_exists}</td>
<#else>
- <td align="right"><a href="/catalog/control/EditProductCosts?productId=${node.product.productId}&externalLoginKey=${externalLoginKey}" class="buttontext">NA</a></td>
+ <td align="right"><a href="/catalog/control/EditProductCosts?productId=${node.product.productId}${externalKeyParam}" class="buttontext">NA</a></td>
</#if>
<td align="right">${productData.totalCost?if_exists}</td>
</tr>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl?rev=1482065&r1=1482064&r2=1482065&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/showcartitems.ftl Mon May 13 20:05:47 2013
@@ -109,7 +109,7 @@ under the License.
<#if cartLine.getAttribute("surveyResponses")?has_content>
<br />Surveys:
<#list cartLine.getAttribute("surveyResponses") as surveyResponseId>
- <a href="/content/control/ViewSurveyResponses?surveyResponseId=${surveyResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext" style="font-size: xx-small;">${surveyResponseId}</a>
+ <a href="/content/control/ViewSurveyResponses?surveyResponseId=${surveyResponseId}${externalKeyParam}" class="buttontext" style="font-size: xx-small;">${surveyResponseId}</a>
</#list>
</#if>
</div>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl?rev=1482065&r1=1482064&r2=1482065&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/checkinits.ftl Mon May 13 20:05:47 2013
@@ -38,7 +38,7 @@ under the License.
<ul>
<li class="h3">${uiLabelMap.OrderSalesOrder}<#if shoppingCart?exists> ${uiLabelMap.OrderInProgress}</#if></li>
<li><a href="javascript:document.salesentryform.submit();">${uiLabelMap.CommonContinue}</a></li>
- <li><a href="/partymgr/control/findparty?externalLoginKey=${externalLoginKey}">${uiLabelMap.PartyFindParty}</a></li>
+ <li><a href="/partymgr/control/findparty?${externalKeyParam}">${uiLabelMap.PartyFindParty}</a></li>
</ul>
<br class="clear"/>
</div>
@@ -130,7 +130,7 @@ under the License.
<ul>
<li class="h3">${uiLabelMap.OrderPurchaseOrder}<#if shoppingCart?exists> ${uiLabelMap.OrderInProgress}</#if></li>
<li><a href="javascript:document.poentryform.submit();">${uiLabelMap.CommonContinue}</a></li>
- <li><a href="/partymgr/control/findparty?externalLoginKey=${externalLoginKey}">${uiLabelMap.PartyFindParty}</a></li>
+ <li><a href="/partymgr/control/findparty?${externalKeyParam}">${uiLabelMap.PartyFindParty}</a></li>
</ul>
<br class="clear"/>
</div>
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=1482065&r1=1482064&r2=1482065&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Mon May 13 20:05:47 2013
@@ -327,7 +327,7 @@ under the License.
<td colspan="6">
<#if orderItem.orderItemTypeId != "RENTAL_ORDER_ITEM">
<span class="label">${uiLabelMap.ManufacturingProductionRun}</span>
- <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}&externalLoginKey=${externalLoginKey}"
+ <a href="/manufacturing/control/ShowProductionRun?productionRunId=${workEffort.workEffortId}${externalKeyParam}"
class="buttontext">${workEffort.workEffortId}</a>
${uiLabelMap.OrderCurrentStatus}
${(delegator.findOne("StatusItem", Static["org.ofbiz.base.util.UtilMisc"].toMap("statusId", workEffort.getString("currentStatusId")), true).get("description",locale))?if_exists}
@@ -418,7 +418,7 @@ under the License.
(${orderItemAdjustment.comments?default("")})
</#if>
<#if orderItemAdjustment.productPromoId?has_content>
- <a href="/catalog/control/EditProductPromo?productPromoId=${orderItemAdjustment.productPromoId}&externalLoginKey=${externalLoginKey}"
+ <a href="/catalog/control/EditProductPromo?productPromoId=${orderItemAdjustment.productPromoId}${externalKeyParam}"
>${orderItemAdjustment.getRelatedOne("ProductPromo", false).getString("promoName")}</a>
</#if>
<#if orderItemAdjustment.orderAdjustmentTypeId == "SALES_TAX">
@@ -479,7 +479,7 @@ under the License.
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.CommonSurveys}</span>
- <a href="/content/control/ViewSurveyResponses?surveyResponseId=${survey.surveyResponseId}&surveyId=${survey.surveyId}&externalLoginKey=${externalLoginKey}"
+ <a href="/content/control/ViewSurveyResponses?surveyResponseId=${survey.surveyResponseId}&surveyId=${survey.surveyId}${externalKeyParam}"
class="buttontext">${survey.surveyId}</a>
</td>
<td colspan="5"> </td>
@@ -543,7 +543,7 @@ under the License.
<tr<#if itemClass == "1"> class="alternate-row"</#if>>
<td align="right" colspan="2">
<span class="label">${uiLabelMap.CommonInventory}</span>
- <a href="/facility/control/EditInventoryItem?inventoryItemId=${orderItemShipGrpInvRes.inventoryItemId}&externalLoginKey=${externalLoginKey}"
+ <a href="/facility/control/EditInventoryItem?inventoryItemId=${orderItemShipGrpInvRes.inventoryItemId}${externalKeyParam}"
class="buttontext">${orderItemShipGrpInvRes.inventoryItemId}</a>
<span class="label">${uiLabelMap.OrderShipGroup}</span> ${orderItemShipGrpInvRes.shipGroupSeqId}
</td>
@@ -571,7 +571,7 @@ under the License.
<td align="right" colspan="2">
<span class="label">${uiLabelMap.OrderPlannedInShipment}</span> <a
target="facility"
- href="/facility/control/ViewShipment?shipmentId=${orderShipment.shipmentId}&externalLoginKey=${externalLoginKey}"
+ href="/facility/control/ViewShipment?shipmentId=${orderShipment.shipmentId}${externalKeyParam}"
class="buttontext">${orderShipment.shipmentId}</a>: ${orderShipment.shipmentItemSeqId}
</td>
<td align="center">
@@ -590,7 +590,7 @@ under the License.
<#if itemIssuance.shipmentId?has_content>
<span class="label">${uiLabelMap.OrderIssuedToShipmentItem}</span>
<a target="facility"
- href="/facility/control/ViewShipment?shipmentId=${itemIssuance.shipmentId}&externalLoginKey=${externalLoginKey}"
+ href="/facility/control/ViewShipment?shipmentId=${itemIssuance.shipmentId}${externalKeyParam}"
class="buttontext">${itemIssuance.shipmentId}</a>: ${itemIssuance.shipmentItemSeqId?if_exists}
<#else>
<span class="label">${uiLabelMap.OrderIssuedWithoutShipment}</span>
@@ -611,7 +611,7 @@ under the License.
<#if itemIssuance.inventoryItemId?has_content>
<#assign inventoryItem = itemIssuance.getRelatedOne("InventoryItem", false)/>
<span class="label">${uiLabelMap.CommonInventory}</span>
- <a href="/facility/control/EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId}&externalLoginKey=${externalLoginKey}"
+ <a href="/facility/control/EditInventoryItem?inventoryItemId=${itemIssuance.inventoryItemId}${externalKeyParam}"
class="buttontext">${itemIssuance.inventoryItemId}</a>
<span class="label">${uiLabelMap.OrderShipGroup}</span> ${itemIssuance.shipGroupSeqId?if_exists}
<#if (inventoryItem.serialNumber?has_content)>
@@ -636,12 +636,12 @@ under the License.
<#if shipmentReceipt.shipmentId?has_content>
<span class="label">${uiLabelMap.OrderShipmentReceived}</span>
<a target="facility"
- href="/facility/control/ViewShipment?shipmentId=${shipmentReceipt.shipmentId}&externalLoginKey=${externalLoginKey}"
+ href="/facility/control/ViewShipment?shipmentId=${shipmentReceipt.shipmentId}${externalKeyParam}"
class="buttontext">${shipmentReceipt.shipmentId}</a>:${shipmentReceipt.shipmentItemSeqId?if_exists}
</#if>
<#if shipmentReceipt.datetimeReceived?has_content>${Static["org.ofbiz.base.util.UtilFormatOut"].formatDateTime(shipmentReceipt.datetimeReceived, "", locale, timeZone)!}</#if>
<span class="label">${uiLabelMap.CommonInventory}</span>
- <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}&externalLoginKey=${externalLoginKey}"
+ <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}${externalKeyParam}"
class="buttontext">${shipmentReceipt.inventoryItemId}</a>
</td>
<td align="center">
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl?rev=1482065&r1=1482064&r2=1482065&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Mon May 13 20:05:47 2013
@@ -79,8 +79,8 @@ under the License.
<td width="1%"> </td>
<td valign="top" width="60%">
<#list invoices as invoice>
- <div>${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}&externalLoginKey=${externalLoginKey}" class="buttontext">${invoice}</a>
- (<a target="_BLANK" href="/accounting/control/invoice.pdf?invoiceId=${invoice}&externalLoginKey=${externalLoginKey}" class="buttontext">PDF</a>)</div>
+ <div>${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}${externalKeyParam}" class="buttontext">${invoice}</a>
+ (<a target="_BLANK" href="/accounting/control/invoice.pdf?invoiceId=${invoice}${externalKeyParam}" class="buttontext">PDF</a>)</div>
</#list>
</td>
<td width="10%"> </td>
@@ -144,7 +144,7 @@ under the License.
<table class="basic-table" cellspacing='0'>
<tr>
<td valign="top">
- ${uiLabelMap.CommonNbr}<a href="/accounting/control/EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}&externalLoginKey=${externalLoginKey}" class="buttontext">${billingAccount.billingAccountId}</a> - ${billingAccount.description?if_exists}
+ ${uiLabelMap.CommonNbr}<a href="/accounting/control/EditBillingAccount?billingAccountId=${billingAccount.billingAccountId}${externalKeyParam}" class="buttontext">${billingAccount.billingAccountId}</a> - ${billingAccount.description?if_exists}
</td>
<td valign="top" align="right">
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED" && orderPaymentPreference.statusId != "PAYMENT_RECEIVED">
@@ -191,7 +191,7 @@ under the License.
<#if (finAccountType?has_content)>
${finAccountType.description?default(finAccountType.finAccountTypeId)}
</#if>
- #${finAccount.finAccountCode?default(finAccount.finAccountId)} (<a href="/accounting/control/EditFinAccount?finAccountId=${finAccount.finAccountId}&externalLoginKey=${externalLoginKey}" class="buttontext">${finAccount.finAccountId}</a>)
+ #${finAccount.finAccountCode?default(finAccount.finAccountId)} (<a href="/accounting/control/EditFinAccount?finAccountId=${finAccount.finAccountId}${externalKeyParam}" class="buttontext">${finAccount.finAccountId}</a>)
<br />
${finAccount.finAccountName?if_exists}
<br />
@@ -199,10 +199,10 @@ under the License.
<#-- Authorize and Capture transactions -->
<div>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
- <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a>
+ <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${externalKeyParam}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a>
</#if>
<#if orderPaymentPreference.statusId == "PAYMENT_AUTHORIZED">
- <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingCapture}</a>
+ <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${externalKeyParam}" class="buttontext">${uiLabelMap.AccountingCapture}</a>
</#if>
</div>
</div>
@@ -217,7 +217,7 @@ under the License.
(<span class="label">${uiLabelMap.OrderReference}</span> ${gatewayResponse.referenceNum?if_exists}
<span class="label">${uiLabelMap.OrderAvs}</span> ${gatewayResponse.gatewayAvsResult?default("N/A")}
<span class="label">${uiLabelMap.OrderScore}</span> ${gatewayResponse.gatewayScoreResult?default("N/A")})
- <a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.CommonDetails}</a>
+ <a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}${externalKeyParam}" class="buttontext">${uiLabelMap.CommonDetails}</a>
<#if gatewayResponse_has_next><hr /></#if>
</#list>
</div>
@@ -248,7 +248,7 @@ under the License.
<td width="60%">
<div>
<#list paymentList as paymentMap>
- <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if>
+ <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${externalKeyParam}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if>
</#list>
</div>
</td>
@@ -308,7 +308,7 @@ under the License.
<td width="60%">
<div>
<#list paymentList as paymentMap>
- <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if>
+ <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${externalKeyParam}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if>
</#list>
</div>
</td>
@@ -356,10 +356,10 @@ under the License.
<#-- Authorize and Capture transactions -->
<div>
<#if orderPaymentPreference.statusId != "PAYMENT_SETTLED">
- <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a>
+ <a href="/accounting/control/AuthorizeTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${externalKeyParam}" class="buttontext">${uiLabelMap.AccountingAuthorize}</a>
</#if>
<#if orderPaymentPreference.statusId == "PAYMENT_AUTHORIZED">
- <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.AccountingCapture}</a>
+ <a href="/accounting/control/CaptureTransaction?orderId=${orderId?if_exists}&orderPaymentPreferenceId=${orderPaymentPreference.orderPaymentPreferenceId}${externalKeyParam}" class="buttontext">${uiLabelMap.AccountingCapture}</a>
</#if>
</div>
<#else>
@@ -377,7 +377,7 @@ under the License.
(<span class="label">${uiLabelMap.OrderReference}</span> ${gatewayResponse.referenceNum?if_exists}
<span class="label">${uiLabelMap.OrderAvs}</span> ${gatewayResponse.gatewayAvsResult?default("N/A")}
<span class="label">${uiLabelMap.OrderScore}</span> ${gatewayResponse.gatewayScoreResult?default("N/A")})
- <a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.CommonDetails}</a>
+ <a href="/accounting/control/ViewGatewayResponse?paymentGatewayResponseId=${gatewayResponse.paymentGatewayResponseId}${externalKeyParam}" class="buttontext">${uiLabelMap.CommonDetails}</a>
<#if gatewayResponse_has_next><hr /></#if>
</#list>
</div>
@@ -446,7 +446,7 @@ under the License.
<td width="60%">
<div>
<#list paymentList as paymentMap>
- <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if>
+ <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${externalKeyParam}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if>
</#list>
</div>
</td>
@@ -505,7 +505,7 @@ under the License.
<td width="60%">
<div>
<#list paymentList as paymentMap>
- <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if>
+ <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${externalKeyParam}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if>
</#list>
</div>
</td>
@@ -540,7 +540,7 @@ under the License.
<td width="60%">
<div>
<#list paymentList as paymentMap>
- <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if>
+ <a href="/accounting/control/paymentOverview?paymentId=${paymentMap.paymentId}${externalKeyParam}" class="buttontext">${paymentMap.paymentId}</a><#if paymentMap_has_next><br /></#if>
</#list>
</div>
</td>
@@ -567,8 +567,8 @@ under the License.
<td width="1%"> </td>
<td valign="top" width="60%">
<#list invoices as invoice>
- <div>${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}&externalLoginKey=${externalLoginKey}" class="buttontext">${invoice}</a>
- (<a target="_BLANK" href="/accounting/control/invoice.pdf?invoiceId=${invoice}&externalLoginKey=${externalLoginKey}" class="buttontext">PDF</a>)</div>
+ <div>${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}${externalKeyParam}" class="buttontext">${invoice}</a>
+ (<a target="_BLANK" href="/accounting/control/invoice.pdf?invoiceId=${invoice}${externalKeyParam}" class="buttontext">PDF</a>)</div>
</#list>
</td>
<td width="10%"> </td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=1482065&r1=1482064&r2=1482065&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Mon May 13 20:05:47 2013
@@ -575,8 +575,8 @@ under the License.
<td valign="top" width="80%">
<#list shipGroupShipments as shipment>
<div>
- ${uiLabelMap.CommonNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${shipment.shipmentId}</a>
- <a target="_BLANK" href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}&externalLoginKey=${externalLoginKey}" class="buttontext">${uiLabelMap.ProductPackingSlip}</a>
+ ${uiLabelMap.CommonNbr}<a href="/facility/control/ViewShipment?shipmentId=${shipment.shipmentId}${externalKeyParam}" class="buttontext">${shipment.shipmentId}</a>
+ <a target="_BLANK" href="/facility/control/PackingSlip.pdf?shipmentId=${shipment.shipmentId}${externalKeyParam}" class="buttontext">${uiLabelMap.ProductPackingSlip}</a>
<#if "SALES_ORDER" == orderHeader.orderTypeId && "ORDER_COMPLETED" == orderHeader.statusId>
<#assign shipmentRouteSegments = delegator.findByAnd("ShipmentRouteSegment", {"shipmentId" : shipment.shipmentId}, null, false)>
<#if shipmentRouteSegments?has_content>
@@ -608,7 +608,7 @@ under the License.
<#if orderHeader.orderTypeId == "SALES_ORDER">
<#if !shipGroup.supplierPartyId?has_content>
<#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>
+ <a href="/facility/control/PackOrder?facilityId=${storeFacilityId?if_exists}&orderId=${orderId}&shipGroupSeqId=${shipGroup.shipGroupSeqId}${externalKeyParam}" class="buttontext">${uiLabelMap.OrderPackShipmentForShipGroup}</a>
<br />
</#if>
<a href="javascript:document.createShipment_${shipGroup.shipGroupSeqId}.submit()" class="buttontext">${uiLabelMap.OrderNewShipmentForShipGroup}</a>
Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1482065&r1=1482064&r2=1482065&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Mon May 13 20:05:47 2013
@@ -393,7 +393,7 @@ under the License.
<td width="45%">
<b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists}
<input type="text" size="12" name="productId_o_${rowCount}"/>
- <a href="/catalog/control/EditProduct?externalLoginKey=${externalLoginKey}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
+ <a href="/catalog/control/EditProduct?${externalKeyParam}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
</td>
</#if>
<td align="right">${uiLabelMap.ProductLocation}:</td>
Modified: ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=1482065&r1=1482064&r2=1482065&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl Mon May 13 20:05:47 2013
@@ -120,7 +120,7 @@ under the License.
<div>
${returnItem.returnItemSeqId}: <b>${orderItemType.get("description",locale)}</b> : ${orderItem.itemDescription?if_exists}
<input type="text" size="12" name="productId_o_${rowCount}" />
- <a href="/catalog/control/EditProduct?externalLoginKey=${externalLoginKey}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
+ <a href="/catalog/control/EditProduct?${externalKeyParam}" target="catalog" class="buttontext">${uiLabelMap.ProductCreateProduct}</a>
</div>
</td>
<#else>
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=1482065&r1=1482064&r2=1482065&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl Mon May 13 20:05:47 2013
@@ -58,8 +58,8 @@ under the License.
<ul>
<#list invoiceIds as invoiceId>
<li>
- ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">${invoiceId}</a>
- (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">PDF</a>)
+ ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">${invoiceId}</a>
+ (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">PDF</a>)
</li>
</#list>
</ul>
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl?rev=1482065&r1=1482064&r2=1482065&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl Mon May 13 20:05:47 2013
@@ -39,8 +39,8 @@ under the License.
<ul>
<#list invoiceIds as invoiceId>
<li>
- ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">${invoiceId}</a>
- (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">PDF</a>)
+ ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">${invoiceId}</a>
+ (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">PDF</a>)
</li>
</#list>
</ul>
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl?rev=1482065&r1=1482064&r2=1482065&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl Mon May 13 20:05:47 2013
@@ -38,8 +38,8 @@ under the License.
<ul>
<#list invoiceIds as invoiceId>
<li>
- ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">${invoiceId}</a>
- (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">PDF</a>)
+ ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">${invoiceId}</a>
+ (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${externalKeyParam}" target="_blank" class="buttontext">PDF</a>)
</li>
</#list>
</ul>
Modified: ofbiz/trunk/themes/flatgrey/includes/header.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/includes/header.ftl?rev=1482065&r1=1482064&r2=1482065&view=diff
==============================================================================
--- ofbiz/trunk/themes/flatgrey/includes/header.ftl (original)
+++ ofbiz/trunk/themes/flatgrey/includes/header.ftl Mon May 13 20:05:47 2013
@@ -133,7 +133,7 @@ under the License.
<#if layoutSettings.topLines?has_content>
<#list layoutSettings.topLines as topLine>
<#if topLine.text?exists>
- <li>${topLine.text}<a href="${StringUtil.wrapString(topLine.url?if_exists)}&externalLoginKey=${externalLoginKey}">${topLine.urlText?if_exists}</a></li>
+ <li>${topLine.text}<a href="${StringUtil.wrapString(topLine.url?if_exists)}${externalKeyParam}">${topLine.urlText?if_exists}</a></li>
<#elseif topLine.dropDownList?exists>
<li><#include "component://common/webcommon/includes/insertDropDown.ftl"/></li>
<#else>