From 873d166a4ee24c1c3274516e21bb00a6fabf51fe Mon Sep 17 00:00:00 2001 From: Jannat Patel <31363128+pateljannat@users.noreply.github.com> Date: Wed, 20 Oct 2021 11:32:35 +0530 Subject: [PATCH] fix: conflicts --- erpnext/crm/doctype/opportunity/opportunity.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/erpnext/crm/doctype/opportunity/opportunity.py b/erpnext/crm/doctype/opportunity/opportunity.py index 3e9d76ee9c1..6ee95b020dc 100644 --- a/erpnext/crm/doctype/opportunity/opportunity.py +++ b/erpnext/crm/doctype/opportunity/opportunity.py @@ -42,8 +42,6 @@ class Opportunity(TransactionBase): if not self.with_items: self.items = [] -<<<<<<< HEAD -======= else: self.calculate_totals() @@ -70,7 +68,6 @@ class Opportunity(TransactionBase): self.grand_total = flt(self.total) + flt(self.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): """Set lead against new opportunity""" if (not self.get("party_name")) and self.contact_email: