Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Rushabh Mehta 2013-02-08 15:06:05 +05:30
parent c5c48fd147
commit 66aa26546b
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hr/doctype/holiday_block_list/holiday_block_list.txt
View File

@ -2,7 +2,7 @@
{ {
"creation": "2013-02-04 15:31:29", "creation": "2013-02-04 15:31:29",
"docstatus": 0, "docstatus": 0,
"modified": "2013-02-07 08:47:25", "modified": "2013-02-08 11:36:20",
"modified_by": "Administrator", "modified_by": "Administrator",
"owner": "Administrator" "owner": "Administrator"
}, },
@ -66,7 +66,7 @@
"doctype": "DocField", "doctype": "DocField",
"fieldname": "applies_to_all_departments", "fieldname": "applies_to_all_departments",
"fieldtype": "Check", "fieldtype": "Check",
"label": "Applies to all Departments" "label": "Applies to Company"
}, },
{ {
"description": "Stop users from making Leave Applications on following days.", "description": "Stop users from making Leave Applications on following days.",

6
startup/report_data_map.py
View File

@ -113,7 +113,7 @@ data_map = {
}, },
}, },
"Purchase Request Item": { "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"], "(ifnull(qty, 0) - ifnull(ordered_qty, 0)) as qty"],
"from": "`tabPurchase Request Item` item, `tabPurchase Request` main", "from": "`tabPurchase Request Item` item, `tabPurchase Request` main",
"conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'", "conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'",
@ -124,7 +124,7 @@ data_map = {
}, },
}, },
"Purchase Order Item": { "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"], "(ifnull(qty, 0) - ifnull(received_qty, 0)) as qty"],
"from": "`tabPurchase Order Item` item, `tabPurchase Order` main", "from": "`tabPurchase Order Item` item, `tabPurchase Order` main",
"conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'", "conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'",
@ -136,7 +136,7 @@ data_map = {
}, },
"Sales Order Item": { "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"], "reserved_warehouse as warehouse"],
"from": "`tabSales Order Item` item, `tabSales Order` main", "from": "`tabSales Order Item` item, `tabSales Order` main",
"conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'", "conditions": ["item.parent = main.name", "main.docstatus=1", "main.status != 'Stopped'",