a[resolved] merge-conflicts

2026-05-29 09:54:47 +00:00 · 2018-09-20 13:28:23 +05:30
parent 772dc6e82c 056ecdca6a
commit 75d90b9d8f
4 changed files with 10 additions and 6 deletions
--- a/erpnext/templates/print_formats/includes/taxes.html
+++ b/erpnext/templates/print_formats/includes/taxes.html
@@ -2,7 +2,7 @@
 	{%- if doc.discount_amount -%}
 		<div class="row">
 			<div class="col-xs-5 {%- if doc._align_labels_right %} text-right{%- endif -%}">
-				<label>{{ _("Discount Amount") }}</label></div>
+				<label>{{ _(doc.meta.get_label('discount_amount')) }}</label></div>
 			<div class="col-xs-7 text-right">
 				- {{ doc.get_formatted("discount_amount", doc) }}
 			</div>