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

2026-05-27 00:44:45 +00:00 · 2021-11-16 16:06:07 +05:30
parent fd6f3c6b88 952fc87c99
commit f9929ed8a6
2194 changed files with 4243 additions and 11241 deletions
--- a/erpnext/templates/includes/salary_slip_log.html
+++ b/erpnext/templates/includes/salary_slip_log.html
@@ -10,7 +10,7 @@
 	<tbody>
 		{% for ss_dict in ss_list %}
 			<tr>
-			{% for key, value in ss_dict.iteritems()|sort %}
+			{% for key, value in ss_dict.items()|sort %}
 				<td {% if key == "Total Pay"%} align = "right" {% endif %}> {{value}} </td>
 			{% endfor %}
 			</tr>