diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
index 1de3aa6..fc9d3c7 100755
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -695,7 +695,7 @@
    "oldfieldname": "due_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
-   "print_hide": 0, 
+   "print_hide": 1, 
    "read_only": 0, 
    "search_index": 1
   }, 
@@ -753,7 +753,7 @@
  "icon": "icon-file-text", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-07-21 05:33:36.332474", 
+ "modified": "2014-07-24 08:46:13.099099", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice", 
diff --git a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
index d3b4606..2275743 100755
--- a/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
+++ b/erpnext/accounts/doctype/purchase_invoice_item/purchase_invoice_item.json
@@ -109,7 +109,7 @@
   }, 
   {
    "fieldname": "discount_percentage", 
-   "fieldtype": "Float", 
+   "fieldtype": "Percent", 
    "in_list_view": 0, 
    "label": "Discount %", 
    "permlevel": 0, 
@@ -421,7 +421,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2014-05-28 12:43:40.647183", 
+ "modified": "2014-07-24 05:50:20.570629", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Purchase Invoice Item", 
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
index 671bb54..27348bb 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.py
@@ -723,15 +723,15 @@
 	"""Notify concerned persons about recurring invoice generation"""
 	frappe.sendmail(new_rv.notification_email_address,
 		subject="New Invoice : " + new_rv.name,
-		message = _("Please find attached Sales Invoice #{0}").format(new_rw.name),
-		attachments = {
+		message = _("Please find attached Sales Invoice #{0}").format(new_rv.name),
+		attachments = [{
 			"fname": new_rv.name + ".pdf",
 			"fcontent": frappe.get_print_format(new_rv.doctype, new_rv.name, as_pdf=True)
-		})
+		}])
 
 def notify_errors(inv, customer, owner):
 	from frappe.utils.user import get_system_managers
-	recipients=get_system_managers()
+	recipients=get_system_managers(only_name=True)
 
 	frappe.sendmail(recipients + [frappe.db.get_value("User", owner, "email")],
 		subject="[Urgent] Error while creating recurring invoice for %s" % inv,
diff --git a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
index 5b3bd9d..82d3a7d 100644
--- a/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
+++ b/erpnext/accounts/doctype/sales_invoice_item/sales_invoice_item.json
@@ -103,7 +103,7 @@
   }, 
   {
    "fieldname": "discount_percentage", 
-   "fieldtype": "Float", 
+   "fieldtype": "Percent", 
    "in_list_view": 0, 
    "label": "Discount (%)", 
    "oldfieldname": "adj_rate", 
@@ -448,7 +448,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2014-05-28 12:42:28.209942", 
+ "modified": "2014-07-24 05:53:05.889457", 
  "modified_by": "Administrator", 
  "module": "Accounts", 
  "name": "Sales Invoice Item", 
diff --git a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
index 224f784..f6bcc23 100755
--- a/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
+++ b/erpnext/buying/doctype/purchase_order_item/purchase_order_item.json
@@ -167,7 +167,7 @@
   }, 
   {
    "fieldname": "discount_percentage", 
-   "fieldtype": "Float", 
+   "fieldtype": "Percent", 
    "in_list_view": 0, 
    "label": "Discount %", 
    "permlevel": 0, 
@@ -466,7 +466,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2014-05-28 12:42:53.018610", 
+ "modified": "2014-07-24 05:49:51.099682", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Purchase Order Item", 
diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index fa0a9f3..fb648b9 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -307,63 +307,6 @@
    "permlevel": 0
   }, 
   {
-   "fieldname": "other_charges_added_import", 
-   "fieldtype": "Currency", 
-   "label": "Taxes and Charges Added", 
-   "no_copy": 0, 
-   "oldfieldname": "other_charges_added_import", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0
-  }, 
-  {
-   "fieldname": "other_charges_deducted_import", 
-   "fieldtype": "Currency", 
-   "label": "Taxes and Charges Deducted", 
-   "no_copy": 0, 
-   "oldfieldname": "other_charges_deducted_import", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 1, 
-   "report_hide": 0
-  }, 
-  {
-   "fieldname": "grand_total_import", 
-   "fieldtype": "Currency", 
-   "in_list_view": 1, 
-   "label": "Grand Total", 
-   "no_copy": 0, 
-   "oldfieldname": "grand_total_import", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1, 
-   "report_hide": 0
-  }, 
-  {
-   "fieldname": "in_words_import", 
-   "fieldtype": "Data", 
-   "label": "In Words", 
-   "oldfieldname": "in_words_import", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 1
-  }, 
-  {
-   "fieldname": "column_break4", 
-   "fieldtype": "Column Break", 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_hide": 0
-  }, 
-  {
    "fieldname": "other_charges_added", 
    "fieldtype": "Currency", 
    "label": "Taxes and Charges Added (Company Currency)", 
@@ -434,6 +377,63 @@
    "read_only": 1
   }, 
   {
+   "fieldname": "column_break4", 
+   "fieldtype": "Column Break", 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "print_hide": 0
+  }, 
+  {
+   "fieldname": "other_charges_added_import", 
+   "fieldtype": "Currency", 
+   "label": "Taxes and Charges Added", 
+   "no_copy": 0, 
+   "oldfieldname": "other_charges_added_import", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0
+  }, 
+  {
+   "fieldname": "other_charges_deducted_import", 
+   "fieldtype": "Currency", 
+   "label": "Taxes and Charges Deducted", 
+   "no_copy": 0, 
+   "oldfieldname": "other_charges_deducted_import", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 1, 
+   "report_hide": 0
+  }, 
+  {
+   "fieldname": "grand_total_import", 
+   "fieldtype": "Currency", 
+   "in_list_view": 1, 
+   "label": "Grand Total", 
+   "no_copy": 0, 
+   "oldfieldname": "grand_total_import", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1, 
+   "report_hide": 0
+  }, 
+  {
+   "fieldname": "in_words_import", 
+   "fieldtype": "Data", 
+   "label": "In Words", 
+   "oldfieldname": "in_words_import", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 1
+  }, 
+  {
    "fieldname": "terms_section_break", 
    "fieldtype": "Section Break", 
    "label": "Terms and Conditions", 
@@ -571,7 +571,7 @@
  "icon": "icon-shopping-cart", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-07-21 05:30:30.367353", 
+ "modified": "2014-07-24 05:16:47.062261", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation", 
diff --git a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
index 65dfe97..11b14e9 100644
--- a/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
+++ b/erpnext/buying/doctype/supplier_quotation_item/supplier_quotation_item.json
@@ -95,7 +95,7 @@
   }, 
   {
    "fieldname": "discount_percentage", 
-   "fieldtype": "Float", 
+   "fieldtype": "Percent", 
    "in_list_view": 0, 
    "label": "Discount %", 
    "permlevel": 0, 
@@ -346,7 +346,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2014-05-28 12:44:17.347236", 
+ "modified": "2014-07-24 05:45:04.371142", 
  "modified_by": "Administrator", 
  "module": "Buying", 
  "name": "Supplier Quotation Item", 
diff --git a/erpnext/hr/doctype/salary_slip/salary_slip.py b/erpnext/hr/doctype/salary_slip/salary_slip.py
index 946588f..7e27830 100644
--- a/erpnext/hr/doctype/salary_slip/salary_slip.py
+++ b/erpnext/hr/doctype/salary_slip/salary_slip.py
@@ -191,9 +191,9 @@
 		if receiver:
 			subj = 'Salary Slip - ' + cstr(self.month) +'/'+cstr(self.fiscal_year)
 			sendmail([receiver], subject=subj, msg = _("Please see attachment"),
-				attachments={
+				attachments=[{
 					"fname": self.name + ".pdf",
 					"fcontent": frappe.get_print_format(self.doctype, self.name, as_pdf = True)
-				})
+				}])
 		else:
 			msgprint(_("Company Email ID not found, hence mail not sent"))
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 1a80ef0..676e0d1 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -73,5 +73,3 @@
 execute:frappe.delete_doc("DocType", "Payment to Invoice Matching Tool Detail")
 execute:frappe.delete_doc("Page", "trial-balance") #2014-07-22
 erpnext.patches.v4_2.delete_old_print_formats
-execute:frappe.delete_doc("DocType", "Payment to Invoice Matching Tool")
-execute:frappe.delete_doc("DocType", "Payment to Invoice Matching Tool Detail")
diff --git a/erpnext/selling/doctype/opportunity/opportunity.json b/erpnext/selling/doctype/opportunity/opportunity.json
index be5f52b..a287c22 100644
--- a/erpnext/selling/doctype/opportunity/opportunity.json
+++ b/erpnext/selling/doctype/opportunity/opportunity.json
@@ -110,6 +110,7 @@
    "oldfieldtype": "Select", 
    "options": "Draft\nSubmitted\nQuotation\nLost\nCancelled\nReplied\nOpen", 
    "permlevel": 0, 
+   "print_hide": 1, 
    "read_only": 1, 
    "reqd": 1
   }, 
@@ -410,7 +411,7 @@
  "icon": "icon-info-sign", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-06-23 07:55:49.718301", 
+ "modified": "2014-07-24 08:55:09.807048", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Opportunity", 
diff --git a/erpnext/selling/doctype/opportunity/test_opportunity.py b/erpnext/selling/doctype/opportunity/test_opportunity.py
new file mode 100644
index 0000000..b991ffa
--- /dev/null
+++ b/erpnext/selling/doctype/opportunity/test_opportunity.py
@@ -0,0 +1,10 @@
+# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and Contributors
+# See license.txt
+
+import frappe
+import unittest
+
+test_records = frappe.get_test_records('Opportunity')
+
+class TestOpportunity(unittest.TestCase):
+	pass
diff --git a/erpnext/selling/doctype/opportunity/test_records.json b/erpnext/selling/doctype/opportunity/test_records.json
new file mode 100644
index 0000000..3970903
--- /dev/null
+++ b/erpnext/selling/doctype/opportunity/test_records.json
@@ -0,0 +1,13 @@
+[
+	{
+		"doctype": "Opportunity",
+		"name": "_Test Opportunity 1",
+		"enquiry_from": "Lead",
+		"enquiry_type": "Sales",
+		"lead": "_T-Lead-00001",
+		"enquiry_details": [{
+			"item_name": "Test Item",
+			"description": "Some description"
+		}]
+	}
+]
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json
index a1807dd..c260505 100644
--- a/erpnext/selling/doctype/quotation_item/quotation_item.json
+++ b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -107,7 +107,7 @@
   }, 
   {
    "fieldname": "discount_percentage", 
-   "fieldtype": "Float", 
+   "fieldtype": "Percent", 
    "in_list_view": 0, 
    "label": "Discount (%)", 
    "oldfieldname": "adj_rate", 
@@ -345,7 +345,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2014-05-28 12:41:40.811916", 
+ "modified": "2014-07-24 05:52:49.665788", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Quotation Item", 
diff --git a/erpnext/selling/doctype/sales_order_item/sales_order_item.json b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
index 13ee085..582792f 100644
--- a/erpnext/selling/doctype/sales_order_item/sales_order_item.json
+++ b/erpnext/selling/doctype/sales_order_item/sales_order_item.json
@@ -101,7 +101,7 @@
   }, 
   {
    "fieldname": "discount_percentage", 
-   "fieldtype": "Float", 
+   "fieldtype": "Percent", 
    "in_list_view": 0, 
    "label": "Discount(%)", 
    "oldfieldname": "adj_rate", 
@@ -431,7 +431,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2014-05-27 14:41:14.996650", 
+ "modified": "2014-07-24 05:55:46.672279", 
  "modified_by": "Administrator", 
  "module": "Selling", 
  "name": "Sales Order Item", 
diff --git a/erpnext/stock/doctype/delivery_note/delivery_note.json b/erpnext/stock/doctype/delivery_note/delivery_note.json
index 89cbc94..84570ab 100644
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -342,19 +342,6 @@
    "permlevel": 0
   }, 
   {
-   "fieldname": "column_break_33", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0
-  }, 
-  {
-   "fieldname": "net_total_export", 
-   "fieldtype": "Currency", 
-   "label": "Net Total", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "read_only": 1
-  }, 
-  {
    "fieldname": "net_total", 
    "fieldtype": "Currency", 
    "label": "Net Total (Company Currency)", 
@@ -370,6 +357,19 @@
    "width": "150px"
   }, 
   {
+   "fieldname": "column_break_33", 
+   "fieldtype": "Column Break", 
+   "permlevel": 0
+  }, 
+  {
+   "fieldname": "net_total_export", 
+   "fieldtype": "Currency", 
+   "label": "Net Total", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "read_only": 1
+  }, 
+  {
    "fieldname": "taxes", 
    "fieldtype": "Section Break", 
    "label": "Taxes and Charges", 
@@ -480,56 +480,6 @@
    "read_only": 0
   }, 
   {
-   "fieldname": "grand_total_export", 
-   "fieldtype": "Currency", 
-   "label": "Grand Total", 
-   "no_copy": 0, 
-   "oldfieldname": "grand_total_export", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_width": "150px", 
-   "read_only": 1, 
-   "reqd": 0, 
-   "width": "150px"
-  }, 
-  {
-   "fieldname": "rounded_total_export", 
-   "fieldtype": "Currency", 
-   "label": "Rounded Total", 
-   "no_copy": 0, 
-   "oldfieldname": "rounded_total_export", 
-   "oldfieldtype": "Currency", 
-   "options": "currency", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_width": "150px", 
-   "read_only": 1, 
-   "width": "150px"
-  }, 
-  {
-   "description": "In Words (Export) will be visible once you save the Delivery Note.", 
-   "fieldname": "in_words_export", 
-   "fieldtype": "Data", 
-   "label": "In Words", 
-   "no_copy": 0, 
-   "oldfieldname": "in_words_export", 
-   "oldfieldtype": "Data", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "print_width": "150px", 
-   "read_only": 1, 
-   "width": "150px"
-  }, 
-  {
-   "fieldname": "column_break3", 
-   "fieldtype": "Column Break", 
-   "oldfieldtype": "Column Break", 
-   "permlevel": 0, 
-   "read_only": 0
-  }, 
-  {
    "fieldname": "grand_total", 
    "fieldtype": "Currency", 
    "label": "Grand Total (Company Currency)", 
@@ -573,6 +523,56 @@
    "width": "200px"
   }, 
   {
+   "fieldname": "column_break3", 
+   "fieldtype": "Column Break", 
+   "oldfieldtype": "Column Break", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "fieldname": "grand_total_export", 
+   "fieldtype": "Currency", 
+   "label": "Grand Total", 
+   "no_copy": 0, 
+   "oldfieldname": "grand_total_export", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "150px", 
+   "read_only": 1, 
+   "reqd": 0, 
+   "width": "150px"
+  }, 
+  {
+   "fieldname": "rounded_total_export", 
+   "fieldtype": "Currency", 
+   "label": "Rounded Total", 
+   "no_copy": 0, 
+   "oldfieldname": "rounded_total_export", 
+   "oldfieldtype": "Currency", 
+   "options": "currency", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "150px", 
+   "read_only": 1, 
+   "width": "150px"
+  }, 
+  {
+   "description": "In Words (Export) will be visible once you save the Delivery Note.", 
+   "fieldname": "in_words_export", 
+   "fieldtype": "Data", 
+   "label": "In Words", 
+   "no_copy": 0, 
+   "oldfieldname": "in_words_export", 
+   "oldfieldtype": "Data", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "print_width": "150px", 
+   "read_only": 1, 
+   "width": "150px"
+  }, 
+  {
    "fieldname": "terms_section_break", 
    "fieldtype": "Section Break", 
    "label": "Terms and Conditions", 
@@ -1009,7 +1009,7 @@
  "idx": 1, 
  "in_create": 0, 
  "is_submittable": 1, 
- "modified": "2014-07-21 05:28:55.380728", 
+ "modified": "2014-07-24 08:48:06.944540", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note", 
diff --git a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
index 13307ef..2f69bc9 100644
--- a/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
+++ b/erpnext/stock/doctype/delivery_note_item/delivery_note_item.json
@@ -109,7 +109,7 @@
   }, 
   {
    "fieldname": "discount_percentage", 
-   "fieldtype": "Float", 
+   "fieldtype": "Percent", 
    "in_list_view": 0, 
    "label": "Discount (%)", 
    "oldfieldname": "adj_rate", 
@@ -429,7 +429,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2014-05-28 12:42:05.788579", 
+ "modified": "2014-07-24 05:56:00.218977", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Delivery Note Item", 
diff --git a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
index 66a9543..ebdc80e 100755
--- a/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
+++ b/erpnext/stock/doctype/purchase_receipt/purchase_receipt.json
@@ -109,7 +109,7 @@
    "oldfieldname": "posting_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
-   "print_hide": 1, 
+   "print_hide": 0, 
    "print_width": "100px", 
    "reqd": 1, 
    "search_index": 1, 
@@ -762,7 +762,7 @@
  "icon": "icon-truck", 
  "idx": 1, 
  "is_submittable": 1, 
- "modified": "2014-07-21 05:43:28.156516", 
+ "modified": "2014-07-24 08:49:12.407907", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt", 
diff --git a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
index 548a7da..8c5e732 100755
--- a/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
+++ b/erpnext/stock/doctype/purchase_receipt_item/purchase_receipt_item.json
@@ -168,7 +168,7 @@
   }, 
   {
    "fieldname": "discount_percentage", 
-   "fieldtype": "Float", 
+   "fieldtype": "Percent", 
    "in_list_view": 0, 
    "label": "Discount  %", 
    "permlevel": 0, 
@@ -545,7 +545,7 @@
  ], 
  "idx": 1, 
  "istable": 1, 
