Shiloh/brotherton-erpnext
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6068 from neilLasrado/develop

Browse Source 
Added image field to guardian, program enrollment, fixed some typos
This commit is contained in:
Nabin Hait 2016-08-16 11:01:58 +05:30 committed by GitHub
commit df9cf2ef8e
3 changed files with 65 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
erpnext/schools/doctype/guardian/guardian.json
View File

@ -91,14 +91,14 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "mobile_nuber",
"fieldname": "mobile_number",
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Mobile Nuber",
"label": "Mobile Number",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@ -116,8 +116,8 @@
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "section_break_5",
"fieldtype": "Section Break",
"fieldname": "column_break_3",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
@ -136,6 +136,31 @@
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "image",
"fieldtype": "Attach Image",
"hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
@ -166,6 +191,7 @@
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"image_field": "image",
"image_view": 0,
"in_create": 0,
"in_dialog": 0,
@ -173,7 +199,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
"modified": "2016-07-25 07:20:11.458757",
"modified": "2016-08-11 07:57:21.708354",
"modified_by": "Administrator",
"module": "Schools",
"name": "Guardian",

30
erpnext/schools/doctype/program_enrollment/program_enrollment.json
View File

@ -9,6 +9,7 @@
"docstatus": 0,
"doctype": "DocType",
"document_type": "Document",
"editable_grid": 0,
"fields": [
{
"allow_on_submit": 0,
@ -239,11 +240,38 @@
"search_index": 0,
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "image",
"fieldtype": "Attach Image",
"hidden": 1,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Image",
"length": 0,
"no_copy": 0,
"permlevel": 0,
"precision": "",
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0
}
],
"hide_heading": 0,
"hide_toolbar": 0,
"idx": 0,
"image_field": "image",
"image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 1,
@ -251,7 +279,7 @@
"istable": 0,
"max_attachments": 0,
"menu_index": 0,
"modified": "2016-07-18 10:30:50.243271",
"modified": "2016-08-11 08:50:24.317353",
"modified_by": "Administrator",
"module": "Schools",
"name": "Program Enrollment",

33
erpnext/selling/doctype/quotation/quotation.json
View File

@ -5,10 +5,11 @@
"autoname": "naming_series:",
"beta": 0,
"creation": "2013-05-24 19:29:08",
"custom": 0,
"custom": 0,
"docstatus": 0,
"doctype": "DocType",
"document_type": "Document",
"editable_grid": 1,
"fields": [
{
"allow_on_submit": 0,
@ -35,30 +36,6 @@
"set_only_once": 0,
"unique": 0
},
{
"allow_on_submit": 0,
"bold": 0,
"collapsible": 0,
"fieldname": "column_break0",
"fieldtype": "Column Break",
"hidden": 0,
"ignore_user_permissions": 0,
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"length": 0,
"no_copy": 0,
"permlevel": 0,
"print_hide": 0,
"print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 0,
"search_index": 0,
"set_only_once": 0,
"unique": 0,
"width": "50%"
},
{
"allow_on_submit": 1,
"bold": 0,
@ -207,7 +184,7 @@
"ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 0,
"label": "Custome Name",
"label": "Customer Name",
"length": 0,
"no_copy": 0,
"permlevel": 0,
@ -2133,7 +2110,7 @@
"istable": 0,
"max_attachments": 1,
"menu_index": 0,
"modified": "2016-07-05 16:44:01.301063",
"modified": "2016-08-11 08:52:09.666306",
"modified_by": "Administrator",
"module": "Selling",
"name": "Quotation",
@ -2313,4 +2290,4 @@
"timeline_field": "customer",
"title_field": "title",
"track_seen": 0
}
}