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 2017/04/18 07:21:11 UTC
svn commit: r1791751 - in /ofbiz/ofbiz-framework/trunk/applications/order:
groovyScripts/order/OrderView.groovy template/order/OrderShippingInfo.ftl
Author: jleroux
Date: Tue Apr 18 07:21:11 2017
New Revision: 1791751
URL: http://svn.apache.org/viewvc?rev=1791751&view=rev
Log:
Improved: No quick ship option with back ordered products
(OFBIZ-)
When an order contains back ordered products the quick ship option should not
be available
Thanks: Padmavati Rawat for report, Suraj Khurana for solution and patch
Modified:
ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderView.groovy
ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl
Modified: ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderView.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderView.groovy?rev=1791751&r1=1791750&r2=1791751&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderView.groovy (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/groovyScripts/order/OrderView.groovy Tue Apr 18 07:21:11 2017
@@ -71,9 +71,11 @@ if (orderHeader) {
orderAdjustments = orderReadHelper.getAdjustments()
orderHeaderAdjustments = orderReadHelper.getOrderHeaderAdjustments()
orderSubTotal = orderReadHelper.getOrderItemsSubTotal()
+ backorderQuantity = orderReadHelper.getOrderBackorderQuantity()
orderTerms = orderHeader.getRelated("OrderTerm", null, null, false)
context.orderHeader = orderHeader
+ context.backorderQuantity = backorderQuantity
context.comments = comments
context.orderReadHelper = orderReadHelper
context.orderItems = orderItems
Modified: ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl?rev=1791751&r1=1791750&r2=1791751&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl (original)
+++ ofbiz/ofbiz-framework/trunk/applications/order/template/order/OrderShippingInfo.ftl Tue Apr 18 07:21:11 2017
@@ -58,7 +58,7 @@ under the License.
<ul>
<#if security.hasEntityPermission("FACILITY", "_CREATE", session) && ((orderHeader.statusId == "ORDER_APPROVED") || (orderHeader.statusId == "ORDER_SENT"))>
<#-- Special shipment options -->
- <#if orderHeader.orderTypeId == "SALES_ORDER">
+ <#if orderHeader.orderTypeId == "SALES_ORDER" && backorderQuantity < 1>
<li>
<form name="quickShipOrder" method="post" action="<@o...@ofbizUrl>">
<input type="hidden" name="orderId" value="${orderId}"/>