diff --git a/custom_ui/api/db/estimates.py b/custom_ui/api/db/estimates.py
index 7576488..c1ac907 100644
--- a/custom_ui/api/db/estimates.py
+++ b/custom_ui/api/db/estimates.py
@@ -268,15 +268,17 @@ def get_estimate_templates(company):
         filters["company"] = company
     try:
         print("DEBUG: Fetching estimate templates for company:", company)
-        templates = frappe.get_all("Quotation Template", fields=["name", "is_active", "description"], filters=filters)
+        templates = frappe.get_all("Quotation Template", fields=["*"], filters=filters)
         
         result = []
         if not templates:
             print("DEBUG: No templates found.")
             return build_success_response(result)
+        print(f"DEBUG: Found {len(templates)} templates.")
         for template in templates:
+            print("DEBUG: Processing template:", template)
             items = frappe.get_all("Quotation Template Item", 
-                                 fields=["item_code", "item_name", "description", "qty", "discount_percentage", "rate"],
+                                 fields=["item_code", "item_name", "description", "quantity", "discount_percentage", "rate"],
                                  filters={"parent": template.name},
                                  order_by="idx")
             
@@ -293,8 +295,9 @@ def get_estimate_templates(company):
                 })
                 
             result.append({
-                "templateName": template.name,
-                "active": template.active,
+                "name": template.name,
+                "templateName": template.template_name,
+                "active": template.is_active,
                 "description": template.description,
                 "items": mapped_items
             })
@@ -302,39 +305,74 @@ def get_estimate_templates(company):
         return build_success_response(result)
     except Exception as e:
         return build_error_response(str(e), 500)
-    
+
 @frappe.whitelist()
-def create_template(data):
+def create_estimate_template(data):
     """Create a new estimate template."""
     try:
-        data = json.loads(data) if isinstance(data, str) else data
         print("DEBUG: Creating estimate template with data:", data)
+        data = json.loads(data) if isinstance(data, str) else data
         
-        new_template = frappe.get_doc({
+        doc_data = {
             "doctype": "Quotation Template",
-            "template_name": data.get("templateName"),
-            "is_active": data.get("active", 1),
-            "description": data.get("description", ""),
-            "company": data.get("company", ""),
+            "is_active": 1,
+            "description": data.get("description"),
+            "company": data.get("company"),
+            "items": [],
+            "template_name": data.get("template_name"),
             "source_quotation": data.get("source_quotation", "")
-        })
+        }
+        
+
+        new_template = frappe.get_doc(doc_data)
         
         for item in data.get("items", []):
-            item = json.loads(item) if isinstance(item, str) else item
             new_template.append("items", {
-                "item_code": item.get("itemCode"),
-                "item_name": item.get("itemName"),
+                "item_code": item.get("item_code"),
+                "item_name": item.get("item_name"),
                 "description": item.get("description"),
-                "qty": item.get("quantity"),
-                "discount_percentage": item.get("discountPercentage"),
-                "rate": item.get("rate")
+                "qty": item.get("qty") or item.get("quantity"),
+                "rate": item.get("standard_rate") or item.get("rate"),
+                "discount_percentage": item.get("discount_percentage")
             })
-        
+            
         new_template.insert()
-        print("DEBUG: New estimate template created with name:", new_template.name)
-        return build_success_response(new_template.as_dict())
+        return build_success_response(new_template.name)
     except Exception as e:
         return build_error_response(str(e), 500)
+    
+# @frappe.whitelist()
+# def create_template(data):
+#     """Create a new estimate template."""
+#     try:
+#         data = json.loads(data) if isinstance(data, str) else data
+#         print("DEBUG: Creating estimate template with data:", data)
+        
+#         new_template = frappe.get_doc({
+#             "doctype": "Quotation Template",
+#             "template_name": data.get("templateName"),
+#             "is_active": data.get("active", 1),
+#             "description": data.get("description", ""),
+#             "company": data.get("company", ""),
+#             "source_quotation": data.get("source_quotation", "")
+#         })
+        
+#         for item in data.get("items", []):
+#             item = json.loads(item) if isinstance(item, str) else item
+#             new_template.append("items", {
+#                 "item_code": item.get("itemCode"),
+#                 "item_name": item.get("itemName"),
+#                 "description": item.get("description"),
+#                 "qty": item.get("quantity"),
+#                 "discount_percentage": item.get("discountPercentage"),
+#                 "rate": item.get("rate")
+#             })
+        
+#         new_template.insert()
+#         print("DEBUG: New estimate template created with name:", new_template.name)
+#         return build_success_response(new_template.as_dict())
+#     except Exception as e:
+#         return build_error_response(str(e), 500)
 
 @frappe.whitelist()
 def upsert_estimate(data):
