Merge branch 'master' into edge

Conflicts: accounts/doctype/sales_invoice/sales_invoice.txt stock/doctype/item/item.txt
2026-05-05 22:48:27 +00:00 · 2013-04-23 12:42:18 +05:30
parent e2fe4cd317 890265928b
commit dc0f2d2422
17 changed files with 602 additions and 285 deletions
--- a/accounts/doctype/purchase_invoice/purchase_invoice_list.js
+++ b/accounts/doctype/purchase_invoice/purchase_invoice_list.js
@@ -1,9 +1,9 @@
 // render
 wn.listview_settings['Purchase Invoice'] = {
 	add_fields: ["`tabPurchase Invoice`.grand_total", "`tabPurchase Invoice`.outstanding_amount"],
-	add_columns: [{"content":"outstanding_amount", width:"10%", type:"bar-graph", label: "Paid"}],
+	add_columns: [{"content":"paid_amount", width:"10%", type:"bar-graph", label: "Paid"}],
 	prepare_data: function(data) {
-		data.outstanding_amount = ((flt(data.grand_total) - 
-			flt(data.outstanding_amount)) / flt(data.grand_total)) * 100;
+		data.paid_amount = flt(data.grand_total) ? (((flt(data.grand_total) - 
+			flt(data.outstanding_amount)) / flt(data.grand_total)) * 100) : 0;
 	}
 };
--- a/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/accounts/doctype/sales_invoice/sales_invoice.js
@@ -159,7 +159,6 @@ cur_frm.cscript.update_stock = function(doc, dt, dn) {
 	cur_frm.cscript.hide_fields(doc, dt, dn);
 }

-
 cur_frm.cscript.warehouse = function(doc, cdt , cdn) {
 	var d = locals[cdt][cdn];
 	if (!d.item_code) { msgprint("please enter item code first"); return };
--- a/accounts/doctype/sales_invoice/sales_invoice.txt
+++ b/accounts/doctype/sales_invoice/sales_invoice.txt
@@ -1,8 +1,8 @@
 [
 {
-  "creation": "2013-04-09 10:18:11", 
+  "creation": "2013-04-19 11:00:14", 
  "docstatus": 0, 
-  "modified": "2013-03-22 18:38:13", 
+  "modified": "2013-04-22 11:59:28", 
  "modified_by": "Administrator", 
  "owner": "Administrator"
 }, 
@@ -42,7 +42,8 @@
  "fieldtype": "Section Break", 
  "label": "Basic Info", 
  "oldfieldtype": "Section Break", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -50,6 +51,7 @@
  "fieldtype": "Column Break", 
  "oldfieldtype": "Column Break", 
  "print_hide": 0, 
+  "read_only": 0, 
  "width": "50%"
 }, 
 {
@@ -63,6 +65,7 @@
  "oldfieldtype": "Select", 
  "options": "INV\nINV/10-11/", 
  "print_hide": 1, 
+  "read_only": 0, 
  "reqd": 1
 }, 
 {
@@ -72,7 +75,8 @@
  "label": "Is POS", 
  "oldfieldname": "is_pos", 
  "oldfieldtype": "Check", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "depends_on": "eval:doc.is_pos==1", 
@@ -82,7 +86,8 @@
  "label": "Update Stock", 
  "oldfieldname": "update_stock", 
  "oldfieldtype": "Check", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "description": "The account to which you will pay (have paid) the money to.", 
@@ -95,6 +100,7 @@
  "oldfieldtype": "Link", 
  "options": "Account", 
  "print_hide": 1, 
+  "read_only": 0, 
  "reqd": 1, 
  "search_index": 1
 }, 
@@ -108,7 +114,8 @@
  "oldfieldname": "customer", 
  "oldfieldtype": "Link", 
  "options": "Customer", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -158,7 +165,8 @@
  "doctype": "DocField", 
  "fieldname": "column_break1", 
  "fieldtype": "Column Break", 
-  "oldfieldtype": "Column Break"
+  "oldfieldtype": "Column Break", 
+  "read_only": 0
 }, 
 {
  "default": "Today", 
@@ -172,6 +180,7 @@
  "oldfieldname": "posting_date", 
  "oldfieldtype": "Date", 
  "print_hide": 0, 
+  "read_only": 0, 
  "reqd": 1, 
  "search_index": 1
 }, 
@@ -186,6 +195,7 @@
  "no_copy": 1, 
  "oldfieldname": "due_date", 
  "oldfieldtype": "Date", 
+  "read_only": 0, 
  "reqd": 1, 
  "search_index": 0
 }, 
@@ -196,14 +206,16 @@
  "label": "Mode of Payment", 
  "oldfieldname": "mode_of_payment", 
  "oldfieldtype": "Select", 
-  "options": "link:Mode of Payment"
+  "options": "link:Mode of Payment", 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "items", 
  "fieldtype": "Section Break", 
  "label": "Items", 
-  "oldfieldtype": "Section Break"
+  "oldfieldtype": "Section Break", 
+  "read_only": 0
 }, 
 {
  "allow_on_submit": 1, 
@@ -213,25 +225,29 @@
  "label": "Entries", 
  "oldfieldname": "entries", 
  "oldfieldtype": "Table", 
-  "options": "Sales Invoice Item"
+  "options": "Sales Invoice Item", 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "sales_bom_help", 
  "fieldtype": "HTML", 
  "label": "Sales BOM Help", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "section_break0", 
  "fieldtype": "Section Break", 
-  "options": "Simple"
+  "options": "Simple", 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "col_break26", 
  "fieldtype": "Column Break", 
+  "read_only": 0, 
  "width": "50%"
 }, 
 {
@@ -253,12 +269,14 @@
  "fieldtype": "Button", 
  "label": "Re-Calculate Values", 
  "oldfieldtype": "Button", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "col_break25", 
  "fieldtype": "Column Break", 
+  "read_only": 0, 
  "width": "50%"
 }, 
 {
@@ -270,7 +288,8 @@
  "oldfieldname": "sales_order_main", 
  "oldfieldtype": "Link", 
  "options": "Sales Order", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "description": "Select Items from Delivery Note", 
@@ -281,7 +300,8 @@
  "oldfieldname": "delivery_note_main", 
  "oldfieldtype": "Link", 
  "options": "Delivery Note", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -289,18 +309,21 @@
  "fieldtype": "Button", 
  "label": "Get Items", 
  "oldfieldtype": "Button", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "currency_section", 
  "fieldtype": "Section Break", 
-  "label": "Price List and Currency"
+  "label": "Price List and Currency", 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "col_break27", 
  "fieldtype": "Column Break", 
+  "read_only": 0, 
  "width": "50%"
 }, 
 {
@@ -312,6 +335,7 @@
  "oldfieldtype": "Select", 
  "options": "link:Price List", 
  "print_hide": 1, 
+  "read_only": 0, 
  "reqd": 1
 }, 
 {
@@ -322,6 +346,7 @@
  "label": "Price List Currency", 
  "options": "Currency", 
  "print_hide": 1, 
+  "read_only": 0, 
  "reqd": 1
 }, 
 {
@@ -331,12 +356,14 @@
  "fieldtype": "Float", 
  "label": "Price List Currency Conversion Rate", 
  "print_hide": 1, 
+  "read_only": 0, 
  "reqd": 1
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "column_break2", 
  "fieldtype": "Column Break", 
+  "read_only": 0, 
  "width": "50%"
 }, 
 {
@@ -348,6 +375,7 @@
  "oldfieldtype": "Select", 
  "options": "Currency", 
  "print_hide": 1, 
+  "read_only": 0, 
  "reqd": 1
 }, 
 {
@@ -360,6 +388,7 @@
  "oldfieldname": "conversion_rate", 
  "oldfieldtype": "Currency", 
  "print_hide": 1, 
+  "read_only": 0, 
  "reqd": 1
 }, 
 {
@@ -367,7 +396,8 @@
  "fieldname": "taxes", 
  "fieldtype": "Section Break", 
  "label": "Taxes and Charges", 
-  "oldfieldtype": "Section Break"
+  "oldfieldtype": "Section Break", 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -377,7 +407,8 @@
  "oldfieldname": "charge", 
  "oldfieldtype": "Link", 
  "options": "Sales Taxes and Charges Master", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -385,7 +416,8 @@
  "fieldtype": "Button", 
  "label": "Get Taxes and Charges", 
  "oldfieldtype": "Button", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "allow_on_submit": 1, 
@@ -395,7 +427,8 @@
  "label": "Taxes and Charges1", 
  "oldfieldname": "other_charges", 
  "oldfieldtype": "Table", 
-  "options": "Sales Taxes and Charges"
+  "options": "Sales Taxes and Charges", 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -403,7 +436,8 @@
  "fieldtype": "Button", 
  "label": "Calculate Taxes and Charges", 
  "oldfieldtype": "Button", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -422,7 +456,8 @@
  "fieldtype": "HTML", 
  "label": "Taxes and Charges Calculation", 
  "oldfieldtype": "HTML", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -430,7 +465,8 @@
  "fieldtype": "Section Break", 
  "label": "Totals", 
  "oldfieldtype": "Section Break", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -438,6 +474,7 @@
  "fieldtype": "Column Break", 
  "oldfieldtype": "Column Break", 
  "print_hide": 1, 
+  "read_only": 0, 
  "width": "50%"
 }, 
 {
@@ -506,6 +543,7 @@
  "fieldtype": "Column Break", 
  "oldfieldtype": "Column Break", 
  "print_hide": 1, 
+  "read_only": 0, 
  "width": "50%"
 }, 
 {
@@ -567,12 +605,14 @@
  "doctype": "DocField", 
  "fieldname": "payments_section", 
  "fieldtype": "Section Break", 
-  "label": "Payments"
+  "label": "Payments", 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "column_break3", 
  "fieldtype": "Column Break", 
+  "read_only": 0, 
  "width": "50%"
 }, 
 {
@@ -583,7 +623,8 @@
  "oldfieldname": "paid_amount", 
  "oldfieldtype": "Currency", 
  "options": "Company:company:default_currency", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -593,12 +634,14 @@
  "oldfieldname": "cash_bank_account", 
  "oldfieldtype": "Link", 
  "options": "Account", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "column_break4", 
  "fieldtype": "Column Break", 
+  "read_only": 0, 
  "width": "50%"
 }, 
 {
@@ -606,7 +649,8 @@
  "fieldname": "write_off_outstanding_amount_automatically", 
  "fieldtype": "Check", 
  "label": "Write Off Outstanding Amount", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -614,7 +658,8 @@
  "fieldtype": "Currency", 
  "label": "Write Off Amount", 
  "options": "Company:company:default_currency", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -622,7 +667,8 @@
  "fieldtype": "Link", 
  "label": "Write Off Account", 
  "options": "Account", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -630,14 +676,16 @@
  "fieldtype": "Link", 
  "label": "Write Off Cost Center", 
  "options": "Cost Center", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "terms_section_break", 
  "fieldtype": "Section Break", 
  "label": "Terms and Conditions", 
-  "oldfieldtype": "Section Break"
+  "oldfieldtype": "Section Break", 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -647,7 +695,8 @@
  "oldfieldname": "tc_name", 
  "oldfieldtype": "Link", 
  "options": "Terms and Conditions", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -656,7 +705,8 @@
  "label": "Get Terms and Conditions", 
  "oldfieldtype": "Button", 
  "options": "get_tc_details", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -665,7 +715,8 @@
  "label": "Terms and Conditions HTML", 
  "oldfieldtype": "HTML", 
  "options": "You can add Terms and Notes that will be printed in the Transaction", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -673,18 +724,21 @@
  "fieldtype": "Text Editor", 
  "label": "Terms and Conditions Details", 
  "oldfieldname": "terms", 
-  "oldfieldtype": "Text Editor"
+  "oldfieldtype": "Text Editor", 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "contact_section", 
  "fieldtype": "Section Break", 
-  "label": "Contact Info"
+  "label": "Contact Info", 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "col_break23", 
  "fieldtype": "Column Break", 
+  "read_only": 0, 
  "width": "50%"
 }, 
 {
@@ -693,7 +747,8 @@
  "fieldtype": "Link", 
  "label": "Customer Address", 
  "options": "Address", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -701,12 +756,14 @@
  "fieldtype": "Link", 
  "label": "Contact Person", 
  "options": "Contact", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "col_break24", 
  "fieldtype": "Column Break", 
+  "read_only": 0, 
  "width": "50%"
 }, 
 {
@@ -717,6 +774,7 @@
  "label": "Territory", 
  "options": "Territory", 
  "print_hide": 1, 
+  "read_only": 0, 
  "reqd": 1, 
  "search_index": 0
 }, 
