Merge pull request #7680 from bcornwellmott/patch-7
Duplicate "title" field
diff --git a/erpnext/hr/doctype/salary_structure/salary_structure.py b/erpnext/hr/doctype/salary_structure/salary_structure.py
index 0e2dd1b..d60cd35 100644
--- a/erpnext/hr/doctype/salary_structure/salary_structure.py
+++ b/erpnext/hr/doctype/salary_structure/salary_structure.py
@@ -33,8 +33,13 @@
def make_salary_slip(source_name, target_doc = None, employee = None, as_print = False, print_format = None):
def postprocess(source, target):
if employee:
+ employee_details = frappe.db.get_value("Employee", employee,
+ ["employee_name", "branch", "designation", "department"], as_dict=1)
target.employee = employee
- target.employee_name = frappe.get_value("Employee",employee, "employee_name")
+ target.employee_name = employee_details.employee_name
+ target.branch = employee_details.branch
+ target.designation = employee_details.designation
+ target.department = employee_details.department
target.run_method('process_salary_structure')
doc = get_mapped_doc("Salary Structure", source_name, {
diff --git a/erpnext/support/doctype/issue/issue.py b/erpnext/support/doctype/issue/issue.py
index f2d8bd5..e5c6ee1 100644
--- a/erpnext/support/doctype/issue/issue.py
+++ b/erpnext/support/doctype/issue/issue.py
@@ -81,9 +81,15 @@
st.save()
def auto_close_tickets():
- frappe.db.sql("""update `tabIssue` set status = 'Closed'
- where status = 'Replied'
- and date_sub(curdate(),interval 15 Day) > modified""")
+ issues = frappe.db.get_all("Issue", filters={
+ "status": "Replied",
+ "modified": ("<", "date_sub(curdate(),interval 7 Day)")
+ }, fields=["name"])
+
+ for issue in issues:
+ doc = frappe.get_doc("Issue", issue.get("name"))
+ doc.status = "Closed"
+ doc.save(ignore_permissions=True)
@frappe.whitelist()
def set_multiple_status(names, status):