diff --git a/selling/doctype/installation_note/installation_note.js b/selling/doctype/installation_note/installation_note.js
index 4cbd67d..3f02c83 100644
--- a/selling/doctype/installation_note/installation_note.js
+++ b/selling/doctype/installation_note/installation_note.js
@@ -20,6 +20,67 @@
 wn.provide("erpnext.selling");
 // TODO commonify this code
 erpnext.selling.InstallationNote = wn.ui.form.Controller.extend({
+	onload: function() {
+		if(!this.frm.doc.status) set_multiple(dt,dn,{ status:'Draft'});
+		if(this.frm.doc.__islocal) set_multiple(this.frm.doc.doctype, this.frm.doc.name, 
+				{inst_date: get_today()});
+				
+		fields = ['customer_address', 'contact_person','customer_name', 'address_display', 
+			'contact_display', 'contact_mobile', 'contact_email', 'territory', 'customer_group']
+		if(this.frm.doc.customer) unhide_field(fields);
+		else hide_field(fields)
+		
+		this.setup_queries();
+	},
+	
+	setup_queries: function() {
+		var me = this;
+		
+		this.frm.set_query("customer_address", function() {
+			return {
+				filters: {'customer': me.frm.doc.customer }
+			}
+		});
+		
+		this.frm.set_query("contact_person", function() {
+			return {
+				filters: {'customer': me.frm.doc.customer }
+			}
+		});
+		
+		this.frm.set_query("territory", function() {
+			return {
+				filters: {'is_group': "No" }
+			}
+		});
+		
+		this.frm.set_query("customer", function() {
+			return {
+				query: "controllers.queries.customer_query"
+			}
+		});
+	},
+	
+	refresh: function() {
+		if (this.frm.doc.docstatus===0) {
+			cur_frm.add_custom_button(wn._('From Delivery Note'), 
+				function() {
+					wn.model.map_current_doc({
+						method: "stock.doctype.delivery_note.delivery_note.make_installation_note",
+						source_doctype: "Delivery Note",
+						get_query_filters: {
+							docstatus: 1,
+							status: ["!=", "Stopped"],
+							per_installed: ["<", 99.99],
+							customer: cur_frm.doc.customer || undefined,
+							company: cur_frm.doc.company
+						}
+					})
+				}
+			);
+		}
+	},
+	
 	customer: function() {
 		var me = this;
 		if(this.frm.doc.customer) {
@@ -37,65 +98,29 @@
 				'territory', 'customer_group']);
 		}
 	}, 
-	get_items: function() {
-		wn.model.map_current_doc({
-			method: "stock.doctype.delivery_note.delivery_note.make_installation_note",
-			source_name: cur_frm.doc.delivery_note_no,
-		})
-		unhide_field(['customer_address', 'contact_person', 'customer_name', 'address_display', 
-			'contact_display', 'contact_mobile', 'contact_email', 'territory', 'customer_group']);
-	}
+	
+	customer_address: function() {
+		var me = this;
+		if(this.frm.doc.customer) {
+			this.frm.call({
+				doc: this.frm.doc,
+				args: {
+					customer: this.frm.doc.customer, 
+					address: this.frm.doc.customer_address, 
+					contact: this.frm.doc.contact_person
+				},
+				method: "get_customer_address",
+				freeze: true,
+				callback: function(r) {
+					me.frm.refresh_fields();
+				}
+			});
+		}
+	},
+	
+	contact_person: function() {
+		this.customer_address();
+	},
 });
 
-$.extend(cur_frm.cscript, new erpnext.selling.InstallationNote({frm: cur_frm}));
-
-cur_frm.cscript.onload = function(doc, dt, dn) {
-	if(!doc.status) set_multiple(dt,dn,{status:'Draft'});
-	if(doc.__islocal){
-		set_multiple(dt,dn,{inst_date:get_today()});
-		hide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']);				
-	}
-	if (doc.customer) {
-		 unhide_field(['customer_address','contact_person','customer_name','address_display','contact_display','contact_mobile','contact_email','territory','customer_group']);
-	}	 
-}
-
-cur_frm.fields_dict['delivery_note_no'].get_query = function(doc) {
-	doc = locals[this.doctype][this.docname];
-
-	var filter = {
-    	'company': doc.company,
-    	'docstatus': 1,
-    	'per_installed': 99.99
-  	};
-	if(doc.customer) filter['customer'] = doc.customer;
-  	return { filters: filter }
-}
-
-cur_frm.fields_dict['territory'].get_query = function(doc,cdt,cdn) {
-  	return{
- 		filters: { 'is_group': "No" }
-  	}	
-}
-
-cur_frm.cscript.customer_address = cur_frm.cscript.contact_person = function(doc,dt,dn) {		
-	if(doc.customer) get_server_fields('get_customer_address', JSON.stringify({customer: doc.customer, address: doc.customer_address, contact: doc.contact_person}),'', doc, dt, dn, 1);
-}
-
-cur_frm.fields_dict['customer_address'].get_query = function(doc, cdt, cdn) {
-  	return{
-    	filters: { 'customer': doc.customer }
-	}
-}
-
-cur_frm.fields_dict['contact_person'].get_query = function(doc, cdt, cdn) {
-	return{
-    	filters: { 'customer': doc.customer }
-	}
-}
-
-cur_frm.fields_dict.customer.get_query = function(doc,cdt,cdn) {
-	return{
-		query:"controllers.queries.customer_query"
-	}
-}
\ No newline at end of file
+$.extend(cur_frm.cscript, new erpnext.selling.InstallationNote({frm: cur_frm}));
\ No newline at end of file
diff --git a/selling/doctype/installation_note/installation_note.txt b/selling/doctype/installation_note/installation_note.txt
index d148f31..7486586 100644
--- a/selling/doctype/installation_note/installation_note.txt
+++ b/selling/doctype/installation_note/installation_note.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-04-30 13:13:06", 
   "docstatus": 0, 
-  "modified": "2013-07-07 18:10:24", 
+  "modified": "2013-07-15 17:09:08", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -242,28 +242,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "delivery_note_no", 
-  "fieldtype": "Link", 
-  "label": "Delivery Note No", 
-  "no_copy": 1, 
-  "oldfieldname": "delivery_note_no", 
-  "oldfieldtype": "Link", 
-  "options": "Delivery Note", 
-  "print_hide": 0, 
-  "reqd": 1, 
-  "search_index": 1
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "get_items", 
-  "fieldtype": "Button", 
-  "hidden": 0, 
-  "label": "Get Items", 
-  "oldfieldtype": "Button", 
-  "print_hide": 1
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "installed_item_details", 
   "fieldtype": "Table", 
   "label": "Installation Note Item", 
diff --git a/selling/doctype/sales_common/sales_common.py b/selling/doctype/sales_common/sales_common.py
index ab5cd0a..c174b13 100644
--- a/selling/doctype/sales_common/sales_common.py
+++ b/selling/doctype/sales_common/sales_common.py
@@ -330,11 +330,13 @@
 	def get_prevdoc_date(self, obj):
 		for d in getlist(obj.doclist, obj.fname):
 			if d.prevdoc_doctype and d.prevdoc_docname:
-				if d.prevdoc_doctype == 'Sales Invoice':
-					dt = webnotes.conn.sql("select posting_date from `tab%s` where name = '%s'" % (d.prevdoc_doctype, d.prevdoc_docname))
+				if d.prevdoc_doctype in ["Sales Invoice", "Delivery Note"]:
+					date_field = "posting_date"
 				else:
-					dt = webnotes.conn.sql("select transaction_date from `tab%s` where name = '%s'" % (d.prevdoc_doctype, d.prevdoc_docname))
-				d.prevdoc_date = (dt and dt[0][0]) and dt[0][0].strftime('%Y-%m-%d') or ''
+					date_field = "transaction_date"
+					
+				d.prevdoc_date = webnotes.conn.get_value(d.prevdoc_doctype, 
+					d.prevdoc_docname, date_field)
 
 def get_batch_no(doctype, txt, searchfield, start, page_len, filters):
 	from controllers.queries import get_match_cond
diff --git a/stock/doctype/delivery_note/delivery_note.py b/stock/doctype/delivery_note/delivery_note.py
index 77c70ee..24df878 100644
--- a/stock/doctype/delivery_note/delivery_note.py
+++ b/stock/doctype/delivery_note/delivery_note.py
@@ -401,14 +401,11 @@
 def make_installation_note(source_name, target_doclist=None):
 	def update_item(obj, target, source_parent):
 		target.qty = flt(obj.qty) - flt(obj.installed_qty)
+		target.prevdoc_date = source_parent.posting_date
 	
 	doclist = get_mapped_doclist("Delivery Note", source_name, 	{
 		"Delivery Note": {
-			"doctype": "Installation Note Item", 
-			"field_map": {
-				"name": "delivery_note_no", 
-				"posting_date": "prevdoc_date"
-			},
+			"doctype": "Installation Note", 
 			"validation": {
 				"docstatus": ["=", 1]
 			}
@@ -419,11 +416,10 @@
 				"name": "prevdoc_detail_docname", 
 				"parent": "prevdoc_docname", 
 				"parenttype": "prevdoc_doctype", 
-				"serial_no": "serial_no"
 			},
 			"postprocess": update_item,
 			"condition": lambda doc: doc.installed_qty < doc.qty
 		}
 	}, target_doclist)
-	
+
 	return [d.fields for d in doclist]
\ No newline at end of file