From 82d8a637ac151fddfc90f49ee8d730f44ec91d8e Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 16 Apr 2014 09:20:00 +0530 Subject: [PATCH] #1252 --- erpnext/controllers/selling_controller.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/erpnext/controllers/selling_controller.py b/erpnext/controllers/selling_controller.py index 14f5192951..bacc8ec92a 100644 --- a/erpnext/controllers/selling_controller.py +++ b/erpnext/controllers/selling_controller.py @@ -20,7 +20,10 @@ class SellingController(StockController): check_active_sales_items(self) def get_sender(self, comm): - return frappe.db.get_value('Sales Email Settings', None, 'email_id') + if frappe.db.get_value('Sales Email Settings', None, 'extract_emails'): + return frappe.db.get_value('Sales Email Settings', None, 'email_id') + else: + return frappe.session.user def set_missing_values(self, for_validate=False): super(SellingController, self).set_missing_values(for_validate)