From e45868a3c69cc5ea918b67a5022c07897734d5a1 Mon Sep 17 00:00:00 2001 From: Shreya Shah Date: Tue, 16 Oct 2018 14:34:56 +0530 Subject: [PATCH] fix(discount-amount): Print hide discount_amount if print without amount (#15705) --- erpnext/stock/doctype/delivery_note/delivery_note.js | 3 +++ erpnext/stock/doctype/delivery_note/delivery_note.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.js b/erpnext/stock/doctype/delivery_note/delivery_note.js index 75e7590d82..daa8318fda 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.js +++ b/erpnext/stock/doctype/delivery_note/delivery_note.js @@ -279,6 +279,7 @@ erpnext.stock.delivery_note.set_print_hide = function(doc, cdt, cdn){ dn_item_fields['discount_percentage'].print_hide = 1; dn_item_fields['price_list_rate'].print_hide = 1; dn_item_fields['amount'].print_hide = 1; + dn_item_fields['discount_amount'].print_hide = 1; dn_fields['taxes'].print_hide = 1; } else { if (dn_fields_copy['currency'].print_hide != 1) @@ -287,6 +288,8 @@ erpnext.stock.delivery_note.set_print_hide = function(doc, cdt, cdn){ dn_item_fields['rate'].print_hide = 0; if (dn_item_fields_copy['amount'].print_hide != 1) dn_item_fields['amount'].print_hide = 0; + if (dn_item_fields_copy['discount_amount'].print_hide != 1) + dn_item_fields['discount_amount'].print_hide = 0 if (dn_fields_copy['taxes'].print_hide != 1) dn_fields['taxes'].print_hide = 0; } diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.py b/erpnext/stock/doctype/delivery_note/delivery_note.py index 6fec6121c8..ab624d17db 100644 --- a/erpnext/stock/doctype/delivery_note/delivery_note.py +++ b/erpnext/stock/doctype/delivery_note/delivery_note.py @@ -74,7 +74,7 @@ class DeliveryNote(SellingController): item_meta = frappe.get_meta("Delivery Note Item") print_hide_fields = { "parent": ["grand_total", "rounded_total", "in_words", "currency", "total", "taxes"], - "items": ["rate", "amount", "price_list_rate", "discount_percentage"] + "items": ["rate", "amount", "discount_amount", "price_list_rate", "discount_percentage"] } for key, fieldname in print_hide_fields.items():