From b166caa9fb0efa4aceab315fd6a945d2fe6922e4 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 13 Jan 2017 17:09:57 +0530 Subject: [PATCH 1/2] Patch fixed --- erpnext/patches/v7_2/update_salary_slips.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/patches/v7_2/update_salary_slips.py b/erpnext/patches/v7_2/update_salary_slips.py index 232de2892d..87eae3b414 100644 --- a/erpnext/patches/v7_2/update_salary_slips.py +++ b/erpnext/patches/v7_2/update_salary_slips.py @@ -6,7 +6,7 @@ def execute(): where (month is not null and month != '') and (fiscal_year is not null and fiscal_year != '') and (start_date is null or start_date = '') and - (end_date is null or end_date = '') and docstatus != 2""") + (end_date is null or end_date = '') and docstatus != 2""", as_dict=1) for salary_slip in salary_slips: get_start_end_date = get_month_details(salary_slip.fiscal_year, salary_slip.month) From fd7f3240b40f9b3709c54e3096aabf77db78c62e Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 13 Jan 2017 17:40:51 +0600 Subject: [PATCH 2/2] bumped to version 7.2.10 --- erpnext/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 454503fda7..6ac6cca2d5 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '7.2.9' +__version__ = '7.2.10' def get_default_company(user=None): '''Get default company for user'''