Merge pull request #1756 from rmehta/develop

removed sms control and related cleanup, fixes frappe/erpnext#462

erpnext/accounts/doctype/sales_invoice/sales_invoice.js

@@ -11,7 +11,6 @@ cur_frm.pformat.print_heading = 'Invoice';
 
 {% include 'selling/sales_common.js' %};
 {% include 'accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js' %}
-{% include 'utilities/doctype/sms_control/sms_control.js' %}
 {% include 'accounts/doctype/sales_invoice/pos.js' %}
 
 frappe.provide("erpnext.accounts");
@@ -426,3 +425,9 @@ cur_frm.cscript.invoice_period_from_date = function(doc, dt, dn) {
 		}
 	}
 }
+
+cur_frm.cscript.send_sms = function() {
+	frappe.require("assets/erpnext/js/sms_manager.js");
+	var sms_man = new SMSManager(cur_frm.doc);
+}
+

erpnext/buying/doctype/purchase_order/purchase_order.js

@@ -9,7 +9,6 @@ cur_frm.cscript.other_fname = "other_charges";
 
 {% include 'buying/doctype/purchase_common/purchase_common.js' %};
 {% include 'accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js' %}
-{% include 'utilities/doctype/sms_control/sms_control.js' %}
 {% include 'accounts/doctype/sales_invoice/pos.js' %}
 
 erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend({
@@ -202,3 +201,9 @@ cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
 		cur_frm.email_doc(frappe.boot.notification_settings.purchase_order_message);
 	}
 }
+
+cur_frm.cscript.send_sms = function() {
+	frappe.require("assets/erpnext/js/sms_manager.js");
+	var sms_man = new SMSManager(cur_frm.doc);
+}
+

erpnext/patches.txt

@@ -46,3 +46,4 @@ execute:import frappe.defaults;frappe.defaults.clear_default("price_list_currenc
 erpnext.patches.v4_0.update_account_root_type
 execute:frappe.delete_doc("Report", "Purchase In Transit")
 erpnext.patches.v4_0.new_address_template
+execute:frappe.delete_doc("DocType", "SMS Control")

erpnext/public/js/sms_manager.js

@@ -0,0 +1,104 @@
+// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
+// License: GNU General Public License v3. See license.txt
+
+function SMSManager(doc) {
+	var me = this;
+	this.setup = function() {
+		var default_msg = {
+			'Lead'				: '',
+			'Opportunity'			: 'Your enquiry has been logged into the system. Ref No: ' + doc.name,
+			'Quotation'			: 'Quotation ' + doc.name + ' has been sent via email. Thanks!',
+			'Sales Order'		: 'Sales Order ' + doc.name + ' has been created against '
+						+ (doc.quotation_no ? ('Quote No:' + doc.quotation_no) : '')
+						+ (doc.po_no ? (' for your PO: ' + doc.po_no) : ''),
+			'Delivery Note'		: 'Items has been delivered against delivery note: ' + doc.name
+						+ (doc.po_no ? (' for your PO: ' + doc.po_no) : ''),
+			'Sales Invoice': 'Invoice ' + doc.name + ' has been sent via email '
+						+ (doc.po_no ? (' for your PO: ' + doc.po_no) : ''),
+			'Material Request'			: 'Material Request ' + doc.name + ' has been raised in the system',
+			'Purchase Order'	: 'Purchase Order ' + doc.name + ' has been sent via email',
+			'Purchase Receipt'	: 'Items has been received against purchase receipt: ' + doc.name
+		}
+
+		if (in_list(['Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice'], doc.doctype))
+			this.show(doc.contact_person, 'customer', doc.customer, '', default_msg[doc.doctype]);
+		else if (in_list(['Purchase Order', 'Purchase Receipt'], doc.doctype))
+			this.show(doc.contact_person, 'supplier', doc.supplier, '', default_msg[doc.doctype]);
+		else if (doc.doctype == 'Lead')
+			this.show('', '', '', doc.mobile_no, default_msg[doc.doctype]);
+		else if (doc.doctype == 'Opportunity')
+			this.show('', '', '', doc.contact_no, default_msg[doc.doctype]);
+		else if (doc.doctype == 'Material Request')
+			this.show('', '', '', '', default_msg[doc.doctype]);
+
+	};
+
+	this.get_contact_number = function(contact, key, value) {
+		frappe.call({
+			method: "erpnext.setup.doctype.sms_settings.sms_settings.get_contact_number",
+			args: {
+				contact_name:contact,
+				value:value,
+				key:key
+			},
+			callback: function(r) {
+				if(r.exc) { msgprint(r.exc); return; }
+				me.number = r.message;
+				me.show_dialog();
+			}
+		});
+	};
+
+	this.show = function(contact, key, value, mobile_nos, message) {
+		this.message = message;
+		if (mobile_nos) {
+			me.number = mobile_nos;
+			me.show_dialog();
+		} else if (contact){
+			this.get_contact_number(contact, key, value)
+		} else {
+			me.show_dialog();
+		}
+	}
+	this.show_dialog = function() {
+		if(!me.dialog)
+			me.make_dialog();
+		me.dialog.set_values({
+			'message': me.message,
+			'number': me.number
+		})
+		me.dialog.show();
+	}
+	this.make_dialog = function() {
+		var d = new frappe.ui.Dialog({
+			title: 'Send SMS',
+			width: 400,
+			fields: [
+				{fieldname:'number', fieldtype:'Data', label:'Mobile Number', reqd:1},
+				{fieldname:'message', fieldtype:'Text', label:'Message', reqd:1},
+				{fieldname:'send', fieldtype:'Button', label:'Send'}
+			]
+		})
+		d.fields_dict.send.input.onclick = function() {
+			var btn = d.fields_dict.send.input;
+			var v = me.dialog.get_values();
+			if(v) {
+				$(btn).set_working();
+				frappe.call({
+					method: "erpnext.setup.doctype.sms_settings.sms_settings.send_sms",
+					args: {
+						receiver_list: [v.number],
+						msg: v.message
+					},
+					callback: function(r) {
+						$(btn).done_working();
+						if(r.exc) {msgprint(r.exc); return; }
+						me.dialog.hide();
+					}
+				});
+			}
+		}
+		this.dialog = d;
+	}
+	this.setup();
+}

erpnext/public/js/transaction.js

@@ -42,7 +42,7 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
 			this.calculate_taxes_and_totals();
 		}
 		if(frappe.meta.get_docfield(this.tname, "item_code")) {
-			cur_frm.get_field(this.fname).grid.set_multiple_add("item_code");
+			cur_frm.get_field(this.fname).grid.set_multiple_add("item_code", "qty");
 		}
 	},
 

erpnext/selling/doctype/lead/lead.js

@@ -2,7 +2,6 @@
 // License: GNU General Public License v3. See license.txt
 
 {% include 'setup/doctype/contact_control/contact_control.js' %};
-{% include 'utilities/doctype/sms_control/sms_control.js' %}
 
 frappe.provide("erpnext");
 erpnext.LeadController = frappe.ui.form.Controller.extend({
@@ -90,3 +89,9 @@ erpnext.LeadController = frappe.ui.form.Controller.extend({
 });
 
 $.extend(cur_frm.cscript, new erpnext.LeadController({frm: cur_frm}));
+
+cur_frm.cscript.send_sms = function() {
+	frappe.require("assets/erpnext/js/sms_manager.js");
+	var sms_man = new SMSManager(cur_frm.doc);
+}
+

erpnext/selling/doctype/opportunity/opportunity.js

@@ -1,8 +1,6 @@
 // Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
 // License: GNU General Public License v3. See license.txt
 
-{% include 'utilities/doctype/sms_control/sms_control.js' %};
-
 frappe.ui.form.on_change("Opportunity", "customer", function(frm) {
 	erpnext.utils.get_party_details(frm) });
 frappe.ui.form.on_change("Opportunity", "customer_address", erpnext.utils.get_address_display);
@@ -145,3 +143,9 @@ cur_frm.cscript['Declare Opportunity Lost'] = function() {
 	});
 	dialog.show();
 }
+
+cur_frm.cscript.send_sms = function() {
+	frappe.require("assets/erpnext/js/sms_manager.js");
+	var sms_man = new SMSManager(cur_frm.doc);
+}
+

