Merge branch 'master' of github.com:webnotes/erpnext into purchase_price_list

Conflicts:
	accounts/doctype/gl_control/gl_control.py

stock/doctype/item/item.py

@@ -77,7 +77,7 @@ class DocType:
 
 	def update_website(self):
 		from website.utils import update_page_name
-		update_page_name(self.doc, self.doc.item_name)
+		update_page_name(self.doc, self.doc.name + " " + self.doc.item_name)
 		
 		from website.helpers.product import invalidate_cache_for
 		invalidate_cache_for(self.doc.item_group)

stock/doctype/packing_slip/packing_slip.py

@@ -117,7 +117,7 @@ class DocType:
 			from `tabDelivery Note Item` dni
 			where parent=%s and item_code in (%s)
 			group by item_code""" % ("%s", ", ".join(["%s"]*len(items))),
-			tuple([self.doc.delivery_note] + items), as_dict=1, debug=1)
+			tuple([self.doc.delivery_note] + items), as_dict=1)
 			
 		ps_item_qty = dict([[d.item_code, d.qty] for d in self.doclist])
 
@@ -170,9 +170,6 @@ class DocType:
 				webnotes.msgprint("Invalid new packed quantity for item %s. \
 					Please try again or contact support@erpnext.com" % item['item_code'], raise_exception=1)
 			
-			delivery_note_item = webnotes.conn.get_value("Delivery Note Item", {
-				"parent": self.doc.delivery_note, "item_code": item["item_code"]})
-			
 			webnotes.conn.sql("""\
 				UPDATE `tabDelivery Note Item`
 				SET packed_qty = %s

stock/doctype/sales_and_purchase_return_tool/sales_and_purchase_return_tool.js

@@ -211,7 +211,6 @@ cur_frm.cscript.make_jv = function(doc, dr_or_cr, children) {
 	jv.fiscal_year = sys_defaults.fiscal_year;
 	jv.is_opening = 'No';
 	jv.posting_date = doc.return_date;
-	jv.voucher_date = dateutil.obj_to_str(new Date());
 
 	// Add children
 	if(children) {