Merge pull request #6427 from KanchanChauhan/salary-slip-indentation

[Fix] Indentation fixed

erpnext/hr/doctype/salary_slip/salary_slip.py

@@ -79,15 +79,13 @@ class SalarySlip(TransactionBase):
 			if d.condition:
 				if not eval(d.condition, None, data):
 					return None	
-	
 			amount = d.amount
 			if d.amount_based_on_formula:
 				if d.formula:
 					amount = eval(d.formula, None, data)
-	
 				data[d.abbr] = amount
-
 			return amount
+			
 		except NameError as err:
 		    frappe.throw(_("Name error: {0}".format(err)))
 		except SyntaxError as err: