From e1b3b9f3aad9126247a08e860e0f545c33921cd6 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 11 Jul 2017 15:39:28 +0530
Subject: [PATCH] [fix] talk proposal

---
 .../conference_talk_proposal/conference_talk_proposal.json  | 6 +++---
 .../templates/conference_talk_proposal.html                 | 2 +-
 .../templates/conference_talk_proposal_row.html             | 6 +++---
 .../conference_talk_proposal/conference_talk_proposal.json  | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

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 2b45fce0..240cebb2 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
@@ -3,7 +3,7 @@
  "allow_guest_to_view": 1, 
  "allow_import": 0, 
  "allow_rename": 0, 
- "autoname": "field:talk_title", 
+ "autoname": "field:title", 
  "beta": 0, 
  "creation": "2017-07-06 14:56:52.586022", 
  "custom": 0, 
@@ -51,7 +51,7 @@
    "bold": 0, 
    "collapsible": 0, 
    "columns": 0, 
-   "fieldname": "talk_title", 
+   "fieldname": "title", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "ignore_user_permissions": 0, 
@@ -238,7 +238,7 @@
  "issingle": 0, 
  "istable": 0, 
  "max_attachments": 0, 
- "modified": "2017-07-06 15:18:25.612161", 
+ "modified": "2017-07-11 15:37:52.074765", 
  "modified_by": "Administrator", 
  "module": "ERPNext Foundation", 
  "name": "Conference Talk Proposal", 
diff --git a/foundation/erpnext_foundation/doctype/conference_talk_proposal/templates/conference_talk_proposal.html b/foundation/erpnext_foundation/doctype/conference_talk_proposal/templates/conference_talk_proposal.html
index 236c2bce..c3306dbb 100644
--- a/foundation/erpnext_foundation/doctype/conference_talk_proposal/templates/conference_talk_proposal.html
+++ b/foundation/erpnext_foundation/doctype/conference_talk_proposal/templates/conference_talk_proposal.html
@@ -1,7 +1,7 @@
 {% extends "templates/web.html" %}
 
 {% block page_content %}
-<h1>{{ talk_title }}</h1>
+<h1>{{ title }}</h1>
 <p><span class='label'>{{ status or 'Pending Review' }}</span></p>
 <section>
 	<h3>Speaker {{ speaker }}</h3>
diff --git a/foundation/erpnext_foundation/doctype/conference_talk_proposal/templates/conference_talk_proposal_row.html b/foundation/erpnext_foundation/doctype/conference_talk_proposal/templates/conference_talk_proposal_row.html
index 1fc9088a..c699f73e 100644
--- a/foundation/erpnext_foundation/doctype/conference_talk_proposal/templates/conference_talk_proposal_row.html
+++ b/foundation/erpnext_foundation/doctype/conference_talk_proposal/templates/conference_talk_proposal_row.html
@@ -1,8 +1,8 @@
 <div>
 	<p>
-		<a href={{ route }}>{{ doc.talk_title }}</a>
-		<span class='label'>{{ status or 'Pending Review' }}</span>
-		<br><span class='text-muted small'>By {{ speaker }}</span>
+		<a href={{ route }}>{{ doc.title }}</a>
+		<span class='label'>{{ doc.status or 'Pending Review' }}</span>
+		<br><span class='text-muted small'>By {{ doc.speaker }}</span>
 	</p>
 </div>
 <!-- this is a sample default list template -->
\ No newline at end of file
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 74d40bcf..7229be09 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": 1, 
  "max_attachment_size": 0, 
- "modified": "2017-07-06 15:03:16.289503", 
+ "modified": "2017-07-11 15:38:10.150031", 
  "modified_by": "Administrator", 
  "module": "ERPNext Foundation", 
  "name": "conference-talk-proposal", 
@@ -31,7 +31,7 @@
  "title": "Conference Talk Proposal", 
  "web_form_fields": [
   {
-   "fieldname": "talk_title", 
+   "fieldname": "title", 
    "fieldtype": "Data", 
    "hidden": 0, 
    "label": "Talk Title",