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

accounts/report/item_wise_purchase_register/item_wise_purchase_register.py

@@ -21,7 +21,7 @@ from webnotes.utils import flt
 def execute(filters=None):
 	if not filters: filters = {}
 	columns = get_columns()
-	last_col = len(columns) - 1
+	last_col = len(columns)
 	
 	item_list = get_items(filters)
 	aii_account_map = get_aii_accounts()
@@ -36,7 +36,9 @@ def execute(filters=None):
 		for tax in tax_accounts:
 			row.append(item_tax.get(d.parent, {}).get(d.item_code, {}).get(tax, 0))
 
-		row.append(sum(row[last_col:]))
+		total_tax = sum(row[last_col:])
+		row += [total_tax, d.amount + total_tax]
+		
 		data.append(row)
 	
 	return columns, data
@@ -104,6 +106,6 @@ def get_tax_accounts(item_list, columns):
 	
 	tax_accounts.sort()
 	columns += [account_head + ":Currency:80" for account_head in tax_accounts]
-	columns.append("Total:Currency:80")
+	columns += ["Total Tax:Currency:80", "Total:Currency:80"]
 
 	return item_tax, tax_accounts

accounts/report/item_wise_sales_register/item_wise_sales_register.py

@@ -21,7 +21,7 @@ from webnotes.utils import flt
 def execute(filters=None):
 	if not filters: filters = {}
 	columns = get_columns()
-	last_col = len(columns) - 1
+	last_col = len(columns)
 	
 	item_list = get_items(filters)
 	item_tax, tax_accounts = get_tax_accounts(item_list, columns)
@@ -35,7 +35,9 @@ def execute(filters=None):
 		for tax in tax_accounts:
 			row.append(item_tax.get(d.parent, {}).get(d.item_code, {}).get(tax, 0))
 			
-		row.append(sum(row[last_col:]))
+		total_tax = sum(row[last_col:])
+		row += [total_tax, d.amount + total_tax]
+		
 		data.append(row)
 	
 	return columns, data
@@ -100,6 +102,6 @@ def get_tax_accounts(item_list, columns):
 	
 	tax_accounts.sort()
 	columns += [account_head + ":Currency:80" for account_head in tax_accounts]
-	columns.append("Total:Currency:80")
+	columns += ["Total Tax:Currency:80", "Total:Currency:80"]
 
 	return item_tax, tax_accounts

accounts/report/purchase_register/purchase_register.py

@@ -31,7 +31,8 @@ def execute(filters=None):
 		return columns, invoice_list
 	
 	invoice_expense_map = get_invoice_expense_map(invoice_list)
-	invoice_expense_map, invoice_tax_map = get_invoice_tax_map(invoice_list, invoice_expense_map)
+	invoice_expense_map, invoice_tax_map = get_invoice_tax_map(invoice_list, 
+		invoice_expense_map, expense_accounts)
 	invoice_po_pr_map = get_invoice_po_pr_map(invoice_list)
 	account_map = get_account_details(invoice_list)
 
@@ -138,15 +139,18 @@ def get_invoice_expense_map(invoice_list):
 	
 	return invoice_expense_map
 	
