Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/hr/doctype/employee/employee.txt b/hr/doctype/employee/employee.txt
index e8879f5..7b1f730 100644
--- a/hr/doctype/employee/employee.txt
+++ b/hr/doctype/employee/employee.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-01-23 19:57:17",
"docstatus": 0,
- "modified": "2013-01-29 17:47:25",
+ "modified": "2013-02-08 13:07:25",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -545,14 +545,6 @@
},
{
"doctype": "DocField",
- "fieldname": "salary_structure",
- "fieldtype": "Button",
- "hidden": 1,
- "label": "Salary Structure",
- "oldfieldtype": "Button"
- },
- {
- "doctype": "DocField",
"fieldname": "place_of_issue",
"fieldtype": "Data",
"label": "Place of Issue"
@@ -775,4 +767,4 @@
"role": "HR Manager",
"write": 1
}
-]
\ No newline at end of file
+]
diff --git a/hr/doctype/leave_application/leave_application.txt b/hr/doctype/leave_application/leave_application.txt
index e105dff..ec17544 100644
--- a/hr/doctype/leave_application/leave_application.txt
+++ b/hr/doctype/leave_application/leave_application.txt
@@ -2,7 +2,7 @@
{
"creation": "2013-02-02 14:40:08",
"docstatus": 0,
- "modified": "2013-02-07 08:54:22",
+ "modified": "2013-02-08 11:27:22",
"modified_by": "Administrator",
"owner": "Administrator"
},
@@ -165,7 +165,7 @@
"fieldtype": "Date",
"label": "Posting Date",
"no_copy": 1,
- "permlevel": 2,
+ "permlevel": 0,
"reqd": 1
},
{
@@ -175,7 +175,7 @@
"in_filter": 1,
"label": "Fiscal Year",
"options": "link:Fiscal Year",
- "permlevel": 2,
+ "permlevel": 0,
"read_only": 0,
"reqd": 1,
"search_index": 0
@@ -195,7 +195,7 @@
"fieldtype": "Link",
"label": "Letter Head",
"options": "Letter Head",
- "permlevel": 2,
+ "permlevel": 0,
"print_hide": 1,
"read_only": 0
},
@@ -250,4 +250,4 @@
"role": "Leave Approver",
"submit": 0
}
-]
\ No newline at end of file
+]
diff --git a/startup/report_data_map.py b/startup/report_data_map.py
index dc1833d..ff9f3e4 100644
--- a/startup/report_data_map.py
+++ b/startup/report_data_map.py
@@ -47,7 +47,7 @@
"order_by": "lft"
},
"GL Entry": {
- "columns": ["account", "posting_date", "cost_center", "debit", "credit", "is_opening",
+ "columns": ["name", "account", "posting_date", "cost_center", "debit", "credit", "is_opening",
"company", "voucher_type", "voucher_no", "remarks"],
"conditions": ["ifnull(is_cancelled, 'No')='No'"],
"order_by": "posting_date, account",
@@ -86,7 +86,7 @@
"order_by": "name"
},
"Stock Ledger Entry": {
- "columns": ["posting_date", "posting_time", "item_code", "warehouse", "actual_qty as qty",
+ "columns": ["name", "posting_date", "posting_time", "item_code", "warehouse", "actual_qty as qty",
"voucher_type", "voucher_no", "ifnull(incoming_rate,0) as incoming_rate"],
"conditions": ["ifnull(is_cancelled, 'No')='No'"],
"order_by": "posting_date, posting_time, name",
@@ -102,7 +102,7 @@
"order_by": "posting_date, posting_time, name",
},
"Production Order": {
- "columns": ["production_item as item_code",
+ "columns": ["name", "production_item as item_code",
"(ifnull(qty, 0) - ifnull(produced_qty, 0)) as qty",
"fg_warehouse as warehouse"],
"conditions": ["docstatus=1", "status != 'Stopped'", "ifnull(fg_warehouse, '')!=''",
@@ -113,7 +113,7 @@
},
},
"Purchase Request Item": {
- "columns": ["item_code", "warehouse",
+ "columns": ["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 @@
},
},
"Purchase Order Item": {
- "columns": ["item_code", "warehouse",
+ "columns": ["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 @@
},
"Sales Order Item": {
- "columns": ["item_code", "(ifnull(qty, 0) - ifnull(delivered_qty, 0)) as qty",
+ "columns": ["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'",
@@ -178,7 +178,7 @@
}
},
"Sales Invoice Item": {
- "columns": ["parent", "item_code", "qty", "amount"],
+ "columns": ["name", "parent", "item_code", "qty", "amount"],
"conditions": ["docstatus=1", "ifnull(parent, '')!=''"],
"order_by": "parent",
"links": {
@@ -196,7 +196,7 @@
}
},
"Sales Order Item[Sales Analytics]": {
- "columns": ["parent", "item_code", "qty", "amount"],
+ "columns": ["name", "parent", "item_code", "qty", "amount"],
"conditions": ["docstatus=1", "ifnull(parent, '')!=''"],
"order_by": "parent",
"links": {
@@ -214,7 +214,7 @@
}
},
"Delivery Note Item[Sales Analytics]": {
- "columns": ["parent", "item_code", "qty", "amount"],
+ "columns": ["name", "parent", "item_code", "qty", "amount"],
"conditions": ["docstatus=1", "ifnull(parent, '')!=''"],
"order_by": "parent",
"links": {
@@ -246,7 +246,7 @@
}
},
"Purchase Invoice Item": {
- "columns": ["parent", "item_code", "qty", "amount"],
+ "columns": ["name", "parent", "item_code", "qty", "amount"],
"conditions": ["docstatus=1", "ifnull(parent, '')!=''"],
"order_by": "parent",
"links": {
@@ -264,7 +264,7 @@
}
},
"Purchase Order Item[Purchase Analytics]": {
- "columns": ["parent", "item_code", "qty", "amount"],
+ "columns": ["name", "parent", "item_code", "qty", "amount"],
"conditions": ["docstatus=1", "ifnull(parent, '')!=''"],
"order_by": "parent",
"links": {
@@ -282,7 +282,7 @@
}
},
"Purchase Receipt Item[Purchase Analytics]": {
- "columns": ["parent", "item_code", "qty", "amount"],
+ "columns": ["name", "parent", "item_code", "qty", "amount"],
"conditions": ["docstatus=1", "ifnull(parent, '')!=''"],
"order_by": "parent",
"links": {