@@ -728,6 +786,7 @@
  "label": "Customer Group", 
  "options": "Customer Group", 
  "print_hide": 1, 
+  "read_only": 0, 
  "search_index": 0
 }, 
 {
@@ -736,7 +795,8 @@
  "fieldtype": "Section Break", 
  "label": "More Info", 
  "oldfieldtype": "Section Break", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -744,6 +804,7 @@
  "fieldtype": "Column Break", 
  "oldfieldtype": "Column Break", 
  "print_hide": 1, 
+  "read_only": 0, 
  "width": "50%"
 }, 
 {
@@ -758,6 +819,7 @@
  "oldfieldtype": "Select", 
  "options": "No\nYes", 
  "print_hide": 1, 
+  "read_only": 0, 
  "search_index": 0
 }, 
 {
@@ -768,7 +830,8 @@
  "label": "Aging Date", 
  "oldfieldname": "aging_date", 
  "oldfieldtype": "Date", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -778,7 +841,8 @@
  "no_copy": 1, 
  "oldfieldname": "posting_time", 
  "oldfieldtype": "Time", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "allow_on_submit": 1, 
@@ -789,7 +853,8 @@
  "oldfieldname": "letter_head", 
  "oldfieldtype": "Select", 
  "options": "link:Letter Head", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -799,6 +864,7 @@
  "no_copy": 1, 
  "options": "No\nYes", 
  "print_hide": 1, 
+  "read_only": 0, 
  "report_hide": 0
 }, 
 {
@@ -820,7 +886,8 @@
  "oldfieldname": "campaign", 
  "oldfieldtype": "Link", 
  "options": "Campaign", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "description": "Track this Sales Invoice against any Project", 
@@ -832,6 +899,7 @@
  "oldfieldname": "project_name", 
  "oldfieldtype": "Link", 
  "options": "Project", 
+  "read_only": 0, 
  "search_index": 1
 }, 
 {
@@ -845,6 +913,7 @@
  "oldfieldtype": "Link", 
  "options": "Print Heading", 
  "print_hide": 1, 
+  "read_only": 0, 
  "report_hide": 1
 }, 
 {
@@ -852,7 +921,8 @@
  "fieldname": "column_break8", 
  "fieldtype": "Column Break", 
  "oldfieldtype": "Column Break", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -862,7 +932,8 @@
  "oldfieldname": "source", 
  "oldfieldtype": "Select", 
  "options": "\nExisting Customer\nReference\nAdvertisement\nCold Calling\nExhibition\nSupplier Reference\nMass Mailing\nCustomer's Vendor\nCampaign", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -874,6 +945,7 @@
  "oldfieldtype": "Link", 
  "options": "Company", 
  "print_hide": 1, 
+  "read_only": 0, 
  "reqd": 1, 
  "search_index": 0
 }, 
