Merge branch 'develop' of https://github.com/frappe/erpnext into erpnext_setup_cleanup
This commit is contained in:
@@ -28,15 +28,13 @@ erpnext.setup.slides_settings = [
|
||||
},
|
||||
{
|
||||
fieldname: 'company_name',
|
||||
label: frappe.setup.domains.includes('Education') ?
|
||||
__('Institute Name') : __('Company Name'),
|
||||
label: __('Company Name'),
|
||||
fieldtype: 'Data',
|
||||
reqd: 1
|
||||
},
|
||||
{
|
||||
fieldname: 'company_abbr',
|
||||
label: frappe.setup.domains.includes('Education') ?
|
||||
__('Institute Abbreviation') : __('Company Abbreviation'),
|
||||
label: __('Company Abbreviation'),
|
||||
fieldtype: 'Data'
|
||||
}
|
||||
],
|
||||
@@ -76,17 +74,12 @@ erpnext.setup.slides_settings = [
|
||||
name: 'organisation',
|
||||
title: __("Your Organization"),
|
||||
icon: "fa fa-building",
|
||||
// help: frappe.setup.domains.includes('Education') ?
|
||||
// __('The name of the institute for which you are setting up this system.') :
|
||||
// __('The name of your company for which you are setting up this system.')),
|
||||
fields: [
|
||||
{
|
||||
fieldname: 'company_tagline',
|
||||
label: __('What does it do?'),
|
||||
fieldtype: 'Data',
|
||||
placeholder: frappe.setup.domains.includes('Education') ?
|
||||
__('e.g. "Primary School" or "University"') :
|
||||
__('e.g. "Build tools for builders"'),
|
||||
placeholder: __('e.g. "Build tools for builders"'),
|
||||
reqd: 1
|
||||
},
|
||||
{ fieldname: 'bank_account', label: __('Bank Name'), fieldtype: 'Data', reqd: 1 },
|
||||
|
||||
Reference in New Issue
Block a user