Merge branch 'version-13-hotfix' of https://github.com/frappe/erpnext into e-commerce-refactor

erpnext/www/all-products/index.html

@@ -66,4 +66,4 @@
 	});
 </script>
 
-{% endblock %}
+{% endblock %}

erpnext/www/all-products/not_found.html

@@ -1 +1 @@
-<div class="d-flex justify-content-center p-3 text-muted">{{ _('No products found') }}</div>
+<div class="d-flex justify-content-center p-3 text-muted">{{ _('No products found') }}</div>

erpnext/www/book_appointment/index.css

@@ -12,7 +12,7 @@
 @media (max-width: 768px) {
     #submit-button-area {
         display: grid;
-        grid-template-areas: 
+        grid-template-areas:
         "submit"
         "back";
     }

erpnext/www/book_appointment/index.html

@@ -63,4 +63,4 @@
 </div>
 </div>
 
-{% endblock %}
+{% endblock %}

erpnext/www/book_appointment/index.py

@@ -148,4 +148,4 @@ def _deltatime_to_datetime(date, deltatime):
 
 def _datetime_to_deltatime(date_time):
 	midnight = datetime.datetime.combine(date_time.date(), datetime.time.min)
-	return (date_time-midnight)
+	return (date_time-midnight)

erpnext/www/book_appointment/verify/index.html

@@ -3,7 +3,7 @@
 {% block title %}
 {{ _("Verify Email") }}
 {% endblock%}
-    
+
 {% block page_content %}
 
     {% if success==True %}
@@ -15,4 +15,4 @@
             Verification failed please check the link
         </div>
     {% endif %}
-{% endblock%}
+{% endblock%}

erpnext/www/book_appointment/verify/index.py

@@ -17,4 +17,4 @@ def get_context(context):
 		return context
 	else:
 		context.success = False
-		return context
+		return context

erpnext/www/lms/content.py

@@ -65,4 +65,4 @@ def allowed_content_access(program, content, content_type):
 			and `tabTopic Content`.parent = `tabCourse Topic`.topic
 			and `tabProgram Course`.parent = %(program)s""", {'program': program})
 
-	return (content, content_type) in contents_of_program
+	return (content, content_type) in contents_of_program

erpnext/www/lms/course.html

@@ -103,4 +103,4 @@
 		</div>
 	</div>
 </section>
-{% endblock %}
+{% endblock %}

erpnext/www/lms/index.py

@@ -13,4 +13,4 @@ def get_context(context):
 
 
 def get_featured_programs():
-	return utils.get_portal_programs() or []
+	return utils.get_portal_programs() or []

erpnext/www/lms/macros/card.html

@@ -31,4 +31,4 @@
 	<div class="h-100 d-none d-sm-block" style="border: 1px solid rgba(209,216,221,0.5);border-radius: 0.25rem;background-color: rgb(250, 251, 252);">
 	</div>
 </div>
-{% endmacro %}
+{% endmacro %}

erpnext/www/lms/macros/hero.html

@@ -52,4 +52,4 @@
 	}
 </script>
 {% endblock %}
-{% endmacro %}
+{% endmacro %}

erpnext/www/lms/profile.py

@@ -23,4 +23,4 @@ def get_program_progress(student):
 		completion = utils.get_program_completion(program)
 		student_progress.append({'program': program.program_name, 'name': program.name, 'progress':progress, 'completion': completion})
 
-	return student_progress
+	return student_progress

erpnext/www/lms/program.html

@@ -84,4 +84,4 @@
 		</div>
 	</div>
 </section>
-{% endblock %}
+{% endblock %}

erpnext/www/lms/program.py

@@ -26,4 +26,4 @@ def get_program(program_name):
 
 def get_course_progress(courses, program):
 	progress = {course.name: utils.get_course_progress(course, program) for course in courses}
-	return progress or {}
+	return progress or {}

erpnext/www/lms/topic.html

@@ -55,4 +55,4 @@
 		</div>
 	</div>
 </section>
-{% endblock %}
+{% endblock %}

erpnext/www/lms/topic.py

@@ -42,4 +42,4 @@ def get_contents(topic, course, program):
 					result = None
 				progress.append({'content': content, 'content_type': content.doctype, 'completed': status, 'score': score, 'result': result})
 
-	return progress
+	return progress

erpnext/www/support/index.html

@@ -96,6 +96,6 @@
 	.search-container {
 		margin-top: 1.2rem;
 		max-width: 500px;
-	}	
+	}
 </style>
 {%- endblock -%}

erpnext/www/support/index.py

@@ -8,7 +8,7 @@ def get_context(context):
 
 	context.greeting_title = setting.greeting_title
 	context.greeting_subtitle = setting.greeting_subtitle
-	
+
 	# Support content
 	favorite_articles = get_favorite_articles_by_page_view()
 	if len(favorite_articles) < 6:
@@ -16,15 +16,15 @@ def get_context(context):
 		if favorite_articles:
 			for article in favorite_articles:
 				name_list.append(article.name)
-		for record in (frappe.get_all("Help Article", 
-			fields=["title", "content", "route", "category"], 
-			filters={"name": ['not in', tuple(name_list)], "published": 1}, 
+		for record in (frappe.get_all("Help Article",
+			fields=["title", "content", "route", "category"],
+			filters={"name": ['not in', tuple(name_list)], "published": 1},
 			order_by="creation desc", limit=(6-len(favorite_articles)))):
 			favorite_articles.append(record)
-		
+
 	context.favorite_article_list = get_favorite_articles(favorite_articles)
 	context.help_article_list = get_help_article_list()
-	
+
 def get_favorite_articles_by_page_view():
 	return frappe.db.sql(
 			"""
@@ -34,13 +34,13 @@ def get_favorite_articles_by_page_view():
 				t1.content as content,
 				t1.route as route,
 				t1.category as category,
-				count(t1.route) as count 
-			FROM `tabHelp Article` AS t1 
+				count(t1.route) as count
+			FROM `tabHelp Article` AS t1
 				INNER JOIN
-				`tabWeb Page View` AS t2 
-			ON t1.route = t2.path 
+				`tabWeb Page View` AS t2
+			ON t1.route = t2.path
 			WHERE t1.published = 1
-			GROUP BY route 
+			GROUP BY route
 			ORDER BY count DESC
 			LIMIT 6;
 			""", as_dict=True)
@@ -71,4 +71,4 @@ def get_help_article_list():
 				'articles': help_articles,
 			}
 			help_article_list.append(help_aricles_per_caetgory)
-	return help_article_list
+	return help_article_list