Return-Path: X-Original-To: apmail-ofbiz-commits-archive@www.apache.org Delivered-To: apmail-ofbiz-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6866E7D3D for ; Tue, 13 Dec 2011 08:29:02 +0000 (UTC) Received: (qmail 68110 invoked by uid 500); 13 Dec 2011 08:29:02 -0000 Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org Received: (qmail 68089 invoked by uid 500); 13 Dec 2011 08:29:01 -0000 Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list commits@ofbiz.apache.org Received: (qmail 68076 invoked by uid 99); 13 Dec 2011 08:29:00 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Dec 2011 08:29:00 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Dec 2011 08:28:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id F1406238897D for ; Tue, 13 Dec 2011 08:28:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1213595 - /ofbiz/branches/release09.04/applications/order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy Date: Tue, 13 Dec 2011 08:28:38 -0000 To: commits@ofbiz.apache.org From: jacopoc@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111213082838.F1406238897D@eris.apache.org> 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"); } }