schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
rohitwaghchaure
2022-05-11 16:05:19 +05:30
committed by GitHub
parent e126d4e592
commit fb62bbf61a
1 changed files with 7 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
erpnext/crm/doctype/opportunity/opportunity.py
View File

@@ -8,12 +8,7 @@ import frappe
from frappe import _ from frappe import _
from frappe.email.inbox import link_communication_to_document from frappe.email.inbox import link_communication_to_document
from frappe.model.mapper import get_mapped_doc from frappe.model.mapper import get_mapped_doc
<<<<<<< HEAD from frappe.utils import cint, get_fullname
from frappe.utils import cint, cstr, get_fullname
=======
from frappe.query_builder import DocType
from frappe.utils import cint, flt, get_fullname
>>>>>>> 3f41cb762d (fix: allow to use formatting for the field to_discuss in opportunity)
from erpnext.accounts.party import get_party_account_currency from erpnext.accounts.party import get_party_account_currency
from erpnext.setup.utils import get_exchange_rate from erpnext.setup.utils import get_exchange_rate
@@ -196,24 +191,6 @@ class Opportunity(TransactionBase):
opts.description = "" opts.description = ""
opts.contact_date = self.contact_date opts.contact_date = self.contact_date
<<<<<<< HEAD
if self.party_name and self.opportunity_from == "Customer":
if self.contact_person:
opts.description = "Contact " + cstr(self.contact_person)
else:
opts.description = "Contact customer " + cstr(self.party_name)
elif self.party_name and self.opportunity_from == "Lead":
if self.contact_display:
opts.description = "Contact " + cstr(self.contact_display)
else:
opts.description = "Contact lead " + cstr(self.party_name)
opts.subject = opts.description
opts.description += ". By : " + cstr(self.contact_by)
if self.to_discuss:
opts.description += " To Discuss : " + cstr(self.to_discuss)
=======
if self.party_name and self.opportunity_from == "Customer": if self.party_name and self.opportunity_from == "Customer":
if self.contact_person: if self.contact_person:
opts.description = f"Contact {self.contact_person}" opts.description = f"Contact {self.contact_person}"
@@ -230,7 +207,6 @@ class Opportunity(TransactionBase):
if self.to_discuss: if self.to_discuss:
opts.description += f" To Discuss : {frappe.render_template(self.to_discuss, {'doc': self})}" opts.description += f" To Discuss : {frappe.render_template(self.to_discuss, {'doc': self})}"
>>>>>>> 3f41cb762d (fix: allow to use formatting for the field to_discuss in opportunity)
super(Opportunity, self).add_calendar_event(opts, force) super(Opportunity, self).add_calendar_event(opts, force)