nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-26 00:14:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

[minor] fixes

Browse Source
This commit is contained in:
Rushabh Mehta
2016-10-04 11:40:22 +05:30
parent 7fb79d175f
commit aedad64445
9 changed files with 408 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
erpnext/manufacturing/doctype/production_order/production_order.py
View File

@@ -115,7 +115,7 @@ class ProductionOrder(Document):
'''Update status of production order if unknown''' '''Update status of production order if unknown'''
if not status: if not status:
status = self.get_status(status) status = self.get_status(status)
if status != self.status: if status != self.status:
self.db_set("status", status) self.db_set("status", status)
@@ -240,7 +240,7 @@ class ProductionOrder(Document):
holidays[holiday_list] = holiday_list_days holidays[holiday_list] = holiday_list_days
return holidays[holiday_list] return holidays[holiday_list]
def make_time_logs(self, open_new=False): def make_time_logs(self, open_new=False):
"""Capacity Planning. Plan time logs based on earliest availablity of workstation after """Capacity Planning. Plan time logs based on earliest availablity of workstation after
Planned Start Date. Time logs will be created and remain in Draft mode and must be submitted Planned Start Date. Time logs will be created and remain in Draft mode and must be submitted
@@ -261,7 +261,7 @@ class ProductionOrder(Document):
if d.workstation and d.status != 'Completed': if d.workstation and d.status != 'Completed':
last_workstation_idx[d.workstation] = i # set last row index of workstation last_workstation_idx[d.workstation] = i # set last row index of workstation
self.set_start_end_time_for_workstation(d, workstation_list, last_workstation_idx.get(d.workstation)) self.set_start_end_time_for_workstation(d, workstation_list, last_workstation_idx.get(d.workstation))
args = self.get_operations_data(d) args = self.get_operations_data(d)
add_timesheet_detail(timesheet, args) add_timesheet_detail(timesheet, args)
original_start_time = d.planned_start_time original_start_time = d.planned_start_time
@@ -366,7 +366,8 @@ class ProductionOrder(Document):
if frappe.db.get_value("Item", self.production_item, "has_variants"): if frappe.db.get_value("Item", self.production_item, "has_variants"):
frappe.throw(_("Production Order cannot be raised against a Item Template"), ItemHasVariantError) 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): def validate_qty(self):
if not self.qty > 0: if not self.qty > 0:
@@ -520,7 +521,7 @@ def make_timesheet(production_order):
timesheet.production_order = production_order timesheet.production_order = production_order
return timesheet return timesheet
@frappe.whitelist() @frappe.whitelist()
def add_timesheet_detail(timesheet, args): def add_timesheet_detail(timesheet, args):
if isinstance(timesheet, unicode): if isinstance(timesheet, unicode):
timesheet = frappe.get_doc('Timesheet', timesheet) timesheet = frappe.get_doc('Timesheet', timesheet)

3
erpnext/public/css/website.css
View File

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

32
erpnext/public/js/shopping_cart.js
View File

@@ -10,7 +10,7 @@ frappe.ready(function() {
$('.navbar li[data-label="User"] a') $('.navbar li[data-label="User"] a')
.html('<i class="icon-fixed-width icon-user"></i> ' + full_name); .html('<i class="icon-fixed-width icon-user"></i> ' + full_name);
} }
// update login // update login
shopping_cart.show_shoppingcart_dropdown(); shopping_cart.show_shoppingcart_dropdown();
shopping_cart.set_cart_count(); shopping_cart.set_cart_count();
@@ -32,7 +32,7 @@ $.extend(shopping_cart, {
} }
}); });
}, },
update_cart: function(opts) { update_cart: function(opts) {
if(!full_name || full_name==="Guest") { if(!full_name || full_name==="Guest") {
if(localStorage) { if(localStorage) {
@@ -50,10 +50,10 @@ $.extend(shopping_cart, {
}, },
btn: opts.btn, btn: opts.btn,
callback: function(r) { callback: function(r) {
shopping_cart.set_cart_count(); shopping_cart.set_cart_count();
if (r.message.shopping_cart_menu) { if (r.message.shopping_cart_menu) {
$('.shopping-cart-menu').html(r.message.shopping_cart_menu); $('.shopping-cart-menu').html(r.message.shopping_cart_menu);
} }
if(opts.callback) if(opts.callback)
opts.callback(r); opts.callback(r);
} }
@@ -63,11 +63,11 @@ $.extend(shopping_cart, {
set_cart_count: function() { set_cart_count: function() {
var cart_count = getCookie("cart_count"); var cart_count = getCookie("cart_count");
if(cart_count) { if(cart_count) {
$(".shopping-cart").toggle(true); $(".shopping-cart").toggleClass('hidden', true);
} }
var $cart = $('.cart-icon'); var $cart = $('.cart-icon');
var $badge = $cart.find("#cart-count"); var $badge = $cart.find("#cart-count");
@@ -88,7 +88,7 @@ $.extend(shopping_cart, {
$badge.remove(); $badge.remove();
} }
}, },
shopping_cart_update: function(item_code, newVal, cart_dropdown) { shopping_cart_update: function(item_code, newVal, cart_dropdown) {
frappe.freeze(); frappe.freeze();
shopping_cart.update_cart({ shopping_cart.update_cart({
@@ -103,20 +103,20 @@ $.extend(shopping_cart, {
$(".cart-tax-items").html(r.message.taxes); $(".cart-tax-items").html(r.message.taxes);
if (cart_dropdown != true) { if (cart_dropdown != true) {
$(".cart-icon").hide(); $(".cart-icon").hide();
} }
} }
}, },
}); });
}, },
bind_dropdown_cart_buttons: function() { bind_dropdown_cart_buttons: function() {
$(".cart-icon").on('click', '.number-spinner button', function () { $(".cart-icon").on('click', '.number-spinner button', function () {
var btn = $(this), var btn = $(this),
input = btn.closest('.number-spinner').find('input'), input = btn.closest('.number-spinner').find('input'),
oldValue = input.val().trim(), oldValue = input.val().trim(),
newVal = 0; newVal = 0;
if (btn.attr('data-dir') == 'up') { if (btn.attr('data-dir') == 'up') {
newVal = parseInt(oldValue) + 1; newVal = parseInt(oldValue) + 1;
} else { } else {
@@ -125,11 +125,11 @@ $.extend(shopping_cart, {
} }
} }
input.val(newVal); input.val(newVal);
var item_code = input.attr("data-item-code"); var item_code = input.attr("data-item-code");
shopping_cart.shopping_cart_update(item_code, newVal, true); shopping_cart.shopping_cart_update(item_code, newVal, true);
return false; return false;
}); });
}, },
}); });

4
erpnext/public/less/website.less
View File

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

733
erpnext/schools/doctype/student_admission/student_admission.json
View File

@@ -1,401 +1,402 @@
{ {
"allow_copy": 0, "allow_copy": 0,
"allow_import": 0, "allow_import": 0,
"allow_rename": 0, "allow_rename": 0,
"autoname": "field:route", "autoname": "field:route",
"beta": 0, "beta": 0,
"creation": "2016-09-13 03:05:27.154713", "creation": "2016-09-13 03:05:27.154713",
"custom": 0, "custom": 0,
"docstatus": 0, "docstatus": 0,
"doctype": "DocType", "doctype": "DocType",
"document_type": "Document", "document_type": "Document",
"editable_grid": 1, "editable_grid": 1,
"fields": [ "fields": [
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "academic_year", "fieldname": "academic_year",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 1, "in_list_view": 1,
"label": "Academic Year", "label": "Academic Year",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Academic Year", "options": "Academic Year",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 1, "reqd": 1,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "admission_start_date", "fieldname": "admission_start_date",
"fieldtype": "Date", "fieldtype": "Date",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Admission Start Date", "label": "Admission Start Date",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "admission_end_date", "fieldname": "admission_end_date",
"fieldtype": "Date", "fieldtype": "Date",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Admission End Date", "label": "Admission End Date",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "title", "fieldname": "title",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Title", "label": "Title",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "publish", "fieldname": "publish",
"fieldtype": "Check", "fieldtype": "Check",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Publish on website", "label": "Publish on website",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "column_break_3", "fieldname": "column_break_3",
"fieldtype": "Column Break", "fieldtype": "Column Break",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "program", "fieldname": "program",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Program", "label": "Program",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Program", "options": "Program",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 1, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "application_fee", "fieldname": "application_fee",
"fieldtype": "Currency", "fieldtype": "Currency",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Application Fee", "label": "Application Fee",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "currency", "options": "currency",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "currency", "fieldname": "currency",
"fieldtype": "Link", "fieldtype": "Link",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Currency", "label": "Currency",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"options": "Currency", "options": "Currency",
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"depends_on": "", "depends_on": "",
"fieldname": "route", "fieldname": "route",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Route", "label": "Route",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 1, "reqd": 1,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 1 "unique": 1
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "application_form_route", "fieldname": "application_form_route",
"fieldtype": "Data", "fieldtype": "Data",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Application Form Route", "label": "Application Form Route",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "section_break_5", "fieldname": "section_break_5",
"fieldtype": "Section Break", "fieldtype": "Section Break",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
}, },
{ {
"allow_on_submit": 0, "allow_on_submit": 0,
"bold": 0, "bold": 0,
"collapsible": 0, "collapsible": 0,
"columns": 0, "columns": 0,
"fieldname": "introduction", "fieldname": "introduction",
"fieldtype": "Text Editor", "fieldtype": "Text Editor",
"hidden": 0, "hidden": 0,
"ignore_user_permissions": 0, "ignore_user_permissions": 0,
"ignore_xss_filter": 0, "ignore_xss_filter": 0,
"in_filter": 0, "in_filter": 0,
"in_list_view": 0, "in_list_view": 0,
"label": "Introduction", "label": "Introduction",
"length": 0, "length": 0,
"no_copy": 0, "no_copy": 0,
"permlevel": 0, "permlevel": 0,
"precision": "", "precision": "",
"print_hide": 0, "print_hide": 0,
"print_hide_if_no_value": 0, "print_hide_if_no_value": 0,
"read_only": 0, "read_only": 0,
"report_hide": 0, "report_hide": 0,
"reqd": 0, "reqd": 0,
"search_index": 0, "search_index": 0,
"set_only_once": 0, "set_only_once": 0,
"unique": 0 "unique": 0
} }
], ],
"hide_heading": 0, "hide_heading": 0,
"hide_toolbar": 0, "hide_toolbar": 0,
"idx": 0, "idx": 0,
"image_view": 0, "image_view": 0,
"in_create": 0, "in_create": 0,
"in_dialog": 0, "in_dialog": 0,
"is_submittable": 0, "is_submittable": 0,
"issingle": 0, "issingle": 0,
"istable": 0, "istable": 0,
"max_attachments": 0, "max_attachments": 0,
"modified": "2016-10-03 15:08:48.020111", "modified": "2016-10-04 02:08:06.915441",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Schools", "module": "Schools",
"name": "Student Admission", "name": "Student Admission",
"name_case": "", "name_case": "",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"amend": 0, "amend": 0,
"apply_user_permissions": 0, "apply_user_permissions": 0,
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 1,
"email": 1, "email": 1,
"export": 1, "export": 1,
"if_owner": 0, "if_owner": 0,
"import": 0, "import": 0,
"permlevel": 0, "is_custom": 0,
"print": 1, "permlevel": 0,
"read": 1, "print": 1,
"report": 1, "read": 1,
"role": "Academics User", "report": 1,
"set_user_permissions": 0, "role": "Academics User",
"share": 1, "set_user_permissions": 0,
"submit": 0, "share": 1,
"submit": 0,
"write": 1 "write": 1
} }
], ],
"quick_entry": 1, "quick_entry": 1,
"read_only": 0, "read_only": 0,
"read_only_onload": 0, "read_only_onload": 0,
"sort_field": "modified", "sort_field": "modified",
"sort_order": "DESC", "sort_order": "DESC",
"title_field": "title", "title_field": "title",
"track_seen": 0 "track_seen": 0
} }

