Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/accounts/page/accounts_home/accounts_home.js b/accounts/page/accounts_home/accounts_home.js
index 10c0fc0..0300902 100644
--- a/accounts/page/accounts_home/accounts_home.js
+++ b/accounts/page/accounts_home/accounts_home.js
@@ -128,6 +128,16 @@
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"
},
diff --git a/accounts/report/supplier_account_head/__init__.py b/accounts/report/supplier_account_head/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/accounts/report/supplier_account_head/__init__.py
diff --git a/accounts/report/supplier_account_head/supplier_account_head.py b/accounts/report/supplier_account_head/supplier_account_head.py
new file mode 100644
index 0000000..8b55067
--- /dev/null
+++ b/accounts/report/supplier_account_head/supplier_account_head.py
@@ -0,0 +1,49 @@
+# ERPNext - web based ERP (http://erpnext.com)
+# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+import webnotes
+
+def execute(filters=None):
+ account_map = get_account_map()
+ columns = get_columns(account_map)
+ data = []
+ suppliers = webnotes.conn.sql("select name from tabSupplier where docstatus < 2")
+ for supplier in suppliers:
+ row = [supplier[0]]
+ for company in sorted(account_map):
+ row.append(account_map[company].get(supplier[0], ''))
+ data.append(row)
+
+ return columns, data
+
+def get_account_map():
+ accounts = webnotes.conn.sql("""select name, company, master_name
+ from `tabAccount` where master_type = 'Supplier'
+ and ifnull(master_name, '') != '' and docstatus < 2""", as_dict=1)
+
+ account_map = {}
+ for acc in accounts:
+ account_map.setdefault(acc.company, {}).setdefault(acc.master_name, {})
+ account_map[acc.company][acc.master_name] = acc.name
+
+ return account_map
+
+def get_columns(account_map):
+ columns = ["Supplier:Link/Supplier:120"] + \
+ [(company + ":Link/Account:120") for company in sorted(account_map)]
+
+ return columns
\ No newline at end of file
diff --git a/accounts/report/supplier_account_head/supplier_account_head.txt b/accounts/report/supplier_account_head/supplier_account_head.txt
new file mode 100644
index 0000000..b0554e8
--- /dev/null
+++ b/accounts/report/supplier_account_head/supplier_account_head.txt
@@ -0,0 +1,21 @@
+[
+ {
+ "creation": "2013-06-04 12:56:17",
+ "docstatus": 0,
+ "modified": "2013-06-04 12:56:46",
+ "modified_by": "Administrator",
+ "owner": "Administrator"
+ },
+ {
+ "doctype": "Report",
+ "is_standard": "Yes",
+ "name": "__common__",
+ "ref_doctype": "Account",
+ "report_name": "Supplier Account Head",
+ "report_type": "Script Report"
+ },
+ {
+ "doctype": "Report",
+ "name": "Supplier Account Head"
+ }
+]
\ No newline at end of file
diff --git a/projects/page/projects_home/projects_home.js b/projects/page/projects_home/projects_home.js
index cfde6b3..fd13a67 100644
--- a/projects/page/projects_home/projects_home.js
+++ b/projects/page/projects_home/projects_home.js
@@ -60,6 +60,11 @@
route: "query-report/Daily Time Log Summary",
doctype: "Time Log"
},
+ {
+ "label":wn._("Project wise Stock Tracking"),
+ route: "query-report/Project wise Stock Tracking",
+ doctype: "Project"
+ },
]
}]
diff --git a/projects/report/project_wise_stock_tracking/__init__.py b/projects/report/project_wise_stock_tracking/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/projects/report/project_wise_stock_tracking/__init__.py
diff --git a/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py b/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py
new file mode 100644
index 0000000..7c702e4
--- /dev/null
+++ b/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.py
@@ -0,0 +1,90 @@
+# ERPNext - web based ERP (http://erpnext.com)
+# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+import webnotes
+
+def execute(filters=None):
+ columns = get_columns()
+ proj_details = get_project_details()
+ pr_item_map = get_purchased_items_cost()
+ se_item_map = get_issued_items_cost()
+ dn_item_map = get_delivered_items_cost()
+
+ data = []
+ for project in proj_details:
+ data.append([project.name, pr_item_map.get(project.name, 0),
+ se_item_map.get(project.name, 0), dn_item_map.get(project.name, 0),
+ project.project_name, project.status, project.company,
+ project.customer, project.project_value, project.project_start_date,
+ project.completion_date])
+
+ return columns, data
+
+def get_columns():
+ return ["Project Id:Link/Project:140", "Cost of Purchased Items:Currency:160",
+ "Cost of Issued Items:Currency:160", "Cost of Delivered Items:Currency:160",
+ "Project Name::120", "Project Status::120", "Company:Link/Company:100",
+ "Customer:Link/Customer:140", "Project Value:Currency:120",
+ "Project Start Date:Date:120", "Completion Date:Date:120"]
+
+def get_project_details():
+ return webnotes.conn.sql(""" select name, project_name, status, company, customer, project_value,
+ project_start_date, completion_date from tabProject where docstatus < 2""", as_dict=1)
+
+def get_purchased_items_cost():
+ pr_items = webnotes.conn.sql("""select project_name, sum(amount) as amount
+ from `tabPurchase Receipt Item` where ifnull(project_name, '') != ''
+ and docstatus = 1 group by project_name""", as_dict=1)
+
+ pr_item_map = {}
+ for item in pr_items:
+ pr_item_map.setdefault(item.project_name, item.amount)
+
+ return pr_item_map
+
+def get_issued_items_cost():
+ se_items = webnotes.conn.sql("""select se.project_name, sum(se_item.amount) as amount
+ from `tabStock Entry` se, `tabStock Entry Detail` se_item
+ where se.name = se_item.parent and se.docstatus = 1 and ifnull(se_item.t_warehouse, '') = ''
+ and ifnull(se.project_name, '') != '' group by se.project_name""", as_dict=1)
+
+ se_item_map = {}
+ for item in se_items:
+ se_item_map.setdefault(item.project_name, item.amount)
+
+ return se_item_map
+
+def get_delivered_items_cost():
+ dn_items = webnotes.conn.sql("""select dn.project_name, sum(dn_item.amount) as amount
+ from `tabDelivery Note` dn, `tabDelivery Note Item` dn_item
+ where dn.name = dn_item.parent and dn.docstatus = 1 and ifnull(dn.project_name, '') != ''
+ group by dn.project_name""", as_dict=1)
+
+ si_items = webnotes.conn.sql("""select si.project_name, sum(si_item.amount) as amount
+ from `tabSales Invoice` si, `tabSales Invoice Item` si_item
+ where si.name = si_item.parent and si.docstatus = 1 and ifnull(si.update_stock, 0) = 1
+ and ifnull(si.is_pos, 0) = 1 and ifnull(si.project_name, '') != ''
+ group by si.project_name""", as_dict=1)
+
+
+ dn_item_map = {}
+ for item in dn_items:
+ dn_item_map.setdefault(item.project_name, item.amount)
+
+ for item in si_items:
+ dn_item_map.setdefault(item.project_name, item.amount)
+
+ return dn_item_map
\ No newline at end of file
diff --git a/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.txt b/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.txt
new file mode 100644
index 0000000..89f5085
--- /dev/null
+++ b/projects/report/project_wise_stock_tracking/project_wise_stock_tracking.txt
@@ -0,0 +1,21 @@
+[
+ {
+ "creation": "2013-06-03 17:37:41",
+ "docstatus": 0,
+ "modified": "2013-06-03 17:37:41",
+ "modified_by": "Administrator",
+ "owner": "Administrator"
+ },
+ {
+ "doctype": "Report",
+ "is_standard": "Yes",
+ "name": "__common__",
+ "ref_doctype": "Project",
+ "report_name": "Project wise Stock Tracking ",
+ "report_type": "Report Builder"
+ },
+ {
+ "doctype": "Report",
+ "name": "Project wise Stock Tracking"
+ }
+]
\ No newline at end of file