Author: ashish
Date: Fri Sep 17 06:34:19 2010
New Revision: 997992
URL: http://svn.apache.org/viewvc?rev=997992&view=rev
Log:
Applied fix from trunk for revision: 997990
===
Bug fix.
Purchase Order creation was not working from Quote if Parent Organization is
being associated with the facility and the value passed from Quote is for Child
Organisation. For this I had put a check on PartyRelationship, so that it will
also check the relationship between parent & child organisation. If it exists
then it will fetch companyId from there.
Modified:
ofbiz/branches/release10.04/ (props changed)
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy
Propchange: ofbiz/branches/release10.04/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 17 06:34:19 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
+/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
Modified:
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy?rev=997992&r1=997991&r2=997992&view=diff
==============================================================================
---
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy
(original)
+++
ofbiz/branches/release10.04/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy
Fri Sep 17 06:34:19 2010
@@ -22,6 +22,9 @@ import org.ofbiz.base.util.*;
import org.ofbiz.order.shoppingcart.*;
import org.ofbiz.party.contact.*;
import org.ofbiz.product.catalog.*;
+import org.ofbiz.base.util.UtilValidate;
+import org.ofbiz.entity.condition.EntityCondition;
+import org.ofbiz.entity.util.EntityUtil;
import javolution.util.FastMap;
import javolution.util.FastList;
@@ -83,6 +86,15 @@ if ("SALES_ORDER".equals(cart.getOrderTy
if (companyId) {
facilityMaps = FastList.newInstance();
facilities = delegator.findByAndCache("Facility", [ownerPartyId :
companyId]);
+
+ // if facilites is null then check the PartyRelationship where there
is a relationship set for Parent & Child organization. Then also fetch the
value of companyId from there.
+ if (UtilValidate.isEmpty(facilities)) {
+ partyRelationship =
EntityUtil.getFirst(delegator.findList("PartyRelationship",
EntityCondition.makeCondition(["roleTypeIdFrom": "PARENT_ORGANIZATION",
"partyIdTo": companyId]), null, null, null, false));
+ if (UtilValidate.isNotEmpty(partyRelationship)) {
+ companyId = partyRelationship.partyIdFrom;
+ facilities = delegator.findByAndCache("Facility",
[ownerPartyId : companyId]);
+ }
+ }
facilities.each { facility ->
facilityMap = FastMap.newInstance();
facilityContactMechValueMaps =
ContactMechWorker.getFacilityContactMechValueMaps(delegator,
facility.facilityId, false, null);