erpnext/selling/doctype/quotation/quotation.js

@@ -10,7 +10,6 @@ cur_frm.cscript.sales_team_fname = "sales_team";
 
 {% include 'selling/sales_common.js' %}
 {% include 'accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js' %}
-{% include 'utilities/doctype/sms_control/sms_control.js' %}
 {% include 'accounts/doctype/sales_invoice/pos.js' %}
 
 erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({
@@ -175,3 +174,9 @@ cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
 	if(cint(frappe.boot.notification_settings.quotation))
 		cur_frm.email_doc(frappe.boot.notification_settings.quotation_message);
 }
+
+cur_frm.cscript.send_sms = function() {
+	frappe.require("assets/erpnext/js/sms_manager.js");
+	var sms_man = new SMSManager(cur_frm.doc);
+}
+

erpnext/selling/doctype/sales_order/sales_order.js

@@ -10,7 +10,6 @@ cur_frm.cscript.sales_team_fname = "sales_team";
 
 {% include 'selling/sales_common.js' %}
 {% include 'accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js' %}
-{% include 'utilities/doctype/sms_control/sms_control.js' %}
 {% include 'accounts/doctype/sales_invoice/pos.js' %}
 
 erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend({
@@ -189,3 +188,8 @@ cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
 		cur_frm.email_doc(frappe.boot.notification_settings.sales_order_message);
 	}
 };
+
+cur_frm.cscript.send_sms = function() {
+	frappe.require("assets/erpnext/js/sms_manager.js");
+	var sms_man = new SMSManager(cur_frm.doc);
+};

erpnext/selling/doctype/sms_center/sms_center.py

@@ -9,6 +9,8 @@ from frappe import msgprint, _
 
 from frappe.model.document import Document
 
+from erpnext.setup.doctype.sms_settings.sms_settings import send_sms
+
 class SMSCenter(Document):
 
 	def create_receiver_list(self):
@@ -26,9 +28,9 @@ class SMSCenter(Document):
 				self.sales_partner.replace("'", "\'") or " and ifnull(sales_partner, '') != ''"
 
 		if self.send_to in ['All Contact', 'All Customer Contact', 'All Supplier Contact', 'All Sales Partner Contact']:
-			rec = frappe.db.sql("""select CONCAT(ifnull(first_name,''), '', ifnull(last_name,'')), 
+			rec = frappe.db.sql("""select CONCAT(ifnull(first_name,''), ' ', ifnull(last_name,'')),
 				mobile_no from `tabContact` where ifnull(mobile_no,'')!='' and
-				docstatus != 2 %s""", where_clause)
+				docstatus != 2 %s""" % where_clause)
 
 		elif self.send_to == 'All Lead (Open)':
 			rec = frappe.db.sql("""select lead_name, mobile_no from `tabLead` where
@@ -42,12 +44,13 @@ class SMSCenter(Document):
 
 			rec = frappe.db.sql("""select employee_name, cell_number from
 				`tabEmployee` where status = 'Active' and docstatus < 2 and
-				ifnull(cell_number,'')!='' %s""", where_clause)
+				ifnull(cell_number,'')!='' %s""" % where_clause)
 
 		elif self.send_to == 'All Sales Person':
 			rec = frappe.db.sql("""select sales_person_name, mobile_no from
 				`tabSales Person` where docstatus!=2 and ifnull(mobile_no,'')!=''""")
-			rec_list = ''
+
+		rec_list = ''
 
 		for d in rec:
 			rec_list += d[0] + ' - ' + d[1] + '\n'
@@ -73,4 +76,5 @@ class SMSCenter(Document):
 		else:
 			receiver_list = self.get_receiver_nos()
 		if receiver_list:
-			msgprint(frappe.get_doc('SMS Control', 'SMS Control').send_sms(receiver_list, cstr(self.message)))
+			send_sms(receiver_list, cstr(self.message))
+

erpnext/selling/sales_common.js

@@ -22,7 +22,7 @@ erpnext.selling.SellingController = erpnext.TransactionController.extend({
 	},
 
 	onload_post_render: function() {
-		cur_frm.get_field(this.fname).grid.set_multiple_add("item_code");
+		cur_frm.get_field(this.fname).grid.set_multiple_add("item_code", "qty");
 	},
 
 	setup_queries: function() {

erpnext/setup/doctype/sms_settings/sms_settings.py

@@ -2,9 +2,111 @@
 # License: GNU General Public License v3. See license.txt
 
 from __future__ import unicode_literals
-import frappe
+import frappe, json
+
+from frappe import _, throw, msgprint
+from frappe.utils import cstr, nowdate
 
 from frappe.model.document import Document
 
 class SMSSettings(Document):
 	pass
+
+def validate_receiver_nos(receiver_list):
+	validated_receiver_list = []
+	for d in receiver_list:
+		# remove invalid character
+		invalid_char_list = [' ', '+', '-', '(', ')']
+		for x in invalid_char_list:
+			d = d.replace(x, '')
+
+		validated_receiver_list.append(d)
+
+	if not validated_receiver_list:
+		throw(_("Please enter valid mobile nos"))
+
+	return validated_receiver_list
+
+
+def get_sender_name():
+	"returns name as SMS sender"
+	sender_name = frappe.db.get_value('Global Defaults', None, 'sms_sender_name') or \
+		'ERPNXT'
+	if len(sender_name) > 6 and \
+			frappe.db.get_default("country") == "India":
+		throw("""As per TRAI rule, sender name must be exactly 6 characters.
+			Kindly change sender name in Setup --> Global Defaults.
+			Note: Hyphen, space, numeric digit, special characters are not allowed.""")
+	return sender_name
+
+@frappe.whitelist()
+def get_contact_number(contact_name, value, key):
+	"returns mobile number of the contact"
+	number = frappe.db.sql("""select mobile_no, phone from tabContact where name=%s and %s=%s""" %
+		('%s', key, '%s'), (contact_name, value))
+	return number and (number[0][0] or number[0][1]) or ''
+
+@frappe.whitelist()
+def send_sms(receiver_list, msg, sender_name = ''):
+	receiver_list = validate_receiver_nos(receiver_list)
+
+	arg = {
+		'receiver_list' : receiver_list,
+		'message'		: msg,
+		'sender_name'	: sender_name or get_sender_name()
+	}
+
+	if frappe.db.get_value('SMS Settings', None, 'sms_gateway_url'):
+		ret = send_via_gateway(arg)
+		msgprint(ret)
+	else:
+		msgprint(_("Please Update SMS Settings"))
+
+def send_via_gateway(arg):
+	ss = frappe.get_doc('SMS Settings', 'SMS Settings')
+	args = {ss.message_parameter : arg.get('message')}
+	for d in ss.get("static_parameter_details"):
+		args[d.parameter] = d.value
+
+	resp = []
+	for d in arg.get('receiver_list'):
+		args[ss.receiver_parameter] = d
+		resp.append(send_request(ss.sms_gateway_url, args))
+
+	return resp
+
+# Send Request
+# =========================================================
+def send_request(gateway_url, args):
+	import httplib, urllib
+	server, api_url = scrub_gateway_url(gateway_url)
+	conn = httplib.HTTPConnection(server)  # open connection
+	headers = {}
+	headers['Accept'] = "text/plain, text/html, */*"
+	conn.request('GET', api_url + urllib.urlencode(args), headers = headers)    # send request
+	resp = conn.getresponse()     # get response
+	resp = resp.read()
+	return resp
+
+# Split gateway url to server and api url
+# =========================================================
+def scrub_gateway_url(url):
+	url = url.replace('http://', '').strip().split('/')
+	server = url.pop(0)
+	api_url = '/' + '/'.join(url)
+	if not api_url.endswith('?'):
+		api_url += '?'
+	return server, api_url
+
+
+# Create SMS Log
+# =========================================================
+def create_sms_log(arg, sent_sms):
+	sl = frappe.get_doc('SMS Log')
+	sl.sender_name = arg['sender_name']
+	sl.sent_on = nowdate()
+	sl.receiver_list = cstr(arg['receiver_list'])
+	sl.message = arg['message']
+	sl.no_of_requested_sms = len(arg['receiver_list'])
+	sl.no_of_sent_sms = sent_sms
+	sl.save()

erpnext/stock/doctype/delivery_note/delivery_note.js

@@ -9,7 +9,6 @@ cur_frm.cscript.sales_team_fname = "sales_team";
 
 {% include 'selling/sales_common.js' %};
 {% include 'accounts/doctype/sales_taxes_and_charges_master/sales_taxes_and_charges_master.js' %}
-{% include 'utilities/doctype/sms_control/sms_control.js' %}
 {% include 'accounts/doctype/sales_invoice/pos.js' %}
 
 frappe.provide("erpnext.stock");
@@ -245,3 +244,9 @@ if (sys_defaults.auto_accounting_for_stock) {
 		}
 	}
 }
+
+cur_frm.cscript.send_sms = function() {
+	frappe.require("assets/erpnext/js/sms_manager.js");
+	var sms_man = new SMSManager(cur_frm.doc);
+}
+

erpnext/stock/doctype/material_request/material_request.js

@@ -5,7 +5,6 @@ cur_frm.cscript.tname = "Material Request Item";
 cur_frm.cscript.fname = "indent_details";
 
 {% include 'buying/doctype/purchase_common/purchase_common.js' %};
-{% include 'utilities/doctype/sms_control/sms_control.js' %}
 
 erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.extend({
 	onload: function(doc) {
@@ -188,3 +187,8 @@ cur_frm.cscript['Unstop Material Request'] = function(){
 		});
 	}
 };
+
+cur_frm.cscript.send_sms = function() {
+	frappe.require("assets/erpnext/js/sms_manager.js");
+	var sms_man = new SMSManager(cur_frm.doc);
+}

erpnext/stock/doctype/purchase_receipt/purchase_receipt.js

@@ -7,7 +7,6 @@ cur_frm.cscript.other_fname = "other_charges";
 
 {% include 'buying/doctype/purchase_common/purchase_common.js' %};
 {% include 'accounts/doctype/purchase_taxes_and_charges_master/purchase_taxes_and_charges_master.js' %}
-{% include 'utilities/doctype/sms_control/sms_control.js' %}
 {% include 'accounts/doctype/sales_invoice/pos.js' %}
 
 frappe.provide("erpnext.stock");
@@ -165,3 +164,9 @@ cur_frm.cscript.on_submit = function(doc, cdt, cdn) {
 	if(cint(frappe.boot.notification_settings.purchase_receipt))
 		cur_frm.email_doc(frappe.boot.notification_settings.purchase_receipt_message);
 }
+
+cur_frm.cscript.send_sms = function() {
+	frappe.require("assets/erpnext/js/sms_manager.js");
+	var sms_man = new SMSManager(cur_frm.doc);
+}
+

erpnext/stock/doctype/stock_entry/stock_entry.js

@@ -56,7 +56,7 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
 	},
 
 	onload_post_render: function() {
-		cur_frm.get_field(this.fname).grid.set_multiple_add("item_code");
+		cur_frm.get_field(this.fname).grid.set_multiple_add("item_code", "qty");
 		this.set_default_account();
 	},
 

