From 6164b89e9588b1047c3687e10458bc656bef09f6 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Thu, 6 Jun 2013 17:18:38 +0530 Subject: [PATCH] [report] listing on home page --- accounts/page/accounts_home/accounts_home.js | 15 +++++---------- .../item_wise_sales_register.py | 2 +- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/accounts/page/accounts_home/accounts_home.js b/accounts/page/accounts_home/accounts_home.js index 7f623d71150..b920bfdbab1 100644 --- a/accounts/page/accounts_home/accounts_home.js +++ b/accounts/page/accounts_home/accounts_home.js @@ -127,16 +127,6 @@ wn.module_page["Accounts"] = [ right: true, icon: "icon-table", items: [ - { - "label":wn._("Customer Account Head"), - route: "query-report/Customer Account Head", - doctype: "Account" - }, - { - "label":wn._("Supplier Account Head"), - route: "query-report/Supplier Account Head", - doctype: "Account" - }, { "label":wn._("General Ledger"), page: "general-ledger" @@ -247,6 +237,11 @@ wn.module_page["Accounts"] = [ route: "query-report/Customer Account Head", doctype: "Account" }, + { + "label":wn._("Supplier Account Head"), + route: "query-report/Supplier Account Head", + doctype: "Account" + }, { "label":wn._("Item-wise Sales Register"), route: "query-report/Item-wise Sales Register", 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 f6e26af3508..f3ed2a12423 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 @@ -59,7 +59,7 @@ def get_conditions(filters): def get_items(filters): conditions = get_conditions(filters) return webnotes.conn.sql("""select si.name, si.posting_date, si.debit_to, si.project_name, - si.customer, si.remarks, si.territory, si_item.item_code, si_item.item_name, + si.customer, si.remarks, si.territory, si.company, si_item.item_code, si_item.item_name, si_item.item_group, si_item.sales_order, si_item.delivery_note, si_item.income_account, si_item.qty, si_item.basic_rate, si_item.amount from `tabSales Invoice` si, `tabSales Invoice Item` si_item