Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Remove domains from setup wizard #30820

Merged
merged 3 commits into from
May 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions erpnext/accounts/doctype/sales_invoice/sales_invoice.js
Original file line number Diff line number Diff line change
Expand Up @@ -824,29 +824,6 @@ frappe.ui.form.on('Sales Invoice', {
}
},

// Healthcare
patient: function(frm) {
if (frappe.boot.active_domains.includes("Healthcare")){
if(frm.doc.patient){
frappe.call({
method: "frappe.client.get_value",
args:{
doctype: "Patient",
filters: {
"name": frm.doc.patient
},
fieldname: "customer"
},
callback:function(r) {
if(r && r.message.customer){
frm.set_value("customer", r.message.customer);
}
}
});
}
}
},

project: function(frm) {
if (frm.doc.project) {
frm.events.add_timesheet_data(frm, {
Expand Down Expand Up @@ -976,25 +953,6 @@ frappe.ui.form.on('Sales Invoice', {
if (frm.doc.is_debit_note) {
frm.set_df_property('return_against', 'label', __('Adjustment Against'));
}

if (frappe.boot.active_domains.includes("Healthcare")) {
frm.set_df_property("patient", "hidden", 0);
frm.set_df_property("patient_name", "hidden", 0);
frm.set_df_property("ref_practitioner", "hidden", 0);
if (cint(frm.doc.docstatus==0) && cur_frm.page.current_view_name!=="pos" && !frm.doc.is_return) {
frm.add_custom_button(__('Healthcare Services'), function() {
get_healthcare_services_to_invoice(frm);
},__("Get Items From"));
frm.add_custom_button(__('Prescriptions'), function() {
get_drugs_to_invoice(frm);
},__("Get Items From"));
}
}
else {
frm.set_df_property("patient", "hidden", 1);
frm.set_df_property("patient_name", "hidden", 1);
frm.set_df_property("ref_practitioner", "hidden", 1);
}
},

create_invoice_discounting: function(frm) {
Expand Down
7 changes: 0 additions & 7 deletions erpnext/hooks.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,6 @@
"Holiday List",
]

domains = {
"Distribution": "erpnext.domains.distribution",
"Manufacturing": "erpnext.domains.manufacturing",
"Retail": "erpnext.domains.retail",
"Services": "erpnext.domains.services",
}

website_generators = ["Item Group", "Website Item", "BOM", "Sales Partner", "Job Opening"]

website_context = {
Expand Down
5 changes: 0 additions & 5 deletions erpnext/loan_management/loan_common.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@

frappe.ui.form.on(cur_frm.doctype, {
refresh: function(frm) {
if (!frappe.boot.active_domains.includes("Non Profit")) {
frm.set_df_property('applicant_type', 'options', ['Employee', 'Customer']);
frm.refresh_field('applicant_type');
}

if (['Loan Disbursement', 'Loan Repayment', 'Loan Interest Accrual', 'Loan Write Off'].includes(frm.doc.doctype)
&& frm.doc.docstatus > 0) {

Expand Down
30 changes: 0 additions & 30 deletions erpnext/public/js/setup_wizard.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,36 +12,6 @@ frappe.setup.on("before_load", function () {
});

erpnext.setup.slides_settings = [
{
// Domain
name: 'domain',
title: __('Select your Domains'),
fields: [
{
fieldname: 'domains',
label: __('Domains'),
fieldtype: 'MultiCheck',
options: [
{ "label": __("Distribution"), "value": "Distribution" },
{ "label": __("Manufacturing"), "value": "Manufacturing" },
{ "label": __("Retail"), "value": "Retail" },
{ "label": __("Services"), "value": "Services" },
{ "label": __("Healthcare (beta)"), "value": "Healthcare" },
{ "label": __("Non Profit (beta)"), "value": "Non Profit" }
], reqd: 1
},
],
// help: __('Select the nature of your business.'),
validate: function () {
if (this.values.domains.length === 0) {
frappe.msgprint(__("Please select at least one domain."));
return false;
}
frappe.setup.domains = this.values.domains;
return true;
},
},

{
// Brand
name: 'brand',
Expand Down
7 changes: 3 additions & 4 deletions erpnext/setup/doctype/company/company.json
Original file line number Diff line number Diff line change
Expand Up @@ -147,9 +147,8 @@
},
{
"fieldname": "domain",
"fieldtype": "Link",
"label": "Domain",
"options": "Domain"
"fieldtype": "Data",
"label": "Domain"
},
{
"fieldname": "parent_company",
Expand Down Expand Up @@ -748,7 +747,7 @@
"image_field": "company_logo",
"is_tree": 1,
"links": [],
"modified": "2022-01-25 10:33:16.826067",
"modified": "2022-04-27 10:33:16.826067",
"modified_by": "Administrator",
"module": "Setup",
"name": "Company",
Expand Down
1 change: 0 additions & 1 deletion erpnext/setup/setup_wizard/operations/company_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ def create_fiscal_year_and_company(args):
"country": args.get("country"),
"create_chart_of_accounts_based_on": "Standard Template",
"chart_of_accounts": args.get("chart_of_accounts"),
"domain": args.get("domains")[0],
}
).insert()

Expand Down
3 changes: 0 additions & 3 deletions erpnext/setup/setup_wizard/operations/defaults_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ def set_default_settings(args):
system_settings.email_footer_address = args.get("company_name")
system_settings.save()

domain_settings = frappe.get_single("Domain Settings")
domain_settings.set_active_domains(args.get("domains"))

stock_settings = frappe.get_doc("Stock Settings")
stock_settings.item_naming_by = "Item Code"
stock_settings.valuation_method = "FIFO"
Expand Down
12 changes: 0 additions & 12 deletions erpnext/setup/setup_wizard/operations/install_fixtures.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,6 @@

def install(country=None):
records = [
# domains
{"doctype": "Domain", "domain": "Distribution"},
{"doctype": "Domain", "domain": "Manufacturing"},
{"doctype": "Domain", "domain": "Retail"},
{"doctype": "Domain", "domain": "Services"},
{"doctype": "Domain", "domain": "Healthcare"},
{"doctype": "Domain", "domain": "Non Profit"},
# ensure at least an empty Address Template exists for this Country
{"doctype": "Address Template", "country": country},
# item group
Expand Down Expand Up @@ -789,7 +782,6 @@ def install_defaults(args=None):
frappe.db.set_value("Stock Settings", None, "email_footer_address", args.get("company_name"))

set_global_defaults(args)
set_active_domains(args)
update_stock_settings()
update_shopping_cart_settings(args)

Expand All @@ -813,10 +805,6 @@ def set_global_defaults(args):
global_defaults.save()


def set_active_domains(args):
frappe.get_single("Domain Settings").set_active_domains(args.get("domains"))


def update_stock_settings():
stock_settings = frappe.get_doc("Stock Settings")
stock_settings.item_naming_by = "Item Code"
Expand Down
6 changes: 0 additions & 6 deletions erpnext/setup/setup_wizard/setup_wizard.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ def get_setup_stages(args=None):
"tasks": [
{"fn": setup_defaults, "args": args, "fail_msg": _("Failed to setup defaults")},
{"fn": stage_four, "args": args, "fail_msg": _("Failed to create website")},
{"fn": set_active_domains, "args": args, "fail_msg": _("Failed to add Domain")},
],
},
{
Expand Down Expand Up @@ -84,8 +83,3 @@ def setup_complete(args=None):
setup_defaults(args)
stage_four(args)
fin(args)


def set_active_domains(args):
domain_settings = frappe.get_single("Domain Settings")
domain_settings.set_active_domains(args.get("domains"))
10 changes: 0 additions & 10 deletions erpnext/setup/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,8 @@ def before_tests():
"email": "test@erpnext.com",
"password": "test",
"chart_of_accounts": "Standard",
"domains": ["Manufacturing"],
}
)
_enable_all_domains()

frappe.db.sql("delete from `tabLeave Allocation`")
frappe.db.sql("delete from `tabLeave Application`")
Expand Down Expand Up @@ -131,17 +129,9 @@ def format_ces_api(data, param):

def enable_all_roles_and_domains():
"""enable all roles and domain for testing"""
_enable_all_domains()
_enable_all_roles_for_admin()


def _enable_all_domains():
domains = frappe.get_all("Domain", pluck="name")
if not domains:
return
frappe.get_single("Domain Settings").set_active_domains(domains)


def _enable_all_roles_for_admin():
from frappe.desk.page.setup_wizard.setup_wizard import add_all_roles_to

Expand Down
4 changes: 0 additions & 4 deletions erpnext/tests/server/agriculture.txt

This file was deleted.

152 changes: 0 additions & 152 deletions erpnext/tests/test_woocommerce.py

This file was deleted.

Loading