You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/06/09 10:51:11 UTC
svn commit: r1747533 - in /ofbiz/branches/release15.12: ./
applications/accounting/servicedef/
applications/accounting/src/org/ofbiz/accounting/period/
applications/accounting/webapp/accounting/WEB-INF/actions/reports/
Author: deepak
Date: Thu Jun 9 10:51:11 2016
New Revision: 1747533
URL: http://svn.apache.org/viewvc?rev=1747533&view=rev
Log:
Applied fix from trunk for revision: 1744873
===
(OFBIZ-7089) Applied patch from jira issue
============================================================
Cash Flow Statement report is broken
============================================================
Thanks Nameet Jain for reporting and providing the patch.
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/applications/accounting/servicedef/services_ledger.xml
ofbiz/branches/release15.12/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java
ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy
ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy
ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jun 9 10:51:11 2016
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,1746422,
1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747498
+/ofbiz/trunk:1722712,1723007,1723248,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940,1724943,1724946,1724951,1724957,1724975,1724978,1725006,1725217,1725257,1725561,1725574,1726388,1726486,1726493,1726828,1727894,1728398,1728411,1729005,1729078,1729609,1729809,1730035,1730456,1730735-1730736,1730747,1730758,1730882,1730889,1731382,1731396,1732454,1732570,1732721,1733951,1733956,1734246,1734269,1734276,1734912,1734918,1735021,1735244,1735385,1735398,1735569,1735731,1735734,1735750,1735753,1735756,1735759,1735773,1736083,1736087,1736272,1736434,1736628,1736851,1736854,1736890,1737156,1737440,1738235,1738303,1738407,1738902,1739438,1739448,1739571,1740008,1740442,1740629,1741146,1741563,1741684,1741925,1741930,1741960,1742018,1742097,1742103,1742712,1742737,1742741,1743025,1743027,1743230,1743411-1743412,1743656,1743937,1744117,1744198,1744396,1744662,1744768,1744773,1744873,1744911,1745111,1745264,1745428,1745438,1745573,1745577,1745592,1745751,1746228,
1746422,1746459,1746524,1746527,1746536,1746601,1746676,1746714,1746755,1746805,1746832,1746890,1747223,1747349,1747498
Modified: ofbiz/branches/release15.12/applications/accounting/servicedef/services_ledger.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/servicedef/services_ledger.xml?rev=1747533&r1=1747532&r2=1747533&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/servicedef/services_ledger.xml (original)
+++ ofbiz/branches/release15.12/applications/accounting/servicedef/services_ledger.xml Thu Jun 9 10:51:11 2016
@@ -564,7 +564,7 @@ under the License.
If no findDate is given, then use the current moment (nowTimestamp).
</description>
<attribute name="organizationPartyId" type="String" mode="IN" optional="true"/>
- <attribute name="findDate" type="java.sql.Date" mode="IN" optional="true"/>
+ <attribute name="findDate" type="Timestamp" mode="IN" optional="true"/>
<attribute name="periodTypeId" type="String" mode="IN" optional="true"/>
<attribute name="lastClosedDate" type="Timestamp" mode="OUT" optional="true"/>
<attribute name="lastClosedTimePeriod" type="org.ofbiz.entity.GenericValue" mode="OUT" optional="true"/>
Modified: ofbiz/branches/release15.12/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java?rev=1747533&r1=1747532&r2=1747533&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java (original)
+++ ofbiz/branches/release15.12/applications/accounting/src/org/ofbiz/accounting/period/PeriodServices.java Thu Jun 9 10:51:11 2016
@@ -50,12 +50,12 @@ public class PeriodServices {
Delegator delegator = dctx.getDelegator();
String organizationPartyId = (String) context.get("organizationPartyId"); // input parameters
String periodTypeId = (String) context.get("periodTypeId");
- Date findDate = (Date) context.get("findDate");
+ Timestamp findDate = (Timestamp) context.get("findDate");
Locale locale = (Locale) context.get("locale");
// default findDate to now
if (findDate == null) {
- findDate = new Date(UtilDateTime.nowTimestamp().getTime());
+ findDate = UtilDateTime.nowTimestamp();
}
Timestamp lastClosedDate = null; // return parameters
Modified: ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy?rev=1747533&r1=1747532&r2=1747533&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy (original)
+++ ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/BalanceSheet.groovy Thu Jun 9 10:51:11 2016
@@ -63,7 +63,7 @@ GenericValue accumAmortizationGlAccountC
List accumAmortizationAccountClassIds = UtilAccounting.getDescendantGlAccountClassIds(accumAmortizationGlAccountClass);
// Find the last closed time period to get the fromDate for the transactions in the current period and the ending balances of the last closed period
-Map lastClosedTimePeriodResult = runService('findLastClosedDate', ["organizationPartyId": organizationPartyId, "findDate": new Date(thruDate.getTime()),"userLogin": userLogin]);
+Map lastClosedTimePeriodResult = runService('findLastClosedDate', ["organizationPartyId": organizationPartyId, "findDate": thruDate,"userLogin": userLogin]);
Timestamp fromDate = (Timestamp)lastClosedTimePeriodResult.lastClosedDate;
if (!fromDate) {
return;
Modified: ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy?rev=1747533&r1=1747532&r2=1747533&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy (original)
+++ ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/CashFlowStatement.groovy Thu Jun 9 10:51:11 2016
@@ -52,8 +52,8 @@ List glAccountClassIds = UtilAccounting.
List cashFlowBalanceTotalList = [];
-// Find the last closed time period to get the fromDate for the transactions in the current period and the ending balances of the last closed period
-Map lastClosedTimePeriodResult = runService('findLastClosedDate', ["organizationPartyId":organizationPartyId, "findDate":new Date(parametersFromDate.getTime()),"userLogin":userLogin]);
+// Find the last closed time period to get the fromDate for the transactions in the current period and the ending balances of the last closed period
+Map lastClosedTimePeriodResult = runService('findLastClosedDate', ["organizationPartyId":organizationPartyId, "findDate": parametersFromDate,"userLogin":userLogin]);
Timestamp periodClosingFromDate = (Timestamp)lastClosedTimePeriodResult.lastClosedDate;
if (!periodClosingFromDate) {
return;
Modified: ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy?rev=1747533&r1=1747532&r2=1747533&view=diff
==============================================================================
--- ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy (original)
+++ ofbiz/branches/release15.12/applications/accounting/webapp/accounting/WEB-INF/actions/reports/TransactionTotals.groovy Thu Jun 9 10:51:11 2016
@@ -41,7 +41,7 @@ if (!glFiscalTypeId) {
}
// Find the last closed time period to get the fromDate for the transactions in the current period and the ending balances of the last closed period
-Map lastClosedTimePeriodResult = runService('findLastClosedDate', ["organizationPartyId": organizationPartyId, "findDate": new Date(fromDate.getTime()),"userLogin": userLogin]);
+Map lastClosedTimePeriodResult = runService('findLastClosedDate', ["organizationPartyId": organizationPartyId, "findDate": fromDate,"userLogin": userLogin]);
Timestamp lastClosedDate = (Timestamp)lastClosedTimePeriodResult.lastClosedDate;
GenericValue lastClosedTimePeriod = null;
if (lastClosedDate) {