Fixed merge conflict

frappe/__init__.py

@@ -17,7 +17,7 @@ from faker import Faker
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
 
-__version__ = '10.1.28'
+__version__ = '10.1.29'
 __title__ = "Frappe Framework"
 
 local = Local()

frappe/desk/query_report.py

@@ -293,6 +293,7 @@ def has_match(row, linked_doctypes, doctype_match_filters, ref_doctype, if_owner
 					if dt=="User" and columns_dict[idx]==columns_dict.get("owner"):
 						continue
 
+					cell_value = None
 					if isinstance(row, dict):
 						cell_value = row.get(idx)
 					elif isinstance(row, list):

frappe/public/css/desk.css

@@ -570,6 +570,9 @@ li.user-progress .progress-bar {
   li.user-progress .progress-chart {
     width: 25px;
   }
+  li.user-progress {
+    display: none;
+  }
 }
 .msg-box {
   padding: 30px 15px;

frappe/utils/boilerplate.py

@@ -269,12 +269,11 @@ def get_data():
 
 setup_template = """# -*- coding: utf-8 -*-
 from setuptools import setup, find_packages
-try: # for pip >= 10
-	from pip._internal.req import parse_requirements
-except ImportError: # for pip <= 9.0.3
-	from pip.req import parse_requirements
 import re, ast
 
+with open('requirements.txt') as f:
+	install_requires = f.read().strip().split('\n')
+
 # get version from __version__ variable in {app_name}/__init__.py
 _version_re = re.compile(r'__version__\s+=\s+(.*)')
 
@@ -282,8 +281,6 @@ with open('{app_name}/__init__.py', 'rb') as f:
 	version = str(ast.literal_eval(_version_re.search(
 		f.read().decode('utf-8')).group(1)))
 
-requirements = parse_requirements("requirements.txt", session="")
-
 setup(
 	name='{app_name}',
 	version=version,
@@ -293,8 +290,7 @@ setup(
 	packages=find_packages(),
 	zip_safe=False,
 	include_package_data=True,
-	install_requires=[str(ir.req) for ir in requirements],
-	dependency_links=[str(ir._link) for ir in requirements if ir._link]
+	install_requires=install_requires
 )
 """
 

frappe/www/printview.html

@@ -22,6 +22,20 @@
 		{{ body }}
 	    </div>
 	</div>
+	<script>
+		document.addEventListener('DOMContentLoaded', () => {
+			const page_div = document.querySelector('.page-break');
+
+			page_div.style.display = 'flex';
+			page_div.style.flexDirection = 'column';
+
+			const footer_html = document.getElementById('footer-html');
+			footer_html.classList.add('hidden-pdf');
+			footer_html.classList.remove('visible-pdf');
+			footer_html.style.order = 1;
+			footer_html.style.marginTop = '20px';
+		});
+	</script>
 </body>
 {%- if comment -%}
 <!-- {{ comment }} -->