From aa60fd9037c385a4787884c2697e40e1f69c6451 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 1 Jun 2016 11:46:33 +0530 Subject: [PATCH] [fix] new_doc to frappe.new_doc --- .../doctype/sales_invoice/sales_invoice.js | 8 ++++---- erpnext/buying/doctype/supplier/supplier.js | 16 ---------------- .../doctype/newsletter_list/newsletter_list.js | 2 +- .../hr/doctype/job_applicant/job_applicant.js | 4 ++-- erpnext/public/js/utils.js | 4 ++-- erpnext/selling/doctype/customer/customer.js | 16 ---------------- 6 files changed, 9 insertions(+), 41 deletions(-) diff --git a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js index 45c918ca8c8..cc6d1e66479 100644 --- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.js +++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.js @@ -51,7 +51,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte 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 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte }); 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 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte frm: cur_frm }) }, - + asset: function(frm, cdt, cdn) { var row = locals[cdt][cdn]; if(row.asset) { @@ -390,7 +390,7 @@ cur_frm.cscript.on_submit = function(doc, cdt, cdn) { if(cur_frm.doc.is_pos) { cur_frm.msgbox = frappe.msgprint(format('{0}\ - {1}', [ + {1}', [ __('Print'), __('New') ])); diff --git a/erpnext/buying/doctype/supplier/supplier.js b/erpnext/buying/doctype/supplier/supplier.js index d502a3d8568..c55b999d6a6 100644 --- a/erpnext/buying/doctype/supplier/supplier.js +++ b/erpnext/buying/doctype/supplier/supplier.js @@ -27,22 +27,6 @@ frappe.ui.form.on("Supplier", { 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 d6cda45a0aa..7799627ffd6 100644 --- a/erpnext/crm/doctype/newsletter_list/newsletter_list.js +++ b/erpnext/crm/doctype/newsletter_list/newsletter_list.js @@ -39,7 +39,7 @@ frappe.ui.form.on("Newsletter List", "refresh", function(frm) { 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/job_applicant/job_applicant.js b/erpnext/hr/doctype/job_applicant/job_applicant.js index eac1a9add1b..6541a8ceb9b 100644 --- a/erpnext/hr/doctype/job_applicant/job_applicant.js +++ b/erpnext/hr/doctype/job_applicant/job_applicant.js @@ -20,11 +20,11 @@ frappe.ui.form.on("Job Applicant", { "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/public/js/utils.js b/erpnext/public/js/utils.js index 8bca282a2f8..ea28fd5fa86 100644 --- a/erpnext/public/js/utils.js +++ b/erpnext/public/js/utils.js @@ -93,7 +93,7 @@ $.extend(erpnext.utils, { .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 @@ $.extend(erpnext.utils, { .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 87d028f2e1f..26804703cba 100644 --- a/erpnext/selling/doctype/customer/customer.js +++ b/erpnext/selling/doctype/customer/customer.js @@ -30,22 +30,6 @@ frappe.ui.form.on("Customer", { 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); }