Author: hansbak
Date: Sun Oct 24 06:10:26 2010
New Revision: 1026742
URL: http://svn.apache.org/viewvc?rev=1026742&view=rev
Log:
use logo of accouning company for he accounting reports
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign
ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign
ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign?rev=1026742&r1=1026741&r2=1026742&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/reports/AcctgTransEntriesSearchResultsInvoiceAndPayment.rptdesign
Sun Oct 24 06:10:26 2010
@@ -13,6 +13,11 @@ module = "AcctgTransEntriesSearchResults
organizationPartyId = params["organizationPartyId"].value;
userLoginId = params["userLoginId"].value;
+organizationPartyGroup = delegator.findOne("PartyGroup",
UtilMisc.toMap("partyId", organizationPartyId), false);
+
+// set logo image url
+logoImageUrl = organizationPartyGroup.getString("logoImageUrl");
+
dateFormatter = new java.text.SimpleDateFormat("dd MMMMM yyyy");
// prepare uiLabelMap
@@ -925,19 +930,8 @@ return true;
<image id="28">
<property name="height">43px</property>
<property name="width">238px</property>
- <method name="onCreate"><![CDATA[// get
organization logo
-partyContents = delegator.findByAnd("PartyContent", UtilMisc.toMap("partyId",
organizationPartyId, "partyContentTypeId", "LGOIMGURL"));
-partyContents = EntityUtil.filterByDate(partyContents);
-if (partyContents != null && partyContents.size() > 0) {
- var dataResource =
partyContents.get(0).getRelatedOne("Content").getRelatedOne("DataResource");
- var dataResourceTypeId = dataResource.getString("dataResourceTypeId");
- if ("LOCAL_FILE".equals(dataResourceTypeId)) {
- this.file = dataResource.get("objectInfo");
- } else {
- this.URL = dataResource.get("objectInfo");
- }
-} else {
- this.URL = "http://localhost:8080/images/ofbiz_logo.gif";;
+ <method name="onCreate"><![CDATA[if
(logoImageUrl) {
+ this.URL = logoImageUrl;
}]]></method>
<property name="source">url</property>
<property
name="fitToContainer">false</property>
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign?rev=1026742&r1=1026741&r2=1026742&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/reports/BalanceSheet.rptdesign
Sun Oct 24 06:10:26 2010
@@ -21,9 +21,13 @@ glFiscalTypeId = null;
// prepare parameters
organizationPartyId = params["organizationPartyId"].value;
+organizationPartyGroup = delegator.findOne("PartyGroup",
UtilMisc.toMap("partyId", organizationPartyId), false);
userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId",
params["userLoginId"].value), false);
partyNameView = delegator.findOne("PartyNameView", UtilMisc.toMap("partyId",
userLogin.getString("partyId")), false);
+// set logo image url
+logoImageUrl = organizationPartyGroup.getString("logoImageUrl");
+
fromDate = null;
if (params["fromDate"].value) {
fromDate = params["fromDate"].value;
@@ -481,19 +485,8 @@ return true;]]></method>
<image id="28">
<property name="height">43px</property>
<property name="width">238px</property>
- <method name="onCreate"><![CDATA[// get
organization logo
-partyContents = delegator.findByAnd("PartyContent", UtilMisc.toMap("partyId",
organizationPartyId, "partyContentTypeId", "LGOIMGURL"));
-partyContents = EntityUtil.filterByDate(partyContents);
-if (partyContents != null && partyContents.size() > 0) {
- var dataResource =
partyContents.get(0).getRelatedOne("Content").getRelatedOne("DataResource");
- var dataResourceTypeId = dataResource.getString("dataResourceTypeId");
- if ("LOCAL_FILE".equals(dataResourceTypeId)) {
- this.file = dataResource.get("objectInfo");
- } else {
- this.URL = dataResource.get("objectInfo");
- }
-} else {
- this.URL = "http://localhost:8080/images/ofbiz_logo.gif";;
+ <method name="onCreate"><![CDATA[if
(logoImageUrl) {
+ this.URL = logoImageUrl;
}]]></method>
<property name="source">url</property>
<property
name="fitToContainer">false</property>
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign?rev=1026742&r1=1026741&r2=1026742&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/reports/IncomeStatement.rptdesign
Sun Oct 24 06:10:26 2010
@@ -21,9 +21,13 @@ glFiscalTypeId = null;
// prepare parameters
organizationPartyId = params["organizationPartyId"].value;
+organizationPartyGroup = delegator.findOne("PartyGroup",
UtilMisc.toMap("partyId", organizationPartyId), false);
userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId",
params["userLoginId"].value), false);
partyNameView = delegator.findOne("PartyNameView", UtilMisc.toMap("partyId",
userLogin.getString("partyId")), false);
+// set logo image url
+logoImageUrl = organizationPartyGroup.getString("logoImageUrl");
+
fromDate = null;
if (params["fromDate"].value) {
fromDate = params["fromDate"].value;
@@ -432,19 +436,8 @@ return true;]]></method>
<image id="28">
<property name="height">43px</property>
<property name="width">238px</property>
- <method name="onCreate"><![CDATA[// get
organization logo
-partyContents = delegator.findByAnd("PartyContent", UtilMisc.toMap("partyId",
organizationPartyId, "partyContentTypeId", "LGOIMGURL"));
-partyContents = EntityUtil.filterByDate(partyContents);
-if (partyContents != null && partyContents.size() > 0) {
- var dataResource =
partyContents.get(0).getRelatedOne("Content").getRelatedOne("DataResource");
- var dataResourceTypeId = dataResource.getString("dataResourceTypeId");
- if ("LOCAL_FILE".equals(dataResourceTypeId)) {
- this.file = dataResource.get("objectInfo");
- } else {
- this.URL = dataResource.get("objectInfo");
- }
-} else {
- this.URL = "http://localhost:8080/images/ofbiz_logo.gif";;
+ <method name="onCreate"><![CDATA[if
(logoImageUrl) {
+ this.URL = logoImageUrl;
}]]></method>
<property name="source">url</property>
<property
name="fitToContainer">false</property>
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign?rev=1026742&r1=1026741&r2=1026742&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/reports/InvoiceAcctgTransEntry.rptdesign
Sun Oct 24 06:10:26 2010
@@ -17,6 +17,10 @@ uiLabelMap.putAll(UtilProperties.getReso
invoiceId = params["invoiceId"].value;
userLoginId = params["userLoginId"].value;
+parameters = FastMap.newInstance();
+parameters.put("invoiceId", invoiceId);
+parameters.put("userLoginId", userLoginId);
+
userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId",
userLoginId), false);
userLoginNameView = delegator.findOne("PartyNameView",
UtilMisc.toMap("partyId", userLogin.get("partyId")), false);
dateFormatter = new java.text.SimpleDateFormat("dd MMMMM yyyy");
@@ -30,6 +34,16 @@ if ("PURCHASE_INVOICE".equals(invoice.ge
organizationPartyId = invoice.get("partyIdFrom");
}
+// get company header
+var companyLogoCtx = FastMap.newInstance();
+companyLogoCtx.put("invoice", invoice);
+companyLogoCtx.put("nowTimestamp", UtilDateTime.nowTimestamp());
+companyLogoCtx.put("locale", reportContext.getLocale());
+companyLogoCtx.put("parameters", parameters);
+companyLogoCtx.put("delegator", delegator);
+GroovyUtil.runScriptAtLocation("component://order/webapp/ordermgr/WEB-INF/actions/order/CompanyHeader.groovy",
companyLogoCtx);
+logoImageUrl = companyLogoCtx.get("logoImageUrl");
+
// create application list
var context = FastMap.newInstance();
context.put("invoice", invoice);
@@ -584,19 +598,8 @@ return true;]]></method>
<image id="28">
<property name="height">43px</property>
<property name="width">238px</property>
- <method name="onCreate"><![CDATA[// get
organization logo
-partyContents = delegator.findByAnd("PartyContent", UtilMisc.toMap("partyId",
organizationPartyId, "partyContentTypeId", "LGOIMGURL"));
-partyContents = EntityUtil.filterByDate(partyContents);
-if (partyContents != null && partyContents.size() > 0) {
- var dataResource =
partyContents.get(0).getRelatedOne("Content").getRelatedOne("DataResource");
- var dataResourceTypeId = dataResource.getString("dataResourceTypeId");
- if ("LOCAL_FILE".equals(dataResourceTypeId)) {
- this.file = dataResource.get("objectInfo");
- } else {
- this.URL = dataResource.get("objectInfo");
- }
-} else {
- this.URL = "http://localhost:8080/images/ofbiz_logo.gif";;
+ <method name="onCreate"><![CDATA[if
(logoImageUrl) {
+ this.URL = logoImageUrl;
}]]></method>
<property name="source">url</property>
<property
name="fitToContainer">false</property>
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign?rev=1026742&r1=1026741&r2=1026742&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/reports/PaymentAcctgTransEntry.rptdesign
Sun Oct 24 06:10:26 2010
@@ -29,6 +29,10 @@ if ("DISBURSEMENT".equals(payment.get("p
} else {
organizationPartyId = payment.get("partyIdTo");
}
+organizationPartyGroup = delegator.findOne("PartyGroup",
UtilMisc.toMap("partyId", organizationPartyId), false);
+
+// set logo image url
+logoImageUrl = organizationPartyGroup.getString("logoImageUrl");
// create debit/credit total variable
debitTotal = 0;
@@ -571,19 +575,8 @@ return true;]]></method>
<image id="28">
<property name="height">43px</property>
<property name="width">238px</property>
- <method name="onCreate"><![CDATA[// get
organization logo
-partyContents = delegator.findByAnd("PartyContent", UtilMisc.toMap("partyId",
organizationPartyId, "partyContentTypeId", "LGOIMGURL"));
-partyContents = EntityUtil.filterByDate(partyContents);
-if (partyContents != null && partyContents.size() > 0) {
- var dataResource =
partyContents.get(0).getRelatedOne("Content").getRelatedOne("DataResource");
- var dataResourceTypeId = dataResource.getString("dataResourceTypeId");
- if ("LOCAL_FILE".equals(dataResourceTypeId)) {
- this.file = dataResource.get("objectInfo");
- } else {
- this.URL = dataResource.get("objectInfo");
- }
-} else {
- this.URL = "http://localhost:8080/images/ofbiz_logo.gif";;
+ <method name="onCreate"><![CDATA[if
(logoImageUrl) {
+ this.URL = logoImageUrl;
}]]></method>
<property name="source">url</property>
<property
name="fitToContainer">false</property>
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign?rev=1026742&r1=1026741&r2=1026742&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/reports/TrialBalance.rptdesign
Sun Oct 24 06:10:26 2010
@@ -18,11 +18,15 @@ dateFormatter = new java.text.SimpleDate
// prepare parameters
organizationPartyId = params["organizationPartyId"].value;
+organizationPartyGroup = delegator.findOne("PartyGroup",
UtilMisc.toMap("partyId", organizationPartyId), false);
userLogin = delegator.findOne("UserLogin", UtilMisc.toMap("userLoginId",
params["userLoginId"].value), false);
partyNameView = delegator.findOne("PartyNameView", UtilMisc.toMap("partyId",
userLogin.getString("partyId")), false);
customTimePeriodId = params["customTimePeriodId"].value;
customerTimePeriod = delegator.findOne("CustomTimePeriod",
UtilMisc.toMap("customTimePeriodId", customTimePeriodId), false);
+// set logo image url
+logoImageUrl = organizationPartyGroup.getString("logoImageUrl");
+
// prepare parties list
partyIds =
org.ofbiz.party.party.PartyWorker.getAssociatedPartyIdsByRelationshipType(delegator,
organizationPartyId, "GROUP_ROLLUP");
parties = FastList.newInstance();
@@ -294,19 +298,8 @@ return true;]]></method>
<image id="28">
<property name="height">43px</property>
<property name="width">238px</property>
- <method name="onCreate"><![CDATA[// get
organization logo
-partyContents = delegator.findByAnd("PartyContent", UtilMisc.toMap("partyId",
organizationPartyId, "partyContentTypeId", "LGOIMGURL"));
-partyContents = EntityUtil.filterByDate(partyContents);
-if (partyContents != null && partyContents.size() > 0) {
- var dataResource =
partyContents.get(0).getRelatedOne("Content").getRelatedOne("DataResource");
- var dataResourceTypeId = dataResource.getString("dataResourceTypeId");
- if ("LOCAL_FILE".equals(dataResourceTypeId)) {
- this.file = dataResource.get("objectInfo");
- } else {
- this.URL = dataResource.get("objectInfo");
- }
-} else {
- this.URL = "http://localhost:8080/images/ofbiz_logo.gif";;
+ <method name="onCreate"><![CDATA[if
(logoImageUrl) {
+ this.URL = logoImageUrl;
}]]></method>
<property name="source">url</property>
<property
name="fitToContainer">false</property>
![http://localhost:8080/images/ofbiz_logo.gif"](http://localhost:8080/images/ofbiz_logo.gif"){kind=link}