- "modified": "2014-05-28 12:43:16.669040", 
+ "modified": "2014-07-24 05:56:12.997533", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Purchase Receipt Item", 
diff --git a/erpnext/stock/doctype/stock_entry/stock_entry.json b/erpnext/stock/doctype/stock_entry/stock_entry.json
index b522282..a455a3b 100644
--- a/erpnext/stock/doctype/stock_entry/stock_entry.json
+++ b/erpnext/stock/doctype/stock_entry/stock_entry.json
@@ -127,7 +127,7 @@
    "oldfieldname": "posting_date", 
    "oldfieldtype": "Date", 
    "permlevel": 0, 
-   "print_hide": 1, 
+   "print_hide": 0, 
    "read_only": 0, 
    "report_hide": 0, 
    "reqd": 1, 
@@ -307,6 +307,7 @@
    "fieldtype": "Check", 
    "label": "Use Multi-Level BOM", 
    "permlevel": 0, 
+   "print_hide": 1, 
    "read_only": 0
   }, 
   {
@@ -453,7 +454,35 @@
    "read_only": 0
   }, 
   {
-   "fieldname": "col4", 
+   "fieldname": "project_name", 
+   "fieldtype": "Link", 
+   "in_filter": 1, 
+   "label": "Project Name", 
+   "oldfieldname": "project_name", 
+   "oldfieldtype": "Link", 
+   "options": "Project", 
+   "permlevel": 0, 
+   "read_only": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
+   "fieldname": "remarks", 
+   "fieldtype": "Text", 
+   "hidden": 0, 
+   "in_filter": 0, 
+   "label": "Remarks", 
+   "no_copy": 1, 
+   "oldfieldname": "remarks", 
+   "oldfieldtype": "Text", 
+   "permlevel": 0, 
+   "print_hide": 1, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "fieldname": "col5", 
    "fieldtype": "Column Break", 
    "permlevel": 0, 
    "print_width": "50%", 
@@ -469,35 +498,6 @@
    "read_only": 1
   }, 
   {
-   "fieldname": "project_name", 
-   "fieldtype": "Link", 
-   "in_filter": 1, 
-   "label": "Project Name", 
-   "oldfieldname": "project_name", 
-   "oldfieldtype": "Link", 
-   "options": "Project", 
-   "permlevel": 0, 
-   "read_only": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "fieldname": "select_print_heading", 
-   "fieldtype": "Link", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Print Heading", 
-   "no_copy": 0, 
-   "oldfieldname": "select_print_heading", 
-   "oldfieldtype": "Link", 
-   "options": "Print Heading", 
-   "permlevel": 0, 
-   "print_hide": 0, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0
-  }, 
-  {
    "fieldname": "fiscal_year", 
    "fieldtype": "Link", 
    "in_filter": 0, 
@@ -509,14 +509,6 @@
    "reqd": 1
   }, 
   {
-   "fieldname": "col5", 
-   "fieldtype": "Column Break", 
-   "permlevel": 0, 
-   "print_width": "50%", 
-   "read_only": 0, 
-   "width": "50%"
-  }, 
-  {
    "allow_on_submit": 0, 
    "fieldname": "company", 
    "fieldtype": "Link", 
@@ -536,6 +528,24 @@
   }, 
   {
    "allow_on_submit": 0, 
+   "fieldname": "select_print_heading", 
+   "fieldtype": "Link", 
+   "hidden": 0, 
+   "in_filter": 0, 
+   "label": "Print Heading", 
+   "no_copy": 0, 
+   "oldfieldname": "select_print_heading", 
+   "oldfieldtype": "Link", 
+   "options": "Print Heading", 
+   "permlevel": 0, 
+   "print_hide": 0, 
+   "read_only": 0, 
+   "report_hide": 0, 
+   "reqd": 0, 
+   "search_index": 0
+  }, 
+  {
+   "allow_on_submit": 0, 
    "fieldname": "amended_from", 
    "fieldtype": "Link", 
    "hidden": 0, 
@@ -552,23 +562,6 @@
    "report_hide": 0, 
    "reqd": 0, 
    "search_index": 0
-  }, 
-  {
-   "allow_on_submit": 0, 
-   "fieldname": "remarks", 
-   "fieldtype": "Text", 
-   "hidden": 0, 
-   "in_filter": 0, 
-   "label": "Remarks", 
-   "no_copy": 1, 
-   "oldfieldname": "remarks", 
-   "oldfieldtype": "Text", 
-   "permlevel": 0, 
-   "print_hide": 1, 
-   "read_only": 0, 
-   "report_hide": 0, 
-   "reqd": 0, 
-   "search_index": 0
   }
  ], 
  "hide_heading": 0, 
