svn commit: r1816296 - in /ofbiz/branches/release16.11: ./ applications/order/template/entry/ applications/order/template/return/ applications/product/template/inventory/ applications/product/template/returns/

Author: jleroux
Date: Sat Nov 25 13:51:16 2017
New Revision: 1816296

URL: http://svn.apache.org/viewvc?rev=1816296&view=rev
Log:
"Applied fix from trunk framework for revision: 1816291"
------------------------------------------------------------------------
r1816291 | jleroux | 2017-11-25 13:50:25 +0100 (sam., 25 nov. 2017) | 11 lines

Improved: Use ofbizCurrency macro and remove hardcoded ##0.00 string
(OFBIZ-9675)

ofbizAmount macro can be used.

jleroux: while applying the patch I noticed the use of ?default(0) where the
newer and simpler !0 could be used. Rather than only replacing this case here
I'll create a Jira and replace all such cases generalising to any value (that's
a lot: 1394 case!)

Thanks: Renuka Srishti and Ritesh Kumar
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/order/template/entry/CheckoutPayment.ftl
    ofbiz/branches/release16.11/applications/order/template/return/ReturnItemInc.ftl
    ofbiz/branches/release16.11/applications/order/template/return/ReturnItems.ftl
    ofbiz/branches/release16.11/applications/product/template/inventory/ReceiveInventory.ftl
    ofbiz/branches/release16.11/applications/product/template/returns/ReceiveReturn.ftl

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 25 13:51:16 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591,1814642,1814644,1814709,1814873,1814928,1814934,1815059,1816264,1816273,1816289,1816291
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/applications/order/template/entry/CheckoutPayment.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/template/entry/CheckoutPayment.ftl?rev=1816296&r1=1816295&r2=1816296&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/template/entry/CheckoutPayment.ftl (original)
+++ ofbiz/branches/release16.11/applications/order/template/entry/CheckoutPayment.ftl Sat Nov 25 13:51:16 2017
@@ -184,7 +184,7 @@ var issuerId = "";
                       <label for="checkOutPayment_${paymentMethod.paymentMethodId}">${uiLabelMap.AccountingGift}:${giftCardNumber}</label>
                         <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
                         <a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'EG', '${paymentMethod.paymentMethodId}');" class="button">${uiLabelMap.CommonUpdate}</a>
-                        <strong>${uiLabelMap.OrderBillUpTo}:</strong> <input type="text" size="5" class="inputBox" name="amount_${paymentMethod.paymentMethodId}" value="<#if (cart.getPaymentAmount(paymentMethod.paymentMethodId)?default(0) > 0)>${cart.getPaymentAmount(paymentMethod.paymentMethodId)?string("##0.00")}</#if>" />
+                        <strong>${uiLabelMap.OrderBillUpTo}:</strong> <input type="text" size="5" class="inputBox" name="amount_${paymentMethod.paymentMethodId}" value="<#if (cart.getPaymentAmount(paymentMethod.paymentMethodId)?default(0) > 0)><@ofbizAmount amount=cart.getPaymentAmount(paymentMethod.paymentMethodId)!/></#if>"/>
                   </div>
                  </#if>
                 <#elseif paymentMethod.paymentMethodTypeId == "CREDIT_CARD">
@@ -195,7 +195,7 @@ var issuerId = "";
                       <label for="checkOutPayment_${paymentMethod.paymentMethodId}">CC:${Static["org.apache.ofbiz.party.contact.ContactHelper"].formatCreditCard(creditCard)}</label>
                         <#if paymentMethod.description?has_content>(${paymentMethod.description})</#if>
                         <a href="javascript:submitForm(document.getElementById('checkoutInfoForm'), 'EC', '${paymentMethod.paymentMethodId}');" class="button">${uiLabelMap.CommonUpdate}</a>
-                        <label for="amount_${paymentMethod.paymentMethodId}"><strong>${uiLabelMap.OrderBillUpTo}:</strong></label><input type="text" size="5" class="inputBox" id="amount_${paymentMethod.paymentMethodId}" name="amount_${paymentMethod.paymentMethodId}" value="<#if (cart.getPaymentAmount(paymentMethod.paymentMethodId)?default(0) > 0)>${cart.getPaymentAmount(paymentMethod.paymentMethodId)?string("##0.00")}</#if>" />
+                        <label for="amount_${paymentMethod.paymentMethodId}"><strong>${uiLabelMap.OrderBillUpTo}:</strong></label><input type="text" size="5" class="inputBox" id="amount_${paymentMethod.paymentMethodId}" name="amount_${paymentMethod.paymentMethodId}" value="<#if (cart.getPaymentAmount(paymentMethod.paymentMethodId)?default(0) > 0)><@ofbizAmount amount=cart.getPaymentAmount(paymentMethod.paymentMethodId)!/></#if>" />
                   </div>
                  </#if>
                 <#elseif paymentMethod.paymentMethodTypeId == "EFT_ACCOUNT">

Modified: ofbiz/branches/release16.11/applications/order/template/return/ReturnItemInc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/template/return/ReturnItemInc.ftl?rev=1816296&r1=1816295&r2=1816296&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/template/return/ReturnItemInc.ftl (original)
+++ ofbiz/branches/release16.11/applications/order/template/return/ReturnItemInc.ftl Sat Nov 25 13:51:16 2017
@@ -72,7 +72,7 @@ under the License.
                 ${StringUtil.wrapString(description)?default("N/A")}
               </td>
               <td>
-                ${orderItem.amount?string("##0.00")}
+                <@ofbizAmount amount=orderItem.amount!/>
                 <#--<input type="text" size="8" name="amount_o_${rowCount}" <#if orderItem.amount?has_content>value="${orderItem.amount?string("##0.00")}"</#if>/>-->
               </td>
               <td></td>
@@ -127,7 +127,7 @@ under the License.
                   <#if product.productTypeId == "ASSET_USAGE_OUT_IN">
                     <input type="text" size="8" name="returnPrice_o_${rowCount}" value="0.00"/>
                   <#else>
-                    <input type="text" size="8" name="returnPrice_o_${rowCount}" value="${returnableItems.get(orderItem).get("returnablePrice")?string("##0.00")}"/>
+                    <input type="text" size="8" name="returnPrice_o_${rowCount}" value="<@ofbizAmount amount=returnableItems.get(orderItem).get("returnablePrice")/>"/>
                   </#if>
                 </#if>
               </td>
@@ -191,7 +191,7 @@ under the License.
             </div>
           </td>
           <td>
-            <input type="text" size="8" name="amount_o_${rowCount}" <#if adj.amount?has_content>value="${adj.amount?string("##0.00")}"</#if>/>
+            <input type="text" size="8" name="amount_o_${rowCount}" <#if adj.amount?has_content>value="<@ofbizAmount amount=adj.amount!/>"</#if>/>
           </td>
           <td>
             <select name="returnTypeId_o_${rowCount}">
@@ -228,7 +228,7 @@ under the License.
         <input type="text" size="30" name="description_o_${rowCount}" />
       </td>
       <td>
-        <input type="text" size="8" name="amount_o_${rowCount}" value="${0.00?string("##0.00")}"/>
+        <input type="text" size="8" name="amount_o_${rowCount}" value="<@ofbizAmount amount=0.00/>"/>
       </td>
       <td>
         <select name="returnTypeId_o_${rowCount}">

Modified: ofbiz/branches/release16.11/applications/order/template/return/ReturnItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/template/return/ReturnItems.ftl?rev=1816296&r1=1816295&r2=1816296&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/template/return/ReturnItems.ftl (original)
+++ ofbiz/branches/release16.11/applications/order/template/return/ReturnItems.ftl Sat Nov 25 13:51:16 2017
@@ -31,7 +31,7 @@ under the License.
         </div></td>
         <#if (adjEditable)>
            <td align="right">
-              <input type="text" size="8" name="amount_o_${rowCount}" value="${returnAdjustment.amount?default(0)?string("##0.00")}"/>
+              <input type="text" size="8" name="amount_o_${rowCount}" value="<@ofbizAmount amount=returnAdjustment.amount?default(0)/>"/>
            </td>
         <#else>
            <td align="right"><@ofbizCurrency amount=returnAdjustment.amount?default(0) isoCode=returnHeader.currencyUomId/></td>

Modified: ofbiz/branches/release16.11/applications/product/template/inventory/ReceiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/template/inventory/ReceiveInventory.ftl?rev=1816296&r1=1816295&r2=1816296&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/product/template/inventory/ReceiveInventory.ftl (original)
+++ ofbiz/branches/release16.11/applications/product/template/inventory/ReceiveInventory.ftl Sat Nov 25 13:51:16 2017
@@ -54,7 +54,7 @@ under the License.
                   <td>${item.orderItemSeqId}</td>
                   <td>${item.productId?default("Not Found")}</td>
                   <td>${item.lotId?default("")}</td>
-                  <td>${item.unitCost?default(0)?string("##0.00")}</td>
+                  <td><@ofbizAmount amount=item.unitCost?default(0)/></td>
                   <td>${item.quantityRejected?default(0)?string.number}</td>
                   <td>${item.quantityAccepted?string.number}</td>
                   <td>

Modified: ofbiz/branches/release16.11/applications/product/template/returns/ReceiveReturn.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/template/returns/ReceiveReturn.ftl?rev=1816296&r1=1816295&r2=1816296&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/product/template/returns/ReceiveReturn.ftl (original)
+++ ofbiz/branches/release16.11/applications/product/template/returns/ReceiveReturn.ftl Sat Nov 25 13:51:16 2017
@@ -45,7 +45,7 @@ under the License.
                 <td>${item.returnId}</td>
                 <td>${item.returnItemSeqId}</td>
                 <td>${item.productId?default("Not Found")}</td>
-                <td>${item.unitCost?default(0)?string("##0.00")}</td>
+                <td><@ofbizAmount amount=item.unitCost?default(0)/></td>
                 <td>${item.quantityAccepted?string.number}</td>
               </tr>
             </#list>
@@ -204,7 +204,7 @@ under the License.
                           </#if>
                           <td align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductPerUnitPrice}</td>
                           <td align="right">
-                            <input type='text' name='unitCost_o_${rowCount}' size='6' value='${unitCost?default(0)?string("##0.00")}' />
+                            <input type='text' name='unitCost_o_${rowCount}' size='6' value='<@ofbizAmount amount=unitCost?default(0)/>' />
                           </td>
                         </tr>
                       </table>