diff --git a/erpnext/patches/v8_0/update_production_orders.py b/erpnext/patches/v8_0/update_production_orders.py
index 317aed5..06b8ce7 100644
--- a/erpnext/patches/v8_0/update_production_orders.py
+++ b/erpnext/patches/v8_0/update_production_orders.py
@@ -17,9 +17,11 @@
 		
 	pro_orders = frappe.get_all("Production Order", filters={"docstatus": ["!=", 2]}, fields=fields)
 	
+	count = 0
 	for p in pro_orders:
 		pro_order = frappe.get_doc("Production Order", p.name)
-		
+		count += 1
+
 		# set required items table
 		pro_order.set_required_items()
 		
@@ -39,6 +41,6 @@
 				pro_order.db_set("status", status)
 			elif pro_order.status == "Stopped":
 				pro_order.update_reserved_qty_for_production()
-			
-			
-			
\ No newline at end of file
+		
+		if count % 200 == 0:
+			frappe.db.commit()
\ No newline at end of file
diff --git a/erpnext/public/js/setup_wizard.js b/erpnext/public/js/setup_wizard.js
index 31bcfe7..43b45d9 100644
--- a/erpnext/public/js/setup_wizard.js
+++ b/erpnext/public/js/setup_wizard.js
@@ -183,7 +183,7 @@
 			slide.get_input("fy_start_date").on("change", function () {
 				var start_date = slide.form.fields_dict.fy_start_date.get_value();
 				var year_end_date =
-					frappe.datetime.add_days(frappe.datetime.add_months(frappe.datetime.user_to_obj(start_date), 12), -1);
+					frappe.datetime.add_days(frappe.datetime.add_months(start_date, 12), -1);
 				slide.form.fields_dict.fy_end_date.set_value(year_end_date);
 			});
 		}