@@ -888,6 +960,7 @@
  "oldfieldtype": "Select", 
  "options": "link:Fiscal Year", 
  "print_hide": 1, 
+  "read_only": 0, 
  "reqd": 1, 
  "search_index": 0
 }, 
@@ -912,7 +985,8 @@
  "no_copy": 1, 
  "oldfieldname": "amendment_date", 
  "oldfieldtype": "Date", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "depends_on": "eval:!doc.__islocal", 
@@ -934,6 +1008,7 @@
  "oldfieldname": "remarks", 
  "oldfieldtype": "Text", 
  "print_hide": 1, 
+  "read_only": 0, 
  "reqd": 0
 }, 
 {
@@ -942,7 +1017,8 @@
  "fieldtype": "Section Break", 
  "label": "Advances", 
  "oldfieldtype": "Section Break", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -951,7 +1027,8 @@
  "label": "Get Advances Received", 
  "oldfieldtype": "Button", 
  "options": "get_advances", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -961,14 +1038,16 @@
  "oldfieldname": "advance_adjustment_details", 
  "oldfieldtype": "Table", 
  "options": "Sales Invoice Advance", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "packing_list", 
  "fieldtype": "Section Break", 
  "label": "Packing List", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -976,7 +1055,8 @@
  "fieldtype": "Table", 
  "label": "Packing Details", 
  "options": "Delivery Note Packing Item", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -984,7 +1064,8 @@
  "fieldtype": "Section Break", 
  "label": "Sales Team", 
  "oldfieldtype": "Section Break", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -992,6 +1073,7 @@
  "fieldtype": "Column Break", 
  "oldfieldtype": "Column Break", 
  "print_hide": 1, 
+  "read_only": 0, 
  "width": "50%"
 }, 
 {
@@ -1003,7 +1085,8 @@
  "oldfieldname": "sales_partner", 
  "oldfieldtype": "Link", 
  "options": "Sales Partner", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -1011,6 +1094,7 @@
  "fieldtype": "Column Break", 
  "oldfieldtype": "Column Break", 
  "print_hide": 1, 
+  "read_only": 0, 
  "width": "50%"
 }, 
 {
@@ -1020,7 +1104,8 @@
  "label": "Commission Rate (%)", 
  "oldfieldname": "commission_rate", 
  "oldfieldtype": "Currency", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -1030,14 +1115,16 @@
  "oldfieldname": "total_commission", 
  "oldfieldtype": "Currency", 
  "options": "Company:company:default_currency", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "section_break2", 
  "fieldtype": "Section Break", 
  "options": "Simple", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -1047,7 +1134,8 @@
  "oldfieldname": "sales_team", 
  "oldfieldtype": "Table", 
  "options": "Sales Team", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "depends_on": "eval:doc.docstatus<2", 
@@ -1055,13 +1143,15 @@
  "fieldname": "recurring_invoice", 
  "fieldtype": "Section Break", 
  "label": "Recurring Invoice", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
  "fieldname": "column_break11", 
  "fieldtype": "Column Break", 
  "print_hide": 1, 
+  "read_only": 0, 
  "width": "50%"
 }, 
 {
@@ -1073,7 +1163,8 @@
  "fieldtype": "Check", 
  "label": "Convert into Recurring Invoice", 
  "no_copy": 1, 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "allow_on_submit": 1, 
@@ -1085,7 +1176,8 @@
  "label": "Recurring Type", 
  "no_copy": 1, 
  "options": "Monthly\nQuarterly\nHalf-yearly\nYearly", 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "allow_on_submit": 1, 
@@ -1096,7 +1188,8 @@
  "fieldtype": "Int", 
  "label": "Repeat on Day of Month", 
  "no_copy": 1, 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "allow_on_submit": 1, 
@@ -1107,7 +1200,8 @@
  "fieldtype": "Date", 
  "label": "Invoice Period From Date", 
  "no_copy": 1, 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "allow_on_submit": 1, 
@@ -1118,7 +1212,8 @@
  "fieldtype": "Date", 
  "label": "Invoice Period To Date", 
  "no_copy": 1, 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -1126,6 +1221,7 @@
  "fieldtype": "Column Break", 
  "no_copy": 0, 
  "print_hide": 1, 
+  "read_only": 0, 
  "width": "50%"
 }, 
 {
@@ -1137,7 +1233,8 @@
  "fieldtype": "Small Text", 
  "label": "Notification Email Address", 
  "no_copy": 1, 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "depends_on": "eval:doc.convert_into_recurring_invoice==1", 
@@ -1170,7 +1267,8 @@
  "fieldtype": "Date", 
  "label": "End Date", 
  "no_copy": 1, 
-  "print_hide": 1
+  "print_hide": 1, 
+  "read_only": 0
 }, 
 {
  "doctype": "DocField", 
@@ -1182,20 +1280,9 @@
  "oldfieldname": "against_income_account", 
  "oldfieldtype": "Small Text", 
  "print_hide": 1, 
+  "read_only": 0, 
  "report_hide": 1
 }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "match": "", 
