nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-27 08:54:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed merge-conflicts

Browse Source
This commit is contained in:
Saurabh
2017-11-28 11:02:28 +05:30
parent a14baf4188 7b833802a9
commit b750b304dd
22 changed files with 292 additions and 268 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
erpnext/crm/doctype/opportunity/opportunity_dashboard.py
View File

@@ -5,6 +5,7 @@ def get_data():
'fieldname': 'prevdoc_docname',
'non_standard_fieldnames': {
'Supplier Quotation': 'opportunity',
'Quotation': 'opportunity'
},
'transactions': [
{