From cfb0adff98a4105f97b81520a59c99606011b91f Mon Sep 17 00:00:00 2001 From: Kanchan Chauhan Date: Thu, 2 Mar 2017 12:59:35 +0530 Subject: [PATCH] [Minor] Removed Paid status from Salary Slip --- erpnext/hr/doctype/salary_slip/salary_slip.json | 4 ++-- erpnext/hr/doctype/salary_slip/salary_slip.py | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.json b/erpnext/hr/doctype/salary_slip/salary_slip.json index 03628e89bc..8f1e6b3c2a 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.json +++ b/erpnext/hr/doctype/salary_slip/salary_slip.json @@ -272,7 +272,7 @@ "label": "Status", "length": 0, "no_copy": 0, - "options": "Draft\nSubmitted\nPaid\nCancelled", + "options": "Draft\nSubmitted\nCancelled", "permlevel": 0, "precision": "", "print_hide": 0, @@ -1581,7 +1581,7 @@ "issingle": 0, "istable": 0, "max_attachments": 0, - "modified": "2017-02-22 06:11:01.882797", + "modified": "2017-03-02 02:25:53.844701", "modified_by": "Administrator", "module": "HR", "name": "Salary Slip", diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index 6ff6f363a5..15d5df8ff0 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -389,8 +389,6 @@ class SalarySlip(TransactionBase): status = "Draft" elif self.docstatus == 1: status = "Submitted" - if self.journal_entry: - status = "Paid" elif self.docstatus == 2: status = "Cancelled" return status @@ -401,5 +399,4 @@ def unlink_ref_doc_from_salary_slip(ref_no): if linked_ss: for ss in linked_ss: ss_doc = frappe.get_doc("Salary Slip", ss) - frappe.db.set_value("Salary Slip", ss_doc.name, "status", "Submitted") frappe.db.set_value("Salary Slip", ss_doc.name, "journal_entry", "")