diff --git a/erpnext/config/setup.py b/erpnext/config/setup.py index f3c0cecf62..8fce33e790 100644 --- a/erpnext/config/setup.py +++ b/erpnext/config/setup.py @@ -17,7 +17,7 @@ def get_data(): ] }, { - "label": _("Printing and Branding"), + "label": _("Printing"), "icon": "icon-print", "items": [ { diff --git a/erpnext/public/js/utils.js b/erpnext/public/js/utils.js index 5528322b1a..58e512235a 100644 --- a/erpnext/public/js/utils.js +++ b/erpnext/public/js/utils.js @@ -120,7 +120,7 @@ $.extend(erpnext.utils, { render_address_and_contact: function(frm) { // render address $(frm.fields_dict['address_html'].wrapper) - .html(frappe.render(frappe.templates.address_list, + .html(frappe.render_template("address_list", cur_frm.doc.__onload)) .find(".btn-address").on("click", function() { new_doc("Address"); @@ -129,7 +129,7 @@ $.extend(erpnext.utils, { // render contact if(frm.fields_dict['contact_html']) { $(frm.fields_dict['contact_html'].wrapper) - .html(frappe.render(frappe.templates.contact_list, + .html(frappe.render_template("contact_list", cur_frm.doc.__onload)) .find(".btn-contact").on("click", function() { new_doc("Contact"); diff --git a/erpnext/setup/doctype/naming_series/naming_series.py b/erpnext/setup/doctype/naming_series/naming_series.py index 56be00661e..6d1b7e9f2b 100644 --- a/erpnext/setup/doctype/naming_series/naming_series.py +++ b/erpnext/setup/doctype/naming_series/naming_series.py @@ -19,7 +19,6 @@ class NamingSeries(Document): prefixes = "" for d in doctypes: - print d try: options = self.get_options(d) except frappe.DoesNotExistError: