[ofbiz-framework] branch release18.12 updated: Fixed: Number problem cancelling order item (OFBIZ-11283)

This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new 7bef576  Fixed: Number problem cancelling order item (OFBIZ-11283)
7bef576 is described below

commit 7bef57652d441cedf3c68e3cb8811aa0e273e53a
Author: Jacques Le Roux <[hidden email]>
AuthorDate: Mon Nov 25 10:28:25 2019 +0100

    Fixed: Number problem cancelling order item
    (OFBIZ-11283)
   
    If an order item has a quantity greater then 1000, cancelling the order item via
    the order form in backend does not work.
   
    In the Demo (trunk) environment: the quantity of 1200 to cancel is displayed as
    "1,200" in the quantity input field.
    --> an error is displayed
   
    On my local installation I use a different locale and it is displayed as "1.200".
    --> interprets the dot as a comma and the quantity of 1,2 is cancelled
   
    Create Order: Order Mgt --> Order Entry --> Sales Order (Customer: DemoCustomer)
    --> ProductId: GZ-2644, Quantity 1200 --> Finalize order
    On order: Edit Items --> click checkbox next to quantity -->cancel selected items
   
    jleroux: I have applied the same in ReceiveInventory.ftl
   
    Thanks: Ingo Wolfmayr for report and test. Ankush Upadhyay for the fix
---
 applications/order/template/order/EditOrderItems.ftl         | 4 ++--
 applications/product/template/inventory/ReceiveInventory.ftl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/order/template/order/EditOrderItems.ftl b/applications/order/template/order/EditOrderItems.ftl
index 39267cb..2d49784 100644
--- a/applications/order/template/order/EditOrderItems.ftl
+++ b/applications/order/template/order/EditOrderItems.ftl
@@ -271,7 +271,7 @@ under the License.
                                     </td>
                                     <#if itemStatusOkay>
                                         <td align="center">
-                                            <input type="text" name="iqm_${shipGroupAssoc.orderItemSeqId}:${shipGroupAssoc.shipGroupSeqId}" size="6" value="${shipGroupQty?string.number}"/>
+                                            <input type="text" name="iqm_${shipGroupAssoc.orderItemSeqId}:${shipGroupAssoc.shipGroupSeqId}" size="6" value="${shipGroupQty}"></input>
                                             <#if itemSelectable>
                                                 <input type="checkbox" name="selectedItem" value="${orderItem.orderItemSeqId}:${shipGroupAssoc.shipGroupSeqId}" />
                                             </#if>
@@ -292,7 +292,7 @@ under the License.
                                         <span class="label">${uiLabelMap.OrderQtyShipped}</span>&nbsp;[${shipGroup.shipGroupSeqId}] ${shipGroupAddress.address1?default("${uiLabelMap.OrderNotShipped}")}
                                     </td>
                                     <td align="center">
-                                        ${shippedQuantity?default(0)}<input type="hidden" name="iqm_${shipGroupAssoc.orderItemSeqId}:${shipGroupAssoc.shipGroupSeqId}" size="6" value="${shippedQuantity?string.number}"/>
+                                        ${shippedQuantity?default(0)}<input type="hidden" name="iqm_${shipGroupAssoc.orderItemSeqId}:${shipGroupAssoc.shipGroupSeqId}" size="6" value="${shippedQuantity}"/>
                                     </td>
                                     <td colspan="5">&nbsp;</td>
                                 </tr>
diff --git a/applications/product/template/inventory/ReceiveInventory.ftl b/applications/product/template/inventory/ReceiveInventory.ftl
index aa83b7a..ed8db84 100644
--- a/applications/product/template/inventory/ReceiveInventory.ftl
+++ b/applications/product/template/inventory/ReceiveInventory.ftl
@@ -262,7 +262,7 @@ under the License.
                 <td width="6%" align="right" nowrap="nowrap" class="label">${uiLabelMap.ProductQuantityAccepted}</td>
                 <td width="6%">&nbsp;</td>
                 <td width="74%">
-                  <input type="text" name="quantityAccepted" size="5" value="${defaultQuantity?default(1)?string.number}"/>
+                  <input type="text" name="quantityAccepted" size="5" value="${defaultQuantity?default(1)}"/>
                 </td>
               </tr>
               <tr>