erpnext/utilities/doctype/sms_control/__init__.py

@@ -1 +0,0 @@
-from __future__ import unicode_literals

erpnext/utilities/doctype/sms_control/sms_control.js

@@ -1,94 +0,0 @@
-// Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-// License: GNU General Public License v3. See license.txt
-
-function SMSManager() {
-	var me = this;
-	this.get_contact_number = function(contact, key, value) {
-		return $c_obj('SMS Control', 'get_contact_number', {
-				contact_name:contact, 
-				value:value,
-				key:key
-			}, function(r,rt) {
-				if(r.exc) { msgprint(r.exc); return; }
-				me.number = r.message;
-				me.show_dialog();
-			}
-		);
-	}
-	this.show = function(contact, key, value, mobile_nos, message) {
-		this.message = message;
-		if (mobile_nos) {
-			me.number = mobile_nos;
-			me.show_dialog();
-		} else if (contact){
-			this.get_contact_number(contact, key, value)
-		} else {
-			me.show_dialog();
-		}
-	}
-	this.show_dialog = function() {
-		if(!me.dialog) 
-			me.make_dialog();
-		me.dialog.set_values({
-			'message': me.message,
-			'number': me.number
-		})
-		me.dialog.show();
-	}
-	this.make_dialog = function() {
-		var d = new frappe.ui.Dialog({
-			title: 'Send SMS',
-			width: 400,
-			fields: [
-				{fieldname:'number', fieldtype:'Data', label:'Mobile Number', reqd:1},
-				{fieldname:'message', fieldtype:'Text', label:'Message', reqd:1},
-				{fieldname:'send', fieldtype:'Button', label:'Send'}
-			]
-		})
-		d.fields_dict.send.input.onclick = function() {
-			var btn = d.fields_dict.send.input;
-			var v = me.dialog.get_values();
-			if(v) {
-				$(this).set_working();
-				return $c_obj('SMS Control', 'send_form_sms', v, function(r,rt) {
-					$(this).done_working();
-					if(r.exc) {msgprint(r.exc); return; }
-					msgprint(__('Message Sent'));
-					me.dialog.hide();
-				})
-			}
-		}
-		this.dialog = d;
-	}
-}
-
-cur_frm.cscript.send_sms = function(doc,dt,dn) {
-	var doc = cur_frm.doc;
-	var sms_man = new SMSManager();
-	var default_msg = {
-		'Lead'				: '',
-		'Opportunity'			: 'Your enquiry has been logged into the system. Ref No: ' + doc.name,
-		'Quotation'			: 'Quotation ' + doc.name + ' has been sent via email. Thanks!',
-		'Sales Order'		: 'Sales Order ' + doc.name + ' has been created against ' 
-					+ (doc.quotation_no ? ('Quote No:' + doc.quotation_no) : '')
-					+ (doc.po_no ? (' for your PO: ' + doc.po_no) : ''),
-		'Delivery Note'		: 'Items has been delivered against delivery note: ' + doc.name
-					+ (doc.po_no ? (' for your PO: ' + doc.po_no) : ''),		
-		'Sales Invoice': 'Invoice ' + doc.name + ' has been sent via email '
-					+ (doc.po_no ? (' for your PO: ' + doc.po_no) : ''),
-		'Material Request'			: 'Material Request ' + doc.name + ' has been raised in the system',
-		'Purchase Order'	: 'Purchase Order ' + doc.name + ' has been sent via email',
-		'Purchase Receipt'	: 'Items has been received against purchase receipt: ' + doc.name
-	}
-
-	if (in_list(['Quotation', 'Sales Order', 'Delivery Note', 'Sales Invoice'], doc.doctype))
-		sms_man.show(doc.contact_person, 'customer', doc.customer, '', default_msg[doc.doctype]);
-	else if (in_list(['Purchase Order', 'Purchase Receipt'], doc.doctype))
-		sms_man.show(doc.contact_person, 'supplier', doc.supplier, '', default_msg[doc.doctype]);
-	else if (doc.doctype == 'Lead')
-		sms_man.show('', '', '', doc.mobile_no, default_msg[doc.doctype]);
-	else if (doc.doctype == 'Opportunity')
-		sms_man.show('', '', '', doc.contact_no, default_msg[doc.doctype]);
-	else if (doc.doctype == 'Material Request')
-		sms_man.show('', '', '', '', default_msg[doc.doctype]);
-}

