Author: jleroux
Date: Sun May 23 20:31:48 2010
New Revision: 947491
URL:
http://svn.apache.org/viewvc?rev=947491&view=revLog:
Some languages don't use # for number
http://en.wikipedia.org/wiki/Number_signShould be last pass (reasonable enough...)
Modified:
ofbiz/trunk/applications/order/config/OrderUiLabels.xml
ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl
Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=947491&r1=947490&r2=947491&view=diff==============================================================================
--- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original)
+++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Sun May 23 20:31:48 2010
@@ -6479,7 +6479,7 @@
<value xml:lang="th">à¸à¸¥à¸à¸à¸à¹à¸à¸</value>
<value xml:lang="zh">éè´§</value>
<value xml:lang="zh_CN">éè´§å</value>
- </property>
+ </property>
<property key="OrderOrderReturns">
<value xml:lang="de">Retouren</value>
<value xml:lang="en">Returns</value>
@@ -8634,6 +8634,10 @@
<value xml:lang="th">à¹à¸à¹à¸²à¸«à¸¡à¸²à¸¢à¸à¸à¸à¸à¸¥à¸±à¸à¸ªà¸´à¸à¸à¹à¸²</value>
<value xml:lang="zh">ç®çå°åºæ</value>
</property>
+ <property key="OrderReturnedItemRaNumber">
+ <value xml:lang="en">Returned Item RA#</value>
+ <value xml:lang="fr">Retour, autorisation n°</value>
+ </property>
<property key="OrderReturnEnumId">
<value xml:lang="de">Retoure Seq. ID</value>
<value xml:lang="en">Return Enum Id</value>
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=947491&r1=947490&r2=947491&view=diff==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl Sun May 23 20:31:48 2010
@@ -24,7 +24,7 @@ under the License.
<a href="<@ofbizUrl>EditFacility</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
<#-- Receiving Results -->
<#if receivedItems?has_content>
- <h3>${uiLabelMap.ProductReceiptForReturn}# <a href="/ordermgr/control/returnMain?returnId=${returnHeader.returnId}${externalKeyParam?if_exists}" class="buttontext">${returnHeader.returnId}</a></h3>
+ <h3>${uiLabelMap.ProductReceiptForReturn} ${uiLabelMap.CommonNbr}<a href="/ordermgr/control/returnMain?returnId=${returnHeader.returnId}${externalKeyParam?if_exists}" class="buttontext">${returnHeader.returnId}</a></h3>
<#if "RETURN_RECEIVED" == returnHeader.getString("statusId")>
<h3>${uiLabelMap.ProductReturnCompletelyReceived}</h3>
</#if>
@@ -93,7 +93,7 @@ under the License.
<input type="hidden" name="facilityId_o_${rowCount}" value="${requestParameters.facilityId?if_exists}" />
<input type="hidden" name="datetimeReceived_o_${rowCount}" value="${now}" />
<input type="hidden" name="quantityRejected_o_${rowCount}" value="0" />
- <input type="hidden" name="comments_o_${rowCount}" value="Returned Item RA# ${returnItem.returnId}" />
+ <input type="hidden" name="comments_o_${rowCount}" value="${uiLabelMap.OrderReturnedItemRaNumber} ${returnItem.returnId}" />
<#assign unitCost = Static["org.ofbiz.order.order.OrderReturnServices"].getReturnItemInitialCost(delegator, returnItem.returnId, returnItem.returnItemSeqId)/>
<tr>
Locked
