Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Minor] Removed Paid status from Salary Slip

Browse Source
This commit is contained in:
Kanchan Chauhan 2017-03-02 12:59:35 +05:30
parent 834d616c60
commit cfb0adff98
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/hr/doctype/salary_slip/salary_slip.json
View File

@ -272,7 +272,7 @@
"label": "Status", "label": "Status",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Draft\nSubmitted\nPaid\nCancelled", "options": "Draft\nSubmitted\nCancelled",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
@ -1581,7 +1581,7 @@
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2017-02-22 06:11:01.882797", "modified": "2017-03-02 02:25:53.844701",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "HR", "module": "HR",
"name": "Salary Slip", "name": "Salary Slip",

3
erpnext/hr/doctype/salary_slip/salary_slip.py
View File

@ -389,8 +389,6 @@ class SalarySlip(TransactionBase):
status = "Draft" status = "Draft"
elif self.docstatus == 1: elif self.docstatus == 1:
status = "Submitted" status = "Submitted"
if self.journal_entry:
status = "Paid"
elif self.docstatus == 2: elif self.docstatus == 2:
status = "Cancelled" status = "Cancelled"
return status return status
@ -401,5 +399,4 @@ def unlink_ref_doc_from_salary_slip(ref_no):
if linked_ss: if linked_ss:
for ss in linked_ss: for ss in linked_ss:
ss_doc = frappe.get_doc("Salary Slip", 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", "") frappe.db.set_value("Salary Slip", ss_doc.name, "journal_entry", "")