erpnext/utilities/doctype/sms_control/sms_control.json

@@ -1,29 +0,0 @@
-{
- "creation": "2013-01-10 16:34:32.000000", 
- "docstatus": 0, 
- "doctype": "DocType", 
- "icon": "icon-mobile-phone", 
- "idx": 1, 
- "in_create": 0, 
- "issingle": 1, 
- "modified": "2013-12-20 19:21:47.000000", 
- "modified_by": "Administrator", 
- "module": "Utilities", 
- "name": "SMS Control", 
- "owner": "Administrator", 
- "permissions": [
-  {
-   "create": 1, 
-   "email": 1, 
-   "export": 0, 
-   "import": 0, 
-   "permlevel": 0, 
-   "print": 1, 
-   "read": 1, 
-   "report": 0, 
-   "role": "System Manager", 
-   "submit": 0, 
-   "write": 1
-  }
- ]
-}

erpnext/utilities/doctype/sms_control/sms_control.py

@@ -1,114 +0,0 @@
-# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors
-# License: GNU General Public License v3. See license.txt
-
-from __future__ import unicode_literals
-import frappe, json
-
-from frappe.utils import nowdate, cstr
-from frappe import msgprint, throw, _
-
-
-from frappe.model.document import Document
-
-class SMSControl(Document):
-
-	def validate_receiver_nos(self,receiver_list):
-		validated_receiver_list = []
-		for d in receiver_list:
-			# remove invalid character
-			invalid_char_list = [' ', '+', '-', '(', ')']
-			for x in invalid_char_list:
-				d = d.replace(x, '')
-
-			validated_receiver_list.append(d)
-
-		if not validated_receiver_list:
-			throw(_("Please enter valid mobile nos"))
-
-		return validated_receiver_list
-
-
-	def get_sender_name(self):
-		"returns name as SMS sender"
-		sender_name = frappe.db.get_value('Global Defaults', None, 'sms_sender_name') or \
-			'ERPNXT'
-		if len(sender_name) > 6 and \
-				frappe.db.get_default("country") == "India":
-			throw("""As per TRAI rule, sender name must be exactly 6 characters.
-				Kindly change sender name in Setup --> Global Defaults.
-				Note: Hyphen, space, numeric digit, special characters are not allowed.""")
-		return sender_name
-
-	def get_contact_number(self, arg):
-		"returns mobile number of the contact"
-		args = json.loads(arg)
-		number = frappe.db.sql("""select mobile_no, phone from tabContact where name=%s and %s=%s""" %
-			('%s', args['key'], '%s'), (args['contact_name'], args['value']))
-		return number and (number[0][0] or number[0][1]) or ''
-
-	def send_form_sms(self, arg):
-		"called from client side"
-		args = json.loads(arg)
-		self.send_sms([cstr(args['number'])], cstr(args['message']))
-
-	def send_sms(self, receiver_list, msg, sender_name = ''):
-		receiver_list = self.validate_receiver_nos(receiver_list)
-
-		arg = {
-			'receiver_list' : receiver_list,
-			'message'		: msg,
-			'sender_name'	: sender_name or self.get_sender_name()
-		}
-
-		if frappe.db.get_value('SMS Settings', None, 'sms_gateway_url'):
-			ret = self.send_via_gateway(arg)
-			msgprint(ret)
-
-	def send_via_gateway(self, arg):
-		ss = frappe.get_doc('SMS Settings', 'SMS Settings')
-		args = {ss.message_parameter : arg.get('message')}
-		for d in ss.get("static_parameter_details"):
-			args[d.parameter] = d.value
-
-		resp = []
-		for d in arg.get('receiver_list'):
-			args[ss.receiver_parameter] = d
-			resp.append(self.send_request(ss.sms_gateway_url, args))
-
-		return resp
-
-	# Send Request
-	# =========================================================
-	def send_request(self, gateway_url, args):
-		import httplib, urllib
-		server, api_url = self.scrub_gateway_url(gateway_url)
-		conn = httplib.HTTPConnection(server)  # open connection
-		headers = {}
-		headers['Accept'] = "text/plain, text/html, */*"
-		conn.request('GET', api_url + urllib.urlencode(args), headers = headers)    # send request
-		resp = conn.getresponse()     # get response
-		resp = resp.read()
-		return resp
-
-	# Split gateway url to server and api url
-	# =========================================================
-	def scrub_gateway_url(self, url):
-		url = url.replace('http://', '').strip().split('/')
-		server = url.pop(0)
-		api_url = '/' + '/'.join(url)
-		if not api_url.endswith('?'):
-			api_url += '?'
-		return server, api_url
-
-
-	# Create SMS Log
-	# =========================================================
-	def create_sms_log(self, arg, sent_sms):
-		sl = frappe.get_doc('SMS Log')
-		sl.sender_name = arg['sender_name']
-		sl.sent_on = nowdate()
-		sl.receiver_list = cstr(arg['receiver_list'])
-		sl.message = arg['message']
-		sl.no_of_requested_sms = len(arg['receiver_list'])
-		sl.no_of_sent_sms = sent_sms
-		sl.save()