diff --git a/foundation/erpnext_foundation/doctype/conference_request/conference_request.json b/foundation/erpnext_foundation/doctype/conference_request/conference_request.json index 87a60778..d742271a 100644 --- a/foundation/erpnext_foundation/doctype/conference_request/conference_request.json +++ b/foundation/erpnext_foundation/doctype/conference_request/conference_request.json @@ -37,7 +37,7 @@ "fieldname": "request_type", "fieldtype": "Select", "label": "Request Type", - "options": "Sponsorship\nExhibit Program" + "options": "Sponsorship\nExhibition" }, { "fieldname": "message", diff --git a/foundation/erpnext_foundation/doctype/conference_talk_proposal/conference_talk_proposal.json b/foundation/erpnext_foundation/doctype/conference_talk_proposal/conference_talk_proposal.json index 5152ac5b..4627d4a8 100644 --- a/foundation/erpnext_foundation/doctype/conference_talk_proposal/conference_talk_proposal.json +++ b/foundation/erpnext_foundation/doctype/conference_talk_proposal/conference_talk_proposal.json @@ -1,488 +1,129 @@ { - "allow_copy": 0, - "allow_guest_to_view": 1, - "allow_import": 0, - "allow_rename": 0, + "allow_guest_to_view": 1, "autoname": "TALK-.YYYY.-.###", - "beta": 0, - "creation": "2017-07-06 14:56:52.586022", - "custom": 0, - "docstatus": 0, - "doctype": "DocType", - "document_type": "", - "editable_grid": 1, - "engine": "InnoDB", + "creation": "2017-07-06 14:56:52.586022", + "doctype": "DocType", + "editable_grid": 1, + "engine": "InnoDB", + "field_order": [ + "title", + "column_break_2", + "status", + "speaker_details_section", + "speaker", + "email", + "speaker_bio", + "talk_summary", + "website_details_section", + "route", + "published", + "column_break_12", + "year", + "discuss_link" + ], "fields": [ { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "title", "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, "label": "Talk Title", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 + "reqd": 1 }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "column_break_2", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 + "fieldtype": "Column Break" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "Pending Review", - "fieldname": "status", - "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Status", - "length": 0, - "no_copy": 0, - "options": "Pending Review\nApproved\nRejected", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "default": "Pending Review", + "fieldname": "status", + "fieldtype": "Select", + "label": "Status", + "options": "Pending Review\nApproved\nRejected" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "speaker_details_section", "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Speaker Details", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "label": "Speaker Details" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "speaker", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 1, - "in_standard_filter": 0, - "label": "Speaker", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "speaker", + "fieldtype": "Data", + "in_list_view": 1, + "label": "Speaker", + "reqd": 1 + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "email", "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Email", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 + "label": "Email" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "speaker_bio", - "fieldtype": "Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Speaker Bio", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "speaker_bio", + "fieldtype": "Text", + "label": "Speaker Bio", + "reqd": 1 + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "fieldname": "talk_summary", - "fieldtype": "Text", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Talk Summary", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 1, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "fieldname": "talk_summary", + "fieldtype": "Text", + "label": "Talk Summary", + "reqd": 1 + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "website_details_section", "fieldtype": "Section Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Website Details", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 + "label": "Website Details" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "route", "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Route", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 + "label": "Route" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, - "default": "1", - "fieldname": "published", - "fieldtype": "Check", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Published", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 - }, + "default": "1", + "fieldname": "published", + "fieldtype": "Check", + "label": "Published" + }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "column_break_12", - "fieldtype": "Column Break", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 + "fieldtype": "Column Break" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "year", "fieldtype": "Select", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, "label": "Year", - "length": 0, - "no_copy": 0, - "options": "\n2018\n2017", - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 + "options": "\n2018\n2017" }, { - "allow_bulk_edit": 0, - "allow_on_submit": 0, - "bold": 0, - "collapsible": 0, - "columns": 0, "fieldname": "discuss_link", - "fieldtype": "Data", - "hidden": 0, - "ignore_user_permissions": 0, - "ignore_xss_filter": 0, - "in_filter": 0, - "in_global_search": 0, - "in_list_view": 0, - "in_standard_filter": 0, - "label": "Discuss Link", - "length": 0, - "no_copy": 0, - "permlevel": 0, - "precision": "", - "print_hide": 0, - "print_hide_if_no_value": 0, - "read_only": 0, - "remember_last_selected_value": 0, - "report_hide": 0, - "reqd": 0, - "search_index": 0, - "set_only_once": 0, - "unique": 0 + "fieldtype": "Data", + "label": "Discuss Link" } - ], - "has_web_view": 1, - "hide_heading": 0, - "hide_toolbar": 0, - "idx": 0, - "image_view": 0, - "in_create": 0, - "is_published_field": "published", - "is_submittable": 0, - "issingle": 0, - "istable": 0, - "max_attachments": 0, - "modified": "2018-10-02 13:20:28.827852", - "modified_by": "Administrator", - "module": "ERPNext Foundation", - "name": "Conference Talk Proposal", - "name_case": "", - "owner": "Administrator", + ], + "has_web_view": 1, + "is_published_field": "published", + "modified": "2019-08-05 13:05:57.484303", + "modified_by": "Administrator", + "module": "ERPNext Foundation", + "name": "Conference Talk Proposal", + "owner": "Administrator", "permissions": [ { - "amend": 0, - "cancel": 0, - "create": 1, - "delete": 1, - "email": 1, - "export": 1, - "if_owner": 0, - "import": 0, - "permlevel": 0, - "print": 1, - "read": 1, - "report": 1, - "role": "System Manager", - "set_user_permissions": 0, - "share": 1, - "submit": 0, + "create": 1, + "delete": 1, + "email": 1, + "export": 1, + "print": 1, + "read": 1, + "report": 1, + "role": "System Manager", + "share": 1, "write": 1 } - ], - "quick_entry": 1, - "read_only": 0, - "read_only_onload": 0, - "route": "talk-proposals", - "show_name_in_global_search": 0, - "sort_field": "modified", - "sort_order": "DESC", + ], + "route": "talk-proposals", + "sort_field": "modified", + "sort_order": "DESC", "title_field": "title", - "track_changes": 1, - "track_seen": 0, - "track_views": 0 + "track_changes": 1 } \ No newline at end of file diff --git a/foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.json b/foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.json index 1a5cc165..f973b2b9 100644 --- a/foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.json +++ b/foundation/erpnext_foundation/notification/conference_ticket_confirmation/conference_ticket_confirmation.json @@ -12,7 +12,7 @@ "idx": 0, "is_standard": 1, "message": "
Dear {{ doc.participant_name }},
\n\nThank you for registering for the 2019 ERPNext Conference!
\n\nHere are your ticket details:
\n\n| Ticket Type | \n\t\tQty | \n\t\tRate | \n\t
|---|---|---|
| Conference Tickets + Lunch + Dinner | \n\t\t{{ doc.full_conference_tickets or 0 }} | \n\t\t{% if doc.currency==\"INR\" %}5000{% else %}70{% endif %} | \n\t
If you need any help, please email us at foundation@erpnext.com
", - "modified": "2019-08-04 21:43:49.890976", + "modified": "2019-08-05 13:09:17.385839", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "Conference Ticket Confirmation", @@ -21,7 +21,7 @@ "property_value": "1", "recipients": [ { - "cc": "", + "cc": "foundation@erpnext.org", "email_by_document_field": "email" } ], diff --git a/foundation/erpnext_foundation/web_form/conference_talk_proposal/conference_talk_proposal.json b/foundation/erpnext_foundation/web_form/conference_talk_proposal/conference_talk_proposal.json index 4fa900d7..658de1ec 100644 --- a/foundation/erpnext_foundation/web_form/conference_talk_proposal/conference_talk_proposal.json +++ b/foundation/erpnext_foundation/web_form/conference_talk_proposal/conference_talk_proposal.json @@ -17,7 +17,7 @@ "is_standard": 1, "login_required": 0, "max_attachment_size": 0, - "modified": "2018-10-16 12:08:19.712608", + "modified": "2019-08-05 13:10:19.956393", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "conference-talk-proposal", @@ -51,7 +51,7 @@ "fieldname": "speaker", "fieldtype": "Data", "hidden": 0, - "label": "Speaker", + "label": "Your Name", "max_length": 0, "max_value": 0, "read_only": 0, @@ -75,7 +75,7 @@ "fieldname": "speaker_bio", "fieldtype": "Text", "hidden": 0, - "label": "Speaker Bio", + "label": "Tell us about yourself", "max_length": 0, "max_value": 0, "read_only": 0, @@ -93,32 +93,6 @@ "read_only": 0, "reqd": 1, "show_in_filter": 0 - }, - { - "allow_read_on_all_link_options": 0, - "default": "2018", - "fieldname": "year", - "fieldtype": "Data", - "hidden": 1, - "label": "Year", - "max_length": 0, - "max_value": 0, - "options": "", - "read_only": 0, - "reqd": 0, - "show_in_filter": 0 - }, - { - "allow_read_on_all_link_options": 0, - "fieldname": "discuss_link", - "fieldtype": "Data", - "hidden": 0, - "label": "Link To Discuss Post (In Case You Have Posted Your Proposal Earlier)", - "max_length": 0, - "max_value": 0, - "read_only": 0, - "reqd": 0, - "show_in_filter": 0 } ] } \ No newline at end of file diff --git a/foundation/erpnext_foundation/web_form/request_a_call/request_a_call.json b/foundation/erpnext_foundation/web_form/request_a_call/request_a_call.json index 4e2f0c4e..7ee5fbc1 100644 --- a/foundation/erpnext_foundation/web_form/request_a_call/request_a_call.json +++ b/foundation/erpnext_foundation/web_form/request_a_call/request_a_call.json @@ -91,7 +91,7 @@ "label": "Request Type", "max_length": 0, "max_value": 0, - "options": "Sponsorship\nExhibit Program", + "options": "Sponsorship\nExhibition", "read_only": 0, "reqd": 1, "show_in_filter": 0 diff --git a/foundation/www/conf/2019/expo.html b/foundation/www/conf/2019/exhibition.html similarity index 90% rename from foundation/www/conf/2019/expo.html rename to foundation/www/conf/2019/exhibition.html index 1b31f000..11df8446 100644 --- a/foundation/www/conf/2019/expo.html +++ b/foundation/www/conf/2019/exhibition.html @@ -1,5 +1,5 @@ {% extends "templates/base.html" %} -{% block title %}Exhibit Program{% endblock %} +{% block title %}Exhibition{% endblock %} {% block content %}
Showcase the services you provide for ERPNext to the global community, understand their challenges and explore solutions with them. @@ -64,21 +64,21 @@
+
Join the global community of ERPNext developers and users for a - two day contribution sprint and contribute new features, +
Join the global ERPNext community for a + two day sprint and contribute new features, fixes and documentation.
KJ Somaiya College of Engineering
15 and 16 October
+
Join the global community of ERPNext developers and users for a - two day contribution sprint and contribute new features, +
Join the global ERPNext community for a + two day sprint and contribute new features, fixes and documentation.
KJ Somaiya College of Engineering
15 and 16 October
Showcase the services you provide for ERPNext to the global community, understand their challenges and explore solutions with them.
+
Join the global community of ERPNext developers and users for a - two day contribution sprint and contribute new features, +
Join the global ERPNext community for a + two day sprint and contribute new features, fixes and documentation.
KJ Somaiya College of Engineering
15 and 16 October