diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js index 61e66970d4..3afc76ddf1 100644 --- a/erpnext/accounts/page/accounts_browser/accounts_browser.js +++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js @@ -19,7 +19,7 @@ pscript['onload_Accounts Browser'] = function(wrapper){ chart_area = $("
") .css({"margin-bottom": "15px", "min-height": "200px"}) .appendTo(main), - help_area = $('
'+ + help_area = $('
'+ '

'+__('Quick Help')+'

'+ '
    '+ '
  1. '+__('To add child nodes, explore tree and click on the node under which you want to add more nodes.')+'
  2. '+ @@ -41,8 +41,7 @@ pscript['onload_Accounts Browser'] = function(wrapper){ '

    '+__('Please setup your chart of accounts before you start Accounting Entries')+'

').appendTo(main); if (frappe.boot.user.can_create.indexOf("Company") !== -1) { - wrapper.page.add_button(__('New Company'), function() { newdoc('Company'); }, - 'icon-plus'); + wrapper.page.add_menu_item(__('New Company'), function() { newdoc('Company'); }, true); } wrapper.page.set_primary_action(__('Refresh'), function() { @@ -169,9 +168,11 @@ erpnext.AccountsChart = Class.extend({ } ], onrender: function(node) { + var dr_or_cr = node.data.balance < 0 ? "Cr" : "Dr"; if (me.ctype == 'Account' && node.data && node.data.balance!==undefined) { - $('' - + format_currency(node.data.balance, node.data.currency) + $('' + + format_currency(Math.abs(node.data.balance), node.data.currency) + + " " + dr_or_cr + '').insertBefore(node.$ul); } } diff --git a/erpnext/public/js/pos/pos.js b/erpnext/public/js/pos/pos.js index da2de904b0..fe3748397d 100644 --- a/erpnext/public/js/pos/pos.js +++ b/erpnext/public/js/pos/pos.js @@ -158,7 +158,7 @@ erpnext.POS = Class.extend({ image = ''; else - image = '
'; + image = '
'; $(repl('
\
%(item_image)s
\ diff --git a/erpnext/selling/page/sales_browser/sales_browser.css b/erpnext/selling/page/sales_browser/sales_browser.css deleted file mode 100644 index 38b8e96375..0000000000 --- a/erpnext/selling/page/sales_browser/sales_browser.css +++ /dev/null @@ -1,14 +0,0 @@ -span.tree-node-toolbar { - padding: 2px; - margin-left: 15px; - border-radius: 3px; - -moz-border-radius: 3px; - -webkit-border-radius: 3px; - border-radius: 3px; - background-color: #ddd; -} - -.tree-area a.selected { - font-weight: bold; - text-decoration: underline; -} diff --git a/erpnext/selling/page/sales_browser/sales_browser.js b/erpnext/selling/page/sales_browser/sales_browser.js index 3f8f6cba28..046fbe6646 100644 --- a/erpnext/selling/page/sales_browser/sales_browser.js +++ b/erpnext/selling/page/sales_browser/sales_browser.js @@ -4,6 +4,7 @@ pscript['onload_Sales Browser'] = function(wrapper){ frappe.ui.make_app_page({ parent: wrapper, + single_column: true, }) frappe.add_breadcrumbs("Selling") @@ -12,13 +13,6 @@ pscript['onload_Sales Browser'] = function(wrapper){ wrapper.make_tree(); }); - - $(wrapper) - .find(".layout-side-section") - .html('
'+ - __('Click on a link to get options to expand get options ') + - __('Add') + ' / ' + __('Edit') + ' / '+ __('Delete') + '.
') - wrapper.make_tree = function() { var ctype = frappe.get_route()[1] || 'Territory'; return frappe.call({ @@ -114,8 +108,7 @@ erpnext.SalesChart = Class.extend({ {fieldtype:'Data', fieldname: 'name_field', label:__('New {0} Name',[__(me.ctype)]), reqd:true}, {fieldtype:'Select', fieldname:'is_group', label:__('Group Node'), options:'No\nYes', - description: __("Further nodes can be only created under 'Group' type nodes")}, - {fieldtype:'Button', fieldname:'create_new', label:__('Create New') } + description: __("Further nodes can be only created under 'Group' type nodes")} ] if(me.ctype == "Sales Person") { @@ -131,7 +124,7 @@ erpnext.SalesChart = Class.extend({ d.set_value("is_group", "No"); // create - $(d.fields_dict.create_new.input).click(function() { + d.set_primary_action(__("Create New"), function() { var btn = this; var v = d.get_values(); if(!v) return; @@ -155,6 +148,7 @@ erpnext.SalesChart = Class.extend({ } }); }); + d.show(); }, });