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

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Nabin Hait 2017-01-13 17:30:45 +05:30
commit 5d69900f66
2 changed files with 5 additions and 1 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.10' __version__ = '7.2.11'
def get_default_company(user=None): def get_default_company(user=None):
'''Get default company for user''' '''Get default company for user'''

4
erpnext/patches/v7_2/update_salary_slips.py
View File

@ -2,6 +2,10 @@ import frappe
from erpnext.hr.doctype.process_payroll.process_payroll import get_month_details from erpnext.hr.doctype.process_payroll.process_payroll import get_month_details
def execute(): 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` salary_slips = frappe.db.sql("""select fiscal_year, month, name from `tabSalary Slip`
where (month is not null and month != '') where (month is not null and month != '')
and (fiscal_year is not null and fiscal_year != '') and and (fiscal_year is not null and fiscal_year != '') and