svn commit: r1868556 - in /ofbiz/branches/release16.11: ./ applications/order/template/order/OrderItems.ftl

Author: jleroux
Date: Thu Oct 17 14:30:09 2019
New Revision: 1868556

URL: http://svn.apache.org/viewvc?rev=1868556&view=rev
Log:
"Applied fix from trunk framework for revision: 1868553" (by hand)
------------------------------------------------------------------------
r1868553 | jleroux | 2019-10-17 16:26:42 +0200 (jeu. 17 oct. 2019) | 14 lignes

Fixed: FTL error for purchase order with Bulk Item Type
(OFBIZ-11252)

Steps to regenerate:
1. Login into the ordermgr application and click on Order Entry tab
2. Create PO with any supplier
3. Fill details and click on Continue
4. Now select Product Category with Item type Bulk and add the description and
   Click on add to order
5.  Finalize order with Finalize Order button
6. Add Term type, ship group option, etc details and create Order.
7. Scroll down to Order Items section and See the FTL error on the screen.

Thanks: Devanshu Vyas
------------------------------------------------------------------------

Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/order/template/order/OrderItems.ftl

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
  Merged /ofbiz/ofbiz-framework/trunk:r1868553

Modified: ofbiz/branches/release16.11/applications/order/template/order/OrderItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/order/template/order/OrderItems.ftl?rev=1868556&r1=1868555&r2=1868556&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/order/template/order/OrderItems.ftl (original)
+++ ofbiz/branches/release16.11/applications/order/template/order/OrderItems.ftl Thu Oct 17 14:30:09 2019
@@ -242,7 +242,7 @@ under the License.
                                                             </#if>
                                                         </#list>
                                                     </#if>
-                                                    <#if product.productTypeId == "SERVICE" && currentItemStatus.statusId == "ITEM_COMPLETED">
+                                                    <#if product?has_content && product.productTypeId?has_content && "SERVICE" == product.productTypeId && "ITEM_COMPLETED" == currentItemStatus.statusId>
                                                         <#assign shippedQuantity = orderItem.quantity?default(0)/>
                                                         <#assign totalReceived = orderItem.quantity?default(0)>
                                                     </#if>