From 34d1b1415e6ccb1221f8122506cb6b8623a81457 Mon Sep 17 00:00:00 2001
From: Nabin Hait <nabinhait@gmail.com>
Date: Tue, 28 May 2013 12:32:21 +0530
Subject: [PATCH] [report] filter added base on territory in sales personwise
 transaction summary

---
 accounts/report/accounts_receivable/accounts_receivable.txt | 2 +-
 .../item_wise_sales_history/item_wise_sales_history.txt     | 5 +++--
 .../sales_person_wise_transaction_summary.js                | 6 ++++++
 .../sales_person_wise_transaction_summary.py                | 1 +
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/accounts/report/accounts_receivable/accounts_receivable.txt b/accounts/report/accounts_receivable/accounts_receivable.txt
index 7eb344fc08..d01bef23d3 100644
--- a/accounts/report/accounts_receivable/accounts_receivable.txt
+++ b/accounts/report/accounts_receivable/accounts_receivable.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-04-16 11:31:13", 
   "docstatus": 0, 
-  "modified": "2013-04-30 17:54:47", 
+  "modified": "2013-05-24 12:02:52", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
diff --git a/selling/report/item_wise_sales_history/item_wise_sales_history.txt b/selling/report/item_wise_sales_history/item_wise_sales_history.txt
index 6fee050e0d..adbfe69254 100644
--- a/selling/report/item_wise_sales_history/item_wise_sales_history.txt
+++ b/selling/report/item_wise_sales_history/item_wise_sales_history.txt
@@ -1,13 +1,14 @@
 [
  {
-  "creation": "2013-05-03 14:38:34", 
+  "creation": "2013-05-23 17:42:24", 
   "docstatus": 0, 
-  "modified": "2013-05-07 11:19:40", 
+  "modified": "2013-05-24 12:20:17", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
  {
   "add_total_row": 1, 
+  "disabled": 0, 
   "doctype": "Report", 
   "is_standard": "Yes", 
   "name": "__common__", 
diff --git a/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js b/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js
index 4a8e6787ff..2e1996e9a2 100644
--- a/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js
+++ b/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.js
@@ -50,5 +50,11 @@ wn.query_reports["Sales Person-wise Transaction Summary"] = {
 			fieldtype: "Link",
 			options: "Customer",
 		},
+		{
+			fieldname:"territory",
+			label: "Territory",
+			fieldtype: "Link",
+			options: "Territory",
+		},
 	]
 }
\ No newline at end of file
diff --git a/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py b/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
index 23e8819242..8ec3a1826e 100644
--- a/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
+++ b/selling/report/sales_person_wise_transaction_summary/sales_person_wise_transaction_summary.py
@@ -54,6 +54,7 @@ def get_conditions(filters, date_field):
 	conditions = ""
 	if filters.get("company"): conditions += " and dt.company = '%s'" % filters["company"]
 	if filters.get("customer"): conditions += " and dt.customer = '%s'" % filters["customer"]
+	if filters.get("territory"): conditions += " and dt.territory = '%s'" % filters["territory"]
 	
 	if filters.get("from_date"): conditions += " and dt.%s >= '%s'" % \
 		(date_field, filters["from_date"])