contact, address list views and allow their deletion from customer / supplier form

erpnext/setup/doctype/contact_control/contact_control.js

@@ -77,3 +77,140 @@ if(cur_frm.fields_dict['territory']){
 		return 'SELECT `tabTerritory`.`name`,`tabTerritory`.`parent_territory` FROM `tabTerritory` WHERE `tabTerritory`.`is_group` = "No" AND `tabTerritory`.`docstatus`!= 2 AND `tabTerritory`.%(key)s LIKE "%s"  ORDER BY  `tabTerritory`.`name` ASC LIMIT 50';
 	}
 }
+
+cur_frm.cscript.render_contact_row = function(wrapper, data) {
+	// prepare data
+	data.fullname = (data.first_name || '') 
+		+ (data.last_name ? ' ' + data.last_name : '');
+	data.primary = data.is_primary_contact ? ' [Primary]' : '';
+	
+	// prepare description
+	var description = [];
+	$.each([
+		['phone', 'Tel'],
+		['mobile_no', 'Mobile'],
+		['email_id', 'Email'],
+		['department', 'Department'],
+		['designation', 'Designation']],
+		function(i, v) {
+			if(v[0] && data[v[0]]) {
+				description.push(repl('<h6>%(label)s:</h6> %(value)s', {
+					label: v[1],
+					value: data[v[0]],
+				}));
+			}
+		});
+	data.description = description.join('<br />');
+	
+	cur_frm.cscript.render_row_in_wrapper(wrapper, data, 'Contact');
+}
+
+cur_frm.cscript.render_address_row = function(wrapper, data) {
+	// prepare data
+	data.fullname = data.address_type;
+	data.primary = '';
+	if (data.is_primary_address) data.primary += ' [Primary]';
+	if (data.is_shipping_address) data.primary += ' [Shipping]';
+	
+	// prepare address
+	var address = [];
+	$.each(['address_line1', 'address_line2', 'city', 'state', 'country', 'pincode'],
+		function(i, v) {
+			if(data[v]) address.push(data[v]);
+		});
+	
+	data.address = address.join('<br />');
+	data.address = "<p class='address-list'>" + data.address + "</p>";
+	
+	// prepare description
+	var description = [];
+	$.each([
+		['address', 'Address'],
+		['phone', 'Tel'],
+		['fax', 'Fax'],
+		['email_id', 'Email']],
+		function(i, v) {
+			if(data[v[0]]) {
+				description.push(repl('<h6>%(label)s:</h6> %(value)s', {
+					label: v[1],
+					value: data[v[0]],
+				}));
+			}
+		});
+	data.description = description.join('<br />');
+	
+	cur_frm.cscript.render_row_in_wrapper(wrapper, data, 'Address');
+	
+	$(wrapper).find('p.address-list').css({
+		'padding-left': '10px',
+		'margin-bottom': '-10px'
+	});
+}
+
+cur_frm.cscript.render_row_in_wrapper = function(wrapper, data, doctype) {
+	// render
+	var $wrapper = $(wrapper);
+	
+	data.doctype = doctype.toLowerCase();
+	
+	$wrapper.append(repl("\
+		<h4><a class='link_type'>%(fullname)s</a>%(primary)s</h4>\
+		<div class='description'>\
+			%(description)s\
+			<p><a class='delete link_type'>delete this %(doctype)s</a></p>\
+		</div>", data));
+	
+	// make link
+	$wrapper.find('h4 a.link_type').click(function() {
+		loaddoc(doctype, data.name);
+	});
+	
+	// css
+	$wrapper.css({ 'padding': '5px 0px' });
+	$wrapper.find('div.description').css({
+		'padding': '5px 2px',
+		'line-height': '150%',
+	});
+	$wrapper.find('h6').css({ 'display': 'inline-block' });
+	
+	// show delete
+	var $delete_doc = $wrapper.find('a.delete');
+	if (wn.model.can_delete(doctype)) {
+		$delete_doc.toggle(true);
+	} else {
+		$delete_doc.toggle(false);
+	}
+	$delete_doc.css({
+		'padding-left': '0px'
+	});
+
+	$delete_doc.click(function() {
+		cur_frm.cscript.delete_doc(doctype, data.name);
+		return false;
+	});
+}
+
+cur_frm.cscript.delete_doc = function(doctype, name) {
+	// confirm deletion
+	var go_ahead = confirm(repl('Delete %(doctype)s "%(name)s"', {
+		doctype: doctype,
+		name: name
+	}));
+	if (!go_ahead) return;
+
+	wn.call({
+		method: 'webnotes.model.delete_doc',
+		args: {
+			dt: doctype,
+			dn: name
+		},
+		callback: function(r) {
+			//console.log(r);
+			if (!r.exc) {
+				// run the correct list
+				var list_name = doctype.toLowerCase() + '_list';
+				cur_frm[list_name].run();
+			}
+		}
+	});
+}

erpnext/setup/doctype/permission_control/permission_control.py

@@ -43,10 +43,11 @@ class DocType:
 	# ----------------------------------------------------- 
 	def get_doctype_list(self):
 		ret = sql("""SELECT `name` FROM tabDocType 
-			WHERE ifnull(docstatus,0)=0 
+			WHERE ifnull(docstatus,0)=0
 			AND ifnull(istable,0)=0
 			AND ifnull(issingle,0)=0
-			AND `module` NOT IN ('System','Utilities','Setup Masters','Roles','Recycle Bin','Mapper','Application Internal','Development', 'Core')
+			AND (`module` NOT IN ('System','Utilities','Setup Masters','Roles','Recycle Bin','Mapper','Application Internal','Development', 'Core')
+			OR name IN ('Contact', 'Address'))
 			ORDER BY `name` ASC""")
 		
 		rl = [''] + [a[0] for a in sql("select name from tabRole where ifnull(docstatus,0)=0")]