Fixed merge conflict

2018-04-04 11:40:16 +05:30
parent ecfc10e21c 821222653b
commit 2b682c82e8
18 changed files with 65 additions and 35 deletions
--- a/erpnext/public/js/controllers/transaction.js
+++ b/erpnext/public/js/controllers/transaction.js
@@ -106,7 +106,8 @@ erpnext.TransactionController = erpnext.taxes_and_totals.extend({
 		}

 		if(
-			this.frm.fields_dict["payment_terms_template"]
+			this.frm.docstatus < 2 
+			&& this.frm.fields_dict["payment_terms_template"]
 			&& this.frm.fields_dict["payment_schedule"]
 			&& this.frm.doc.payment_terms_template
 			&& !this.frm.doc.payment_schedule.length