nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-16 11:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Deepesh Garg
2022-06-18 20:23:58 +05:30
committed by GitHub
parent 8d63abb442
commit 8e2e61ef84
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
erpnext/selling/doctype/quotation/quotation.py
View File

@@ -115,17 +115,8 @@ class Quotation(SellingController):
opp.set_status(status=status, update=True) opp.set_status(status=status, update=True)
@frappe.whitelist() @frappe.whitelist()
<<<<<<< HEAD
def declare_enquiry_lost(self, lost_reasons_list, detailed_reason=None): def declare_enquiry_lost(self, lost_reasons_list, detailed_reason=None):
if not self.has_sales_order():
=======
def declare_enquiry_lost(self, lost_reasons_list, competitors, detailed_reason=None):
<<<<<<< HEAD
if not self.is_fully_ordered() or self.is_partially_ordered():
>>>>>>> 02f9441e1a (fix: Quotation lost update)
=======
if not (self.is_fully_ordered() or self.is_partially_ordered()): if not (self.is_fully_ordered() or self.is_partially_ordered()):
>>>>>>> e457288dba (chore: fix condition)
get_lost_reasons = frappe.get_list("Quotation Lost Reason", fields=["name"]) get_lost_reasons = frappe.get_list("Quotation Lost Reason", fields=["name"])
lost_reasons_lst = [reason.get("name") for reason in get_lost_reasons] lost_reasons_lst = [reason.get("name") for reason in get_lost_reasons]
frappe.db.set(self, "status", "Lost") frappe.db.set(self, "status", "Lost")