update doctype workflows and events for Sales Order creation from Quotation
This commit is contained in:
parent
483942d2ca
commit
02c48e6108
@ -104,56 +104,76 @@ def get_estimate_from_address(full_address):
|
|||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def send_estimate_email(estimate_name):
|
def send_estimate_email(estimate_name):
|
||||||
# def send_estimate_email_job(estimate_name):
|
# def send_estimate_email_job(estimate_name):
|
||||||
print("DEBUG: Sending estimate email for:", estimate_name)
|
try:
|
||||||
quotation = frappe.get_doc("Quotation", estimate_name)
|
print("DEBUG: Sending estimate email for:", estimate_name)
|
||||||
|
quotation = frappe.get_doc("Quotation", estimate_name)
|
||||||
|
|
||||||
party_exists = frappe.db.exists(quotation.quotation_to, quotation.party_name)
|
party_exists = frappe.db.exists(quotation.quotation_to, quotation.party_name)
|
||||||
if not party_exists:
|
if not party_exists:
|
||||||
return build_error_response("No email found for the customer.", 400)
|
return build_error_response("No email found for the customer.", 400)
|
||||||
party = frappe.get_doc(quotation.quotation_to, quotation.party_name)
|
party = frappe.get_doc(quotation.quotation_to, quotation.party_name)
|
||||||
|
|
||||||
|
email = None
|
||||||
|
if (getattr(party, 'email_id', None)):
|
||||||
|
email = party.email_id
|
||||||
|
elif (getattr(party, 'contact_ids', None) and len(party.email_ids) > 0):
|
||||||
|
primary = next((e for e in party.email_ids if e.is_primary), None)
|
||||||
|
email = primary.email_id if primary else party.email_ids[0].email_id
|
||||||
|
|
||||||
|
if not email and quotation.custom_installation_address:
|
||||||
|
address = frappe.get_doc("Address", quotation.custom_installation_address)
|
||||||
|
email = getattr(address, 'email_id', None)
|
||||||
|
if not email:
|
||||||
|
return build_error_response("No email found for the customer or address.", 400)
|
||||||
|
|
||||||
|
# email = "casey@shilohcode.com"
|
||||||
|
template_name = "Quote with Actions - SNW"
|
||||||
|
template = frappe.get_doc("Email Template", template_name)
|
||||||
|
message = frappe.render_template(template.response, {"name": quotation.name})
|
||||||
|
subject = frappe.render_template(template.subject, {"doc": quotation})
|
||||||
|
print("DEBUG: Message: ", message)
|
||||||
|
print("DEBUG: Subject: ", subject)
|
||||||
|
html = frappe.get_print("Quotation", quotation.name, print_format="Quotation - SNW - Standard", letterhead=True)
|
||||||
|
print("DEBUG: Generated HTML for PDF.")
|
||||||
|
pdf = get_pdf(html)
|
||||||
|
print("DEBUG: Generated PDF for email attachment.")
|
||||||
|
frappe.sendmail(
|
||||||
|
recipients=email,
|
||||||
|
subject=subject,
|
||||||
|
content=message,
|
||||||
|
doctype="Quotation",
|
||||||
|
name=quotation.name,
|
||||||
|
read_receipt=1,
|
||||||
|
print_letterhead=1,
|
||||||
|
attachments=[{"fname": f"{quotation.name}.pdf", "fcontent": pdf}]
|
||||||
|
)
|
||||||
|
print(f"DEBUG: Email sent to {email} successfully.")
|
||||||
|
quotation.custom_current_status = "Submitted"
|
||||||
|
quotation.custom_sent = 1
|
||||||
|
quotation.save()
|
||||||
|
updated_quotation = frappe.get_doc("Quotation", estimate_name)
|
||||||
|
print("DEBUG: Quotation submitted successfully.")
|
||||||
|
return build_success_response(updated_quotation.as_dict())
|
||||||
|
except Exception as e:
|
||||||
|
print(f"DEBUG: Error in send_estimate_email: {str(e)}")
|
||||||
|
return build_error_response(str(e), 500)
|
||||||
|
|
||||||
|
@frappe.whitelist(allow_guest=True)
|
||||||
|
def update_response(name, response):
|
||||||
|
"""Update the response for a given estimate."""
|
||||||
|
estimate = frappe.get_doc("Quotation", name)
|
||||||
|
accepted = True if response == "Accepted" else False
|
||||||
|
new_status = "Estimate Accepted" if accepted else "Lost"
|
||||||
|
|
||||||
|
estimate.custom_response = response
|
||||||
|
estimate.custom_current_status = new_status
|
||||||
|
estimate.custom_followup_needed = 1 if response == "Requested call" else 0
|
||||||
|
estimate.flags.ignore_permissions = True
|
||||||
|
estimate.save()
|
||||||
|
frappe.db.commit()
|
||||||
|
|
||||||
email = None
|
|
||||||
if (getattr(party, 'email_id', None)):
|
|
||||||
email = party.email_id
|
|
||||||
elif (getattr(party, 'contact_ids', None) and len(party.email_ids) > 0):
|
|
||||||
primary = next((e for e in party.email_ids if e.is_primary), None)
|
|
||||||
email = primary.email_id if primary else party.email_ids[0].email_id
|
|
||||||
|
|
||||||
if not email and quotation.custom_installation_address:
|
|
||||||
address = frappe.get_doc("Address", quotation.custom_installation_address)
|
|
||||||
email = getattr(address, 'email_id', None)
|
|
||||||
if not email:
|
|
||||||
return build_error_response("No email found for the customer or address.", 400)
|
|
||||||
|
|
||||||
# email = "casey@shilohcode.com"
|
|
||||||
template_name = "Quote with Actions - SNW"
|
|
||||||
template = frappe.get_doc("Email Template", template_name)
|
|
||||||
message = frappe.render_template(template.response, {"name": quotation.name})
|
|
||||||
subject = frappe.render_template(template.subject, {"doc": quotation})
|
|
||||||
print("DEBUG: Message: ", message)
|
|
||||||
print("DEBUG: Subject: ", subject)
|
|
||||||
html = frappe.get_print("Quotation", quotation.name, print_format="Quotation - SNW - Standard", letterhead=True)
|
|
||||||
print("DEBUG: Generated HTML for PDF.")
|
|
||||||
pdf = get_pdf(html)
|
|
||||||
print("DEBUG: Generated PDF for email attachment.")
|
|
||||||
frappe.sendmail(
|
|
||||||
recipients=email,
|
|
||||||
subject=subject,
|
|
||||||
content=message,
|
|
||||||
doctype="Quotation",
|
|
||||||
name=quotation.name,
|
|
||||||
read_receipt=1,
|
|
||||||
print_letterhead=1,
|
|
||||||
attachments=[{"fname": f"{quotation.name}.pdf", "fcontent": pdf}]
|
|
||||||
)
|
|
||||||
print(f"DEBUG: Email sent to {email} successfully.")
|
|
||||||
quotation.custom_current_status = "Submitted"
|
|
||||||
quotation.custom_sent = 1
|
|
||||||
quotation.save()
|
|
||||||
quotation.submit()
|
|
||||||
updated_quotation = frappe.get_doc("Quotation", estimate_name)
|
|
||||||
print("DEBUG: Quotation submitted successfully.")
|
|
||||||
return build_success_response(updated_quotation.as_dict())
|
|
||||||
|
|
||||||
@frappe.whitelist()
|
@frappe.whitelist()
|
||||||
def upsert_estimate(data):
|
def upsert_estimate(data):
|
||||||
@ -193,6 +213,7 @@ def upsert_estimate(data):
|
|||||||
new_estimate = frappe.get_doc({
|
new_estimate = frappe.get_doc({
|
||||||
"doctype": "Quotation",
|
"doctype": "Quotation",
|
||||||
"custom_installation_address": data.get("address_name"),
|
"custom_installation_address": data.get("address_name"),
|
||||||
|
"custom_current_status": "Draft",
|
||||||
"contact_email": data.get("contact_email"),
|
"contact_email": data.get("contact_email"),
|
||||||
"party_name": data.get("contact_name"),
|
"party_name": data.get("contact_name"),
|
||||||
"company": "Sprinklers Northwest",
|
"company": "Sprinklers Northwest",
|
||||||
@ -211,13 +232,3 @@ def upsert_estimate(data):
|
|||||||
print(f"DEBUG: Error in upsert_estimate: {str(e)}")
|
print(f"DEBUG: Error in upsert_estimate: {str(e)}")
|
||||||
return build_error_response(str(e), 500)
|
return build_error_response(str(e), 500)
|
||||||
|
|
||||||
@frappe.whitelist()
|
|
||||||
def lock_estimate(estimate_name):
|
|
||||||
"""Lock an estimate to prevent further edits."""
|
|
||||||
try:
|
|
||||||
estimate = frappe.get_doc("Quotation", estimate_name)
|
|
||||||
estimate.submit()
|
|
||||||
final_estimate = frappe.get_doc("Quotation", estimate_name)
|
|
||||||
return build_success_response(final_estimate.as_dict())
|
|
||||||
except Exception as e:
|
|
||||||
return build_error_response(str(e), 500)
|
|
||||||
17
custom_ui/api/db/sales_orders.py
Normal file
17
custom_ui/api/db/sales_orders.py
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
import frappe
|
||||||
|
from custom_ui.db_utils import build_success_response, build_error_response
|
||||||
|
from erpnext.selling.doctype.quotation.quotation import make_sales_order
|
||||||
|
|
||||||
|
@frappe.whitelist()
|
||||||
|
def create_sales_order_from_estimate(estimate_name):
|
||||||
|
"""Create a Sales Order from a given Estimate (Quotation)."""
|
||||||
|
try:
|
||||||
|
estimate = frappe.get_doc("Quotation", estimate_name)
|
||||||
|
if estimate.custom_current_status != "Estimate Accepted":
|
||||||
|
raise Exception("Estimate must be accepted to create a Sales Order.")
|
||||||
|
new_sales_order = make_sales_order(estimate_name)
|
||||||
|
new_sales_order.custom_requires_half_payment = estimate.requires_half_payment
|
||||||
|
new_sales_order.insert()
|
||||||
|
return build_success_response(new_sales_order.as_dict())
|
||||||
|
except Exception as e:
|
||||||
|
return build_error_response(str(e), 500)
|
||||||
@ -1,4 +1,5 @@
|
|||||||
import frappe
|
import frappe
|
||||||
|
from erpnext.selling.doctype.quotation.quotation import make_sales_order
|
||||||
|
|
||||||
def after_insert(doc, method):
|
def after_insert(doc, method):
|
||||||
try:
|
try:
|
||||||
@ -14,7 +15,7 @@ def after_insert(doc, method):
|
|||||||
frappe.log_error(f"Error in estimate after_insert: {str(e)}", "Estimate Hook Error")
|
frappe.log_error(f"Error in estimate after_insert: {str(e)}", "Estimate Hook Error")
|
||||||
|
|
||||||
def after_save(doc, method):
|
def after_save(doc, method):
|
||||||
if not doc.custom_sent:
|
if not doc.custom_sent or not doc.custom_response:
|
||||||
return
|
return
|
||||||
print("DEBUG: Quotation has been sent, updating Address status")
|
print("DEBUG: Quotation has been sent, updating Address status")
|
||||||
address_doc = frappe.get_doc("Address", doc.custom_installation_address)
|
address_doc = frappe.get_doc("Address", doc.custom_installation_address)
|
||||||
|
|||||||
@ -7,14 +7,11 @@ def after_insert(doc, method):
|
|||||||
address_doc = frappe.get_doc("Address", doc.address)
|
address_doc = frappe.get_doc("Address", doc.address)
|
||||||
address_doc.custom_onsite_meeting_scheduled = "In Progress"
|
address_doc.custom_onsite_meeting_scheduled = "In Progress"
|
||||||
address_doc.save()
|
address_doc.save()
|
||||||
if doc.status == "Completed":
|
|
||||||
address_doc = frappe.get_doc("Address", doc.address)
|
|
||||||
address_doc.custom_onsite_meeting_scheduled = "Completed"
|
|
||||||
address_doc.save()
|
|
||||||
|
|
||||||
def on_update(doc, method):
|
def after_save(doc, method):
|
||||||
print("DEBUG: On Update Triggered for On-Site Meeting")
|
print("DEBUG: After Save Triggered for On-Site Meeting")
|
||||||
if doc.status == "Completed":
|
if doc.status == "Completed":
|
||||||
print("DEBUG: Meeting marked as Completed, updating Address status")
|
print("DEBUG: Meeting marked as Completed, updating Address status")
|
||||||
address_doc = frappe.get_doc("Address", doc.address)
|
address_doc = frappe.get_doc("Address", doc.address)
|
||||||
address_doc.custom_onsite_meeting_scheduled = "Completed"
|
address_doc.custom_onsite_meeting_scheduled = "Completed"
|
||||||
|
address_doc.save()
|
||||||
@ -1,10 +0,0 @@
|
|||||||
import frappe
|
|
||||||
|
|
||||||
def after_insert(doc, method):
|
|
||||||
address_title = doc.custom_installation_address
|
|
||||||
address_name = frappe.db.get_value("Address", fieldname="name", filters={"address_title": address_title})
|
|
||||||
if address_name:
|
|
||||||
address_doc = frappe.get_doc("Address", address_name)
|
|
||||||
address_doc.custom_estimate_sent_status = "In Progress"
|
|
||||||
address_doc.save()
|
|
||||||
|
|
||||||
@ -161,7 +161,7 @@ add_to_apps_screen = [
|
|||||||
doc_events = {
|
doc_events = {
|
||||||
"On-Site Meeting": {
|
"On-Site Meeting": {
|
||||||
"after_insert": "custom_ui.events.onsite_meeting.after_insert",
|
"after_insert": "custom_ui.events.onsite_meeting.after_insert",
|
||||||
"on_update": "custom_ui.events.onsite_meeting.on_update"
|
"after_save": "custom_ui.events.onsite_meeting.after_save"
|
||||||
},
|
},
|
||||||
"Address": {
|
"Address": {
|
||||||
"after_insert": "custom_ui.events.address.after_insert"
|
"after_insert": "custom_ui.events.address.after_insert"
|
||||||
|
|||||||
@ -169,6 +169,15 @@ def add_custom_fields():
|
|||||||
options="Employee",
|
options="Employee",
|
||||||
insert_after="status"
|
insert_after="status"
|
||||||
)
|
)
|
||||||
|
],
|
||||||
|
"Quotation": [
|
||||||
|
dict(
|
||||||
|
fieldname="requires_half_payment",
|
||||||
|
label="Requires Half Payment",
|
||||||
|
fieldtype="Check",
|
||||||
|
default=0,
|
||||||
|
insert_after="custom_installation_address"
|
||||||
|
)
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user