-def get_invoice_tax_map(invoice_list, invoice_expense_map):
+def get_invoice_tax_map(invoice_list, invoice_expense_map, expense_accounts):
 	tax_details = webnotes.conn.sql("""select parent, account_head, sum(tax_amount) as tax_amount
 		from `tabPurchase Taxes and Charges` where parent in (%s) group by parent, account_head""" % 
 		', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1)
 	
 	invoice_tax_map = {}
 	for d in tax_details:
-		if d.account_head in invoice_expense_map.get(d.parent):
+		if d.account_head in expense_accounts:
+			if invoice_expense_map[d.parent].has_key(d.account_head):
 				invoice_expense_map[d.parent][d.account_head] += flt(d.tax_amount)
+			else:
+				invoice_expense_map[d.parent][d.account_head] = flt(d.tax_amount)
 		else:
 			invoice_tax_map.setdefault(d.parent, webnotes._dict()).setdefault(d.account_head, [])
 			invoice_tax_map[d.parent][d.account_head] = flt(d.tax_amount)

accounts/report/sales_register/sales_register.py

@@ -30,7 +30,8 @@ def execute(filters=None):
 		return columns, invoice_list
 	
 	invoice_income_map = get_invoice_income_map(invoice_list)
-	invoice_income_map, invoice_tax_map = get_invoice_tax_map(invoice_list, invoice_income_map)
+	invoice_income_map, invoice_tax_map = get_invoice_tax_map(invoice_list, 
+		invoice_income_map, income_accounts)
 	
 	invoice_so_dn_map = get_invoice_so_dn_map(invoice_list)
 	customer_map = get_customer_deatils(invoice_list)
@@ -137,15 +138,18 @@ def get_invoice_income_map(invoice_list):
 	
 	return invoice_income_map
 	
-def get_invoice_tax_map(invoice_list, invoice_income_map):
+def get_invoice_tax_map(invoice_list, invoice_income_map, income_accounts):
 	tax_details = webnotes.conn.sql("""select parent, account_head, sum(tax_amount) as tax_amount
 		from `tabSales Taxes and Charges` where parent in (%s) group by parent, account_head""" % 
 		', '.join(['%s']*len(invoice_list)), tuple([inv.name for inv in invoice_list]), as_dict=1)
 	
 	invoice_tax_map = {}
 	for d in tax_details:
-		if d.account_head in invoice_income_map.get(d.parent):
+		if d.account_head in income_accounts:
+			if invoice_income_map[d.parent].has_key(d.account_head):
 				invoice_income_map[d.parent][d.account_head] += flt(d.tax_amount)
+			else:
+				invoice_income_map[d.parent][d.account_head] = flt(d.tax_amount)
 		else:
 			invoice_tax_map.setdefault(d.parent, webnotes._dict()).setdefault(d.account_head, [])
 			invoice_tax_map[d.parent][d.account_head] = flt(d.tax_amount)

public/js/toolbar.js

@@ -20,19 +20,20 @@ wn.provide('erpnext.toolbar');
 erpnext.toolbar.setup = function() {
 	// profile
 	var $user = $('#toolbar-user');
-	$user.append('<li><a href="#Form/Profile/'+user+'">'
+	$user.append('<li><a href="#Form/Profile/'+user+'"><i class="icon-fixed-width icon-user"></i> '
 		+wn._("My Settings")+'...</a></li>');
 	$user.append('<li class="divider"></li>');
-	$user.append('<li><a href="https://erpnext.com/manual" target="_blank">'
-		+wn._('Documentation')+'</a></li>')
-	$user.append('<li><a href="http://groups.google.com/group/erpnext-user-forum" target="_blank">'
-		+wn._('Forum')+'</a></li>')
+	$user.append('<li><a href="https://erpnext.com/manual" target="_blank">\
+		<i class="icon-fixed-width icon-file"></i> '+wn._('Documentation')+'</a></li>')
+	$user.append('<li><a href="http://groups.google.com/group/erpnext-user-forum" target="_blank">\
+		<i class="icon-fixed-width icon-quote-left"></i> '+wn._('Forum')+'</a></li>')
 	$user.append('<li><a href="http://www.providesupport.com?messenger=iwebnotes" target="_blank">\
-		'+wn._('Live Chat')+'</a></li>')
+		<i class="icon-fixed-width icon-comments"></i> '+wn._('Live Chat')+'</a></li>')
 	
 	erpnext.toolbar.set_new_comments();
 
-	$("#toolbar-tools").append('<li><a href="#latest-updates">Latest Updates</li>');
+	$("#toolbar-tools").append('<li><a href="#latest-updates">\
+		<i class="icon-fixed-width icon-rss"></i> Latest Updates</li>');
 }
 
 erpnext.toolbar.set_new_comments = function(new_comments) {