Author: jacopoc
Date: Tue Dec 8 10:21:24 2009
New Revision: 888309
URL: http://svn.apache.org/viewvc?rev=888309&view=rev
Log:
Cleanup for data preparatio script for accounting transaction totals report.
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy?rev=888309&r1=888308&r2=888309&view=diff
==============================================================================
---
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy
(original)
+++
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy
Tue Dec 8 10:21:24 2009
@@ -45,10 +45,11 @@
andExprs = FastList.newInstance();
andExprs.add(EntityCondition.makeCondition("organizationPartyId",
EntityOperator.IN, partyIds));
andExprs.add(EntityCondition.makeCondition("isPosted", EntityOperator.EQUALS,
"Y"));
-andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, parameters.glFiscalTypeId));
+andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, glFiscalTypeId));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
andCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND);
+System.out.println("JAC expr: " + andCond);
List postedTransactionTotals = delegator.findList("AcctgTransEntrySums",
andCond, UtilMisc.toSet("glAccountId", "accountName", "accountCode",
"debitCreditFlag", "amount"), UtilMisc.toList("glAccountId"), null, false);
if (postedTransactionTotals) {
Map postedTransactionTotalsMap = [:]
@@ -68,7 +69,7 @@
andExprs = FastList.newInstance();
andExprs.add(EntityCondition.makeCondition("organizationPartyId",
EntityOperator.IN, partyIds));
andExprs.add(EntityCondition.makeCondition("isPosted", EntityOperator.EQUALS,
"Y"));
-andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, parameters.glFiscalTypeId));
+andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, glFiscalTypeId));
andExprs.add(EntityCondition.makeCondition("debitCreditFlag",
EntityOperator.EQUALS, "D"));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
@@ -84,7 +85,7 @@
andExprs = FastList.newInstance();
andExprs.add(EntityCondition.makeCondition("organizationPartyId",
EntityOperator.IN, partyIds));
andExprs.add(EntityCondition.makeCondition("isPosted", EntityOperator.EQUALS,
"Y"));
-andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, parameters.glFiscalTypeId));
+andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, glFiscalTypeId));
andExprs.add(EntityCondition.makeCondition("debitCreditFlag",
EntityOperator.EQUALS, "C"));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
@@ -107,7 +108,7 @@
andExprs = FastList.newInstance();
andExprs.add(EntityCondition.makeCondition("organizationPartyId",
EntityOperator.IN, partyIds));
andExprs.add(EntityCondition.makeCondition("isPosted", EntityOperator.EQUALS,
"N"));
-andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, parameters.glFiscalTypeId));
+andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, glFiscalTypeId));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
andCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND);
@@ -130,7 +131,7 @@
andExprs = FastList.newInstance();
andExprs.add(EntityCondition.makeCondition("organizationPartyId",
EntityOperator.IN, partyIds));
andExprs.add(EntityCondition.makeCondition("isPosted", EntityOperator.EQUALS,
"N"));
-andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, parameters.glFiscalTypeId));
+andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, glFiscalTypeId));
andExprs.add(EntityCondition.makeCondition("debitCreditFlag",
EntityOperator.EQUALS, "D"));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
@@ -146,7 +147,7 @@
andExprs = FastList.newInstance();
andExprs.add(EntityCondition.makeCondition("organizationPartyId",
EntityOperator.IN, partyIds));
andExprs.add(EntityCondition.makeCondition("isPosted", EntityOperator.EQUALS,
"N"));
-andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, parameters.glFiscalTypeId));
+andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, glFiscalTypeId));
andExprs.add(EntityCondition.makeCondition("debitCreditFlag",
EntityOperator.EQUALS, "C"));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
@@ -168,7 +169,7 @@
allTotalCredit = BigDecimal.ZERO;
andExprs = FastList.newInstance();
andExprs.add(EntityCondition.makeCondition("organizationPartyId",
EntityOperator.IN, partyIds));
-andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, parameters.glFiscalTypeId));
+andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, glFiscalTypeId));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
andCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND);
@@ -190,7 +191,7 @@
// Posted and unposted grand total for Debits
andExprs = FastList.newInstance();
andExprs.add(EntityCondition.makeCondition("organizationPartyId",
EntityOperator.IN, partyIds));
-andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, parameters.glFiscalTypeId));
+andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, glFiscalTypeId));
andExprs.add(EntityCondition.makeCondition("debitCreditFlag",
EntityOperator.EQUALS, "D"));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
@@ -205,7 +206,7 @@
// Posted and unposted grand total for Credits
andExprs = FastList.newInstance();
andExprs.add(EntityCondition.makeCondition("organizationPartyId",
EntityOperator.IN, partyIds));
-andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, parameters.glFiscalTypeId));
+andExprs.add(EntityCondition.makeCondition("glFiscalTypeId",
EntityOperator.EQUALS, glFiscalTypeId));
andExprs.add(EntityCondition.makeCondition("debitCreditFlag",
EntityOperator.EQUALS, "C"));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
andExprs.add(EntityCondition.makeCondition("transactionDate",
EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
