svn commit: r1865853 - in /ofbiz/ofbiz-framework/trunk/applications: order/template/order/ order/template/return/ product/template/shipment/

[Pawan Verma-2]

Author: pawan
Date: Sat Aug 24 15:05:25 2019
New Revision: 1865853

URL: http://svn.apache.org/viewvc?rev=1865853&view=rev
Log:
Improved: Replaced hard coded PDF instead of uiLabel on various places
(OFBIZ-11169)

Replaced hard coded PDF instead of uiLabel on various places use CommonUilable instead.

Thanks: Komal Dayle for your contribution.

Modified:
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderInfo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl
    ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnLinks.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/PackOrder.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl
    ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/WeightPackage.ftl

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderInfo.ftl?rev=1865853&r1=1865852&r2=1865853&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderInfo.ftl Sat Aug 24 15:05:25 2019
@@ -24,7 +24,7 @@ under the License.
                <#assign externalOrder = "(" + orderHeader.externalId + ")"/>
             </#if>
             <#assign orderType = orderHeader.getRelatedOne("OrderType", false)/>
-            <li class="h3">&nbsp;${(orderType.get("description", locale))?default(uiLabelMap.OrderOrder)}&nbsp;${uiLabelMap.CommonNbr}&nbsp;<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>">${orderId}</a> ${externalOrder!} [&nbsp;<a href="<@ofbizUrl>order.pdf?orderId=${orderId}</@ofbizUrl>" target="_blank">PDF</a>&nbsp;]</li>
+            <li class="h3">&nbsp;${(orderType.get("description", locale))?default(uiLabelMap.OrderOrder)}&nbsp;${uiLabelMap.CommonNbr}&nbsp;<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>">${orderId}</a> ${externalOrder!} [&nbsp;<a href="<@ofbizUrl>order.pdf?orderId=${orderId}</@ofbizUrl>" target="_blank">${uiLabelMap.CommonPdf}</a>&nbsp;]</li>
             <div class="basic-nav">
               <ul>
             <#if "ORDER_APPROVED" == currentStatus.statusId && "SALES_ORDER" == orderHeader.orderTypeId>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl?rev=1865853&r1=1865852&r2=1865853&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderPaymentInfo.ftl Sat Aug 24 15:05:25 2019
@@ -79,7 +79,7 @@ under the License.
            <td>
              <#list invoices as invoice>
                <div>${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${invoice}</a>
-               (<a target="_BLANK" href="/accounting/control/invoice.pdf?invoiceId=${invoice}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">PDF</a>)</div>
+               (<a target="_BLANK" href="/accounting/control/invoice.pdf?invoiceId=${invoice}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.CommonPdf}</a>)</div>
              </#list>
            </td>
          </tr>
@@ -547,7 +547,7 @@ under the License.
             <td>
               <#list invoices as invoice>
                 <div>${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoice}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${invoice}</a>
-                (<a target="_BLANK" href="/accounting/control/invoice.pdf?invoiceId=${invoice}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">PDF</a>)</div>
+                (<a target="_BLANK" href="/accounting/control/invoice.pdf?invoiceId=${invoice}${StringUtil.wrapString(externalKeyParam)}" class="buttontext">${uiLabelMap.CommonPdf}</a>)</div>
               </#list>
             </td>
             <td>&nbsp;</td>

Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnLinks.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnLinks.ftl?rev=1865853&r1=1865852&r2=1865853&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnLinks.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/return/ReturnLinks.ftl Sat Aug 24 15:05:25 2019
@@ -35,7 +35,7 @@ under the License.
       <ul>
         <li>
           <ul>
-      <li><a href="<@ofbizUrl>return.pdf?returnId=${returnId!}</@ofbizUrl>" target="_BLANK" >PDF</a></li>
+      <li><a href="<@ofbizUrl>return.pdf?returnId=${returnId!}</@ofbizUrl>" target="_BLANK" >${uiLabelMap.CommonPdf}</a></li>
       <#if returnId??>
         <#assign returnItems = EntityQuery.use(delegator).from("ReturnItem").where("returnId", returnId!, "returnTypeId", "RTN_REFUND").queryList()!/>
         <#if returnItems?has_content>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/PackOrder.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/PackOrder.ftl?rev=1865853&r1=1865852&r2=1865853&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/PackOrder.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/PackOrder.ftl Sat Aug 24 15:05:25 2019
@@ -59,7 +59,7 @@ under the License.
                     <#list invoiceIds as invoiceId>
                       <li>
                         ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">${invoiceId}</a>
-                        (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">PDF</a>)
+                        (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">${uiLabelMap.CommonPdf}</a>)
                       </li>
                     </#list>
                     </ul>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl?rev=1865853&r1=1865852&r2=1865853&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/VerifyPick.ftl Sat Aug 24 15:05:25 2019
@@ -40,7 +40,7 @@ under the License.
             <#list invoiceIds as invoiceId>
               <li>
                 ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">${invoiceId}</a>
-                (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">PDF</a>)
+                (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">${uiLabelMap.CommonPdf}</a>)
               </li>
             </#list>
           </ul>

Modified: ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/WeightPackage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/WeightPackage.ftl?rev=1865853&r1=1865852&r2=1865853&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/WeightPackage.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/product/template/shipment/WeightPackage.ftl Sat Aug 24 15:05:25 2019
@@ -39,7 +39,7 @@ under the License.
                 <#list invoiceIds as invoiceId>
                   <li>
                     ${uiLabelMap.CommonNbr}<a href="/accounting/control/invoiceOverview?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">${invoiceId}</a>
-                    (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">PDF</a>)
+                    (<a href="/accounting/control/invoice.pdf?invoiceId=${invoiceId}${StringUtil.wrapString(externalKeyParam)}" target="_blank" class="buttontext">${uiLabelMap.CommonPdf}</a>)
                   </li>
                 </#list>
               </ul>