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

fix: create zero-dollar invoices fro trial subscriptions (#26441)

Browse Source
This commit is contained in:
Rohan
2021-08-25 20:11:05 +05:30
committed by GitHub
parent 81b28b8998
commit 87308465d8
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
erpnext/accounts/doctype/subscription/subscription.py
View File

@@ -367,21 +367,25 @@ class Subscription(Document):
) )
# Discounts # Discounts
if self.additional_discount_percentage: if self.is_trialling():
invoice.additional_discount_percentage = self.additional_discount_percentage invoice.additional_discount_percentage = 100
else:
if self.additional_discount_percentage:
invoice.additional_discount_percentage = self.additional_discount_percentage
if self.additional_discount_amount: if self.additional_discount_amount:
invoice.discount_amount = self.additional_discount_amount invoice.discount_amount = self.additional_discount_amount
if self.additional_discount_percentage or self.additional_discount_amount: if self.additional_discount_percentage or self.additional_discount_amount:
discount_on = self.apply_additional_discount discount_on = self.apply_additional_discount
invoice.apply_discount_on = discount_on if discount_on else 'Grand Total' invoice.apply_discount_on = discount_on if discount_on else 'Grand Total'
# Subscription period # Subscription period
invoice.from_date = self.current_invoice_start invoice.from_date = self.current_invoice_start
invoice.to_date = self.current_invoice_end invoice.to_date = self.current_invoice_end
invoice.flags.ignore_mandatory = True invoice.flags.ignore_mandatory = True
invoice.save() invoice.save()
if self.submit_invoice: if self.submit_invoice: