From 70b996af73e0301cb59ee250d28c365ffa4958b7 Mon Sep 17 00:00:00 2001 From: Rohit Waghchaure Date: Sun, 31 Mar 2019 20:33:15 +0530 Subject: [PATCH] fix: test cases --- erpnext/hr/doctype/salary_slip/salary_slip.py | 5 ++++- erpnext/public/js/controllers/transaction.js | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py index 684f3483f06..eb7cb113fc0 100644 --- a/erpnext/hr/doctype/salary_slip/salary_slip.py +++ b/erpnext/hr/doctype/salary_slip/salary_slip.py @@ -452,7 +452,10 @@ class SalarySlip(TransactionBase): self.set_loan_repayment() - self.net_pay = (flt(self.gross_pay) - (flt(self.total_deduction) + flt(self.total_loan_repayment))) * flt(self.payment_days / self.total_working_days) + self.net_pay = 0 + if self.total_working_days: + self.net_pay = (flt(self.gross_pay) - (flt(self.total_deduction) + flt(self.total_loan_repayment))) * flt(self.payment_days / self.total_working_days) + self.rounded_total = rounded(self.net_pay, self.precision("net_pay") if disable_rounded_total else 0) diff --git a/erpnext/public/js/controllers/transaction.js b/erpnext/public/js/controllers/transaction.js index 62b8155b143..fa1b6df5571 100644 --- a/erpnext/public/js/controllers/transaction.js +++ b/erpnext/public/js/controllers/transaction.js @@ -160,8 +160,9 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({ } if(frappe.meta.get_docfield(this.frm.doc.doctype, "pricing_rules")) { - this.frm.set_indicator_formatter('pricing_rule', - function(doc) { return (doc.rule_applied) ? "green" : "red" }); + this.frm.set_indicator_formatter('pricing_rule', function(doc) { + return (doc.rule_applied) ? "green" : "red"; + }); } }, onload: function() {