nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-04 14:08:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

tiny refactor of invoice setting logic

Browse Source
This commit is contained in:
tundebabzy
2018-03-01 17:15:46 +01:00
parent 9df4f0bd43
commit 16afa8765e
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/accounts/doctype/subscriptions/subscriptions.py
View File

@@ -267,17 +267,16 @@ class Subscriptions(Document):
) )
# Discounts # 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: if self.additional_discount_percentage:
invoice.additional_discount_percentage = self.additional_discount_percentage invoice.additional_discount_percentage = self.additional_discount_percentage
if self.additional_discount_amount: if self.additional_discount_amount:
invoice.additional_discount_amount = 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.save()
invoice.submit() invoice.submit()