Merge branch 'staging-fixes' of https://github.com/frappe/erpnext.git into Item-Tax-Template
# Conflicts:
# erpnext/patches.txt
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
old mode 100755
new mode 100644
index 917176a..bd4ed3e
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -581,3 +581,4 @@
erpnext.patches.v11_0.set_missing_gst_hsn_code
erpnext.patches.v11_0.rename_bom_wo_fields
erpnext.patches.v11_0.move_item_tax_to_item_tax_template
+erpnext.patches.v11_0.rename_additional_salary_component_additional_salary