@@ -580,7 +573,7 @@
  "is_submittable": 1, 
  "issingle": 0, 
  "max_attachments": 0, 
- "modified": "2014-05-27 03:49:19.520247", 
+ "modified": "2014-07-24 08:52:33.496200", 
  "modified_by": "Administrator", 
  "module": "Stock", 
  "name": "Stock Entry", 
diff --git a/erpnext/templates/emails/recurring_invoice_failed.html b/erpnext/templates/emails/recurring_invoice_failed.html
index dd3b913..39690d8 100644
--- a/erpnext/templates/emails/recurring_invoice_failed.html
+++ b/erpnext/templates/emails/recurring_invoice_failed.html
@@ -6,7 +6,7 @@
 "Convert into Recurring" field in the invoice {{ name }}.</p>
 <p><b>Please correct the invoice and make the invoice recurring again.</b></p>
 <hr>
-<p><b>It is necessary to take this action today itself for the above mentioned recurring invoice \
-to be generated. If delayed, you will have to manually change the "Repeat on Day of Month" field \
+<p><b>It is necessary to take this action today itself for the above mentioned recurring invoice
+to be generated. If delayed, you will have to manually change the "Repeat on Day of Month" field
 of this invoice for generating the recurring invoice.</b></p>
 <p>[This email is autogenerated]</p>
