From 66aa26546bfe29f6eae13acb2fa06935b3aadcd4 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Fri, 8 Feb 2013 15:06:05 +0530
Subject: [PATCH] fix

---
 hr/doctype/holiday_block_list/holiday_block_list.txt | 4 ++--
 startup/report_data_map.py                           | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hr/doctype/holiday_block_list/holiday_block_list.txt b/hr/doctype/holiday_block_list/holiday_block_list.txt
index 23b70e2ecf..d034d8fdbf 100644
--- a/hr/doctype/holiday_block_list/holiday_block_list.txt
+++ b/hr/doctype/holiday_block_list/holiday_block_list.txt
@@ -2,7 +2,7 @@
  {
   "creation": "2013-02-04 15:31:29", 
   "docstatus": 0, 
-  "modified": "2013-02-07 08:47:25", 
+  "modified": "2013-02-08 11:36:20", 
   "modified_by": "Administrator", 
   "owner": "Administrator"
  }, 
@@ -66,7 +66,7 @@
   "doctype": "DocField", 
   "fieldname": "applies_to_all_departments", 
   "fieldtype": "Check", 
-  "label": "Applies to all Departments"
+  "label": "Applies to Company"
  }, 
  {
   "description": "Stop users from making Leave Applications on following days.", 
diff --git a/startup/report_data_map.py b/startup/report_data_map.py
index ff9f3e44cf..83e4b30dca 100644
--- a/startup/report_data_map.py
+++ b/startup/report_data_map.py
@@ -113,7 +113,7 @@ data_map = {
 		},
 	},
 	"Purchase Request Item": {
-		"columns": ["name", "item_code", "warehouse", 
+		"columns": ["item.name as name", "item_code", "warehouse", 
 			"(ifnull(qty, 0) - ifnull(ordered_qty, 0)) as qty"],
 		"from": "`tabPurchase Request Item` item, `tabPurchase Request` main",
 		"conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'", 
@@ -124,7 +124,7 @@ data_map = {
 		},
 	},
 	"Purchase Order Item": {
-		"columns": ["name", "item_code", "warehouse", 
+		"columns": ["item.name as name", "item_code", "warehouse", 
 			"(ifnull(qty, 0) - ifnull(received_qty, 0)) as qty"],
 		"from": "`tabPurchase Order Item` item, `tabPurchase Order` main",
 		"conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'", 
@@ -136,7 +136,7 @@ data_map = {
 	},
 	
 	"Sales Order Item": {
-		"columns": ["name", "item_code", "(ifnull(qty, 0) - ifnull(delivered_qty, 0)) as qty", 
+		"columns": ["item.name as name", "item_code", "(ifnull(qty, 0) - ifnull(delivered_qty, 0)) as qty", 
 			"reserved_warehouse as warehouse"],
 		"from": "`tabSales Order Item` item, `tabSales Order` main",
 		"conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'",