svn commit: r1822394 - in /ofbiz/ofbiz-framework/branches/release17.12: ./ applications/product/groovyScripts/facility/inventory/ReceiveInventory.groovy applications/product/template/inventory/ReceiveInventory.ftl

[Arun Patidar-4]

Author: arunpatidar
Date: Sat Jan 27 11:45:26 2018
New Revision: 1822394

URL: http://svn.apache.org/viewvc?rev=1822394&view=rev
Log:
Applied fix from trunk for revision: 1822393
===

Improved: Completed Service Order Items are being allowed to be received along with finished goods over Approved PO. (OFBIZ-7183)
Thanks Ankush Upadhyay and Swapnil Shah for your contribution.

Modified:
    ofbiz/ofbiz-framework/branches/release17.12/   (props changed)
    ofbiz/ofbiz-framework/branches/release17.12/applications/product/groovyScripts/facility/inventory/ReceiveInventory.groovy
    ofbiz/ofbiz-framework/branches/release17.12/applications/product/template/inventory/ReceiveInventory.ftl

Propchange: ofbiz/ofbiz-framework/branches/release17.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 27 11:45:26 2018
@@ -10,4 +10,4 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383
+/ofbiz/ofbiz-framework/trunk:1819499,1819598,1819800,1819805,1819811,1820038,1820262,1820374-1820375,1820441,1820457,1820644,1820658,1820790,1820823,1820949,1820966,1821012,1821036,1821112,1821115,1821144,1821186,1821219,1821226,1821230,1821386,1821613,1821628,1821965,1822125,1822310,1822377,1822383,1822393

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/product/groovyScripts/facility/inventory/ReceiveInventory.groovy
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/product/groovyScripts/facility/inventory/ReceiveInventory.groovy?rev=1822394&r1=1822393&r2=1822394&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/product/groovyScripts/facility/inventory/ReceiveInventory.groovy (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/product/groovyScripts/facility/inventory/ReceiveInventory.groovy Sat Jan 27 11:45:26 2018
@@ -130,7 +130,7 @@ if (purchaseOrder) {
     } else {
         purchaseOrderItems = purchaseOrder.getRelated("OrderItem", null, null, false)
     }
-    purchaseOrderItems = EntityUtil.filterByAnd(purchaseOrderItems, [EntityCondition.makeCondition("statusId", EntityOperator.NOT_EQUAL, "ITEM_CANCELLED")])
+    purchaseOrderItems = EntityUtil.filterByAnd(purchaseOrderItems, [EntityCondition.makeCondition("statusId", EntityOperator.NOT_IN, ["ITEM_CANCELLED", "ITEM_COMPLETED"])])
 }
 // convert the unit prices to that of the facility owner's currency
 orderCurrencyUnitPriceMap = [:]

Modified: ofbiz/ofbiz-framework/branches/release17.12/applications/product/template/inventory/ReceiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release17.12/applications/product/template/inventory/ReceiveInventory.ftl?rev=1822394&r1=1822393&r2=1822394&view=diff
==============================================================================
--- ofbiz/ofbiz-framework/branches/release17.12/applications/product/template/inventory/ReceiveInventory.ftl (original)
+++ ofbiz/ofbiz-framework/branches/release17.12/applications/product/template/inventory/ReceiveInventory.ftl Sat Jan 27 11:45:26 2018
@@ -373,7 +373,12 @@ under the License.
                   </td>
                 </tr>
                 <#list purchaseOrderItems as orderItem>
-                  <#assign defaultQuantity = orderItem.quantity - receivedQuantities[orderItem.orderItemSeqId]?double/>
+                    <#if orderItem.cancelQuantity?has_content>
+                      <#assign cancelQuantity = orderItem.cancelQuantity>
+                    <#else>
+                      <#assign cancelQuantity = 0>
+                    </#if>
+                  <#assign defaultQuantity = orderItem.quantity - cancelQuantity - receivedQuantities[orderItem.orderItemSeqId]?double/>
                   <#assign itemCost = orderItem.unitPrice?default(0)/>
                   <#assign salesOrderItem = salesOrderItems[orderItem.orderItemSeqId]!/>
                   <#if shipment?has_content>