diff --git a/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.py b/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.py index 23aec3b3..710f55e5 100644 --- a/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.py +++ b/foundation/erpnext_foundation/doctype/conference_participant/conference_participant.py @@ -62,7 +62,7 @@ class ConferenceParticipant(Document): 'remarks': json.dumps(transaction), 'currency': currency, 'selling_price_list': currency, - 'series': series, + 'naming_series': naming_series, 'payment_mode': transaction.service, 'items': [ { diff --git a/foundation/erpnext_foundation/web_form/buy_tickets_inr/buy_tickets_inr.json b/foundation/erpnext_foundation/web_form/buy_tickets_inr/buy_tickets_inr.json index 6b912460..d74fc618 100644 --- a/foundation/erpnext_foundation/web_form/buy_tickets_inr/buy_tickets_inr.json +++ b/foundation/erpnext_foundation/web_form/buy_tickets_inr/buy_tickets_inr.json @@ -9,6 +9,7 @@ "amount": 0.0, "amount_based_on_field": 1, "amount_field": "amount", + "button_label": "Buy", "client_script": "", "creation": "2017-07-06 16:25:22.393979", "currency": "INR", @@ -16,11 +17,11 @@ "docstatus": 0, "doctype": "Web Form", "idx": 0, - "introduction_text": "", + "introduction_text": "
After submitting your proposal, it will be reviewed by the conference team. After the review we will get in touch with you
", "is_standard": 1, "login_required": 0, "max_attachment_size": 0, - "modified": "2019-08-05 16:32:20.478032", + "modified": "2019-08-08 16:27:57.975819", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "buy-tickets-inr", @@ -34,7 +35,7 @@ "show_in_grid": 0, "show_sidebar": 0, "sidebar_items": [], - "success_url": "/conf/2017", + "success_url": "/conf/2019", "title": "Buy Tickets INR", "web_form_fields": [ { diff --git a/foundation/erpnext_foundation/web_form/buy_tickets_paypal/buy_tickets_paypal.json b/foundation/erpnext_foundation/web_form/buy_tickets_paypal/buy_tickets_paypal.json index 9f9aa8e8..23199cca 100644 --- a/foundation/erpnext_foundation/web_form/buy_tickets_paypal/buy_tickets_paypal.json +++ b/foundation/erpnext_foundation/web_form/buy_tickets_paypal/buy_tickets_paypal.json @@ -9,6 +9,7 @@ "amount": 0.0, "amount_based_on_field": 1, "amount_field": "amount", + "button_label": "Buy", "creation": "2017-07-06 16:22:37.464680", "currency": "USD", "doc_type": "Conference Participant", @@ -19,7 +20,7 @@ "is_standard": 1, "login_required": 0, "max_attachment_size": 0, - "modified": "2019-08-06 18:58:48.782274", + "modified": "2019-08-08 16:23:30.523688", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "buy-tickets-paypal", @@ -39,7 +40,7 @@ "title": "My Tickets" } ], - "success_url": "/conf/2017", + "success_url": "/conf/2019", "title": "Buy Tickets Paypal", "web_form_fields": [ { 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 658de1ec..7110ab73 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 @@ -8,16 +8,17 @@ "allow_print": 0, "amount": 0.0, "amount_based_on_field": 0, + "button_label": "Submit Proposal", "creation": "2017-07-06 15:01:50.932057", "doc_type": "Conference Talk Proposal", "docstatus": 0, "doctype": "Web Form", "idx": 0, - "introduction_text": "", + "introduction_text": "
Once you submit your proposal the conference committee will review the proposal and make the selections. We shall get in touch with shortlisted speakers via email.
", "is_standard": 1, "login_required": 0, "max_attachment_size": 0, - "modified": "2019-08-05 13:10:19.956393", + "modified": "2019-08-08 16:27:48.804521", "modified_by": "Administrator", "module": "ERPNext Foundation", "name": "conference-talk-proposal", @@ -31,7 +32,7 @@ "show_sidebar": 0, "sidebar_items": [], "success_message": "Thank you for submitting your proposal.", - "success_url": "/conf/2018", + "success_url": "/conf/2019", "title": "Propose A Talk", "web_form_fields": [ { @@ -66,6 +67,7 @@ "label": "Email", "max_length": 0, "max_value": 0, + "options": "Email", "read_only": 0, "reqd": 1, "show_in_filter": 0