diff --git a/erpnext/__init__.py b/erpnext/__init__.py index 6ac6cca2d5..0083cebb71 100644 --- a/erpnext/__init__.py +++ b/erpnext/__init__.py @@ -2,7 +2,7 @@ from __future__ import unicode_literals import frappe -__version__ = '7.2.10' +__version__ = '7.2.11' def get_default_company(user=None): '''Get default company for user''' diff --git a/erpnext/patches/v7_2/update_salary_slips.py b/erpnext/patches/v7_2/update_salary_slips.py index 87eae3b414..c694fc5f1e 100644 --- a/erpnext/patches/v7_2/update_salary_slips.py +++ b/erpnext/patches/v7_2/update_salary_slips.py @@ -2,6 +2,10 @@ import frappe from erpnext.hr.doctype.process_payroll.process_payroll import get_month_details def execute(): + ss_columns = frappe.db.get_table_columns("Salary Slip") + if "fiscal_year" not in ss_columns or "month" not in ss_columns: + return + salary_slips = frappe.db.sql("""select fiscal_year, month, name from `tabSalary Slip` where (month is not null and month != '') and (fiscal_year is not null and fiscal_year != '') and