12
erpnext/setup/doctype/email_digest/templates/default.html
View File

@@ -43,7 +43,8 @@
<!-- issue list --> <!-- issue list -->
{% if 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> <div>
{% for t in issue_list %} {% for t in issue_list %}
<div style="{{ line_item }}"> <div style="{{ line_item }}">
@@ -66,7 +67,8 @@
<!-- project list --> <!-- project list -->
{% if 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> <div>
{% for t in project_list %} {% for t in project_list %}
<div style="{{ line_item }}"> <div style="{{ line_item }}">
@@ -92,7 +94,8 @@
<!-- events --> <!-- events -->
{% if 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> <div>
{% for e in events %} {% for e in events %}
{% if loop.index==1 or events[loop.index-1].date != e.date %} {% if loop.index==1 or events[loop.index-1].date != e.date %}
@@ -124,7 +127,8 @@
<!-- todo list --> <!-- todo list -->
{% if 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> <div>
{% for t in todo_list %} {% for t in todo_list %}
<div style="{{ line_item }}"> <div style="{{ line_item }}">

1
erpnext/setup/doctype/naming_series/naming_series.py
View File

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

3
erpnext/templates/generators/student_admission.html
View File

@@ -19,7 +19,8 @@
{%- if application_form_route -%} {%- if application_form_route -%}
<p> <p>
<a class='btn btn-primary' <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> {{ _("Apply Now") }}</a>
</p> </p>
{% endif %} {% endif %}

2
erpnext/templates/includes/navbar/navbar_items.html
View File

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