OFBiz › OFBiz - Commits

svn commit: r947483 - in /ofbiz/trunk: applications/order/webapp/ordermgr/entry/order/ applications/order/webapp/ordermgr/order/ applications/order/webapp/ordermgr/return/ applications/product/webapp/facility/facility/ applications/product/webapp/facil...

_‹ Previous Topic Next Topic _›

Classic

List

Threaded

1 message

jleroux@apache.org

svn commit: r947483 - in /ofbiz/trunk: applications/order/webapp/ordermgr/entry/order/ applications/order/webapp/ordermgr/order/ applications/order/webapp/ordermgr/return/ applications/product/webapp/facility/facility/ applications/product/webapp/facil...

Author: jleroux
Date: Sun May 23 20:15:49 2010
New Revision: 947483

URL: http://svn.apache.org/viewvc?rev=947483&view=rev
Log:
Some languages don't use # for number http://en.wikipedia.org/wiki/Number_sign

Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.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/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl?rev=947483&r1=947482&r2=947483&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/order/orderpaymentinfo.ftl Sun May 23 20:15:49 2010
@@ -41,7 +41,7 @@ under the License.
<div align="center">${paymentAddress.city}<#if paymentAddress.stateProvinceGeoId?has_content>, ${paymentAddress.stateProvinceGeoId}</#if> ${paymentAddress.postalCode}
<div align="center">${paymentAddress.countryGeoId}</div>
<div align="center"><hr /></div>
- <div align="center"><b>${uiLabelMap.OrderBeSureIncludeOrder} #</b></div>
+ <div align="center"><b>${uiLabelMap.OrderBeSureIncludeOrder} ${uiLabelMap.CommonNbr}</b></div>
</#if>
</td>
<#else>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl?rev=947483&r1=947482&r2=947483&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl Sun May 23 20:15:49 2010
@@ -35,7 +35,7 @@ under the License.
<#if orderHeaderList?has_content>
<table class="basic-table hover-bar" cellspacing='0'>
<tr class="header-row">
- <td width="10%">${uiLabelMap.OrderOrder} #</td>
+ <td width="10%">${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</td>
<td width="15%">${uiLabelMap.OrderOrderBillToParty}</td>
<td width="25%">${uiLabelMap.OrderProductStore}</td>
<td width="10%">${uiLabelMap.CommonAmount}</td>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl?rev=947483&r1=947482&r2=947483&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/editorderitems.ftl Sun May 23 20:15:49 2010
@@ -129,7 +129,7 @@ under the License.
<#assign returnHeader = returnItem.getRelatedOne("ReturnHeader")>
<#if returnHeader.statusId != "RETURN_CANCELLED">
<div class="alert">
- <span class="label">${uiLabelMap.OrderReturned}</span> #<a href="<@ofbizUrl>returnMain?returnId=${returnItem.returnId}</@ofbizUrl>" class="buttontext">${returnItem.returnId}</a>
+ <span class="label">${uiLabelMap.OrderReturned}</span> ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl>returnMain?returnId=${returnItem.returnId}</@ofbizUrl>" class="buttontext">${returnItem.returnId}</a>
</div>
</#if>
</#list>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl?rev=947483&r1=947482&r2=947483&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderReportHeaderInfo.fo.ftl Sun May 23 20:15:49 2010
@@ -35,7 +35,7 @@ under the License.
</fo:table-row>

<fo:table-row>
- <fo:table-cell><fo:block>${uiLabelMap.OrderOrder} #</fo:block></fo:table-cell>
+ <fo:table-cell><fo:block>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</fo:block></fo:table-cell>
<fo:table-cell><fo:block>${orderId}</fo:block></fo:table-cell>
</fo:table-row>

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=947483&r1=947482&r2=947483&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderitems.ftl Sun May 23 20:15:49 2010
@@ -184,7 +184,7 @@ under the License.
<#assign returnHeader = returnItem.getRelatedOne("ReturnHeader")>
<#if returnHeader.statusId != "RETURN_CANCELLED">
<font color="red">${uiLabelMap.OrderReturned}</font>
- #<a href="<@ofbizUrl>returnMain?returnId=${returnItem.returnId}</@ofbizUrl>" class="buttontext">${returnItem.returnId}</a>
+ ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl>returnMain?returnId=${returnItem.returnId}</@ofbizUrl>" class="buttontext">${returnItem.returnId}</a>
</#if>
</#list>
</#if>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl?rev=947483&r1=947482&r2=947483&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderlist.ftl Sun May 23 20:15:49 2010
@@ -150,7 +150,7 @@ under the License.
<table class="basic-table hover-bar" cellspacing='0'>
<tr class="header-row">
<td width="15%">${uiLabelMap.CommonDate}</td>
- <td width="10%">${uiLabelMap.OrderOrder} #</td>
+ <td width="10%">${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</td>
<td width="10%">${uiLabelMap.OrderOrderType}</td>
<td width="10%">${uiLabelMap.OrderOrderBillFromParty}</td>
<td width="10%">${uiLabelMap.OrderOrderBillToParty}</td>

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=947483&r1=947482&r2=947483&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderpaymentinfo.ftl Sun May 23 20:15:49 2010
@@ -395,7 +395,7 @@ under the License.
</td>
<td width="1%"> </td>
<td valign="top" width="60%">
- #<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}&externalLoginKey=${externalLoginKey}" class="buttontext">${billingAccount.billingAccountId}</a> - ${billingAccount.description?if_exists}
</td>
<td width="10%"> </td>
</tr>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl?rev=947483&r1=947482&r2=947483&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl Sun May 23 20:15:49 2010
@@ -18,7 +18,7 @@ under the License.
-->
<table cellspacing="0" class="basic-table">
<tr>
- <td colspan="7"><h3>${uiLabelMap.OrderReturnFromOrder} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</a></h3></td>
+ <td colspan="7"><h3>${uiLabelMap.OrderReturnFromOrder} ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</a></h3></td>
<td colspan="2" align="right">
<span>${uiLabelMap.CommonSelectAll}</span> 
<input type="checkbox" name="selectAll" value="Y" onclick="javascript:toggleAll(this, '${selectAllFormName}');highlightAllRows(this, 'returnItemId_tableRow_', 'selectAllForm');"/>
@@ -158,7 +158,7 @@ under the License.
</#list>
<tr><td colspan="9"><hr/></td></tr>
<tr>
- <td colspan="9"><h3>${uiLabelMap.OrderReturnAdjustments} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</a></h3></td>
+ <td colspan="9"><h3>${uiLabelMap.OrderReturnAdjustments} ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</a></h3></td>
</tr>
<tr><td colspan="9"><br /></td></tr>
<#if orderHeaderAdjustments?has_content>
@@ -213,7 +213,7 @@ under the License.
</tr>
<tr>
<td colspan="9">
- <h3>${uiLabelMap.OrderReturnManualAdjustment} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</a></h3>
+ <h3>${uiLabelMap.OrderReturnManualAdjustment} ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</a></h3>
</td>
</tr>
<tr>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=947483&r1=947482&r2=947483&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl Sun May 23 20:15:49 2010
@@ -256,11 +256,11 @@ under the License.
<#assign itemResp = item.getRelatedOne("ReturnItemResponse")?if_exists>
<#if itemResp?has_content>
<#if itemResp.paymentId?has_content>
- <div>${uiLabelMap.AccountingPayment} #<a href="/accounting/control/paymentOverview?paymentId=${itemResp.paymentId}${externalKeyParam}" class="buttontext">${itemResp.paymentId}</a></div>
+ <div>${uiLabelMap.AccountingPayment} ${uiLabelMap.CommonNbr}<a href="/accounting/control/paymentOverview?paymentId=${itemResp.paymentId}${externalKeyParam}" class="buttontext">${itemResp.paymentId}</a></div>
<#elseif itemResp.replacementOrderId?has_content>
- <div>${uiLabelMap.OrderOrder} #<a href="<@ofbizUrl>orderview?orderId=${itemResp.replacementOrderId}</@ofbizUrl>" class="buttontext">${itemResp.replacementOrderId}</a></div>
+ <div>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}<a href="<@ofbizUrl>orderview?orderId=${itemResp.replacementOrderId}</@ofbizUrl>" class="buttontext">${itemResp.replacementOrderId}</a></div>
<#elseif itemResp.billingAccountId?has_content>
- <div>${uiLabelMap.AccountingAccountId} #<a href="/accounting/control/EditBillingAccount?billingAccountId=${itemResp.billingAccountId}${externalKeyParam}" class="buttontext">${itemResp.billingAccountId}</a></div>
+ <div>${uiLabelMap.AccountingAccountId} ${uiLabelMap.CommonNbr}<a href="/accounting/control/EditBillingAccount?billingAccountId=${itemResp.billingAccountId}${externalKeyParam}" class="buttontext">${itemResp.billingAccountId}</a></div>
</#if>
<#else>
<div>${uiLabelMap.CommonNone}</div>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl?rev=947483&r1=947482&r2=947483&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl Sun May 23 20:15:49 2010
@@ -23,7 +23,7 @@ under the License.
<br />
<table cellspacing="0" class="basic-table">
<tr class="header-row">
- <td>${uiLabelMap.OrderReturnId} #</td>
+ <td>${uiLabelMap.OrderReturnId} ${uiLabelMap.CommonNbr}</td>
<td>${uiLabelMap.FormFieldTitle_entryDate}</td>
<td>${uiLabelMap.PartyParty}</td>
<td>${uiLabelMap.FacilityFacility}</td>

Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl?rev=947483&r1=947482&r2=947483&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistOptions.ftl Sun May 23 20:15:49 2010
@@ -55,7 +55,7 @@ under the License.
<#if pickMoveInfoList?has_content || rushOrderInfo?has_content>
<tr class="header-row">
<#if !((requestParameters.groupByShippingMethod?exists && requestParameters.groupByShippingMethod == "Y") || (requestParameters.groupByWarehouseArea?exists && requestParameters.groupByWarehouseArea == "Y") || (requestParameters.groupByNoOfOrderItems?exists && requestParameters.groupByNoOfOrderItems == "Y"))>
- <td>${uiLabelMap.OrderOrder} #</td>
+ <td>${uiLabelMap.OrderOrder} ${uiLabelMap.CommonNbr}</td>
<#else>
<td>${uiLabelMap.ProductShipmentMethod}</td>
<td>${uiLabelMap.ProductWarehouseArea}</td>

Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl?rev=947483&r1=947482&r2=947483&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl Sun May 23 20:15:49 2010
@@ -312,12 +312,12 @@ under the License.
<#if shipmentPackageRouteSeg.labelImage?exists>
<a href="javascript:document.viewShipmentPackageRouteSegLabelImage_${shipmentRouteSegmentData_index}_${shipmentPackageRouteSeg_index}.submit();" class="buttontext">${uiLabelMap.ProductViewLabelImage}</a>
</#if>
- <span class="label">${uiLabelMap.ProductTrack} #</span><input type="text" size="22" name="trackingCode" value="${shipmentPackageRouteSeg.trackingCode?if_exists}"/>
+ <span class="label">${uiLabelMap.ProductTrack} ${uiLabelMap.CommonNbr}</span><input type="text" size="22" name="trackingCode" value="${shipmentPackageRouteSeg.trackingCode?if_exists}"/>
</div>
</td>
<td valign="top">
<div>
- <span class="label">${uiLabelMap.ProductBox} #</span>
+ <span class="label">${uiLabelMap.ProductBox} ${uiLabelMap.CommonNbr}</span>
<input type="text" size="5" name="boxNumber" value="${shipmentPackageRouteSeg.boxNumber?if_exists}"/>
</div>
</td>

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=947483&r1=947482&r2=947483&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl Sun May 23 20:15:49 2010
@@ -58,7 +58,7 @@ under the License.
<ul>
<#list invoiceIds as invoiceId>
<li>
- #<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">${invoiceId}</a>
+ ${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>)
</li>
</#list>
@@ -144,7 +144,7 @@ under the License.
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="h3">${uiLabelMap.ProductOrderId} #<a href="/ordermgr/control/orderview?orderId=${orderId}">${orderId}</a> / ${uiLabelMap.ProductOrderShipGroupId} #${shipGroupSeqId}</li>
+ <li class="h3">${uiLabelMap.ProductOrderId} ${uiLabelMap.CommonNbr}<a href="/ordermgr/control/orderview?orderId=${orderId}">${orderId}</a> / ${uiLabelMap.ProductOrderShipGroupId} #${shipGroupSeqId}</li>
</ul>
<br class="clear"/>
</div>
@@ -252,7 +252,7 @@ under the License.
<table class="basic-table" cellspacing='0'>
<tr class="header-row">
<td> </td>
- <td>${uiLabelMap.ProductItem} #</td>
+ <td>${uiLabelMap.ProductItem} ${uiLabelMap.CommonNbr}</td>
<td>${uiLabelMap.ProductProductId}</td>
<td>${uiLabelMap.ProductInternalName}</td>
<td align="right">${uiLabelMap.ProductOrderedQuantity}</td>
@@ -430,13 +430,13 @@ under the License.
<br />
<table class="basic-table" cellspacing='0'>
<tr class="header-row">
- <td>${uiLabelMap.ProductItem} #</td>
+ <td>${uiLabelMap.ProductItem} ${uiLabelMap.CommonNbr}</td>
<td>${uiLabelMap.ProductProductId}</td>
<td>${uiLabelMap.ProductProductDescription}</td>
- <td>${uiLabelMap.ProductInventoryItem} #</td>
+ <td>${uiLabelMap.ProductInventoryItem} ${uiLabelMap.CommonNbr}</td>
<td align="right">${uiLabelMap.ProductPackedQty}</td>
<td align="right">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}) (${uiLabelMap.ProductPackage})</td>
- <td align="right">${uiLabelMap.ProductPackage} #</td>
+ <td align="right">${uiLabelMap.ProductPackage} ${uiLabelMap.CommonNbr}</td>
<td> </td>
</tr>
<#list packedLines as line>
@@ -474,13 +474,13 @@ under the License.
<div class="screenlet-body">
<table class="basic-table" cellspacing='0'>
<tr class="header-row">
- <td>${uiLabelMap.ProductItem} #</td>
+ <td>${uiLabelMap.ProductItem} ${uiLabelMap.CommonNbr}</td>
<td>${uiLabelMap.ProductProductId}</td>
<td>${uiLabelMap.ProductProductDescription}</td>
- <td>${uiLabelMap.ProductInventoryItem} #</td>
+ <td>${uiLabelMap.ProductInventoryItem} ${uiLabelMap.CommonNbr}</td>
<td align="right">${uiLabelMap.ProductPackedQty}</td>
<td align="right">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}) (${uiLabelMap.ProductPackage})</td>
- <td align="right">${uiLabelMap.ProductPackage} #</td>
+ <td align="right">${uiLabelMap.ProductPackage} ${uiLabelMap.CommonNbr}</td>
<td> </td>
</tr>
<#list packedLines as line>

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=947483&r1=947482&r2=947483&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl Sun May 23 20:15:49 2010
@@ -39,7 +39,7 @@ under the License.
<ul>
<#list invoiceIds as invoiceId>
<li>
- #<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">${invoiceId}</a>
+ ${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>)
</li>
</#list>
@@ -106,7 +106,7 @@ under the License.
<div class="screenlet">
<div class="screenlet-title-bar">
<ul>
- <li class="h3">${uiLabelMap.ProductOrderId} #<a href="/ordermgr/control/orderview?orderId=${orderId}">${orderId}</a> / ${uiLabelMap.ProductOrderShipGroupId} #${shipGroupSeqId}</li>
+ <li class="h3">${uiLabelMap.ProductOrderId} ${uiLabelMap.CommonNbr}<a href="/ordermgr/control/orderview?orderId=${orderId}">${orderId}</a> / ${uiLabelMap.ProductOrderShipGroupId} #${shipGroupSeqId}</li>
</ul>
<br class="clear"/>
</div>
@@ -191,7 +191,7 @@ under the License.
<table class="basic-table" cellspacing='0'>
<tr class="header-row">
<td> </td>
- <td>${uiLabelMap.ProductItem} #</td>
+ <td>${uiLabelMap.ProductItem} ${uiLabelMap.CommonNbr}</td>
<td>${uiLabelMap.ProductProductId}</td>
<td>${uiLabelMap.ProductInternalName}</td>
<td>${uiLabelMap.ProductCountryOfOrigin}</td>
@@ -334,9 +334,9 @@ under the License.
<div class="screenlet-body">
<table class="basic-table" cellspacing='0'>
<tr class="header-row">
- <td>${uiLabelMap.ProductItem} #</td>
+ <td>${uiLabelMap.ProductItem} ${uiLabelMap.CommonNbr}</td>
<td>${uiLabelMap.ProductProductId}</td>
- <td>${uiLabelMap.ProductInventoryItem} #</td>
+ <td>${uiLabelMap.ProductInventoryItem} ${uiLabelMap.CommonNbr}</td>
<td align="right">${uiLabelMap.ProductVerified} ${uiLabelMap.CommonQuantity}</td>
<td> </td>
</tr>

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=947483&r1=947482&r2=947483&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl Sun May 23 20:15:49 2010
@@ -38,7 +38,7 @@ under the License.
<ul>
<#list invoiceIds as invoiceId>
<li>
- #<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}&externalLoginKey=${externalLoginKey}" target="_blank" class="buttontext">${invoiceId}</a>
+ ${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>)
</li>
</#list>

Modified: ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl?rev=947483&r1=947482&r2=947483&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl (original)
+++ ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl Sun May 23 20:15:49 2010
@@ -226,19 +226,19 @@ under the License.
<tr>
<td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStorePrimaryColor} :</td>
<td valign="middle">
- #<input type="text" id="storePrimaryColor" name="storePrimaryColor" size="10" value="${ebayStore.storeColorPrimary?if_exists}"/>
+ ${uiLabelMap.CommonNbr}<input type="text" id="storePrimaryColor" name="storePrimaryColor" size="10" value="${ebayStore.storeColorPrimary?if_exists}"/>
</td>
</tr>
<tr>
<td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreSecondColor} :</td>
<td valign="middle">
- #<input type="text" id="storeSecondaryColor" name="storeSecondaryColor" size="10" value="${ebayStore.storeColorSecondary?if_exists}"/>
+ ${uiLabelMap.CommonNbr}<input type="text" id="storeSecondaryColor" name="storeSecondaryColor" size="10" value="${ebayStore.storeColorSecondary?if_exists}"/>
</td>
</tr>
<tr>
<td class="label" align="right" valign="middle">${uiLabelMap.EbayStoreStoreAccentColor} :</td>
<td valign="middle">
- #<input type="text" id="storeAccentColor" name="storeAccentColor" size="10" value="${ebayStore.storeColorAccent?if_exists}"/>
+ ${uiLabelMap.CommonNbr}<input type="text" id="storeAccentColor" name="storeAccentColor" size="10" value="${ebayStore.storeColorAccent?if_exists}"/>
</td>
</tr>
<tr>
@@ -284,7 +284,7 @@ under the License.
</select>
</td>
<td>
- #<input id="storeNameFontColor" type="text" size="10" name="storeNameFontColor" value="${storeFontColor?if_exists}"/>
+ ${uiLabelMap.CommonNbr}<input id="storeNameFontColor" type="text" size="10" name="storeNameFontColor" value="${storeFontColor?if_exists}"/>
</td>
</tr>
</table>
@@ -317,7 +317,7 @@ under the License.
</select>
</td>
<td>
- #<input id="storeTitleFontColor" type="text" size="10" name="storeTitleFontColor" value="${storeTitleColor?if_exists}"/>
+ ${uiLabelMap.CommonNbr}<input id="storeTitleFontColor" type="text" size="10" name="storeTitleFontColor" value="${storeTitleColor?if_exists}"/>
</td>
</tr>
</table>
@@ -350,7 +350,7 @@ under the License.
</select>
</td>
<td>
- #<input id="storeDescFontColor" type="text" size="10" name="storeDescFontColor" value="${storeDescColor?if_exists}"/>
+ ${uiLabelMap.CommonNbr}<input id="storeDescFontColor" type="text" size="10" name="storeDescFontColor" value="${storeDescColor?if_exists}"/>
</td>
</tr>
</table>