Fixes for Estimate/Sales Order creation.

This commit is contained in:
rocketdebris 2026-01-09 13:29:51 -05:00
parent 016aa08b95
commit f7ce3a39d0
5 changed files with 34 additions and 33 deletions

View file

@ -390,7 +390,7 @@ def upsert_estimate(data):
estimate = frappe.get_doc("Quotation", estimate_name) estimate = frappe.get_doc("Quotation", estimate_name)
# Update fields # Update fields
estimate.custom_installation_address = data.get("address_name") estimate.custom_installation_address = data.get("address")
estimate.party_name = data.get("customer") estimate.party_name = data.get("customer")
estimate.contact_person = data.get("contact_name") estimate.contact_person = data.get("contact_name")
estimate.custom_requires_half_payment = data.get("requires_half_payment", 0) estimate.custom_requires_half_payment = data.get("requires_half_payment", 0)
@ -419,7 +419,7 @@ def upsert_estimate(data):
new_estimate = frappe.get_doc({ new_estimate = frappe.get_doc({
"doctype": "Quotation", "doctype": "Quotation",
"custom_requires_half_payment": data.get("requires_half_payment", 0), "custom_requires_half_payment": data.get("requires_half_payment", 0),
# "custom_installation_address": data.get("address_name"), "custom_installation_address": data.get("address_name"),
"custom_current_status": "Draft", "custom_current_status": "Draft",
"contact_email": data.get("contact_email"), "contact_email": data.get("contact_email"),
"party_name": data.get("customer"), "party_name": data.get("customer"),

View file

@ -34,6 +34,7 @@ def on_update_after_submit(doc, method):
try: try:
new_sales_order = make_sales_order(doc.name) new_sales_order = make_sales_order(doc.name)
new_sales_order.custom_requires_half_payment = doc.requires_half_payment new_sales_order.custom_requires_half_payment = doc.requires_half_payment
new_sales_order.custom_installation_address = doc.custom_installation_address
new_sales_order.payment_schedule = [] new_sales_order.payment_schedule = []
print("DEBUG: Setting payment schedule for Sales Order") print("DEBUG: Setting payment schedule for Sales Order")
new_sales_order.set_payment_schedule() new_sales_order.set_payment_schedule()

View file

@ -1,12 +1,12 @@
import frappe import frappe
def after_insert(doc, method):
pass
def on_submit(doc, method): def on_submit(doc, method):
print(doc.as_dict()) print("DEBUG: Info from Sales Order")
print(doc.custom_installation_address)
print(doc.company)
print(doc.transaction_date)
print(doc.customer)
# Create Invoice and Project from Sales Order # Create Invoice and Project from Sales Order
try: try:
print("Creating Project from Sales Order", doc.name) print("Creating Project from Sales Order", doc.name)

View file

@ -173,7 +173,6 @@ doc_events = {
"on_update_after_submit": "custom_ui.events.estimate.on_update_after_submit" "on_update_after_submit": "custom_ui.events.estimate.on_update_after_submit"
}, },
"Sales Order": { "Sales Order": {
"after_insert": "custom_ui.events.sales_order.after_insert",
"on_submit": "custom_ui.events.sales_order.on_submit", "on_submit": "custom_ui.events.sales_order.on_submit",
} }
} }

View file

@ -592,6 +592,7 @@ const saveDraft = async () => {
isSubmitting.value = true; isSubmitting.value = true;
try { try {
const data = { const data = {
address: formData.address,
addressName: formData.addressName, addressName: formData.addressName,
contactName: selectedContact.value.name, contactName: selectedContact.value.name,
customer: selectedAddress.value?.customer?.name, customer: selectedAddress.value?.customer?.name,