svn commit: r1814592 - in /ofbiz/branches/release16.11: ./ applications/product/groovyScripts/facility/facility/ViewFacilityInventoryByProduct.groovy

Author: jleroux
Date: Wed Nov  8 15:43:05 2017
New Revision: 1814592

URL: http://svn.apache.org/viewvc?rev=1814592&view=rev
Log:
"Applied fix from trunk framework for revision: 1814591"
------------------------------------------------------------------------
r1814591 | jleroux | 2017-11-08 16:42:16 +0100 (mer., 08 nov. 2017) | 12 lines

Fixed: Inventory Report PDF lists all available statusId's irrespective of
selection criteria
(OFBIZ-7438)

1. Go to Facility -> Inventory
2. Select a status and perform find
3. Click on Print pdf button

Expected: PDF should show selected statusId
Actual: All available statusId's in the system get listed in the Pdf.

Thanks: Arvind Singh Tomar
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release16.11/   (props changed)
    ofbiz/branches/release16.11/applications/product/groovyScripts/facility/facility/ViewFacilityInventoryByProduct.groovy

Propchange: ofbiz/branches/release16.11/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Nov  8 15:43:05 2017
@@ -10,5 +10,5 @@
 /ofbiz/branches/json-integration-refactoring:1634077-1635900
 /ofbiz/branches/multitenant20100310:921280-927264
 /ofbiz/branches/release13.07:1547657
-/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501
+/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787906-1787911,1787949,1789665,1789863,1789874,1790396,1790810,1791277,1791288,1791342,1791346,1791490,1791496,1791625,1791634,1791791,1791804,1792270,1792272,1792275,1792432,1792609,1792638,1794008,1794132,1796047,1796262,1797733,1798668,1798682,1798796,1798803,1798808,1799088,1799183,1799327,1799417,1799687,1799767,1799793,1799859,1800250,1800780,1800832,1800853,1801094,1801262-1801263,1801273-1801274,1801303,1801318-1801319,1801336,1801340,1801346,1801359,1801742,1802657,1802766,1803525,1804656,1804843,1804847,1804859,1805143,1805558,1805880,1806036,1806220,1806266,1806269,1806951,1807597,1807890,1808834,1809399,1809429,1809594,1809741,1810102,1811794,1812387,1813600,1813617,1813647,1813833,1814277,1814319,1814349,1814501,1814591
 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520

Modified: ofbiz/branches/release16.11/applications/product/groovyScripts/facility/facility/ViewFacilityInventoryByProduct.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/product/groovyScripts/facility/facility/ViewFacilityInventoryByProduct.groovy?rev=1814592&r1=1814591&r2=1814592&view=diff
==============================================================================
--- ofbiz/branches/release16.11/applications/product/groovyScripts/facility/facility/ViewFacilityInventoryByProduct.groovy (original)
+++ ofbiz/branches/release16.11/applications/product/groovyScripts/facility/facility/ViewFacilityInventoryByProduct.groovy Wed Nov  8 15:43:05 2017
@@ -122,12 +122,19 @@ if (action) {
         whereConditionsList.add(EntityCondition.makeCondition("productId", EntityOperator.LIKE, productId + "%"))
         searchParameterString = searchParameterString + "&productId=" + productId
     }
-    whereCondition = EntityCondition.makeCondition(whereConditionsList, EntityOperator.AND)
+    // add statusId in search parametters
+    if (statusId) {
+        searchParameterString = searchParameterString + "&statusId=" + statusId;
+    }
+    
+        whereCondition = EntityCondition.makeCondition(whereConditionsList, EntityOperator.AND)
 
     beganTransaction = false
     // get the indexes for the partial list
     lowIndex = ((viewIndex.intValue() * viewSize.intValue()) + 1)
     highIndex = (viewIndex.intValue() + 1) * viewSize.intValue()
+    // add viewSize and viewIndex in search parameters
+    searchParameterString = searchParameterString + "&VIEW_SIZE=" + viewSize + "&VIEW_INDEX=" + viewIndex;
     List prods = null
     try {
         beganTransaction = TransactionUtil.begin()