From af1df68c13350c2fc1ca40ddfaa0b268799736e3 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 26 Jul 2013 15:11:55 +0530 Subject: [PATCH 1/3] [cleanup] [minor] added icons in toolbar menu [issue] webnotes/erpnext#655 --- public/js/toolbar.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/public/js/toolbar.js b/public/js/toolbar.js index 91427b3ada..c50f1ed14b 100644 --- a/public/js/toolbar.js +++ b/public/js/toolbar.js @@ -20,19 +20,20 @@ wn.provide('erpnext.toolbar'); erpnext.toolbar.setup = function() { // profile var $user = $('#toolbar-user'); - $user.append('
  • ' + $user.append('
  • ' +wn._("My Settings")+'...
    • '); $user.append('
  • '); - $user.append('
  • ' - +wn._('Documentation')+'
    • ') - $user.append('
  • ' - +wn._('Forum')+'
    • ') + $user.append('
  • \ + '+wn._('Documentation')+'
    • ') + $user.append('
  • \ + '+wn._('Forum')+'
    • ') $user.append('
  • \ - '+wn._('Live Chat')+'
    • ') + '+wn._('Live Chat')+'') erpnext.toolbar.set_new_comments(); - $("#toolbar-tools").append('
  • Latest Updates
    • '); + $("#toolbar-tools").append('
  • \ + Latest Updates
    • '); } erpnext.toolbar.set_new_comments = function(new_comments) { From a10ef4592b976538c5e1638112cf2929fa119949 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 26 Jul 2013 15:45:38 +0530 Subject: [PATCH 2/3] [minor] total tax column in item-wise sales/purchase register --- .../item_wise_purchase_register.py | 10 ++++++---- .../item_wise_sales_register.py | 8 +++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py b/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py index 38408371b1..9093d11e2b 100644 --- a/accounts/report/item_wise_purchase_register/item_wise_purchase_register.py +++ b/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() @@ -35,8 +35,10 @@ def execute(filters=None): d.purchase_receipt, expense_head, d.qty, d.rate, d.amount] 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 \ No newline at end of file diff --git a/accounts/report/item_wise_sales_register/item_wise_sales_register.py b/accounts/report/item_wise_sales_register/item_wise_sales_register.py index 9df994ae0a..14d686353f 100644 --- a/accounts/report/item_wise_sales_register/item_wise_sales_register.py +++ b/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 \ No newline at end of file From 114bc0916474e5dfc80f20e6cd0aea1c7d219884 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Fri, 26 Jul 2013 15:47:47 +0530 Subject: [PATCH 3/3] [minor] [fix] same account in item and tax table --- .../report/purchase_register/purchase_register.py | 14 +++++++++----- accounts/report/sales_register/sales_register.py | 12 ++++++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/accounts/report/purchase_register/purchase_register.py b/accounts/report/purchase_register/purchase_register.py index 12b93162a2..0a4711ffb8 100644 --- a/accounts/report/purchase_register/purchase_register.py +++ b/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): - invoice_expense_map[d.parent][d.account_head] += flt(d.tax_amount) + 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) @@ -180,4 +184,4 @@ def get_account_details(invoice_list): where name in (%s)""" % ", ".join(["%s"]*len(accounts)), tuple(accounts), as_dict=1): account_map[acc.name] = acc.parent_account - return account_map + return account_map \ No newline at end of file diff --git a/accounts/report/sales_register/sales_register.py b/accounts/report/sales_register/sales_register.py index 653b5e65a0..87c58164bc 100644 --- a/accounts/report/sales_register/sales_register.py +++ b/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): - invoice_income_map[d.parent][d.account_head] += flt(d.tax_amount) + 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)