svn commit: r917790 - /ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy

[doogie-3]

Author: doogie
Date: Mon Mar  1 23:24:19 2010
New Revision: 917790

URL: http://svn.apache.org/viewvc?rev=917790&view=rev
Log:
Apply patch from OFBIZ-3513, don't hard-code "Company" as a fallback
partyId, instead fetching ORGANIZATION_PARTY from general.properties.

Modified:
    ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy?rev=917790&r1=917789&r2=917790&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy Mon Mar  1 23:24:19 2010
@@ -19,7 +19,7 @@
 
  // this script is used to get the company's logo header information for orders, invoices, and returns.  It can either take order, invoice, returnHeader from
  // parameters or use orderId, invoiceId, or returnId to look them up.
- // if none of these parameters are available then fromPartyId is used or "Company" as fallback
+ // if none of these parameters are available then fromPartyId is used or "ORGANIZATION_PARTY" from general.properties as fallback
 
 import org.ofbiz.base.util.*;
 import org.ofbiz.entity.*;
@@ -106,7 +106,7 @@
     if (fromPartyId) {
         partyId = fromPartyId;
     } else {
-        partyId = "Company";
+        partyId = UtilProperties.getPropertyValue("general.properties", "ORGANIZATION_PARTY");
     }
 }