diff --git a/frontend/src/api.js b/frontend/src/api.js
index 2f9cc4c..d3e2b0c 100644
--- a/frontend/src/api.js
+++ b/frontend/src/api.js
@@ -13,6 +13,7 @@ const FRAPPE_SEND_ESTIMATE_EMAIL_METHOD = "custom_ui.api.db.estimates.send_estim
 const FRAPPE_LOCK_ESTIMATE_METHOD = "custom_ui.api.db.estimates.lock_estimate";
 const FRAPPE_ESTIMATE_UPDATE_RESPONSE_METHOD = "custom_ui.api.db.estimates.manual_response";
 const FRAPPE_GET_ESTIMATE_TEMPLATES_METHOD = "custom_ui.api.db.estimates.get_estimate_templates";
+const FRAPPE_CREATE_ESTIMATE_TEMPLATE_METHOD = "custom_ui.api.db.estimates.create_estimate_template";
 // Job methods
 const FRAPPE_GET_JOB_METHOD = "custom_ui.api.db.jobs.get_job";
 const FRAPPE_GET_JOBS_METHOD = "custom_ui.api.db.jobs.get_jobs_table_data";
@@ -227,6 +228,10 @@ class Api {
 		return await this.request(FRAPPE_GET_ESTIMATE_TEMPLATES_METHOD, { company });
 	}
 
+	static async createEstimateTemplate(data) {
+		return await this.request(FRAPPE_CREATE_ESTIMATE_TEMPLATE_METHOD, { data });
+	}
+
 	// ============================================================================
 	// JOB / PROJECT METHODS
 	// ============================================================================
diff --git a/frontend/src/components/modals/SaveTemplateModal.vue b/frontend/src/components/modals/SaveTemplateModal.vue
new file mode 100644
index 0000000..aa94837
--- /dev/null
+++ b/frontend/src/components/modals/SaveTemplateModal.vue
@@ -0,0 +1,82 @@
+<template>
+	<Modal
+		:visible="visible"
+		@update:visible="$emit('update:visible', $event)"
+		@close="$emit('update:visible', false)"
+		:options="{ showActions: false }"
+	>
+		<template #title>Save As Template</template>
+		<div class="modal-content">
+			<div class="field-group">
+				<label for="templateName" class="field-label">Template Name</label>
+				<InputText id="templateName" v-model="templateData.templateName" fluid />
+			</div>
+			<div class="field-group">
+				<label for="templateDescription" class="field-label">Description</label>
+				<InputText id="templateDescription" v-model="templateData.description" fluid />
+			</div>
+			<div class="confirmation-buttons">
+				<Button label="Cancel" @click="$emit('update:visible', false)" severity="secondary" />
+				<Button label="Submit" @click="submit" :disabled="!templateData.templateName" />
+			</div>
+		</div>
+	</Modal>
+</template>
+
+<script setup>
+import { reactive, watch } from "vue";
+import Modal from "../common/Modal.vue";
+import InputText from "primevue/inputtext";
+import Button from "primevue/button";
+
+const props = defineProps({
+	visible: {
+		type: Boolean,
+		required: true,
+	},
+});
+
+const emit = defineEmits(["update:visible", "save"]);
+
+const templateData = reactive({
+	templateName: "",
+	description: "",
+});
+
+watch(
+	() => props.visible,
+	(newVal) => {
+		if (newVal) {
+			templateData.templateName = "";
+			templateData.description = "";
+		}
+	},
+);
+
+const submit = () => {
+	emit("save", { ...templateData });
+};
+</script>
+
+<style scoped>
+.field-label {
+	display: block;
+	margin-bottom: 0.5rem;
+	font-weight: 500;
+}
+
+.field-group {
+	margin-bottom: 1rem;
+}
+
+.confirmation-buttons {
+	display: flex;
+	gap: 1rem;
+	justify-content: flex-end;
+	margin-top: 1rem;
+}
+
+.modal-content {
+	padding: 1rem;
+}
+</style>
diff --git a/frontend/src/components/pages/Estimate.vue b/frontend/src/components/pages/Estimate.vue
index 79803be..ff53e7b 100644
--- a/frontend/src/components/pages/Estimate.vue
+++ b/frontend/src/components/pages/Estimate.vue
@@ -60,24 +60,29 @@
 		</div>
 
 		<!-- Template Section -->
-		<div v-if="isNew" class="template-section">
-			<label for="template" class="field-label">Template</label>
-			<Select
-				v-model="selectedTemplate"
-				:options="templates"
-				optionLabel="templateName"
-				optionValue="templateName"
-				placeholder="Select a template"
-				fluid
-				@change="onTemplateChange"
-			>
-				<template #option="slotProps">
-					<div class="template-option">
-						<div class="template-name">{{ slotProps.option.templateName }}</div>
-						<div class="template-desc">{{ slotProps.option.description }}</div>
-					</div>
-				</template>
-			</Select>
+		<div class="template-section">
+			<div v-if="isNew">
+				<label for="template" class="field-label">Template</label>
+				<Select
+					v-model="selectedTemplate"
+					:options="templates"
+					optionLabel="templateName"
+					optionValue="name"
+					placeholder="Select a template"
+					fluid
+					@change="onTemplateChange"
+				>
+					<template #option="slotProps">
+						<div class="template-option">
+							<div class="template-name">{{ slotProps.option.templateName }}</div>
+							<div class="template-desc">{{ slotProps.option.description }}</div>
+						</div>
+					</template>
+				</Select>
+			</div>
+			<div v-else>
+				<Button label="Save As Template" icon="pi pi-save" @click="openSaveTemplateModal" />
+			</div>
 		</div>
 
 		<!-- Items Section -->
@@ -198,6 +203,13 @@
 			<Button label="Submit" @click="submitResponse"/>
 		</Modal>
 
+		<!-- Save Template Modal -->
+		<SaveTemplateModal
+			:visible="showSaveTemplateModal"
+			@update:visible="showSaveTemplateModal = $event"
+			@save="confirmSaveTemplate"
+		/>
+
 		<!-- Address Search Modal -->
 		<Modal
 			:visible="showAddressModal"
@@ -311,6 +323,7 @@
 import { ref, reactive, computed, onMounted, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import Modal from "../common/Modal.vue";
+import SaveTemplateModal from "../modals/SaveTemplateModal.vue";
 import DataTable from "../common/DataTable.vue";
 import DocHistory from "../common/DocHistory.vue";
 import InputText from "primevue/inputtext";
@@ -362,6 +375,7 @@ const showAddressModal = ref(false);
 const showAddItemModal = ref(false);
 const showConfirmationModal = ref(false);
 const showResponseModal = ref(false);
+const showSaveTemplateModal = ref(false);
 const addressSearchResults = ref([]);
 const itemSearchTerm = ref("");
 
@@ -394,7 +408,7 @@ const fetchTemplates = async () => {
 };
 
 const onTemplateChange = () => {
-	const template = templates.value.find(t => t.templateName === selectedTemplate.value);
+	const template = templates.value.find(t => t.name === selectedTemplate.value);
 	if (template && template.items) {
 		selectedItems.value = template.items.map(item => ({
 			itemCode: item.itemCode,
@@ -414,6 +428,35 @@ const onTemplateChange = () => {
 	}
 };
 
+const openSaveTemplateModal = () => {
+	showSaveTemplateModal.value = true;
+};
+
+const confirmSaveTemplate = async (templateData) => {
+	try {
+		const data = {
+			templateName: templateData.templateName,
+			description: templateData.description,
+			company: company.currentCompany,
+			sourceQuotation: estimate.value.name,
+			items: selectedItems.value.map(item => ({
+				itemCode: item.itemCode,
+				itemName: item.itemName,
+				description: item.description,
+				qty: item.qty,
+				standardRate: item.standardRate,
+				discountPercentage: item.discountPercentage
+			}))
+		};
+		await Api.createEstimateTemplate(data);
+		notificationStore.addSuccess("Template saved successfully", "success");
+		showSaveTemplateModal.value = false;
+	} catch (error) {
+		console.error("Error saving template:", error);
+		notificationStore.addNotification("Failed to save template", "error");
+	}
+};
+
 const searchAddresses = async () => {
 	const searchTerm = formData.address.trim();
 	if (!searchTerm) return;
@@ -1092,5 +1135,9 @@ onMounted(async () => {
 	font-size: 0.85rem;
 	color: #666;
 }
+
+.field-group {
+	margin-bottom: 1rem;
+}
 </style>
 <parameter name="filePath"></parameter>