diff --git a/erpnext/templates/print_formats/includes/item_grid.html b/erpnext/templates/print_formats/includes/item_grid.html
index ffcf857..df1859c 100644
--- a/erpnext/templates/print_formats/includes/item_grid.html
+++ b/erpnext/templates/print_formats/includes/item_grid.html
@@ -5,12 +5,12 @@
 <table class="table table-bordered">
 	<tbody>
 		<tr>
-			<th>Sr</th>
-			<th>Item Name</th>
-			<th>Description</th>
-			<th class="text-right">Qty</th>
-			<th class="text-right">Rate</th>
-			<th class="text-right">Amount</th>
+			<th>{{ _("Sr") }}</th>
+			<th>{{ _("Item Name") }}</th>
+			<th>{{ _("Description") }}</th>
+			<th class="text-right">{{ _("Qty") }}</th>
+			<th class="text-right">{{ _("Rate") }}</th>
+			<th class="text-right">{{ _("Amount") }}</th>
 		</tr>
 		{%- for row in data -%}
 		<tr>
@@ -25,12 +25,15 @@
 				<div style="border: 0px;">{{ row.description }}
 					{%- for field in visible_columns -%}
 						{%- if (field.fieldname not in std_fields) and
-								(row[field.fieldname] not in (None, "")) -%}
-						<br><strong>{{ field.label }}:</strong>
-							{{ row.get_formatted(field.fieldname, doc) }}</p>
+								(row[field.fieldname] not in (None, "", 0)) -%}
+						<br><strong>{{ _(field.label) }}:</strong>
+							{{ row.get_formatted(field.fieldname, doc) }}
 						{%- endif -%}
 					{%- endfor -%}
-			<td style="width: 10%; text-align: right;">{{ row.get_formatted("qty", doc) }} {{ row.uom or row.stock_uom }}</td>
+				</div>
+			</td>
+			<td style="width: 10%; text-align: right;">{{ row.get_formatted("qty", doc) }}<br>
+				<small>{{ row.uom or row.stock_uom }}</small></td>
 			<td style="width: 15%; text-align: right;">{{
 				row.get_formatted("rate", doc) }}</td>
 			<td style="width: 15%; text-align: right;">{{
diff --git a/test_sites/test_site/site_config.json b/test_sites/test_site/site_config.json
index c77200c..05bf562 100644
--- a/test_sites/test_site/site_config.json
+++ b/test_sites/test_site/site_config.json
@@ -1,6 +1,5 @@
 {
  "db_name": "test_frappe",
  "db_password": "test_frappe",
- "mute_emails": 1,
- "developer_mode": 1
+ "mute_emails": 1
 }