diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index 1bceff7..3ffa4dd 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -84,6 +84,7 @@
 			if d.amount_based_on_formula:
 				if d.formula:
 					amount = eval(d.formula, None, data)
+			if amount:		
 				data[d.abbr] = amount
 			return amount
 			
diff --git a/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.json b/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.json
index f880508..f6a994d 100644
--- a/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.json
+++ b/erpnext/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.json
@@ -5,12 +5,12 @@
  "doctype": "Report", 
  "idx": 1, 
  "is_standard": "Yes", 
- "modified": "2014-06-03 07:18:17.229116", 
+ "modified": "2016-12-01 09:18:17.229116", 
  "modified_by": "Administrator", 
  "module": "Projects", 
  "name": "Project wise Stock Tracking", 
  "owner": "Administrator", 
  "ref_doctype": "Project", 
  "report_name": "Project wise Stock Tracking ", 
- "report_type": "Report Builder"
-}
\ No newline at end of file
+ "report_type": "Script Report"
+}