nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-20 03:47:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Missing commits from hotfix branch (#17997)

Browse Source 
* fix: merge conflict

* fix: restored missing set_gst_state_and_state_number function

* fix: style linting as per codacy

* fix: Fixes related to customer/lead merging

* fix: merge conflict

* fix: Fixes related to customer/lead merging

* fix: Assign isue/opportunity to user

* fix: Assign isue/opportunity to user

* fix: Replaced Invoice type by GST Category

* fix: merge conflict

* fix: merge conflict

* fix: test cases

* fix: test cases
This commit is contained in:
Nabin Hait
2019-07-03 10:34:31 +05:30
committed by GitHub
parent 7763d0a059
commit 34c551d9a5
194 changed files with 34197 additions and 21884 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/templates/utils.py
View File

@@ -28,7 +28,7 @@ def send_message(subject="Website Query", message="", sender="", status="Open"):
opportunity = frappe.get_doc(dict(
doctype ='Opportunity',
enquiry_from = 'Customer' if customer else 'Lead',
opportunity_from = 'Customer' if customer else 'Lead',
status = 'Open',
title = subject,
contact_email = sender,
@@ -36,11 +36,11 @@ def send_message(subject="Website Query", message="", sender="", status="Open"):
))
if customer:
opportunity.customer = customer[0][0]
opportunity.party_name = customer[0][0]
elif lead:
opportunity.lead = lead
opportunity.party_name = lead
else:
opportunity.lead = new_lead.name
opportunity.party_name = new_lead.name
opportunity.insert(ignore_permissions=True)