From f8aa6ed46bfc48a7b72eb6bb7c34d0b4c180916b Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Thu, 2 Mar 2017 17:51:15 +0530 Subject: [PATCH 1/4] removed fiscal year and month from the print --- .../monthly_salary_register/monthly_salary_register.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.html b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.html index c77e4e58b8..c16f11056f 100644 --- a/erpnext/hr/report/monthly_salary_register/monthly_salary_register.html +++ b/erpnext/hr/report/monthly_salary_register/monthly_salary_register.html @@ -2,8 +2,8 @@ {%= frappe.boot.letter_heads[filters.letter_head || frappe.defaults.get_default("letter_head")] %}

{%= __(report.report_name) %}

-
Fiscal Year: {%= filters.fiscal_year %}
-
Month: {%= filters.month %}
+
From Date: {%= filters.from_date %}
+
To Date: {%= filters.to_date %}
From 9f4317e9b8acceb3f1b85675df824c2fcf4cc67c Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Mon, 6 Mar 2017 23:37:59 +0530 Subject: [PATCH 2/4] minor fix --- erpnext/accounts/report/financial_statements.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/erpnext/accounts/report/financial_statements.py b/erpnext/accounts/report/financial_statements.py index 695503749a..d35af01a94 100644 --- a/erpnext/accounts/report/financial_statements.py +++ b/erpnext/accounts/report/financial_statements.py @@ -141,8 +141,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: From c03f275e7a6279999e86d3458e4a6e723257de45 Mon Sep 17 00:00:00 2001 From: mbauskar Date: Tue, 7 Mar 2017 11:59:55 +0530 Subject: [PATCH 3/4] [minor] allowed the credit and debit amount to be 0 in JE --- erpnext/accounts/doctype/journal_entry/journal_entry.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/erpnext/accounts/doctype/journal_entry/journal_entry.py b/erpnext/accounts/doctype/journal_entry/journal_entry.py index 0f9b5d34bb..fc8966282b 100644 --- a/erpnext/accounts/doctype/journal_entry/journal_entry.py +++ b/erpnext/accounts/doctype/journal_entry/journal_entry.py @@ -37,16 +37,8 @@ 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() From f9672065235265aa484bf5910315fdb2bb3696d9 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Wed, 8 Mar 2017 11:46:00 +0600 Subject: [PATCH 4/4] bumped to version 7.2.28 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 86c0760d8b..1ffae7c313 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'''