Author: jleroux Date: Mon May 23 20:59:41 2016 New Revision: 1745274 URL: http://svn.apache.org/viewvc?rev=1745274&view=rev Log: Backport by hand in R15.12, R15.12 and R13.07
A patch from Akash Jain for "Remaining quantity should be ZERO for completed order items" https://issues.apache.org/jira/browse/OFBIZ-7093 There are the steps: -- Initiate sales order. -- Add service product (ex. sv-1000) in the cart -- Place order and mark approved. -- Order item of service product will be completed but Remaining quantity still ONE (attaching screen-shot). Expected Result: -- Order item of service product should be completed (working) -- Remaining quantity should be ZERO (need to fix) Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderitems.ftl ofbiz/branches/release14.12/applications/order/webapp/ordermgr/order/orderitems.ftl ofbiz/branches/release15.12/applications/order/webapp/ordermgr/order/orderitems.ftl Modified: ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=1745274&r1=1745273&r2=1745274&view=diff ============================================================================== --- ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderitems.ftl (original) +++ ofbiz/branches/release13.07/applications/order/webapp/ordermgr/order/orderitems.ftl Mon May 23 20:59:41 2016 @@ -236,6 +236,10 @@ under the License. </#if> </#list> </#if> + <#if product.productTypeId == "SERVICE" && currentItemStatus.statusId == "ITEM_COMPLETED"> + <#assign shippedQuantity = orderItem.quantity?default(0)/> + <#assign totalReceived = orderItem.quantity?default(0)> + </#if> <#if orderHeader.orderTypeId == "PURCHASE_ORDER"> <#assign remainingQuantity = ((orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0)) - totalReceived?double)> <#else> Modified: ofbiz/branches/release14.12/applications/order/webapp/ordermgr/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release14.12/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=1745274&r1=1745273&r2=1745274&view=diff ============================================================================== --- ofbiz/branches/release14.12/applications/order/webapp/ordermgr/order/orderitems.ftl (original) +++ ofbiz/branches/release14.12/applications/order/webapp/ordermgr/order/orderitems.ftl Mon May 23 20:59:41 2016 @@ -236,6 +236,10 @@ under the License. </#if> </#list> </#if> + <#if product.productTypeId == "SERVICE" && currentItemStatus.statusId == "ITEM_COMPLETED"> + <#assign shippedQuantity = orderItem.quantity?default(0)/> + <#assign totalReceived = orderItem.quantity?default(0)> + </#if> <#if orderHeader.orderTypeId == "PURCHASE_ORDER"> <#assign remainingQuantity = ((orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0)) - totalReceived?double)> <#else> Modified: ofbiz/branches/release15.12/applications/order/webapp/ordermgr/order/orderitems.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/order/webapp/ordermgr/order/orderitems.ftl?rev=1745274&r1=1745273&r2=1745274&view=diff ============================================================================== --- ofbiz/branches/release15.12/applications/order/webapp/ordermgr/order/orderitems.ftl (original) +++ ofbiz/branches/release15.12/applications/order/webapp/ordermgr/order/orderitems.ftl Mon May 23 20:59:41 2016 @@ -242,6 +242,10 @@ under the License. </#if> </#list> </#if> + <#if product.productTypeId == "SERVICE" && currentItemStatus.statusId == "ITEM_COMPLETED"> + <#assign shippedQuantity = orderItem.quantity?default(0)/> + <#assign totalReceived = orderItem.quantity?default(0)> + </#if> <#if orderHeader.orderTypeId == "PURCHASE_ORDER"> <#assign remainingQuantity = ((orderItem.quantity?default(0) - orderItem.cancelQuantity?default(0)) - totalReceived?double)> <#else>
