Merge branch 'develop' into bug_invoice_creation_throws_typeerror
diff --git a/erpnext/controllers/accounts_controller.py b/erpnext/controllers/accounts_controller.py
index bab16a4..8be88b8 100644
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -1318,6 +1318,9 @@
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):