Merge pull request #6120 from KanchanChauhan/images-for-salary-doc
Better images for redesigned salary docs
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index e383929..e938b7d 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -23,13 +23,15 @@
execute:frappe.reload_doc('buying', 'doctype', 'supplier') # 2014-01-29
execute:frappe.reload_doc('accounts', 'doctype', 'asset_category')
execute:frappe.reload_doc('accounts', 'doctype', 'pricing_rule')
+
+erpnext.patches.v5_2.change_item_selects_to_checks
execute:frappe.reload_doctype('Item')
+
erpnext.patches.v4_0.map_charge_to_taxes_and_charges
execute:frappe.reload_doc('support', 'doctype', 'newsletter') # 2014-01-31
execute:frappe.reload_doc('hr', 'doctype', 'employee') # 2014-02-03
execute:frappe.db.sql("update tabPage set module='Core' where name='Setup'")
-erpnext.patches.v5_2.change_item_selects_to_checks
erpnext.patches.v4_0.fields_to_be_renamed
erpnext.patches.v4_0.rename_sitemap_to_route
erpnext.patches.v7_0.re_route #2016-06-27
diff --git a/erpnext/patches/v7_0/move_employee_parent_to_child_in_salary_structure.py b/erpnext/patches/v7_0/move_employee_parent_to_child_in_salary_structure.py
index 085fbbf..509c0a8 100644
--- a/erpnext/patches/v7_0/move_employee_parent_to_child_in_salary_structure.py
+++ b/erpnext/patches/v7_0/move_employee_parent_to_child_in_salary_structure.py
@@ -2,9 +2,10 @@
def execute():
frappe.reload_doc('hr', 'doctype', 'salary_structure')
+ frappe.reload_doc('hr', 'doctype', 'salary_structure_employee')
for ss in frappe.db.sql(""" select employee, name from `tabSalary Structure`""", as_dict=True):
ss_doc = frappe.get_doc('Salary Structure', ss.name)
se = ss_doc.append('employees',{})
se.employee = ss.employee
se.base = 0
- ss_doc.save()
\ No newline at end of file
+ ss_doc.save()