svn commit: r814686 - in /ofbiz/branches/release09.04: ./ applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy

Author: jleroux
Date: Mon Sep 14 15:14:56 2009
New Revision: 814686

URL: http://svn.apache.org/viewvc?rev=814686&view=rev
Log:
"Applied fix from trunk for revision: 814681  "
------------------------------------------------------------------------
r814681 | jleroux | 2009-09-14 17:09:00 +0200 (lun. 14 sept. 2009) | 2 lignes

A patch from Arun Patidar "Inventory search results for "QOH minus Min Stock less than" & "ATP minus Min Stock less than" filter does not works properly." (https://issues.apache.org/jira/browse/OFBIZ-2939) - OFBIZ-2939
In Facility-> Inventory screen, Inventory search results for "QOH minus Min Stock less than" & "ATP minus Min Stock less than" filter does not works properly.
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release09.04/   (props changed)
    ofbiz/branches/release09.04/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 14 15:14:56 2009
@@ -1 +1 @@
-/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576
+/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810814,810832,810
 836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681

Modified: ofbiz/branches/release09.04/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy?rev=814686&r1=814685&r2=814686&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/facility/WEB-INF/actions/facility/ViewFacilityInventoryByProduct.groovy Mon Sep 14 15:14:56 2009
@@ -29,7 +29,7 @@
 import org.ofbiz.product.inventory.*
 
 action = request.getParameter("action");
-
+statusId = request.getParameter("statusId");
 searchParameterString = "";
 searchParameterString = "action=Y&facilityId=" + facilityId;
 
@@ -164,15 +164,39 @@
 
     prods.each { oneProd ->
         oneInventory = [:];
+        resultMap = [:];
         oneInventory.checkTime = checkTime;
         oneInventory.facilityId = facilityId;
         oneInventory.productId = oneProd.productId;
-        oneInventory.minimumStock = oneProd.minimumStock as String;
+        minimumStock = oneProd.minimumStock as String;
+        oneInventory.minimumStock = minimumStock;
         oneInventory.reorderQuantity = oneProd.reorderQuantity;
         oneInventory.daysToShip = oneProd.daysToShip;
-        rows.add(oneInventory);
-    }
 
+        resultMap = dispatcher.runSync("getProductInventoryAndFacilitySummary", [productId : oneProd.productId, minimumStock : minimumStock, facilityId : oneProd.facilityId, checkTime : checkTime, statusId : statusId]);
+        if (resultMap) {
+            oneInventory.totalAvailableToPromise = resultMap.totalAvailableToPromise;
+            oneInventory.totalQuantityOnHand = resultMap.totalQuantityOnHand;
+            oneInventory.quantityOnOrder = resultMap.quantityOnOrder;
+            oneInventory.offsetQOHQtyAvailable = resultMap.offsetQOHQtyAvailable;
+            oneInventory.offsetATPQtyAvailable = resultMap.offsetATPQtyAvailable;
+            oneInventory.usageQuantity = resultMap.usageQuantity;
+            oneInventory.defultPrice = resultMap.defultPrice;
+            oneInventory.listPrice = resultMap.listPrice;
+            oneInventory.wholeSalePrice = resultMap.wholeSalePrice;
+            if (offsetQOHQty && offsetATPQty) {
+                if ((offsetQOHQty && resultMap.offsetQOHQtyAvailable < offsetQOH) && (offsetATPQty && resultMap.offsetATPQtyAvailable < offsetATP)) {
+                    rows.add(oneInventory);
+                }
+            }else if (offsetQOHQty || offsetATPQty) {
+                if ((offsetQOHQty && resultMap.offsetQOHQtyAvailable < offsetQOH) || (offsetATPQty && resultMap.offsetATPQtyAvailable < offsetATP)) {
+                    rows.add(oneInventory);
+                }
+            } else {
+                rows.add(oneInventory);
+            }
+        }
+    }
 }
 context.inventoryByProduct = rows;
-context.searchParameterString = searchParameterString;
\ No newline at end of file
+context.searchParameterString = searchParameterString;