Merge branch 'develop' into fix-ignore-pricing-rule

2022-02-08 15:29:28 +05:30
parent 4c3d751421 27ced4f082
commit 4f4395545e
6 changed files with 14 additions and 6 deletions
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -1326,6 +1326,9 @@ class AccountsController(TransactionBase):
 				payment_schedule['discount_type'] = schedule.discount_type
 				payment_schedule['discount'] = schedule.discount

+			if not schedule.invoice_portion:
+				payment_schedule['payment_amount'] = schedule.payment_amount
+
 			self.append("payment_schedule", payment_schedule)

 	def set_due_date(self):