update(conference agenda)

foundation/erpnext_foundation/doctype/bounty/bounty.json

@@ -1,5 +1,6 @@
 {
  "allow_copy": 0,
+ "allow_events_in_timeline": 0,
  "allow_guest_to_view": 1,
  "allow_import": 0,
  "allow_rename": 0,
@@ -15,6 +16,7 @@
  "fields": [
   {
    "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
    "allow_on_submit": 0,
    "bold": 1,
    "collapsible": 0,
@@ -41,10 +43,12 @@
    "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
    "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -71,10 +75,12 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
    "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -101,10 +107,12 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
    "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -130,10 +138,12 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
    "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -160,10 +170,12 @@
    "reqd": 1,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
    "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -190,10 +202,12 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
    "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -220,10 +234,12 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
    "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -249,10 +265,12 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
    "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -279,10 +297,12 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
    "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -309,10 +329,12 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
    "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -340,10 +362,12 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   },
   {
    "allow_bulk_edit": 0,
+   "allow_in_quick_entry": 0,
    "allow_on_submit": 0,
    "bold": 0,
    "collapsible": 0,
@@ -370,10 +394,11 @@
    "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
+   "translatable": 0,
    "unique": 0
   }
  ],
- "has_web_view": 1, 
+ "has_web_view": 0,
  "hide_heading": 0,
  "hide_toolbar": 0,
  "idx": 0,
@@ -384,8 +409,8 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2017-08-23 17:58:31.810230", 
+ "modified": "2018-10-18 15:31:38.915991",
- "modified_by": "faris@erpnext.com", 
+ "modified_by": "Administrator",
  "module": "ERPNext Foundation",
  "name": "Bounty",
  "name_case": "",
@@ -393,7 +418,6 @@
  "permissions": [
   {
    "amend": 0,
-   "apply_user_permissions": 0, 
    "cancel": 0,
    "create": 1,
    "delete": 1,
@@ -421,5 +445,6 @@
  "sort_order": "DESC",
  "title_field": "feature_name",
  "track_changes": 1,
- "track_seen": 0
+ "track_seen": 0,
+ "track_views": 0
 }

foundation/erpnext_foundation/doctype/bounty/bounty.py

@@ -4,12 +4,12 @@
 
 from __future__ import unicode_literals
 import frappe
-from frappe.website.website_generator import WebsiteGenerator
+from frappe.model.document import Document
 from frappe.website.utils import get_comment_list
 from frappe.utils import date_diff, nowdate, fmt_money, add_months
 from frappe.website.utils import get_comment_list
 
-class Bounty(WebsiteGenerator):
+class Bounty(Document):
 	def get_context(self, context):
 		paid_backers = get_paid_backers(self.bounty_backer)
 		no_of_backers = len(paid_backers)

foundation/www/conf/2017/agenda.html

@@ -1,6 +1,7 @@
 {% extends "templates/web.html" %}
 
 {% block page_content %}
+<div class='container'>
 <style>
 	section {
 		max-width: 600px;
@@ -38,5 +39,5 @@
 {% endfor %}
 </div>
 <p class=text-center><a href="/conf/2017/register" class='btn btn-primary'>Register Now</a></p>
-
+</div>
 {% endblock %}

foundation/www/conf/2017/index.html

@@ -5,6 +5,7 @@
 
 {% block page_content %}
 
+<div class=container>
 <section class='section-padding text-center'>
 	<div class='text-center'>
 		<img src='/assets/foundation/img/conf/mumbai.png' style='width: 300px; margin-bottom: 50px;'>
@@ -80,5 +81,6 @@
 	</p>
 	<p class=text-center><a href="/conf/2017/agenda">See the full agenda.</a>
 </section>
+</div>
 {% endblock %}
 

foundation/www/conf/2018/index.html

@@ -7,7 +7,7 @@
 {% set platinum_sponsors = [
 	{
 		'image': '/assets/foundation/img/conf/sponsors/mnt-logo.png',
-		'title': 'MN Technique (Platinum)',
+		'title': 'MN Technique (Platinum!)',
 		'website_url': 'https://www.mntechnique.com'
 	},
 	{
@@ -16,9 +16,9 @@
 		'website_url': 'https://eso-electronic.com'
 	},
 	{
-		'image': '/assets/foundation/img/people/tux.png',
+		'image': '/assets/foundation/img/conf/sponsors/indictrans.png',
-		'title': 'Your Company',
+		'title': 'New Indictrans (Silver)',
-		'website_url': 'https://erpnext.org'
+		'website_url': 'https://indictranstech.com'
 	},
 ] %}
 
@@ -55,28 +55,93 @@
 <section class='top-section after-splash'>
 	<div class='container'>
 		<h1>ERPNext Conference 2018</h1>
-		<p class='lead'>October 26 & 27, Mumbai</p>
+		<p class='lead'>October 24 - 27, Mumbai</p>
 		<p><a href='/buy-tickets-inr' class='btn btn-dark mt-4'>Buy Tickets Now (INR)</a> <a href='/buy-tickets-paypal' class='btn btn-dark mt-4'>Buy Tickets Now (USD)</a></p>
+			<p>Please buy ahead of time. On the spot tickets will be priced 20% higher.</p>
 	</div>
 </section>
-<section class='section-padding section-bg text-center'>
+<section class='section-padding text-center section-bg'>
 	<div class='container'>
-		<h3>Propose a Talk</h3>
+		<h3>Days 1 & 2: Contribution Sprint</h3>
-		<p class='lead'>Talk about your experience in the using or developing for ERPNext. These talks are live streamed and watched by thousands online.</p>
+		<p>In Assocation with</p>
-		<a href='https://discuss.erpnext.com/t/conference-2018-propose-a-talk/38312' class='btn btn-dark btn-sm mt-4' target='_blank'>Propose A Talk</a>
+		<div style='max-width: 500px; margin: auto'>
+			<h5>KJ Somaiya College of Engineering</h5>
+			<div>
+				Dates: 24th and 25th of October<br>
+			</div>
+			<hr>
+			<div class='text-left'>
+			<h5>For Developers</h5>
+			<ul>
+				<li>Bug quashing sprint: Try and fix all issues tagged as “bug” on GitHub Issues.</li>
+				<li>Build a feature: Scratch your own itch by contributing a feature you really want in the product.</li>
+				<li>Test Coverage Sprint: Add test coverage, refactor tests where missing.</li>
+				<li>Documentation Sprint: Add missing developer documentation.</li>
+			</ul>
+			<h5>For Non Developers</h5>
+			<ul>
+				<li>Issue Cleanup Sprint: Review and respond to un-replied issues. Review all old issues and either tag them or close them if they are not relevant.</li>
+				<li>Documentation Sprint: Writing missing documentation for ERPNext modules or features.</li>
+				<li>Article Writing Sprint: Write general purpose articles on ERP systems, benefits, challenges, implementation strategies that can be published on ERPNext.org</li>
+			</ul>
+
+<hr>
+
+<ul>
+	<li>Venue: K.J. Somaiya College of Engineering (5th Floor), Vidyavihar<br>
+	<li>Event starts at 9.30am</li>
+	<li>Lunch at KJ Somaiya Canteen, included in the cost</li>
+	<li>Group Dinner (optional, will be decided on the spot)</li>
+</ul>
+			</div>
+		</div>
 	</div>
 </section>
 <section class='section-padding text-center'>
 	<div class='container'>
-		<h3>Developer + Documentation Sprint</h3>
+		<h3>Day 3 & 4: Unconference</h3>
-		<p>In Assocation with</p>
+		<p class='lead'>The conference will be planned as an unconference and will be streamed live!</p>
-		<div class='text-left' style='max-width: 400px; margin: auto'>
+		<h5 class='mt-4'>26th and 27th October, 2018</h5>
-			<h5>KJ Somaiya College of Engineering</h5>
+		<div>Mysore Association Auditorium,<br>
-			Dates: 24th and 25th of October<br>
+			King's Circle, Matunga, Mumbai - 400019,<br>
-			Venue: K.J. Somaiya College of Engineering (5th Floor)<br>
+		</div>
-			Time: 10am-6pm
+
+<div class='text-left'  style='max-width: 500px; margin: auto'>
+
+<hr>
+
+<h4>Day 3: Sessions on 26th October</h4>
+<h5>1. Upcoming Contributions</h5>
+<p>What are the list of planned contributions? Sneak preview / demo of features being developed by various teams in the community. What are best practices while preparing and planning for a contribution?</p>
+
+<h5>2. Implementation Stories, Challenges and Best Practices</h5>
+<p>What did ERPNext benefit the organization? What are some nice hacks that worked well for a company? What are the challenges in implementing ERPNext? How to manage organization change? How to handle migration? How to handle integrations?</p>
+
+<h5>3. Service Provider Stories, Challenges and Best Practices</h5>
+<p>How to make money from ERPNext? How do we balance the needs of service providers against end users? How did successful service providers make money? What are plans of service providers? How does competition affect the service providers? What are challenges faced by service providers?</p>
+
+<hr>
+
+<h4>Day 4: Sessions on 27th October</h4>
+
+<h5>1. Contribution and Volunteering</h5>
+<p>What are the things people can contribute with? What are the challenges faced by contributors? Who are the best contributors? How do contributors benefit? How can people volunteer for non technical activities? How do we improve the co-ordination between the volunteers? What has been the story so far?</p>
+
+<h5>2. Vision of ERPNext</h5>
+<p>What should be the long term vision of ERPNext? Should it focus on being the best product for the end user, or the service provider? What should or should not be a part of ERPNext? What are the next big things users will want, AI? How roles do all of us have to play in this vision?</p>
+
+<h5>3. Role of the ERPNext Foundation</h5>
+<p>What are the goals of the foundation? What should be the role of the foundation? Should foundation do more events, services, features? Should the foundation hire more developers? How should the foundation be governed?</p>
+
+<hr>
+
+<ul>
+	<li>Venue: Mysore Association Auditorium, King's Circle, Matunga</li>
+	<li>Breakfast starts at 8.30am</li>
+	<li>Lunch break will be at 1pm</li>
+	<li>Dinner starts at 6.30am at Matunga Gujarati Seva Mandal</li>
+</ul>
 </div>
-		<a href='https://discuss.erpnext.com/t/conf-18-developer-documentation-sprint-on-24th-and-25th-oct/39443' class='btn btn-dark btn-sm mt-4' target='_blank'>Add your Name</a>
 	</div>
 </section>
 <section class='section-padding section-bg text-center'>
@@ -104,21 +169,12 @@
 <section class='section-padding'>
 	<div class='container'>
 		<div class='text-center'>
-			<h3>Dates and Venue</h3>
+			<h3>Buy Tickets</h3>
-			<p class='lead mb-5'>The ERPNext Conference will be held at the same venue as the previous four editions, in Mumbai.</p>
+			<p><a href='/buy-tickets-inr' class='btn btn-dark mt-4'>Buy Tickets Now (INR)</a> <a href='/buy-tickets-paypal' class='btn btn-dark mt-4'>Buy Tickets Now (USD)</a></p>
-		</div>
-		<div class='card w-400'>
-			<div class='card-body'>
-				<h5>26th and 27th October, 2018</h5>
-				<div>Mysore Association Auditorium,<br>
-					King's Circle, Matunga,<br>
-					Mumbai - 400019,<br>
-					India
-				</div>
-			</div>
 			</div>
 		<div class='text-center mt-5'>
-			For any queries, <a href='mailto:foundation@erpnext.org'>please email us</a> or call us at +91-80-339-23819.
+			<p>Please buy ahead of time. On the spot tickets will be priced 20% higher.</p>
+			<p>For any queries, <a href='mailto:foundation@erpnext.org'>please email us</a> or call us at +91-80-339-23819.</p>
 		</div>
 	</div>
 </section>

foundation/www/esoc/index.html

@@ -6,8 +6,12 @@
 
 <section class='section-padding text-center border-top-light'>
 	<div class="container-wrapper">
-		<h1 class="header-1">ERPNext Summer of Code</h1>
+		<h1 class="header-1">ERPNext Summer of Code (2018)</h1>
-		<p class='intro text-light'>
+	<p class='alert alert-warning mt-4'>
+		ERPNext Summer of Code 2018 is now complete! Catch us again in 2019.
+	</p>
+
+		<p class='intro'>
 				ERPNext Summer of Code is an initiative by the ERPNext Foundation, in similar lines to Google Summer of Code (GSoC) to help bring more young and budding developers into the world of Open Source Software development.
 				Students will spend 3 months of their summer time working with ERPNext and contributing to open source development, all while earning a stipend!
 				ERPNext is the world’s top fully open source ERP system made by Frappe Technologies and backed by the ERPNext Foundation.

foundation/www/members/setup_payment.html

@@ -3,6 +3,7 @@
 {% block title %}Setup Payment Method{% endblock %}
 
 {% block page_content %}
+
 <section>
 	<input type="radio" name="gender" value="USD" checked> USD <br>
 	<input type="radio" name="gender" value="INR" style="margin-top: 15px;"> INR <br>

foundation/www/service-providers.html

@@ -37,6 +37,9 @@
 		<p class='lead'>
 			ERPNext Members are both Service Providers and End Users. Check out their website if you are looking for help in your region.
 		</p>
+	<p class='alert alert-info mt-4'>
+		Please independently verify the quality of partners you select. If you need developer help, usually the ones that contribute the most are the best.
+	</p>
 	</div>
 </section>
 <section class="section-padding section-bg">