svn commit: r1213596 - /ofbiz/branches/release09.04/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy

[jacopoc]

Author: jacopoc
Date: Tue Dec 13 08:33:22 2011
New Revision: 1213596

URL: http://svn.apache.org/viewvc?rev=1213596&view=rev
Log:
Backported rev. 917792: patch from OFBIZ-3514 by Ean Schuessler: When doing a vendor return we should use the fromPartyId instead of the toPartyId as the company in the company header

Modified:
    ofbiz/branches/release09.04/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy

Modified: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy?rev=1213596&r1=1213595&r2=1213596&view=diff
==============================================================================
--- ofbiz/branches/release09.04/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy (original)
+++ ofbiz/branches/release09.04/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy Tue Dec 13 08:33:22 2011
@@ -93,6 +93,8 @@ if (orderHeader) {
 } else if (returnHeader) {
     if ("CUSTOMER_RETURN".equals(returnHeader.returnHeaderTypeId) && returnHeader.toPartyId) {
         partyId = returnHeader.toPartyId;
+    } else if ("VENDOR_RETURN".equals(returnHeader.returnHeaderTypeId) && returnHeader.fromPartyId) {
+        partyId = returnHeader.fromPartyId;
     }
 } else if (quote) {
     productStore = quote.getRelatedOne("ProductStore");