nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-18 20:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts from enterprise_sprint branch

Browse Source
This commit is contained in:
Saurabh
2018-05-14 21:15:46 +05:30
parent 044d6908cf 8b04d431c0
commit 2ca83d61ea
463 changed files with 35469 additions and 5844 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/startup/report_data_map.py
View File

@@ -208,15 +208,15 @@ data_map = {
},
"Supplier": {
"columns": ["name", "if(supplier_name=name, '', supplier_name) as supplier_name",
"supplier_type as parent_supplier_type"],
"supplier_group as parent_supplier_group"],
"conditions": ["docstatus < 2"],
"order_by": "name",
"links": {
"parent_supplier_type": ["Supplier Type", "name"],
"parent_supplier_group": ["Supplier Group", "name"],
}
},
"Supplier Type": {
"columns": ["name"],
"Supplier Group": {
"columns": ["name", "parent_supplier_group"],
"conditions": ["docstatus < 2"],
"order_by": "name"
},