\
-
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_year_select.empty()
- .add_options($.map(r.message.fiscal_years, function(v) { return v[0]; }))
- .val(sys_defaults.fiscal_year);
- 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/slickgrid/slick.grid.css');
- wn.require('js/lib/slickgrid/slick-default-theme.css');
- wn.require('js/lib/slickgrid/jquery.event.drag.min.js');
- wn.require('js/lib/slickgrid/slick.core.js');
- wn.require('js/lib/slickgrid/slick.grid.js');
- wn.require('js/lib/slickgrid/slick.dataview.js');
- wn.dom.set_style('.slick-cell { font-size: 12px; }');
- },
- refresh: function() {
- this.prepare_balances();
- this.render();
- },
- render: function() {
- var me = this;
- erpnext.coa.waiting.toggle(false);
- this.setup_dataview();
-
- var columns = [
- {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 = {
- editable: false,
- enableColumnReorder: false
- };
-
- // initialize the grid
- var grid = new Slick.Grid("#chart-of-accounts", this.dataView, columns, options);
- this.add_events(grid);
- this.grid = grid;
- },
- load_data: function(company) {
- var me = this;
- wn.call({
- module: "accounts",
- page: "chart_of_accounts",
- method: "get_chart",
- args: {company: company},
- callback: function(r) {
- me.gl = r.message.gl;
- me.prepare_chart(r.message.chart);
- $.each(me.gl, function(i, v) {
- v[1] = me.accounts[v[1]].name;
- });
- me.refresh();
- }
- })
- },
- prepare_chart: function(indata) {
- var data = [];
- var parent_map = {};
- var data_by_name = {};
- $.each(indata, function(i, v) {
- if(v[0]) {
- var d = {
- "id": v[0],
- "name": v[0],
- "parent": v[1],
- "debit_or_credit": v[2],
+ },
+ init_filter_values: function() {
+ this.filter_inputs.company.val(sys_defaults.company);
+ this.filter_inputs.fiscal_year.val(sys_defaults.fiscal_year);
+ this.filter_inputs.from_date.val(dateutil.str_to_user(sys_defaults.year_start_date));
+ this.filter_inputs.to_date.val(dateutil.str_to_user(sys_defaults.year_end_date));
+ },
+ prepare_data: function() {
+ var data = [];
+ var parent_map = {};
+ var data_by_name = {};
+ $.each(wn.report_dump.data["Account"], function(i, v) {
+ var d = $.extend(copy_dict(v), {
"opening_debit": 0,
"opening_credit": 0,
"debit": 0,
"credit": 0,
"closing_debit": 0,
- "closing_credit": 0,
- "is_pl": v[3]
- };
-
+ "closing_credit": 0
+ });
+
data.push(d);
data_by_name[d.name] = d;
- if(d.parent) {
- parent_map[d.name] = d.parent;
+ if(d.parent_account) {
+ parent_map[d.name] = d.parent_account;
}
- }
- });
- this.set_indent(data, parent_map);
- this.accounts = data;
- this.parent_map = parent_map;
- this.accounts_by_name = data_by_name;
- },
- prepare_balances: function() {
- var gl = this.gl;
- var me = this;
-
- 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.accounts, 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) {
- var posting_date = dateutil.str_to_obj(v[0]);
- var account = me.accounts_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]);
+ });
+ this.set_indent(data, parent_map);
+ this.accounts = data;
+ this.parent_map = parent_map;
+ this.accounts_by_name = data_by_name;
+ this.prepare_balances();
+ this.prepare_data_view(this.accounts);
+ },
+ prepare_balances: function() {
+ var gl = wn.report_dump.data['GL Entry'];
+ var me = this;
+
+ this.opening_date = dateutil.user_to_obj(this.filter_inputs.from_date.val());
+ this.closing_date = dateutil.user_to_obj(this.filter_inputs.to_date.val());
+ this.set_fiscal_year();
+ if (!this.fiscal_year) return;
+
+ $.each(this.accounts, 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) {
+ var posting_date = dateutil.str_to_obj(v.posting_date);
+ var account = me.accounts_by_name[v.account];
+ me.update_balances(account, posting_date, v)
+ });
+
+ this.update_groups();
+ },
+ update_balances: function(account, posting_date, v) {
+ // opening
+ if (posting_date < this.opening_date || v.is_opening === "Yes") {
+ if (account.is_pl_account === "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 {
- 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.accounts, function(i, account) {
- // update groups
- var parent = me.parent_map[account.name];
- while(parent) {
- parent_account = me.accounts_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(this.accounts, 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_debit = fmt_money(v.closing_debit);
- v.closing_credit = fmt_money(v.closing_credit);
- });
- },
- set_fiscal_year: function() {
- if (this.opening_date > this.closing_date) {
- msgprint("Opening Date should be before Closing Date");
- return;
- }
-
- this.fiscal_year = null;
- var me = this;
- $.each(erpnext.coa.fiscal_years, function(i, 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 (!this.fiscal_year) {
- msgprint("Opening Date and Closing Date should be within same Fiscal Year");
- return;
- }
- },
- set_indent: function(data, parent_map) {
- $.each(data, function(i, d) {
- var indent = 0;
- var parent = parent_map[d.name];
- if(parent) {
- while(parent) {
- indent++;
- parent = parent_map[parent];
- }
- }
- d.indent = indent;
- });
- },
- setup_dataview: function() {
- var me = this;
- // initialize the model
- this.dataView = new Slick.Data.DataView({ inlineFilters: true });
- this.dataView.beginUpdate();
- this.dataView.setItems(this.accounts);
- 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.accounts_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 = me.dataView.getItem(args.row);
- if (item) {
- if (!item._collapsed) {
- item._collapsed = true;
+ if(account.debit_or_credit=='Debit') {
+ account.opening_debit += (v.debit - v.credit);
} else {
- item._collapsed = false;
+ account.opening_credit += (v.credit - v.debit);
}
-
- me.dataView.updateItem(item.id, item);
}
- e.stopImmediatePropagation();
+ } else if (this.opening_date <= posting_date && posting_date <= this.closing_date) {
+ // in between
+ account.debit += v.debit;
+ account.credit += v.credit;
}
- });
-
- this.dataView.onRowsChanged.subscribe(function (e, args) {
- grid.invalidateRows(args.rows);
- grid.render();
- });
-
- this.dataView.onRowCountChanged.subscribe(function (e, args) {
- grid.updateRowCount();
- grid.render();
- });
-
- },
- account_formatter: function (row, cell, value, columnDef, dataContext) {
- value = value.replace(/&/g,"&").replace(//g,">");
- var data = erpnext.coa.chart.accounts;
- var spacer = "
";
- 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;
+ // closing
+ if(account.debit_or_credit=='Debit') {
+ account.closing_debit = account.opening_debit + account.debit - account.credit;
} else {
- return spacer + "
" + value;
+ account.closing_credit = account.opening_credit - account.debit + account.credit;
}
- } else {
- return spacer + "
" + value;
- }
- }
+ },
+ update_groups: function() {
+ // update groups
+ var me= this;
+ $.each(this.accounts, function(i, account) {
+ // update groups
+ var parent = me.parent_map[account.name];
+ while(parent) {
+ parent_account = me.accounts_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];
+ }
+ });
+ },
+
+ set_fiscal_year: function() {
+ if (this.opening_date > this.closing_date) {
+ msgprint("Opening Date should be before Closing Date");
+ return;
+ }
+
+ this.fiscal_year = null;
+ var me = this;
+ $.each(wn.report_dump.data["Fiscal Year"], function(i, v) {
+ if (me.opening_date >= dateutil.str_to_obj(v.year_start_date) &&
+ me.closing_date <= dateutil.str_to_obj(v.year_end_date)) {
+ me.fiscal_year = v;
+ }
+ });
+
+ if (!this.fiscal_year) {
+ msgprint("Opening Date and Closing Date should be within same Fiscal Year");
+ return;
+ }
+ },
+ set_indent: function(data, parent_map) {
+ $.each(data, function(i, d) {
+ var indent = 0;
+ var parent = parent_map[d.name];
+ if(parent) {
+ while(parent) {
+ indent++;
+ parent = parent_map[parent];
+ }
+ }
+ d.indent = indent;
+ });
+ },
+ account_formatter: function (row, cell, value, columnDef, dataContext) {
+ value = value.replace(/&/g,"&").replace(//g,">");
+ var data = erpnext.coa.accounts;
+ var spacer = "
";
+ var idx = erpnext.coa.dataView.getIdxById(dataContext.id);
+ if (data[idx + 1] && data[idx + 1].indent > data[idx].indent) {
+ if (dataContext._collapsed) {
+ return spacer + "
" + value;
+ } else {
+ return spacer + "
" + value;
+ }
+ } else {
+ return spacer + "
" + value;
+ }
+ },
+ add_grid_events: function() {
+ var me = this;
+ this.grid.onClick.subscribe(function (e, args) {
+ if ($(e.target).hasClass("toggle")) {
+ var item = me.dataView.getItem(args.row);
+ if (item) {
+ if (!item._collapsed) {
+ item._collapsed = true;
+ } else {
+ item._collapsed = false;
+ }
+
+ me.dataView.updateItem(item.id, item);
+ }
+ e.stopImmediatePropagation();
+ }
+ });
+ },
+ custom_dataview_filter: function(item) {
+ if (item.parent_account) {
+ var parent = item.parent_account;
+ while (parent) {
+ if (erpnext.coa.accounts_by_name[parent]._collapsed) {
+ return false;
+ }
+ parent = erpnext.coa.parent_map[parent];
+ }
+ }
+ return true;
+ }
+ });
+}
+
+erpnext.ChartOfAccounts = Class.extend({
});
diff --git a/erpnext/startup/report_data_map.py b/erpnext/startup/report_data_map.py
index 1811aaaec5..f4539382dc 100644
--- a/erpnext/startup/report_data_map.py
+++ b/erpnext/startup/report_data_map.py
@@ -32,6 +32,6 @@ data_map = {
},
"Fiscal Year": {
"columns": ["name", "year_start_date",
- "adddate(year_start_date, interval 1 year) as year_end_date"]
+ "adddate(adddate(year_start_date, interval 1 year), interval -1 day) as year_end_date"]
}
}
diff --git a/public/js/all-app.js b/public/js/all-app.js
index 89162c61c6..f32e26e791 100644
--- a/public/js/all-app.js
+++ b/public/js/all-app.js
@@ -847,13 +847,13 @@ wn.ui.AppFrame=Class.extend({init:function(parent,title){this.buttons={};this.$w
\
×\