Merge pull request #327 from Zlash65/min-min

[Minor] Email fetched from owner & label fix

foundation/erpnext_foundation/doctype/developer_sprint/developer_sprint.json

@@ -1,5 +1,6 @@
 {
  "allow_copy": 0, 
+ "allow_events_in_timeline": 0,
  "allow_guest_to_view": 0, 
  "allow_import": 0, 
  "allow_rename": 0, 
@@ -19,7 +20,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "teamcompanychapter_name", 
+   "fieldname": "person_team_name",
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -28,7 +29,7 @@
    "in_global_search": 0, 
    "in_list_view": 0, 
    "in_standard_filter": 0, 
-   "label": "Team/Company/Chapter Name", 
+   "label": "Person / Team / Company / Chapter Name",
    "length": 0, 
    "no_copy": 0, 
    "permlevel": 0, 
@@ -184,7 +185,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2018-10-09 16:22:00.627261", 
+ "modified": "2018-10-10 17:26:07.389705",
  "modified_by": "Administrator", 
  "module": "ERPNext Foundation", 
  "name": "Developer Sprint", 

foundation/erpnext_foundation/doctype/developer_sprint/developer_sprint.py

@@ -12,3 +12,7 @@ class DeveloperSprint(Document):
 		autoname = 'DEV-SPRINT-.YYYY.-.###'
 		self.name = make_autoname(autoname)
 
+	def validate(self):
+		self.year = '2018'
+		if self.owner not in ["Guest", "Administrator"] and not self.get("email"):
+			self.email = frappe.db.get_value('User', self.owner, "email")

foundation/erpnext_foundation/web_form/conference_talk_proposal/conference_talk_proposal.json

@@ -17,7 +17,7 @@
  "is_standard": 1, 
  "login_required": 1, 
  "max_attachment_size": 0, 
- "modified": "2018-10-09 16:27:05.686309", 
+ "modified": "2018-10-10 18:21:55.971259",
  "modified_by": "Administrator", 
  "module": "ERPNext Foundation", 
  "name": "conference-talk-proposal", 
@@ -25,11 +25,13 @@
  "payment_button_label": "Buy Now", 
  "published": 1, 
  "route": "propose-a-talk", 
+ "route_to_success_link": 1,
+ "show_attachments": 0,
  "show_in_grid": 0, 
  "show_sidebar": 1, 
  "sidebar_items": [], 
- "success_message": "Thank you for your proposal.", 
+ "success_message": "Thank you for submitting your proposal.",
- "success_url": "/conference-talk-proposal", 
+ "success_url": "/conf/2018",
  "title": "Propose A Talk", 
  "web_form_fields": [
   {

foundation/erpnext_foundation/web_form/developer_sprint/developer_sprint.json

@@ -18,7 +18,7 @@
  "is_standard": 1, 
  "login_required": 1, 
  "max_attachment_size": 0, 
- "modified": "2018-10-09 16:27:18.317370", 
+ "modified": "2018-10-10 18:21:49.734218",
  "modified_by": "Administrator", 
  "module": "ERPNext Foundation", 
  "name": "developer-sprint", 
@@ -26,31 +26,21 @@
  "payment_button_label": "Buy Now", 
  "published": 1, 
  "route": "developer-sprint", 
+ "route_to_success_link": 1,
+ "show_attachments": 0,
  "show_in_grid": 0, 
  "show_sidebar": 1, 
  "sidebar_items": [], 
- "success_message": "Thank you for your proposal.", 
+ "success_message": "Thank you for submitting your proposal for the Developer Sprint. See you on the 24th of October!",
- "success_url": "/developer-sprint", 
+ "success_url": "/conf/2018",
  "title": "Developer Sprint", 
  "web_form_fields": [
   {
    "allow_read_on_all_link_options": 0, 
-   "fieldname": "teamcompanychapter_name", 
+   "fieldname": "person_team_name",
    "fieldtype": "Data", 
    "hidden": 0, 
-   "label": "Team/Company/Chapter Name", 
+   "label": "Person / Team / Company / Chapter Name",
-   "max_length": 0, 
-   "max_value": 0, 
-   "read_only": 0, 
-   "reqd": 0, 
-   "show_in_filter": 0
-  }, 
-  {
-   "allow_read_on_all_link_options": 0, 
-   "fieldname": "email_id", 
-   "fieldtype": "Data", 
-   "hidden": 0, 
-   "label": "Email ID", 
    "max_length": 0, 
    "max_value": 0, 
    "read_only": 0, 
@@ -66,7 +56,7 @@
    "max_length": 0, 
    "max_value": 0, 
    "read_only": 0, 
-   "reqd": 0, 
+   "reqd": 1,
    "show_in_filter": 0
   }, 
   {
@@ -78,7 +68,7 @@
    "max_length": 0, 
    "max_value": 0, 
    "read_only": 0, 
-   "reqd": 0, 
+   "reqd": 1,
    "show_in_filter": 0
   }, 
   {
@@ -91,7 +81,7 @@
    "max_length": 0, 
    "max_value": 0, 
    "read_only": 0, 
-   "reqd": 0, 
+   "reqd": 1,
    "show_in_filter": 0
   }
  ]