-  "permlevel": 1, 
-  "report": 0, 
-  "role": "Accounts Manager", 
-  "submit": 0, 
-  "write": 0
- }, 
 {
  "amend": 1, 
  "cancel": 1, 
@@ -1203,33 +1290,10 @@
  "doctype": "DocPerm", 
  "permlevel": 0, 
  "report": 1, 
-  "role": "Accounts Manager", 
-  "submit": 1, 
-  "write": 1
- }, 
- {
-  "amend": 1, 
-  "cancel": 0, 
-  "create": 1, 
-  "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "report": 1, 
  "role": "Accounts User", 
  "submit": 1, 
  "write": 1
 }, 
- {
-  "amend": 0, 
-  "cancel": 0, 
-  "create": 0, 
-  "doctype": "DocPerm", 
-  "match": "", 
-  "permlevel": 1, 
-  "report": 0, 
-  "role": "Accounts User", 
-  "submit": 0, 
-  "write": 0
- }, 
 {
  "doctype": "DocPerm", 
  "match": "customer", 
@@ -1237,9 +1301,4 @@
  "report": 1, 
  "role": "Customer"
 }, 
- {
-  "doctype": "DocPerm", 
-  "permlevel": 0, 
-  "role": "Retail User"
- }
 ]
--- a/accounts/doctype/sales_invoice/sales_invoice_list.js
+++ b/accounts/doctype/sales_invoice/sales_invoice_list.js
@@ -1,10 +1,10 @@
 // render
 wn.listview_settings['Sales Invoice'] = {
 	add_fields: ["`tabSales Invoice`.grand_total", "`tabSales Invoice`.outstanding_amount"],
-	add_columns: [{"content":"outstanding_amount", width:"10%", type:"bar-graph",
+	add_columns: [{"content":"paid_amount", width:"10%", type:"bar-graph",
 		label: "Payment Received"}],
 	prepare_data: function(data) {
-		data.outstanding_amount = (flt(data.grand_total) - 
-			flt(data.outstanding_amount)) / flt(data.grand_total) * 100;
+		data.paid_amount =  flt(data.grand_total) ? (((flt(data.grand_total) - 
+			flt(data.outstanding_amount)) / flt(data.grand_total)) * 100) : 0;
 	}
 };
--- a/accounts/page/accounts_home/accounts_home.js
+++ b/accounts/page/accounts_home/accounts_home.js
@@ -139,6 +139,11 @@ wn.module_page["Accounts"] = [
 				"page":"Financial Statements",
 				"label": wn._("Financial Statements")
 			},
+			{
+				"label":wn._("Accounts Receivable"),
+				route: "query-report/Accounts Receivable",
+				doctype: "Sales Invoice"
+			},
 		]
 	},
 	{
--- a/accounts/report/accounts_receivable/init.py
+++ b/accounts/report/accounts_receivable/init.py
--- a/accounts/report/accounts_receivable/accounts_receivable.js
+++ b/accounts/report/accounts_receivable/accounts_receivable.js
@@ -0,0 +1,42 @@
+wn.query_reports["Accounts Receivable"] = {
+	"filters": [
+		{
+			"fieldname":"company",
+			"label": "Company",
+			"fieldtype": "Link",
+			"options": "Company",
+			"default": sys_defaults.company
+		},
+		{
+			"fieldname":"account",
+			"label": "Account",
+			"fieldtype": "Link",
+			"options": "Account",
+			"get_query": function() {
+				var company = wn.query_report.filters_by_name.company.get_value();
+				return {
+					"query": "accounts.utils.get_account_list", 
+					"filters": {
+						"is_pl_account": "No",
+						"debit_or_credit": "Debit",
+						"company": company,
+						"master_type": "Customer"
+					}
+				}
+			}
+		},
+		{
+			"fieldname":"report_date",
+			"label": "Date",
+			"fieldtype": "Date",
+			"default": get_today()
+		},
+		{
+			"fieldname":"ageing_based_on",
+			"label": "Ageing Based On",
+			"fieldtype": "Select",
+			"options": 'Posting Date' + NEWLINE + 'Due Date',
+			"default": "Posting Date"
+		}
+	]
+}
--- a/accounts/report/accounts_receivable/accounts_receivable.py
+++ b/accounts/report/accounts_receivable/accounts_receivable.py
@@ -0,0 +1,141 @@
+from __future__ import unicode_literals
+import webnotes
+from webnotes.utils import getdate, nowdate, flt, cstr
+
+def execute(filters=None):
+	if not filters: filters = {}
+	columns = get_columns()
+	entries = get_gl_entries(filters)
+	
+	entries_after_report_date = [[gle.voucher_type, gle.voucher_no] 
+		for gle in get_gl_entries(filters, upto_report_date=False)]
+	
+	account_territory_map = get_account_territory_map()
+	si_due_date_map = get_si_due_date_map()
+		
+	# Age of the invoice on this date
+	age_on = getdate(filters.get("report_date")) > getdate(nowdate()) \
+		and nowdate() or filters.get("report_date")
+
+	data = []
+	total_invoiced_amount = total_payment = total_outstanding = 0
+	for gle in entries:
+		if cstr(gle.against_voucher) == gle.voucher_no or not gle.against_voucher \
+				or [gle.against_voucher_type, gle.against_voucher] in entries_after_report_date:
+			
+			due_date = (gle.voucher_type == "Sales Invoice") \
+				and si_due_date_map.get(gle.voucher_no) or ""
+		
+			invoiced_amount = gle.debit > 0 and gle.debit or 0		
+			payment_amount = get_payment_amount(gle, filters.get("report_date") or nowdate(), 
+				entries_after_report_date)
+			outstanding_amount = invoiced_amount - payment_amount
+		
+			if abs(flt(outstanding_amount)) > 0.01:
+				row = [gle.posting_date, gle.account, gle.voucher_type, gle.voucher_no, 
+					gle.remarks, due_date, account_territory_map.get(gle.account), 
+					invoiced_amount, payment_amount, outstanding_amount]
+				# Ageing
+				if filters.get("ageing_based_on") == "Due Date":
+					ageing_based_on_date = due_date
+				else:
+					ageing_based_on_date = gle.posting_date
+				row += get_ageing_data(ageing_based_on_date, age_on, outstanding_amount)
+				
+				# Add to total
+				total_invoiced_amount += flt(invoiced_amount)
+				total_payment += flt(payment_amount)
+				total_outstanding += flt(outstanding_amount)
+				
+				data.append(row)
+	if data:
+		data.append(["", "", "", "", "", "", "Total", total_invoiced_amount, total_payment, 
+			total_outstanding, "", "", "", ""])
+				
+	return columns, data
+	
+def get_columns():
+	return [
+		"Posting Date:Date:80", "Account:Link/Account:150", "Voucher Type::110", 
+		"Voucher No::120", "Remarks::150", "Due Date:Date:80", "Territory:Link/Territory:80", 
+		"Invoiced Amount:Currency:100", "Payment Amount:Currency:100", 
+		"Outstanding Amount:Currency:100", "Age:Int:50", "0-30:Currency:100", 
+		"30-60:Currency:100", "60-90:Currency:100", "90-Above:Currency:100"
+	]
+	
+def get_gl_entries(filters, upto_report_date=True):
+	conditions, customer_accounts = get_conditions(filters, upto_report_date)
+	return webnotes.conn.sql("""select * from `tabGL Entry` 
+		where ifnull(is_cancelled, 'No') = 'No' %s order by posting_date, account""" % 
+		(conditions) % (", ".join(['%s']*len(customer_accounts))), 
+		tuple(customer_accounts), as_dict=1)
+	
+def get_conditions(filters, upto_report_date=True):
+	conditions = ""
+	if filters.get("company"):
+		conditions += " and company='%s'" % filters["company"]
+	
+	customer_accounts = []
+	if filters.get("account"):
+		customer_accounts = [filters["account"]]
+	elif filters.get("company"):
+		customer_accounts = webnotes.conn.sql_list("""select name from `tabAccount` 
+			where ifnull(master_type, '') = 'Customer' and docstatus < 2 %s""" % 
+			conditions, filters)
+	
+	if customer_accounts:
+		conditions += " and account in (%s)"
+		
+	if filters.get("report_date"):
+		if upto_report_date:
+			conditions += " and posting_date<='%s'" % filters["report_date"]
+		else:
+			conditions += " and posting_date>'%s'" % filters["report_date"]
+		
+	return conditions, customer_accounts
+	
+def get_account_territory_map():
+	account_territory_map = {}
+	for each in webnotes.conn.sql("""select t2.name, t1.territory from `tabCustomer` t1, 
+			`tabAccount` t2 where t1.name = t2.master_name group by t2.name"""):
+		account_territory_map[each[0]] = each[1]
+		
+	return account_territory_map
+	
+def get_si_due_date_map():
+	""" get due_date from sales invoice """
+	si_due_date_map = {}
+	for t in webnotes.conn.sql("""select name, due_date from `tabSales Invoice` group by name"""):
+		si_due_date_map[t[0]] = t[1]
+		
+	return si_due_date_map
+
+def get_payment_amount(gle, report_date, entries_after_report_date):
+	payment_amount = 0
+	if flt(gle.credit) > 0 and (not gle.against_voucher or 
+		[gle.against_voucher_type, gle.against_voucher] in entries_after_report_date):
+			payment_amount = gle.credit
+	elif flt(gle.debit) > 0:
+		payment_amount = webnotes.conn.sql("""
+			select sum(ifnull(credit, 0)) - sum(ifnull(debit, 0)) from `tabGL Entry` 
+			where account = %s and posting_date <= %s and against_voucher_type = %s 
+			and against_voucher = %s and name != %s and ifnull(is_cancelled, 'No') = 'No'""", 
+			(gle.account, report_date, gle.voucher_type, gle.voucher_no, gle.name))[0][0]
+	
+	return flt(payment_amount)
+
+def get_ageing_data(ageing_based_on_date, age_on, outstanding_amount):
+	val1 = val2 = val3 = val4 = diff = 0
+	diff = age_on and ageing_based_on_date \
+		and (getdate(age_on) - getdate(ageing_based_on_date)).days or 0
+
+	if diff <= 30:
+		val1 = outstanding_amount
+	elif 30 < diff <= 60:
+		val2 = outstanding_amount
+	elif 60 < diff <= 90:
+		val3 = outstanding_amount
+	elif diff > 90:
+		val4 = outstanding_amount
+		
+	return [diff, val1, val2, val3, val4]
--- a/accounts/report/accounts_receivable/accounts_receivable.txt
+++ b/accounts/report/accounts_receivable/accounts_receivable.txt
@@ -0,0 +1,21 @@
+[
+ {
+  "creation": "2013-04-16 11:31:13", 
+  "docstatus": 0, 
+  "modified": "2013-04-16 11:31:13", 
+  "modified_by": "Administrator", 
+  "owner": "Administrator"
+ }, 
+ {
+  "doctype": "Report", 
+  "is_standard": "Yes", 
+  "name": "__common__", 
+  "ref_doctype": "Sales Invoice", 
+  "report_name": "Accounts Receivable", 
+  "report_type": "Script Report"
+ }, 
+ {
+  "doctype": "Report", 
+  "name": "Accounts Receivable"
+ }
+]
--- a/accounts/search_criteria/accounts_receivable/accounts_receivable.sql
+++ b/accounts/search_criteria/accounts_receivable/accounts_receivable.sql
@@ -13,4 +13,4 @@ WHERE
 	 AND `tabGL Entry`.`is_cancelled` = 'No'
 	 AND `tabAccount`.`master_type` = 'Customer'
 	 AND `tabAccount`.`name` = `tabGL Entry`.`account`
-ORDER BY `tabGL Entry`.`posting_date`
+ORDER BY `tabGL Entry`.`posting_date`, `tabGL Entry`.`account`