diff --git a/crm/locale/main.pot b/crm/locale/main.pot
index 51e85391..05cdc8a6 100644
--- a/crm/locale/main.pot
+++ b/crm/locale/main.pot
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Frappe CRM VERSION\n"
 "Report-Msgid-Bugs-To: shariq@frappe.io\n"
-"POT-Creation-Date: 2025-05-04 09:35+0000\n"
-"PO-Revision-Date: 2025-05-04 09:35+0000\n"
+"POT-Creation-Date: 2025-05-18 09:35+0000\n"
+"PO-Revision-Date: 2025-05-18 09:35+0000\n"
 "Last-Translator: shariq@frappe.io\n"
 "Language-Team: shariq@frappe.io\n"
 "MIME-Version: 1.0\n"
@@ -176,8 +176,8 @@ msgstr ""
 msgid "Actions"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:546 frontend/src/pages/Lead.vue:532
-#: frontend/src/pages/MobileDeal.vue:441 frontend/src/pages/MobileLead.vue:344
+#: frontend/src/pages/Deal.vue:545 frontend/src/pages/Lead.vue:531
+#: frontend/src/pages/MobileDeal.vue:440 frontend/src/pages/MobileLead.vue:343
 msgid "Activity"
 msgstr ""
 
@@ -201,7 +201,7 @@ msgstr ""
 msgid "Add Filter"
 msgstr ""
 
-#: frontend/src/components/Controls/Grid.vue:243
+#: frontend/src/components/Controls/Grid.vue:310
 msgid "Add Row"
 msgstr ""
 
@@ -282,12 +282,19 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: frontend/src/pages/Contact.vue:633 frontend/src/pages/MobileContact.vue:607
-#: frontend/src/pages/MobileOrganization.vue:493
-#: frontend/src/pages/Organization.vue:532
+#. Label of the amount (Currency) field in DocType 'CRM Products'
+#: crm/fcrm/doctype/crm_products/crm_products.json
+#: frontend/src/pages/Contact.vue:632 frontend/src/pages/MobileContact.vue:606
+#: frontend/src/pages/MobileOrganization.vue:492
+#: frontend/src/pages/Organization.vue:531
 msgid "Amount"
 msgstr ""
 
+#. Description of the 'Net Amount' (Currency) field in DocType 'CRM Products'
+#: crm/fcrm/doctype/crm_products/crm_products.json
+msgid "Amount after discount"
+msgstr ""
+
 #. Description of the 'Favicon' (Attach) field in DocType 'FCRM Settings'
 #: crm/fcrm/doctype/fcrm_settings/fcrm_settings.json
 msgid "An icon file with .ico extension. Should be 16 x 16 px. Generated using a favicon generator. [favicon-generator.org]"
@@ -347,12 +354,12 @@ msgstr ""
 msgid "Are you sure you want to delete this attachment?"
 msgstr ""
 
-#: frontend/src/pages/Contact.vue:321 frontend/src/pages/MobileContact.vue:292
+#: frontend/src/pages/Contact.vue:320 frontend/src/pages/MobileContact.vue:291
 msgid "Are you sure you want to delete this contact?"
 msgstr ""
 
-#: frontend/src/pages/MobileOrganization.vue:286
-#: frontend/src/pages/Organization.vue:328
+#: frontend/src/pages/MobileOrganization.vue:285
+#: frontend/src/pages/Organization.vue:327
 msgid "Are you sure you want to delete this organization?"
 msgstr ""
 
@@ -400,7 +407,7 @@ msgstr ""
 msgid "Assignment rule"
 msgstr ""
 
-#: frontend/src/components/Controls/GridFieldsEditorModal.vue:171
+#: frontend/src/components/Controls/GridFieldsEditorModal.vue:176
 msgid "At least one field is required"
 msgstr ""
 
@@ -413,8 +420,8 @@ msgstr ""
 msgid "Attach a file"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:581 frontend/src/pages/Lead.vue:567
-#: frontend/src/pages/MobileDeal.vue:477 frontend/src/pages/MobileLead.vue:380
+#: frontend/src/pages/Deal.vue:580 frontend/src/pages/Lead.vue:566
+#: frontend/src/pages/MobileDeal.vue:476 frontend/src/pages/MobileLead.vue:379
 msgid "Attachments"
 msgstr ""
 
@@ -572,6 +579,16 @@ msgstr ""
 msgid "CRM Portal Page"
 msgstr ""
 
+#. Name of a DocType
+#: crm/fcrm/doctype/crm_product/crm_product.json
+msgid "CRM Product"
+msgstr ""
+
+#. Name of a DocType
+#: crm/fcrm/doctype/crm_products/crm_products.json
+msgid "CRM Products"
+msgstr ""
+
 #. Name of a DocType
 #: crm/fcrm/doctype/crm_service_day/crm_service_day.json
 msgid "CRM Service Day"
@@ -667,8 +684,8 @@ msgstr ""
 msgid "Calling..."
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:566 frontend/src/pages/Lead.vue:552
-#: frontend/src/pages/MobileDeal.vue:461 frontend/src/pages/MobileLead.vue:364
+#: frontend/src/pages/Deal.vue:565 frontend/src/pages/Lead.vue:551
+#: frontend/src/pages/MobileDeal.vue:460 frontend/src/pages/MobileLead.vue:363
 msgid "Calls"
 msgstr ""
 
@@ -723,8 +740,8 @@ msgstr ""
 msgid "Change image"
 msgstr ""
 
-#: frontend/src/pages/Lead.vue:245 frontend/src/pages/Lead.vue:271
-#: frontend/src/pages/MobileLead.vue:110 frontend/src/pages/MobileLead.vue:137
+#: frontend/src/pages/Lead.vue:244 frontend/src/pages/Lead.vue:270
+#: frontend/src/pages/MobileLead.vue:109 frontend/src/pages/MobileLead.vue:136
 msgid "Choose Existing"
 msgstr ""
 
@@ -811,8 +828,8 @@ msgstr ""
 msgid "Comment"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:556 frontend/src/pages/Lead.vue:542
-#: frontend/src/pages/MobileDeal.vue:451 frontend/src/pages/MobileLead.vue:354
+#: frontend/src/pages/Deal.vue:555 frontend/src/pages/Lead.vue:541
+#: frontend/src/pages/MobileDeal.vue:450 frontend/src/pages/MobileLead.vue:353
 msgid "Comments"
 msgstr ""
 
@@ -861,7 +878,7 @@ msgstr ""
 #: crm/fcrm/doctype/crm_contacts/crm_contacts.json
 #: crm/fcrm/doctype/crm_deal/crm_deal.json
 #: frontend/src/components/Layouts/AppSidebar.vue:509
-#: frontend/src/pages/Lead.vue:267 frontend/src/pages/MobileLead.vue:133
+#: frontend/src/pages/Lead.vue:266 frontend/src/pages/MobileLead.vue:132
 msgid "Contact"
 msgstr ""
 
@@ -873,11 +890,11 @@ msgstr ""
 msgid "Contact Us"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:665 frontend/src/pages/MobileDeal.vue:560
+#: frontend/src/pages/Deal.vue:664 frontend/src/pages/MobileDeal.vue:559
 msgid "Contact added"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:651 frontend/src/pages/MobileDeal.vue:546
+#: frontend/src/pages/Deal.vue:650 frontend/src/pages/MobileDeal.vue:545
 msgid "Contact already added"
 msgstr ""
 
@@ -889,7 +906,7 @@ msgstr ""
 msgid "Contact not found"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:680 frontend/src/pages/MobileDeal.vue:575
+#: frontend/src/pages/Deal.vue:679 frontend/src/pages/MobileDeal.vue:574
 msgid "Contact removed"
 msgstr ""
 
@@ -898,8 +915,8 @@ msgstr ""
 #. Label of a shortcut in the Frappe CRM Workspace
 #: crm/fcrm/doctype/crm_deal/crm_deal.json
 #: crm/fcrm/workspace/frappe_crm/frappe_crm.json
-#: frontend/src/pages/Contact.vue:265 frontend/src/pages/MobileContact.vue:236
-#: frontend/src/pages/MobileOrganization.vue:373
+#: frontend/src/pages/Contact.vue:264 frontend/src/pages/MobileContact.vue:235
+#: frontend/src/pages/MobileOrganization.vue:372
 msgid "Contacts"
 msgstr ""
 
@@ -917,8 +934,8 @@ msgstr ""
 
 #: frontend/src/components/Layouts/AppSidebar.vue:351
 #: frontend/src/components/ListBulkActions.vue:70
-#: frontend/src/pages/Lead.vue:205 frontend/src/pages/MobileLead.vue:49
-#: frontend/src/pages/MobileLead.vue:96
+#: frontend/src/pages/Lead.vue:204 frontend/src/pages/MobileLead.vue:49
+#: frontend/src/pages/MobileLead.vue:95
 msgid "Convert"
 msgstr ""
 
@@ -929,8 +946,8 @@ msgstr ""
 
 #: frontend/src/components/ListBulkActions.vue:62
 #: frontend/src/components/ListBulkActions.vue:204
-#: frontend/src/pages/Lead.vue:38 frontend/src/pages/Lead.vue:216
-#: frontend/src/pages/MobileLead.vue:92
+#: frontend/src/pages/Lead.vue:38 frontend/src/pages/Lead.vue:215
+#: frontend/src/pages/MobileLead.vue:91
 msgid "Convert to Deal"
 msgstr ""
 
@@ -946,6 +963,7 @@ msgstr ""
 #: frontend/src/components/Modals/AddressModal.vue:100
 #: frontend/src/components/Modals/CallLogModal.vue:85
 #: frontend/src/components/Modals/ContactModal.vue:37
+#: frontend/src/components/Modals/CreateDocumentModal.vue:87
 #: frontend/src/components/Modals/DealModal.vue:63
 #: frontend/src/components/Modals/EmailTemplateModal.vue:9
 #: frontend/src/components/Modals/LeadModal.vue:34
@@ -985,7 +1003,7 @@ msgstr ""
 #: frontend/src/components/Controls/Link.vue:48
 #: frontend/src/components/Modals/EmailTemplateSelectorModal.vue:55
 #: frontend/src/components/Modals/WhatsappTemplateSelectorModal.vue:45
-#: frontend/src/components/SidePanelLayout.vue:125
+#: frontend/src/components/SidePanelLayout.vue:135
 msgid "Create New"
 msgstr ""
 
@@ -1053,7 +1071,7 @@ msgstr ""
 msgid "Custom statuses"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:434
+#: frontend/src/pages/Deal.vue:433
 msgid "Customer created successfully"
 msgstr ""
 
@@ -1067,8 +1085,8 @@ msgstr ""
 
 #: frontend/src/components/Activities/DataFields.vue:6
 #: frontend/src/components/Layouts/AppSidebar.vue:539
-#: frontend/src/pages/Deal.vue:561 frontend/src/pages/Lead.vue:547
-#: frontend/src/pages/MobileDeal.vue:456 frontend/src/pages/MobileLead.vue:359
+#: frontend/src/pages/Deal.vue:560 frontend/src/pages/Lead.vue:546
+#: frontend/src/pages/MobileDeal.vue:455 frontend/src/pages/MobileLead.vue:358
 msgid "Data"
 msgstr ""
 
@@ -1103,21 +1121,21 @@ msgstr ""
 msgid "Deal Statuses"
 msgstr ""
 
-#: frontend/src/pages/Contact.vue:654 frontend/src/pages/MobileContact.vue:628
-#: frontend/src/pages/MobileOrganization.vue:514
-#: frontend/src/pages/Organization.vue:553
+#: frontend/src/pages/Contact.vue:653 frontend/src/pages/MobileContact.vue:627
+#: frontend/src/pages/MobileOrganization.vue:513
+#: frontend/src/pages/Organization.vue:552
 msgid "Deal owner"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:474 frontend/src/pages/MobileDeal.vue:363
+#: frontend/src/pages/Deal.vue:473 frontend/src/pages/MobileDeal.vue:362
 msgid "Deal updated"
 msgstr ""
 
 #. Label of a shortcut in the Frappe CRM Workspace
 #: crm/fcrm/workspace/frappe_crm/frappe_crm.json
-#: frontend/src/pages/Deal.vue:506 frontend/src/pages/MobileContact.vue:320
-#: frontend/src/pages/MobileDeal.vue:395
-#: frontend/src/pages/MobileOrganization.vue:367
+#: frontend/src/pages/Deal.vue:505 frontend/src/pages/MobileContact.vue:319
+#: frontend/src/pages/MobileDeal.vue:394
+#: frontend/src/pages/MobileOrganization.vue:366
 msgid "Deals"
 msgstr ""
 
@@ -1191,21 +1209,21 @@ msgstr ""
 #: frontend/src/components/Activities/NoteArea.vue:12
 #: frontend/src/components/Activities/TaskArea.vue:55
 #: frontend/src/components/Activities/TaskArea.vue:63
-#: frontend/src/components/Controls/Grid.vue:238
+#: frontend/src/components/Controls/Grid.vue:305
 #: frontend/src/components/Kanban/KanbanView.vue:225
 #: frontend/src/components/ListBulkActions.vue:96
 #: frontend/src/components/ListBulkActions.vue:104
 #: frontend/src/components/ListBulkActions.vue:186
 #: frontend/src/components/ViewControls.vue:1163
 #: frontend/src/components/ViewControls.vue:1174
-#: frontend/src/pages/Contact.vue:105 frontend/src/pages/Contact.vue:324
+#: frontend/src/pages/Contact.vue:105 frontend/src/pages/Contact.vue:323
 #: frontend/src/pages/MobileContact.vue:81
-#: frontend/src/pages/MobileContact.vue:295
-#: frontend/src/pages/MobileDeal.vue:526
+#: frontend/src/pages/MobileContact.vue:294
+#: frontend/src/pages/MobileDeal.vue:525
 #: frontend/src/pages/MobileOrganization.vue:72
-#: frontend/src/pages/MobileOrganization.vue:289
+#: frontend/src/pages/MobileOrganization.vue:288
 #: frontend/src/pages/Notes.vue:40 frontend/src/pages/Organization.vue:83
-#: frontend/src/pages/Organization.vue:331 frontend/src/pages/Tasks.vue:368
+#: frontend/src/pages/Organization.vue:330 frontend/src/pages/Tasks.vue:368
 msgid "Delete"
 msgstr ""
 
@@ -1227,12 +1245,12 @@ msgstr ""
 msgid "Delete attachment"
 msgstr ""
 
-#: frontend/src/pages/Contact.vue:320 frontend/src/pages/MobileContact.vue:291
+#: frontend/src/pages/Contact.vue:319 frontend/src/pages/MobileContact.vue:290
 msgid "Delete contact"
 msgstr ""
 
-#: frontend/src/pages/MobileOrganization.vue:285
-#: frontend/src/pages/Organization.vue:327
+#: frontend/src/pages/MobileOrganization.vue:284
+#: frontend/src/pages/Organization.vue:326
 msgid "Delete organization"
 msgstr ""
 
@@ -1241,8 +1259,10 @@ msgid "Deleted successfully"
 msgstr ""
 
 #. Label of the description (Text Editor) field in DocType 'CRM Holiday'
+#. Label of the description (Text Editor) field in DocType 'CRM Product'
 #. Label of the description (Text Editor) field in DocType 'CRM Task'
 #: crm/fcrm/doctype/crm_holiday/crm_holiday.json
+#: crm/fcrm/doctype/crm_product/crm_product.json
 #: crm/fcrm/doctype/crm_task/crm_task.json
 #: frontend/src/components/Modals/TaskModal.vue:35
 msgid "Description"
@@ -1256,9 +1276,9 @@ msgstr ""
 #. Label of the details (Text Editor) field in DocType 'CRM Lead Source'
 #: crm/fcrm/doctype/crm_lead/crm_lead.json
 #: crm/fcrm/doctype/crm_lead_source/crm_lead_source.json
-#: frontend/src/pages/MobileContact.vue:315
-#: frontend/src/pages/MobileDeal.vue:435 frontend/src/pages/MobileLead.vue:338
-#: frontend/src/pages/MobileOrganization.vue:362
+#: frontend/src/pages/MobileContact.vue:314
+#: frontend/src/pages/MobileDeal.vue:434 frontend/src/pages/MobileLead.vue:337
+#: frontend/src/pages/MobileOrganization.vue:361
 msgid "Details"
 msgstr ""
 
@@ -1273,11 +1293,26 @@ msgstr ""
 msgid "Disable"
 msgstr ""
 
+#. Label of the disabled (Check) field in DocType 'CRM Product'
+#: crm/fcrm/doctype/crm_product/crm_product.json
+msgid "Disabled"
+msgstr ""
+
 #: frontend/src/components/CommentBox.vue:76
 #: frontend/src/components/EmailEditor.vue:158
 msgid "Discard"
 msgstr ""
 
+#. Label of the discount_percentage (Percent) field in DocType 'CRM Products'
+#: crm/fcrm/doctype/crm_products/crm_products.json
+msgid "Discount %"
+msgstr ""
+
+#. Label of the discount_amount (Currency) field in DocType 'CRM Products'
+#: crm/fcrm/doctype/crm_products/crm_products.json
+msgid "Discount Amount"
+msgstr ""
+
 #. Label of the dt (Link) field in DocType 'CRM Form Script'
 #. Label of the dt (Link) field in DocType 'CRM Global Settings'
 #. Label of the dt (Link) field in DocType 'CRM View Settings'
@@ -1300,6 +1335,10 @@ msgstr ""
 msgid "Document not found"
 msgstr ""
 
+#: frontend/src/data/document.js:21
+msgid "Document updated successfully"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'CRM Task'
 #: crm/fcrm/doctype/crm_task/crm_task.json
 msgid "Done"
@@ -1382,7 +1421,7 @@ msgstr ""
 msgid "ERPNext is not integrated with the CRM"
 msgstr ""
 
-#: frontend/src/components/FieldLayout/Field.vue:80
+#: frontend/src/components/FieldLayout/Field.vue:91
 #: frontend/src/components/FieldLayoutEditor.vue:319
 #: frontend/src/components/FieldLayoutEditor.vue:345
 #: frontend/src/components/ListBulkActions.vue:179
@@ -1454,12 +1493,12 @@ msgstr ""
 #: crm/fcrm/doctype/crm_contacts/crm_contacts.json
 #: crm/fcrm/doctype/crm_deal/crm_deal.json
 #: crm/fcrm/doctype/crm_invitation/crm_invitation.json
-#: crm/fcrm/doctype/crm_lead/crm_lead.json frontend/src/pages/Contact.vue:644
-#: frontend/src/pages/MobileContact.vue:618
-#: frontend/src/pages/MobileOrganization.vue:504
-#: frontend/src/pages/MobileOrganization.vue:532
-#: frontend/src/pages/Organization.vue:543
-#: frontend/src/pages/Organization.vue:571
+#: crm/fcrm/doctype/crm_lead/crm_lead.json frontend/src/pages/Contact.vue:643
+#: frontend/src/pages/MobileContact.vue:617
+#: frontend/src/pages/MobileOrganization.vue:503
+#: frontend/src/pages/MobileOrganization.vue:531
+#: frontend/src/pages/Organization.vue:542
+#: frontend/src/pages/Organization.vue:570
 msgid "Email"
 msgstr ""
 
@@ -1501,8 +1540,8 @@ msgstr ""
 msgid "Email template"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:551 frontend/src/pages/Lead.vue:537
-#: frontend/src/pages/MobileDeal.vue:446 frontend/src/pages/MobileLead.vue:349
+#: frontend/src/pages/Deal.vue:550 frontend/src/pages/Lead.vue:536
+#: frontend/src/pages/MobileDeal.vue:445 frontend/src/pages/MobileLead.vue:348
 msgid "Emails"
 msgstr ""
 
@@ -1556,7 +1595,7 @@ msgstr ""
 msgid "End Time"
 msgstr ""
 
-#: frontend/src/components/FieldLayout/Field.vue:265
+#: frontend/src/components/FieldLayout/Field.vue:324
 msgid "Enter {0}"
 msgstr ""
 
@@ -1574,28 +1613,32 @@ msgstr ""
 #: frontend/src/components/Settings/SettingsPage.vue:91
 #: frontend/src/components/Settings/TelephonySettings.vue:131
 #: frontend/src/components/Settings/TelephonySettings.vue:156
-#: frontend/src/pages/Lead.vue:633 frontend/src/pages/Lead.vue:643
-#: frontend/src/pages/MobileLead.vue:438 frontend/src/pages/MobileLead.vue:448
+#: frontend/src/pages/Lead.vue:632 frontend/src/pages/Lead.vue:642
+#: frontend/src/pages/MobileLead.vue:437 frontend/src/pages/MobileLead.vue:447
 msgid "Error"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:495 frontend/src/pages/MobileDeal.vue:384
+#: frontend/src/pages/Deal.vue:494 frontend/src/pages/MobileDeal.vue:383
 msgid "Error Updating Deal"
 msgstr ""
 
-#: frontend/src/pages/Lead.vue:481 frontend/src/pages/MobileLead.vue:287
+#: frontend/src/pages/Lead.vue:480 frontend/src/pages/MobileLead.vue:286
 msgid "Error Updating Lead"
 msgstr ""
 
-#: frontend/src/pages/Lead.vue:666
+#: frontend/src/pages/Lead.vue:665
 msgid "Error converting to deal"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:482 frontend/src/pages/MobileDeal.vue:371
+#: frontend/src/pages/Deal.vue:481 frontend/src/pages/MobileDeal.vue:370
 msgid "Error updating deal"
 msgstr ""
 
-#: frontend/src/pages/Lead.vue:468 frontend/src/pages/MobileLead.vue:274
+#: frontend/src/data/document.js:28
+msgid "Error updating document"
+msgstr ""
+
+#: frontend/src/pages/Lead.vue:467 frontend/src/pages/MobileLead.vue:273
 msgid "Error updating lead"
 msgstr ""
 
@@ -1702,6 +1745,10 @@ msgstr ""
 msgid "Failed to create email account, Invalid credentials"
 msgstr ""
 
+#: frontend/src/data/script.js:98
+msgid "Failed to load form controller: {0}"
+msgstr ""
+
 #: crm/integrations/twilio/api.py:152
 msgid "Failed to update Twilio call status"
 msgstr ""
@@ -1979,7 +2026,9 @@ msgid "If enabled, records can be created from the incoming emails on this accou
 msgstr ""
 
 #. Label of the image (Attach Image) field in DocType 'CRM Lead'
+#. Label of the image (Attach Image) field in DocType 'CRM Product'
 #: crm/fcrm/doctype/crm_lead/crm_lead.json
+#: crm/fcrm/doctype/crm_product/crm_product.json
 msgid "Image"
 msgstr ""
 
@@ -2236,11 +2285,11 @@ msgstr ""
 msgid "Last Year"
 msgstr ""
 
-#: frontend/src/pages/Contact.vue:659 frontend/src/pages/MobileContact.vue:633
-#: frontend/src/pages/MobileOrganization.vue:519
-#: frontend/src/pages/MobileOrganization.vue:547
-#: frontend/src/pages/Organization.vue:558
-#: frontend/src/pages/Organization.vue:586
+#: frontend/src/pages/Contact.vue:658 frontend/src/pages/MobileContact.vue:632
+#: frontend/src/pages/MobileOrganization.vue:518
+#: frontend/src/pages/MobileOrganization.vue:546
+#: frontend/src/pages/Organization.vue:557
+#: frontend/src/pages/Organization.vue:585
 msgid "Last modified"
 msgstr ""
 
@@ -2286,13 +2335,13 @@ msgstr ""
 msgid "Lead Statuses"
 msgstr ""
 
-#: frontend/src/pages/Lead.vue:460 frontend/src/pages/MobileLead.vue:266
+#: frontend/src/pages/Lead.vue:459 frontend/src/pages/MobileLead.vue:265
 msgid "Lead updated"
 msgstr ""
 
 #. Label of a shortcut in the Frappe CRM Workspace
 #: crm/fcrm/workspace/frappe_crm/frappe_crm.json
-#: frontend/src/pages/Lead.vue:492 frontend/src/pages/MobileLead.vue:298
+#: frontend/src/pages/Lead.vue:491 frontend/src/pages/MobileLead.vue:297
 msgid "Leads"
 msgstr ""
 
@@ -2347,7 +2396,7 @@ msgstr ""
 
 #: frontend/src/components/Activities/Activities.vue:22
 #: frontend/src/components/Activities/DataFields.vue:35
-#: frontend/src/pages/Deal.vue:177 frontend/src/pages/MobileDeal.vue:111
+#: frontend/src/pages/Deal.vue:176 frontend/src/pages/MobileDeal.vue:110
 msgid "Loading..."
 msgstr ""
 
@@ -2493,9 +2542,9 @@ msgstr ""
 msgid "Mobile app installation"
 msgstr ""
 
-#: frontend/src/pages/Contact.vue:649 frontend/src/pages/MobileContact.vue:623
-#: frontend/src/pages/MobileOrganization.vue:509
-#: frontend/src/pages/Organization.vue:548
+#: frontend/src/pages/Contact.vue:648 frontend/src/pages/MobileContact.vue:622
+#: frontend/src/pages/MobileOrganization.vue:508
+#: frontend/src/pages/Organization.vue:547
 msgid "Mobile no"
 msgstr ""
 
@@ -2532,16 +2581,30 @@ msgstr ""
 #: crm/fcrm/doctype/fcrm_settings/fcrm_settings.json
 #: frontend/src/components/Modals/EmailTemplateModal.vue:24
 #: frontend/src/components/ViewControls.vue:781
-#: frontend/src/pages/MobileOrganization.vue:527
-#: frontend/src/pages/Organization.vue:566
+#: frontend/src/pages/MobileOrganization.vue:526
+#: frontend/src/pages/Organization.vue:565
 msgid "Name"
 msgstr ""
 
 #. Label of the naming_series (Select) field in DocType 'CRM Deal'
+#. Label of the naming_series (Select) field in DocType 'CRM Product'
 #: crm/fcrm/doctype/crm_deal/crm_deal.json
+#: crm/fcrm/doctype/crm_product/crm_product.json
 msgid "Naming Series"
 msgstr ""
 
+#. Label of the net_amount (Currency) field in DocType 'CRM Products'
+#: crm/fcrm/doctype/crm_products/crm_products.json
+msgid "Net Amount"
+msgstr ""
+
+#. Label of the net_total (Currency) field in DocType 'CRM Deal'
+#. Label of the net_total (Currency) field in DocType 'CRM Lead'
+#: crm/fcrm/doctype/crm_deal/crm_deal.json
+#: crm/fcrm/doctype/crm_lead/crm_lead.json
+msgid "Net Total"
+msgstr ""
+
 #: frontend/src/components/Activities/ActivityHeader.vue:82
 msgid "New"
 msgstr ""
@@ -2604,14 +2667,18 @@ msgstr ""
 msgid "New WhatsApp Message"
 msgstr ""
 
-#: frontend/src/pages/Lead.vue:283 frontend/src/pages/MobileLead.vue:150
+#: frontend/src/pages/Lead.vue:282 frontend/src/pages/MobileLead.vue:149
 msgid "New contact will be created based on the person's details"
 msgstr ""
 
-#: frontend/src/pages/Lead.vue:258 frontend/src/pages/MobileLead.vue:124
+#: frontend/src/pages/Lead.vue:257 frontend/src/pages/MobileLead.vue:123
 msgid "New organization will be created based on the data in details section"
 msgstr ""
 
+#: frontend/src/components/Modals/CreateDocumentModal.vue:83
+msgid "New {0}"
+msgstr ""
+
 #: frontend/src/components/Filter.vue:655
 msgid "Next 6 Months"
 msgstr ""
@@ -2646,7 +2713,7 @@ msgstr ""
 msgid "No Answer"
 msgstr ""
 
-#: frontend/src/components/Controls/Grid.vue:231
+#: frontend/src/components/Controls/Grid.vue:298
 msgid "No Data"
 msgstr ""
 
@@ -2661,7 +2728,7 @@ msgid "No changes made"
 msgstr ""
 
 #: frontend/src/components/Modals/SidePanelModal.vue:51
-#: frontend/src/pages/Deal.vue:262 frontend/src/pages/MobileDeal.vue:199
+#: frontend/src/pages/Deal.vue:261 frontend/src/pages/MobileDeal.vue:198
 msgid "No contacts added"
 msgstr ""
 
@@ -2673,7 +2740,7 @@ msgstr ""
 msgid "No label"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:726
+#: frontend/src/pages/Deal.vue:725
 msgid "No mobile number set"
 msgstr ""
 
@@ -2686,7 +2753,7 @@ msgstr ""
 msgid "No phone number set"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:721
+#: frontend/src/pages/Deal.vue:720
 msgid "No primary contact set"
 msgstr ""
 
@@ -2699,16 +2766,16 @@ msgstr ""
 msgid "No website set"
 msgstr ""
 
-#: frontend/src/components/SidePanelLayout.vue:116
+#: frontend/src/components/SidePanelLayout.vue:126
 msgid "No {0} Available"
 msgstr ""
 
-#: frontend/src/pages/CallLogs.vue:56 frontend/src/pages/Contact.vue:165
+#: frontend/src/pages/CallLogs.vue:56 frontend/src/pages/Contact.vue:164
 #: frontend/src/pages/Contacts.vue:59 frontend/src/pages/Deals.vue:235
 #: frontend/src/pages/EmailTemplates.vue:60 frontend/src/pages/Leads.vue:261
-#: frontend/src/pages/MobileContact.vue:154
-#: frontend/src/pages/MobileOrganization.vue:143
-#: frontend/src/pages/Notes.vue:92 frontend/src/pages/Organization.vue:157
+#: frontend/src/pages/MobileContact.vue:153
+#: frontend/src/pages/MobileOrganization.vue:142
+#: frontend/src/pages/Notes.vue:92 frontend/src/pages/Organization.vue:156
 #: frontend/src/pages/Organizations.vue:59 frontend/src/pages/Tasks.vue:184
 msgid "No {0} Found"
 msgstr ""
@@ -2777,8 +2844,8 @@ msgstr ""
 msgid "Not allowed to set primary contact for Deal"
 msgstr ""
 
-#: frontend/src/pages/Contact.vue:256 frontend/src/pages/Deal.vue:418
-#: frontend/src/pages/Lead.vue:426 frontend/src/pages/Organization.vue:245
+#: frontend/src/pages/Contact.vue:255 frontend/src/pages/Deal.vue:417
+#: frontend/src/pages/Lead.vue:425 frontend/src/pages/Organization.vue:244
 msgid "Not permitted"
 msgstr ""
 
@@ -2788,8 +2855,8 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:576 frontend/src/pages/Lead.vue:562
-#: frontend/src/pages/MobileDeal.vue:472 frontend/src/pages/MobileLead.vue:375
+#: frontend/src/pages/Deal.vue:575 frontend/src/pages/Lead.vue:561
+#: frontend/src/pages/MobileDeal.vue:471 frontend/src/pages/MobileLead.vue:374
 msgid "Notes"
 msgstr ""
 
@@ -2836,10 +2903,10 @@ msgstr ""
 msgid "Old Parent"
 msgstr ""
 
-#: frontend/src/pages/Contact.vue:304 frontend/src/pages/Lead.vue:596
-#: frontend/src/pages/MobileContact.vue:275
-#: frontend/src/pages/MobileOrganization.vue:269
-#: frontend/src/pages/Organization.vue:311
+#: frontend/src/pages/Contact.vue:303 frontend/src/pages/Lead.vue:595
+#: frontend/src/pages/MobileContact.vue:274
+#: frontend/src/pages/MobileOrganization.vue:268
+#: frontend/src/pages/Organization.vue:310
 msgid "Only PNG and JPG images are allowed"
 msgstr ""
 
@@ -2894,13 +2961,13 @@ msgstr ""
 #: crm/fcrm/doctype/crm_deal/crm_deal.json
 #: crm/fcrm/doctype/crm_lead/crm_lead.json
 #: frontend/src/components/Layouts/AppSidebar.vue:510
-#: frontend/src/pages/Contact.vue:628 frontend/src/pages/Lead.vue:241
-#: frontend/src/pages/MobileContact.vue:602
-#: frontend/src/pages/MobileLead.vue:106
-#: frontend/src/pages/MobileOrganization.vue:488
-#: frontend/src/pages/MobileOrganization.vue:542
-#: frontend/src/pages/Organization.vue:527
-#: frontend/src/pages/Organization.vue:581
+#: frontend/src/pages/Contact.vue:627 frontend/src/pages/Lead.vue:240
+#: frontend/src/pages/MobileContact.vue:601
+#: frontend/src/pages/MobileLead.vue:105
+#: frontend/src/pages/MobileOrganization.vue:487
+#: frontend/src/pages/MobileOrganization.vue:541
+#: frontend/src/pages/Organization.vue:526
+#: frontend/src/pages/Organization.vue:580
 msgid "Organization"
 msgstr ""
 
@@ -2927,15 +2994,15 @@ msgstr ""
 msgid "Organization logo"
 msgstr ""
 
-#: frontend/src/pages/MobileOrganization.vue:216
-#: frontend/src/pages/Organization.vue:258
+#: frontend/src/pages/MobileOrganization.vue:215
+#: frontend/src/pages/Organization.vue:257
 msgid "Organization updated"
 msgstr ""
 
 #. Label of a shortcut in the Frappe CRM Workspace
 #: crm/fcrm/workspace/frappe_crm/frappe_crm.json
-#: frontend/src/pages/MobileOrganization.vue:223
-#: frontend/src/pages/Organization.vue:265
+#: frontend/src/pages/MobileOrganization.vue:222
+#: frontend/src/pages/Organization.vue:264
 msgid "Organizations"
 msgstr ""
 
@@ -3012,8 +3079,8 @@ msgstr ""
 #: crm/fcrm/doctype/crm_deal/crm_deal.json
 #: crm/fcrm/doctype/crm_lead/crm_lead.json
 #: crm/fcrm/doctype/crm_telephony_agent/crm_telephony_agent.json
-#: frontend/src/pages/MobileOrganization.vue:537
-#: frontend/src/pages/Organization.vue:576
+#: frontend/src/pages/MobileOrganization.vue:536
+#: frontend/src/pages/Organization.vue:575
 msgid "Phone"
 msgstr ""
 
@@ -3055,11 +3122,11 @@ msgstr ""
 msgid "Please enter a valid URL"
 msgstr ""
 
-#: frontend/src/pages/Lead.vue:634 frontend/src/pages/MobileLead.vue:439
+#: frontend/src/pages/Lead.vue:633 frontend/src/pages/MobileLead.vue:438
 msgid "Please select an existing contact"
 msgstr ""
 
-#: frontend/src/pages/Lead.vue:644 frontend/src/pages/MobileLead.vue:449
+#: frontend/src/pages/Lead.vue:643 frontend/src/pages/MobileLead.vue:448
 msgid "Please select an existing organization"
 msgstr ""
 
@@ -3074,11 +3141,11 @@ msgstr ""
 msgid "Position"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:206 frontend/src/pages/MobileDeal.vue:143
+#: frontend/src/pages/Deal.vue:205 frontend/src/pages/MobileDeal.vue:142
 msgid "Primary"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:695 frontend/src/pages/MobileDeal.vue:590
+#: frontend/src/pages/Deal.vue:694 frontend/src/pages/MobileDeal.vue:589
 msgid "Primary contact set"
 msgstr ""
 
@@ -3104,6 +3171,32 @@ msgstr ""
 msgid "Probability"
 msgstr ""
 
+#. Label of the product_code (Link) field in DocType 'CRM Products'
+#: crm/fcrm/doctype/crm_products/crm_products.json
+msgid "Product"
+msgstr ""
+
+#. Label of the product_code (Data) field in DocType 'CRM Product'
+#: crm/fcrm/doctype/crm_product/crm_product.json
+msgid "Product Code"
+msgstr ""
+
+#. Label of the product_name (Data) field in DocType 'CRM Product'
+#. Label of the product_name (Data) field in DocType 'CRM Products'
+#: crm/fcrm/doctype/crm_product/crm_product.json
+#: crm/fcrm/doctype/crm_products/crm_products.json
+msgid "Product Name"
+msgstr ""
+
+#. Label of the products_tab (Tab Break) field in DocType 'CRM Deal'
+#. Label of the products (Table) field in DocType 'CRM Deal'
+#. Label of the products_tab (Tab Break) field in DocType 'CRM Lead'
+#. Label of the products (Table) field in DocType 'CRM Lead'
+#: crm/fcrm/doctype/crm_deal/crm_deal.json
+#: crm/fcrm/doctype/crm_lead/crm_lead.json
+msgid "Products"
+msgstr ""
+
 #: frontend/src/components/Layouts/AppSidebar.vue:497
 #: frontend/src/components/Settings/Settings.vue:85
 msgid "Profile"
@@ -3126,6 +3219,11 @@ msgstr ""
 msgid "Public view"
 msgstr ""
 
+#. Label of the qty (Float) field in DocType 'CRM Products'
+#: crm/fcrm/doctype/crm_products/crm_products.json
+msgid "Quantity"
+msgstr ""
+
 #. Option for the 'Status' (Select) field in DocType 'CRM Call Log'
 #: crm/fcrm/doctype/crm_call_log/crm_call_log.json
 msgid "Queued"
@@ -3149,6 +3247,11 @@ msgstr ""
 msgid "Quick entry layout"
 msgstr ""
 
+#. Label of the rate (Currency) field in DocType 'CRM Products'
+#: crm/fcrm/doctype/crm_products/crm_products.json
+msgid "Rate"
+msgstr ""
+
 #. Label of the read (Check) field in DocType 'CRM Notification'
 #: crm/fcrm/doctype/crm_notification/crm_notification.json
 msgid "Read"
@@ -3213,7 +3316,7 @@ msgstr ""
 msgid "Reject"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:631
+#: frontend/src/pages/Deal.vue:630
 msgid "Remove"
 msgstr ""
 
@@ -3493,7 +3596,7 @@ msgstr ""
 msgid "Section"
 msgstr ""
 
-#: frontend/src/components/FieldLayout/Field.vue:263
+#: frontend/src/components/FieldLayout/Field.vue:322
 msgid "Select {0}"
 msgstr ""
 
@@ -3547,7 +3650,7 @@ msgstr ""
 msgid "Set an organization"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:639 frontend/src/pages/MobileDeal.vue:534
+#: frontend/src/pages/Deal.vue:638 frontend/src/pages/MobileDeal.vue:533
 msgid "Set as Primary Contact"
 msgstr ""
 
@@ -3670,6 +3773,11 @@ msgstr ""
 msgid "Standard Form Scripts can not be modified, duplicate the Form Script instead."
 msgstr ""
 
+#. Label of the standard_rate (Currency) field in DocType 'CRM Product'
+#: crm/fcrm/doctype/crm_product/crm_product.json
+msgid "Standard Selling Rate"
+msgstr ""
+
 #: frontend/src/components/ViewControls.vue:633
 msgid "Standard Views"
 msgstr ""
@@ -3708,10 +3816,10 @@ msgstr ""
 #: crm/fcrm/doctype/crm_invitation/crm_invitation.json
 #: crm/fcrm/doctype/crm_lead/crm_lead.json
 #: crm/fcrm/doctype/crm_lead_status/crm_lead_status.json
-#: crm/fcrm/doctype/crm_task/crm_task.json frontend/src/pages/Contact.vue:639
-#: frontend/src/pages/MobileContact.vue:613
-#: frontend/src/pages/MobileOrganization.vue:499
-#: frontend/src/pages/Organization.vue:538
+#: crm/fcrm/doctype/crm_task/crm_task.json frontend/src/pages/Contact.vue:638
+#: frontend/src/pages/MobileContact.vue:612
+#: frontend/src/pages/MobileOrganization.vue:498
+#: frontend/src/pages/Organization.vue:537
 msgid "Status"
 msgstr ""
 
@@ -3772,6 +3880,7 @@ msgstr ""
 #: crm/fcrm/doctype/crm_global_settings/crm_global_settings.json
 #: crm/fcrm/doctype/crm_invitation/crm_invitation.json
 #: crm/fcrm/doctype/crm_notification/crm_notification.json
+#: crm/fcrm/doctype/crm_product/crm_product.json
 #: crm/fcrm/doctype/crm_telephony_agent/crm_telephony_agent.json
 #: crm/fcrm/doctype/crm_twilio_settings/crm_twilio_settings.json
 #: crm/fcrm/doctype/erpnext_crm_settings/erpnext_crm_settings.json
@@ -3793,8 +3902,8 @@ msgstr ""
 msgid "Task"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:571 frontend/src/pages/Lead.vue:557
-#: frontend/src/pages/MobileDeal.vue:467 frontend/src/pages/MobileLead.vue:370
+#: frontend/src/pages/Deal.vue:570 frontend/src/pages/Lead.vue:556
+#: frontend/src/pages/MobileDeal.vue:466 frontend/src/pages/MobileLead.vue:369
 msgid "Tasks"
 msgstr ""
 
@@ -3939,11 +4048,25 @@ msgstr ""
 msgid "Took a call with John Doe and discussed the new project."
 msgstr ""
 
+#. Label of the total (Currency) field in DocType 'CRM Deal'
+#. Label of the total (Currency) field in DocType 'CRM Lead'
+#: crm/fcrm/doctype/crm_deal/crm_deal.json
+#: crm/fcrm/doctype/crm_lead/crm_lead.json
+msgid "Total"
+msgstr ""
+
 #. Label of the total_holidays (Int) field in DocType 'CRM Holiday List'
 #: crm/fcrm/doctype/crm_holiday_list/crm_holiday_list.json
 msgid "Total Holidays"
 msgstr ""
 
+#. Description of the 'Net Total' (Currency) field in DocType 'CRM Deal'
+#. Description of the 'Net Total' (Currency) field in DocType 'CRM Lead'
+#: crm/fcrm/doctype/crm_deal/crm_deal.json
+#: crm/fcrm/doctype/crm_lead/crm_lead.json
+msgid "Total after discount"
+msgstr ""
+
 #. Option for the 'Weekly Off' (Select) field in DocType 'CRM Holiday List'
 #. Option for the 'Workday' (Select) field in DocType 'CRM Service Day'
 #: crm/fcrm/doctype/crm_holiday_list/crm_holiday_list.json
@@ -4029,6 +4152,7 @@ msgstr ""
 #: frontend/src/components/FieldLayoutEditor.vue:26
 #: frontend/src/components/Modals/AddressModal.vue:8
 #: frontend/src/components/Modals/CallLogModal.vue:8
+#: frontend/src/components/Modals/CreateDocumentModal.vue:8
 #: frontend/src/components/Section.vue:21
 #: frontend/src/components/SidePanelLayoutEditor.vue:19
 msgid "Untitled"
@@ -4039,7 +4163,7 @@ msgstr ""
 #: frontend/src/components/Modals/EmailTemplateModal.vue:9
 #: frontend/src/components/Modals/NoteModal.vue:6
 #: frontend/src/components/Modals/TaskModal.vue:6
-#: frontend/src/components/Settings/GeneralSettings.vue:112
+#: frontend/src/components/Settings/GeneralSettings.vue:113
 #: frontend/src/components/Settings/ProfileSettings.vue:71
 #: frontend/src/components/Settings/SettingsPage.vue:31
 #: frontend/src/components/Settings/TelephonySettings.vue:70
@@ -4134,8 +4258,8 @@ msgstr ""
 msgid "Website"
 msgstr ""
 
-#: frontend/src/pages/MobileOrganization.vue:308
-#: frontend/src/pages/Organization.vue:354
+#: frontend/src/pages/MobileOrganization.vue:307
+#: frontend/src/pages/Organization.vue:353
 msgid "Website not found"
 msgstr ""
 
@@ -4165,8 +4289,8 @@ msgstr ""
 #: crm/fcrm/doctype/crm_notification/crm_notification.json
 #: frontend/src/components/Layouts/AppSidebar.vue:562
 #: frontend/src/components/Settings/Settings.vue:124
-#: frontend/src/pages/Deal.vue:586 frontend/src/pages/Lead.vue:572
-#: frontend/src/pages/MobileDeal.vue:482 frontend/src/pages/MobileLead.vue:385
+#: frontend/src/pages/Deal.vue:585 frontend/src/pages/Lead.vue:571
+#: frontend/src/pages/MobileDeal.vue:481 frontend/src/pages/MobileLead.vue:384
 msgid "WhatsApp"
 msgstr ""
 
@@ -4421,8 +4545,8 @@ msgstr ""
 msgid "{0} assigned a {1} {2} to you"
 msgstr ""
 
-#: frontend/src/pages/Deal.vue:496 frontend/src/pages/Lead.vue:482
-#: frontend/src/pages/MobileDeal.vue:385 frontend/src/pages/MobileLead.vue:288
+#: frontend/src/pages/Deal.vue:495 frontend/src/pages/Lead.vue:481
+#: frontend/src/pages/MobileDeal.vue:384 frontend/src/pages/MobileLead.vue:287
 msgid "{0} is a required field"
 msgstr ""
 
@@ -4433,3 +4557,23 @@ msgstr ""
 msgid "{0} is an invalid email address"
 msgstr ""
 
+#: frontend/src/data/script.js:233
+msgid "⚠️ Avoid using \"trigger\" as a field name — it conflicts with the built-in trigger() method."
+msgstr ""
+
+#: frontend/src/data/script.js:245
+msgid "⚠️ Method \"{0}\" not found in class."
+msgstr ""
+
+#: frontend/src/data/script.js:75
+msgid "⚠️ No class found for doctype: {0}, it is mandatory to have a class for the parent doctype. it can be empty, but it should be present."
+msgstr ""
+
+#: frontend/src/data/script.js:168
+msgid "⚠️ No data found for parent field: {0}"
+msgstr ""
+
+#: frontend/src/data/script.js:176
+msgid "⚠️ No row found for idx: {0} in parent field: {1}"
+msgstr ""
+
diff --git a/frontend/components.d.ts b/frontend/components.d.ts
index 99bd28e3..bfacdcf1 100644
--- a/frontend/components.d.ts
+++ b/frontend/components.d.ts
@@ -150,7 +150,6 @@ declare module 'vue' {
     ListIcon: typeof import('./src/components/Icons/ListIcon.vue')['default']
     ListRows: typeof import('./src/components/ListViews/ListRows.vue')['default']
     LoadingIndicator: typeof import('./src/components/Icons/LoadingIndicator.vue')['default']
-    LucidePlus: typeof import('~icons/lucide/plus')['default']
     MarkAsDoneIcon: typeof import('./src/components/Icons/MarkAsDoneIcon.vue')['default']
     MaximizeIcon: typeof import('./src/components/Icons/MaximizeIcon.vue')['default']
     MenuIcon: typeof import('./src/components/Icons/MenuIcon.vue')['default']
diff --git a/frontend/package.json b/frontend/package.json
index e4904246..40e1f47a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -2,6 +2,7 @@
   "name": "crm-ui",
   "private": true,
   "version": "0.0.0",
+  "type": "module",
   "scripts": {
     "dev": "vite",
     "build": "vite build --base=/assets/crm/frontend/ && yarn copy-html-entry",
@@ -9,9 +10,10 @@
     "serve": "vite preview"
   },
   "dependencies": {
+    "@tiptap/extension-paragraph": "^2.12.0",
     "@twilio/voice-sdk": "^2.10.2",
     "@vueuse/integrations": "^10.3.0",
-    "frappe-ui": "^0.1.123",
+    "frappe-ui": "^0.1.145",
     "gemoji": "^8.1.0",
     "lodash": "^4.17.21",
     "mime": "^4.0.1",
diff --git a/frontend/postcss.config.js b/frontend/postcss.config.js
index 33ad091d..2e7af2b7 100644
--- a/frontend/postcss.config.js
+++ b/frontend/postcss.config.js
@@ -1,4 +1,4 @@
-module.exports = {
+export default {
   plugins: {
     tailwindcss: {},
     autoprefixer: {},
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
index 210e93fa..f14de1bb 100644
--- a/frontend/src/App.vue
+++ b/frontend/src/App.vue
@@ -1,16 +1,17 @@
 <template>
-  <Layout v-if="session().isLoggedIn">
-    <router-view />
-  </Layout>
-  <Dialogs />
-  <Toasts />
+  <FrappeUIProvider>
+    <Layout v-if="session().isLoggedIn">
+      <router-view />
+    </Layout>
+    <Dialogs />
+  </FrappeUIProvider>
 </template>
 
 <script setup>
 import { Dialogs } from '@/utils/dialogs'
 import { sessionStore as session } from '@/stores/session'
 import { setTheme } from '@/stores/theme'
-import { Toasts, setConfig } from 'frappe-ui'
+import { FrappeUIProvider, setConfig } from 'frappe-ui'
 import { computed, defineAsyncComponent, onMounted } from 'vue'
 
 const MobileLayout = defineAsyncComponent(
diff --git a/frontend/tailwind.config.js b/frontend/tailwind.config.js
index cdd9cc9a..85306337 100644
--- a/frontend/tailwind.config.js
+++ b/frontend/tailwind.config.js
@@ -1,5 +1,7 @@
-module.exports = {
-  presets: [require('frappe-ui/src/tailwind/preset')],
+import frappeUIPreset from 'frappe-ui/src/tailwind/preset'
+
+export default {
+  presets: [frappeUIPreset],
   content: [
     './index.html',
     './src/**/*.{vue,js,ts,jsx,tsx}',
diff --git a/frontend/vite.config.js b/frontend/vite.config.js
index f4de2403..cb0bdda9 100644
--- a/frontend/vite.config.js
+++ b/frontend/vite.config.js
@@ -18,7 +18,13 @@ export default defineConfig({
         sourcemap: true,
       },
     }),
-    vue(),
+    vue({
+      template: {
+        compilerOptions: {
+          isCustomElement: (tag) => tag.startsWith('Lucide'),
+        },
+      },
+    }),
     vueJsx(),
     VitePWA({
       registerType: 'autoUpdate',
diff --git a/package.json b/package.json
index 70ac19de..423a4b8f 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
 	"private": true,
+	"type": "module",
 	"workspaces": ["frontend", "frappe-ui"],
 	"scripts": {
 		"postinstall": "cd frontend && yarn install",
diff --git a/yarn.lock b/yarn.lock
index a76abc61..8862db5d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1236,6 +1236,11 @@
   resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.10.3.tgz#7744abd4a954f35265af351f1be9b545e819c66d"
   integrity sha512-wAG/0/UsLeZLmshWb6rtWNXKJftcmnned91/HLccHVQAuQZ1UWH+wXeQKu/mtodxEO7JcU2mVPR9mLGQkK0McQ==
 
+"@tiptap/core@^2.11.7":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/core/-/core-2.12.0.tgz#e0bc9255865db53682e83d843c8fef19596a8899"
+  integrity sha512-3qX8oGVKFFZzQ0vit+ZolR6AJIATBzmEmjAA0llFhWk4vf3v64p1YcXcJsOBsr5scizJu5L6RYWEFatFwqckRg==
+
 "@tiptap/extension-blockquote@^2.10.3":
   version "2.10.3"
   resolved "https://registry.yarnpkg.com/@tiptap/extension-blockquote/-/extension-blockquote-2.10.3.tgz#ee29925930ac9a5b129d3ad262bb45afcc23b318"
@@ -1268,6 +1273,11 @@
   resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.10.3.tgz#5ff1b1e563c4eda44677df444c523de1e5258fa4"
   integrity sha512-yiDVNg22fYkzsFk5kBlDSHcjwVJgajvO/M5fDXA+Hfxwo2oNcG6aJyyHXFe+UaXTVjdkPej0J6kcMKrTMCiFug==
 
+"@tiptap/extension-code-block@^2.11.9":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-code-block/-/extension-code-block-2.12.0.tgz#73bceaa90ba54de65ade42db5a28cc299c16158b"
+  integrity sha512-1D7cYAjgxEFHdfC/35Ooi4GqWKB5sszbW8iI7N16XILNln26xb0d5KflXqYrwr9CN/ZnZoCl2o6YsP7xEObcZA==
+
 "@tiptap/extension-code@^2.10.3":
   version "2.10.3"
   resolved "https://registry.yarnpkg.com/@tiptap/extension-code/-/extension-code-2.10.3.tgz#b9fb04be2d51760f011ec7a060d4e2e3eefe392c"
@@ -1362,6 +1372,11 @@
   resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.10.3.tgz#128c8fcd46d2e854d214c7f566e6212f2ebff6f1"
   integrity sha512-sNkTX/iN+YoleDiTJsrWSBw9D7c4vsYwnW5y/G5ydfuJMIRQMF78pWSIWZFDRNOMkgK5UHkhu9anrbCFYgBfaA==
 
+"@tiptap/extension-paragraph@^2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@tiptap/extension-paragraph/-/extension-paragraph-2.12.0.tgz#35987cfa842f254e67ecec403441578a1b2189a1"
+  integrity sha512-QNK5cgewCunWFxpLlbvvoO1rrLgEtNKxiY79fctP9toV+e59R+1i1Q9lXC1O5mOfDgVxCb6uFDMsqmKhFjpPog==
+
 "@tiptap/extension-placeholder@^2.0.3":
   version "2.10.3"
   resolved "https://registry.yarnpkg.com/@tiptap/extension-placeholder/-/extension-placeholder-2.10.3.tgz#eeb2b2f1916619e334af7d2a9d6885f77bb4ab78"
@@ -2267,6 +2282,14 @@ eastasianwidth@^0.2.0:
   resolved "https://registry.yarnpkg.com/eastasianwidth/-/eastasianwidth-0.2.0.tgz#696ce2ec0aa0e6ea93a397ffcf24aa7840c827cb"
   integrity sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==
 
+echarts@^5.6.0:
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/echarts/-/echarts-5.6.0.tgz#2377874dca9fb50f104051c3553544752da3c9d6"
+  integrity sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==
+  dependencies:
+    tslib "2.3.0"
+    zrender "5.6.1"
+
 ejs@^3.1.6:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b"
@@ -2542,15 +2565,18 @@ fraction.js@^4.3.7:
   resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.3.7.tgz#06ca0085157e42fda7f9e726e79fefc4068840f7"
   integrity sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==
 
-frappe-ui@^0.1.123:
-  version "0.1.123"
-  resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.123.tgz#501139a103a03e52648d9ee9ea85aa54bc8102e0"
-  integrity sha512-WkTnKZ+n82d9xZ9g9ZQXVkFyKU2wlcfT6/9g8/2biJuXMwmo/80I29EKGb9nrM1Liuj0Wtyg9nsqvfvgktdHbw==
+frappe-ui@^0.1.145:
+  version "0.1.145"
+  resolved "https://registry.yarnpkg.com/frappe-ui/-/frappe-ui-0.1.145.tgz#19ec429badf85f3f2c45a85ec13c3c462ec11ee9"
+  integrity sha512-DnnSJREu/EpUAJGNFaXEUF3re0hQMmLBOX/MSW9AsQtnCJwXkO5VbH/dyVHAZjqdb9Do3CNQF33/HB4NibNI8Q==
   dependencies:
+    "@floating-ui/vue" "^1.1.6"
     "@headlessui/vue" "^1.7.14"
     "@popperjs/core" "^2.11.2"
     "@tailwindcss/forms" "^0.5.3"
     "@tailwindcss/typography" "^0.5.16"
+    "@tiptap/core" "^2.11.7"
+    "@tiptap/extension-code-block" "^2.11.9"
     "@tiptap/extension-code-block-lowlight" "^2.11.5"
     "@tiptap/extension-color" "^2.0.3"
     "@tiptap/extension-highlight" "^2.0.3"
@@ -2571,12 +2597,16 @@ frappe-ui@^0.1.123:
     "@tiptap/vue-3" "^2.0.3"
     "@vueuse/core" "^10.4.1"
     dayjs "^1.11.13"
+    echarts "^5.6.0"
     feather-icons "^4.28.0"
     idb-keyval "^6.2.0"
     lowlight "^3.3.0"
     lucide-static "^0.479.0"
     ora "5.4.1"
     prettier "^3.3.2"
+    prosemirror-model "^1.25.1"
+    prosemirror-state "^1.4.3"
+    prosemirror-view "^1.39.2"
     radix-vue "^1.5.3"
     reka-ui "^2.0.2"
     showdown "^2.1.0"
@@ -3732,6 +3762,13 @@ prosemirror-model@^1.0.0, prosemirror-model@^1.19.0, prosemirror-model@^1.20.0,
   dependencies:
     orderedmap "^2.0.0"
 
+prosemirror-model@^1.25.1:
+  version "1.25.1"
+  resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.25.1.tgz#aeae9f1ec79fcaa76f6fc619800d91fbcf726870"
+  integrity sha512-AUvbm7qqmpZa5d9fPKMvH1Q5bqYQvAZWOGRvxsB6iFLyycvC9MwNemNVjHVrWgjaoxAfY8XVg7DbvQ/qxvI9Eg==
+  dependencies:
+    orderedmap "^2.0.0"
+
 prosemirror-schema-basic@^1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/prosemirror-schema-basic/-/prosemirror-schema-basic-1.2.3.tgz#649c349bb21c61a56febf9deb71ac68fca4cedf2"
@@ -3792,6 +3829,15 @@ prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, pros
     prosemirror-state "^1.0.0"
     prosemirror-transform "^1.1.0"
 
+prosemirror-view@^1.39.2:
+  version "1.39.3"
+  resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.39.3.tgz#54fa4b8ab4fd75ad0075dc6dc0be1745429d5a5c"
+  integrity sha512-bY/7kg0LzRE7ytR0zRdSMWX3sknEjw68l836ffLPMh0OG3OYnNuBDUSF3v0vjvnzgYjgY9ZH/RypbARURlcMFA==
+  dependencies:
+    prosemirror-model "^1.20.0"
+    prosemirror-state "^1.0.0"
+    prosemirror-transform "^1.1.0"
+
 punycode.js@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/punycode.js/-/punycode.js-2.3.1.tgz#6b53e56ad75588234e79f4affa90972c7dd8cdb7"
@@ -4463,6 +4509,11 @@ ts-interface-checker@^0.1.9:
   resolved "https://registry.yarnpkg.com/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz#784fd3d679722bc103b1b4b8030bcddb5db2a699"
   integrity sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==
 
+tslib@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
+  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
+
 tslib@^2.0.0, tslib@^2.8.0:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.8.1.tgz#612efe4ed235d567e8aba5f2a5fab70280ade83f"
@@ -4984,3 +5035,10 @@ yaml@^2.3.4:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.6.1.tgz#42f2b1ba89203f374609572d5349fb8686500773"
   integrity sha512-7r0XPzioN/Q9kXBro/XPnA6kznR73DHq+GXh5ON7ZozRO6aMjbmiBuKste2wslTFkC5d1dw0GooOCepZXJ2SAg==
+
+zrender@5.6.1:
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/zrender/-/zrender-5.6.1.tgz#e08d57ecf4acac708c4fcb7481eb201df7f10a6b"
+  integrity sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==
+  dependencies:
+    tslib "2.3.0"