Merge pull request #3996 from nabinhait/fix6

Check credit limit in Delivery Note / Sales Invoice, only if not created against Sales Order

erpnext/accounts/doctype/sales_invoice/sales_invoice.py

@@ -88,13 +88,13 @@ class SalesInvoice(SellingController):
 		self.update_status_updater_args()
 		self.update_prevdoc_status()
 
+		# this sequence because outstanding may get -ve
+		self.make_gl_entries()
+		
 		if not self.is_return:
 			self.update_billing_status_for_zero_amount_refdoc("Sales Order")
 			self.check_credit_limit()
 
-		# this sequence because outstanding may get -ve
-		self.make_gl_entries()
-
 		if not cint(self.is_pos) == 1 and not self.is_return:
 			self.update_against_document_in_jv()
 
@@ -162,6 +162,17 @@ class SalesInvoice(SellingController):
 			}
 		])
 		
+	def check_credit_limit(self):
+		from erpnext.selling.doctype.customer.customer import check_credit_limit
+		
+		validate_against_credit_limit = False
+		for d in self.get("items"):
+			if not (d.sales_order or d.delivery_note):
+				validate_against_credit_limit = True
+				break
+		if validate_against_credit_limit:
+			check_credit_limit(self.customer, self.company)
+
 	def set_missing_values(self, for_validate=False):
 		pos = self.set_pos_fields(for_validate)
 

erpnext/controllers/selling_controller.py

@@ -32,10 +32,6 @@ class SellingController(StockController):
 		self.validate_max_discount()
 		check_active_sales_items(self)
 
-	def check_credit_limit(self):
-		from erpnext.selling.doctype.customer.customer import check_credit_limit
-		check_credit_limit(self.customer, self.company)
-
 	def set_missing_values(self, for_validate=False):
 		super(SellingController, self).set_missing_values(for_validate)
 

erpnext/selling/doctype/sales_order/sales_order.py

@@ -176,6 +176,10 @@ class SalesOrder(SellingController):
 
 		frappe.db.set(self, 'status', 'Cancelled')
 		
+	def check_credit_limit(self):
+		from erpnext.selling.doctype.customer.customer import check_credit_limit
+		check_credit_limit(self.customer, self.company)
+
 	def check_nextdoc_docstatus(self):
 		# Checks Delivery Note
 		submit_dn = frappe.db.sql_list("""select t1.name from `tabDelivery Note` t1,`tabDelivery Note Item` t2

erpnext/stock/doctype/delivery_note/delivery_note.py

@@ -215,6 +215,17 @@ class DeliveryNote(SellingController):
 
 		self.make_gl_entries_on_cancel()
 		
+	def check_credit_limit(self):
+		from erpnext.selling.doctype.customer.customer import check_credit_limit
+		
+		validate_against_credit_limit = False
+		for d in self.get("items"):
+			if not (d.against_sales_order or d.against_sales_invoice):
+				validate_against_credit_limit = True
+				break
+		if validate_against_credit_limit:
+			check_credit_limit(self.customer, self.company)
+
 	def validate_packed_qty(self):
 		"""
 			Validate that if packed qty exists, it should be equal to qty