[minor] fixes

erpnext/manufacturing/doctype/production_order/production_order.py

@@ -366,7 +366,8 @@ class ProductionOrder(Document):
 		if frappe.db.get_value("Item", self.production_item, "has_variants"):
 			frappe.throw(_("Production Order cannot be raised against a Item Template"), ItemHasVariantError)
 
-		validate_end_of_life(self.production_item)
+		if self.production_item:
+			validate_end_of_life(self.production_item)
 
 	def validate_qty(self):
 		if not self.qty > 0:

erpnext/public/css/website.css

@@ -2,6 +2,9 @@
   font-size: 18px;
   line-height: 200%;
 }
+.web-page-content {
+  margin-bottom: 30px;
+}
 .item-stock {
   margin-bottom: 10px !important;
 }

erpnext/public/js/shopping_cart.js

@@ -65,7 +65,7 @@ $.extend(shopping_cart, {
 		var cart_count = getCookie("cart_count");
 
 		if(cart_count) {
-			$(".shopping-cart").toggle(true);	
+			$(".shopping-cart").toggleClass('hidden', true);
 		}
 
 		var $cart = $('.cart-icon');

erpnext/public/less/website.less

@@ -8,6 +8,10 @@
 	line-height: 200%;
 }
 
+.web-page-content {
+	margin-bottom: 30px;
+}
+
 .item-stock {
 	margin-bottom: 10px !important;
 }

erpnext/schools/doctype/student_admission/student_admission.json

@@ -189,7 +189,7 @@
    "print_hide_if_no_value": 0,
    "read_only": 0,
    "report_hide": 0,
-   "reqd": 1, 
+   "reqd": 0,
    "search_index": 0,
    "set_only_once": 0,
    "unique": 0
@@ -363,7 +363,7 @@
  "issingle": 0,
  "istable": 0,
  "max_attachments": 0,
- "modified": "2016-10-03 15:08:48.020111", 
+ "modified": "2016-10-04 02:08:06.915441",
  "modified_by": "Administrator",
  "module": "Schools",
  "name": "Student Admission",
@@ -380,6 +380,7 @@
    "export": 1,
    "if_owner": 0,
    "import": 0,
+   "is_custom": 0,
    "permlevel": 0,
    "print": 1,
    "read": 1,

erpnext/setup/doctype/email_digest/templates/default.html

@@ -43,7 +43,8 @@
 
 <!-- issue list -->
 {% if issue_list %}
-<h4 style="{{ section_head }}">{{ _("Open Issues ") }}<span class="badge">({{ issue_count }})</span></h4>
+<h4 style="{{ section_head }}">{{ _("Open Issues ") }}
+	<span class="badge">({{ issue_count }})</span></h4>
 <div>
 {% for t in issue_list %}
     <div style="{{ line_item }}">
@@ -66,7 +67,8 @@
 
 <!-- project list -->
 {% if project_list %}
-<h4 style="{{ section_head }}">{{ _("Open Projects ") }}<span class="badge">({{ project_count }})</span></h4>
+<h4 style="{{ section_head }}">{{ _("Open Projects ") }}
+	<span class="badge">({{ project_count }})</span></h4>
 <div>
 {% for t in project_list %}
     <div style="{{ line_item }}">
@@ -92,7 +94,8 @@
 
 <!-- events -->
 {% if events %}
-<h4 style="{{ section_head }}">{{ _("Upcoming Calendar Events ") }}<span class="badge">({{ event_count }})</span></h4>
+<h4 style="{{ section_head }}">{{ _("Upcoming Calendar Events ") }}
+	<span class="badge">({{ event_count }})</span></h4>
 <div>
 {% for e in events %}
     {% if loop.index==1 or events[loop.index-1].date != e.date %}
@@ -124,7 +127,8 @@
 
 <!-- todo list -->
 {% if todo_list %}
-<h4 style="{{ section_head }}">{{ _("Open To Do ") }}<span class="badge">({{ todo_count }})</span></h4>
+<h4 style="{{ section_head }}">{{ _("Open To Do ") }}
+	<span class="badge">({{ todo_count }})</span></h4>
 <div>
 {% for t in todo_list %}
     <div style="{{ line_item }}">

erpnext/setup/doctype/naming_series/naming_series.py

@@ -25,6 +25,7 @@ class NamingSeries(Document):
 				options = self.get_options(d)
 			except frappe.DoesNotExistError:
 				frappe.msgprint('Unable to find DocType {0}'.format(d))
+				#frappe.pass_does_not_exist_error()
 				continue
 
 			if options:

erpnext/templates/generators/student_admission.html

@@ -19,7 +19,8 @@
 {%- if application_form_route -%}
 <p>
 	<a class='btn btn-primary'
-	href='/{{ doc.application_form_route }}?program={{ doc.program }}&academic_year={{ doc.academic_year }}&new=1'>
+	href='/{{ doc.application_form_route }}?academic_year={{ doc.academic_year }}&new=1
+		{%- if doc.program -%}&program={{ doc.program }}{%- endif -%}'>
 	{{ _("Apply Now") }}</a>
 </p>
 {% endif %}

erpnext/templates/includes/navbar/navbar_items.html

@@ -1,7 +1,7 @@
 {% extends 'frappe/templates/includes/navbar/navbar_items.html' %}
 
 {% block navbar_right_extension %}
-	<li class="shopping-cart">
+	<li class="shopping-cart hidden">
 		<div class="cart-icon small">
 			<a class="dropdown-toggle" href="#" data-toggle="dropdown" id="navLogin">
 				Cart <span class="badge-wrapper" id="cart-count"></span>