nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-06 21:59:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

[design] form toolbar

Browse Source
This commit is contained in:
Rushabh Mehta
2014-12-23 17:56:47 +05:30
committed by Anand Doshi
parent 6f7cba8d73
commit 4096a3ab2b
13 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/accounts/doctype/sales_invoice/sales_invoice.js
View File

@@ -73,12 +73,12 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
}); });
if(!from_delivery_note) { if(!from_delivery_note) {
cur_frm.appframe.add_primary_action(__('Make Delivery'), cur_frm.cscript['Make Delivery Note'], "icon-truck") cur_frm.page.add_menu_item(__('Make Delivery'), cur_frm.cscript['Make Delivery Note'], "icon-truck")
} }
} }
if(doc.outstanding_amount!=0) { if(doc.outstanding_amount!=0) {
cur_frm.appframe.add_primary_action(__('Make Payment Entry'), cur_frm.cscript.make_bank_voucher, "icon-money"); cur_frm.page.add_menu_item(__('Make Payment Entry'), cur_frm.cscript.make_bank_voucher, "icon-money");
} }
} }
@@ -90,7 +90,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
}, },
sales_order_btn: function() { sales_order_btn: function() {
this.$sales_order_btn = cur_frm.appframe.add_primary_action(__('From Sales Order'), this.$sales_order_btn = cur_frm.page.add_menu_item(__('From Sales Order'),
function() { function() {
frappe.model.map_current_doc({ frappe.model.map_current_doc({
method: "erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice", method: "erpnext.selling.doctype.sales_order.sales_order.make_sales_invoice",
@@ -107,7 +107,7 @@ erpnext.accounts.SalesInvoiceController = erpnext.selling.SellingController.exte
}, },
delivery_note_btn: function() { delivery_note_btn: function() {
this.$delivery_note_btn = cur_frm.appframe.add_primary_action(__('From Delivery Note'), this.$delivery_note_btn = cur_frm.page.add_menu_item(__('From Delivery Note'),
function() { function() {
frappe.model.map_current_doc({ frappe.model.map_current_doc({
method: "erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice", method: "erpnext.stock.doctype.delivery_note.delivery_note.make_sales_invoice",

10
erpnext/accounts/page/accounts_browser/accounts_browser.js
View File

@@ -41,16 +41,16 @@ pscript['onload_Accounts Browser'] = function(wrapper){
'<p>'+__('Please setup your chart of accounts before you start Accounting Entries')+'</p></div>').appendTo(main); '<p>'+__('Please setup your chart of accounts before you start Accounting Entries')+'</p></div>').appendTo(main);
if (frappe.boot.user.can_create.indexOf("Company") !== -1) { if (frappe.boot.user.can_create.indexOf("Company") !== -1) {
wrapper.appframe.add_button(__('New Company'), function() { newdoc('Company'); }, wrapper.page.add_button(__('New Company'), function() { newdoc('Company'); },
'icon-plus'); 'icon-plus');
} }
wrapper.appframe.set_title_right(__('Refresh'), function() { wrapper.page.set_primary_action(__('Refresh'), function() {
wrapper.$company_select.change(); wrapper.$company_select.change();
}); });
// company-select // company-select
wrapper.$company_select = wrapper.appframe.add_select("Company", []) wrapper.$company_select = wrapper.page.add_select("Company", [])
.change(function() { .change(function() {
var ctype = frappe.get_route()[1] || 'Account'; var ctype = frappe.get_route()[1] || 'Account';
erpnext.account_chart = new erpnext.AccountsChart(ctype, $(this).val(), erpnext.account_chart = new erpnext.AccountsChart(ctype, $(this).val(),
@@ -73,9 +73,9 @@ pscript['onload_Accounts Browser'] = function(wrapper){
pscript.set_title = function(wrapper, ctype, val) { pscript.set_title = function(wrapper, ctype, val) {
if(val) { if(val) {
wrapper.appframe.set_title('Chart of '+ctype+'s' + " - " + cstr(val)); wrapper.page.set_title('Chart of '+ctype+'s' + " - " + cstr(val));
} else { } else {
wrapper.appframe.set_title('Chart of '+ctype+'s'); wrapper.page.set_title('Chart of '+ctype+'s');
} }
} }

2
erpnext/buying/page/purchase_analytics/purchase_analytics.js
View File

@@ -21,7 +21,7 @@ erpnext.PurchaseAnalytics = frappe.views.TreeGridReport.extend({
title: __("Purchase Analytics"), title: __("Purchase Analytics"),
page: wrapper, page: wrapper,
parent: $(wrapper).find('.layout-main'), parent: $(wrapper).find('.layout-main'),
appframe: wrapper.appframe, page: wrapper.page,
doctypes: ["Item", "Item Group", "Supplier", "Supplier Type", "Company", "Fiscal Year", doctypes: ["Item", "Item Group", "Supplier", "Supplier Type", "Company", "Fiscal Year",
"Purchase Invoice", "Purchase Invoice Item", "Purchase Invoice", "Purchase Invoice Item",
"Purchase Order", "Purchase Order Item[Purchase Analytics]", "Purchase Order", "Purchase Order Item[Purchase Analytics]",

2
erpnext/projects/doctype/time_log/time_log_list.js
View File

@@ -6,7 +6,7 @@ frappe.listview_settings['Time Log'] = {
add_fields: ["status", "billable", "activity_type", "task", "project", "hours", "time_log_for"], add_fields: ["status", "billable", "activity_type", "task", "project", "hours", "time_log_for"],
selectable: true, selectable: true,
onload: function(me) { onload: function(me) {
me.appframe.add_primary_action(__("Make Time Log Batch"), function() { me.page.add_menu_item(__("Make Time Log Batch"), function() {
var selected = me.get_checked_items() || []; var selected = me.get_checked_items() || [];
if(!selected.length) { if(!selected.length) {

2
erpnext/public/js/account_tree_grid.js
View File

@@ -20,7 +20,7 @@ erpnext.AccountTreeGrid = frappe.views.TreeGridReport.extend({
title: title, title: title,
page: wrapper, page: wrapper,
parent: $(wrapper).find('.layout-main'), parent: $(wrapper).find('.layout-main'),
appframe: wrapper.appframe, page: wrapper.page,
doctypes: ["Company", "Fiscal Year", "Account", "GL Entry", "Cost Center"], doctypes: ["Company", "Fiscal Year", "Account", "GL Entry", "Cost Center"],
tree_grid: { tree_grid: {
show: true, show: true,

2
erpnext/public/js/stock_analytics.js
View File

@@ -9,7 +9,7 @@ erpnext.StockAnalytics = erpnext.StockGridReport.extend({
title: __("Stock Analytics"), title: __("Stock Analytics"),
page: wrapper, page: wrapper,
parent: $(wrapper).find('.layout-main'), parent: $(wrapper).find('.layout-main'),
appframe: wrapper.appframe, page: wrapper.page,
doctypes: ["Item", "Item Group", "Warehouse", "Stock Ledger Entry", "Brand", doctypes: ["Item", "Item Group", "Warehouse", "Stock Ledger Entry", "Brand",
"Fiscal Year", "Serial No"], "Fiscal Year", "Serial No"],
tree_grid: { tree_grid: {

8
erpnext/public/js/transaction.js
View File

@@ -82,9 +82,9 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
this.$pos_btn && this.$pos_btn.remove(); this.$pos_btn && this.$pos_btn.remove();
this.$pos_btn = this.frm.appframe.add_primary_action(btn_label, function() { this.$pos_btn = this.frm.page.add_menu_item(btn_label, function() {
me.toggle_pos(); me.toggle_pos();
}, icon, "btn-default"); });
} else { } else {
// hack: will avoid calling refresh from refresh // hack: will avoid calling refresh from refresh
setTimeout(function() { me.toggle_pos(false); }, 100); setTimeout(function() { me.toggle_pos(false); }, 100);
@@ -105,12 +105,12 @@ erpnext.TransactionController = erpnext.stock.StockController.extend({
// make pos // make pos
if(!this.frm.pos) { if(!this.frm.pos) {
var wrapper = this.frm.appframe.add_view("pos", "<div>"); var wrapper = this.frm.page.add_view("pos", "<div>");
this.frm.pos = new erpnext.POS(wrapper, this.frm); this.frm.pos = new erpnext.POS(wrapper, this.frm);
} }
// toggle view // toggle view
this.frm.appframe.set_view(this.pos_active ? "main" : "pos"); this.frm.page.set_view(this.pos_active ? "main" : "pos");
this.pos_active = !this.pos_active; this.pos_active = !this.pos_active;
// refresh // refresh

2
erpnext/selling/page/sales_analytics/sales_analytics.js
View File

@@ -20,7 +20,7 @@ erpnext.SalesAnalytics = frappe.views.TreeGridReport.extend({
title: __("Sales Analytics"), title: __("Sales Analytics"),
page: wrapper, page: wrapper,
parent: $(wrapper).find('.layout-main'), parent: $(wrapper).find('.layout-main'),
appframe: wrapper.appframe, page: wrapper.page,
doctypes: ["Item", "Item Group", "Customer", "Customer Group", "Company", "Territory", doctypes: ["Item", "Item Group", "Customer", "Customer Group", "Company", "Territory",
"Fiscal Year", "Sales Invoice", "Sales Invoice Item", "Fiscal Year", "Sales Invoice", "Sales Invoice Item",
"Sales Order", "Sales Order Item[Sales Analytics]", "Sales Order", "Sales Order Item[Sales Analytics]",

4
erpnext/selling/page/sales_browser/sales_browser.js
View File

@@ -8,7 +8,7 @@ pscript['onload_Sales Browser'] = function(wrapper){
frappe.add_breadcrumbs("Selling") frappe.add_breadcrumbs("Selling")
wrapper.appframe.set_title_right(__('Refresh'), function() { wrapper.page.set_primary_action(__('Refresh'), function() {
wrapper.make_tree(); wrapper.make_tree();
}); });
@@ -44,7 +44,7 @@ pscript['onshow_Sales Browser'] = function(wrapper){
// set route // set route
var ctype = frappe.get_route()[1] || 'Territory'; var ctype = frappe.get_route()[1] || 'Territory';
wrapper.appframe.set_title(__('{0} Tree',[__(ctype)])); wrapper.page.set_title(__('{0} Tree',[__(ctype)]));
if(erpnext.sales_chart && erpnext.sales_chart.ctype != ctype) { if(erpnext.sales_chart && erpnext.sales_chart.ctype != ctype) {
wrapper.make_tree(); wrapper.make_tree();

6
erpnext/selling/page/sales_funnel/sales_funnel.js
View File

@@ -28,9 +28,9 @@ erpnext.SalesFunnel = Class.extend({
this.elements = { this.elements = {
layout: $(wrapper).find(".layout-main"), layout: $(wrapper).find(".layout-main"),
from_date: wrapper.appframe.add_date(__("From Date")), from_date: wrapper.page.add_date(__("From Date")),
to_date: wrapper.appframe.add_date(__("To Date")), to_date: wrapper.page.add_date(__("To Date")),
refresh_btn: wrapper.appframe.set_title_right(__("Refresh"), refresh_btn: wrapper.page.set_primary_action(__("Refresh"),
function() { me.get_data(); }, "icon-refresh"), function() { me.get_data(); }, "icon-refresh"),
}; };

2
erpnext/stock/page/stock_ledger/stock_ledger.js
View File

@@ -20,7 +20,7 @@ erpnext.StockLedger = erpnext.StockGridReport.extend({
title: __("Stock Ledger"), title: __("Stock Ledger"),
page: wrapper, page: wrapper,
parent: $(wrapper).find('.layout-main'), parent: $(wrapper).find('.layout-main'),
appframe: wrapper.appframe, page: wrapper.page,
doctypes: ["Item", "Item Group", "Warehouse", "Stock Ledger Entry", "Brand", "Serial No"], doctypes: ["Item", "Item Group", "Warehouse", "Stock Ledger Entry", "Brand", "Serial No"],
}) })
}, },

2
erpnext/stock/page/stock_level/stock_level.js
View File

@@ -25,7 +25,7 @@ erpnext.StockLevel = erpnext.StockGridReport.extend({
title: __("Stock Level"), title: __("Stock Level"),
page: wrapper, page: wrapper,
parent: $(wrapper).find('.layout-main'), parent: $(wrapper).find('.layout-main'),
appframe: wrapper.appframe, page: wrapper.page,
doctypes: ["Item", "Warehouse", "Stock Ledger Entry", "Production Order", doctypes: ["Item", "Warehouse", "Stock Ledger Entry", "Production Order",
"Material Request Item", "Purchase Order Item", "Sales Order Item", "Brand", "Serial No"], "Material Request Item", "Purchase Order Item", "Sales Order Item", "Brand", "Serial No"],
}); });

2
erpnext/support/page/support_analytics/support_analytics.js
View File

@@ -21,7 +21,7 @@ erpnext.SupportAnalytics = frappe.views.GridReportWithPlot.extend({
title: __("Support Analtyics"), title: __("Support Analtyics"),
page: wrapper, page: wrapper,
parent: $(wrapper).find('.layout-main'), parent: $(wrapper).find('.layout-main'),
appframe: wrapper.appframe, page: wrapper.page,
doctypes: ["Issue", "Fiscal Year"], doctypes: ["Issue", "Fiscal Year"],
}); });
}, },