nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-02 19:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge conflict

Browse Source
This commit is contained in:
Nabin Hait
2016-11-17 15:55:11 +05:30
parent d4e8b297cd 29570d1ecb
commit 46753de6d7
15 changed files with 229 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/patches/v7_1/update_missing_salary_component_type.py
View File

@@ -9,6 +9,8 @@ earnings or deductions in existing salary slips
'''
def execute():
frappe.reload_doc("accounts", "doctype", "salary_component_account")
for s in frappe.db.sql('''select name, type, salary_component_abbr from `tabSalary Component`
where ifnull(type, "")="" or ifnull(salary_component_abbr, "") = ""''', as_dict=1):
@@ -43,4 +45,4 @@ def execute():
component.salary_component_abbr = abbr
component.save()
component.save()