Fixes for Estimate/Sales Order creation.

custom_ui/api/db/estimates.py

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

custom_ui/events/estimate.py

@@ -34,6 +34,7 @@ def on_update_after_submit(doc, method):
         try:
             new_sales_order = make_sales_order(doc.name)
             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 = []
             print("DEBUG: Setting payment schedule for Sales Order")
             new_sales_order.set_payment_schedule()

custom_ui/events/sales_order.py

@@ -1,12 +1,12 @@
 import frappe
 
 
-def after_insert(doc, method):
-    pass
-
-
 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
     try:
         print("Creating Project from Sales Order",  doc.name)

custom_ui/hooks.py

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

frontend/src/components/pages/Estimate.vue

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