diff --git a/erpnext/__init__.py b/erpnext/__init__.py index c080f440ff..2985dac0c2 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '7.2.27' +__version__ = '7.2.28' def get_default_company(user=None): '''Get default company for user''' diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 28a746e4c4..9bb3fe4144 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -38,17 +38,9 @@ class JournalEntry(AccountsController): self.validate_credit_debit_note() self.validate_empty_accounts_table() self.set_account_and_party_balance() - self.clear_zero_debit_credit_row() if not self.title: self.title = self.get_title() - def clear_zero_debit_credit_row(self): - self.accounts = [account for account in self.accounts - if not (account.debit_in_account_currency==0.0 and account.credit_in_account_currency==0.0)] - - if not self.accounts: - frappe.throw("Debit or Credit amount is not found in account table") - def on_submit(self): self.check_credit_limit() self.make_gl_entries() diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py index 5e84a650d7..fb1c4ac813 100644 --- a/erpnext/accounts/report/financial_statements.py +++ b/erpnext/accounts/report/financial_statements.py @@ -139,8 +139,7 @@ def calculate_values(accounts_by_name, gl_entries_by_account, period_list, accum if entry.posting_date <= period.to_date: if (accumulated_values or entry.posting_date >= period.from_date) and \ - (entry.fiscal_year == period.to_date_fiscal_year or not ignore_accumulated_values_for_fy): - frappe.errprint([entry.fiscal_year, period.to_date_fiscal_year]) + (not ignore_accumulated_values_for_fy or entry.fiscal_year == period.to_date_fiscal_year): d[period.key] = d.get(period.key, 0.0) + flt(entry.debit) - flt(entry.credit) if entry.posting_date < period_list[0].year_start_date: