Merge pull request #485 from frappe/version-14-hotfix

Author: ruchamahabal

hrms/__init__.py

@@ -1 +1 @@
-__version__ = "14.2.3"
+__version__ = "14.2.4"

hrms/hr/doctype/shift_request/shift_request.py

@@ -50,8 +50,8 @@ def on_submit(self):
 			)
 
 	def on_cancel(self):
-		shift_assignment_list = frappe.get_list(
-			"Shift Assignment", {"employee": self.employee, "shift_request": self.name}
+		shift_assignment_list = frappe.db.get_all(
+			"Shift Assignment", {"employee": self.employee, "shift_request": self.name, "docstatus": 1}
 		)
 		if shift_assignment_list:
 			for shift in shift_assignment_list:

hrms/hr/doctype/shift_request/test_shift_request.py

@@ -48,6 +48,7 @@ def test_make_shift_request(self):
 			"Shift Assignment", filters={"shift_request": shift_request.name}, fieldname="docstatus"
 		)
 		self.assertEqual(shift_assignment_docstatus, 2)
+		self.assertEqual(shift_request.docstatus, 2)
 
 	def test_shift_request_approver_perms(self):
 		setup_shift_type(shift_type="Day Shift")

hrms/payroll/doctype/income_tax_slab/income_tax_slab.json

@@ -68,7 +68,6 @@
    "label": "Disabled"
   },
   {
-   "depends_on": "allow_tax_exemption",
    "fieldname": "standard_tax_exemption_amount",
    "fieldtype": "Currency",
    "label": "Standard Tax Exemption Amount",
@@ -109,7 +108,7 @@
  ],
  "is_submittable": 1,
  "links": [],
- "modified": "2022-11-09 16:08:47.654119",
+ "modified": "2023-04-30 15:01:22.706198",
  "modified_by": "Administrator",
  "module": "Payroll",
  "name": "Income Tax Slab",

hrms/payroll/doctype/salary_slip/salary_slip.py

@@ -746,6 +746,7 @@ def compute_income_tax_breakup(self):
 
 		self.standard_tax_exemption_amount = 0
 		self.tax_exemption_declaration = 0
+		self.deductions_before_tax_calculation = 0
 
 		self.non_taxable_earnings = self.compute_non_taxable_earnings()
 
@@ -755,12 +756,12 @@ def compute_income_tax_breakup(self):
 
 		self.total_earnings = self.ctc + self.income_from_other_sources
 
-		self.deductions_before_tax_calculation = self.compute_annual_deductions_before_tax_calculation()
-
 		if hasattr(self, "tax_slab"):
-			self.standard_tax_exemption_amount = (
-				self.tax_slab.standard_tax_exemption_amount if self.tax_slab.allow_tax_exemption else 0.0
-			)
+			if self.tax_slab.allow_tax_exemption:
+				self.standard_tax_exemption_amount = self.tax_slab.standard_tax_exemption_amount
+				self.deductions_before_tax_calculation = (
+					self.compute_annual_deductions_before_tax_calculation()
+				)
 
 			self.tax_exemption_declaration = (
 				self.get_total_exemption_amount() - self.standard_tax_exemption_amount
@@ -1597,6 +1598,7 @@ def get_total_exemption_amount(self):
 				if declaration:
 					total_exemption_amount = declaration
 
+		if self.tax_slab.standard_tax_exemption_amount:
 			total_exemption_amount += flt(self.tax_slab.standard_tax_exemption_amount)
 
 		return total_exemption_amount