From 4f642e76704d82816f9d3fad33e3154600d84c19 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 13 Nov 2013 16:55:38 +0530 Subject: [PATCH] [cleanup] Fixed title bars, toolbars in all pages, added default background --- accounts/doctype/account/account.js | 6 +++--- accounts/doctype/cost_center/cost_center.js | 2 +- .../doctype/journal_voucher/journal_voucher.js | 4 ++-- .../doctype/purchase_invoice/purchase_invoice.js | 4 ++-- accounts/doctype/sales_invoice/sales_invoice.js | 14 +++++++------- accounts/page/accounts_browser/accounts_browser.js | 4 ++-- .../financial_analytics/financial_analytics.js | 6 ++---- accounts/page/general_ledger/general_ledger.js | 2 +- accounts/page/trial_balance/trial_balance.js | 4 ++-- buying/doctype/purchase_order/purchase_order.js | 6 +++--- .../page/purchase_analytics/purchase_analytics.js | 6 +++--- home/page/activity/activity.js | 5 ++++- hr/doctype/expense_claim/expense_claim.js | 4 ++-- hr/doctype/leave_application/leave_application.js | 3 +-- .../doctype/production_order/production_order.js | 4 ++-- projects/doctype/project/project.js | 2 +- public/js/controllers/stock_controller.js | 4 ++-- public/js/stock_analytics.js | 2 +- selling/doctype/lead/lead.js | 2 +- selling/doctype/opportunity/opportunity.js | 2 +- selling/doctype/quotation/quotation.js | 4 ++-- selling/doctype/sales_order/sales_order.js | 6 +++--- selling/page/sales_analytics/sales_analytics.js | 10 +++++----- selling/page/sales_browser/sales_browser.js | 4 ++-- selling/page/sales_funnel/sales_funnel.js | 2 +- setup/doctype/item_group/item_group.js | 6 +++--- setup/page/setup/setup.js | 4 ++-- stock/doctype/delivery_note/delivery_note.js | 2 +- stock/doctype/item/item.js | 2 +- stock/doctype/material_request/material_request.js | 6 +++--- stock/doctype/purchase_receipt/purchase_receipt.js | 2 +- stock/page/stock_ageing/stock_ageing.js | 6 +++--- stock/page/stock_analytics/stock_analytics.js | 4 ++-- stock/page/stock_balance/stock_balance.js | 6 +++--- stock/page/stock_ledger/stock_ledger.js | 2 +- stock/page/stock_level/stock_level.js | 6 +++--- .../page/support_analytics/support_analytics.js | 6 +++--- 37 files changed, 82 insertions(+), 82 deletions(-) diff --git a/accounts/doctype/account/account.js b/accounts/doctype/account/account.js index 67a46cda157..cb4dd0fd5a4 100644 --- a/accounts/doctype/account/account.js +++ b/accounts/doctype/account/account.js @@ -81,7 +81,7 @@ cur_frm.cscript.account_type = function(doc, cdt, cdn) { // Hide/unhide group or ledger // ----------------------------------------- cur_frm.cscript.add_toolbar_buttons = function(doc) { - cur_frm.add_custom_button(wn._('Chart of Accounts'), + cur_frm.appframe.add_button(wn._('Chart of Accounts'), function() { wn.set_route("Accounts Browser", "Account"); }, 'icon-sitemap') if (cstr(doc.group_or_ledger) == 'Group') { @@ -91,14 +91,14 @@ cur_frm.cscript.add_toolbar_buttons = function(doc) { cur_frm.add_custom_button(wn._('Convert to Group'), function() { cur_frm.cscript.convert_to_group(); }, 'icon-retweet') - cur_frm.add_custom_button(wn._('View Ledger'), function() { + cur_frm.appframe.add_button(wn._('View Ledger'), function() { wn.route_options = { "account": doc.name, "from_date": sys_defaults.year_start_date, "to_date": sys_defaults.year_end_date }; wn.set_route("general-ledger"); - }); + }, "icon-table"); } } // Convert group to ledger diff --git a/accounts/doctype/cost_center/cost_center.js b/accounts/doctype/cost_center/cost_center.js index 9995b6b1b5c..c037b6afc25 100644 --- a/accounts/doctype/cost_center/cost_center.js +++ b/accounts/doctype/cost_center/cost_center.js @@ -50,7 +50,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.toggle_display('sb1', doc.group_or_ledger=='Ledger') cur_frm.set_intro(intro_txt); - cur_frm.add_custom_button(wn._('Chart of Cost Centers'), + cur_frm.appframe.add_button(wn._('Chart of Cost Centers'), function() { wn.set_route("Accounts Browser", "Cost Center"); }, 'icon-sitemap') } diff --git a/accounts/doctype/journal_voucher/journal_voucher.js b/accounts/doctype/journal_voucher/journal_voucher.js index 15fad3f9f3c..f9c552b9ef3 100644 --- a/accounts/doctype/journal_voucher/journal_voucher.js +++ b/accounts/doctype/journal_voucher/journal_voucher.js @@ -115,14 +115,14 @@ cur_frm.cscript.refresh = function(doc) { erpnext.hide_naming_series(); cur_frm.cscript.voucher_type(doc); if(doc.docstatus==1) { - cur_frm.add_custom_button(wn._('View Ledger'), function() { + cur_frm.appframe.add_button(wn._('View Ledger'), function() { wn.route_options = { "voucher_no": doc.name, "from_date": doc.posting_date, "to_date": doc.posting_date, }; wn.set_route("general-ledger"); - }); + }, "icon-table"); } } diff --git a/accounts/doctype/purchase_invoice/purchase_invoice.js b/accounts/doctype/purchase_invoice/purchase_invoice.js index ed75934f143..733b62928ea 100644 --- a/accounts/doctype/purchase_invoice/purchase_invoice.js +++ b/accounts/doctype/purchase_invoice/purchase_invoice.js @@ -30,14 +30,14 @@ erpnext.accounts.PurchaseInvoice = erpnext.buying.BuyingController.extend({ this.frm.add_custom_button(wn._('Make Payment Entry'), this.make_bank_voucher); if(doc.docstatus==1) { - cur_frm.add_custom_button(wn._('View Ledger'), function() { + cur_frm.appframe.add_button(wn._('View Ledger'), function() { wn.route_options = { "voucher_no": doc.name, "from_date": doc.posting_date, "to_date": doc.posting_date, }; wn.set_route("general-ledger"); - }); + }, "icon-table"); } if(doc.docstatus===0) { diff --git a/accounts/doctype/sales_invoice/sales_invoice.js b/accounts/doctype/sales_invoice/sales_invoice.js index 9afa33d3c84..a221638790b 100644 --- a/accounts/doctype/sales_invoice/sales_invoice.js +++ b/accounts/doctype/sales_invoice/sales_invoice.js @@ -49,19 +49,19 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte cur_frm.dashboard.reset(); if(doc.docstatus==1) { - cur_frm.add_custom_button('View Ledger', function() { + cur_frm.appframe.add_button('View Ledger', function() { wn.route_options = { "voucher_no": doc.name, "from_date": doc.posting_date, "to_date": doc.posting_date, }; wn.set_route("general-ledger"); - }); + }, "icon-table"); var percent_paid = cint(flt(doc.grand_total - doc.outstanding_amount) / flt(doc.grand_total) * 100); cur_frm.dashboard.add_progress(percent_paid + "% Paid", percent_paid); - cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript.send_sms); + cur_frm.appframe.add_button(wn._('Send SMS'), cur_frm.cscript.send_sms, 'icon-mobile-phone'); if(cint(doc.update_stock)!=1) { // show Make Delivery Note button only if Sales Invoice is not created from Delivery Note @@ -72,11 +72,11 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte }); if(!from_delivery_note) - cur_frm.add_custom_button(wn._('Make Delivery'), cur_frm.cscript['Make Delivery Note']); + cur_frm.appframe.add_primary_action(wn._('Make Delivery'), cur_frm.cscript['Make Delivery Note']) } if(doc.outstanding_amount!=0) - cur_frm.add_custom_button(wn._('Make Payment Entry'), cur_frm.cscript.make_bank_voucher); + cur_frm.appframe.add_primary_action(wn._('Make Payment Entry'), cur_frm.cscript.make_bank_voucher); } // Show buttons only when pos view is active @@ -87,7 +87,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte }, sales_order_btn: function() { - this.$sales_order_btn = cur_frm.add_custom_button(wn._('From Sales Order'), + this.$sales_order_btn = cur_frm.appframe.add_primary_action(wn._('From Sales Order'), function() { wn.model.map_current_doc({ method: "selling.doctype.sales_order.sales_order.make_sales_invoice", @@ -104,7 +104,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte }, delivery_note_btn: function() { - this.$delivery_note_btn = cur_frm.add_custom_button(wn._('From Delivery Note'), + this.$delivery_note_btn = cur_frm.appframe.add_primary_action(wn._('From Delivery Note'), function() { wn.model.map_current_doc({ method: "stock.doctype.delivery_note.delivery_note.make_sales_invoice", diff --git a/accounts/page/accounts_browser/accounts_browser.js b/accounts/page/accounts_browser/accounts_browser.js index b9767eff9d0..0c9ec88422c 100644 --- a/accounts/page/accounts_browser/accounts_browser.js +++ b/accounts/page/accounts_browser/accounts_browser.js @@ -48,9 +48,9 @@ pscript['onload_Accounts Browser'] = function(wrapper){ 'icon-plus'); } - wrapper.appframe.add_button('Refresh', function() { + wrapper.appframe.set_title_right('Refresh', function() { wrapper.$company_select.change(); - }, 'icon-refresh'); + }); // company-select wrapper.$company_select = wrapper.appframe.add_select("Company", []) diff --git a/accounts/page/financial_analytics/financial_analytics.js b/accounts/page/financial_analytics/financial_analytics.js index ffe29ac1a20..c7fbbc187b4 100644 --- a/accounts/page/financial_analytics/financial_analytics.js +++ b/accounts/page/financial_analytics/financial_analytics.js @@ -10,10 +10,8 @@ wn.pages['financial-analytics'].onload = function(wrapper) { single_column: true }); erpnext.trial_balance = new erpnext.FinancialAnalytics(wrapper, 'Financial Analytics'); - - wrapper.appframe.add_home_breadcrumb() wrapper.appframe.add_module_icon("Accounts") - wrapper.appframe.add_breadcrumb("icon-bar-chart") + } erpnext.FinancialAnalytics = erpnext.AccountTreeGrid.extend({ @@ -39,7 +37,7 @@ erpnext.FinancialAnalytics = erpnext.AccountTreeGrid.extend({ {fieldtype:"Date", label: wn._("To Date")}, {fieldtype:"Select", label: wn._("Range"), options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}, - {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white"}, {fieldtype:"Button", label: wn._("Reset Filters")} ], setup_columns: function() { diff --git a/accounts/page/general_ledger/general_ledger.js b/accounts/page/general_ledger/general_ledger.js index dbc691b549a..33aa93317d6 100644 --- a/accounts/page/general_ledger/general_ledger.js +++ b/accounts/page/general_ledger/general_ledger.js @@ -82,7 +82,7 @@ erpnext.GeneralLedger = wn.views.GridReport.extend({ }}, {fieldtype: "Check", label: wn._("Group by Ledger")}, {fieldtype: "Check", label: wn._("Group by Voucher")}, - {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white"}, {fieldtype:"Button", label: wn._("Reset Filters")} ], setup_filters: function() { diff --git a/accounts/page/trial_balance/trial_balance.js b/accounts/page/trial_balance/trial_balance.js index ec14c51e884..e3d07647a26 100644 --- a/accounts/page/trial_balance/trial_balance.js +++ b/accounts/page/trial_balance/trial_balance.js @@ -45,7 +45,7 @@ wn.pages['trial-balance'].onload = function(wrapper) { }) erpnext.trial_balance = new TrialBalance(wrapper, 'Trial Balance'); - wrapper.appframe.add_home_breadcrumb() + wrapper.appframe.add_module_icon("Accounts") - wrapper.appframe.add_breadcrumb("icon-bar-chart") + } \ No newline at end of file diff --git a/buying/doctype/purchase_order/purchase_order.js b/buying/doctype/purchase_order/purchase_order.js index c1342232bb8..b20f0a82845 100644 --- a/buying/doctype/purchase_order/purchase_order.js +++ b/buying/doctype/purchase_order/purchase_order.js @@ -24,20 +24,20 @@ erpnext.buying.PurchaseOrderController = erpnext.buying.BuyingController.extend( doc.per_billed); - cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript['Send SMS']); + cur_frm.appframe.add_button(wn._('Send SMS'), cur_frm.cscript['Send SMS'], "icon-mobile-phone"); if(flt(doc.per_received, 2) < 100) cur_frm.add_custom_button(wn._('Make Purchase Receipt'), this.make_purchase_receipt); if(flt(doc.per_billed, 2) < 100) cur_frm.add_custom_button(wn._('Make Invoice'), this.make_purchase_invoice); if(flt(doc.per_billed, 2) < 100 || doc.per_received < 100) - cur_frm.add_custom_button(wn._('Stop'), cur_frm.cscript['Stop Purchase Order']); + cur_frm.add_custom_button(wn._('Stop'), cur_frm.cscript['Stop Purchase Order'], "icon-exclamation"); } else if(doc.docstatus===0) { cur_frm.cscript.add_from_mappers(); } if(doc.docstatus == 1 && doc.status == 'Stopped') cur_frm.add_custom_button(wn._('Unstop Purchase Order'), - cur_frm.cscript['Unstop Purchase Order']); + cur_frm.cscript['Unstop Purchase Order'], "icon-check"); }, make_purchase_receipt: function() { diff --git a/buying/page/purchase_analytics/purchase_analytics.js b/buying/page/purchase_analytics/purchase_analytics.js index 6a8fc1ae0f5..e589c04973d 100644 --- a/buying/page/purchase_analytics/purchase_analytics.js +++ b/buying/page/purchase_analytics/purchase_analytics.js @@ -10,9 +10,9 @@ wn.pages['purchase-analytics'].onload = function(wrapper) { new erpnext.PurchaseAnalytics(wrapper); - wrapper.appframe.add_home_breadcrumb() + wrapper.appframe.add_module_icon("Buying") - wrapper.appframe.add_breadcrumb("icon-bar-chart") + } erpnext.PurchaseAnalytics = wn.views.TreeGridReport.extend({ @@ -101,7 +101,7 @@ erpnext.PurchaseAnalytics = wn.views.TreeGridReport.extend({ {fieldtype:"Date", label: wn._("To Date")}, {fieldtype:"Select", label: wn._("Range"), options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}, - {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white"}, {fieldtype:"Button", label: wn._("Reset Filters")} ], setup_filters: function() { diff --git a/home/page/activity/activity.js b/home/page/activity/activity.js index edfe50f363b..ef7ccd9b0e1 100644 --- a/home/page/activity/activity.js +++ b/home/page/activity/activity.js @@ -10,6 +10,7 @@ wn.pages['activity'].onload = function(wrapper) { wrapper.appframe.add_module_icon("Activity"); var list = new wn.ui.Listing({ + hide_refresh: true, appframe: wrapper.appframe, method: 'home.page.activity.activity.get_feed', parent: $(wrapper).find(".layout-main"), @@ -18,10 +19,12 @@ wn.pages['activity'].onload = function(wrapper) { } }); list.run(); + + wrapper.appframe.set_title_right("Refresh", function() { list.run(); }); // Build Report Button if(wn.boot.profile.can_get_report.indexOf("Feed")!=-1) { - wrapper.appframe.add_button(wn._('Build Report'), function() { + wrapper.appframe.add_primary_action(wn._('Build Report'), function() { wn.set_route('Report', "Feed"); }, 'icon-th') } diff --git a/hr/doctype/expense_claim/expense_claim.js b/hr/doctype/expense_claim/expense_claim.js index e19cac77512..26893aff961 100644 --- a/hr/doctype/expense_claim/expense_claim.js +++ b/hr/doctype/expense_claim/expense_claim.js @@ -86,8 +86,8 @@ cur_frm.cscript.refresh = function(doc,cdt,cdn){ cur_frm.toggle_enable("exp_approver", (doc.owner==user && doc.approval_status=="Draft")); cur_frm.toggle_enable("approval_status", (doc.exp_approver==user && doc.docstatus==0)); - if(!doc.__islocal && user!=doc.exp_approver && cur_frm.frm_head.appframe.buttons.Submit) - cur_frm.frm_head.appframe.buttons.Submit.toggle(false); + if(!doc.__islocal && user!=doc.exp_approver) + cur_frm.frm_head.appframe.set_title_right(""); if(doc.docstatus==0 && doc.exp_approver==user && doc.approval_status=="Approved") cur_frm.savesubmit(); diff --git a/hr/doctype/leave_application/leave_application.js b/hr/doctype/leave_application/leave_application.js index 7b32cff6919..066307fd757 100755 --- a/hr/doctype/leave_application/leave_application.js +++ b/hr/doctype/leave_application/leave_application.js @@ -41,8 +41,7 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { cur_frm.set_intro(wn._("This Leave Application is pending approval. Only the Leave Apporver can update status.")) cur_frm.toggle_enable("status", false); if(!doc.__islocal) { - if(cur_frm.frm_head.appframe.buttons.Submit) - cur_frm.frm_head.appframe.buttons.Submit.remove(); + cur_frm.frm_head.appframe.set_title_right(""); } } } else { diff --git a/manufacturing/doctype/production_order/production_order.js b/manufacturing/doctype/production_order/production_order.js index 7c4325dc37d..e8bc68a27dd 100644 --- a/manufacturing/doctype/production_order/production_order.js +++ b/manufacturing/doctype/production_order/production_order.js @@ -27,9 +27,9 @@ cur_frm.cscript.refresh = function(doc, dt, dn) { var cfn_set_fields = function(doc, dt, dn) { if (doc.docstatus == 1) { if (doc.status != 'Stopped' && doc.status != 'Completed') - cur_frm.add_custom_button(wn._('Stop!'), cur_frm.cscript['Stop Production Order']); + cur_frm.add_custom_button(wn._('Stop!'), cur_frm.cscript['Stop Production Order'], "icon-exclamation"); else if (doc.status == 'Stopped') - cur_frm.add_custom_button(wn._('Unstop'), cur_frm.cscript['Unstop Production Order']); + cur_frm.add_custom_button(wn._('Unstop'), cur_frm.cscript['Unstop Production Order'], "icon-check"); if (doc.status == 'Submitted' || doc.status == 'Material Transferred' || doc.status == 'In Process'){ cur_frm.add_custom_button(wn._('Transfer Raw Materials'), cur_frm.cscript['Transfer Raw Materials']); diff --git a/projects/doctype/project/project.js b/projects/doctype/project/project.js index 3dfe8973839..fd1a642dac9 100644 --- a/projects/doctype/project/project.js +++ b/projects/doctype/project/project.js @@ -4,7 +4,7 @@ // show tasks cur_frm.cscript.refresh = function(doc) { if(!doc.__islocal) { - cur_frm.add_custom_button(wn._("Gantt Chart"), function() { + cur_frm.appframe.add_button(wn._("Gantt Chart"), function() { wn.route_options = {"project": doc.name} wn.set_route("Gantt", "Task"); }, "icon-tasks"); diff --git a/public/js/controllers/stock_controller.js b/public/js/controllers/stock_controller.js index 01a73a25f57..feecc7bb0d3 100644 --- a/public/js/controllers/stock_controller.js +++ b/public/js/controllers/stock_controller.js @@ -7,7 +7,7 @@ erpnext.stock.StockController = wn.ui.form.Controller.extend({ show_stock_ledger: function() { var me = this; if(this.frm.doc.docstatus===1) { - this.frm.add_custom_button(wn._("Stock Ledger"), function() { + this.frm.appframe.add_button(wn._("Stock Ledger"), function() { wn.route_options = { voucher_no: me.frm.doc.name, from_date: me.frm.doc.posting_date, @@ -22,7 +22,7 @@ erpnext.stock.StockController = wn.ui.form.Controller.extend({ show_general_ledger: function() { var me = this; if(this.frm.doc.docstatus===1 && cint(wn.defaults.get_default("auto_accounting_for_stock"))) { - cur_frm.add_custom_button(wn._('Accounting Ledger'), function() { + cur_frm.appframe.add_button(wn._('Accounting Ledger'), function() { wn.route_options = { "voucher_no": me.frm.doc.name, "from_date": me.frm.doc.posting_date, diff --git a/public/js/stock_analytics.js b/public/js/stock_analytics.js index 8cb61616360..71ed809108b 100644 --- a/public/js/stock_analytics.js +++ b/public/js/stock_analytics.js @@ -65,7 +65,7 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({ {fieldtype:"Date", label: wn._("To Date")}, {fieldtype:"Select", label: wn._("Range"), options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}, - {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white"}, {fieldtype:"Button", label: wn._("Reset Filters")} ], setup_filters: function() { diff --git a/selling/doctype/lead/lead.js b/selling/doctype/lead/lead.js index d65338fe815..9bc4a2871f6 100644 --- a/selling/doctype/lead/lead.js +++ b/selling/doctype/lead/lead.js @@ -37,7 +37,7 @@ erpnext.LeadController = wn.ui.form.Controller.extend({ if(!this.frm.doc.__islocal && !this.frm.__is_customer) { this.frm.add_custom_button(wn._("Create Customer"), this.create_customer); this.frm.add_custom_button(wn._("Create Opportunity"), this.create_opportunity); - this.frm.add_custom_button(wn._("Send SMS"), this.frm.cscript.send_sms); + this.frm.appframe.add_button(wn._("Send SMS"), this.frm.cscript.send_sms, "icon-mobile-phone"); } cur_frm.communication_view = new wn.views.CommunicationList({ diff --git a/selling/doctype/opportunity/opportunity.js b/selling/doctype/opportunity/opportunity.js index 75fde277ec7..2b8d0b74ca6 100644 --- a/selling/doctype/opportunity/opportunity.js +++ b/selling/doctype/opportunity/opportunity.js @@ -108,7 +108,7 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn){ if(doc.status!=="Quotation") { cur_frm.add_custom_button(wn._('Opportunity Lost'), cur_frm.cscript['Declare Opportunity Lost']); } - cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript.send_sms); + cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript.send_sms, "icon-mobile-phone"); } cur_frm.toggle_display("contact_info", doc.customer || doc.lead); diff --git a/selling/doctype/quotation/quotation.js b/selling/doctype/quotation/quotation.js index f890b28d760..d4613d02a68 100644 --- a/selling/doctype/quotation/quotation.js +++ b/selling/doctype/quotation/quotation.js @@ -30,9 +30,9 @@ erpnext.selling.QuotationController = erpnext.selling.SellingController.extend({ cur_frm.cscript['Make Sales Order']); if(doc.status!=="Ordered") { cur_frm.add_custom_button(wn._('Set as Lost'), - cur_frm.cscript['Declare Order Lost']); + cur_frm.cscript['Declare Order Lost'], "icon-exclamation"); } - cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript.send_sms); + cur_frm.appframe.add_button(wn._('Send SMS'), cur_frm.cscript.send_sms, "icon-mobile-phone"); } if (this.frm.doc.docstatus===0) { diff --git a/selling/doctype/sales_order/sales_order.js b/selling/doctype/sales_order/sales_order.js index 4033870775a..ea9d39f6528 100644 --- a/selling/doctype/sales_order/sales_order.js +++ b/selling/doctype/sales_order/sales_order.js @@ -27,7 +27,7 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( cur_frm.dashboard.add_progress(cint(doc.per_billed) + wn._("% Billed"), doc.per_billed); - cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript.send_sms); + cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript.send_sms, "icon-mobile-phone"); // delivery note if(flt(doc.per_delivered, 2) < 100 && doc.order_type=='Sales') cur_frm.add_custom_button(wn._('Make Delivery'), this.make_delivery_note); @@ -50,11 +50,11 @@ erpnext.selling.SalesOrderController = erpnext.selling.SellingController.extend( // stop if(flt(doc.per_delivered, 2) < 100 || doc.per_billed < 100) - cur_frm.add_custom_button(wn._('Stop!'), cur_frm.cscript['Stop Sales Order']); + cur_frm.add_custom_button(wn._('Stop!'), cur_frm.cscript['Stop Sales Order'],"icon-exclamation"); } else { // un-stop cur_frm.dashboard.set_headline_alert(wn._("Stopped"), "alert-danger", "icon-stop"); - cur_frm.add_custom_button(wn._('Unstop'), cur_frm.cscript['Unstop Sales Order']); + cur_frm.add_custom_button(wn._('Unstop'), cur_frm.cscript['Unstop Sales Order'], "icon-check"); } } diff --git a/selling/page/sales_analytics/sales_analytics.js b/selling/page/sales_analytics/sales_analytics.js index f75e0e36d8a..42980bc6d5e 100644 --- a/selling/page/sales_analytics/sales_analytics.js +++ b/selling/page/sales_analytics/sales_analytics.js @@ -9,9 +9,9 @@ wn.pages['sales-analytics'].onload = function(wrapper) { }); new erpnext.SalesAnalytics(wrapper); - wrapper.appframe.add_home_breadcrumb() + wrapper.appframe.add_module_icon("Selling") - wrapper.appframe.add_breadcrumb("icon-bar-chart") + } erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({ @@ -88,7 +88,7 @@ erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({ this.columns = std_columns.concat(this.columns); }, filters: [ - {fieldtype:"Select", fieldname: "treetype", label: wn._("Tree Type"), options:["Customer Group", "Customer", + {fieldtype:"Select", fieldname: "tree_type", label: wn._("Tree Type"), options:["Customer Group", "Customer", "Item Group", "Item", "Territory"], filter: function(val, item, opts, me) { return me.apply_zero_filter(val, item, opts, me); @@ -103,8 +103,8 @@ erpnext.SalesAnalytics = wn.views.TreeGridReport.extend({ {fieldtype:"Date", fieldname: "to_date", label: wn._("To Date")}, {fieldtype:"Select", fieldname: "range", label: wn._("Range"), options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}, - {fieldtype:"Button", fieldname: "refresh", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, - {fieldtype:"Button", fieldname: "reset_filters", label: wn._("Reset Filters")} + {fieldtype:"Button", fieldname: "refresh", label: wn._("Refresh"), icon:"icon-refresh"}, + {fieldtype:"Button", fieldname: "reset_filters", label: wn._("Reset Filters"), icon:"icon-filter"} ], setup_filters: function() { var me = this; diff --git a/selling/page/sales_browser/sales_browser.js b/selling/page/sales_browser/sales_browser.js index 470fb688699..bfaa6abf082 100644 --- a/selling/page/sales_browser/sales_browser.js +++ b/selling/page/sales_browser/sales_browser.js @@ -8,9 +8,9 @@ pscript['onload_Sales Browser'] = function(wrapper){ wrapper.appframe.add_module_icon("Selling") - wrapper.appframe.add_button('Refresh', function() { + wrapper.appframe.set_title_right('Refresh', function() { wrapper.make_tree(); - }, 'icon-refresh'); + }); $(wrapper) diff --git a/selling/page/sales_funnel/sales_funnel.js b/selling/page/sales_funnel/sales_funnel.js index 5ad61f7ad4b..4178ccfe2f4 100644 --- a/selling/page/sales_funnel/sales_funnel.js +++ b/selling/page/sales_funnel/sales_funnel.js @@ -32,7 +32,7 @@ erpnext.SalesFunnel = Class.extend({ layout: $(wrapper).find(".layout-main"), from_date: wrapper.appframe.add_date("From Date"), to_date: wrapper.appframe.add_date("To Date"), - refresh_btn: wrapper.appframe.add_button("Refresh", + refresh_btn: wrapper.appframe.set_title_right("Refresh", function() { me.get_data(); }, "icon-refresh"), }; diff --git a/setup/doctype/item_group/item_group.js b/setup/doctype/item_group/item_group.js index 6dbb0d273bf..b0171f34442 100644 --- a/setup/doctype/item_group/item_group.js +++ b/setup/doctype/item_group/item_group.js @@ -4,12 +4,12 @@ cur_frm.cscript.refresh = function(doc, cdt, cdn) { cur_frm.cscript.set_root_readonly(doc); - cur_frm.add_custom_button(wn._("Item Group Tree"), function() { + cur_frm.appframe.add_button(wn._("Item Group Tree"), function() { wn.set_route("Sales Browser", "Item Group"); - }) + }, "icon-sitemap") if(!doc.__islocal && doc.show_in_website) { - cur_frm.add_custom_button("View In Website", function() { + cur_frm.appframe.add_button("View In Website", function() { window.open(doc.page_name); }, "icon-globe"); } diff --git a/setup/page/setup/setup.js b/setup/page/setup/setup.js index ed55eb5ca95..c636d8e4788 100644 --- a/setup/page/setup/setup.js +++ b/setup/page/setup/setup.js @@ -10,9 +10,9 @@ wn.pages['Setup'].onload = function(wrapper) { }); wrapper.appframe.add_module_icon("Setup"); - wrapper.appframe.add_button(wn._("Refresh"), function() { + wrapper.appframe.set_title_right(wn._("Refresh"), function() { wn.pages.Setup.make(wrapper); - }, "icon-refresh"); + }); wn.pages.Setup.make(wrapper); diff --git a/stock/doctype/delivery_note/delivery_note.js b/stock/doctype/delivery_note/delivery_note.js index 210b3926fca..f627eba2b9c 100644 --- a/stock/doctype/delivery_note/delivery_note.js +++ b/stock/doctype/delivery_note/delivery_note.js @@ -33,7 +33,7 @@ erpnext.stock.DeliveryNoteController = erpnext.selling.SellingController.extend( cur_frm.add_custom_button(wn._('Make Installation Note'), this.make_installation_note); if (doc.docstatus==1) { - cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript.send_sms); + cur_frm.appframe.add_button(wn._('Send SMS'), cur_frm.cscript.send_sms, "icon-mobile-phone"); this.show_stock_ledger(); this.show_general_ledger(); } diff --git a/stock/doctype/item/item.js b/stock/doctype/item/item.js index d8ee45f42f4..18b88b5c4d8 100644 --- a/stock/doctype/item/item.js +++ b/stock/doctype/item/item.js @@ -9,7 +9,7 @@ cur_frm.cscript.refresh = function(doc) { erpnext.hide_naming_series(); if(!doc.__islocal && doc.show_in_website) { - cur_frm.add_custom_button("View In Website", function() { + cur_frm.appframe.add_button("View In Website", function() { window.open(doc.page_name); }, "icon-globe"); } diff --git a/stock/doctype/material_request/material_request.js b/stock/doctype/material_request/material_request.js index 9fc852f87b8..0dc927816b3 100644 --- a/stock/doctype/material_request/material_request.js +++ b/stock/doctype/material_request/material_request.js @@ -39,9 +39,9 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten this.make_purchase_order); cur_frm.add_custom_button(wn._('Stop Material Request'), - cur_frm.cscript['Stop Material Request']); + cur_frm.cscript['Stop Material Request'], "icon-exclamation"); } - cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript.send_sms); + cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript.send_sms, "icon-mobile-phone"); } @@ -63,7 +63,7 @@ erpnext.buying.MaterialRequestController = erpnext.buying.BuyingController.exten if(doc.docstatus == 1 && doc.status == 'Stopped') cur_frm.add_custom_button(wn._('Unstop Material Request'), - cur_frm.cscript['Unstop Material Request']); + cur_frm.cscript['Unstop Material Request'], "icon-check"); }, diff --git a/stock/doctype/purchase_receipt/purchase_receipt.js b/stock/doctype/purchase_receipt/purchase_receipt.js index 8006d56c7e6..f51da81ff9d 100644 --- a/stock/doctype/purchase_receipt/purchase_receipt.js +++ b/stock/doctype/purchase_receipt/purchase_receipt.js @@ -20,7 +20,7 @@ erpnext.stock.PurchaseReceiptController = erpnext.buying.BuyingController.extend cur_frm.add_custom_button(wn._('Make Purchase Invoice'), this.make_purchase_invoice); } - cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript['Send SMS']); + cur_frm.add_custom_button(wn._('Send SMS'), cur_frm.cscript['Send SMS'], "icon-mobile-phone"); this.show_stock_ledger(); this.show_general_ledger(); diff --git a/stock/page/stock_ageing/stock_ageing.js b/stock/page/stock_ageing/stock_ageing.js index 914999b2052..afd936397d7 100644 --- a/stock/page/stock_ageing/stock_ageing.js +++ b/stock/page/stock_ageing/stock_ageing.js @@ -11,9 +11,9 @@ wn.pages['stock-ageing'].onload = function(wrapper) { new erpnext.StockAgeing(wrapper); - wrapper.appframe.add_home_breadcrumb() + wrapper.appframe.add_module_icon("Stock") - wrapper.appframe.add_breadcrumb("icon-bar-chart") + } wn.require("app/js/stock_grid_report.js"); @@ -59,7 +59,7 @@ erpnext.StockAgeing = erpnext.StockGridReport.extend({ {fieldtype:"Select", label: wn._("Plot By"), options: ["Average Age", "Earliest", "Latest"]}, {fieldtype:"Date", label: wn._("To Date")}, - {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white"}, {fieldtype:"Button", label: wn._("Reset Filters")} ], setup_filters: function() { diff --git a/stock/page/stock_analytics/stock_analytics.js b/stock/page/stock_analytics/stock_analytics.js index d5aa219cde7..cecd39d4553 100644 --- a/stock/page/stock_analytics/stock_analytics.js +++ b/stock/page/stock_analytics/stock_analytics.js @@ -11,9 +11,9 @@ wn.pages['stock-analytics'].onload = function(wrapper) { new erpnext.StockAnalytics(wrapper); - wrapper.appframe.add_home_breadcrumb() + wrapper.appframe.add_module_icon("Stock") - wrapper.appframe.add_breadcrumb("icon-bar-chart") + } wn.require("app/js/stock_analytics.js"); \ No newline at end of file diff --git a/stock/page/stock_balance/stock_balance.js b/stock/page/stock_balance/stock_balance.js index c6b9fda1183..caa0c9e58b3 100644 --- a/stock/page/stock_balance/stock_balance.js +++ b/stock/page/stock_balance/stock_balance.js @@ -12,9 +12,9 @@ wn.pages['stock-balance'].onload = function(wrapper) { new erpnext.StockBalance(wrapper); - wrapper.appframe.add_home_breadcrumb() + wrapper.appframe.add_module_icon("Stock") - wrapper.appframe.add_breadcrumb("icon-bar-chart") + } erpnext.StockBalance = erpnext.StockAnalytics.extend({ @@ -70,7 +70,7 @@ erpnext.StockBalance = erpnext.StockAnalytics.extend({ {fieldtype:"Date", label: wn._("From Date")}, {fieldtype:"Label", label: wn._("To")}, {fieldtype:"Date", label: wn._("To Date")}, - {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white"}, {fieldtype:"Button", label: wn._("Reset Filters")} ], diff --git a/stock/page/stock_ledger/stock_ledger.js b/stock/page/stock_ledger/stock_ledger.js index 66071401868..5770d1d7751 100644 --- a/stock/page/stock_ledger/stock_ledger.js +++ b/stock/page/stock_ledger/stock_ledger.js @@ -84,7 +84,7 @@ erpnext.StockLedger = erpnext.StockGridReport.extend({ {fieldtype:"Date", label: wn._("To Date"), filter: function(val, item) { return dateutil.str_to_obj(val) >= dateutil.str_to_obj(item.posting_date); }}, - {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white"}, {fieldtype:"Button", label: wn._("Reset Filters")} ], diff --git a/stock/page/stock_level/stock_level.js b/stock/page/stock_level/stock_level.js index a6cc6a8209d..1aa3a4702c3 100644 --- a/stock/page/stock_level/stock_level.js +++ b/stock/page/stock_level/stock_level.js @@ -10,9 +10,9 @@ wn.pages['stock-level'].onload = function(wrapper) { new erpnext.StockLevel(wrapper); - wrapper.appframe.add_home_breadcrumb() + wrapper.appframe.add_module_icon("Stock") - wrapper.appframe.add_breadcrumb("icon-bar-chart"); + ; } wn.require("app/js/stock_grid_report.js"); @@ -99,7 +99,7 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({ default_value: "Select Brand...", filter: function(val, item, opts) { return val == opts.default_value || item.brand == val; }}, - {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white"}, {fieldtype:"Button", label: wn._("Reset Filters")} ], diff --git a/support/page/support_analytics/support_analytics.js b/support/page/support_analytics/support_analytics.js index ecc07496241..c437b76157b 100644 --- a/support/page/support_analytics/support_analytics.js +++ b/support/page/support_analytics/support_analytics.js @@ -10,9 +10,9 @@ wn.pages['support-analytics'].onload = function(wrapper) { new erpnext.SupportAnalytics(wrapper); - wrapper.appframe.add_home_breadcrumb() + wrapper.appframe.add_module_icon("Support") - wrapper.appframe.add_breadcrumb("icon-bar-chart") + } erpnext.SupportAnalytics = wn.views.GridReportWithPlot.extend({ @@ -34,7 +34,7 @@ erpnext.SupportAnalytics = wn.views.GridReportWithPlot.extend({ {fieldtype:"Date", label: wn._("To Date")}, {fieldtype:"Select", label: wn._("Range"), options:["Daily", "Weekly", "Monthly", "Quarterly", "Yearly"]}, - {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white", cssClass:"btn-info"}, + {fieldtype:"Button", label: wn._("Refresh"), icon:"icon-refresh icon-white"}, {fieldtype:"Button", label: wn._("Reset Filters")} ],