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

Conflicts:
	buying/doctype/purchase_order_item/purchase_order_item.txt

stock/doctype/delivery_note/delivery_note.js

@@ -34,7 +34,9 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend(
 		if(flt(doc.per_installed, 2) < 100 && doc.docstatus==1) 
 			cur_frm.add_custom_button('Make Installation Note', this.make_installation_note);
 
-		if (doc.docstatus==1) cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms);
+		if (doc.docstatus==1) {
+			cur_frm.add_custom_button('Send SMS', cur_frm.cscript.send_sms);
+		}
 
 		if(doc.docstatus==0 && !doc.__islocal) {
 			cur_frm.add_custom_button('Make Packing Slip', cur_frm.cscript['Make Packing Slip']);

stock/doctype/delivery_note/test_delivery_note.py

@@ -28,6 +28,25 @@ class TestDeliveryNote(unittest.TestCase):
 		pr.run_method("calculate_taxes_and_totals")
 		pr.insert()
 		pr.submit()
+		
+	def test_over_billing_against_dn(self):
+		from stock.doctype.delivery_note.delivery_note import make_sales_invoice
+		
+		dn = webnotes.bean(copy=test_records[0]).insert()
+		
+		self.assertRaises(webnotes.ValidationError, make_sales_invoice, 
+			dn.doc.name)
+
+		dn = webnotes.bean("Delivery Note", dn.doc.name)
+		dn.submit()
+		si = make_sales_invoice(dn.doc.name)
+		
+		self.assertEquals(len(si), len(dn.doclist))
+		
+		# modify export_amount
+		si[1].export_rate = 200
+		self.assertRaises(webnotes.ValidationError, webnotes.bean(si).submit)
+		
 	
 	def test_delivery_note_no_gl_entry(self):
 		webnotes.conn.sql("""delete from `tabBin`""")

stock/doctype/material_request/test_material_request.py

@@ -124,6 +124,9 @@ class TestMaterialRequest(unittest.TestCase):
 		po_doclist[0].supplier = "_Test Supplier"
 		po_doclist[1].qty = 27.0
 		po_doclist[2].qty = 1.5
+		po_doclist[1].schedule_date = "2013-07-09"
+		po_doclist[2].schedule_date = "2013-07-09"
+
 		
 		# check for stopped status of Material Request
 		po = webnotes.bean(copy=po_doclist)

stock/doctype/material_request_item/material_request_item.txt

@@ -2,7 +2,7 @@
  {
   "creation": "2013-02-22 01:28:02", 
   "docstatus": 0, 
-  "modified": "2013-03-07 07:03:25", 
+  "modified": "2013-07-09 11:37:12", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -25,20 +25,6 @@
   "doctype": "DocType", 
   "name": "Material Request Item"
  }, 
- {
-  "allow_on_submit": 0, 
-  "doctype": "DocField", 
-  "fieldname": "schedule_date", 
-  "fieldtype": "Date", 
-  "label": "Required Date", 
-  "no_copy": 1, 
-  "oldfieldname": "schedule_date", 
-  "oldfieldtype": "Date", 
-  "print_hide": 0, 
-  "print_width": "100px", 
-  "reqd": 1, 
-  "width": "100px"
- }, 
  {
   "doctype": "DocField", 
   "fieldname": "item_code", 
@@ -53,6 +39,20 @@
   "search_index": 1, 
   "width": "100px"
  }, 
+ {
+  "allow_on_submit": 0, 
+  "doctype": "DocField", 
+  "fieldname": "schedule_date", 
+  "fieldtype": "Date", 
+  "label": "Required Date", 
+  "no_copy": 1, 
+  "oldfieldname": "schedule_date", 
+  "oldfieldtype": "Date", 
+  "print_hide": 0, 
+  "print_width": "100px", 
+  "reqd": 1, 
+  "width": "100px"
+ }, 
  {
   "doctype": "DocField", 
   "fieldname": "description", 

stock/doctype/purchase_receipt/purchase_receipt.py

@@ -103,7 +103,7 @@ class DocType(BuyingController):
 			},
 			"Purchase Order Item": {
 				"ref_dn_field": "prevdoc_detail_docname",
-				"compare_fields": [["export_rate", "="], ["project_name", "="], ["warehouse", "="], 
+				"compare_fields": [["import_rate", "="], ["project_name", "="], ["warehouse", "="], 
 					["uom", "="], ["item_code", "="]],
 				"is_child_table": True
 			}

stock/doctype/purchase_receipt/test_purchase_receipt.py

@@ -22,7 +22,7 @@ import webnotes.defaults
 from webnotes.utils import cint
 
 class TestPurchaseReceipt(unittest.TestCase):
-	def test_make_purchase_invocie(self):
+	def test_make_purchase_invoice(self):
 		from stock.doctype.purchase_receipt.purchase_receipt import make_purchase_invoice
 
 		pr = webnotes.bean(copy=test_records[0]).insert()
@@ -37,6 +37,10 @@ class TestPurchaseReceipt(unittest.TestCase):
 		self.assertEquals(pi[0]["doctype"], "Purchase Invoice")
 		self.assertEquals(len(pi), len(pr.doclist))
 		
+		# modify import_rate
+		pi[1].import_rate = 200
+		self.assertRaises(webnotes.ValidationError, webnotes.bean(pi).submit)
+		
 	def test_purchase_receipt_no_gl_entry(self):
 		pr = webnotes.bean(copy=test_records[0])
 		pr.run_method("calculate_taxes_and_totals")

stock/doctype/stock_entry/stock_entry.js

@@ -103,6 +103,8 @@ erpnext.stock.StockEntry = erpnext.stock.StockController.extend({
 		this.toggle_enable_bom();
 		if (this.frm.doc.docstatus==1) {
 			this.show_stock_ledger();
+			if(wn.boot.auto_inventory_accounting)
+				this.show_general_ledger();
 		}
 		
 		if(this.frm.doc.docstatus === 1 &&