Fixed version conflict

erpnext/patches/v7_1/rename_quality_inspection_field.py

@@ -0,0 +1,38 @@
+from __future__ import unicode_literals
+import frappe
+from frappe.model.utils.rename_field import *
+
+def execute():
+	for doctype in ("Purchase Receipt Item", "Delivery Note Item"):
+		frappe.reload_doctype(doctype)
+
+		table_columns = frappe.db.get_table_columns(doctype)
+		if "qa_no" in table_columns:
+			rename_field(doctype, "qa_no", "quality_inspection")
+
+	frappe.reload_doctype("Item")
+	rename_field("Item", "inspection_required", "inspection_required_before_purchase")
+
+	frappe.reload_doc('stock', 'doctype', 'quality_inspection')
+	frappe.db.sql("""
+		update
+			`tabQuality Inspection`
+		set
+			reference_type = 'Purchase Receipt', reference_name = purchase_receipt_no
+		where
+			ifnull(purchase_receipt_no, '') != '' and inspection_type = 'Incoming'
+	""")
+
+	frappe.db.sql("""
+		update
+			`tabQuality Inspection`
+		set
+			reference_type = 'Delivery Note', reference_name = delivery_note_no
+		where
+			ifnull(delivery_note_no, '') != '' and inspection_type = 'Outgoing'
+	""")
+
+	for old_fieldname in ["purchase_receipt_no", "delivery_note_no"]:
+		update_reports("Quality Inspection", old_fieldname, "reference_name")
+		update_users_report_view_settings("Quality Inspection", old_fieldname, "reference_name")
+		update_property_setters("Quality Inspection", old_fieldname, "reference_name")

erpnext/patches/v7_1/save_stock_settings.py

@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	stock_settings = frappe.get_doc('Stock Settings')
+	stock_settings.flags.ignore_mandatory = True
+	stock_settings.save()

erpnext/patches/v7_1/set_budget_against_as_cost_center.py

@@ -0,0 +1,10 @@
+import frappe
+
+def execute():
+	frappe.reload_doc("accounts", "doctype", "budget")
+	frappe.db.sql("""
+		update
+			`tabBudget`
+		set
+			budget_against = 'Cost Center'
+		""")

erpnext/patches/v7_1/set_currency_exchange_date.py

@@ -0,0 +1,9 @@
+import frappe
+
+def execute():
+	frappe.reload_doctype("Currency Exchange")
+	frappe.db.sql("""
+		update `tabCurrency Exchange` 
+		set `date` = '2010-01-01' 
+		where date is null or date = '' or date = '0000-00-00'
+	""")

erpnext/patches/v7_1/set_prefered_contact_email.py

@@ -2,6 +2,7 @@ from __future__ import unicode_literals
 import frappe
 
 def execute():
+	frappe.reload_doctype('User')
 	for d in frappe.get_all("Employee"):
 		employee = frappe.get_doc("Employee", d.name)
 		if employee.company_email:
@@ -13,5 +14,4 @@ def execute():
 		elif employee.user_id:
 			employee.prefered_contact_email = "User ID"
 			employee.prefered_email = employee.user_id
-		
-		employee.db_update()
+		employee.db_update()

erpnext/patches/v7_1/set_sales_person_status.py

@@ -0,0 +1,8 @@
+from __future__ import unicode_literals
+import frappe
+
+def execute():
+	frappe.reload_doc('setup','doctype','sales_person')
+	frappe.db.sql("""update `tabSales Person` set enabled=1 
+		where (employee is null or employee = '' 
+			or employee IN (select employee from tabEmployee where status != "Left"))""")

erpnext/patches/v7_1/update_bom_base_currency.py

@@ -0,0 +1,19 @@
+import frappe
+from erpnext import get_default_currency
+
+def execute():
+	frappe.reload_doc("manufacturing", "doctype", "bom")
+	frappe.reload_doc("manufacturing", "doctype", "bom_item")
+	frappe.reload_doc("manufacturing", "doctype", "bom_explosion_item")
+	frappe.reload_doc("manufacturing", "doctype", "bom_operation")
+	frappe.reload_doc("manufacturing", "doctype", "bom_scrap_item")
+
+	frappe.db.sql(""" update `tabBOM Operation` set base_hour_rate = hour_rate,
+		base_operating_cost = operating_cost """)
+
+	frappe.db.sql(""" update `tabBOM Item` set base_rate = rate, base_amount = amount """)
+	frappe.db.sql(""" update `tabBOM Scrap Item` set base_rate = rate, base_amount = amount """)
+
+	frappe.db.sql(""" update `tabBOM` set `tabBOM`.base_operating_cost = `tabBOM`.operating_cost, 
+		`tabBOM`.base_raw_material_cost = `tabBOM`.raw_material_cost,
+		`tabBOM`.currency = (select default_currency from `tabCompany` where name = `tabBOM`.company)""")