diff --git a/accounts/doctype/account/account.txt b/accounts/doctype/account/account.txt
index f96e3b2..a0354c2 100644
--- a/accounts/doctype/account/account.txt
+++ b/accounts/doctype/account/account.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-19 10:23:33", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:26", 
+  "modified": "2013-01-29 16:27:57", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -207,7 +207,7 @@
   "label": "Credit Limit", 
   "oldfieldname": "credit_limit", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "permlevel": 0, 
   "print_hide": 1
  }, 
diff --git a/accounts/doctype/bank_reconciliation/bank_reconciliation.txt b/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
index 45eae20..194cc42 100644
--- a/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
+++ b/accounts/doctype/bank_reconciliation/bank_reconciliation.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:05", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:16", 
+  "modified": "2013-01-29 16:27:50", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -105,7 +105,7 @@
   "fieldname": "total_amount", 
   "fieldtype": "Currency", 
   "label": "Total Amount", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
diff --git a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
index f4a011d..1b8b991 100644
--- a/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
+++ b/accounts/doctype/bank_reconciliation_detail/bank_reconciliation_detail.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:05", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:16", 
+  "modified": "2013-01-29 16:27:50", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -79,7 +79,7 @@
   "label": "Debit", 
   "oldfieldname": "debit", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
@@ -89,7 +89,7 @@
   "label": "Credit", 
   "oldfieldname": "credit", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
diff --git a/accounts/doctype/budget_detail/budget_detail.txt b/accounts/doctype/budget_detail/budget_detail.txt
index 58936be..b2b312c 100644
--- a/accounts/doctype/budget_detail/budget_detail.txt
+++ b/accounts/doctype/budget_detail/budget_detail.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:05", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:02:32", 
+  "modified": "2013-01-29 16:28:16", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -44,7 +44,7 @@
   "label": "Budget Allocated", 
   "oldfieldname": "budget_allocated", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency(cur_frm.doc.company_name)", 
+  "options": "Company:company_name:default_currency", 
   "reqd": 1
  }, 
  {
@@ -54,7 +54,7 @@
   "label": "Actual", 
   "oldfieldname": "actual", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency(cur_frm.doc.company_name)", 
+  "options": "Company:company_name:default_currency", 
   "read_only": 1
  }, 
  {
diff --git a/accounts/doctype/c_form/c_form.txt b/accounts/doctype/c_form/c_form.txt
index 4741706..c429632 100644
--- a/accounts/doctype/c_form/c_form.txt
+++ b/accounts/doctype/c_form/c_form.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-19 10:23:34", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:26", 
+  "modified": "2013-01-29 16:27:57", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -120,7 +120,7 @@
   "fieldname": "total_amount", 
   "fieldtype": "Currency", 
   "label": "Total Amount", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 0, 
   "reqd": 1
  }, 
@@ -152,7 +152,7 @@
   "fieldname": "total_invoiced_amount", 
   "fieldtype": "Currency", 
   "label": "Total Invoiced Amount", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 0, 
   "read_only": 1
  }, 
diff --git a/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt b/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
index 36d8bbc..f9b7372 100644
--- a/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
+++ b/accounts/doctype/c_form_invoice_detail/c_form_invoice_detail.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:06", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:16", 
+  "modified": "2013-01-29 16:27:50", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -54,7 +54,7 @@
   "fieldname": "net_total", 
   "fieldtype": "Currency", 
   "label": "Net Total", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1, 
   "width": "120px"
  }, 
@@ -63,7 +63,7 @@
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
   "label": "Grand Total", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1, 
   "width": "120px"
  }
diff --git a/accounts/doctype/gl_control/gl_control.py b/accounts/doctype/gl_control/gl_control.py
index 46b2112..2a7d284 100644
--- a/accounts/doctype/gl_control/gl_control.py
+++ b/accounts/doctype/gl_control/gl_control.py
@@ -51,6 +51,7 @@
 		ac.doc.doctype = "Account"
 		ac.doc.old_parent = ""
 		ac.doc.freeze_account = "No"
+		ac.ignore_permissions = 1
 		ac.insert()
 
 		return ac.doc.name
@@ -59,6 +60,7 @@
 		cc = webnotes.model_wrapper(eval(arg))
 		cc.doc.doctype = "Cost Center"
 		cc.doc.old_parent = ""
+		cc.ignore_permissions = 1
 		cc.insert()
 
 		return cc.doc.name
@@ -159,4 +161,4 @@
 		""" % (args))
 		
 		if not ret:
-			msgprint("Payment Entry has been modified after you pulled it. Please pull it again.", raise_exception=1)
\ No newline at end of file
+			msgprint("Payment Entry has been modified after you pulled it. Please pull it again.", raise_exception=1)
diff --git a/accounts/doctype/gl_entry/gl_entry.txt b/accounts/doctype/gl_entry/gl_entry.txt
index 433faae..84d9eee 100644
--- a/accounts/doctype/gl_entry/gl_entry.txt
+++ b/accounts/doctype/gl_entry/gl_entry.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:06", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:17", 
+  "modified": "2013-01-29 16:27:50", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -98,7 +98,7 @@
   "label": "Debit Amt", 
   "oldfieldname": "debit", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
@@ -107,7 +107,7 @@
   "label": "Credit Amt", 
   "oldfieldname": "credit", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
diff --git a/accounts/doctype/journal_voucher/journal_voucher.txt b/accounts/doctype/journal_voucher/journal_voucher.txt
index 7482038..601ab5f 100644
--- a/accounts/doctype/journal_voucher/journal_voucher.txt
+++ b/accounts/doctype/journal_voucher/journal_voucher.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-19 10:23:34", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:27", 
+  "modified": "2013-01-29 18:19:58", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -62,6 +62,7 @@
   "fieldname": "voucher_type", 
   "fieldtype": "Select", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Voucher Type", 
   "oldfieldname": "voucher_type", 
   "oldfieldtype": "Select", 
@@ -119,11 +120,12 @@
   "fieldname": "total_debit", 
   "fieldtype": "Currency", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Total Debit", 
   "no_copy": 1, 
   "oldfieldname": "total_debit", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
@@ -135,7 +137,7 @@
   "no_copy": 1, 
   "oldfieldname": "total_credit", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
@@ -151,7 +153,7 @@
   "no_copy": 1, 
   "oldfieldname": "difference", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -222,6 +224,7 @@
   "doctype": "DocField", 
   "fieldname": "remark", 
   "fieldtype": "Small Text", 
+  "in_list_view": 1, 
   "label": "Remark", 
   "no_copy": 1, 
   "oldfieldname": "remark", 
@@ -311,7 +314,7 @@
   "fieldname": "write_off_amount", 
   "fieldtype": "Currency", 
   "label": "Write Off Amount <=", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "report_hide": 1
  }, 
@@ -346,6 +349,7 @@
   "fieldname": "total_amount", 
   "fieldtype": "Data", 
   "hidden": 1, 
+  "in_list_view": 0, 
   "label": "Total Amount", 
   "no_copy": 1, 
   "print_hide": 1, 
diff --git a/accounts/doctype/journal_voucher/journal_voucher_list.js b/accounts/doctype/journal_voucher/journal_voucher_list.js
deleted file mode 100644
index 0d7bd08..0000000
--- a/accounts/doctype/journal_voucher/journal_voucher_list.js
+++ /dev/null
@@ -1,39 +0,0 @@
-wn.doclistviews['Journal Voucher'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d);
-		this.fields = this.fields.concat([
-			'`tabJournal Voucher`.voucher_type',
-			'`tabJournal Voucher`.remark',
-			'`tabJournal Voucher`.total_debit',
-			'`tabJournal Voucher`.company',
-			"`tabJournal Voucher`.posting_date",
-		]);
-		this.stats = this.stats.concat(['voucher_type', 'company']);
-	},
-	prepare_data: function(data) {
-		this._super(data);
-		if(!data.remark) data.remark = '';
-		if(data.remark.length> 30) {
-			data.remark = '<span title="'+data.remark+'">' + data.remark.substr(0,30) 
-				+ '...</span>';
-		}
-	},
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content: 'avatar'},	
-		{width: '3%', content: 'docstatus'},
-		{width: '12%', content: 'name'},
-		{width: '15%', content: 'voucher_type'},
-		{width: '32%', content: 'remark+tags', css: {'color':'#222'}},
-		{
-			width: '18%', 
-			content: function(parent, data) { 
-				$(parent).html(format_currency(data.total_debit, erpnext.get_currency(data.company))); 
-			},
-			css: {'text-align':'right'}
-		},
-		{width: '12%', content:'posting_date',
-			css: {'text-align': 'right', 'color':'#777'},
-			title: "Journal Voucher Date", type: "date"}
-	],
-});
\ No newline at end of file
diff --git a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
index 397eb0c..245ddf1 100644
--- a/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
+++ b/accounts/doctype/journal_voucher_detail/journal_voucher_detail.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:06", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:17", 
+  "modified": "2013-01-29 16:27:50", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -45,7 +45,7 @@
   "label": "Debit", 
   "oldfieldname": "debit", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
@@ -54,7 +54,7 @@
   "label": "Credit", 
   "oldfieldname": "credit", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
diff --git a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt
index a1a5fd5..d1374af 100644
--- a/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt
+++ b/accounts/doctype/payment_to_invoice_matching_tool/payment_to_invoice_matching_tool.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-23 15:27:14", 
+  "creation": "2013-01-21 18:19:17", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:27", 
+  "modified": "2013-01-29 16:27:58", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -56,14 +56,6 @@
   "label": "Company", 
   "options": "Company", 
   "print_hide": 1
- },
- {
-  "doctype": "DocField", 
-  "fieldname": "account_type", 
-  "fieldtype": "Data", 
-  "hidden": 1, 
-  "label": "Account Type", 
-  "read_only": 1
  }, 
  {
   "doctype": "DocField", 
@@ -100,7 +92,7 @@
   "fieldname": "total_amount", 
   "fieldtype": "Currency", 
   "label": "Total Amount", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
@@ -108,7 +100,7 @@
   "fieldname": "pending_amt_to_reconcile", 
   "fieldtype": "Currency", 
   "label": "Outstanding Amount", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
diff --git a/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt b/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
index dd1a97f..5fcb606 100644
--- a/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
+++ b/accounts/doctype/payment_to_invoice_matching_tool_detail/payment_to_invoice_matching_tool_detail.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:07", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:17", 
+  "modified": "2013-01-29 16:27:50", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -40,7 +40,7 @@
   "fieldname": "amt_due", 
   "fieldtype": "Currency", 
   "label": "Unmatched Amount", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
@@ -48,7 +48,7 @@
   "fieldname": "amt_to_be_reconciled", 
   "fieldtype": "Currency", 
   "label": "Allocated Amount", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "reqd": 1
  }, 
  {
@@ -63,7 +63,7 @@
   "fieldname": "total_amt", 
   "fieldtype": "Currency", 
   "label": "Total Amount", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.txt b/accounts/doctype/purchase_invoice/purchase_invoice.txt
index b1bd5f2..0c921b1 100755
--- a/accounts/doctype/purchase_invoice/purchase_invoice.txt
+++ b/accounts/doctype/purchase_invoice/purchase_invoice.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-21 18:19:17", 
+  "creation": "2013-01-29 17:54:09", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:25:09", 
+  "modified": "2013-01-29 18:25:24", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -89,6 +89,7 @@
   "fieldname": "supplier_name", 
   "fieldtype": "Text", 
   "hidden": 1, 
+  "in_list_view": 1, 
   "label": "Name", 
   "oldfieldname": "supplier_name", 
   "oldfieldtype": "Data", 
@@ -357,7 +358,7 @@
   "label": "Total Tax", 
   "oldfieldname": "total_tax", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -434,6 +435,7 @@
   "doctype": "DocField", 
   "fieldname": "grand_total_import", 
   "fieldtype": "Currency", 
+  "in_list_view": 1, 
   "label": "Grand Total (Import)", 
   "oldfieldname": "grand_total_import", 
   "oldfieldtype": "Currency", 
@@ -460,7 +462,7 @@
   "no_copy": 1, 
   "oldfieldname": "total_amount_to_pay", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -472,7 +474,7 @@
   "no_copy": 1, 
   "oldfieldname": "total_advance", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -481,11 +483,12 @@
   "fieldname": "outstanding_amount", 
   "fieldtype": "Currency", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Outstanding Amount", 
   "no_copy": 1, 
   "oldfieldname": "outstanding_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "search_index": 1
@@ -506,7 +509,7 @@
   "label": "Net Total", 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -517,7 +520,7 @@
   "label": "Taxes and Charges Added", 
   "oldfieldname": "other_charges_added", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -528,7 +531,7 @@
   "label": "Taxes and Charges Deducted", 
   "oldfieldname": "other_charges_deducted", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -539,7 +542,7 @@
   "label": "Grand Total", 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -560,7 +563,7 @@
   "fieldtype": "Currency", 
   "label": "Write Off Amount", 
   "no_copy": 1, 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1
  }, 
  {
diff --git a/accounts/doctype/purchase_invoice/purchase_invoice_list.js b/accounts/doctype/purchase_invoice/purchase_invoice_list.js
deleted file mode 100644
index 149f46f..0000000
--- a/accounts/doctype/purchase_invoice/purchase_invoice_list.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// render
-wn.doclistviews['Purchase Invoice'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d);
-		this.fields = this.fields.concat([
-			'`tabPurchase Invoice`.supplier_name',
-			'`tabPurchase Invoice`.credit_to',
-			'`tabPurchase Invoice`.currency',
-			'IFNULL(`tabPurchase Invoice`.grand_total_import, 0) as grand_total_import',
-			'IFNULL(`tabPurchase Invoice`.grand_total, 0) as grand_total',
-			'IFNULL(`tabPurchase Invoice`.outstanding_amount, 0) as outstanding_amount',
-			"`tabPurchase Invoice`.posting_date"
-		]);
-		this.stats = this.stats.concat(['company']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		data.paid = data.docstatus == 1 ?
-			flt(((data.grand_total - data.outstanding_amount) / data.grand_total) * 100, 2) : 0;
-	},
-
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content: 'avatar'},
-		{width: '3%', content: 'docstatus'},
-		{width: '15%', content: 'name'},
-		{
-			width: '34%', 
-			content: function(parent, data) {
-				$(parent).html(data.supplier_name?data.supplier_name:data.credit_to)
-			}, 
-			css: {color: '#222'}
-		},
-		{
-			width: '18%', 
-			content: function(parent, data) { 
-				$(parent).html(format_currency(data.grand_total_import, data.currency)) 
-			},
-			css: {'text-align':'right'}
-		},
-		{width: '10%', content: 'paid', type:'bar-graph', label:'Paid'},
-		{width: '12%', content:'posting_date',
-			css: {'text-align': 'right', 'color':'#777'},
-			title: "Purchase Invoice Date", type: "date"},
-	]
-});
diff --git a/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt b/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
index 08ff6fc..dadf28a 100644
--- a/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
+++ b/accounts/doctype/purchase_invoice_advance/purchase_invoice_advance.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:08", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:17", 
+  "modified": "2013-01-29 16:27:50", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -55,7 +55,7 @@
   "label": "Advance Amount", 
   "oldfieldname": "advance_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1, 
   "width": "100px"
  }, 
@@ -66,7 +66,7 @@
   "label": "Allocated Amount", 
   "oldfieldname": "allocated_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "width": "100px"
  }, 
  {
diff --git a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
index bc763a4..2891a12 100755
--- a/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
+++ b/accounts/doctype/purchase_invoice_item/purchase_invoice_item.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-24 11:03:29", 
+  "creation": "2013-01-28 10:05:58", 
   "docstatus": 0, 
-  "modified": "2013-01-25 18:28:20", 
+  "modified": "2013-01-29 16:28:04", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -119,7 +119,7 @@
   "fieldname": "purchase_ref_rate", 
   "fieldtype": "Currency", 
   "label": "Ref Rate*", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1
  }, 
  {
@@ -129,7 +129,7 @@
   "label": "Rate*", 
   "oldfieldname": "rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "reqd": 1
  }, 
@@ -140,7 +140,7 @@
   "label": "Amount*", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "reqd": 1
diff --git a/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt b/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
index 976a215..6067afb 100644
--- a/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
+++ b/accounts/doctype/purchase_taxes_and_charges/purchase_taxes_and_charges.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:08", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:17", 
+  "modified": "2013-01-29 16:27:50", 
   "modified_by": "Administrator", 
   "owner": "wasim@webnotestech.com"
  }, 
@@ -72,7 +72,7 @@
   "label": "Rate", 
   "oldfieldname": "rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "reqd": 0
  }, 
  {
@@ -82,7 +82,7 @@
   "label": "Amount", 
   "oldfieldname": "tax_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "reqd": 0
  }, 
  {
@@ -92,7 +92,7 @@
   "label": "Total", 
   "oldfieldname": "total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
@@ -159,7 +159,7 @@
   "no_copy": 1, 
   "oldfieldname": "total_tax_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "report_hide": 1
  }, 
@@ -173,7 +173,7 @@
   "no_copy": 1, 
   "oldfieldname": "total_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "report_hide": 1
  }
diff --git a/accounts/doctype/sales_invoice/sales_invoice.txt b/accounts/doctype/sales_invoice/sales_invoice.txt
index 2b35a2d..c7c8fba 100644
--- a/accounts/doctype/sales_invoice/sales_invoice.txt
+++ b/accounts/doctype/sales_invoice/sales_invoice.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-10 16:34:08", 
+  "creation": "2013-01-29 17:54:09", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:17", 
+  "modified": "2013-01-29 18:22:52", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -118,6 +118,7 @@
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
+  "in_list_view": 1, 
   "label": "Name", 
   "oldfieldname": "customer_name", 
   "oldfieldtype": "Data", 
@@ -244,7 +245,7 @@
   "label": "Net Total*", 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 0, 
   "read_only": 1, 
   "reqd": 1
@@ -414,7 +415,7 @@
   "label": "Total Taxes and Charges", 
   "oldfieldname": "other_charges_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -450,7 +451,7 @@
   "label": "Grand Total", 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "reqd": 1, 
@@ -463,7 +464,7 @@
   "label": "Rounded Total", 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -485,7 +486,7 @@
   "label": "Total Advance", 
   "oldfieldname": "total_advance", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -493,11 +494,12 @@
   "doctype": "DocField", 
   "fieldname": "outstanding_amount", 
   "fieldtype": "Currency", 
+  "in_list_view": 1, 
   "label": "Outstanding Amount", 
   "no_copy": 1, 
   "oldfieldname": "outstanding_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -513,6 +515,7 @@
   "doctype": "DocField", 
   "fieldname": "grand_total_export", 
   "fieldtype": "Currency", 
+  "in_list_view": 1, 
   "label": "Grand Total (Export)", 
   "oldfieldname": "grand_total_export", 
   "oldfieldtype": "Currency", 
@@ -549,7 +552,7 @@
   "label": "Gross Profit", 
   "oldfieldname": "gross_profit", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -582,7 +585,7 @@
   "label": "Paid Amount", 
   "oldfieldname": "paid_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1
  }, 
  {
@@ -613,7 +616,7 @@
   "fieldname": "write_off_amount", 
   "fieldtype": "Currency", 
   "label": "Write Off Amount", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1
  }, 
  {
@@ -1027,7 +1030,7 @@
   "label": "Total Commission", 
   "oldfieldname": "total_commission", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1
  }, 
  {
diff --git a/accounts/doctype/sales_invoice/sales_invoice_list.js b/accounts/doctype/sales_invoice/sales_invoice_list.js
deleted file mode 100644
index 463350b..0000000
--- a/accounts/doctype/sales_invoice/sales_invoice_list.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// render
-wn.doclistviews['Sales Invoice'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d);
-		this.fields = this.fields.concat([
-			"`tabSales Invoice`.customer_name", 
-			"`tabSales Invoice`.debit_to", 
-			"ifnull(`tabSales Invoice`.outstanding_amount,0) as outstanding_amount", 
-			"ifnull(`tabSales Invoice`.grand_total,0) as grand_total", 
-			"`tabSales Invoice`.currency", 
-			"ifnull(`tabSales Invoice`.grand_total_export,0) as grand_total_export",
-			"`tabSales Invoice`.posting_date",
-		]);
-	},
-	prepare_data: function(data) {
-		this._super(data);
-		data.paid = (data.docstatus == 1) ? 
-				flt((data.grand_total - data.outstanding_amount) / data.grand_total * 100, 2) : 0;
-	},
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content: 'avatar'},
-		{width: '3%', content: 'docstatus'},
-		{width: '15%', content: 'name'},
-		{
-			width: '34%', 
-			content: function(parent, data) {
-				$(parent).html(data.customer_name?data.customer_name:data.debit_to)
-			}, 
-			css: {color: '#222'}
-		},
-		{
-			width: '18%', 
-			content: function(parent, data) { 
-				$(parent).html(format_currency(data.grand_total_export, data.currency)) 
-			},
-			css: {'text-align':'right'}
-		},
-		{width: '10%', content: 'paid', type:'bar-graph', label:'Paid'},
-		{width: '12%', content:'posting_date',
-			css: {'text-align': 'right', 'color':'#777'},
-			title: "Sales Invoice Date", type: "date"}
-	]
-});
diff --git a/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt b/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
index f7c3c5a..6216c89 100644
--- a/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
+++ b/accounts/doctype/sales_invoice_advance/sales_invoice_advance.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:09", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:18", 
+  "modified": "2013-01-29 16:27:51", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -55,7 +55,7 @@
   "label": "Advance amount", 
   "oldfieldname": "advance_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1, 
   "width": "120px"
  }, 
@@ -66,7 +66,7 @@
   "label": "Allocated amount", 
   "oldfieldname": "allocated_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "width": "120px"
  }, 
  {
diff --git a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
index 43685b2..88c5aa8 100644
--- a/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
+++ b/accounts/doctype/sales_invoice_item/sales_invoice_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:09", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:18", 
+  "modified": "2013-01-29 16:27:51", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -140,7 +140,7 @@
   "label": "Price List Rate*", 
   "oldfieldname": "base_ref_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -152,7 +152,7 @@
   "label": "Basic Rate*", 
   "oldfieldname": "basic_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "reqd": 1, 
   "search_index": 0
@@ -164,7 +164,7 @@
   "label": "Amount*", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "reqd": 1
diff --git a/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt b/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
index d5294a3..bbac704 100644
--- a/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
+++ b/accounts/doctype/sales_taxes_and_charges/sales_taxes_and_charges.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-24 11:03:30", 
+  "creation": "2013-01-24 15:56:19", 
   "docstatus": 0, 
-  "modified": "2013-01-24 14:15:49", 
+  "modified": "2013-01-29 16:28:04", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -82,7 +82,7 @@
   "label": "Amount", 
   "oldfieldname": "tax_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "reqd": 0
  }, 
  {
@@ -92,7 +92,7 @@
   "label": "Total", 
   "oldfieldname": "total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
@@ -136,7 +136,7 @@
   "no_copy": 1, 
   "oldfieldname": "total_tax_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "report_hide": 1
  }, 
@@ -150,7 +150,7 @@
   "no_copy": 1, 
   "oldfieldname": "total_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "report_hide": 1
  }, 
diff --git a/accounts/page/financial_analytics/financial_analytics.txt b/accounts/page/financial_analytics/financial_analytics.txt
index 5572a0e..4993200 100644
--- a/accounts/page/financial_analytics/financial_analytics.txt
+++ b/accounts/page/financial_analytics/financial_analytics.txt
@@ -1,40 +1,36 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-27 16:30:52", 
   "docstatus": 0, 
-  "creation": "2012-09-18 11:05:48", 
+  "modified": "2013-01-29 13:11:00", 
   "modified_by": "Administrator", 
-  "modified": "2012-10-04 17:02:43"
+  "owner": "Administrator"
  }, 
  {
-  "name": "__common__", 
-  "title": "Financial Analytics", 
-  "module": "Accounts", 
   "doctype": "Page", 
+  "module": "Accounts", 
+  "name": "__common__", 
   "page_name": "financial-analytics", 
-  "standard": "Yes"
+  "standard": "Yes", 
+  "title": "Financial Analytics"
  }, 
  {
+  "doctype": "Page Role", 
   "name": "__common__", 
   "parent": "financial-analytics", 
+  "parentfield": "roles", 
+  "parenttype": "Page"
+ }, 
+ {
+  "doctype": "Page", 
+  "name": "financial-analytics"
+ }, 
+ {
   "doctype": "Page Role", 
-  "parenttype": "Page", 
-  "parentfield": "roles"
+  "role": "Analytics"
  }, 
  {
-  "name": "financial-analytics", 
-  "doctype": "Page"
- }, 
- {
-  "role": "Analytics", 
-  "doctype": "Page Role"
- }, 
- {
-  "role": "Accounts Manager", 
-  "doctype": "Page Role"
- }, 
- {
-  "role": "Accounts User", 
-  "doctype": "Page Role"
+  "doctype": "Page Role", 
+  "role": "Accounts Manager"
  }
 ]
\ No newline at end of file
diff --git a/accounts/page/financial_statements/financial_statements.txt b/accounts/page/financial_statements/financial_statements.txt
index 7796103..b8226d0 100644
--- a/accounts/page/financial_statements/financial_statements.txt
+++ b/accounts/page/financial_statements/financial_statements.txt
@@ -1,35 +1,31 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-27 16:30:52", 
   "docstatus": 0, 
-  "creation": "2012-06-14 15:07:28", 
+  "modified": "2013-01-29 13:11:17", 
   "modified_by": "Administrator", 
-  "modified": "2012-10-04 17:04:05"
+  "owner": "Administrator"
  }, 
  {
-  "name": "__common__", 
-  "module": "Accounts", 
-  "page_name": "Financial Statements", 
   "doctype": "Page", 
+  "module": "Accounts", 
+  "name": "__common__", 
+  "page_name": "Financial Statements", 
   "standard": "Yes"
  }, 
  {
+  "doctype": "Page Role", 
   "name": "__common__", 
   "parent": "Financial Statements", 
-  "doctype": "Page Role", 
+  "parentfield": "roles", 
   "parenttype": "Page", 
-  "parentfield": "roles"
+  "role": "Accounts Manager"
  }, 
  {
-  "name": "Financial Statements", 
-  "doctype": "Page"
+  "doctype": "Page", 
+  "name": "Financial Statements"
  }, 
  {
-  "role": "Accounts User", 
-  "doctype": "Page Role"
- }, 
- {
-  "role": "Accounts Manager", 
   "doctype": "Page Role"
  }
 ]
\ No newline at end of file
diff --git a/accounts/page/trial_balance/trial_balance.txt b/accounts/page/trial_balance/trial_balance.txt
index eafc1d2..7c85601 100644
--- a/accounts/page/trial_balance/trial_balance.txt
+++ b/accounts/page/trial_balance/trial_balance.txt
@@ -1,40 +1,36 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-27 16:30:52", 
   "docstatus": 0, 
-  "creation": "2012-09-18 11:05:48", 
+  "modified": "2013-01-29 13:11:43", 
   "modified_by": "Administrator", 
-  "modified": "2012-10-04 17:01:47"
+  "owner": "Administrator"
  }, 
  {
-  "name": "__common__", 
-  "title": "Trial Balance", 
-  "module": "Accounts", 
   "doctype": "Page", 
+  "module": "Accounts", 
+  "name": "__common__", 
   "page_name": "trial-balance", 
-  "standard": "Yes"
+  "standard": "Yes", 
+  "title": "Trial Balance"
  }, 
  {
+  "doctype": "Page Role", 
   "name": "__common__", 
   "parent": "trial-balance", 
+  "parentfield": "roles", 
+  "parenttype": "Page"
+ }, 
+ {
+  "doctype": "Page", 
+  "name": "trial-balance"
+ }, 
+ {
   "doctype": "Page Role", 
-  "parenttype": "Page", 
-  "parentfield": "roles"
+  "role": "Analytics"
  }, 
  {
-  "name": "trial-balance", 
-  "doctype": "Page"
- }, 
- {
-  "role": "Analytics", 
-  "doctype": "Page Role"
- }, 
- {
-  "role": "Accounts Manager", 
-  "doctype": "Page Role"
- }, 
- {
-  "role": "Accounts User", 
-  "doctype": "Page Role"
+  "doctype": "Page Role", 
+  "role": "Accounts Manager"
  }
 ]
\ No newline at end of file
diff --git a/buying/doctype/purchase_order/purchase_order.txt b/buying/doctype/purchase_order/purchase_order.txt
index eed812f..38c526e 100644
--- a/buying/doctype/purchase_order/purchase_order.txt
+++ b/buying/doctype/purchase_order/purchase_order.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-22 15:11:37", 
+  "creation": "2013-01-29 17:54:10", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:28", 
+  "modified": "2013-01-29 18:16:48", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -31,6 +31,7 @@
   "parent": "Purchase Order", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
+  "permlevel": 0, 
   "read": 1, 
   "report": 1
  }, 
@@ -70,6 +71,7 @@
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
+  "in_list_view": 1, 
   "label": "Name", 
   "read_only": 1
  }, 
@@ -401,6 +403,7 @@
   "doctype": "DocField", 
   "fieldname": "grand_total_import", 
   "fieldtype": "Currency", 
+  "in_list_view": 1, 
   "label": "Grand Total (Import)", 
   "no_copy": 0, 
   "oldfieldname": "grand_total_import", 
@@ -435,7 +438,7 @@
   "no_copy": 1, 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "reqd": 0
@@ -448,7 +451,7 @@
   "no_copy": 0, 
   "oldfieldname": "other_charges_added", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -460,7 +463,7 @@
   "no_copy": 0, 
   "oldfieldname": "other_charges_deducted", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -472,7 +475,7 @@
   "no_copy": 1, 
   "oldfieldname": "total_tax", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -484,7 +487,7 @@
   "no_copy": 1, 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -495,7 +498,7 @@
   "label": "Rounded Total", 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -724,7 +727,8 @@
   "description": "% of materials received against this Purchase Order", 
   "doctype": "DocField", 
   "fieldname": "per_received", 
-  "fieldtype": "Float", 
+  "fieldtype": "Percent", 
+  "in_list_view": 1, 
   "label": "% Received", 
   "no_copy": 1, 
   "oldfieldname": "per_received", 
@@ -737,7 +741,8 @@
   "description": "% of materials billed against this Purchase Order.", 
   "doctype": "DocField", 
   "fieldname": "per_billed", 
-  "fieldtype": "Float", 
+  "fieldtype": "Percent", 
+  "in_list_view": 1, 
   "label": "% Billed", 
   "no_copy": 1, 
   "oldfieldname": "per_billed", 
@@ -814,7 +819,6 @@
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
   "role": "Purchase User", 
   "submit": 1, 
   "write": 1
@@ -822,21 +826,13 @@
  {
   "doctype": "DocPerm", 
   "match": "supplier", 
-  "permlevel": 0, 
   "role": "Supplier"
  }, 
  {
-  "doctype": "DocPerm", 
-  "permlevel": 2, 
-  "role": "All", 
-  "write": 1
- }, 
- {
   "amend": 1, 
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
   "role": "Purchase Manager", 
   "submit": 1, 
   "write": 1
@@ -846,7 +842,6 @@
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
   "role": "Material User", 
   "submit": 0, 
   "write": 0
diff --git a/buying/doctype/purchase_order/purchase_order_list.js b/buying/doctype/purchase_order/purchase_order_list.js
deleted file mode 100644
index 387d24d..0000000
--- a/buying/doctype/purchase_order/purchase_order_list.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// render
-wn.doclistviews['Purchase Order'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabPurchase Order`.supplier_name", 
-			"ifnull(`tabPurchase Order`.per_received,0) as per_received",
-			"ifnull(`tabPurchase Order`.per_billed,0) as per_billed",
-			"`tabPurchase Order`.currency", 
-			"ifnull(`tabPurchase Order`.grand_total_import,0) as grand_total_import",
-			"`tabPurchase Order`.transaction_date",
-			
-		]);
-		this.stats = this.stats.concat(['status', 'company']);
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content: 'avatar'},
-		{width: '3%', content: 'docstatus'},
-		{width: '15%', content: 'name'},
-		{width: '28%', content: 'supplier_name+tags', css: {color:'#222'}},
-		{
-			width: '18%', 
-			content: function(parent, data) { 
-				$(parent).html(format_currency(data.grand_total_import, data.currency)) 
-			},
-			css: {'text-align':'right'}
-		},
-		{width: '8%', content: 'per_received', type:'bar-graph', label:'Received'},
-		{width: '8%', content: 'per_billed', type:'bar-graph', label:'Billed'},
-		{width: '12%', content:'transaction_date',
-			css: {'text-align': 'right', 'color':'#777'},
-			title: "Purchase Order Date", type: "date"}
-	]
-
-});
-
diff --git a/buying/doctype/purchase_order_item/purchase_order_item.txt b/buying/doctype/purchase_order_item/purchase_order_item.txt
index 5f45be2..20ba876 100755
--- a/buying/doctype/purchase_order_item/purchase_order_item.txt
+++ b/buying/doctype/purchase_order_item/purchase_order_item.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-24 11:03:31", 
+  "creation": "2013-01-28 10:05:59", 
   "docstatus": 0, 
-  "modified": "2013-01-28 11:56:26", 
+  "modified": "2013-01-29 16:28:05", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -152,7 +152,7 @@
   "fieldname": "purchase_ref_rate", 
   "fieldtype": "Currency", 
   "label": "Ref Rate*", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1
  }, 
  {
@@ -163,7 +163,7 @@
   "label": "Rate*", 
   "oldfieldname": "purchase_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "print_width": "100px", 
   "reqd": 1, 
@@ -177,7 +177,7 @@
   "label": "Amount*", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "reqd": 1
@@ -344,7 +344,7 @@
   "oldfieldtype": "Currency", 
   "print_hide": 1, 
   "print_width": "100px", 
-  "read_only": 0, 
+  "read_only": 1, 
   "width": "100px"
  }, 
  {
diff --git a/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt b/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt
index d78763e..dd71989 100644
--- a/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt
+++ b/buying/doctype/purchase_order_item_supplied/purchase_order_item_supplied.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:10", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:19", 
+  "modified": "2013-01-29 16:27:51", 
   "modified_by": "Administrator", 
   "owner": "dhanalekshmi@webnotestech.com"
  }, 
@@ -80,7 +80,7 @@
   "label": "Rate", 
   "oldfieldname": "rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
@@ -89,7 +89,7 @@
   "label": "Amount", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
diff --git a/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt b/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt
index f7a0f8c..4c5ba81 100644
--- a/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt
+++ b/buying/doctype/purchase_receipt_item_supplied/purchase_receipt_item_supplied.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:10", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:19", 
+  "modified": "2013-01-29 16:27:51", 
   "modified_by": "Administrator", 
   "owner": "wasim@webnotestech.com"
  }, 
@@ -98,7 +98,7 @@
   "label": "Rate", 
   "oldfieldname": "rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
@@ -117,7 +117,7 @@
   "label": "Amount", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
diff --git a/buying/doctype/purchase_request/purchase_request.txt b/buying/doctype/purchase_request/purchase_request.txt
index 6d98053..6aad4ee 100644
--- a/buying/doctype/purchase_request/purchase_request.txt
+++ b/buying/doctype/purchase_request/purchase_request.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-21 18:19:20", 
   "docstatus": 0, 
-  "modified": "2013-01-23 16:59:33", 
+  "modified": "2013-01-29 18:14:11", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -183,6 +183,7 @@
   "doctype": "DocField", 
   "fieldname": "requested_by", 
   "fieldtype": "Data", 
+  "in_list_view": 0, 
   "label": "Requested By", 
   "no_copy": 1, 
   "oldfieldname": "requested_by", 
@@ -226,6 +227,7 @@
   "fieldname": "status", 
   "fieldtype": "Select", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Status", 
   "no_copy": 1, 
   "oldfieldname": "status", 
@@ -242,7 +244,8 @@
   "description": "% of materials ordered against this Purchase Requisition", 
   "doctype": "DocField", 
   "fieldname": "per_ordered", 
-  "fieldtype": "Float", 
+  "fieldtype": "Percent", 
+  "in_list_view": 1, 
   "label": "% Ordered", 
   "no_copy": 1, 
   "oldfieldname": "per_ordered", 
@@ -280,6 +283,7 @@
   "doctype": "DocField", 
   "fieldname": "remark", 
   "fieldtype": "Small Text", 
+  "in_list_view": 1, 
   "label": "Remarks", 
   "no_copy": 1, 
   "oldfieldname": "remark", 
diff --git a/buying/doctype/purchase_request/purchase_request_list.js b/buying/doctype/purchase_request/purchase_request_list.js
deleted file mode 100644
index 967c2d4..0000000
--- a/buying/doctype/purchase_request/purchase_request_list.js
+++ /dev/null
@@ -1,37 +0,0 @@
-// render
-wn.doclistviews['Purchase Request'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabPurchase Request`.status",
-			"IFNULL(`tabPurchase Request`.per_ordered, 0) as per_ordered",
-			"`tabPurchase Request`.remark",
-			"`tabPurchase Request`.transaction_date",
-		]);
-		this.stats = this.stats.concat(['status', 'company']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		if(['Stopped', 'Cancelled'].indexOf(data.status)!=-1) {
-			data.label_type = 'important';
-		} else if(data.status == 'Submitted') {
-			data.label_type = 'success';
-		}
-
-		data.status_html = repl('<span class="label label-%(label_type)s">%(status)s</span>', data);
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content:'avatar'},
-		{width: '3%', content:'docstatus'},
-		{width: '17%', content:'name'},
-		{width: '50%', content:'status_html+remark+tags', css: {'color': '#222'}},
-		{width: '10%', content: 'per_ordered', type:'bar-graph', label:'Ordered'},
-		{width: '12%', content:'transaction_date',
-			css: {'text-align': 'right', 'color':'#777'},
-			title: "Quotation Date", type: "date"}
-	]
-});
-
diff --git a/buying/doctype/supplier/supplier.txt b/buying/doctype/supplier/supplier.txt
index 370a16e..95fa717 100644
--- a/buying/doctype/supplier/supplier.txt
+++ b/buying/doctype/supplier/supplier.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:11", 
   "docstatus": 0, 
-  "modified": "2013-01-22 16:55:25", 
+  "modified": "2013-01-29 14:35:42", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -52,6 +52,7 @@
   "doctype": "DocField", 
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
+  "in_list_view": 1, 
   "label": "Supplier Name", 
   "no_copy": 1, 
   "oldfieldname": "supplier_name", 
@@ -62,6 +63,7 @@
   "doctype": "DocField", 
   "fieldname": "supplier_type", 
   "fieldtype": "Link", 
+  "in_list_view": 1, 
   "label": "Supplier Type", 
   "oldfieldname": "supplier_type", 
   "oldfieldtype": "Link", 
diff --git a/buying/doctype/supplier/supplier_list.js b/buying/doctype/supplier/supplier_list.js
deleted file mode 100644
index 6f9a356..0000000
--- a/buying/doctype/supplier/supplier_list.js
+++ /dev/null
@@ -1,27 +0,0 @@
-// render
-wn.doclistviews['Supplier'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabSupplier`.supplier_type",
-			"`tabSupplier`.supplier_name",
-		]);
-		//this.stats = this.stats.concat(['company']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		data.supplier_name = repl("<a href=\"#!Form/Supplier/%(name)s\">%(supplier_name)s</a>",
-			data);
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content:'avatar'},
-		{width: '50%', content:'supplier_name'},
-		{width: '10%', content:'tags'},
-		{width: '20%', content:'supplier_type', css: {'color': '#aaa'}},
-		{width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
-	]
-});
-
diff --git a/buying/doctype/supplier_quotation/supplier_quotation.txt b/buying/doctype/supplier_quotation/supplier_quotation.txt
index 709e2cd..f5fa37d 100644
--- a/buying/doctype/supplier_quotation/supplier_quotation.txt
+++ b/buying/doctype/supplier_quotation/supplier_quotation.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-21 18:19:20", 
+  "creation": "2013-01-29 17:54:11", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:28", 
+  "modified": "2013-01-29 18:11:12", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -31,6 +31,7 @@
   "parent": "Supplier Quotation", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
+  "permlevel": 0, 
   "read": 1, 
   "report": 1
  }, 
@@ -70,6 +71,7 @@
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
+  "in_list_view": 1, 
   "label": "Name", 
   "read_only": 1
  }, 
@@ -356,6 +358,7 @@
   "doctype": "DocField", 
   "fieldname": "grand_total_import", 
   "fieldtype": "Currency", 
+  "in_list_view": 1, 
   "label": "Grand Total (Import)", 
   "no_copy": 0, 
   "oldfieldname": "grand_total_import", 
@@ -390,7 +393,7 @@
   "no_copy": 1, 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "reqd": 0
@@ -403,7 +406,7 @@
   "no_copy": 0, 
   "oldfieldname": "other_charges_added", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -415,7 +418,7 @@
   "no_copy": 0, 
   "oldfieldname": "other_charges_deducted", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -427,7 +430,7 @@
   "no_copy": 1, 
   "oldfieldname": "total_tax", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -439,7 +442,7 @@
   "no_copy": 1, 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -450,7 +453,7 @@
   "label": "Rounded Total", 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -676,7 +679,6 @@
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
   "role": "Manufacturing Manager", 
   "submit": 1, 
   "write": 1
@@ -686,7 +688,6 @@
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
   "role": "Purchase Manager", 
   "submit": 1, 
   "write": 1
@@ -696,7 +697,6 @@
   "cancel": 0, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
   "role": "Purchase User", 
   "submit": 0, 
   "write": 1
@@ -706,7 +706,6 @@
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
   "role": "Material User", 
   "submit": 0, 
   "write": 0
@@ -716,19 +715,8 @@
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
   "role": "Supplier", 
   "submit": 0, 
   "write": 0
- }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "permlevel": 2, 
-  "role": "All", 
-  "submit": 0, 
-  "write": 1
  }
 ]
\ No newline at end of file
diff --git a/buying/doctype/supplier_quotation/supplier_quotation_list.js b/buying/doctype/supplier_quotation/supplier_quotation_list.js
deleted file mode 100644
index e7e6a5b..0000000
--- a/buying/doctype/supplier_quotation/supplier_quotation_list.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// render
-wn.doclistviews['Supplier Quotation'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabSupplier Quotation`.supplier_name",
-			"`tabSupplier Quotation`.currency", 
-			"ifnull(`tabSupplier Quotation`.grand_total_import,0) as grand_total_import",
-			"`tabSupplier Quotation`.transaction_date",
-		]);
-		this.stats = this.stats.concat(['status', 'company']);
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content:'avatar'},
-		{width: '3%', content:'docstatus'},
-		{width: '15%', content:'name'},
-		{width: '44%', content:'supplier_name+tags', css: {color:'#222'}},
-		{
-			width: '18%', 
-			content: function(parent, data) { 
-				$(parent).html(format_currency(data.grand_total_import, data.currency)) 
-			},
-			css: {'text-align':'right'}
-		},
-		{width: '12%', content:'transaction_date',
-			css: {'text-align': 'right', 'color':'#777'},
-			title: "Supplier Quotation Date", type: "date"}
-	]
-
-});
-
diff --git a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
index 60b424e..ab1f3e4 100644
--- a/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
+++ b/buying/doctype/supplier_quotation_item/supplier_quotation_item.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-24 11:03:32", 
+  "creation": "2013-01-28 10:06:00", 
   "docstatus": 0, 
-  "modified": "2013-01-25 18:28:54", 
+  "modified": "2013-01-29 16:28:05", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -138,7 +138,7 @@
   "fieldname": "purchase_ref_rate", 
   "fieldtype": "Currency", 
   "label": "Ref Rate*", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1
  }, 
  {
@@ -149,7 +149,7 @@
   "label": "Rate*", 
   "oldfieldname": "purchase_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "print_width": "100px", 
   "reqd": 1, 
@@ -163,7 +163,7 @@
   "label": "Amount*", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "reqd": 1
diff --git a/hr/doctype/appraisal/appraisal.txt b/hr/doctype/appraisal/appraisal.txt
index 718910d..9ed85e6 100644
--- a/hr/doctype/appraisal/appraisal.txt
+++ b/hr/doctype/appraisal/appraisal.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:12", 
   "docstatus": 0, 
-  "modified": "2013-01-22 14:55:57", 
+  "modified": "2013-01-29 17:50:21", 
   "modified_by": "Administrator", 
   "owner": "ashwini@webnotestech.com"
  }, 
@@ -76,6 +76,7 @@
   "fieldname": "employee_name", 
   "fieldtype": "Data", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "For Employee Name", 
   "oldfieldname": "employee_name", 
   "oldfieldtype": "Data", 
@@ -96,6 +97,7 @@
   "fieldname": "status", 
   "fieldtype": "Select", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Status", 
   "no_copy": 1, 
   "oldfieldname": "status", 
@@ -111,6 +113,7 @@
   "fieldname": "start_date", 
   "fieldtype": "Date", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Start Date", 
   "oldfieldname": "start_date", 
   "oldfieldtype": "Date", 
@@ -159,6 +162,7 @@
   "doctype": "DocField", 
   "fieldname": "total_score", 
   "fieldtype": "Float", 
+  "in_list_view": 1, 
   "label": "Total Score (Out of 5)", 
   "no_copy": 1, 
   "oldfieldname": "total_score", 
diff --git a/hr/doctype/appraisal/appraisal_list.js b/hr/doctype/appraisal/appraisal_list.js
deleted file mode 100644
index 074bced..0000000
--- a/hr/doctype/appraisal/appraisal_list.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// render
-wn.doclistviews['Appraisal'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabAppraisal`.employee_name",
-			"`tabAppraisal`.start_date",
-			"`tabAppraisal`.end_date",
-			"`tabAppraisal`.total_score",
-			"`tabAppraisal`.status",
-		]);
-		this.stats = this.stats.concat(['company']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		data.start_date = wn.datetime.str_to_user(data.start_date);
-		data.end_date = wn.datetime.str_to_user(data.end_date);
-		data.date_range = data.start_date + " to " + data.end_date;
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '3%', content: 'docstatus'},
-		{width: '15%', content: 'name'},
-		{width: '25%', content: 'employee_name'},
-		{width: '12%', content: 'status+tags'},
-		{width: '12%', content: 'total_score', css: {'text-align': 'right'}},
-		{width: '30%', content:'date_range',
-			css: {'text-align': 'right', 'color': '#777'}},
-]
-});
\ No newline at end of file
diff --git a/hr/doctype/attendance/attendance.txt b/hr/doctype/attendance/attendance.txt
index 1a68f81..127b7e3 100644
--- a/hr/doctype/attendance/attendance.txt
+++ b/hr/doctype/attendance/attendance.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:13", 
   "docstatus": 0, 
-  "modified": "2013-01-22 14:16:20", 
+  "modified": "2013-01-29 17:52:06", 
   "modified_by": "Administrator", 
   "owner": "ashwini@webnotestech.com"
  }, 
@@ -73,6 +73,7 @@
   "doctype": "DocField", 
   "fieldname": "employee_name", 
   "fieldtype": "Data", 
+  "in_list_view": 1, 
   "label": "Employee Name", 
   "oldfieldname": "employee_name", 
   "oldfieldtype": "Data"
@@ -82,6 +83,7 @@
   "fieldname": "status", 
   "fieldtype": "Select", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Status", 
   "no_copy": 1, 
   "oldfieldname": "status", 
@@ -95,6 +97,7 @@
   "fieldname": "leave_type", 
   "fieldtype": "Link", 
   "hidden": 1, 
+  "in_list_view": 1, 
   "label": "Leave Type", 
   "oldfieldname": "leave_type", 
   "oldfieldtype": "Link", 
diff --git a/hr/doctype/attendance/attendance_list.js b/hr/doctype/attendance/attendance_list.js
deleted file mode 100644
index 4505980..0000000
--- a/hr/doctype/attendance/attendance_list.js
+++ /dev/null
@@ -1,29 +0,0 @@
-// render
-wn.doclistviews['Attendance'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabAttendance`.att_date",
-			"`tabAttendance`.employee_name",
-			"`tabAttendance`.`status`",
-			
-		]);
-		this.stats = this.stats.concat(['company']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		data.att_date = wn.datetime.str_to_user(data.att_date);
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '3%', content:'docstatus'},
-		{width: '12%', content:'name'},
-		{width: '47%', content:'employee_name'},
-		{width: '13%', content:'status'},
-		{width: '10%', content:'tags'},
-		//{width: '23%', content:'supplier_type', css: {'color': '#aaa'}},
-		{width: '12%', content:'att_date', css: {'text-align': 'right', 'color':'#777'}}
-	]
-});
\ No newline at end of file
diff --git a/hr/doctype/designation/designation.txt b/hr/doctype/designation/designation.txt
index 0f1fd5b..e606a35 100644
--- a/hr/doctype/designation/designation.txt
+++ b/hr/doctype/designation/designation.txt
@@ -2,11 +2,12 @@
  {
   "creation": "2013-01-10 16:34:13", 
   "docstatus": 0, 
-  "modified": "2013-01-22 14:46:41", 
+  "modified": "2013-01-29 19:06:00", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
  {
+  "allow_rename": 1, 
   "autoname": "field:designation_name", 
   "doctype": "DocType", 
   "document_type": "Master", 
@@ -32,6 +33,7 @@
   "permlevel": 0, 
   "read": 1, 
   "report": 1, 
+  "role": "HR User", 
   "submit": 0, 
   "write": 1
  }, 
@@ -58,15 +60,6 @@
   "reqd": 1
  }, 
  {
-  "doctype": "DocPerm", 
-  "role": "System Manager"
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "HR User"
- }, 
- {
-  "doctype": "DocPerm", 
-  "role": "HR Manager"
+  "doctype": "DocPerm"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt
index 3a1809f..e8879f5 100644
--- a/hr/doctype/employee/employee.txt
+++ b/hr/doctype/employee/employee.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-10 16:34:13", 
+  "creation": "2013-01-23 19:57:17", 
   "docstatus": 0, 
-  "modified": "2013-01-22 14:56:01", 
+  "modified": "2013-01-29 17:47:25", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -56,6 +56,7 @@
   "doctype": "DocField", 
   "fieldname": "image_view", 
   "fieldtype": "Image", 
+  "in_list_view": 1, 
   "label": "Image View", 
   "options": "image"
  }, 
@@ -95,6 +96,7 @@
   "doctype": "DocField", 
   "fieldname": "employee_name", 
   "fieldtype": "Data", 
+  "in_list_view": 1, 
   "label": "Full Name", 
   "oldfieldname": "employee_name", 
   "oldfieldtype": "Data", 
@@ -191,6 +193,7 @@
   "fieldname": "status", 
   "fieldtype": "Select", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Status", 
   "oldfieldname": "status", 
   "oldfieldtype": "Select", 
@@ -203,6 +206,7 @@
   "fieldname": "employment_type", 
   "fieldtype": "Link", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Employment Type", 
   "oldfieldname": "employment_type", 
   "oldfieldtype": "Link", 
diff --git a/hr/doctype/employee/employee_list.js b/hr/doctype/employee/employee_list.js
deleted file mode 100644
index fbd338e..0000000
--- a/hr/doctype/employee/employee_list.js
+++ /dev/null
@@ -1,56 +0,0 @@
-// render
-wn.doclistviews['Employee'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabEmployee`.employee_name",
-			"`tabEmployee`.employee_number",
-			"`tabEmployee`.employment_type",
-			"`tabEmployee`.designation",
-			"`tabEmployee`.department",
-			"`tabEmployee`.branch",
-			"`tabEmployee`.company",
-			"`tabEmployee`.reports_to",
-			"`tabEmployee`.date_of_joining",
-			"`tabEmployee`.status",
-		]);
-		this.stats = this.stats.concat(['status', 'company']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		
-		data.employee_name = data.employee_name
-			+ (data.employee_number ? ' [' + data.employee_number + ']' : '');
-		
-		data.date_of_joining = wn.datetime.str_to_user(data.date_of_joining);
-		data.designation = data.designation
-			+ (data.employment_type ? ' [' + data.employment_type + ']' : '');
-
-		var concat_list = [];
-		data.designation && concat_list.push(data.designation);
-		data.department && concat_list.push(data.department);
-		data.company && concat_list.push(data.company);
-		data.branch && concat_list.push(data.branch);
-		data.description = concat_list.join(", ");
-		
-		if(data.status=='Left') {
-			data.label_type = 'important';
-		} else if(data.status=='Active') {
-			data.label_type = 'success';
-		}
-		data.status_html = repl('<span class="label label-%(label_type)s" \
-			support_list_status="%(status)s">%(status)s</span>', data);
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '12%', content: 'name'},
-		{width: '25%', content: 'employee_name'},
-		{width: '10%', content: 'status_html'},
-		{width: '38%', content: 'description+tags',
-			css: {'color': '#aaa'}},
-		{width: '12%', content:'date_of_joining',
-			css: {'text-align': 'right', 'color': '#777'}},
-]
-});
\ No newline at end of file
diff --git a/hr/doctype/employee_external_work_history/employee_external_work_history.txt b/hr/doctype/employee_external_work_history/employee_external_work_history.txt
index 8c822ef..eea7d65 100644
--- a/hr/doctype/employee_external_work_history/employee_external_work_history.txt
+++ b/hr/doctype/employee_external_work_history/employee_external_work_history.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:14", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:20", 
+  "modified": "2013-01-29 16:27:51", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -47,7 +47,7 @@
   "label": "Salary", 
   "oldfieldname": "salary", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
diff --git a/hr/doctype/expense_claim/expense_claim.txt b/hr/doctype/expense_claim/expense_claim.txt
index ea52df8..954a694 100644
--- a/hr/doctype/expense_claim/expense_claim.txt
+++ b/hr/doctype/expense_claim/expense_claim.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:14", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:20", 
+  "modified": "2013-01-29 17:43:18", 
   "modified_by": "Administrator", 
   "owner": "harshada@webnotestech.com"
  }, 
@@ -44,6 +44,7 @@
   "fieldname": "approval_status", 
   "fieldtype": "Select", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Approval Status", 
   "no_copy": 1, 
   "oldfieldname": "approval_status", 
@@ -72,11 +73,12 @@
   "fieldname": "total_claimed_amount", 
   "fieldtype": "Currency", 
   "in_filter": 0, 
+  "in_list_view": 1, 
   "label": "Total Claimed Amount", 
   "no_copy": 1, 
   "oldfieldname": "total_claimed_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1, 
   "reqd": 0, 
   "width": "160px"
@@ -86,11 +88,12 @@
   "fieldname": "total_sanctioned_amount", 
   "fieldtype": "Currency", 
   "in_filter": 0, 
+  "in_list_view": 1, 
   "label": "Total Sanctioned Amount", 
   "no_copy": 1, 
   "oldfieldname": "total_sanctioned_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1, 
   "width": "160px"
  }, 
@@ -134,6 +137,7 @@
   "fieldname": "employee_name", 
   "fieldtype": "Data", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Employee Name", 
   "oldfieldname": "employee_name", 
   "oldfieldtype": "Data", 
diff --git a/hr/doctype/expense_claim/expense_claim_list.js b/hr/doctype/expense_claim/expense_claim_list.js
deleted file mode 100644
index 4e5a0dc..0000000
--- a/hr/doctype/expense_claim/expense_claim_list.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// render
-wn.doclistviews['Expense Claim'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabExpense Claim`.employee_name",
-			"`tabExpense Claim`.posting_date",
-			"`tabExpense Claim`.approval_status",
-			"`tabExpense Claim`.total_claimed_amount",
-			"`tabExpense Claim`.total_sanctioned_amount",
-			"`tabExpense Claim`.company",
-		]);
-		this.stats = this.stats.concat(['company']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		data.posting_date = wn.datetime.str_to_user(data.posting_date);
-		data.employee_name = data.employee_name + ' claimed '
-			+ format_currency(data.total_claimed_amount, erpnext.get_currency(data.company));
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content: 'avatar'},
-		{width: '3%', content: 'docstatus'},
-		{width: '12%', content: 'name'},
-		{width: '41%', content: 'employee_name+tags'},
-		{width: '10%', content: 'approval_status'},
-		{
-			width: '12%',
-			content: function(parent, data) {
-				$(parent).html(format_currency(data.total_sanctioned_amount, 
-					erpnext.get_currency(data.company)));
-			},
-			css: {'text-align': 'right'},
-		},
-		{width: '12%', content: 'posting_date',
-			css: {'text-align': 'right', 'color': '#777'}},
-	]
-});
\ No newline at end of file
diff --git a/hr/doctype/expense_claim_detail/expense_claim_detail.txt b/hr/doctype/expense_claim_detail/expense_claim_detail.txt
index 2d6a23c..d8f9400 100644
--- a/hr/doctype/expense_claim_detail/expense_claim_detail.txt
+++ b/hr/doctype/expense_claim_detail/expense_claim_detail.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:14", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:20", 
+  "modified": "2013-01-29 16:27:51", 
   "modified_by": "Administrator", 
   "owner": "harshada@webnotestech.com"
  }, 
@@ -61,7 +61,7 @@
   "label": "Claim Amount", 
   "oldfieldname": "claim_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "reqd": 1, 
   "width": "150px"
  }, 
@@ -74,7 +74,7 @@
   "no_copy": 1, 
   "oldfieldname": "sanctioned_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "width": "150px"
  }
 ]
\ No newline at end of file
diff --git a/hr/doctype/job_applicant/job_applicant.txt b/hr/doctype/job_applicant/job_applicant.txt
index 0078c95..4500d9b 100644
--- a/hr/doctype/job_applicant/job_applicant.txt
+++ b/hr/doctype/job_applicant/job_applicant.txt
@@ -1,77 +1,80 @@
 [
  {
-  "owner": "Administrator", 
-  "docstatus": 0, 
   "creation": "2013-01-15 16:32:13", 
+  "docstatus": 0, 
+  "modified": "2013-01-29 17:44:52", 
   "modified_by": "Administrator", 
-  "modified": "2013-01-15 17:40:29"
+  "owner": "Administrator"
  }, 
  {
-  "autoname": "field:applicant_name", 
   "allow_attach": 1, 
+  "autoname": "field:applicant_name", 
   "description": "Applicant for a Job", 
   "doctype": "DocType", 
-  "module": "HR", 
   "document_type": "Transaction", 
+  "module": "HR", 
   "name": "__common__"
  }, 
  {
+  "doctype": "DocField", 
   "name": "__common__", 
   "parent": "Job Applicant", 
-  "doctype": "DocField", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
+  "permlevel": 0
  }, 
  {
-  "parent": "Job Applicant", 
-  "read": 1, 
   "cancel": 1, 
-  "name": "__common__", 
   "create": 1, 
   "doctype": "DocPerm", 
-  "write": 1, 
+  "name": "__common__", 
+  "parent": "Job Applicant", 
+  "parentfield": "permissions", 
   "parenttype": "DocType", 
-  "role": "HR User", 
-  "report": 1, 
   "permlevel": 0, 
-  "parentfield": "permissions"
+  "read": 1, 
+  "report": 1, 
+  "role": "HR User", 
+  "write": 1
  }, 
  {
-  "name": "Job Applicant", 
-  "doctype": "DocType"
+  "doctype": "DocType", 
+  "name": "Job Applicant"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Applicant Name", 
   "fieldname": "applicant_name", 
   "fieldtype": "Data", 
+  "in_list_view": 1, 
+  "label": "Applicant Name", 
   "reqd": 1
  }, 
  {
   "doctype": "DocField", 
-  "label": "Email Id", 
   "fieldname": "email_id", 
-  "fieldtype": "Data"
+  "fieldtype": "Data", 
+  "label": "Email Id"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Status", 
   "fieldname": "status", 
   "fieldtype": "Select", 
+  "in_list_view": 1, 
+  "label": "Status", 
   "options": "Open\nReplied\nRejected\nHold"
  }, 
  {
   "doctype": "DocField", 
-  "width": "50%", 
   "fieldname": "column_break_3", 
-  "fieldtype": "Column Break"
+  "fieldtype": "Column Break", 
+  "width": "50%"
  }, 
  {
   "doctype": "DocField", 
-  "label": "Job Opening", 
   "fieldname": "job_opening", 
   "fieldtype": "Link", 
+  "in_list_view": 1, 
+  "label": "Job Opening", 
   "options": "Job Opening"
  }, 
  {
@@ -81,18 +84,19 @@
  }, 
  {
   "doctype": "DocField", 
-  "label": "Thread HTML", 
   "fieldname": "thread_html", 
-  "fieldtype": "HTML"
+  "fieldtype": "HTML", 
+  "label": "Thread HTML"
  }, 
  {
-  "print_hide": 1, 
-  "no_copy": 1, 
   "doctype": "DocField", 
-  "label": "File List", 
   "fieldname": "file_list", 
   "fieldtype": "Text", 
-  "hidden": 1
+  "hidden": 1, 
+  "in_list_view": 1, 
+  "label": "File List", 
+  "no_copy": 1, 
+  "print_hide": 1
  }, 
  {
   "doctype": "DocPerm"
diff --git a/hr/doctype/job_applicant/job_applicant_list.js b/hr/doctype/job_applicant/job_applicant_list.js
deleted file mode 100644
index 3d149ef..0000000
--- a/hr/doctype/job_applicant/job_applicant_list.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// render
-wn.doclistviews['Job Applicant'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabJob Applicant`.status", 
-			'`tabJob Applicant`.modified_by'
-			
-		]);
-		this.stats = this.stats.concat(['status']);
-		this.show_hide_check_column();
-	},
-	
-	label_style: {
-		"status": {
-			"Open": "danger",
-			"Hold": "info",
-			"Rejected": "plain",
-		}
-	},
-	
-	prepare_data: function(data) {
-		this._super(data);
-		
-		data.label_style = this.label_style.status[data.status];
-		if(data.label_style=="danger")
-			data.label_style = "important"
-		
-		data.status_html = repl('<span class="label \
-			label-%(label_style)s">%(status)s</span>', data);
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content:'avatar_modified'},
-		{width: '30%', content:'name'},
-		{width: '50%', content:'status_html'},		
-		{width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
-	]
-
-});
diff --git a/hr/doctype/leave_application/leave_application.txt b/hr/doctype/leave_application/leave_application.txt
index cc2bf15..310d205 100644
--- a/hr/doctype/leave_application/leave_application.txt
+++ b/hr/doctype/leave_application/leave_application.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:14", 
   "docstatus": 0, 
-  "modified": "2013-01-22 14:47:02", 
+  "modified": "2013-01-29 17:41:32", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -42,6 +42,7 @@
   "doctype": "DocField", 
   "fieldname": "status", 
   "fieldtype": "Select", 
+  "in_list_view": 1, 
   "label": "Status", 
   "no_copy": 1, 
   "options": "Open\nApproved\nRejected", 
@@ -61,6 +62,7 @@
   "fieldname": "leave_type", 
   "fieldtype": "Select", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Leave Type", 
   "options": "link:Leave Type", 
   "permlevel": 0, 
@@ -71,6 +73,7 @@
   "doctype": "DocField", 
   "fieldname": "from_date", 
   "fieldtype": "Date", 
+  "in_list_view": 1, 
   "label": "From Date", 
   "permlevel": 0, 
   "reqd": 1, 
@@ -80,6 +83,7 @@
   "doctype": "DocField", 
   "fieldname": "to_date", 
   "fieldtype": "Date", 
+  "in_list_view": 0, 
   "label": "To Date", 
   "permlevel": 0, 
   "reqd": 1, 
@@ -123,6 +127,7 @@
   "fieldname": "employee_name", 
   "fieldtype": "Data", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Employee Name", 
   "permlevel": 0, 
   "read_only": 1, 
diff --git a/hr/doctype/leave_application/leave_application_list.js b/hr/doctype/leave_application/leave_application_list.js
deleted file mode 100644
index 4c80e7f..0000000
--- a/hr/doctype/leave_application/leave_application_list.js
+++ /dev/null
@@ -1,51 +0,0 @@
-// render
-wn.doclistviews['Leave Application'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabLeave Application`.status",
-			"`tabLeave Application`.employee_name",
-			"`tabLeave Application`.total_leave_days",
-			"`tabLeave Application`.from_date",
-			"`tabLeave Application`.to_date",
-			
-		]);
-		this.stats = this.stats.concat(['company']);
-	},
-
-	label_style: {
-		"status": {
-			"Open": "danger",
-			"Approved": "success",
-			"Rejected": "info",
-		}
-	},
-	
-	prepare_data: function(data) {
-		this._super(data);
-
-		data.label_style = this.label_style.status[data.status];		
-		data.status_html = repl('<span class="label \
-			label-%(label_style)s">%(status)s</span>', data);
-
-		data.from_date = wn.datetime.str_to_user(data.from_date);
-		data.to_date = wn.datetime.str_to_user(data.to_date);
-		data.date_range = (data.from_date === data.to_date)
-						? data.from_date
-						: data.from_date + " to " + data.to_date;
-		data.total_leave_days = data.total_leave_days<=1
-								? data.total_leave_days + " day"
-								: data.total_leave_days + " days"
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content:'avatar'},
-		{width: '3%', content:'docstatus'},
-		{width: '15%', content:'status_html'},
-		{width: '12%', content:'name'},
-		{width: '25%', content:'employee_name+tags'},
-		{width: '25%', content:'date_range'},
-		{width: '12%', content:'modified'},
-	]
-});
\ No newline at end of file
diff --git a/hr/doctype/salary_slip/salary_slip.txt b/hr/doctype/salary_slip/salary_slip.txt
index 0f68971..54db9a1 100644
--- a/hr/doctype/salary_slip/salary_slip.txt
+++ b/hr/doctype/salary_slip/salary_slip.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:15", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:20", 
+  "modified": "2013-01-29 17:38:08", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -61,6 +61,7 @@
   "fieldname": "employee_name", 
   "fieldtype": "Data", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Employee Name", 
   "oldfieldname": "employee_name", 
   "oldfieldtype": "Data", 
@@ -153,6 +154,7 @@
   "fieldname": "fiscal_year", 
   "fieldtype": "Link", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Fiscal Year", 
   "oldfieldname": "fiscal_year", 
   "oldfieldtype": "Data", 
@@ -174,6 +176,7 @@
   "fieldname": "month", 
   "fieldtype": "Select", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Month", 
   "oldfieldname": "month", 
   "oldfieldtype": "Select", 
@@ -326,7 +329,7 @@
   "label": "Arrear Amount", 
   "oldfieldname": "arrear_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
@@ -335,7 +338,7 @@
   "label": "Leave Encashment Amount", 
   "oldfieldname": "encashment_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
@@ -344,7 +347,7 @@
   "label": "Gross Pay", 
   "oldfieldname": "gross_pay", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
@@ -354,7 +357,7 @@
   "label": "Total Deduction", 
   "oldfieldname": "total_deduction", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
@@ -372,7 +375,7 @@
   "label": "Net Pay", 
   "oldfieldname": "net_pay", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
@@ -380,7 +383,7 @@
   "fieldname": "rounded_total", 
   "fieldtype": "Currency", 
   "label": "Rounded Total", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
diff --git a/hr/doctype/salary_slip/salary_slip_list.js b/hr/doctype/salary_slip/salary_slip_list.js
deleted file mode 100644
index dc0b836..0000000
--- a/hr/doctype/salary_slip/salary_slip_list.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// render
-wn.doclistviews['Salary Slip'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabSalary Slip`.employee_name",
-			"`tabSalary Slip`.designation",
-			"`tabSalary Slip`.branch",
-			"`tabSalary Slip`.rounded_total",
-			"`tabSalary Slip`.company",
-			"`tabSalary Slip`.month",
-			"`tabSalary Slip`.fiscal_year",
-		]);
-		this.stats = this.stats.concat(['company']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		var concat_list = [];
-		data.designation && concat_list.push(data.designation);
-		data.branch && concat_list.push(data.branch);
-		data.description = concat_list.join(", ");
-		data.month = month_list[cint(data.month)-1] + " [" + data.fiscal_year + "]";
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '3%', content: 'docstatus'},
-		{width: '14%', content: 'name'},
-		{width: '20%', content: 'employee_name'},
-		{width: '27%', content: 'description+tags', css: {'color': '#aaa'}},
-		{width: '17%', content:'month', css: {'text-align': 'right', 'color':'#aaa'}},
-		{
-			width: '16%',
-			content: function(parent, data) {
-				$(parent).html(format_currency(data.rounded_total,
-					erpnext.get_currency(data.company)));
-			},
-			css: {'text-align': 'right'},
-		},
-]
-});
\ No newline at end of file
diff --git a/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt b/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
index 545fe94..958147c 100644
--- a/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
+++ b/hr/doctype/salary_slip_deduction/salary_slip_deduction.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:15", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:20", 
+  "modified": "2013-01-29 16:27:52", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -55,7 +55,7 @@
   "label": "Amount", 
   "oldfieldname": "d_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
@@ -63,7 +63,7 @@
   "fieldname": "d_modified_amount", 
   "fieldtype": "Currency", 
   "label": "Modified Amount", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
diff --git a/hr/doctype/salary_slip_earning/salary_slip_earning.txt b/hr/doctype/salary_slip_earning/salary_slip_earning.txt
index aafab56..e0acf29 100644
--- a/hr/doctype/salary_slip_earning/salary_slip_earning.txt
+++ b/hr/doctype/salary_slip_earning/salary_slip_earning.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:15", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:20", 
+  "modified": "2013-01-29 16:27:52", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -55,7 +55,7 @@
   "label": "Amount", 
   "oldfieldname": "e_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
@@ -63,7 +63,7 @@
   "fieldname": "e_modified_amount", 
   "fieldtype": "Currency", 
   "label": "Modified Amount", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
diff --git a/hr/doctype/salary_structure/salary_structure.txt b/hr/doctype/salary_structure/salary_structure.txt
index e30d9a2..c2efac6 100644
--- a/hr/doctype/salary_structure/salary_structure.txt
+++ b/hr/doctype/salary_structure/salary_structure.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-10 16:34:15", 
+  "creation": "2013-01-23 19:57:18", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:20", 
+  "modified": "2013-01-29 17:35:34", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -58,6 +58,7 @@
   "doctype": "DocField", 
   "fieldname": "employee_name", 
   "fieldtype": "Data", 
+  "in_list_view": 1, 
   "label": "Employee Name", 
   "oldfieldname": "employee_name", 
   "oldfieldtype": "Data", 
@@ -123,6 +124,7 @@
   "fieldname": "is_active", 
   "fieldtype": "Select", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Is Active", 
   "oldfieldname": "is_active", 
   "oldfieldtype": "Select", 
@@ -133,6 +135,7 @@
   "doctype": "DocField", 
   "fieldname": "from_date", 
   "fieldtype": "Date", 
+  "in_list_view": 1, 
   "label": "From Date", 
   "oldfieldname": "from_date", 
   "oldfieldtype": "Date", 
@@ -142,6 +145,7 @@
   "doctype": "DocField", 
   "fieldname": "to_date", 
   "fieldtype": "Date", 
+  "in_list_view": 1, 
   "label": "To Date", 
   "oldfieldname": "to_date", 
   "oldfieldtype": "Date"
@@ -155,7 +159,7 @@
   "label": "CTC", 
   "oldfieldname": "ctc", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "reqd": 1
  }, 
  {
@@ -235,7 +239,7 @@
   "label": "Total Earning", 
   "oldfieldname": "total_earning", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
@@ -245,7 +249,7 @@
   "label": "Total Deduction", 
   "oldfieldname": "total_deduction", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
@@ -259,7 +263,7 @@
   "fieldname": "net_pay", 
   "fieldtype": "Currency", 
   "label": "Net Pay", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
diff --git a/hr/doctype/salary_structure/salary_structure_list.js b/hr/doctype/salary_structure/salary_structure_list.js
deleted file mode 100644
index 53182ed..0000000
--- a/hr/doctype/salary_structure/salary_structure_list.js
+++ /dev/null
@@ -1,42 +0,0 @@
-// render
-wn.doclistviews['Salary Structure'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabSalary Structure`.employee_name",
-			"`tabSalary Structure`.designation",
-			"`tabSalary Structure`.branch",
-			"`tabSalary Structure`.net_pay",
-			"`tabSalary Structure`.from_date",
-			"`tabSalary Structure`.to_date",
-			"`tabSalary Structure`.company"
-		]);
-		this.stats = this.stats.concat(['company']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		var concat_list = [];
-		data.designation && concat_list.push(data.designation);
-		data.branch && concat_list.push(data.branch);
-		data.description = concat_list.join(", ");
-		data.period = data.from_date + (data.to_date && ' to ' + data.to_date);
-	},
-	
-	columns: [
-		{width: '2%', content: 'check'},
-		{width: '2%', content: 'docstatus'},
-		{width: '13%', content: 'name'},
-		{width: '18%', content: 'employee_name'},
-		{width: '24%', content: 'description+tags', css: {'color': '#aaa'}},
-		{width: '26%', content:'period', css: {'text-align': 'right', 'color':'#aaa'}},
-		{
-			width: '15%',
-			content: function(parent, data) {
-				$(parent).html(format_currency(data.net_pay, 
-					erpnext.get_currency(data.company)));
-			},
-			css: {'text-align': 'right'},
-		},
-]
-});
\ No newline at end of file
diff --git a/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt b/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
index 262cf95..1591b0f 100644
--- a/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
+++ b/hr/doctype/salary_structure_deduction/salary_structure_deduction.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:16", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:21", 
+  "modified": "2013-01-29 16:27:52", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -42,7 +42,7 @@
   "label": "Amount", 
   "oldfieldname": "d_modified_amt", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
diff --git a/hr/doctype/salary_structure_earning/salary_structure_earning.txt b/hr/doctype/salary_structure_earning/salary_structure_earning.txt
index 25d4294..74f6fe2 100644
--- a/hr/doctype/salary_structure_earning/salary_structure_earning.txt
+++ b/hr/doctype/salary_structure_earning/salary_structure_earning.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:16", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:21", 
+  "modified": "2013-01-29 16:27:52", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -44,7 +44,7 @@
   "label": "Amount", 
   "oldfieldname": "modified_value", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
diff --git a/hr/page/hr_home/hr_home.js b/hr/page/hr_home/hr_home.js
index e26cbd3..fe2c5d4 100644
--- a/hr/page/hr_home/hr_home.js
+++ b/hr/page/hr_home/hr_home.js
@@ -124,6 +124,11 @@
 				doctype: "Employment Type"
 			},	
 			{
+				"label": wn._("Designation"),
+				"description": wn._("Employee Designation."),
+				doctype: "Designation"
+			},	
+			{
 				"label": wn._("Appraisal Template"),
 				"description": wn._("Template for employee performance appraisals."),
 				doctype: "Appraisal Template"
diff --git a/manufacturing/doctype/bom/bom.txt b/manufacturing/doctype/bom/bom.txt
index c960494..922fd80 100644
--- a/manufacturing/doctype/bom/bom.txt
+++ b/manufacturing/doctype/bom/bom.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-22 15:11:38", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:00:25", 
+  "modified": "2013-01-29 17:32:53", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -57,6 +57,7 @@
   "fieldname": "item", 
   "fieldtype": "Link", 
   "in_filter": 1, 
+  "in_list_view": 0, 
   "label": "Item", 
   "oldfieldname": "item", 
   "oldfieldtype": "Link", 
@@ -76,6 +77,7 @@
   "fieldname": "is_active", 
   "fieldtype": "Check", 
   "hidden": 0, 
+  "in_list_view": 1, 
   "label": "Is Active", 
   "no_copy": 1, 
   "oldfieldname": "is_active", 
@@ -87,6 +89,7 @@
   "doctype": "DocField", 
   "fieldname": "is_default", 
   "fieldtype": "Check", 
+  "in_list_view": 1, 
   "label": "Is Default", 
   "no_copy": 1, 
   "oldfieldname": "is_default", 
@@ -151,6 +154,7 @@
   "doctype": "DocField", 
   "fieldname": "total_cost", 
   "fieldtype": "Float", 
+  "in_list_view": 1, 
   "label": "Total Cost", 
   "read_only": 1
  }, 
@@ -217,6 +221,7 @@
   "doctype": "DocField", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
+  "in_list_view": 1, 
   "label": "Item Desription", 
   "read_only": 1
  }, 
diff --git a/manufacturing/doctype/bom/bom_list.js b/manufacturing/doctype/bom/bom_list.js
deleted file mode 100644
index 59e34d0..0000000
--- a/manufacturing/doctype/bom/bom_list.js
+++ /dev/null
@@ -1,47 +0,0 @@
-// render
-wn.doclistviews['BOM'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d);
-		this.fields = this.fields.concat([
-			'`tabBOM`.item',
-			'`tabBOM`.uom',
-			'IFNULL(`tabBOM`.quantity, 0) as quantity',
-			'`tabBOM`.is_active',
-			'`tabBOM`.costing_date',
-			'`tabBOM`.total_cost',
-			'`tabBOM`.description',
-		]);
-		this.stats = this.stats.concat(['company']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		data.costing_date = wn.datetime.str_to_user(data.costing_date);
-		data.description = (data.is_active ? '' : '[Inactive] ') + data.description;
-	},
-
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '3%', content: 'docstatus'},
-		{width: '15%', content: 'name'},
-		{width: '15%', content: 'item'},
-		{width: '23%', content: 'description+tags'},
-		{
-			width: '12%', 
-			content: function(parent, data) { 
-				$(parent).html(data.quantity + ' ' + data.uom) 
-			},
-			css: {'text-align':'right'},
-		},
-		{
-			width: '20%', 
-			content: function(parent, data) {
-				$(parent).html(format_currency(data.total_cost));
-			},
-			css: {'text-align': 'right'},
-		},
-		{width: '12%', content:'costing_date', css: {
-			'text-align': 'right', 'color':'#777'
-		}},
-	]
-});
diff --git a/manufacturing/doctype/production_order/production_order.txt b/manufacturing/doctype/production_order/production_order.txt
index 188622f..53b7f1c 100644
--- a/manufacturing/doctype/production_order/production_order.txt
+++ b/manufacturing/doctype/production_order/production_order.txt
@@ -1,210 +1,215 @@
 [
  {
-  "owner": "Administrator", 
+  "creation": "2013-01-10 16:34:16", 
   "docstatus": 0, 
-  "creation": "2012-12-20 14:31:18", 
+  "modified": "2013-01-29 17:17:31", 
   "modified_by": "Administrator", 
-  "modified": "2012-12-24 18:39:00"
+  "owner": "Administrator"
  }, 
  {
-  "is_submittable": 1, 
-  "in_create": 0, 
   "autoname": "naming_series:", 
-  "module": "Manufacturing", 
   "doctype": "DocType", 
+  "in_create": 0, 
+  "is_submittable": 1, 
+  "module": "Manufacturing", 
   "name": "__common__"
  }, 
  {
-  "name": "__common__", 
-  "parent": "Production Order", 
   "doctype": "DocField", 
-  "parenttype": "DocType", 
-  "permlevel": 0, 
-  "parentfield": "fields"
- }, 
- {
-  "parent": "Production Order", 
-  "read": 1, 
-  "doctype": "DocPerm", 
-  "cancel": 1, 
   "name": "__common__", 
-  "amend": 1, 
-  "create": 1, 
-  "submit": 1, 
-  "write": 1, 
+  "parent": "Production Order", 
+  "parentfield": "fields", 
   "parenttype": "DocType", 
-  "role": "Manufacturing User", 
-  "report": 1, 
-  "permlevel": 0, 
-  "parentfield": "permissions"
+  "permlevel": 0
  }, 
  {
-  "name": "Production Order", 
-  "doctype": "DocType"
+  "amend": 1, 
+  "cancel": 1, 
+  "create": 1, 
+  "doctype": "DocPerm", 
+  "name": "__common__", 
+  "parent": "Production Order", 
+  "parentfield": "permissions", 
+  "parenttype": "DocType", 
+  "permlevel": 0, 
+  "read": 1, 
+  "report": 1, 
+  "role": "Manufacturing User", 
+  "submit": 1, 
+  "write": 1
+ }, 
+ {
+  "doctype": "DocType", 
+  "name": "Production Order"
  }, 
  {
   "default": "PRO", 
   "doctype": "DocField", 
-  "label": "Series", 
   "fieldname": "naming_series", 
   "fieldtype": "Select", 
-  "reqd": 1, 
-  "options": "\nPRO"
- }, 
- {
-  "read_only": 1, 
-  "doctype": "DocField", 
-  "no_copy": 1, 
-  "search_index": 1, 
-  "oldfieldtype": "Select", 
-  "label": "Status", 
-  "oldfieldname": "status", 
-  "fieldname": "status", 
-  "fieldtype": "Select", 
-  "depends_on": "eval:!doc.__islocal", 
-  "reqd": 1, 
-  "options": "\nDraft\nSubmitted\nStopped\nIn Process\nCompleted\nCancelled", 
-  "in_filter": 1
- }, 
- {
-  "read_only": 0, 
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "Item To Manufacture", 
-  "oldfieldname": "production_item", 
-  "fieldname": "production_item", 
-  "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Item", 
-  "in_filter": 1
- }, 
- {
-  "read_only": 0, 
-  "description": "Bill of Material to be considered for manufacturing", 
-  "oldfieldtype": "Link", 
-  "doctype": "DocField", 
-  "label": "BOM No", 
-  "oldfieldname": "bom_no", 
-  "fieldname": "bom_no", 
-  "fieldtype": "Link", 
-  "depends_on": "production_item", 
-  "reqd": 1, 
-  "options": "BOM"
- }, 
- {
-  "read_only": 0, 
-  "description": "Manufactured quantity will be updated in this warehouse", 
-  "depends_on": "production_item", 
-  "doctype": "DocField", 
-  "label": "For Warehouse", 
-  "fieldname": "fg_warehouse", 
-  "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Warehouse"
- }, 
- {
-  "read_only": 0, 
-  "oldfieldtype": "Column Break", 
-  "doctype": "DocField", 
-  "width": "50%", 
-  "fieldname": "column_break1", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "read_only": 0, 
-  "oldfieldtype": "Currency", 
-  "doctype": "DocField", 
-  "label": "Qty To Manufacture", 
-  "oldfieldname": "qty", 
-  "fieldname": "qty", 
-  "fieldtype": "Float", 
-  "depends_on": "production_item", 
+  "label": "Series", 
+  "options": "\nPRO", 
   "reqd": 1
  }, 
  {
-  "read_only": 1, 
-  "description": "Automatically updated via Stock Entry of type Manufacture/Repack", 
-  "no_copy": 1, 
-  "oldfieldtype": "Currency", 
+  "depends_on": "eval:!doc.__islocal", 
   "doctype": "DocField", 
-  "label": "Manufactured Qty", 
-  "oldfieldname": "produced_qty", 
+  "fieldname": "status", 
+  "fieldtype": "Select", 
+  "in_filter": 1, 
+  "in_list_view": 1, 
+  "label": "Status", 
+  "no_copy": 1, 
+  "oldfieldname": "status", 
+  "oldfieldtype": "Select", 
+  "options": "\nDraft\nSubmitted\nStopped\nIn Process\nCompleted\nCancelled", 
+  "read_only": 1, 
+  "reqd": 1, 
+  "search_index": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "production_item", 
+  "fieldtype": "Link", 
+  "in_filter": 1, 
+  "in_list_view": 1, 
+  "label": "Item To Manufacture", 
+  "oldfieldname": "production_item", 
+  "oldfieldtype": "Link", 
+  "options": "Item", 
+  "read_only": 0, 
+  "reqd": 1
+ }, 
+ {
+  "depends_on": "production_item", 
+  "description": "Bill of Material to be considered for manufacturing", 
+  "doctype": "DocField", 
+  "fieldname": "bom_no", 
+  "fieldtype": "Link", 
+  "in_list_view": 1, 
+  "label": "BOM No", 
+  "oldfieldname": "bom_no", 
+  "oldfieldtype": "Link", 
+  "options": "BOM", 
+  "read_only": 0, 
+  "reqd": 1
+ }, 
+ {
+  "depends_on": "production_item", 
+  "description": "Manufactured quantity will be updated in this warehouse", 
+  "doctype": "DocField", 
+  "fieldname": "fg_warehouse", 
+  "fieldtype": "Link", 
+  "in_list_view": 1, 
+  "label": "For Warehouse", 
+  "options": "Warehouse", 
+  "read_only": 0, 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocField", 
+  "fieldname": "column_break1", 
+  "fieldtype": "Column Break", 
+  "oldfieldtype": "Column Break", 
+  "read_only": 0, 
+  "width": "50%"
+ }, 
+ {
+  "depends_on": "production_item", 
+  "doctype": "DocField", 
+  "fieldname": "qty", 
+  "fieldtype": "Float", 
+  "in_list_view": 1, 
+  "label": "Qty To Manufacture", 
+  "oldfieldname": "qty", 
+  "oldfieldtype": "Currency", 
+  "read_only": 0, 
+  "reqd": 1
+ }, 
+ {
+  "depends_on": "eval:doc.docstatus==1", 
+  "description": "Automatically updated via Stock Entry of type Manufacture/Repack", 
+  "doctype": "DocField", 
   "fieldname": "produced_qty", 
   "fieldtype": "Float", 
-  "depends_on": "eval:doc.docstatus==1"
+  "label": "Manufactured Qty", 
+  "no_copy": 1, 
+  "oldfieldname": "produced_qty", 
+  "oldfieldtype": "Currency", 
+  "read_only": 1
  }, 
  {
-  "read_only": 1, 
-  "oldfieldtype": "Data", 
+  "depends_on": "production_item", 
   "doctype": "DocField", 
-  "label": "Stock UOM", 
-  "oldfieldname": "stock_uom", 
   "fieldname": "stock_uom", 
   "fieldtype": "Data", 
-  "depends_on": "production_item"
+  "label": "Stock UOM", 
+  "oldfieldname": "stock_uom", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
-  "description": "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.", 
   "default": "1", 
+  "description": "If checked, BOM for sub-assembly items will be considered for getting raw materials. Otherwise, all sub-assembly items will be treated as a raw material.", 
   "doctype": "DocField", 
-  "label": "Use Multi-Level BOM", 
   "fieldname": "use_multi_level_bom", 
-  "fieldtype": "Check"
+  "fieldtype": "Check", 
+  "label": "Use Multi-Level BOM"
  }, 
  {
-  "read_only": 0, 
   "doctype": "DocField", 
-  "label": "More Info", 
   "fieldname": "more_info", 
-  "fieldtype": "Section Break"
+  "fieldtype": "Section Break", 
+  "label": "More Info", 
+  "read_only": 0
  }, 
  {
-  "read_only": 0, 
   "description": "Manufacture against Sales Order", 
   "doctype": "DocField", 
-  "label": "Sales Order", 
   "fieldname": "sales_order", 
   "fieldtype": "Link", 
-  "options": "Sales Order"
+  "label": "Sales Order", 
+  "options": "Sales Order", 
+  "read_only": 0
  }, 
  {
-  "read_only": 0, 
-  "oldfieldtype": "Link", 
   "doctype": "DocField", 
-  "label": "Project Name", 
-  "oldfieldname": "project_name", 
   "fieldname": "project_name", 
   "fieldtype": "Link", 
-  "options": "Project", 
-  "in_filter": 1
- }, 
- {
-  "read_only": 0, 
-  "doctype": "DocField", 
-  "width": "50%", 
-  "fieldname": "column_break2", 
-  "fieldtype": "Column Break"
- }, 
- {
-  "read_only": 0, 
+  "in_filter": 1, 
+  "label": "Project Name", 
+  "oldfieldname": "project_name", 
   "oldfieldtype": "Link", 
+  "options": "Project", 
+  "read_only": 0
+ }, 
+ {
   "doctype": "DocField", 
-  "label": "Company", 
-  "oldfieldname": "company", 
+  "fieldname": "column_break2", 
+  "fieldtype": "Column Break", 
+  "read_only": 0, 
+  "width": "50%"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "company", 
   "fieldtype": "Link", 
-  "reqd": 1, 
-  "options": "Company"
+  "label": "Company", 
+  "oldfieldname": "company", 
+  "oldfieldtype": "Link", 
+  "options": "Company", 
+  "read_only": 0, 
+  "reqd": 1
  }, 
  {
-  "read_only": 1, 
-  "no_copy": 1, 
-  "oldfieldtype": "Data", 
   "doctype": "DocField", 
-  "label": "Amended From", 
-  "oldfieldname": "amended_from", 
   "fieldname": "amended_from", 
-  "fieldtype": "Data"
+  "fieldtype": "Data", 
+  "label": "Amended From", 
+  "no_copy": 1, 
+  "oldfieldname": "amended_from", 
+  "oldfieldtype": "Data", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocPerm"
diff --git a/manufacturing/doctype/production_order/production_order_list.js b/manufacturing/doctype/production_order/production_order_list.js
deleted file mode 100644
index dd56b71..0000000
--- a/manufacturing/doctype/production_order/production_order_list.js
+++ /dev/null
@@ -1,40 +0,0 @@
-// render
-wn.doclistviews['Production Order'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d);
-		this.fields = this.fields.concat([
-			'`tabProduction Order`.production_item',
-			'`tabProduction Order`.fg_warehouse',
-			'`tabProduction Order`.stock_uom',
-			'IFNULL(`tabProduction Order`.qty, 0) as qty',
-			'`tabProduction Order`.creation',
-			'`tabProduction Order`.status',
-		]);
-		this.stats = this.stats.concat(['company']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		data.creation = wn.datetime.str_to_user(data.creation);
-	},
-
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content: 'avatar'},
-		{width: '3%', content: 'docstatus'},
-		{width: '17%', content: 'name'},
-		{width: '16%', content: 'production_item'},
-		{width: '20%', content: 'fg_warehouse'},
-		{width: '12%', content: 'status+tags'},
-		{
-			width: '12%', 
-			content: function(parent, data) { 
-				$(parent).html(data.qty + ' ' + data.stock_uom) 
-			},
-			css: {'text-align':'right'}
-		},
-		{width: '12%', content:'creation', css: {
-			'text-align': 'right', 'color':'#777'
-		}},
-	]
-});
diff --git a/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
index de011dc..9c2b132 100644
--- a/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
+++ b/manufacturing/doctype/production_plan_sales_order/production_plan_sales_order.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:17", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:21", 
+  "modified": "2013-01-29 16:27:52", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -72,7 +72,7 @@
   "fieldname": "grand_total", 
   "fieldtype": "Currency", 
   "label": "Grand Total", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1, 
   "width": "120px"
  }, 
diff --git a/projects/doctype/project/project.txt b/projects/doctype/project/project.txt
index 4d089bd..11d473e 100644
--- a/projects/doctype/project/project.txt
+++ b/projects/doctype/project/project.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:17", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:21", 
+  "modified": "2013-01-29 17:01:19", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -215,11 +215,12 @@
   "doctype": "DocField", 
   "fieldname": "project_value", 
   "fieldtype": "Currency", 
+  "in_list_view": 1, 
   "label": "Project Value", 
   "no_copy": 0, 
   "oldfieldname": "project_value", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "reqd": 0, 
   "search_index": 0
  }, 
@@ -231,7 +232,7 @@
   "no_copy": 0, 
   "oldfieldname": "est_material_cost", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "search_index": 0
  }, 
  {
@@ -250,7 +251,7 @@
   "no_copy": 0, 
   "oldfieldname": "gross_margin_value", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "reqd": 0, 
   "search_index": 0
  }, 
@@ -262,7 +263,7 @@
   "no_copy": 0, 
   "oldfieldname": "per_gross_margin", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "reqd": 0, 
   "search_index": 0
  }, 
diff --git a/projects/doctype/project/project_list.js b/projects/doctype/project/project_list.js
deleted file mode 100644
index e0fc378..0000000
--- a/projects/doctype/project/project_list.js
+++ /dev/null
@@ -1,52 +0,0 @@
-// render
-wn.doclistviews['Project'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d);
-		this.fields = this.fields.concat([
-			'`tabProject`.project_name',
-			'`tabProject`.status',
-			'`tabProject`.is_active',
-			'`tabProject`.priority',
-			'IFNULL(`tabProject`.project_value, 0) as project_value',
-			'IFNULL(`tabProject`.per_gross_margin, 0) as per_gross_margin',
-			'`tabProject`.creation',
-		]);
-		//this.stats = this.stats.concat(['company']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		data.completion_date = wn.datetime.str_to_user(data.completion_date);
-	},
-
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '3%', content: 'docstatus'},
-		{width: '15%', content: 'name'},
-		{width: '22%', content: 'project_name+tags'},
-		{
-			width: '20%',
-			content: function(parent, data) {
-				$(parent).html(data.status + " [" + data.priority + "] " 
-					+ (data.is_active=='No'?" [Inactive]":""));
-			},
-		},
-		{
-			width: '15%', 
-			content: function(parent, data) {
-				$(parent).html(format_currency(data.project_value));
-			},
-			css: {'text-align': 'right'},
-		},
-		{
-			width: '10%', 
-			content: function(parent, data) {
-				$(parent).html(format_number(data.per_gross_margin) + " %");
-			},
-			css: {'text-align': 'right'},
-		},
-		{
-			width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}
-		},
-	]
-});
diff --git a/projects/doctype/task/task.txt b/projects/doctype/task/task.txt
index 96d6e41..f0e0f23 100644
--- a/projects/doctype/task/task.txt
+++ b/projects/doctype/task/task.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:17", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:21", 
+  "modified": "2013-01-29 16:27:52", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -57,6 +57,7 @@
   "fieldname": "subject", 
   "fieldtype": "Data", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Subject", 
   "oldfieldname": "subject", 
   "oldfieldtype": "Data", 
@@ -94,6 +95,7 @@
   "doctype": "DocField", 
   "fieldname": "project", 
   "fieldtype": "Link", 
+  "in_list_view": 1, 
   "label": "Project", 
   "oldfieldname": "project", 
   "oldfieldtype": "Link", 
@@ -103,6 +105,7 @@
   "doctype": "DocField", 
   "fieldname": "status", 
   "fieldtype": "Select", 
+  "in_list_view": 1, 
   "label": "Status", 
   "no_copy": 1, 
   "oldfieldname": "status", 
@@ -114,6 +117,7 @@
   "fieldname": "priority", 
   "fieldtype": "Select", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Priority", 
   "oldfieldname": "priority", 
   "oldfieldtype": "Select", 
@@ -171,7 +175,7 @@
   "label": "Allocated Budget", 
   "oldfieldname": "allocated_budget", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
@@ -205,7 +209,7 @@
   "label": "Actual Budget", 
   "oldfieldname": "actual_budget", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
diff --git a/projects/doctype/task/task_list.js b/projects/doctype/task/task_list.js
deleted file mode 100644
index 5221687..0000000
--- a/projects/doctype/task/task_list.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// render
-wn.doclistviews['Task'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d);
-		this.fields = this.fields.concat([
-			'`tabTask`.subject',
-			'`tabTask`.project',
-			'`tabTask`.status',
-			'`tabTask`.opening_date',
-			'`tabTask`.priority',
-		]);
-		this.stats = this.stats.concat(['status']);
-	},
-
-	label_style: {
-		"status": {
-			"Open": "danger",
-			"Closed": "success",
-			"Hold": "info",
-			"Waiting for Customer": "info"
-		}
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		
-		data.label_style = this.label_style.status[data.status];
-		if(data.label_style=="danger")
-			data.label_style = "important"
-		data.status_html = repl('<span class="label \
-			label-%(label_style)s">%(status)s</span>', data);
-
-		// escape double quotes
-		data.description = cstr(data.subject)
-			+ " | " + cstr(data.description);
-			
-		data.description = data.description.replace(/"/gi, '\"')
-							.replace(/</gi, '&lt;').replace(/>/gi, '&gt;');
-	},
-
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content: 'avatar_modified'},
-		{width: '20%', content:'name'},
-		{width: '10%', content:'status_html'},
-		{width: '40%', content: 'subject+tags'},
-		{width: '20%', content: 'project'},
-		{width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
-	]
-});
diff --git a/projects/doctype/timesheet/timesheet.txt b/projects/doctype/timesheet/timesheet.txt
index 8f3cc6e..649be40 100644
--- a/projects/doctype/timesheet/timesheet.txt
+++ b/projects/doctype/timesheet/timesheet.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:17", 
   "docstatus": 0, 
-  "modified": "2013-01-22 14:57:26", 
+  "modified": "2013-01-29 14:36:53", 
   "modified_by": "Administrator", 
   "owner": "ashwini@webnotestech.com"
  }, 
@@ -53,6 +53,7 @@
   "fieldname": "status", 
   "fieldtype": "Select", 
   "in_filter": 0, 
+  "in_list_view": 1, 
   "label": "Status", 
   "oldfieldname": "status", 
   "oldfieldtype": "Select", 
@@ -116,6 +117,7 @@
   "doctype": "DocField", 
   "fieldname": "notes", 
   "fieldtype": "Text", 
+  "in_list_view": 1, 
   "label": "Notes"
  }, 
  {
diff --git a/projects/doctype/timesheet/timesheet_list.js b/projects/doctype/timesheet/timesheet_list.js
deleted file mode 100644
index 66e4e5d..0000000
--- a/projects/doctype/timesheet/timesheet_list.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// render
-wn.doclistviews['Timesheet'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d);
-		this.fields = this.fields.concat([
-			'`tabTimesheet`.status',
-			'`tabTimesheet`.timesheet_date',
-			'`tabTimesheet`.owner',
-			'`tabTimesheet`.notes',
-			
-		]);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		data.timesheet_date = wn.datetime.str_to_user(data.timesheet_date);
-		if(data.notes && data.notes.length > 50) {
-			data.notes = '<span title="'+data.notes+'">' + 
-				data.notes.substr(0,50) + '...</span>';
-		}
-	},
-
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content: 'avatar'},
-		{width: '3%', content: 'docstatus'},
-		{width: '18%', content: 'name'},
-		{width: '12%', content: 'status'},
-		{width: '27%', content: 'notes+tags', css: {'color': '#777'}},
-		{width: '20%', content: 'owner'},
-		{width: '12%', content:'timesheet_date', css: {
-			'text-align': 'right', 'color':'#777'
-		}},
-	]
-});
diff --git a/public/js/utils.js b/public/js/utils.js
index 06d3a53..0f78705 100644
--- a/public/js/utils.js
+++ b/public/js/utils.js
@@ -20,7 +20,7 @@
 	if(!company && cur_frm)
 		company = cur_frm.doc.company;
 	if(company)
-		return wn.boot.company[company].default_currency || wn.boot.sysdefaults.currency;
+		return wn.model.get(":Company", company).default_currency || wn.boot.sysdefaults.currency;
 	else
 		return wn.boot.sysdefaults.currency;
 }
diff --git a/selling/doctype/customer/customer.txt b/selling/doctype/customer/customer.txt
index a907bda..a221daa 100644
--- a/selling/doctype/customer/customer.txt
+++ b/selling/doctype/customer/customer.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-10 16:34:18", 
+  "creation": "2013-01-23 19:57:18", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:21", 
+  "modified": "2013-01-29 16:28:03", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -52,6 +52,7 @@
   "fieldtype": "Data", 
   "hidden": 0, 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Customer Name", 
   "no_copy": 1, 
   "oldfieldname": "customer_name", 
@@ -127,6 +128,7 @@
   "doctype": "DocField", 
   "fieldname": "territory", 
   "fieldtype": "Link", 
+  "in_list_view": 1, 
   "label": "Territory", 
   "oldfieldname": "territory", 
   "oldfieldtype": "Link", 
@@ -277,7 +279,7 @@
   "label": "Credit Limit", 
   "oldfieldname": "credit_limit", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "permlevel": 2
  }, 
  {
diff --git a/selling/doctype/customer/customer_list.js b/selling/doctype/customer/customer_list.js
deleted file mode 100644
index 133beac..0000000
--- a/selling/doctype/customer/customer_list.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// render
-wn.doclistviews['Customer'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabCustomer`.customer_name",
-			"`tabCustomer`.territory",
-		]);
-		this.show_hide_check_column();
-	},
-	
-	prepare_data: function(data) {
-		this._super(data);
-		data.customer_name = repl("<a href=\"#!Form/Customer/%(name)s\">%(customer_name)s</a>",
-			data);
-	},
-	
-	columns: [
-		{width: '3%', content:'check'},
-		{width: '5%', content:'avatar'},
-		{width: '50%', content:'customer_name'},
-		{width: '10%', content:'tags'},
-		{width: '20%', content:'territory',
-			css: {'color': '#aaa'}},
-		{width: '12%', content:'modified',
-			css: {'text-align': 'right', 'color':'#777'}}
-	],
-});
diff --git a/selling/doctype/opportunity/opportunity.txt b/selling/doctype/opportunity/opportunity.txt
index 1547ad7..573f17e 100644
--- a/selling/doctype/opportunity/opportunity.txt
+++ b/selling/doctype/opportunity/opportunity.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-10 16:34:19", 
+  "creation": "2013-01-23 19:57:18", 
   "docstatus": 0, 
-  "modified": "2013-01-22 15:23:24", 
+  "modified": "2013-01-29 14:23:07", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -73,6 +73,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Customer", 
   "oldfieldname": "customer", 
   "oldfieldtype": "Link", 
@@ -87,6 +88,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Lead", 
   "oldfieldname": "lead", 
   "oldfieldtype": "Link", 
@@ -105,6 +107,7 @@
   "doctype": "DocField", 
   "fieldname": "status", 
   "fieldtype": "Select", 
+  "in_list_view": 1, 
   "label": "Status", 
   "no_copy": 1, 
   "oldfieldname": "status", 
diff --git a/selling/doctype/opportunity/opportunity_list.js b/selling/doctype/opportunity/opportunity_list.js
deleted file mode 100644
index 949422e..0000000
--- a/selling/doctype/opportunity/opportunity_list.js
+++ /dev/null
@@ -1,41 +0,0 @@
-wn.doclistviews['Opportunity'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			'tabOpportunity.enquiry_from',
-			'tabOpportunity.lead_name',
-			'tabOpportunity.customer_name',
-			'tabOpportunity.status',
-			'tabOpportunity.transaction_date',
-		]);
-		this.stats = this.stats.concat(['status', 'source', 'enquiry_from', 'company']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		if(['Order Confirmed', 'Quotation Sent']
-				.indexOf(data.status)!=-1) {
-			data.label_type = 'success';
-		} else if(data.status == 'Draft') {
-			data.label_type = 'info';
-		} else if(data.status == 'Submit') {
-			data.label_type = 'important';
-		}
-		data.status_html = repl('<span class="label label-%(label_type)s">%(status)s</span>', data);
-		if(data.enquiry_from == 'Lead') {
-			data.enquiry_name = repl('[%(enquiry_from)s] %(lead_name)s', data);
-		} else {
-			data.enquiry_name = repl('[%(enquiry_from)s] %(customer_name)s', data);
-		}
-	},
-
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '15%', content:'name'},
-		{width: '18%', content:'status_html'},
-		{width: '52%', content:'enquiry_name+tags', css: {color:'#222'}},
-		{width: '12%', content:'transaction_date',
-			css: {'text-align': 'right', 'color':'#777'},
-			title: "Opportunity Date", type: "date"}
-	]
-})
diff --git a/selling/doctype/opportunity_item/opportunity_item.txt b/selling/doctype/opportunity_item/opportunity_item.txt
index 8d80e8b..f9f8c79 100644
--- a/selling/doctype/opportunity_item/opportunity_item.txt
+++ b/selling/doctype/opportunity_item/opportunity_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:19", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:22", 
+  "modified": "2013-01-29 16:27:53", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -85,7 +85,7 @@
   "label": "Basic Rate", 
   "oldfieldname": "basic_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1
  }, 
  {
diff --git a/selling/doctype/quotation/quotation.txt b/selling/doctype/quotation/quotation.txt
index ca788d4..b2669e6 100644
--- a/selling/doctype/quotation/quotation.txt
+++ b/selling/doctype/quotation/quotation.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:19", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:22", 
+  "modified": "2013-01-29 16:27:53", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -105,6 +105,7 @@
   "fieldtype": "Text", 
   "hidden": 1, 
   "in_filter": 0, 
+  "in_list_view": 1, 
   "label": "Lead Name", 
   "read_only": 1
  }, 
@@ -113,6 +114,7 @@
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
+  "in_list_view": 1, 
   "label": "Customer Name", 
   "read_only": 1
  }, 
@@ -242,7 +244,7 @@
   "no_copy": 0, 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 0, 
   "read_only": 1, 
   "reqd": 0, 
@@ -414,7 +416,7 @@
   "label": "Taxes and Charges Total*", 
   "oldfieldname": "other_charges_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -442,7 +444,7 @@
   "no_copy": 0, 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "reqd": 0, 
@@ -456,7 +458,7 @@
   "no_copy": 0, 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "width": "200px"
@@ -486,6 +488,7 @@
   "doctype": "DocField", 
   "fieldname": "grand_total_export", 
   "fieldtype": "Currency", 
+  "in_list_view": 1, 
   "label": "Grand Total", 
   "no_copy": 0, 
   "oldfieldname": "grand_total_export", 
diff --git a/selling/doctype/quotation/quotation_list.js b/selling/doctype/quotation/quotation_list.js
deleted file mode 100644
index 55cbc1d..0000000
--- a/selling/doctype/quotation/quotation_list.js
+++ /dev/null
@@ -1,44 +0,0 @@
-// render
-wn.doclistviews['Quotation'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabQuotation`.quotation_to",
-			"`tabQuotation`.lead_name",
-			"`tabQuotation`.customer_name",
-			"`tabQuotation`.currency", 
-			"ifnull(`tabQuotation`.grand_total_export,0) as grand_total_export",
-			"`tabQuotation`.transaction_date",
-		]);
-		this.stats = this.stats.concat(['status', 'quotation_to', 'company']);
-	},
-	
-	prepare_data: function(data) {
-		this._super(data);
-		if(data.quotation_to == 'Lead') {
-			data.quotation_name = repl('[%(quotation_to)s] %(lead_name)s', data);
-		} else {
-			data.quotation_name = repl('[%(quotation_to)s] %(customer_name)s', data);
-		}		
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content:'avatar'},
-		{width: '3%', content:'docstatus'},
-		{width: '15%', content:'name'},
-		{width: '44%', content:'quotation_name+tags', css: {color:'#222'}},
-		{
-			width: '18%', 
-			content: function(parent, data) { 
-				$(parent).html(format_currency(data.grand_total_export, data.currency)) 
-			},
-			css: {'text-align':'right'}
-		},
-		{width: '12%', content:'transaction_date',
-			css: {'text-align': 'right', 'color':'#777'},
-			title: "Quotation Date", type: "date"}
-	]
-
-});
-
diff --git a/selling/doctype/quotation_item/quotation_item.txt b/selling/doctype/quotation_item/quotation_item.txt
index 49f9b65..8979562 100644
--- a/selling/doctype/quotation_item/quotation_item.txt
+++ b/selling/doctype/quotation_item/quotation_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:19", 
   "docstatus": 0, 
-  "modified": "2013-01-23 15:46:18", 
+  "modified": "2013-01-29 16:27:54", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -161,7 +161,7 @@
   "label": "Price List Rate*", 
   "oldfieldname": "base_ref_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency(cur_frm.doc.company);", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "width": "100px"
@@ -175,7 +175,7 @@
   "label": "Basic Rate*", 
   "oldfieldname": "basic_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency(cur_frm.doc.company);", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "reqd": 0, 
   "search_index": 0, 
@@ -190,7 +190,7 @@
   "label": "Amount*", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency(cur_frm.doc.company);", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "reqd": 0, 
diff --git a/selling/doctype/sales_and_purchase_return_item/sales_and_purchase_return_item.txt b/selling/doctype/sales_and_purchase_return_item/sales_and_purchase_return_item.txt
index eb7bc29..179a6a3 100644
--- a/selling/doctype/sales_and_purchase_return_item/sales_and_purchase_return_item.txt
+++ b/selling/doctype/sales_and_purchase_return_item/sales_and_purchase_return_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:20", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:22", 
+  "modified": "2013-01-29 16:27:54", 
   "modified_by": "Administrator", 
   "owner": "wasim@webnotestech.com"
  }, 
@@ -63,7 +63,7 @@
   "label": "Rate", 
   "oldfieldname": "rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
diff --git a/selling/doctype/sales_order/sales_order.txt b/selling/doctype/sales_order/sales_order.txt
index 1c543d4..e6f762e 100644
--- a/selling/doctype/sales_order/sales_order.txt
+++ b/selling/doctype/sales_order/sales_order.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-22 15:24:17", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:29", 
+  "modified": "2013-01-29 17:14:58", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -67,6 +67,7 @@
   "fieldname": "customer", 
   "fieldtype": "Link", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Customer", 
   "oldfieldname": "customer", 
   "oldfieldtype": "Link", 
@@ -121,6 +122,7 @@
   "doctype": "DocField", 
   "fieldname": "order_type", 
   "fieldtype": "Select", 
+  "in_list_view": 1, 
   "label": "Order Type", 
   "oldfieldname": "order_type", 
   "oldfieldtype": "Select", 
@@ -249,7 +251,7 @@
   "label": "Net Total*", 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 0, 
   "read_only": 1, 
   "reqd": 0, 
@@ -428,7 +430,7 @@
   "label": "Taxes and Charges Total*", 
   "oldfieldname": "other_charges_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "width": "150px"
@@ -456,7 +458,7 @@
   "label": "Grand Total*", 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "reqd": 0, 
@@ -469,7 +471,7 @@
   "label": "Rounded Total", 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "width": "150px"
@@ -791,6 +793,7 @@
   "fieldname": "status", 
   "fieldtype": "Select", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Status", 
   "no_copy": 1, 
   "oldfieldname": "status", 
@@ -807,8 +810,9 @@
   "description": "% of materials delivered against this Sales Order", 
   "doctype": "DocField", 
   "fieldname": "per_delivered", 
-  "fieldtype": "Float", 
+  "fieldtype": "Percent", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "%  Delivered", 
   "no_copy": 1, 
   "oldfieldname": "per_delivered", 
@@ -822,8 +826,9 @@
   "description": "% of materials billed against this Sales Order", 
   "doctype": "DocField", 
   "fieldname": "per_billed", 
-  "fieldtype": "Float", 
+  "fieldtype": "Percent", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "% Amount Billed", 
   "no_copy": 1, 
   "oldfieldname": "per_billed", 
@@ -926,7 +931,7 @@
   "label": "Total Commission", 
   "oldfieldname": "total_commission", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1
  }, 
  {
diff --git a/selling/doctype/sales_order/sales_order_list.js b/selling/doctype/sales_order/sales_order_list.js
deleted file mode 100644
index 16050c9..0000000
--- a/selling/doctype/sales_order/sales_order_list.js
+++ /dev/null
@@ -1,50 +0,0 @@
-// render
-wn.doclistviews['Sales Order'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabSales Order`.customer_name",
-			"`tabSales Order`.status",
-			"`tabSales Order`.order_type",
-			"ifnull(`tabSales Order`.per_delivered,0) as per_delivered", 
-			"ifnull(`tabSales Order`.per_billed,0) as per_billed",
-			"`tabSales Order`.currency", 
-			"ifnull(`tabSales Order`.grand_total_export,0) as grand_total_export",
-			"`tabSales Order`.transaction_date",
-		]);
-		this.stats = this.stats.concat(['status', 'order_type', 'company']);
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content: 'avatar'},
-		{width: '3%', content: 'docstatus'},
-		{width: '15%', content: 'name'},
-		{width: '29%', content: 'customer_name+tags', css: {color:'#222'}},
-		{
-			width: '18%', 
-			content: function(parent, data) { 
-				$(parent).html(format_currency(data.grand_total_export, data.currency)) 
-			},
-			css: {'text-align':'right'}
-		},
-		{
-			width: '11%',
-			content: function(parent, data, me) {
-				var order_type = data.order_type.toLowerCase();
-
-				if (order_type === 'sales') {
-					me.render_icon(parent, 'icon-tag', data.order_type);
-					me.render_bar_graph(parent, data, 'per_delivered', 'Delivered');
-				} else if (order_type === 'maintenance') {
-					me.render_icon(parent, 'icon-wrench', data.order_type);
-				}
-			},
-		},
-		{width: '8%', content: 'per_billed', type:'bar-graph', label:'Billed'},
-		{width: '12%', content:'transaction_date',
-			css: {'text-align': 'right', 'color':'#777'},
-			title: "Sales Order Date", type: "date"}
-	]
-
-});
diff --git a/selling/doctype/sales_order_item/sales_order_item.txt b/selling/doctype/sales_order_item/sales_order_item.txt
index b32e23f..dc8d19e 100644
--- a/selling/doctype/sales_order_item/sales_order_item.txt
+++ b/selling/doctype/sales_order_item/sales_order_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:21", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:22", 
+  "modified": "2013-01-29 16:27:54", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -150,7 +150,7 @@
   "label": "Price List Rate*", 
   "oldfieldname": "base_ref_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "width": "100px"
@@ -163,7 +163,7 @@
   "label": "Basic Rate*", 
   "oldfieldname": "basic_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "reqd": 0, 
   "width": "100px"
@@ -177,7 +177,7 @@
   "no_copy": 0, 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "reqd": 0, 
diff --git a/selling/doctype/sales_team/sales_team.txt b/selling/doctype/sales_team/sales_team.txt
index d57929f..c1a00d7 100644
--- a/selling/doctype/sales_team/sales_team.txt
+++ b/selling/doctype/sales_team/sales_team.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:22", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:23", 
+  "modified": "2013-01-29 16:27:56", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -73,7 +73,7 @@
   "label": "Allocated Amount", 
   "oldfieldname": "allocated_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "reqd": 0, 
   "width": "120px"
  }, 
@@ -96,6 +96,6 @@
   "label": "Incentives", 
   "oldfieldname": "incentives", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }
 ]
\ No newline at end of file
diff --git a/setup/doctype/currency/currency.txt b/setup/doctype/currency/currency.txt
index 679e6a6..9252c5a 100644
--- a/setup/doctype/currency/currency.txt
+++ b/setup/doctype/currency/currency.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-28 10:06:02", 
   "docstatus": 0, 
-  "modified": "2013-01-28 10:37:18", 
+  "modified": "2013-01-29 14:55:36", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -53,6 +53,7 @@
   "doctype": "DocField", 
   "fieldname": "enabled", 
   "fieldtype": "Check", 
+  "in_list_view": 1, 
   "label": "Enabled"
  }, 
  {
@@ -60,6 +61,7 @@
   "doctype": "DocField", 
   "fieldname": "fraction", 
   "fieldtype": "Data", 
+  "in_list_view": 1, 
   "label": "Fraction"
  }, 
  {
@@ -67,6 +69,7 @@
   "doctype": "DocField", 
   "fieldname": "fraction_units", 
   "fieldtype": "Int", 
+  "in_list_view": 1, 
   "label": "Fraction Units"
  }, 
  {
@@ -74,6 +77,7 @@
   "doctype": "DocField", 
   "fieldname": "symbol", 
   "fieldtype": "Data", 
+  "in_list_view": 1, 
   "label": "Symbol"
  }, 
  {
@@ -81,8 +85,9 @@
   "doctype": "DocField", 
   "fieldname": "number_format", 
   "fieldtype": "Select", 
+  "in_list_view": 1, 
   "label": "Number Format", 
-  "options": "\n#,###.##\n#.###,##\n# ###.##\n#,##,###.##\n#.###\n#,###"
+  "options": "\n#,###.##\n#.###,##\n# ###.##\n#,###.###\n#,##,###.##\n#.###\n#,###"
  }, 
  {
   "cancel": 1, 
diff --git a/setup/doctype/currency/currency_list.js b/setup/doctype/currency/currency_list.js
deleted file mode 100644
index 31eadbc..0000000
--- a/setup/doctype/currency/currency_list.js
+++ /dev/null
@@ -1,19 +0,0 @@
-wn.doclistviews['Currency'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabCurrency`.enabled",
-		]);
-		this.stats = this.stats.concat(['enabled']);		
-		this.order_by = "`tabCurrency`.`enabled` desc, `tabCurrency`.modified desc";
-	},	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content: 'avatar'},
-		{width: '3%', content: "enabled"},
-		{width: '70%', content: 'name'},
-		{width: '20%', content:'modified',
-			css: {'text-align': 'right', 'color': '#777'}},
-			
-	]
-});
\ No newline at end of file
diff --git a/setup/doctype/global_defaults/global_defaults.txt b/setup/doctype/global_defaults/global_defaults.txt
index 02df285..942415e 100644
--- a/setup/doctype/global_defaults/global_defaults.txt
+++ b/setup/doctype/global_defaults/global_defaults.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-28 10:06:02", 
   "docstatus": 0, 
-  "modified": "2013-01-28 15:09:04", 
+  "modified": "2013-01-29 14:55:57", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -114,7 +114,7 @@
   "fieldname": "number_format", 
   "fieldtype": "Select", 
   "label": "Number Format", 
-  "options": "\n#,###.##\n#.###,##\n# ###.##\n#,##,###.##\n#.###\n#,###"
+  "options": "\n#,###.##\n#.###,##\n# ###.##\n#,###.###\n#,##,###.##\n#.###\n#,###"
  }, 
  {
   "description": "Precision for Float fields (quantities, discounts, percentages etc) only for display. Floats will still be calculated up to 6 decimals.", 
diff --git a/startup/event_handlers.py b/startup/event_handlers.py
index 6b16f4c..3f04dc7 100644
--- a/startup/event_handlers.py
+++ b/startup/event_handlers.py
@@ -69,13 +69,9 @@
 		for key in ['max_users', 'expires_on', 'max_space', 'status', 'developer_mode']:
 			if hasattr(conf, key): bootinfo[key] = getattr(conf, key)
 
-		company = webnotes.conn.sql("select name, default_currency from `tabCompany`", as_dict=1)
-		company_dict = {}
-		for c in company:
-			company_dict.setdefault(c['name'], {}).update(c)
-
-		bootinfo['company'] = company_dict
-		
+		bootinfo['docs'] += webnotes.conn.sql("select name, default_currency from `tabCompany`", 
+			as_dict=1, update={"doctype":":Company"})
+			
 def get_letter_heads():
 	"""load letter heads with startup"""
 	import webnotes
diff --git a/stock/doctype/batch/batch.txt b/stock/doctype/batch/batch.txt
index 429644a..cad4a0d 100644
--- a/stock/doctype/batch/batch.txt
+++ b/stock/doctype/batch/batch.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:25", 
   "docstatus": 0, 
-  "modified": "2013-01-22 14:55:57", 
+  "modified": "2013-01-29 13:40:32", 
   "modified_by": "Administrator", 
   "owner": "harshada@webnotestech.com"
  }, 
@@ -42,15 +42,6 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "trash_reason", 
-  "fieldtype": "Small Text", 
-  "label": "Trash Reason", 
-  "oldfieldname": "trash_reason", 
-  "oldfieldtype": "Small Text", 
-  "read_only": 1
- }, 
- {
-  "doctype": "DocField", 
   "fieldname": "batch_id", 
   "fieldtype": "Data", 
   "label": "Batch ID", 
@@ -61,8 +52,20 @@
  }, 
  {
   "doctype": "DocField", 
+  "fieldname": "item", 
+  "fieldtype": "Link", 
+  "in_list_view": 1, 
+  "label": "Item", 
+  "oldfieldname": "item", 
+  "oldfieldtype": "Link", 
+  "options": "Item", 
+  "reqd": 1
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "description", 
   "fieldtype": "Small Text", 
+  "in_list_view": 1, 
   "label": "Description", 
   "oldfieldname": "description", 
   "oldfieldtype": "Small Text", 
@@ -70,6 +73,15 @@
  }, 
  {
   "doctype": "DocField", 
+  "fieldname": "expiry_date", 
+  "fieldtype": "Date", 
+  "in_list_view": 1, 
+  "label": "Expiry Date", 
+  "oldfieldname": "expiry_date", 
+  "oldfieldtype": "Date"
+ }, 
+ {
+  "doctype": "DocField", 
   "fieldname": "start_date", 
   "fieldtype": "Date", 
   "label": "Batch Started Date", 
@@ -86,21 +98,12 @@
  }, 
  {
   "doctype": "DocField", 
-  "fieldname": "expiry_date", 
-  "fieldtype": "Date", 
-  "label": "Expiry Date", 
-  "oldfieldname": "expiry_date", 
-  "oldfieldtype": "Date"
- }, 
- {
-  "doctype": "DocField", 
-  "fieldname": "item", 
-  "fieldtype": "Link", 
-  "label": "Item", 
-  "oldfieldname": "item", 
-  "oldfieldtype": "Link", 
-  "options": "Item", 
-  "reqd": 1
+  "fieldname": "trash_reason", 
+  "fieldtype": "Small Text", 
+  "label": "Trash Reason", 
+  "oldfieldname": "trash_reason", 
+  "oldfieldtype": "Small Text", 
+  "read_only": 1
  }, 
  {
   "doctype": "DocPerm"
diff --git a/stock/doctype/batch/batch_list.js b/stock/doctype/batch/batch_list.js
deleted file mode 100644
index 52e4156..0000000
--- a/stock/doctype/batch/batch_list.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// render
-wn.doclistviews['Batch'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabBatch`.item",
-			"`tabBatch`.description",
-		]);
-		this.stats = this.stats.concat(['company']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		if(data.description && data.description.length > 50) {
-			data.description = '<span title="'+data.description+'">' + 
-				data.description.substr(0,50) + '...</span>';
-		}
-	},
-	
-	columns: [
-		{width: '3%', content:'check'},
-		{width: '5%', content:'avatar'},
-		{width: '15%', content:'name'},
-		{width: '15%', content:'item'},
-		{width: '50%', content:'description+tags'},
-		{width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
-	]
-});
\ No newline at end of file
diff --git a/stock/doctype/delivery_note/delivery_note.txt b/stock/doctype/delivery_note/delivery_note.txt
index 4d95396..5fe8592 100644
--- a/stock/doctype/delivery_note/delivery_note.txt
+++ b/stock/doctype/delivery_note/delivery_note.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-10 16:34:25", 
+  "creation": "2013-01-23 19:57:19", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:24", 
+  "modified": "2013-01-29 16:28:03", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -32,6 +32,7 @@
   "parent": "Delivery Note", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
+  "permlevel": 0, 
   "read": 1, 
   "report": 1
  }, 
@@ -81,6 +82,7 @@
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
+  "in_list_view": 1, 
   "label": "Customer Name", 
   "read_only": 1
  }, 
@@ -254,7 +256,7 @@
   "no_copy": 0, 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 0, 
   "print_width": "150px", 
   "read_only": 1, 
@@ -280,6 +282,7 @@
   "doctype": "DocField", 
   "fieldname": "sales_order_no", 
   "fieldtype": "Link", 
+  "in_list_view": 1, 
   "label": "Sales Order No", 
   "no_copy": 0, 
   "oldfieldname": "sales_order_no", 
@@ -428,7 +431,7 @@
   "label": "Taxes and Charges Total", 
   "oldfieldname": "other_charges_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "print_width": "150px", 
   "read_only": 1, 
@@ -468,7 +471,7 @@
   "no_copy": 0, 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "print_width": "150px", 
   "read_only": 1, 
@@ -483,7 +486,7 @@
   "no_copy": 0, 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "print_width": "150px", 
   "read_only": 1, 
@@ -1094,7 +1097,7 @@
   "no_copy": 0, 
   "oldfieldname": "total_commission", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 0
  }, 
@@ -1131,7 +1134,6 @@
   "cancel": 0, 
   "create": 0, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
   "role": "Accounts User", 
   "submit": 0, 
   "write": 0
@@ -1141,7 +1143,6 @@
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
   "role": "Sales User", 
   "submit": 1, 
   "write": 1
@@ -1149,25 +1150,13 @@
  {
   "doctype": "DocPerm", 
   "match": "customer_name", 
-  "permlevel": 0, 
   "role": "Customer"
  }, 
  {
-  "amend": 0, 
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "permlevel": 2, 
-  "role": "All", 
-  "submit": 0, 
-  "write": 1
- }, 
- {
   "amend": 1, 
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
   "role": "Material Manager", 
   "submit": 1, 
   "write": 1
@@ -1177,7 +1166,6 @@
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
   "role": "Material User", 
   "submit": 1, 
   "write": 1
diff --git a/stock/doctype/delivery_note/delivery_note_list.js b/stock/doctype/delivery_note/delivery_note_list.js
deleted file mode 100644
index 9c94fdb..0000000
--- a/stock/doctype/delivery_note/delivery_note_list.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// render
-wn.doclistviews['Delivery Note'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d);
-		this.fields = this.fields.concat([
-			"`tabDelivery Note`.customer_name",
-			"`tabDelivery Note`.sales_order_no",
-			"`tabDelivery Note`.posting_date",
-		]);
-	},
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content:'avatar'},
-		{width: '3%', content:'docstatus'},
-		{width: '15%', content:'name'},
-		{width: '47%', content:'customer_name+tags', css: {color:'#222'}},
-		{width: '15%', content:'sales_order_no', type:'link', doctype:'Sales Order'},
-		{width: '12%', content:'posting_date',
-			css: {'text-align': 'right', 'color':'#777'},
-			title: "Delivery Note Date", type: "date"}
-	]
-});
diff --git a/stock/doctype/delivery_note_item/delivery_note_item.txt b/stock/doctype/delivery_note_item/delivery_note_item.txt
index e2c6fbf..9f18568 100644
--- a/stock/doctype/delivery_note_item/delivery_note_item.txt
+++ b/stock/doctype/delivery_note_item/delivery_note_item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:26", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:24", 
+  "modified": "2013-01-29 16:27:56", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -155,7 +155,7 @@
   "label": "Price List Rate*", 
   "oldfieldname": "base_ref_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "width": "100px"
@@ -168,7 +168,7 @@
   "label": "Rate*", 
   "oldfieldname": "basic_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "reqd": 0, 
   "width": "150px"
@@ -180,7 +180,7 @@
   "label": "Amount*", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1, 
   "reqd": 0, 
diff --git a/stock/doctype/item/item.txt b/stock/doctype/item/item.txt
index d5ab5a4..fd963f7 100644
--- a/stock/doctype/item/item.txt
+++ b/stock/doctype/item/item.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-21 18:19:22", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:00:07", 
+  "modified": "2013-01-29 13:32:21", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -67,6 +67,7 @@
   "fieldname": "item_name", 
   "fieldtype": "Data", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Item Name", 
   "oldfieldname": "item_name", 
   "oldfieldtype": "Data", 
@@ -130,6 +131,7 @@
   "doctype": "DocField", 
   "fieldname": "image_view", 
   "fieldtype": "Image", 
+  "in_list_view": 1, 
   "label": "Image View", 
   "options": "image"
  }, 
@@ -138,6 +140,7 @@
   "fieldname": "description", 
   "fieldtype": "Small Text", 
   "in_filter": 0, 
+  "in_list_view": 1, 
   "label": "Description", 
   "oldfieldname": "description", 
   "oldfieldtype": "Text", 
diff --git a/stock/doctype/item/item_list.js b/stock/doctype/item/item_list.js
deleted file mode 100644
index 02ed161..0000000
--- a/stock/doctype/item/item_list.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// render
-wn.doclistviews['Item'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabItem`.item_name",
-			"`tabItem`.description",
-		]);
-		this.stats = this.stats.concat(['default_warehouse', 'brand']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		data.description = repl("%(item_name)s | %(description)s", data);
-		if(data.description && data.description.length > 50) {
-			data.description = '<span title="'+data.description+'">' + 
-				data.description.substr(0,50) + '...</span>';
-		}
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content:'avatar'},
-		{width: '20%', content:'name'},
-		{width: '60%', content:'description+tags', css: {'color': '#222'}},
-		{width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
-	]
-});
diff --git a/stock/doctype/purchase_receipt/purchase_receipt.txt b/stock/doctype/purchase_receipt/purchase_receipt.txt
index 7851133..0c7a4c3 100755
--- a/stock/doctype/purchase_receipt/purchase_receipt.txt
+++ b/stock/doctype/purchase_receipt/purchase_receipt.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-22 15:24:18", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:30", 
+  "modified": "2013-01-29 16:28:01", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -31,6 +31,7 @@
   "parent": "Purchase Receipt", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
+  "permlevel": 0, 
   "read": 1, 
   "report": 1
  }, 
@@ -80,7 +81,8 @@
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
-  "label": "Name", 
+  "in_list_view": 1, 
+  "label": "Supplier Name", 
   "read_only": 1
  }, 
  {
@@ -241,6 +243,7 @@
   "doctype": "DocField", 
   "fieldname": "purchase_order_no", 
   "fieldtype": "Link", 
+  "in_list_view": 0, 
   "label": "Purchase Order", 
   "no_copy": 1, 
   "oldfieldname": "purchase_order_no", 
@@ -451,7 +454,7 @@
   "label": "Net Total", 
   "oldfieldname": "net_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "print_width": "150px", 
   "read_only": 1, 
@@ -465,7 +468,7 @@
   "label": "Taxes and Charges Added", 
   "oldfieldname": "other_charges_added", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -476,7 +479,7 @@
   "label": "Taxes and Charges Deducted", 
   "oldfieldname": "other_charges_deducted", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -487,7 +490,7 @@
   "label": "Total Tax", 
   "oldfieldname": "total_tax", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -498,7 +501,7 @@
   "label": "Grand Total", 
   "oldfieldname": "grand_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -509,7 +512,7 @@
   "label": "Rounded Total", 
   "oldfieldname": "rounded_total", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "read_only": 1
  }, 
@@ -895,7 +898,6 @@
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
   "role": "Purchase User", 
   "submit": 1, 
   "write": 1
@@ -903,21 +905,13 @@
  {
   "doctype": "DocPerm", 
   "match": "supplier", 
-  "permlevel": 0, 
   "role": "Supplier"
  }, 
  {
-  "doctype": "DocPerm", 
-  "permlevel": 2, 
-  "role": "All", 
-  "write": 1
- }, 
- {
   "amend": 1, 
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
   "role": "Material Manager", 
   "submit": 1, 
   "write": 1
@@ -927,7 +921,6 @@
   "cancel": 1, 
   "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
   "role": "Material User", 
   "submit": 1, 
   "write": 1
diff --git a/stock/doctype/purchase_receipt/purchase_receipt_list.js b/stock/doctype/purchase_receipt/purchase_receipt_list.js
index e04ef7e..d20c352 100644
--- a/stock/doctype/purchase_receipt/purchase_receipt_list.js
+++ b/stock/doctype/purchase_receipt/purchase_receipt_list.js
@@ -1,16 +1,10 @@
 // render
-wn.doclistviews['Purchase Receipt'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d);
-		this.fields = this.fields.concat([
-			"`tabPurchase Receipt`.supplier_name",
-			"group_concat(`tabPurchase Receipt Item`.prevdoc_docname) as purchase_order_no",
-			"`tabPurchase Receipt`.posting_date",
-		]);
-		this.group_by = "`tabPurchase Receipt`.name";
-	},
+wn.listview_settings['Purchase Receipt'] = {
+	add_fields: ["group_concat(`tabPurchase Receipt Item`.prevdoc_docname) \
+		as purchase_order_no"],
+	add_columns: [{"content":"purchase_order_no", width:"30%"}],
+	group_by: "`tabPurchase Receipt`.name",
 	prepare_data: function(data) {
-		this._super(data);
 		if(data.purchase_order_no) {
 			data.purchase_order_no = data.purchase_order_no.split(",");
 			var po_list = [];
@@ -21,16 +15,5 @@
 			});
 			data.purchase_order_no = po_list.join(", ");
 		}
-	},
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content:'avatar'},
-		{width: '3%', content:'docstatus'},
-		{width: '15%', content:'name'},
-		{width: '32%', content:'supplier_name+tags', css: {color:'#222'}},
-		{width: '30%', content:'purchase_order_no'},
-		{width: '12%', content:'posting_date',
-			css: {'text-align': 'right', 'color':'#777'},
-			title: "Purhcase Receipt Date", type: "date"}
-	]
-});
+	}	
+};
diff --git a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
index 693bfca..e1ceb05 100755
--- a/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
+++ b/stock/doctype/purchase_receipt_item/purchase_receipt_item.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-24 11:03:43", 
+  "creation": "2013-01-28 10:06:02", 
   "docstatus": 0, 
-  "modified": "2013-01-25 18:27:53", 
+  "modified": "2013-01-29 16:28:06", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -156,7 +156,7 @@
   "fieldname": "purchase_ref_rate", 
   "fieldtype": "Currency", 
   "label": "Ref Rate*", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1
  }, 
  {
@@ -167,7 +167,7 @@
   "label": "Rate*", 
   "oldfieldname": "purchase_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "print_width": "100px", 
   "reqd": 1, 
@@ -181,7 +181,7 @@
   "label": "Amount*", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "print_width": "100px", 
   "reqd": 0, 
@@ -387,7 +387,7 @@
   "label": "Raw Materials Supplied Cost", 
   "oldfieldname": "rm_supp_cost", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "print_width": "150px", 
   "read_only": 1, 
@@ -402,7 +402,7 @@
   "no_copy": 1, 
   "oldfieldname": "item_tax_amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "print_width": "150px", 
   "read_only": 1, 
@@ -450,7 +450,7 @@
   "no_copy": 1, 
   "oldfieldname": "valuation_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_hide": 1, 
   "print_width": "80px", 
   "read_only": 1, 
diff --git a/stock/doctype/serial_no/serial_no.txt b/stock/doctype/serial_no/serial_no.txt
index 6758436..086575f 100644
--- a/stock/doctype/serial_no/serial_no.txt
+++ b/stock/doctype/serial_no/serial_no.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:29", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:26", 
+  "modified": "2013-01-29 16:27:57", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -56,6 +56,7 @@
   "fieldname": "status", 
   "fieldtype": "Select", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Status", 
   "no_copy": 1, 
   "oldfieldname": "status", 
@@ -82,6 +83,7 @@
   "fieldname": "item_code", 
   "fieldtype": "Link", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Item Code", 
   "oldfieldname": "item_code", 
   "oldfieldtype": "Link", 
@@ -98,6 +100,7 @@
   "doctype": "DocField", 
   "fieldname": "item_name", 
   "fieldtype": "Data", 
+  "in_list_view": 1, 
   "label": "Item Name", 
   "read_only": 1
  }, 
@@ -196,7 +199,7 @@
   "no_copy": 1, 
   "oldfieldname": "purchase_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "reqd": 1, 
   "search_index": 0
  }, 
@@ -211,6 +214,7 @@
   "fieldname": "warehouse", 
   "fieldtype": "Link", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Warehouse", 
   "no_copy": 1, 
   "oldfieldname": "warehouse", 
diff --git a/stock/doctype/serial_no/serial_no_list.js b/stock/doctype/serial_no/serial_no_list.js
deleted file mode 100644
index 8d9a3e6..0000000
--- a/stock/doctype/serial_no/serial_no_list.js
+++ /dev/null
@@ -1,28 +0,0 @@
-// render
-wn.doclistviews['Serial No'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabSerial No`.item_code",
-			"`tabSerial No`.item_name",
-			"`tabSerial No`.status",
-			"`tabSerial No`.warehouse",
-		]);
-		this.stats = this.stats.concat(['company']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		data.item_name = data.item_name ? data.item_name : data.item_code;
-	},
-	
-	columns: [
-		{width: '3%', content:'check'},
-		{width: '5%', content:'avatar'},
-		{width: '15%', content:'name'},
-		{width: '30%', content:'item_name+tags'},
-		{width: '15%', content:'status'},
-		{width: '20%', content:'warehouse', css: {'color': '#777'}},
-		{width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
-	]
-});
\ No newline at end of file
diff --git a/stock/doctype/stock_entry/stock_entry.txt b/stock/doctype/stock_entry/stock_entry.txt
index 1ebbae6..2554455 100644
--- a/stock/doctype/stock_entry/stock_entry.txt
+++ b/stock/doctype/stock_entry/stock_entry.txt
@@ -1,8 +1,8 @@
 [
  {
-  "creation": "2013-01-14 16:33:34", 
+  "creation": "2013-01-23 19:57:20", 
   "docstatus": 0, 
-  "modified": "2013-01-22 14:57:24", 
+  "modified": "2013-01-28 17:59:20", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -36,13 +36,18 @@
   "permlevel": 0
  }, 
  {
+  "amend": 1, 
+  "cancel": 1, 
+  "create": 1, 
   "doctype": "DocPerm", 
   "name": "__common__", 
   "parent": "Stock Entry", 
   "parentfield": "permissions", 
   "parenttype": "DocType", 
+  "permlevel": 0, 
   "read": 1, 
   "report": 1, 
+  "submit": 1, 
   "write": 1
  }, 
  {
@@ -83,6 +88,7 @@
   "fieldtype": "Select", 
   "hidden": 0, 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Purpose", 
   "no_copy": 0, 
   "oldfieldname": "purpose", 
@@ -110,6 +116,7 @@
   "fieldtype": "Date", 
   "hidden": 0, 
   "in_filter": 1, 
+  "in_list_view": 0, 
   "label": "Posting Date", 
   "no_copy": 1, 
   "oldfieldname": "posting_date", 
@@ -149,6 +156,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "in_filter": 0, 
+  "in_list_view": 1, 
   "label": "Default Source Warehouse", 
   "no_copy": 1, 
   "oldfieldname": "from_warehouse", 
@@ -171,6 +179,7 @@
   "fieldtype": "Link", 
   "hidden": 0, 
   "in_filter": 0, 
+  "in_list_view": 1, 
   "label": "Default Target Warehouse", 
   "no_copy": 1, 
   "oldfieldname": "to_warehouse", 
@@ -554,50 +563,11 @@
   "search_index": 0
  }, 
  {
-  "amend": 1, 
-  "cancel": 1, 
-  "create": 1, 
   "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "role": "Material User", 
-  "submit": 1
+  "role": "Material User"
  }, 
  {
-  "create": 0, 
   "doctype": "DocPerm", 
-  "permlevel": 2, 
   "role": "Manufacturing User"
- }, 
- {
-  "doctype": "DocPerm", 
-  "permlevel": 2, 
-  "role": "Manufacturing Manager"
- }, 
- {
-  "amend": 1, 
-  "cancel": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "role": "Manufacturing User", 
-  "submit": 1
- }, 
- {
-  "amend": 1, 
-  "cancel": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "role": "Manufacturing Manager", 
-  "submit": 1
- }, 
- {
-  "amend": 1, 
-  "cancel": 1, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "role": "Material Manager", 
-  "submit": 1
  }
 ]
\ No newline at end of file
diff --git a/stock/doctype/stock_entry/stock_entry_list.js b/stock/doctype/stock_entry/stock_entry_list.js
deleted file mode 100644
index 60526cb..0000000
--- a/stock/doctype/stock_entry/stock_entry_list.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// render
-wn.doclistviews['Stock Entry'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d);
-		this.fields = this.fields.concat([
-			"`tabStock Entry`.purpose",
-			"`tabStock Entry`.from_warehouse",
-			"`tabStock Entry`.to_warehouse",
-			"`tabStock Entry`.posting_date",
-		]);
-	},
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content:'avatar'},
-		{width: '3%', content:'docstatus'},
-		{width: '15%', content:'name'},
-		{width: '15%', content:'purpose+tags', css: {color:'#222'}},
-		{width: '18%', content:'from_warehouse', template: 'From %(from_warehouse)s'},
-		{width: '18%', content:'to_warehouse', template: 'To %(to_warehouse)s'},
-		{width: '12%', content:'posting_date',
-			css: {'text-align': 'right', 'color':'#777'},
-			title: "Stock Entry Date", type: "date"}
-	]
-});
diff --git a/stock/doctype/stock_entry_detail/stock_entry_detail.txt b/stock/doctype/stock_entry_detail/stock_entry_detail.txt
index e042b65..18fac82 100644
--- a/stock/doctype/stock_entry_detail/stock_entry_detail.txt
+++ b/stock/doctype/stock_entry_detail/stock_entry_detail.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-14 16:33:34", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:26", 
+  "modified": "2013-01-29 16:27:57", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -101,7 +101,7 @@
   "label": "Valuation Rate", 
   "oldfieldname": "incoming_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 0, 
   "reqd": 0
  }, 
@@ -112,7 +112,7 @@
   "label": "Amount", 
   "oldfieldname": "amount", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "read_only": 1
  }, 
  {
diff --git a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
index 108e985..9551b59 100644
--- a/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
+++ b/stock/doctype/stock_ledger_entry/stock_ledger_entry.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-14 16:33:26", 
   "docstatus": 0, 
-  "modified": "2013-01-23 17:11:26", 
+  "modified": "2013-01-29 16:27:57", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -181,7 +181,7 @@
   "label": "Incoming Rate", 
   "oldfieldname": "incoming_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
@@ -211,7 +211,7 @@
   "label": "Valuation Rate", 
   "oldfieldname": "valuation_rate", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()", 
+  "options": "Company:company:default_currency", 
   "print_width": "150px", 
   "width": "150px"
  }, 
@@ -222,7 +222,7 @@
   "label": "Stock Value", 
   "oldfieldname": "stock_value", 
   "oldfieldtype": "Currency", 
-  "options": "eval:erpnext.get_currency()"
+  "options": "Company:company:default_currency"
  }, 
  {
   "doctype": "DocField", 
diff --git a/stock/doctype/warehouse/warehouse.txt b/stock/doctype/warehouse/warehouse.txt
index 58c3bb1..e767543 100644
--- a/stock/doctype/warehouse/warehouse.txt
+++ b/stock/doctype/warehouse/warehouse.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:30", 
   "docstatus": 0, 
-  "modified": "2013-01-22 15:07:00", 
+  "modified": "2013-01-29 13:29:21", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -59,6 +59,8 @@
   "doctype": "DocField", 
   "fieldname": "warehouse_type", 
   "fieldtype": "Link", 
+  "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Warehouse Type", 
   "oldfieldname": "warehouse_type", 
   "oldfieldtype": "Link", 
@@ -146,6 +148,7 @@
   "doctype": "DocField", 
   "fieldname": "city", 
   "fieldtype": "Data", 
+  "in_list_view": 1, 
   "label": "City", 
   "oldfieldname": "city", 
   "oldfieldtype": "Data", 
diff --git a/stock/doctype/warehouse/warehouse_list.js b/stock/doctype/warehouse/warehouse_list.js
deleted file mode 100644
index 0abb7f9..0000000
--- a/stock/doctype/warehouse/warehouse_list.js
+++ /dev/null
@@ -1,35 +0,0 @@
-// render
-wn.doclistviews['Warehouse'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabWarehouse`.warehouse_type",
-			"`tabWarehouse`.address_line_1",
-			"`tabWarehouse`.address_line_2",
-			"`tabWarehouse`.city",
-			"`tabWarehouse`.state",
-			"`tabWarehouse`.pin",
-		]);
-		this.stats = this.stats.concat(['company']);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		var concat_list = [];
-		data.address_line_1 && concat_list.push(data.address_line_1);
-		data.address_line_2 && concat_list.push(data.address_line_2);
-		data.city && concat_list.push(data.city);
-		data.state && concat_list.push(data.state);
-		data.pin && concat_list.push(data.pin);
-		data.address = concat_list.join(", ");
-	},
-	
-	columns: [
-		{width: '3%', content:'check'},
-		{width: '5%', content:'avatar'},
-		{width: '20%', content:'name'},
-		{width: '15%', content:'warehouse_type'},
-		{width: '45%', content:'address+tags'},
-		{width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
-	]
-});
\ No newline at end of file
diff --git a/support/doctype/customer_issue/customer_issue.txt b/support/doctype/customer_issue/customer_issue.txt
index 00d0dee..59ebc15 100644
--- a/support/doctype/customer_issue/customer_issue.txt
+++ b/support/doctype/customer_issue/customer_issue.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:30", 
   "docstatus": 0, 
-  "modified": "2013-01-22 14:55:59", 
+  "modified": "2013-01-28 17:54:09", 
   "modified_by": "Administrator", 
   "owner": "harshada@webnotestech.com"
  }, 
@@ -57,6 +57,7 @@
   "fieldname": "status", 
   "fieldtype": "Select", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Status", 
   "no_copy": 1, 
   "oldfieldname": "status", 
@@ -89,6 +90,7 @@
   "fieldname": "customer", 
   "fieldtype": "Link", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Customer", 
   "oldfieldname": "customer", 
   "oldfieldtype": "Link", 
@@ -136,6 +138,7 @@
   "doctype": "DocField", 
   "fieldname": "serial_no", 
   "fieldtype": "Link", 
+  "in_list_view": 0, 
   "label": "Serial No", 
   "options": "Serial No"
  }, 
@@ -144,6 +147,7 @@
   "fieldname": "item_code", 
   "fieldtype": "Link", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Item Code", 
   "oldfieldname": "item_code", 
   "oldfieldtype": "Link", 
@@ -185,6 +189,7 @@
   "fieldtype": "Select", 
   "hidden": 0, 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Warranty / AMC Status", 
   "options": "\nUnder Warranty\nOut of Warranty\nUnder AMC\nOut of AMC"
  }, 
diff --git a/support/doctype/customer_issue/customer_issue_list.js b/support/doctype/customer_issue/customer_issue_list.js
deleted file mode 100644
index 5b5c88d..0000000
--- a/support/doctype/customer_issue/customer_issue_list.js
+++ /dev/null
@@ -1,60 +0,0 @@
-// render
-wn.doclistviews['Customer Issue'] = wn.views.ListView.extend({
-	me: this,
-
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabCustomer Issue`.customer",
-			"`tabCustomer Issue`.serial_no",
-			"`tabCustomer Issue`.item_name",
-			"`tabCustomer Issue`.complaint",
-			"`tabCustomer Issue`.status",
-		]);
-		this.stats = this.stats.concat(['status', 'company']);
-		//this.show_hide_check_column();
-	},
-	
-	prepare_data: function(data) {
-		this._super(data);
-		if(data.status=='Open') {
-			data.label_type = 'important';
-		} else if(data.status=='Closed') {
-			data.label_type = 'success';
-		} else if(data.status=='Cancelled') {
-			data.label_type = 'info';
-		} else if(data.status=='Work In Progress') {
-			data.label_type = 'info';
-			data.status = 'WIP';
-		}
-		
-		data.status_html = repl(
-			'<span class="label label-%(label_type)s">%(status)s</span>', data);
-		var a = $(data.status_html).click(function() {
-			me.set_filter('status', $(this).text());
-		});
-		
-		var concat_list = [data.customer];
-		data.serial_no && concat_list.push(data.serial_no);
-		data.complaint && concat_list.push(data.complaint);
-		data.complaint = concat_list.join(" | ");
-		
-		// description
-		if(data.complaint && data.complaint.length > 50) {
-			data.complaint = '<span title="'+data.complaint+'">' + 
-				data.complaint.substr(0,50) + '...</span>';
-		}
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content: 'avatar'},
-		{width: '3%', content: 'docstatus'},
-		{width: '20%', content: 'name'},
-		{width: '10%', content: 'status_html'},
-		{width: '47%', content: 'complaint+tags', css: {color:'#777'}},
-		{width: '12%', content: 'modified',
-			css: {'text-align': 'right', 'color':'#777'}}
-	]
-
-});
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule.txt b/support/doctype/maintenance_schedule/maintenance_schedule.txt
index c763755..19dc7fd 100644
--- a/support/doctype/maintenance_schedule/maintenance_schedule.txt
+++ b/support/doctype/maintenance_schedule/maintenance_schedule.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:30", 
   "docstatus": 0, 
-  "modified": "2013-01-22 14:56:04", 
+  "modified": "2013-01-28 17:35:45", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -60,6 +60,7 @@
   "fieldname": "customer", 
   "fieldtype": "Link", 
   "in_filter": 1, 
+  "in_list_view": 0, 
   "label": "Customer", 
   "oldfieldname": "customer", 
   "oldfieldtype": "Link", 
@@ -89,7 +90,8 @@
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
   "in_filter": 1, 
-  "label": "Name", 
+  "in_list_view": 1, 
+  "label": "Customer Name", 
   "oldfieldname": "customer_name", 
   "oldfieldtype": "Data", 
   "read_only": 1, 
diff --git a/support/doctype/maintenance_schedule/maintenance_schedule_list.js b/support/doctype/maintenance_schedule/maintenance_schedule_list.js
deleted file mode 100644
index a471c3e..0000000
--- a/support/doctype/maintenance_schedule/maintenance_schedule_list.js
+++ /dev/null
@@ -1,24 +0,0 @@
-// render
-wn.doclistviews['Maintenance Schedule'] = wn.views.ListView.extend({
-	me: this,
-
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabMaintenance Schedule`.customer",			
-		]);
-		this.stats = this.stats.concat(['company']);
-		//this.show_hide_check_column();
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content: 'avatar'},
-		{width: '3%', content: 'docstatus'},
-		{width: '20%', content: 'name'},
-		{width: '55%', content: 'customer+tags'},
-		{width: '14%', content: 'modified',
-			css: {'text-align': 'right', 'color':'#777'}}
-	]
-
-});
diff --git a/support/doctype/maintenance_visit/maintenance_visit.txt b/support/doctype/maintenance_visit/maintenance_visit.txt
index 6dd6d73..6ecbb1f 100644
--- a/support/doctype/maintenance_visit/maintenance_visit.txt
+++ b/support/doctype/maintenance_visit/maintenance_visit.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:31", 
   "docstatus": 0, 
-  "modified": "2013-01-22 14:56:04", 
+  "modified": "2013-01-28 17:31:01", 
   "modified_by": "Administrator", 
   "owner": "ashwini@webnotestech.com"
  }, 
@@ -73,6 +73,7 @@
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
   "hidden": 1, 
+  "in_list_view": 1, 
   "label": "Customer Name", 
   "read_only": 1
  }, 
@@ -147,6 +148,7 @@
   "doctype": "DocField", 
   "fieldname": "completion_status", 
   "fieldtype": "Select", 
+  "in_list_view": 1, 
   "label": "Completion Status", 
   "oldfieldname": "completion_status", 
   "oldfieldtype": "Select", 
@@ -159,6 +161,7 @@
   "fieldname": "maintenance_type", 
   "fieldtype": "Select", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Maintenance Type", 
   "oldfieldname": "maintenance_type", 
   "oldfieldtype": "Select", 
diff --git a/support/doctype/maintenance_visit/maintenance_visit_list.js b/support/doctype/maintenance_visit/maintenance_visit_list.js
deleted file mode 100644
index 6dc5dac..0000000
--- a/support/doctype/maintenance_visit/maintenance_visit_list.js
+++ /dev/null
@@ -1,38 +0,0 @@
-// render
-wn.doclistviews['Maintenance Visit'] = wn.views.ListView.extend({
-	me: this,
-
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabMaintenance Visit`.customer_name",
-			"`tabMaintenance Visit`.mntc_date",
-			"`tabMaintenance Visit`.mntc_time",
-			"`tabMaintenance Visit`.maintenance_type",
-			"`tabMaintenance Visit`.completion_status",
-			
-		]);
-		this.stats = this.stats.concat(['completion_status', 'company']);
-	},
-	
-	prepare_data: function(data) {
-		this._super(data);
-		data.mntc_date = wn.datetime.str_to_user(data.mntc_date);
-		data.date_time = "on " + data.mntc_date + " at " + data.mntc_time;
-		data.customer_name = data.customer_name + " " + data.date_time;
-		data.completion_status = data.completion_status + 
-			(data.maintenance_type ? " [" + data.maintenance_type + "]": "");
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '5%', content: 'avatar'},
-		{width: '3%', content: 'docstatus'},
-		{width: '15%', content: 'name'},
-		{width: '40%', content: 'customer_name+tags'},
-		{width: '20%', content: 'completion_status'},
-		{width: '14%', content: 'modified',
-			css: {'text-align': 'right', 'color':'#777'}}
-	]
-
-});
diff --git a/utilities/doctype/address/address.txt b/utilities/doctype/address/address.txt
index 77f25cf..757beb9 100644
--- a/utilities/doctype/address/address.txt
+++ b/utilities/doctype/address/address.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:32", 
   "docstatus": 0, 
-  "modified": "2013-01-22 14:55:56", 
+  "modified": "2013-01-29 13:24:45", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -79,6 +79,7 @@
   "fieldname": "city", 
   "fieldtype": "Data", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "City/Town", 
   "reqd": 1, 
   "search_index": 1
@@ -96,6 +97,7 @@
   "fieldname": "country", 
   "fieldtype": "Select", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Country", 
   "options": "link:Country", 
   "reqd": 1, 
@@ -151,6 +153,7 @@
   "doctype": "DocField", 
   "fieldname": "is_shipping_address", 
   "fieldtype": "Check", 
+  "in_list_view": 1, 
   "label": "Is Shipping Address"
  }, 
  {
@@ -173,6 +176,7 @@
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Customer Name", 
   "read_only": 1
  }, 
@@ -190,6 +194,7 @@
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
   "in_filter": 1, 
+  "in_list_view": 1, 
   "label": "Supplier Name", 
   "read_only": 1, 
   "search_index": 0
diff --git a/utilities/doctype/address/address_list.js b/utilities/doctype/address/address_list.js
deleted file mode 100644
index 325c059..0000000
--- a/utilities/doctype/address/address_list.js
+++ /dev/null
@@ -1,55 +0,0 @@
-wn.doclistviews['Address'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabAddress`.customer_name",
-			"`tabAddress`.supplier",
-			"`tabAddress`.supplier_name",
-			"`tabAddress`.sales_partner",
-			"`tabAddress`.city",
-			"`tabAddress`.country",
-			"ifnull(`tabAddress`.is_shipping_address, 0) as is_shipping_address",
-		]);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		
-		// prepare address
-		var address = []
-		$.each(['city', 'country'], function(i, v) {
-			if(data[v]) address.push(data[v]);
-		});
-		data.address = address.join(", ");
-		
-		// prepare shipping tag
-		if(data.is_shipping_address) {
-			data.shipping = '<span class="label label-info">Shipping</span>';
-		}
-		
-
-		// prepare description
-		if(data.customer) {
-			data.description = (data.customer_name || data.customer);
-			data.contact_type = 'Customer';
-		} else if (data.supplier) {
-			data.description = (data.supplier_name || data.supplier);
-			data.contact_type = 'Supplier';
-		} else if (data.sales_partner) {
-			data.description = data.sales_partner;
-			data.contact_type = 'Sales Partner'
-		} else {
-			data.description = '';
-			data.contact_type = '';
-		}
-},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '20%', content: 'name'},
-		{width: '15%', content: 'contact_type'},
-		{width: '20%', content: 'description'},
-		{width: '30%', content: 'address+shipping+tags', css: {'padding': '2px 0px'}},
-		{width: '12%', content: 'modified', css: {'text-align': 'right', 'color':'#777'}}
-	]
-});
diff --git a/utilities/doctype/contact/contact.txt b/utilities/doctype/contact/contact.txt
index 0a244dc..923ade9 100644
--- a/utilities/doctype/contact/contact.txt
+++ b/utilities/doctype/contact/contact.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-01-10 16:34:32", 
   "docstatus": 0, 
-  "modified": "2013-01-22 14:55:59", 
+  "modified": "2013-01-29 13:26:39", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -65,6 +65,7 @@
   "doctype": "DocField", 
   "fieldname": "email_id", 
   "fieldtype": "Data", 
+  "in_list_view": 1, 
   "label": "Email Id", 
   "oldfieldname": "email_id", 
   "oldfieldtype": "Data", 
@@ -113,6 +114,7 @@
   "doctype": "DocField", 
   "fieldname": "customer_name", 
   "fieldtype": "Data", 
+  "in_list_view": 1, 
   "label": "Customer Name", 
   "read_only": 1
  }, 
@@ -130,6 +132,7 @@
   "doctype": "DocField", 
   "fieldname": "supplier_name", 
   "fieldtype": "Data", 
+  "in_list_view": 1, 
   "label": "Supplier Name", 
   "read_only": 1
  }, 
diff --git a/utilities/doctype/contact/contact_list.js b/utilities/doctype/contact/contact_list.js
deleted file mode 100644
index 3b1b3c9..0000000
--- a/utilities/doctype/contact/contact_list.js
+++ /dev/null
@@ -1,50 +0,0 @@
-wn.doclistviews['Contact'] = wn.views.ListView.extend({
-	init: function(d) {
-		this._super(d)
-		this.fields = this.fields.concat([
-			"`tabContact`.first_name",
-			"`tabContact`.last_name",
-			"`tabContact`.customer",
-			"`tabContact`.customer_name",
-			"`tabContact`.supplier",
-			"`tabContact`.supplier_name",
-			"`tabContact`.sales_partner",
-			"`tabContact`.email_id",
-		]);
-	},
-
-	prepare_data: function(data) {
-		this._super(data);
-		
-		// prepare fullname
-		data.fullname = (data.first_name || '') + 
-						(data.last_name ? ' ' + data.last_name : '');
-		if(!data.fullname) data.fullname = data.name;
-		data.fullname = repl("<a href='#!Form/Contact/%(name)s'>%(name)s\
-							</a>", data);
-
-		// prepare description
-		if(data.customer) {
-			data.description = (data.customer_name || data.customer);
-			data.contact_type = 'Customer';
-		} else if (data.supplier) {
-			data.description = (data.supplier_name || data.supplier);
-			data.contact_type = 'Supplier';
-		} else if (data.sales_partner) {
-			data.description = data.sales_partner;
-			data.contact_type = 'Sales Partner'
-		} else {
-			data.description = '';
-			data.contact_type = '';
-		}
-	},
-	
-	columns: [
-		{width: '3%', content: 'check'},
-		{width: '20%', content: 'fullname'},
-		{width: '15%', content: 'contact_type'},
-		{width: '20%', content: 'description+tags'},
-		{width: '30%', content: 'email_id'},
-		{width: '12%', content:'modified', css: {'text-align': 'right', 'color':'#777'}}
-	]
-});