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/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -667,7 +667,9 @@ class AccountsController(TransactionBase):
 			self.remove(item)

 	def set_payment_schedule(self):
-		if self.doctype == 'Sales Invoice' and self.is_pos: return
+		if self.doctype == 'Sales Invoice' and self.is_pos:
+			self.payment_terms_template = ''
+			return

 		posting_date = self.get("bill_date") or self.get("posting_date") or self.get("transaction_date")
 		date = self.get("due_date")