svn commit: r1027961 - in /ofbiz/branches/release10.04: ./ applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java

[ashish-18]

Author: ashish
Date: Wed Oct 27 13:48:22 2010
New Revision: 1027961

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

Bug fix.
Applied patch from jira issue OFBIZ-4004 - Incorrect State/Province for Billing Addresses in paypal orders.

There are some State/Province which have the same geoCode
for example (geoId = IN-UT, geoCode = UT) and (geoId = UT, geoCode = UT)
For such states when paypal checkout is done, the billing address is stored incorrectly in the DB.
When checking out with billing address as (UT, USA), what gets stored instead is (IN-UT, USA).


Modified:
    ofbiz/branches/release10.04/   (props changed)
    ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java

Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Oct 27 13:48:22 2010
@@ -1,3 +1,3 @@
 /ofbiz/branches/addbirt:831210-885099,885686-886087
 /ofbiz/branches/multitenant20100310:921280-927264
-/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
 485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756
+/ofbiz/trunk:939988,939990,939999,940025,940053,940234,940248,940309,940401,940410,940425,940779,940815,940849,940851,941007,941047,941109,941177,941199,941261,941440,941600,941999,942084,942406,942414,942671,942883-942884,943168,943271-943272,944614,944621,944623,944647,944669,944797,944895,945010,945018,945026,945118,945573,945578,945580,945582,945610,945619,945848,945852,945857,946061,946066,946073,946075,946080,946309,946313,946320,946322,946596,947004-947005,947392,947424,947679,947988,948017,948694,949174,949710,949844,950866,950870,950893,951005,951062,951098,951251,951367,951381,951672,952232,952249,952270,953294,953671,954135,954583,954733,954956,955568,956022,956206,956340,957160,958343,958514,958521,958752,958758,958769,958953,959456,960143,960491,960997,963610,964558,965470,965916,966525,966785,967098,978806,978893,978939,979104,980641-980642,980935,981051,981104,981123,981288,983920,983930,985163,985473,985718,985856,985902,987841,989166,990127,990339,990539,991
 485,993344,993387,995384,995686,996069,996078-996079,996563,997418-997420,997423-997425,997431,997440,997526,997990,998061,998412,998557,1000621,1000725,1000998,1001099,1001131,1001185,1001574,1001849,1001962,1002963,1003434,1003450,1003829,1004139,1027756,1027960

Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java?rev=1027961&r1=1027960&r2=1027961&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java (original)
+++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java Wed Oct 27 13:48:22 2010
@@ -1020,6 +1020,7 @@ public class PayPalServices {
             conditionList.add(EntityCondition.makeCondition("geoTypeId", geoTypeId));
             lookupField = "geoCode";
         }
+        conditionList.add(EntityCondition.makeCondition("geoIdFrom", countryGeoId));
         conditionList.add(EntityCondition.makeCondition(lookupField, payPalShipToState));
         EntityCondition cond = EntityCondition.makeCondition(conditionList);
         GenericValue geoAssocAndGeoTo = null;