Merge branch 'develop'
This commit is contained in:
commit
c88068eecf
@ -1,2 +1,2 @@
|
||||
from __future__ import unicode_literals
|
||||
__version__ = '6.25.0'
|
||||
__version__ = '6.25.1'
|
||||
|
@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
|
||||
app_description = """ERP made simple"""
|
||||
app_icon = "icon-th"
|
||||
app_color = "#e74c3c"
|
||||
app_version = "6.25.0"
|
||||
app_version = "6.25.1"
|
||||
app_email = "info@erpnext.com"
|
||||
app_license = "GNU General Public License (v3)"
|
||||
source_link = "https://github.com/frappe/erpnext"
|
||||
|
@ -24,12 +24,12 @@ function load_erpnext_slides() {
|
||||
placeholder: __('e.g. "XYZ National Bank"'), reqd:1 },
|
||||
{fieldname:'domain', label: __('Domain'), fieldtype:'Select',
|
||||
options: [
|
||||
__("Distribution"),
|
||||
__("Manufacturing"),
|
||||
__("Retail"),
|
||||
__("Services"),
|
||||
__("Education"),
|
||||
__("Other")
|
||||
{"label": __("Distribution"), "value": "Distribution"},
|
||||
{"label": __("Manufacturing"), "value": "Manufacturing"},
|
||||
{"label": __("Retail"), "value": "Retail"},
|
||||
{"label": __("Services"), "value": "Services"},
|
||||
{"label": __("Education"), "value": "Education"},
|
||||
{"label": __("Other"), "value": "Other"},
|
||||
], reqd:1},
|
||||
{fieldname:'chart_of_accounts', label: __('Chart of Accounts'),
|
||||
options: "", fieldtype: 'Select'},
|
||||
|
Loading…
x
Reference in New Issue
Block a user