diff --git a/erpnext/accounts/report/cash_flow/cash_flow.py b/erpnext/accounts/report/cash_flow/cash_flow.py
index 3e5efea..8c0acfb 100644
--- a/erpnext/accounts/report/cash_flow/cash_flow.py
+++ b/erpnext/accounts/report/cash_flow/cash_flow.py
@@ -2,71 +2,132 @@
 # For license information, please see license.txt
 
 from __future__ import unicode_literals
+import frappe
 from frappe import _
-from erpnext.accounts.report.financial_statements import (get_period_list, get_columns, get_data, get_data_account_type, add_total_row_account)
+from erpnext.accounts.report.financial_statements import (get_period_list, get_columns, get_data)
 from erpnext.accounts.report.profit_and_loss_statement.profit_and_loss_statement import get_net_profit_loss
 
 
 def execute(filters=None):
-    period_list = get_period_list(filters.fiscal_year, filters.periodicity)
+	period_list = get_period_list(filters.fiscal_year, filters.periodicity)
 
-    operation_accounts = {"section_name": "Operations",
-                          "section_footer": _("Net Cash from Operations"),
-                          "section_header": _("Cash Flow from Operations"),
-                          "account_types": [{"account_type": "Depreciation", "label": _("Depreciation")},
-                                            {"account_type": "Receivable", "label": _("Net Change in Accounts Receivable")},
-                                            {"account_type": "Payable", "label": _("Net Change in Accounts Payable")},
-                                            {"account_type": "Warehouse", "label": _("Net Change in Inventory")}]}
+	operation_accounts = {
+		"section_name": "Operations",
+		"section_footer": _("Net Cash from Operations"),
+		"section_header": _("Cash Flow from Operations"),
+		"account_types": [
+			{"account_type": "Depreciation", "label": _("Depreciation")},
+			{"account_type": "Receivable", "label": _("Net Change in Accounts Receivable")},
+			{"account_type": "Payable", "label": _("Net Change in Accounts Payable")},
+			{"account_type": "Warehouse", "label": _("Net Change in Inventory")}
+		]
+	}
 
-    investing_accounts = {"section_name": "Investing",
-                          "section_footer": _("Net Cash from Investing"),
-                          "section_header": _("Cash Flow from Investing"),
-                          "account_types": [{"account_type": "Fixed Asset", "label": _("Net Change in Fixed Asset")},
-                                            ]}
+	investing_accounts = {
+		"section_name": "Investing",
+		"section_footer": _("Net Cash from Investing"),
+		"section_header": _("Cash Flow from Investing"),
+		"account_types": [
+			{"account_type": "Fixed Asset", "label": _("Net Change in Fixed Asset")},
+			# {"account_type": "Investment", "label": _("Net Change in Fixed Asset")},
+		]
+	}
 
-    financing_accounts = {"section_name": "Financing",
-                          "section_footer": _("Net Cash from Financing"),
-                          "section_header": _("Cash Flow from Financing"),
-                          "account_types": [{"account_type": "Equity", "label": _("Net Change in Equity")},
-                                            ]}
+	financing_accounts = {
+		"section_name": "Financing",
+		"section_footer": _("Net Cash from Financing"),
+		"section_header": _("Cash Flow from Financing"),
+		"account_types": [
+			{"account_type": "Equity", "label": _("Net Change in Equity")}
+		]
+	}
 
-    # combine all cash flow accounts for iteration
-    cash_flow_accounts = []
-    cash_flow_accounts.append(operation_accounts)
-    cash_flow_accounts.append(investing_accounts)
-    cash_flow_accounts.append(financing_accounts)
+	# combine all cash flow accounts for iteration
+	cash_flow_accounts = []
+	cash_flow_accounts.append(operation_accounts)
+	cash_flow_accounts.append(investing_accounts)
+	cash_flow_accounts.append(financing_accounts)
 
-    # compute net income
-    income = get_data(filters.company, "Income", "Credit", period_list, ignore_closing_entries=True)
-    expense = get_data(filters.company, "Expense", "Debit", period_list, ignore_closing_entries=True)
-    net_profit_loss = get_net_profit_loss(income, expense, period_list)
+	# compute net profit / loss
+	income = get_data(filters.company, "Income", "Credit", period_list, ignore_closing_entries=True)
+	expense = get_data(filters.company, "Expense", "Debit", period_list, ignore_closing_entries=True)
+	net_profit_loss = get_net_profit_loss(income, expense, period_list)
 
-    data = []
+	data = []
 
-    for cash_flow_account in cash_flow_accounts:
+	for cash_flow_account in cash_flow_accounts:
 
