Merge pull request #1210 from frappe/version-15-hotfix

chore: release v15
frappe · Dec 27, 2023 · 7650f58 · 7650f58
2 parents 1b93613 + 12e5e66
commit 7650f58
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/hrms/payroll/doctype/payroll_entry/payroll_entry.py b/hrms/payroll/doctype/payroll_entry/payroll_entry.py
@@ -680,7 +680,7 @@ def set_payable_amount_against_payroll_payable_account(
 			}
 			"""
 			for employee, employee_details in self.employee_based_payroll_payable_entries.items():
-				payable_amount = employee_details.get("earnings") - (employee_details.get("deductions") or 0)
+				payable_amount = employee_details.get("earnings", 0) - employee_details.get("deductions", 0)
 
 				payable_amount = self.get_accounting_entries_and_payable_amount(
 					payroll_payable_account,
@@ -926,8 +926,8 @@ def set_accounting_entries_for_bank_entry(self, je_payment_amount, user_remark):
 
 		if self.employee_based_payroll_payable_entries:
 			for employee, employee_details in self.employee_based_payroll_payable_entries.items():
-				je_payment_amount = employee_details.get("earnings") - (
-					employee_details.get("deductions") or 0
+				je_payment_amount = employee_details.get("earnings", 0) - (
+					employee_details.get("deductions", 0)
 				)
 				exchange_rate, amount = self.get_amount_and_exchange_rate_for_journal_entry(
 					self.payment_account, je_payment_amount, company_currency, currencies

diff --git a/hrms/payroll/doctype/retention_bonus/retention_bonus.py b/hrms/payroll/doctype/retention_bonus/retention_bonus.py
@@ -43,14 +43,14 @@ def on_submit(self):
 	def on_cancel(self):
 
 		additional_salary = self.get_additional_salary()
-		if self.additional_salary:
+		if additional_salary:
 			bonus_removed = (
-				frappe.db.get_value("Additional Salary", self.additional_salary, "amount") - self.bonus_amount
+				frappe.db.get_value("Additional Salary", additional_salary, "amount") - self.bonus_amount
 			)
 			if bonus_removed == 0:
-				frappe.get_doc("Additional Salary", self.additional_salary).cancel()
+				frappe.get_doc("Additional Salary", additional_salary).cancel()
 			else:
-				frappe.db.set_value("Additional Salary", self.additional_salary, "amount", bonus_removed)
+				frappe.db.set_value("Additional Salary", additional_salary, "amount", bonus_removed)
 
 			# self.db_set('additional_salary', '')