fix: conflicts

school/patches/v0_0/add_progress_to_membership.py

@@ -0,0 +1,22 @@
+import frappe
+from frappe.utils import rounded
+
+def execute():
+    frappe.reload_doc("lms", "doctype", "lms_batch_membership")
+    memberships = frappe.get_all(
+                        "LMS Batch Membership",
+                        ["name", "course", "member"],
+                        order_by="course")
+
+    if len(memberships):
+        current_course = memberships[0].course
+        for membership in memberships:
+            if current_course != membership.course:
+                current_course = membership.course
+
+            course_details = frappe.get_doc("LMS Course", current_course)
+            progress = rounded(course_details.get_course_progress(membership.member))
+            frappe.db.set_value("LMS Batch Membership", membership.name, "progress", progress)
+
+    frappe.db.delete("Prepared Report", {"ref_report_doctype": "Course Progress Summary"})
+    frappe.db.set_value("Report", "Course Progress Summary", "prepared_report", 0)