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

fix: create SO from Quot for Prospect --conflicts

Browse Source
This commit is contained in:
Nihantra C. Patel
2024-08-20 11:31:49 +05:30
committed by GitHub
parent 33542cb909
commit 5d7fb1d945
1 changed files with 12 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -347,8 +347,8 @@ def make_sales_order(source_name: str, target_doc=None):
return _make_sales_order(source_name, target_doc) return _make_sales_order(source_name, target_doc)
def _make_sales_order(source_name, target_doc=None, customer_group=None, ignore_permissions=False): def _make_sales_order(source_name, target_doc=None, ignore_permissions=False):
customer = _make_customer(source_name, ignore_permissions, customer_group) customer = _make_customer(source_name, ignore_permissions)
ordered_items = frappe._dict( ordered_items = frappe._dict(
frappe.db.get_all( frappe.db.get_all(
"Sales Order Item", "Sales Order Item",
@@ -502,41 +502,17 @@ def _make_sales_invoice(source_name, target_doc=None, ignore_permissions=False):
return doclist return doclist
def _make_customer(source_name, ignore_permissions=False, customer_group=None): def _make_customer(source_name, ignore_permissions=False):
quotation = frappe.db.get_value( quotation = frappe.db.get_value(
"Quotation", source_name, ["order_type", "party_name", "customer_name"], as_dict=1 "Quotation",
source_name,
["order_type", "quotation_to", "party_name", "customer_name"],
as_dict=1,
) )
if quotation and quotation.get("party_name"): if quotation.quotation_to == "Customer":
if not frappe.db.exists("Customer", quotation.get("party_name")): return frappe.get_doc("Customer", quotation.party_name)
lead_name = quotation.get("party_name")
customer_name = frappe.db.get_value(
"Customer", {"lead_name": lead_name}, ["name", "customer_name"], as_dict=True
)
if not customer_name:
from erpnext.crm.doctype.lead.lead import _make_customer
<<<<<<< HEAD
customer_doclist = _make_customer(lead_name, ignore_permissions=ignore_permissions)
customer = frappe.get_doc(customer_doclist)
customer.flags.ignore_permissions = ignore_permissions
customer.customer_group = customer_group
try:
customer.insert()
return customer
except frappe.NameError:
if frappe.defaults.get_global_default("cust_master_name") == "Customer Name":
customer.run_method("autoname")
customer.name += "-" + lead_name
customer.insert()
return customer
else:
raise
except frappe.MandatoryError as e:
mandatory_fields = e.args[0].split(":")[1].split(",")
mandatory_fields = [customer.meta.get_label(field.strip()) for field in mandatory_fields]
=======
# Check if a Customer already exists for the Lead or Prospect. # Check if a Customer already exists for the Lead or Prospect.
existing_customer = None existing_customer = None
if quotation.quotation_to == "Lead": if quotation.quotation_to == "Lead":
@@ -554,24 +530,8 @@ def _make_customer(source_name, ignore_permissions=False, customer_group=None):
return create_customer_from_prospect(quotation.party_name, ignore_permissions=ignore_permissions) return create_customer_from_prospect(quotation.party_name, ignore_permissions=ignore_permissions)
return None return None
>>>>>>> 2f63fae31d (fix: Create Sales Order from Quotation for Prospect)
frappe.local.message_log = []
lead_link = frappe.utils.get_link_to_form("Lead", lead_name)
message = (
_("Could not auto create Customer due to the following missing mandatory field(s):")
+ "<br>"
)
message += "<br><ul><li>" + "</li><li>".join(mandatory_fields) + "</li></ul>"
message += _("Please create Customer from Lead {0}.").format(lead_link)
<<<<<<< HEAD
frappe.throw(message, title=_("Mandatory Missing"))
else:
return customer_name
else:
return frappe.get_doc("Customer", quotation.get("party_name"))
=======
def create_customer_from_lead(lead_name, ignore_permissions=False): def create_customer_from_lead(lead_name, ignore_permissions=False):
from erpnext.crm.doctype.lead.lead import _make_customer from erpnext.crm.doctype.lead.lead import _make_customer
@@ -605,9 +565,10 @@ def handle_mandatory_error(e, customer, lead_name):
mandatory_fields = [customer.meta.get_label(field.strip()) for field in mandatory_fields] mandatory_fields = [customer.meta.get_label(field.strip()) for field in mandatory_fields]
frappe.local.message_log = [] frappe.local.message_log = []
message = _("Could not auto create Customer due to the following missing mandatory field(s):") + "<br>" message = (
_("Could not auto create Customer due to the following missing mandatory field(s):") + "<br>"
)
message += "<br><ul><li>" + "</li><li>".join(mandatory_fields) + "</li></ul>" message += "<br><ul><li>" + "</li><li>".join(mandatory_fields) + "</li></ul>"
message += _("Please create Customer from Lead {0}.").format(get_link_to_form("Lead", lead_name)) message += _("Please create Customer from Lead {0}.").format(get_link_to_form("Lead", lead_name))
frappe.throw(message, title=_("Mandatory Missing")) frappe.throw(message, title=_("Mandatory Missing"))
>>>>>>> 2f63fae31d (fix: Create Sales Order from Quotation for Prospect)