svn commit: r1231449 - in /ofbiz/branches/release09.04: ./ applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy

Author: jleroux
Date: Sat Jan 14 07:43:10 2012
New Revision: 1231449

URL: http://svn.apache.org/viewvc?rev=1231449&view=rev
Log:
"Applied fix from trunk for revision: 1231444"
------------------------------------------------------------------------
r1231444 | jleroux | 2012-01-14 08:31:15 +0100 (sam., 14 janv. 2012) | 11 lines

A patch from Ankit Jain https://issues.apache.org/jira/browse/OFBIZ-OFBIZ-4629 "The Status of PicklistItem never changes from PICKITEM_PENDING to PICKITEM_COMPLETED."

Ankit 1st provided another patch,I asked:

jleroux: It seems to me that this is already done in methods PackingSessionLine.issueItemToShipment, and VerifyPickSessionRow.issueItemToShipment, which makes sense to me, thought I did only a 5 mins review, so I could be wrong, could you please check?

Ankit: Yes I found the method VerifyPickSessionRow.issueItemToShipment which is doing the same thing.

I found a bug too and also the reason for it, actually when you verify an order by passing "PicklistBinId" then it updates the status of picklistitems, but if we verify an order by passing a orderId then the status of the picklistitem never changes to Complete.

The reason is that when we pass orderId the "picklistBinId" is not get set in the verifyPickSession so its not available at the time "issueItemToShipment" is called so its not changing the status to complete.
------------------------------------------------------------------------


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

Propchange: ofbiz/branches/release09.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 14 07:43:10 2012
@@ -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,770308,770997,771073,771477,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,778273,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,806914,808786-808787,808792,809141,810370,810438,810465,810
 807,810809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,812724,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832880,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620,896649,899188,899833,900024,900026,900050,900217,900273,901628,907342-907343,910460,912587,915332,916252,916703,916925,917435,922042,923828,927870,92803
 7,928166,928171,928180,928470,928477,929582,931594-931595,933157,935494,936817,941047,941431,941440,942884,943168,944895,945118,948017,950866,950870,950893,951005,951062,951098,951367,951381,951672,953294,953671,954135,954956,958343,958514,958521,960997,964558,965470,965916,966785,967098,978893,980641-980642,980935,981051,981104,981123,981288,983920,985718,985856,985902,990339,995686,996069,996078-996079,996563,997419-997420,997440,1003434,1003450,1004139,1037567,1040044,1042009,1042034,1042038,1042132,1042188,1042317,1042348,1042411,1043996-1043998,1050602,1053722,1056305,1057519,1058488,1059180,1060261,1060368,1060933,1061167,1063228,1063273,1066048,1067097,1069597,1069965,1072017,1075205,1080959,1084572,1084671,1084689,1085697,1085774,1090952,1090961,1090964,1094126,1104423,1134649,1135199,1139346,1139385,1139504,1140469,1153073,1159080,1163036,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1167606,1172213,1172243,1175135,1175143,1177128,1181878,1183651,1184999,1
 187515,1187528,1187933,1187944,1188564,1201125,1203350,1206507,1212147,1221913,1222105,1226055,1226065,1226223
+/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,770308,770997,771073,771477,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,778273,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,806914,808786-808787,808792,809141,810370,810438,810465,810
 807,810809,810814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,812724,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832880,832908,833324,833686,833703,834825,835161,835357,835585,836015,881194,881713,882072,882326,882918,883933,884023,884529,884546,884758,885122,885702,887916,888111,888559,888587,889666,890050,890107,890245,891378,891620,896649,899188,899833,900024,900026,900050,900217,900273,901628,907342-907343,910460,912587,915332,916252,916703,916925,917435,922042,923828,927870,92803
 7,928166,928171,928180,928470,928477,929582,931594-931595,933157,935494,936817,941047,941431,941440,942884,943168,944895,945118,948017,950866,950870,950893,951005,951062,951098,951367,951381,951672,953294,953671,954135,954956,958343,958514,958521,960997,964558,965470,965916,966785,967098,978893,980641-980642,980935,981051,981104,981123,981288,983920,985718,985856,985902,990339,995686,996069,996078-996079,996563,997419-997420,997440,1003434,1003450,1004139,1037567,1040044,1042009,1042034,1042038,1042132,1042188,1042317,1042348,1042411,1043996-1043998,1050602,1053722,1056305,1057519,1058488,1059180,1060261,1060368,1060933,1061167,1063228,1063273,1066048,1067097,1069597,1069965,1072017,1075205,1080959,1084572,1084671,1084689,1085697,1085774,1090952,1090961,1090964,1094126,1104423,1134649,1135199,1139346,1139385,1139504,1140469,1153073,1159080,1163036,1165130,1166591,1167116,1167314,1167480,1167501,1167517,1167606,1172213,1172243,1175135,1175143,1177128,1181878,1183651,1184999,1
 187515,1187528,1187933,1187944,1188564,1201125,1203350,1206507,1212147,1221913,1222105,1226055,1226065,1226223,1231444

Modified: ofbiz/branches/release09.04/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy?rev=1231449&r1=1231448&r2=1231449&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy (original)
+++ ofbiz/branches/release09.04/applications/product/webapp/facility/WEB-INF/actions/shipment/VerifyPick.groovy Sat Jan 14 07:43:10 2012
@@ -71,6 +71,14 @@ if (picklistBinId) {
     }
 }
 
+if (orderId && !picklistBinId) {
+    picklistBin = EntityUtil.getFirst(delegator.findByAnd("PicklistBin", [primaryOrderId : orderId]));
+    if (picklistBin) {
+        picklistBinId = picklistBin.picklistBinId;
+        verifyPickSession.setPicklistBinId(picklistBinId);
+    }
+}
+
 context.orderId = orderId;
 context.shipGroupSeqId = shipGroupSeqId;
 context.picklistBinId = picklistBinId;