diff --git a/accounts/page/trial_balance/trial_balance.js b/accounts/page/trial_balance/trial_balance.js index 3504ae0c98e..3f47758f045 100644 --- a/accounts/page/trial_balance/trial_balance.js +++ b/accounts/page/trial_balance/trial_balance.js @@ -22,5 +22,39 @@ wn.pages['trial-balance'].onload = function(wrapper) { title: 'Trial Balance', single_column: true }); - erpnext.trial_balance = new erpnext.AccountTreeGrid(wrapper, 'Trial Balance'); + var TrialBalance = erpnext.AccountTreeGrid.extend({ + export: function() { + var msgbox = msgprint('

Select To Download:

\ +

Account Groups

\ +

Account Ledgers

\ +

'); + + var me = this; + + $(msgbox.body).find("button").click(function() { + var with_groups = $(msgbox.body).find("[name='with_groups']").is(":checked"); + var with_ledgers = $(msgbox.body).find("[name='with_ledgers']").is(":checked"); + + var data = wn.slickgrid_tools.get_view_data(me.columns, me.dataView, + function(row, item) { + if(with_groups) { + // pad row + for(var i=0; iReport issues by sending a mail to support@erpnext.com or \ + via GitHub Issues


").appendTo(parent); + + + $.each(erpnext.updates, function(i, day) { + $("

" + day[0] + "

").appendTo(parent); + $.each(day[1], function(j, item) { + $("

").html(item).appendTo(parent); + }) + $("


").appendTo(parent); + }); +} \ No newline at end of file diff --git a/home/page/latest_updates/latest_updates.txt b/home/page/latest_updates/latest_updates.txt new file mode 100644 index 00000000000..876c086de5f --- /dev/null +++ b/home/page/latest_updates/latest_updates.txt @@ -0,0 +1,43 @@ +# Page, latest-updates +[ + + # These values are common in all dictionaries + { + u'creation': '2012-11-13 11:55:09', + u'docstatus': 0, + u'modified': '2012-11-13 12:21:39', + u'modified_by': u'Administrator', + u'owner': u'Administrator' + }, + + # These values are common for all Page + { + u'doctype': u'Page', + 'module': u'Home', + u'name': u'__common__', + 'page_name': u'latest-updates', + 'standard': u'Yes', + 'title': u'Latest Updates' + }, + + # These values are common for all Page Role + { + u'doctype': u'Page Role', + u'name': u'__common__', + 'parent': u'latest-updates', + 'parentfield': u'roles', + 'parenttype': u'Page', + 'role': u'All' + }, + + # Page, latest-updates + { + u'doctype': u'Page', + u'name': u'latest-updates' + }, + + # Page Role + { + u'doctype': u'Page Role' + } +] \ No newline at end of file diff --git a/public/js/startup.js b/public/js/startup.js index 4efc2a35046..1757dc5d8ed 100644 --- a/public/js/startup.js +++ b/public/js/startup.js @@ -53,7 +53,8 @@ erpnext.startup.start = function() { // border to the body // ------------------ $('footer').html(''); + Attributions and License | \ + Latest Updates'); // complete registration if(in_list(user_roles,'System Manager') && (wn.boot.setup_complete=='No')) { diff --git a/startup/report_data_map.py b/startup/report_data_map.py index 08670f95440..1ea9d130ec4 100644 --- a/startup/report_data_map.py +++ b/startup/report_data_map.py @@ -33,9 +33,13 @@ data_map = { # Accounts "Account": { "columns": ["name", "parent_account", "lft", "rgt", "debit_or_credit", - "is_pl_account", "company"], + "is_pl_account", "company", "group_or_ledger"], "conditions": ["docstatus < 2"], - "order_by": "lft" + "order_by": "lft", + "links": { + "company": ["Company", "name"], + } + }, "Cost Center": { "columns": ["name", "lft", "rgt"],