From 16afa8765e41c2dd59bb2b07734f6cfc73cb7c4e Mon Sep 17 00:00:00 2001 From: tundebabzy Date: Thu, 1 Mar 2018 17:15:46 +0100 Subject: [PATCH] tiny refactor of invoice setting logic --- erpnext/accounts/doctype/subscriptions/subscriptions.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/erpnext/accounts/doctype/subscriptions/subscriptions.py b/erpnext/accounts/doctype/subscriptions/subscriptions.py index bbf2a69a2d..0a2eea3e3f 100644 --- a/erpnext/accounts/doctype/subscriptions/subscriptions.py +++ b/erpnext/accounts/doctype/subscriptions/subscriptions.py @@ -267,17 +267,16 @@ class Subscriptions(Document): ) # Discounts - if self.apply_additional_discount: - invoice.apply_discount_on = self.apply_additional_discount - else: - invoice.apply_discount_on = 'Grand Total' - if self.additional_discount_percentage: invoice.additional_discount_percentage = self.additional_discount_percentage if self.additional_discount_amount: invoice.additional_discount_amount = self.additional_discount_amount + if (self.additional_discount_percentage or self.additional_discount_amount) \ + and not self.apply_additional_discount: + self.apply_additional_discount = 'Grand Total' + invoice.save() invoice.submit()