You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ja...@apache.org on 2009/12/04 14:12:00 UTC
svn commit: r887182 - in /ofbiz/trunk/applications/accounting:
webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy
widget/ReportFinancialSummaryForms.xml
Author: jacopoc
Date: Fri Dec 4 13:11:59 2009
New Revision: 887182
URL: http://svn.apache.org/viewvc?rev=887182&view=rev
Log:
Misc cleanups; improved (for consistency) search result lists and links. Added ability to filter transactions by Fiscal Gl Type
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy
ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
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=887182&r1=887181&r2=887182&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 Fri Dec 4 13:11:59 2009
@@ -33,6 +33,9 @@
if (!thruDate) {
thruDate = UtilDateTime.nowTimestamp();
}
+if (!parameters.glFiscalTypeId) {
+ parameters.glFiscalTypeId = "ACTUAL";
+}
// POSTED
// Posted transactions totals and grand totals
@@ -42,6 +45,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("transactionDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
andExprs.add(EntityCondition.makeCondition("transactionDate", EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
andCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND);
@@ -64,6 +68,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("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));
@@ -79,6 +84,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("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));
@@ -101,6 +107,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("transactionDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
andExprs.add(EntityCondition.makeCondition("transactionDate", EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
andCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND);
@@ -123,6 +130,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("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));
@@ -138,6 +146,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("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));
@@ -159,6 +168,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("transactionDate", EntityOperator.GREATER_THAN_EQUAL_TO, fromDate));
andExprs.add(EntityCondition.makeCondition("transactionDate", EntityOperator.LESS_THAN_EQUAL_TO, thruDate));
andCond = EntityCondition.makeCondition(andExprs, EntityOperator.AND);
@@ -180,6 +190,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("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));
@@ -194,6 +205,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("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));
Modified: ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml?rev=887182&r1=887181&r2=887182&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ReportFinancialSummaryForms.xml Fri Dec 4 13:11:59 2009
@@ -166,55 +166,6 @@
<field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="BalanceSheetAssetList" type="list" list-name="assetBalancesList"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <row-actions>
- <entity-one entity-name="GlAccount" value-field="glAccount">
- <field-map field-name="glAccountId"/>
- </entity-one>
- </row-actions>
- <field name="glAccountId" use-when="isPdf != true">
- <hyperlink target="FindAcctgTransEntries" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}">
- <parameter param-name="glAccountId"/>
- <parameter param-name="organizationPartyId"/>
- </hyperlink>
- </field>
- <field name="glAccountId" use-when="isPdf == true"><display description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"/></field>
- <field name="totalAmount" title-area-style="tableheadmedium" widget-style="tabletextright"><display type="currency" currency="${currencyUomId}"/></field>
- </form>
- <form name="BalanceSheetLiabilityList" type="list" list-name="liabilityBalancesList"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <row-actions>
- <entity-one entity-name="GlAccount" value-field="glAccount">
- <field-map field-name="glAccountId"/>
- </entity-one>
- </row-actions>
- <field name="glAccountId" use-when="isPdf != true">
- <hyperlink target="FindAcctgTransEntries" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}">
- <parameter param-name="glAccountId"/>
- <parameter param-name="organizationPartyId"/>
- </hyperlink>
- </field>
- <field name="glAccountId" use-when="isPdf == true"><display description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"/></field>
- <field name="totalAmount" title-area-style="tableheadmedium" widget-style="tabletextright"><display type="currency" currency="${currencyUomId}"/></field>
- </form>
- <form name="BalanceSheetEquityList" type="list" list-name="equityBalancesList"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <row-actions>
- <entity-one entity-name="GlAccount" value-field="glAccount">
- <field-map field-name="glAccountId"/>
- </entity-one>
- </row-actions>
- <field name="glAccountId" use-when="isPdf != true">
- <hyperlink target="FindAcctgTransEntries" description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}">
- <parameter param-name="glAccountId"/>
- <parameter param-name="organizationPartyId"/>
- </hyperlink>
- </field>
- <field name="glAccountId" use-when="isPdf == true"><display description="[${glAccountId}] [${glAccount.accountCode}] ${glAccount.accountName}"/></field>
- <field name="totalAmount" title-area-style="tableheadmedium" widget-style="tabletextright"><display type="currency" currency="${currencyUomId}"/></field>
- </form>
-
<form name="BalanceSheetAssets" type="list" list-name="assetAccountBalanceList"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="accountCode">
@@ -254,13 +205,21 @@
<field name="organizationPartyId"><hidden/></field>
<field name="fromDate"><date-time/></field>
<field name="thruDate"><date-time/></field>
+ <field name="glFiscalTypeId" title="${uiLabelMap.FormFieldTitle_glFiscalType}">
+ <drop-down>
+ <entity-options entity-name="GlFiscalType" description="${description}">
+ <entity-order-by field-name="glFiscalTypeId"/>
+ </entity-options>
+ </drop-down>
+ </field>
<field name="submitButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="PostedTransactionTotalList" type="list" list-name="postedTransactionTotals"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <field name="glAccountId">
- <hyperlink target="GlAccountNavigate" description="${glAccountId}">
+ <field name="accountCode">
+ <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
<parameter param-name="glAccountId"/>
+ <parameter param-name="organizationPartyId"/>
</hyperlink>
</field>
<field name="accountName" title-area-style="tableheadwide"><display description="${accountName}"/></field>
@@ -269,9 +228,10 @@
</form>
<form name="UnpostedTransactionTotalList" type="list" list-name="unpostedTransactionTotals"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <field name="glAccountId">
- <hyperlink target="GlAccountNavigate" description="${glAccountId}">
+ <field name="accountCode">
+ <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
<parameter param-name="glAccountId"/>
+ <parameter param-name="organizationPartyId"/>
</hyperlink>
</field>
<field name="accountName" title-area-style="tableheadwide"><display description="${accountName}"/></field>
@@ -280,9 +240,10 @@
</form>
<form name="PostedAndUnpostedTransactionTotalList" type="list" list-name="allTransactionTotals"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
- <field name="glAccountId">
- <hyperlink target="GlAccountNavigate" description="${glAccountId}">
+ <field name="accountCode">
+ <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
<parameter param-name="glAccountId"/>
+ <parameter param-name="organizationPartyId"/>
</hyperlink>
</field>
<field name="accountName" title-area-style="tableheadwide"><display description="${accountName}"/></field>
@@ -562,13 +523,12 @@
<order-by field-name="accountCode"/>
</entity-condition>
</actions>
- <field name="glAccountId">
- <hyperlink target="FindAcctgTransEntries" description="${glAccountId}">
+ <field name="accountCode">
+ <hyperlink target="FindAcctgTransEntries" description="${accountCode}">
<parameter param-name="glAccountId"/>
<parameter param-name="organizationPartyId"/>
</hyperlink>
</field>
- <field name="accountCode"><display description="${accountCode}"/></field>
<field name="accountName" title-area-style="tableheadwide"><display description="${accountName}"/></field>
<field name="totalPostedDebits" title="${uiLabelMap.AccountingDebitFlag}" widget-style="tabletextright"><display description="${totalPostedDebits}" type="currency" currency="${currencyUomId}"/></field>
<field name="totalPostedCredits" title="${uiLabelMap.AccountingCreditFlag}" widget-style="tabletextright"><display description="${totalPostedCredits}" type="currency" currency="${currencyUomId}"/></field>