Resolved merge conflicts

2018-07-06 13:18:44 +05:30
parent da486eeebd 0b9129e519
commit 1cfcf70905
30 changed files with 237 additions and 110 deletions
--- a/erpnext/controllers/accounts_controller.py
+++ b/erpnext/controllers/accounts_controller.py
@@ -154,6 +154,8 @@ class AccountsController(TransactionBase):
 					self.meta.get_label(date_field), self)

 	def validate_due_date(self):
+		if self.get('is_pos'): return
+
 		from erpnext.accounts.party import validate_due_date
 		if self.doctype == "Sales Invoice":
 			if not self.due_date: