-
Notifications
You must be signed in to change notification settings - Fork 244
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #356 from frappe/develop
chore: Merge develop to main
- Loading branch information
Showing
30 changed files
with
740 additions
and
199 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
21 changes: 21 additions & 0 deletions
21
crm/fcrm/doctype/erpnext_crm_settings/erpnext_crm_settings.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| // Copyright (c) 2023, Frappe Technologies Pvt. Ltd. and contributors | ||
| // For license information, please see license.txt | ||
|
|
||
| frappe.ui.form.on("ERPNext CRM Settings", { | ||
| refresh(frm) { | ||
| if (!frm.doc.enabled) return; | ||
| frm.add_custom_button(__("Reset ERPNext Form Script"), () => { | ||
| frappe.confirm( | ||
| __( | ||
| "Are you sure you want to reset 'Create Quotation from CRM Deal' Form Script?" | ||
| ), | ||
| () => frm.trigger("reset_erpnext_form_script") | ||
| ); | ||
| }); | ||
| }, | ||
| async reset_erpnext_form_script(frm) { | ||
| let script = await frm.call("reset_erpnext_form_script"); | ||
| script.message && | ||
| frappe.msgprint(__("Form Script updated successfully")); | ||
| }, | ||
| }); |
124 changes: 124 additions & 0 deletions
124
crm/fcrm/doctype/erpnext_crm_settings/erpnext_crm_settings.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| { | ||
| "actions": [], | ||
| "allow_rename": 1, | ||
| "creation": "2024-07-02 15:23:17.022214", | ||
| "doctype": "DocType", | ||
| "engine": "InnoDB", | ||
| "field_order": [ | ||
| "enabled", | ||
| "is_erpnext_in_different_site", | ||
| "column_break_vfru", | ||
| "erpnext_company", | ||
| "section_break_oubd", | ||
| "erpnext_site_url", | ||
| "column_break_fllx", | ||
| "api_key", | ||
| "api_secret", | ||
| "section_break_jnbn", | ||
| "create_customer_on_status_change", | ||
| "column_break_kbhw", | ||
| "deal_status" | ||
| ], | ||
| "fields": [ | ||
| { | ||
| "depends_on": "eval:doc.enabled && doc.is_erpnext_in_different_site", | ||
| "fieldname": "api_key", | ||
| "fieldtype": "Data", | ||
| "label": "API Key", | ||
| "mandatory_depends_on": "is_erpnext_in_different_site" | ||
| }, | ||
| { | ||
| "depends_on": "eval:doc.enabled && doc.is_erpnext_in_different_site", | ||
| "fieldname": "api_secret", | ||
| "fieldtype": "Password", | ||
| "label": "API Secret", | ||
| "mandatory_depends_on": "is_erpnext_in_different_site" | ||
| }, | ||
| { | ||
| "depends_on": "enabled", | ||
| "fieldname": "section_break_oubd", | ||
| "fieldtype": "Section Break" | ||
| }, | ||
| { | ||
| "fieldname": "column_break_fllx", | ||
| "fieldtype": "Column Break" | ||
| }, | ||
| { | ||
| "depends_on": "eval:doc.enabled && doc.is_erpnext_in_different_site", | ||
| "fieldname": "erpnext_site_url", | ||
| "fieldtype": "Data", | ||
| "label": "ERPNext Site URL", | ||
| "mandatory_depends_on": "is_erpnext_in_different_site" | ||
| }, | ||
| { | ||
| "depends_on": "enabled", | ||
| "fieldname": "erpnext_company", | ||
| "fieldtype": "Data", | ||
| "label": "Company in ERPNext Site", | ||
| "mandatory_depends_on": "enabled" | ||
| }, | ||
| { | ||
| "fieldname": "column_break_vfru", | ||
| "fieldtype": "Column Break" | ||
| }, | ||
| { | ||
| "default": "0", | ||
| "fieldname": "enabled", | ||
| "fieldtype": "Check", | ||
| "label": "Enabled" | ||
| }, | ||
| { | ||
| "default": "0", | ||
| "depends_on": "enabled", | ||
| "fieldname": "is_erpnext_in_different_site", | ||
| "fieldtype": "Check", | ||
| "label": "Is ERPNext installed on a different site?" | ||
| }, | ||
| { | ||
| "fieldname": "section_break_jnbn", | ||
| "fieldtype": "Section Break" | ||
| }, | ||
| { | ||
| "default": "0", | ||
| "depends_on": "enabled", | ||
| "fieldname": "create_customer_on_status_change", | ||
| "fieldtype": "Check", | ||
| "label": "Create customer on status change" | ||
| }, | ||
| { | ||
| "fieldname": "column_break_kbhw", | ||
| "fieldtype": "Column Break" | ||
| }, | ||
| { | ||
| "depends_on": "eval:doc.enabled && doc.create_customer_on_status_change", | ||
| "fieldname": "deal_status", | ||
| "fieldtype": "Link", | ||
| "label": "Deal Status", | ||
| "mandatory_depends_on": "create_customer_on_status_change", | ||
| "options": "CRM Deal Status" | ||
| } | ||
| ], | ||
| "index_web_pages_for_search": 1, | ||
| "issingle": 1, | ||
| "links": [], | ||
| "modified": "2024-09-17 19:21:11.060901", | ||
| "modified_by": "Administrator", | ||
| "module": "FCRM", | ||
| "name": "ERPNext CRM Settings", | ||
| "owner": "Administrator", | ||
| "permissions": [ | ||
| { | ||
| "create": 1, | ||
| "delete": 1, | ||
| "email": 1, | ||
| "print": 1, | ||
| "read": 1, | ||
| "role": "System Manager", | ||
| "share": 1, | ||
| "write": 1 | ||
| } | ||
| ], | ||
| "sort_field": "creation", | ||
| "sort_order": "DESC", | ||
| "states": [] | ||
| } |
Oops, something went wrong.