Merge pull request #5428 from ShashaQin/patch-21
Update fiscal_year.py
diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
index 45c918c..cc6d1e6 100644
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js
@@ -51,7 +51,7 @@
this.make_sales_return, __("Make"));
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
}
-
+
if(cint(doc.update_stock)!=1) {
// show Make Delivery Note button only if Sales Invoice is not created from Delivery Note
var from_delivery_note = false;
@@ -61,7 +61,7 @@
});
if(!from_delivery_note && !is_delivered_by_supplier) {
- cur_frm.add_custom_button(__('Delivery'), cur_frm.cscript['Make Delivery Note'],
+ cur_frm.add_custom_button(__('Delivery'), cur_frm.cscript['Make Delivery Note'],
__("Make"));
}
}
@@ -221,7 +221,7 @@
frm: cur_frm
})
},
-
+
asset: function(frm, cdt, cdn) {
var row = locals[cdt][cdn];
if(row.asset) {
@@ -390,7 +390,7 @@
if(cur_frm.doc.is_pos) {
cur_frm.msgbox = frappe.msgprint(format('<a class="btn btn-primary" \
onclick="cur_frm.print_preview.printit(true)" style="margin-right: 5px;">{0}</a>\
- <a class="btn btn-default" href="javascript:new_doc(cur_frm.doctype);">{1}</a>', [
+ <a class="btn btn-default" href="javascript:frappe.new_doc(cur_frm.doctype);">{1}</a>', [
__('Print'), __('New')
]));
diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js
index d502a3d..c55b999 100644
--- a/erpnext/buying/doctype/supplier/supplier.js
+++ b/erpnext/buying/doctype/supplier/supplier.js
@@ -27,22 +27,6 @@
frm.events.add_custom_buttons(frm);
},
- add_custom_buttons: function(frm) {
- // ["Supplier Quotation", "Purchase Order", "Purchase Receipt", "Purchase Invoice"].forEach(function(doctype, i) {
- // if(frappe.model.can_read(doctype)) {
- // frm.add_custom_button(__(doctype), function() {
- // frappe.route_options = {"supplier": frm.doc.name};
- // frappe.set_route("List", doctype);
- // }, __("View"));
- // }
- // if(frappe.model.can_create(doctype)) {
- // frm.add_custom_button(__(doctype), function() {
- // frappe.route_options = {"supplier": frm.doc.name};
- // new_doc(doctype);
- // }, __("Make"));
- // }
- // });
- },
});
cur_frm.fields_dict['default_price_list'].get_query = function(doc, cdt, cdn) {
diff --git a/erpnext/crm/doctype/newsletter_list/newsletter_list.js b/erpnext/crm/doctype/newsletter_list/newsletter_list.js
index d6cda45..7799627 100644
--- a/erpnext/crm/doctype/newsletter_list/newsletter_list.js
+++ b/erpnext/crm/doctype/newsletter_list/newsletter_list.js
@@ -39,7 +39,7 @@
frm.add_custom_button(__("New Newsletter"), function() {
frappe.route_options = {"newsletter_list": frm.doc.name};
- new_doc("Newsletter");
+ frappe.new_doc("Newsletter");
}, __("Action"));
}
diff --git a/erpnext/hr/doctype/designation/designation.js b/erpnext/hr/doctype/designation/designation.js
new file mode 100644
index 0000000..952c73f
--- /dev/null
+++ b/erpnext/hr/doctype/designation/designation.js
@@ -0,0 +1,8 @@
+// Copyright (c) 2016, Frappe Technologies Pvt. Ltd. and contributors
+// For license information, please see license.txt
+
+frappe.ui.form.on('Designation', {
+ refresh: function(frm) {
+
+ }
+});
diff --git a/erpnext/hr/doctype/designation/designation.json b/erpnext/hr/doctype/designation/designation.json
index 1a1cc32..73f4446 100644
--- a/erpnext/hr/doctype/designation/designation.json
+++ b/erpnext/hr/doctype/designation/designation.json
@@ -3,6 +3,7 @@
"allow_import": 1,
"allow_rename": 1,
"autoname": "field:designation_name",
+ "beta": 0,
"creation": "2013-01-10 16:34:13",
"custom": 0,
"docstatus": 0,
@@ -17,6 +18,7 @@
"fieldtype": "Data",
"hidden": 0,
"ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
"in_filter": 0,
"in_list_view": 1,
"label": "Designation",
@@ -26,12 +28,38 @@
"oldfieldtype": "Data",
"permlevel": 0,
"print_hide": 0,
+ "print_hide_if_no_value": 0,
"read_only": 0,
"report_hide": 0,
"reqd": 1,
"search_index": 0,
"set_only_once": 0,
"unique": 0
+ },
+ {
+ "allow_on_submit": 0,
+ "bold": 0,
+ "collapsible": 0,
+ "fieldname": "description",
+ "fieldtype": "Text",
+ "hidden": 0,
+ "ignore_user_permissions": 0,
+ "ignore_xss_filter": 0,
+ "in_filter": 0,
+ "in_list_view": 0,
+ "label": "Description",
+ "length": 0,
+ "no_copy": 0,
+ "permlevel": 0,
+ "precision": "",
+ "print_hide": 0,
+ "print_hide_if_no_value": 0,
+ "read_only": 0,
+ "report_hide": 0,
+ "reqd": 0,
+ "search_index": 0,
+ "set_only_once": 0,
+ "unique": 0
}
],
"hide_heading": 0,
@@ -44,7 +72,7 @@
"issingle": 0,
"istable": 0,
"max_attachments": 0,
- "modified": "2015-11-16 06:29:45.227540",
+ "modified": "2016-06-01 12:52:03.787578",
"modified_by": "Administrator",
"module": "HR",
"name": "Designation",
@@ -71,6 +99,9 @@
"write": 1
}
],
+ "quick_entry": 1,
"read_only": 0,
- "read_only_onload": 0
+ "read_only_onload": 0,
+ "sort_order": "ASC",
+ "track_seen": 0
}
\ No newline at end of file
diff --git a/erpnext/hr/doctype/job_applicant/job_applicant.js b/erpnext/hr/doctype/job_applicant/job_applicant.js
index eac1a9a..6541a8c 100644
--- a/erpnext/hr/doctype/job_applicant/job_applicant.js
+++ b/erpnext/hr/doctype/job_applicant/job_applicant.js
@@ -20,11 +20,11 @@
"applicant_name": frm.doc.applicant_name,
"designation": frm.doc.job_opening,
};
- new_doc("Offer Letter");
+ frappe.new_doc("Offer Letter");
}, __("Make"));
cur_frm.page.set_inner_btn_group_as_primary(__("Make"));
}
}
-
+
}
});
\ No newline at end of file
diff --git a/erpnext/patches/v7_0/update_home_page.py b/erpnext/patches/v7_0/update_home_page.py
index f646405..604d7d4 100644
--- a/erpnext/patches/v7_0/update_home_page.py
+++ b/erpnext/patches/v7_0/update_home_page.py
@@ -12,7 +12,10 @@
if header and header.startswith("<div class='hero text-center'>"):
homepage = frappe.get_doc('Homepage', 'Homepage')
homepage.company = erpnext.get_default_company()
- homepage.tag_line = header.split('<h1>')[1].split('</h1>')[0] or 'Default Website'
+ if '<h1>' in header:
+ homepage.tag_line = header.split('<h1>')[1].split('</h1>')[0] or 'Default Website'
+ else:
+ homepage.tag_line = 'Default Website'
homepage.setup_items()
homepage.save()
diff --git a/erpnext/projects/doctype/project/project.js b/erpnext/projects/doctype/project/project.js
index 4835287..7b340d2 100644
--- a/erpnext/projects/doctype/project/project.js
+++ b/erpnext/projects/doctype/project/project.js
@@ -2,6 +2,15 @@
// License: GNU General Public License v3. See license.txt
frappe.ui.form.on("Project", {
+ setup: function(frm) {
+ frm.get_field('tasks').grid.editable_fields = [
+ {fieldname: 'title', columns: 4},
+ {fieldname: 'status', columns: 3},
+ {fieldname: 'start_date', columns: 2},
+ {fieldname: 'end_date', columns: 2}
+ ];
+
+ },
onload: function(frm) {
var so = frappe.meta.get_docfield("Project", "sales_order");
so.get_route_options_for_new_doc = function(field) {
diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js
index 8bca282..ea28fd5 100644
--- a/erpnext/public/js/utils.js
+++ b/erpnext/public/js/utils.js
@@ -93,7 +93,7 @@
.html(frappe.render_template("address_list",
cur_frm.doc.__onload))
.find(".btn-address").on("click", function() {
- new_doc("Address");
+ frappe.new_doc("Address");
});
// render contact
@@ -102,7 +102,7 @@
.html(frappe.render_template("contact_list",
cur_frm.doc.__onload))
.find(".btn-contact").on("click", function() {
- new_doc("Contact");
+ frappe.new_doc("Contact");
}
);
}
diff --git a/erpnext/selling/doctype/customer/customer.js b/erpnext/selling/doctype/customer/customer.js
index 87d028f..2680470 100644
--- a/erpnext/selling/doctype/customer/customer.js
+++ b/erpnext/selling/doctype/customer/customer.js
@@ -30,22 +30,6 @@
frm.events.add_custom_buttons(frm);
},
- add_custom_buttons: function(frm) {
- // ["Opportunity", "Quotation", "Sales Order", "Delivery Note", "Sales Invoice"].forEach(function(doctype, i) {
- // if(frappe.model.can_read(doctype)) {
- // frm.add_custom_button(__(doctype), function() {
- // frappe.route_options = {"customer": frm.doc.name};
- // frappe.set_route("List", doctype);
- // }, __("View"));
- // }
- // if(frappe.model.can_create(doctype)) {
- // frm.add_custom_button(__(doctype), function() {
- // frappe.route_options = {"customer": frm.doc.name};
- // new_doc(doctype);
- // }, __("Make"));
- // }
- // });
- },
validate: function(frm) {
if(frm.doc.lead_name) frappe.model.clear_doc("Lead", frm.doc.lead_name);
}