svn commit: r1759145 - in /ofbiz/trunk/applications/accounting/groovyScripts: fixedasset/FixedAssetGeoLocation.groovy reports/BalanceSheet.groovy reports/CashFlowStatement.groovy

[as...@apache.org]

Author: ashish
Date: Sun Sep  4 06:33:32 2016
New Revision: 1759145

URL: http://svn.apache.org/viewvc?rev=1759145&view=rev
Log:
Applied patch from jira issue - OFBIZ-8069 - Clean up commented out code in Groovy for Accounting. Thanks Aman for the contribution.

Modified:
    ofbiz/trunk/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/reports/BalanceSheet.groovy
    ofbiz/trunk/applications/accounting/groovyScripts/reports/CashFlowStatement.groovy

Modified: ofbiz/trunk/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy?rev=1759145&r1=1759144&r2=1759145&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/fixedasset/FixedAssetGeoLocation.groovy Sun Sep  4 06:33:32 2016
@@ -27,9 +27,6 @@ if (fixedAsset) {
     latestGeoPoint = GeoWorker.findLatestGeoPoint(delegator, "FixedAssetAndGeoPoint", "fixedAssetId", fixedAssetId, null, null);
     if (latestGeoPoint) {
         context.latestGeoPoint = latestGeoPoint;
-        
-        //List geoCenter = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "zoom", "13"));
-        
         if (latestGeoPoint.containsKey("latitude") && latestGeoPoint.containsKey("longitude")) {
             List geoPoints = UtilMisc.toList(UtilMisc.toMap("lat", latestGeoPoint.latitude, "lon", latestGeoPoint.longitude, "fixedAssetId", fixedAssetId,
                             "link", UtilMisc.toMap("url", "EditFixedAsset?fixedAssetId="+ fixedAssetId, "label", uiLabelMap.AccountingFixedAsset + " " + fixedAsset.fixedAssetName)));

Modified: ofbiz/trunk/applications/accounting/groovyScripts/reports/BalanceSheet.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/reports/BalanceSheet.groovy?rev=1759145&r1=1759144&r2=1759145&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/reports/BalanceSheet.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/reports/BalanceSheet.groovy Sun Sep  4 06:33:32 2016
@@ -305,11 +305,9 @@ accountBalanceList = UtilMisc.sortMaps(t
 accountBalanceList.each { accountBalance ->
     balanceTotal = balanceTotal + accountBalance.balance;
 }
-//context.contraAssetAccountBalanceList = accountBalanceList;
 context.assetAccountBalanceList.addAll(accountBalanceList);
 context.assetAccountBalanceList.add(UtilMisc.toMap("accountName", uiLabelMap.AccountingTotalAccumulatedDepreciation, "balance", balanceTotal));
 context.contraAssetBalanceTotal = balanceTotal;
-//balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingLongTermAssetsAtCost", "balance", (context.longtermAssetBalanceTotal - context.contraAssetBalanceTotal)));
 balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingTotalAccumulatedDepreciation", "balance", balanceTotal));
 balanceTotalList.add(UtilMisc.toMap("totalName", "AccountingTotalAssets", "balance", (context.currentAssetBalanceTotal + context.longtermAssetBalanceTotal + balanceTotal)));
 

Modified: ofbiz/trunk/applications/accounting/groovyScripts/reports/CashFlowStatement.groovy
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/groovyScripts/reports/CashFlowStatement.groovy?rev=1759145&r1=1759144&r2=1759145&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/groovyScripts/reports/CashFlowStatement.groovy (original)
+++ ofbiz/trunk/applications/accounting/groovyScripts/reports/CashFlowStatement.groovy Sun Sep  4 06:33:32 2016
@@ -77,7 +77,6 @@ List mainAndExprs = [];
 mainAndExprs.add(EntityCondition.makeCondition("organizationPartyId", EntityOperator.IN, partyIds));
 mainAndExprs.add(EntityCondition.makeCondition("isPosted", EntityOperator.EQUALS, "Y"));
 mainAndExprs.add(EntityCondition.makeCondition("glFiscalTypeId", EntityOperator.EQUALS, parameters.glFiscalTypeId));
-//mainAndExprs.add(EntityCondition.makeCondition("acctgTransTypeId", EntityOperator.NOT_EQUAL, "PERIOD_CLOSING"));
 mainAndExprs.add(EntityCondition.makeCondition("glAccountClassId", EntityOperator.IN, glAccountClassIds));
 
 // All GlAccount's transactions (from last closing period to parameter's fromDate) 
@@ -203,7 +202,6 @@ if (transactionTotals) {
 accountBalanceList.each { accountBalance ->
     balanceTotal = balanceTotal.add(accountBalance.balance);
 }
-//closingCashBalanceTotal = balanceTotal;
 context.closingCashBalanceList = accountBalanceList;
 context.closingCashBalanceList.add("accountName":uiLabelMap.AccountingTotalClosingCashBalance, "balance":balanceTotal);