From fd1c166f5b32b89737be8f9cdab1dcfce804dfbf Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 13 Sep 2012 10:21:29 +0530 Subject: [PATCH 1/2] late loading js (require) files in localStorage, brought back versions (simpler) --- .../chart_of_accounts/chart_of_accounts.js | 10 + public/css/all-app.css | 211 ++++++++++++++++++ public/js/all-app.js | 17 +- public/js/all-web.js | 17 +- 4 files changed, 231 insertions(+), 24 deletions(-) diff --git a/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.js b/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.js index 7cf5648b93..74523be5f4 100644 --- a/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.js +++ b/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.js @@ -33,6 +33,13 @@ wn.pages['chart-of-accounts'].onload = function(wrapper) { erpnext.coa.closing_date = wrapper.appframe.add_date("Closing Date") .val(dateutil.obj_to_user(new Date())); + erpnext.coa.waiting = $('
\ +

Building Trial Balance Report. \ + Please wait for a few moments

\ +
\ +
') + .appendTo($(wrapper).find('.layout-main')); + $('
\
').appendTo($(wrapper).find('.layout-main')); @@ -41,6 +48,7 @@ wn.pages['chart-of-accounts'].onload = function(wrapper) { page: "chart_of_accounts", method: "get_companies", callback: function(r) { + erpnext.coa.waiting.toggle(); erpnext.coa.company_select.empty().add_options(r.message.companies).change(); erpnext.coa.fiscal_years = r.message.fiscal_years; } @@ -197,6 +205,8 @@ erpnext.coa = { }); }, render: function() { + erpnext.coa.waiting.toggle(false); + // initialize the model erpnext.coa.dataView = new Slick.Data.DataView({ inlineFilters: true }); erpnext.coa.dataView.beginUpdate(); diff --git a/public/css/all-app.css b/public/css/all-app.css index dcc21384f7..ab3ad36582 100644 --- a/public/css/all-app.css +++ b/public/css/all-app.css @@ -1919,6 +1919,217 @@ button.btn.small, input[type="submit"].btn.small { margin-bottom: 0; } +/* + * lib/css/bootstrap/progress.css + */ +@-webkit-keyframes progress-bar-stripes { + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } +} + +@-moz-keyframes progress-bar-stripes { + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } +} + +@-ms-keyframes progress-bar-stripes { + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } +} + +@-o-keyframes progress-bar-stripes { + from { + background-position: 0 0; + } + to { + background-position: 40px 0; + } +} + +@keyframes progress-bar-stripes { + from { + background-position: 40px 0; + } + to { + background-position: 0 0; + } +} + +.progress { + height: 20px; + margin-bottom: 20px; + overflow: hidden; + background-color: #f7f7f7; + background-image: -moz-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9)); + background-image: -webkit-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: -o-linear-gradient(top, #f5f5f5, #f9f9f9); + background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9); + background-repeat: repeat-x; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fff5f5f5', endColorstr='#fff9f9f9', GradientType=0); + -webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + -moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); + box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1); +} + +.progress .bar { + float: left; + width: 0; + height: 100%; + font-size: 12px; + color: #ffffff; + text-align: center; + text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25); + background-color: #0e90d2; + background-image: -moz-linear-gradient(top, #149bdf, #0480be); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be)); + background-image: -webkit-linear-gradient(top, #149bdf, #0480be); + background-image: -o-linear-gradient(top, #149bdf, #0480be); + background-image: linear-gradient(to bottom, #149bdf, #0480be); + background-repeat: repeat-x; + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff149bdf', endColorstr='#ff0480be', GradientType=0); + -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + -webkit-transition: width 0.6s ease; + -moz-transition: width 0.6s ease; + -o-transition: width 0.6s ease; + transition: width 0.6s ease; +} + +.progress .bar + .bar { + -webkit-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); + -moz-box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); + box-shadow: inset 1px 0 0 rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.15); +} + +.progress-striped .bar { + background-color: #149bdf; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + -webkit-background-size: 40px 40px; + -moz-background-size: 40px 40px; + -o-background-size: 40px 40px; + background-size: 40px 40px; +} + +.progress.active .bar { + -webkit-animation: progress-bar-stripes 2s linear infinite; + -moz-animation: progress-bar-stripes 2s linear infinite; + -ms-animation: progress-bar-stripes 2s linear infinite; + -o-animation: progress-bar-stripes 2s linear infinite; + animation: progress-bar-stripes 2s linear infinite; +} + +.progress-danger .bar, +.progress .bar-danger { + background-color: #dd514c; + background-image: -moz-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35)); + background-image: -webkit-linear-gradient(top, #ee5f5b, #c43c35); + background-image: -o-linear-gradient(top, #ee5f5b, #c43c35); + background-image: linear-gradient(to bottom, #ee5f5b, #c43c35); + background-repeat: repeat-x; + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ffee5f5b', endColorstr='#ffc43c35', GradientType=0); +} + +.progress-danger.progress-striped .bar, +.progress-striped .bar-danger { + background-color: #ee5f5b; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} + +.progress-success .bar, +.progress .bar-success { + background-color: #5eb95e; + background-image: -moz-linear-gradient(top, #62c462, #57a957); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957)); + background-image: -webkit-linear-gradient(top, #62c462, #57a957); + background-image: -o-linear-gradient(top, #62c462, #57a957); + background-image: linear-gradient(to bottom, #62c462, #57a957); + background-repeat: repeat-x; + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff62c462', endColorstr='#ff57a957', GradientType=0); +} + +.progress-success.progress-striped .bar, +.progress-striped .bar-success { + background-color: #62c462; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} + +.progress-info .bar, +.progress .bar-info { + background-color: #4bb1cf; + background-image: -moz-linear-gradient(top, #5bc0de, #339bb9); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9)); + background-image: -webkit-linear-gradient(top, #5bc0de, #339bb9); + background-image: -o-linear-gradient(top, #5bc0de, #339bb9); + background-image: linear-gradient(to bottom, #5bc0de, #339bb9); + background-repeat: repeat-x; + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#ff5bc0de', endColorstr='#ff339bb9', GradientType=0); +} + +.progress-info.progress-striped .bar, +.progress-striped .bar-info { + background-color: #5bc0de; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} + +.progress-warning .bar, +.progress .bar-warning { + background-color: #faa732; + background-image: -moz-linear-gradient(top, #fbb450, #f89406); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406)); + background-image: -webkit-linear-gradient(top, #fbb450, #f89406); + background-image: -o-linear-gradient(top, #fbb450, #f89406); + background-image: linear-gradient(to bottom, #fbb450, #f89406); + background-repeat: repeat-x; + filter: progid:dximagetransform.microsoft.gradient(startColorstr='#fffbb450', endColorstr='#fff89406', GradientType=0); +} + +.progress-warning.progress-striped .bar, +.progress-striped .bar-warning { + background-color: #fbb450; + background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent)); + background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -moz-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: -o-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); + background-image: linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent); +} + /* * lib/css/legacy/body.css */ diff --git a/public/js/all-app.js b/public/js/all-app.js index 0ae6190b40..f52272c8ef 100644 --- a/public/js/all-app.js +++ b/public/js/all-app.js @@ -134,22 +134,15 @@ if(!window.wn)wn={} wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i Date: Thu, 13 Sep 2012 11:59:32 +0530 Subject: [PATCH 2/2] updates to gzip, chart of accounts --- .../chart_of_accounts/chart_of_accounts.js | 318 +++++++++++------- .../chart_of_accounts/chart_of_accounts.py | 15 +- 2 files changed, 203 insertions(+), 130 deletions(-) diff --git a/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.js b/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.js index 74523be5f4..7ab1e5705c 100644 --- a/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.js +++ b/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.js @@ -27,43 +27,65 @@ wn.pages['chart-of-accounts'].onload = function(wrapper) { title: 'Chart of Accounts', single_column: true }); - erpnext.coa.company_select = wrapper.appframe.add_select("Company", ["Loading..."]); - erpnext.coa.opening_date = wrapper.appframe.add_date("Opening Date") - .val(dateutil.str_to_user(sys_defaults.year_start_date)); - erpnext.coa.closing_date = wrapper.appframe.add_date("Closing Date") - .val(dateutil.obj_to_user(new Date())); - erpnext.coa.waiting = $('
\ -

Building Trial Balance Report. \ - Please wait for a few moments

\ -
\ -
') - .appendTo($(wrapper).find('.layout-main')); - - $('
\ -
').appendTo($(wrapper).find('.layout-main')); - - wn.call({ - module: "accounts", - page: "chart_of_accounts", - method: "get_companies", - callback: function(r) { - erpnext.coa.waiting.toggle(); - erpnext.coa.company_select.empty().add_options(r.message.companies).change(); - erpnext.coa.fiscal_years = r.message.fiscal_years; - } - }); - - erpnext.coa.company_select.change(function() { - erpnext.coa.load_slickgrid(); - erpnext.coa.load_data($(this).val()); - }); - - erpnext.coa.opening_date.change(erpnext.coa.refresh); - erpnext.coa.closing_date.change(erpnext.coa.refresh); + erpnext.coa.make_page(wrapper); + erpnext.coa.load_companies(); } - erpnext.coa = { + make_page: function(wrapper) { + erpnext.coa.company_select = wrapper.appframe + .add_select("Company", ["Loading..."]) + .change(function() { + erpnext.coa.chart = new erpnext.ChartOfAccounts(); + }); + + erpnext.coa.opening_date = wrapper.appframe.add_date("Opening Date") + .val(dateutil.str_to_user(sys_defaults.year_start_date)); + + var end_date = new Date(); + if(end_date > dateutil.str_to_obj(sys_defaults.year_end_date)) + end_date = sys_defaults.year_end_date; + + erpnext.coa.closing_date = wrapper.appframe.add_date("Closing Date") + .val(dateutil.obj_to_user(end_date)); + + erpnext.coa.refresh_btn = wrapper.appframe.add_button("Refresh", function() { + erpnext.coa.chart = new erpnext.ChartOfAccounts(); + }, "icon-refresh"); + + + + erpnext.coa.waiting = $('
\ +

Building Trial Balance Report. \ + Please wait for a few moments

\ +
\ +
') + .appendTo($(wrapper).find('.layout-main')); + + $('
\ +
').appendTo($(wrapper).find('.layout-main')); + + }, + load_companies: function() { + wn.call({ + module: "accounts", + page: "chart_of_accounts", + method: "get_companies", + callback: function(r) { + erpnext.coa.waiting.toggle(); + erpnext.coa.company_select.empty().add_options(r.message.companies) + .val(sys_defaults.company || r.message.companies[0]).change(); + erpnext.coa.fiscal_years = r.message.fiscal_years; + } + }); + } +}; + +erpnext.ChartOfAccounts = Class.extend({ + init: function() { + this.load_slickgrid(); + this.load_data($(erpnext.coa.company_select).val()); + }, load_slickgrid: function() { // load tree wn.require('js/lib/jquery/jquery.ui.sortable'); @@ -77,20 +99,20 @@ erpnext.coa = { wn.dom.set_style('.slick-cell { font-size: 12px; }'); }, refresh: function() { - erpnext.coa.prepare_balances(); - erpnext.coa.render(); + this.prepare_balances(); + this.render(); }, load_data: function(company) { + var me = this; wn.call({ module: "accounts", page: "chart_of_accounts", method: "get_chart", args: {company: company}, callback: function(r) { - erpnext.coa.gl = r.message.gl; - erpnext.coa.prepare_chart(r.message.chart); - erpnext.coa.prepare_balances(); - erpnext.coa.render(); + me.gl = r.message.gl; + me.prepare_chart(r.message.chart); + me.refresh(); } }) }, @@ -104,92 +126,125 @@ erpnext.coa = { "id": v[0], "name": v[0], "parent": v[1], - "opening": 0, + "debit_or_credit": v[2], + "opening_debit": 0, + "opening_credit": 0, "debit": 0, "credit": 0, - "closing": 0, - "debit_or_credit": v[2], + "closing_debit": 0, + "closing_credit": 0, "is_pl": v[3] }; - + data.push(d); data_by_name[d.name] = d; if(d.parent) { parent_map[d.name] = d.parent; - } + } } }); - erpnext.coa.set_indent(data, parent_map); - erpnext.coa.data = data; - erpnext.coa.parent_map = parent_map; - erpnext.coa.data_by_name = data_by_name; + this.set_indent(data, parent_map); + this.data = data; + this.parent_map = parent_map; + this.data_by_name = data_by_name; }, prepare_balances: function() { - var gl = erpnext.coa.gl; - var opening_date = dateutil.user_to_obj(erpnext.coa.opening_date.val()); - var closing_date = dateutil.user_to_obj(erpnext.coa.closing_date.val()); - var fiscal_year = erpnext.coa.get_fiscal_year(opening_date, closing_date); - if (!fiscal_year) return; + var gl = this.gl; + var me = this; - $.each(erpnext.coa.data, function(i, v) { - v.opening = v.debit = v.credit = v.closing = 0; + this.opening_date = dateutil.user_to_obj(erpnext.coa.opening_date.val()); + this.closing_date = dateutil.user_to_obj(erpnext.coa.closing_date.val()); + this.set_fiscal_year(); + if (!this.fiscal_year) return; + + $.each(this.data, function(i, v) { + v.opening_debit = v.opening_credit = v.debit + = v.credit = v.closing_debit = v.closing_credit = 0; }); $.each(gl, function(i, v) { + v[1] = me.data[v[1]].name; var posting_date = dateutil.str_to_obj(v[0]); - var account = erpnext.coa.data_by_name[v[1]]; - // opening - if (posting_date < opening_date || v[4] === "Yes") { - if (account.is_pl === "Yes" && posting_date <= dateutil.str_to_obj(fiscal_year[1])) { - // balance of previous fiscal_year should - // not be part of opening of pl account balance - } else { - if (account.debit_or_credit === "Debit") { - account.opening += (v[2] - v[3]); - } else { - account.opening += (v[3] - v[2]); - } - } - } else if (opening_date <= posting_date && posting_date <= closing_date) { - // in between - account.debit += v[2]; - account.credit += v[3]; - } - // closing - if (account.debit_or_credit === "Debit") { - account.closing = account.opening + account.debit - account.credit; - } else { - account.closing = account.opening + account.credit - account.debit; - } + var account = me.data_by_name[v[1]]; + me.update_balances(account, posting_date, v) }); + this.update_groups(); + this.format_balances(); + }, + update_balances: function(account, posting_date, v) { + // opening + if (posting_date < this.opening_date || v[4] === "Y") { + if (account.is_pl === "Yes" && posting_date <= dateutil.str_to_obj(this.fiscal_year[1])) { + // balance of previous fiscal_year should + // not be part of opening of pl account balance + } else { + if(account.debit_or_credit=='D') { + account.opening_debit += (v[2] - v[3]); + } else { + account.opening_credit += (v[3] - v[2]); + } + } + } else if (this.opening_date <= posting_date && posting_date <= this.closing_date) { + // in between + account.debit += v[2]; + account.credit += v[3]; + } + // closing + if(account.debit_or_credit=='D') { + account.closing_debit = account.opening_debit + account.debit - account.credit; + } else { + account.closing_credit = account.opening_credit - account.debit + account.credit; + } + }, + update_groups: function() { + // update groups + var me= this; + $.each(this.data, function(i, account) { + // update groups + var parent = me.parent_map[account.name]; + while(parent) { + parent_account = me.data_by_name[parent]; + parent_account.opening_debit += account.opening_debit; + parent_account.opening_credit += account.opening_credit; + parent_account.debit += account.debit; + parent_account.credit += account.credit; + parent_account.closing_debit += account.closing_debit; + parent_account.closing_credit += account.closing_credit; + parent = me.parent_map[parent]; + } + }); + }, + format_balances: function() { // format amount - $.each(erpnext.coa.data, function(i, v) { - v.opening = fmt_money(v.opening); + $.each(this.data, function(i, v) { + v.opening_debit = fmt_money(v.opening_debit); + v.opening_credit = fmt_money(v.opening_credit); v.debit = fmt_money(v.debit); v.credit = fmt_money(v.credit); - v.closing = fmt_money(v.closing); - }); + v.closing_debit = fmt_money(v.closing_debit); + v.closing_credit = fmt_money(v.closing_credit); + }); }, - get_fiscal_year: function(opening_date, closing_date) { - if (opening_date > closing_date) { + set_fiscal_year: function() { + if (this.opening_date > this.closing_date) { msgprint("Opening Date should be before Closing Date"); return; } - - var fiscal_year = null; + + this.fiscal_year = null; + var me = this; $.each(erpnext.coa.fiscal_years, function(i, v) { - if (opening_date >= dateutil.str_to_obj(v[1]) && - closing_date <= dateutil.str_to_obj(v[2])) { - fiscal_year = v; + if (me.opening_date >= dateutil.str_to_obj(v[1]) && + me.closing_date <= dateutil.str_to_obj(v[2])) { + me.fiscal_year = v; } }); - if (!fiscal_year) { + if (!this.fiscal_year) { msgprint("Opening Date and Closing Date should be within same Fiscal Year"); return; } - return fiscal_year; }, set_indent: function(data, parent_map) { $.each(data, function(i, d) { @@ -205,22 +260,19 @@ erpnext.coa = { }); }, render: function() { + var me = this; erpnext.coa.waiting.toggle(false); - - // initialize the model - erpnext.coa.dataView = new Slick.Data.DataView({ inlineFilters: true }); - erpnext.coa.dataView.beginUpdate(); - erpnext.coa.dataView.setItems(erpnext.coa.data); - erpnext.coa.dataView.setFilter(erpnext.coa.filter) - erpnext.coa.dataView.endUpdate(); + this.setup_dataview(); var columns = [ - {id: "name", name: "Account", field: "name", width: 400, cssClass: "cell-title", - formatter: erpnext.coa.account_formatter}, - {id: "opening", name: "Opening", field: "opening"}, - {id: "debit", name: "Debit", field: "debit"}, - {id: "credit", name: "Credit", field: "credit"}, - {id: "closing", name: "Closing", field: "closing"} + {id: "name", name: "Account", field: "name", width: 300, cssClass: "cell-title", + formatter: this.account_formatter}, + {id: "opening_debit", name: "Opening (Dr)", field: "opening_debit", width: 100}, + {id: "opening_credit", name: "Opening (Cr)", field: "opening_credit", width: 100}, + {id: "debit", name: "Debit", field: "debit", width: 100}, + {id: "credit", name: "Credit", field: "credit", width: 100}, + {id: "closing_debit", name: "Closing (Dr)", field: "closing_debit", width: 100}, + {id: "closing_credit", name: "Closing (Cr)", field: "closing_credit", width: 100} ]; var options = { @@ -229,14 +281,36 @@ erpnext.coa = { }; // initialize the grid - var grid = new Slick.Grid("#chart-of-accounts", erpnext.coa.dataView, columns, options); - erpnext.coa.add_events(grid); - erpnext.coa.grid = grid; + var grid = new Slick.Grid("#chart-of-accounts", this.dataView, columns, options); + this.add_events(grid); + this.grid = grid; + }, + setup_dataview: function() { + var me = this; + // initialize the model + this.dataView = new Slick.Data.DataView({ inlineFilters: true }); + this.dataView.beginUpdate(); + this.dataView.setItems(this.data); + this.dataView.setFilter(this.dataview_filter); + this.dataView.endUpdate(); + }, + dataview_filter: function(item) { + if (item.parent) { + var parent = item.parent; + while (parent) { + if (erpnext.coa.chart.data_by_name[parent]._collapsed) { + return false; + } + parent = erpnext.coa.chart.parent_map[parent]; + } + } + return true; }, add_events: function(grid) { + var me = this; grid.onClick.subscribe(function (e, args) { if ($(e.target).hasClass("toggle")) { - var item = erpnext.coa.dataView.getItem(args.row); + var item = me.dataView.getItem(args.row); if (item) { if (!item._collapsed) { item._collapsed = true; @@ -244,41 +318,29 @@ erpnext.coa = { item._collapsed = false; } - erpnext.coa.dataView.updateItem(item.id, item); + me.dataView.updateItem(item.id, item); } e.stopImmediatePropagation(); } }); - erpnext.coa.dataView.onRowsChanged.subscribe(function (e, args) { + this.dataView.onRowsChanged.subscribe(function (e, args) { grid.invalidateRows(args.rows); grid.render(); }); - erpnext.coa.dataView.onRowCountChanged.subscribe(function (e, args) { + this.dataView.onRowCountChanged.subscribe(function (e, args) { grid.updateRowCount(); grid.render(); }); }, - filter: function(item) { - if (item.parent) { - var parent = item.parent; - while (parent) { - if (erpnext.coa.data_by_name[parent]._collapsed) { - return false; - } - parent = erpnext.coa.parent_map[parent]; - } - } - return true; - }, account_formatter: function (row, cell, value, columnDef, dataContext) { value = value.replace(/&/g,"&").replace(//g,">"); - var data = erpnext.coa.data; + var data = erpnext.coa.chart.data; var spacer = ""; - var idx = erpnext.coa.dataView.getIdxById(dataContext.id); + var idx = erpnext.coa.chart.dataView.getIdxById(dataContext.id); if (data[idx + 1] && data[idx + 1].indent > data[idx].indent) { if (dataContext._collapsed) { return spacer + "  " + value; @@ -289,4 +351,4 @@ erpnext.coa = { return spacer + "  " + value; } } -} +}); diff --git a/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.py b/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.py index 14984fbdb9..9979163860 100644 --- a/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.py +++ b/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.py @@ -4,12 +4,23 @@ import webnotes def get_chart(): company = webnotes.form_dict.get('company') res = {} - res["chart"] = webnotes.conn.sql("""select name, parent_account, debit_or_credit, is_pl_account from + res["chart"] = webnotes.conn.sql("""select name, parent_account, + if(debit_or_credit="Debit", "D", ""), + if(is_pl_account="Yes", "Y", "") from tabAccount where company=%s and docstatus < 2 order by lft""", (company, )) + res["gl"] = webnotes.conn.sql("""select posting_date, account, ifnull(debit, 0), ifnull(credit, 0), ifnull(is_opening, 'No') from `tabGL Entry` where company=%s and ifnull(is_cancelled, "No") = "No" - order by posting_date""", (company, )) + order by posting_date""", (company, ), as_list=1) + + idx_map = {} + for i in xrange(len(res["chart"])): + idx_map[res["chart"][i][0]] = i + + for d in res["gl"]: + d[1] = idx_map[d[1]] + return res @webnotes.whitelist()