-        section_data = []
-        value = {"account_name": cash_flow_account['section_header'], "parent_account": None,
-                 "indent": 0.0, "account": cash_flow_account['section_header']}
-        data.append(value)
+		section_data = []
+		data.append({
+			"account_name": cash_flow_account['section_header'], 
+			"parent_account": None,
+			"indent": 0.0, 
+			"account": cash_flow_account['section_header']
+		})
 
-        if len(data) == 1:
-            # add first net income in operations section
-            if net_profit_loss:
-                net_profit_loss.update({"indent": 1, "parent_account": operation_accounts['section_header']})
-                data.append(net_profit_loss)
-                section_data.append(net_profit_loss)
+		if len(data) == 1:
+			# add first net income in operations section
+			if net_profit_loss:
+				net_profit_loss.update({
+					"indent": 1, 
+					"parent_account": operation_accounts['section_header']
+				})
+				data.append(net_profit_loss)
+				section_data.append(net_profit_loss)
 
-        for account in cash_flow_account['account_types']:
-            account_data = get_data_account_type(filters.company, account['account_type'], period_list)
-            account_data.update({"account_name": account['label'], "indent": 1,
-                                 "parent_account": cash_flow_account['section_header']})
-            data.append(account_data)
-            section_data.append(account_data)
+		for account in cash_flow_account['account_types']:
+			account_data = get_account_type_based_data(filters.company, account['account_type'], period_list)
+			account_data.update({
+				"account_name": account['label'], 
+				"indent": 1,
+				"parent_account": cash_flow_account['section_header']
+			})
+			data.append(account_data)
+			section_data.append(account_data)
 
-        add_total_row_account(data, section_data, cash_flow_account['section_footer'], period_list)
+		add_total_row_account(data, section_data, cash_flow_account['section_footer'], period_list)
 
-    add_total_row_account(data, data, _("Net Change in Cash"), period_list)
-    columns = get_columns(period_list)
+	add_total_row_account(data, data, _("Net Change in Cash"), period_list)
+	columns = get_columns(period_list)
 
-    return columns, data
+	return columns, data
+
+
+def get_account_type_based_data(company, account_type, period_list):
+	data = {}
+	for period in period_list:
+		gl_sum = frappe.db.sql_list("""
+			select sum(credit) - sum(debit)
+			from `tabGL Entry`
+			where company=%s and posting_date >= %s and posting_date <= %s 
+				and voucher_type != 'Period Closing Voucher'
+				and account in ( SELECT name FROM tabAccount WHERE account_type = %s)
+		""", (company, period['from_date'], period['to_date'], account_type))
+		
+		if gl_sum and gl_sum[0]:
+			amount = gl_sum[0]
+		else:
+			amount = 0
+		
+		data.update({
+			"from_date": period['from_date'], 
+			"to_date": period['to_date'], 
+			period["key"]: amount
+		})
+	return data
+
+
+def add_total_row_account(out, data, label, period_list):
+	total_row = {
+		"account_name": "'" + _("{0}").format(label) + "'",
+		"account": None
+	}
+
+	for row in data:
+		if row.get("parent_account"):
+			for period in period_list:
+				total_row.setdefault(period.key, 0.0)
+				total_row[period.key] += row.get(period.key, 0.0)
+
+	out.append(total_row)
+	out.append({})
\ No newline at end of file
diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py
index be13ea5..5e3184d 100644
--- a/erpnext/accounts/report/financial_statements.py
+++ b/erpnext/accounts/report/financial_statements.py
@@ -257,36 +257,4 @@
 			"width": 150
 		})
 
-	return columns
-
-
-def get_data_account_type(company, account_type, period_list):
-    data = {}
-    for period in period_list:
-        gl_sum = frappe.db.sql_list("""select sum(credit) - sum(debit) FROM `tabGL Entry`
-                                    where company='%s' and posting_date >= '%s' and posting_date <= '%s' and
-                                    account in ( SELECT name FROM tabAccount WHERE account_type = '%s')""" %
-                                    (company, period['from_date'], period['to_date'], account_type))
-        if gl_sum[0]:
-            amount = gl_sum[0]
-        else:
-            amount = 0
-        data.update({"from_date": period['from_date'], "to_date": period['to_date'], period["key"]: amount})
-    return data
-
-
-def add_total_row_account(out, data, label, period_list):
-    # print out
-    total_row = {
-        "account_name": "'" + _("{0}").format(label) + "'",
-        "account": None
-    }
-
-    for row in data:
-        if row.get("parent_account"):
-            for period in period_list:
-                total_row.setdefault(period.key, 0.0)
-                total_row[period.key] += row.get(period.key, 0.0)
-
-    out.append(total_row)
-    out.append({})
+	return columns
\ No newline at end of file