You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/05/23 22:18:07 UTC
svn commit: r947485 - in /ofbiz/trunk/applications:
accounting/webapp/accounting/period/ order/webapp/ordermgr/order/
product/webapp/facility/facility/ product/webapp/facility/shipment/
Author: jleroux
Date: Sun May 23 20:18:07 2010
New Revision: 947485
URL: http://svn.apache.org/viewvc?rev=947485&view=rev
Log:
Some languages don't use # for number http://en.wikipedia.org/wiki/Number_sign
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl
Modified: ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl?rev=947485&r1=947484&r2=947485&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl (original)
+++ ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl Sun May 23 20:18:07 2010
@@ -56,7 +56,7 @@ under the License.
<td>${uiLabelMap.CommonParent}</td>
<td>${uiLabelMap.AccountingOrgPartyId}</td>
<td>${uiLabelMap.AccountingPeriodType}</td>
- <td>#</td>
+ <td>${uiLabelMap.CommonNbr}</td>
<td>${uiLabelMap.AccountingPeriodName}</td>
<td>${uiLabelMap.CommonFromDate}</td>
<td>${uiLabelMap.CommonThruDate}</td>
@@ -148,7 +148,7 @@ under the License.
<td>${uiLabelMap.CommonParent}</td>
<td>${uiLabelMap.AccountingOrgPartyId}</td>
<td>${uiLabelMap.AccountingPeriodType}</td>
- <td>#</td>
+ <td>${uiLabelMap.CommonNbr}</td>
<td>${uiLabelMap.AccountingPeriodName}</td>
<td>${uiLabelMap.CommonFromDate}</td>
<td>${uiLabelMap.CommonThruDate}</td>
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl?rev=947485&r1=947484&r2=947485&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/order/orderinfo.ftl Sun May 23 20:18:07 2010
@@ -24,7 +24,7 @@ under the License.
<#assign externalOrder = "(" + orderHeader.externalId + ")"/>
</#if>
<#assign orderType = orderHeader.getRelatedOne("OrderType")/>
- <li class="h3"> ${orderType?if_exists.get("description", locale)?default(uiLabelMap.OrderOrder)} #<a href="<@o...@ofbizUrl>">${orderId}</a> ${externalOrder?if_exists} [ <a href="<@o...@ofbizUrl>" target="_blank">PDF</a> ]</li>
+ <li class="h3"> ${orderType?if_exists.get("description", locale)?default(uiLabelMap.OrderOrder)} ${uiLabelMap.CommonNbr}<a href="<@o...@ofbizUrl>">${orderId}</a> ${externalOrder?if_exists} [ <a href="<@o...@ofbizUrl>" target="_blank">PDF</a> ]</li>
<#if currentStatus.statusId == "ORDER_APPROVED" && orderHeader.orderTypeId == "SALES_ORDER">
<li class="h3"><a href="javascript:document.PrintOrderPickSheet.submit()">${uiLabelMap.FormFieldTitle_printPickSheet}</a>
<form name="PrintOrderPickSheet" method="post" action="<@o...@ofbizUrl>">
@@ -240,7 +240,7 @@ under the License.
<td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.FormFieldTitle_priority}</td>
<td width="5%"> </td>
<td valign="top" width="80%">
- <form action="setOrderReservationPriority" method="post" name="setOrderReservationPriority">
+ <form action="setOrderReservationPriority" method="post" name="setOrderReservationPriority">
<input type = "hidden" name="orderId" value="${orderId}"/>
<select name="priority">
<option value="1" <#if (orderHeader.priority)?if_exists == "1">selected="selected" </#if>>${uiLabelMap.CommonHigh}</option>
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl?rev=947485&r1=947484&r2=947485&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/Picklist.fo.ftl Sun May 23 20:18:07 2010
@@ -142,7 +142,7 @@ under the License.
<fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductLocation}</fo:block></fo:table-cell>
<fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductProductId}</fo:block></fo:table-cell>
<fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductToPick}</fo:block></fo:table-cell>
- <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductQuantityToBin}#</fo:block></fo:table-cell>
+ <fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductQuantityToBin} ${uiLabelMap.CommonNbr}</fo:block></fo:table-cell>
<#-- Not display details here, just the summary info for the bins
<fo:table-cell border-bottom="thin solid grey"><fo:block>${uiLabelMap.ProductOrderItems}</fo:block></fo:table-cell>
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl?rev=947485&r1=947484&r2=947485&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl Sun May 23 20:18:07 2010
@@ -104,7 +104,7 @@ under the License.
<form method="post" action="<@o...@ofbizUrl>" style="display: inline;">
<input type="hidden" name="facilityId" value="${facilityId}"/>
<input type="hidden" name="picklistBinId" value="${picklistBinInfo.picklistBin.picklistBinId}"/>
- <span class="label">${uiLabelMap.ProductLocation}#</span>
+ <span class="label">${uiLabelMap.ProductLocation} ${uiLabelMap.CommonNbr}</span>
<input type"text" size="2" name="binLocationNumber" value="${picklistBinInfo.picklistBin.binLocationNumber}"/>
<span class="label">${uiLabelMap.PageTitlePickList}</span>
<select name="picklistId">
Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl?rev=947485&r1=947484&r2=947485&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentPackages.ftl Sun May 23 20:18:07 2010
@@ -169,8 +169,8 @@ under the License.
</select>
</div>
</td>
- <td><span class="label">Track#</span><input type="text" size="22" name="trackingCode"/></td>
- <td><span class="label">Box#</span><input type="text" size="5" name="boxNumber"/></td>
+ <td><span class="label">Track ${uiLabelMap.CommonNbr}</span><input type="text" size="22" name="trackingCode"/></td>
+ <td><span class="label">Box ${uiLabelMap.CommonNbr}</span><input type="text" size="5" name="boxNumber"/></td>
<td><a href="javascript:document.createShipmentPackageRouteSegForm${shipmentPackageData_index}.submit()" class="buttontext">${uiLabelMap.CommonAdd}</a></td>
<td> </td>
</form>