Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait 2017-03-08 11:18:15 +05:30
commit 33fb6ae323
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/__init__.py
View File

@ -2,7 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import frappe import frappe
__version__ = '7.2.27' __version__ = '7.2.28'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

8
erpnext/accounts/doctype/journal_entry/journal_entry.py
View File

@ -38,17 +38,9 @@ class JournalEntry(AccountsController):
self.validate_credit_debit_note() self.validate_credit_debit_note()
self.validate_empty_accounts_table() self.validate_empty_accounts_table()
self.set_account_and_party_balance() self.set_account_and_party_balance()
self.clear_zero_debit_credit_row()
if not self.title: if not self.title:
self.title = self.get_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): def on_submit(self):
self.check_credit_limit() self.check_credit_limit()
self.make_gl_entries() self.make_gl_entries()

3
erpnext/accounts/report/financial_statements.py
View File

@ -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 entry.posting_date <= period.to_date:
if (accumulated_values or entry.posting_date >= period.from_date) and \ 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): (not ignore_accumulated_values_for_fy or entry.fiscal_year == period.to_date_fiscal_year):
frappe.errprint([entry.fiscal_year, period.to_date_fiscal_year])
d[period.key] = d.get(period.key, 0.0) + flt(entry.debit) - flt(entry.credit) 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: if entry.posting_date < period_list[0].year_start_date: