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

fix: conflicts

Browse Source
This commit is contained in:
Jannat Patel
2021-10-20 11:32:35 +05:30
committed by GitHub
parent 9166d58717
commit 873d166a4e
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -42,8 +42,6 @@ class Opportunity(TransactionBase):
if not self.with_items: if not self.with_items:
self.items = [] self.items = []
<<<<<<< HEAD
=======
else: else:
self.calculate_totals() self.calculate_totals()
@@ -70,7 +68,6 @@ class Opportunity(TransactionBase):
self.grand_total = flt(self.total) + flt(self.opportunity_amount) self.grand_total = flt(self.total) + flt(self.opportunity_amount)
self.base_grand_total = flt(self.base_total) + flt(self.base_opportunity_amount) self.base_grand_total = flt(self.base_total) + flt(self.base_opportunity_amount)
>>>>>>> d81f811349 (fix: map missing fields in opportunity (#27904))
def make_new_lead_if_required(self): def make_new_lead_if_required(self):
"""Set lead against new opportunity""" """Set lead against new opportunity"""
if (not self.get("party_name")) and self.contact_email: if (not self.get("party_name")) and self.contact_email: