Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ui] minor fixes

Browse Source
This commit is contained in:
Rushabh Mehta 2014-12-30 18:09:40 +05:30
parent a5b149c061
commit afbfdcf552
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/config/setup.py
View File

@ -17,7 +17,7 @@ def get_data():
] ]
}, },
{ {
"label": _("Printing and Branding"), "label": _("Printing"),
"icon": "icon-print", "icon": "icon-print",
"items": [ "items": [
{ {

4
erpnext/public/js/utils.js
View File

@ -120,7 +120,7 @@ $.extend(erpnext.utils, {
render_address_and_contact: function(frm) { render_address_and_contact: function(frm) {
// render address // render address
$(frm.fields_dict['address_html'].wrapper) $(frm.fields_dict['address_html'].wrapper)
.html(frappe.render(frappe.templates.address_list, .html(frappe.render_template("address_list",
cur_frm.doc.__onload)) cur_frm.doc.__onload))
.find(".btn-address").on("click", function() { .find(".btn-address").on("click", function() {
new_doc("Address"); new_doc("Address");
@ -129,7 +129,7 @@ $.extend(erpnext.utils, {
// render contact // render contact
if(frm.fields_dict['contact_html']) { if(frm.fields_dict['contact_html']) {
$(frm.fields_dict['contact_html'].wrapper) $(frm.fields_dict['contact_html'].wrapper)
.html(frappe.render(frappe.templates.contact_list, .html(frappe.render_template("contact_list",
cur_frm.doc.__onload)) cur_frm.doc.__onload))
.find(".btn-contact").on("click", function() { .find(".btn-contact").on("click", function() {
new_doc("Contact"); new_doc("Contact");

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

@ -19,7 +19,6 @@ class NamingSeries(Document):
prefixes = "" prefixes = ""
for d in doctypes: for d in doctypes:
print d
try: try:
options = self.get_options(d) options = self.get_options(d)
except frappe.DoesNotExistError: except frappe.DoesNotExistError: