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

[jacopoc]

Author: jacopoc
Date: Tue Dec 13 08:28:38 2011
New Revision: 1213595

URL: http://svn.apache.org/viewvc?rev=1213595&view=rev
Log:
Backported rev. 917790: patch from OFBIZ-3513 by Ean Schuessler: removed hardcoded "Company" and used general.properties instead

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=1213595&r1=1213594&r2=1213595&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:28:38 2011
@@ -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 (!partyId) {
     if (fromPartyId) {
         partyId = fromPartyId;
     } else {
-        partyId = "Company";
+        partyId = UtilProperties.getPropertyValue("general.properties", "ORGANIZATION_PARTY");
     }
 }