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],
+ "opening_debit": 0,
+ "opening_credit": 0,
+ "debit": 0,
+ "credit": 0,
+ "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;
+ }
+ }
+ });
+ 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]);
+ } 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;
+ } else {
+ item._collapsed = false;
+ }
+
+ me.dataView.updateItem(item.id, item);
+ }
+ e.stopImmediatePropagation();
+ }
+ });
+
+ 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;
+ } else {
+ return spacer + " " + value;
+ }
+ } else {
+ 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
new file mode 100644
index 00000000000..59cd460e710
--- /dev/null
+++ b/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.py
@@ -0,0 +1,49 @@
+import webnotes
+
+@webnotes.whitelist()
+def get_chart():
+ company = webnotes.form_dict.get('company')
+ res = {}
+ 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, ), 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()
+def get_companies():
+ """get a list of companies based on permission"""
+
+ # check if match permission exists
+ res = webnotes.conn.sql("""select role, `match` from `tabDocPerm`
+ where parent='Account' and permlevel=0 and `read`=1""", as_dict=1)
+
+ match = any((r["match"] for r in res
+ if r["role"] in webnotes.user.roles and r["match"]=="company"))
+
+ # if match == company is specified and companies are specified in user defaults
+ res = {}
+ if match and webnotes.user.get_defaults().get("company"):
+ res["companies"] = webnotes.user.get_defaults().get("company")
+ else:
+ res["companies"] = [r[0] for r in webnotes.conn.sql("""select name from tabCompany
+ where docstatus!=2""")]
+
+ res["fiscal_years"] = webnotes.conn.sql("""select name, year_start_date,
+ adddate(year_start_date, interval 1 year)
+ from `tabFiscal Year` where docstatus!=2
+ order by year_start_date asc""")
+ return res
diff --git a/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.txt b/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.txt
new file mode 100644
index 00000000000..e9d5ab5065e
--- /dev/null
+++ b/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.txt
@@ -0,0 +1,28 @@
+# Page, chart-of-accounts
+[
+
+ # These values are common in all dictionaries
+ {
+ 'creation': '2012-09-12 14:43:52',
+ 'docstatus': 0,
+ 'modified': '2012-09-12 14:43:53',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
+ },
+
+ # These values are common for all Page
+ {
+ 'doctype': 'Page',
+ 'module': u'Accounts',
+ 'name': '__common__',
+ 'page_name': u'Chart of Accounts',
+ 'standard': u'Yes',
+ 'title': u'Chart of Accounts'
+ },
+
+ # Page, chart-of-accounts
+ {
+ 'doctype': 'Page',
+ 'name': u'chart-of-accounts'
+ }
+]
\ No newline at end of file
diff --git a/erpnext/accounts/page/general_ledger/__init__.py b/erpnext/accounts/page/general_ledger/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/accounts/page/general_ledger/general_ledger.css b/erpnext/accounts/page/general_ledger/general_ledger.css
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/accounts/page/general_ledger/general_ledger.html b/erpnext/accounts/page/general_ledger/general_ledger.html
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/erpnext/accounts/page/general_ledger/general_ledger.js b/erpnext/accounts/page/general_ledger/general_ledger.js
new file mode 100644
index 00000000000..d3956128168
--- /dev/null
+++ b/erpnext/accounts/page/general_ledger/general_ledger.js
@@ -0,0 +1,65 @@
+wn.pages['general-ledger'].onload = function(wrapper) {
+ wn.ui.make_app_page({
+ parent: wrapper,
+ title: 'General Ledger',
+ single_column: true
+ });
+
+ erpnext.general_ledger = new wn.views.GridReport({
+ parent: $(wrapper).find('.layout-main'),
+ appframe: wrapper.appframe,
+ doctypes: ["Company", "Account", "GL Entry"],
+ filters: [
+ {fieldtype:"Select", label: "Company", options:"Company",
+ filter: function(val, item) {
+ return item.company == val || val == "Select Company";
+ }},
+ {fieldtype:"Select", label: "Account", options:"Account",
+ filter: function(val, item) {
+ return item.account == val || val == "Select Account";
+ }},
+ {fieldtype:"Date", label: "From Date"},
+ {fieldtype:"Label", label: "To"},
+ {fieldtype:"Date", label: "To Date"},
+ {fieldtype:"Button", label: "Refresh"},
+ ],
+ setup: function() {
+ this.setup_filters();
+ this.setup_columns();
+ },
+ setup_filters: function() {
+ var me = this;
+ // default filters
+ this.filter_inputs.company.val(sys_defaults.company);
+ 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));
+ this.filter_inputs.refresh.click(function() { me.refresh(); })
+ },
+ setup_columns: function() {
+ this.columns = [
+ {id: "posting_date", name: "Posting Date", field: "posting_date", width: 100,
+ formatter: this.date_formatter},
+ {id: "account", name: "Account", field: "account", width: 240},
+ {id: "debit", name: "Debit", field: "debit", width: 100,
+ formatter: this.currency_formatter},
+ {id: "credit", name: "Credit", field: "credit", width: 100,
+ formatter: this.currency_formatter},
+ ];
+ },
+ prepare_data: function() {
+ this.prepare_data_view(wn.report_dump.data["GL Entry"]);
+ },
+ dataview_filter: function(item) {
+ var filters = wn.cur_grid_report.filter_inputs;
+ for (i in filters) {
+ var filter = filters[i].get(0);
+ if(filter.opts.filter && !filter.opts.filter($(filter).val(), item)) {
+ return false;
+ }
+ }
+ return true;
+ },
+ });
+
+}
+
diff --git a/erpnext/accounts/page/general_ledger/general_ledger.py b/erpnext/accounts/page/general_ledger/general_ledger.py
new file mode 100644
index 00000000000..f351978a5eb
--- /dev/null
+++ b/erpnext/accounts/page/general_ledger/general_ledger.py
@@ -0,0 +1,10 @@
+import webnotes
+
+@webnotes.whitelist()
+def get_chart():
+ company = webnotes.form_dict.get('company')
+ res = {}
+ 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, ))
\ No newline at end of file
diff --git a/erpnext/accounts/page/general_ledger/general_ledger.txt b/erpnext/accounts/page/general_ledger/general_ledger.txt
new file mode 100644
index 00000000000..c57ff0f3e25
--- /dev/null
+++ b/erpnext/accounts/page/general_ledger/general_ledger.txt
@@ -0,0 +1,28 @@
+# Page, general-ledger
+[
+
+ # These values are common in all dictionaries
+ {
+ 'creation': '2012-09-13 13:50:13',
+ 'docstatus': 0,
+ 'modified': '2012-09-13 13:50:13',
+ 'modified_by': u'Administrator',
+ 'owner': u'Administrator'
+ },
+
+ # These values are common for all Page
+ {
+ 'doctype': 'Page',
+ 'module': u'Accounts',
+ 'name': '__common__',
+ 'page_name': u'general-ledger',
+ 'standard': u'Yes',
+ 'title': u'General Ledger'
+ },
+
+ # Page, general-ledger
+ {
+ 'doctype': 'Page',
+ 'name': u'general-ledger'
+ }
+]
\ No newline at end of file
diff --git a/erpnext/patches/august_2012/reload_stock_ledger.py b/erpnext/patches/august_2012/reload_stock_ledger.py
deleted file mode 100644
index d0ec9ee8899..00000000000
--- a/erpnext/patches/august_2012/reload_stock_ledger.py
+++ /dev/null
@@ -1,4 +0,0 @@
-def execute():
- import webnotes
- from webnotes.modules import reload_doc
- reload_doc('stock', 'Report', 'Stock Ledger')
\ No newline at end of file
diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py
index e4eff963efb..3acd97d1f4f 100644
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -533,10 +533,6 @@ patch_list = [
'patch_module': 'patches.august_2012',
'patch_file': 'remove_cash_flow_statement',
},
- {
- 'patch_module': 'patches.august_2012',
- 'patch_file': 'reload_stock_ledger',
- },
{
'patch_module': 'patches.september_2012',
'patch_file': 'stock_report_permissions_for_accounts',
@@ -545,4 +541,8 @@ patch_list = [
'patch_module': 'patches.september_2012',
'patch_file': 'communication_delete_permission',
},
+ {
+ 'patch_module': 'patches.september_2012',
+ 'patch_file': 'reload_criteria_stock_ledger',
+ },
]
diff --git a/erpnext/patches/september_2012/reload_criteria_stock_ledger.py b/erpnext/patches/september_2012/reload_criteria_stock_ledger.py
new file mode 100644
index 00000000000..4e2e71af33c
--- /dev/null
+++ b/erpnext/patches/september_2012/reload_criteria_stock_ledger.py
@@ -0,0 +1,7 @@
+def execute():
+ import webnotes
+ from webnotes.modules import reload_doc
+ reload_doc('stock', 'Search Criteria', 'Stock Ledger')
+
+ from webnotes.model import delete_doc
+ delete_doc("Report", "Stock Ledger")
\ No newline at end of file
diff --git a/erpnext/startup/report_data_map.py b/erpnext/startup/report_data_map.py
new file mode 100644
index 00000000000..aa23ade5216
--- /dev/null
+++ b/erpnext/startup/report_data_map.py
@@ -0,0 +1,37 @@
+# ERPNext - web based ERP (http://erpnext.com)
+# Copyright (C) 2012 Web Notes Technologies Pvt Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see 
').insertAfter(ele);}}
$.fn.done_working=function(){var ele=this.get(0);$(ele).attr('disabled',null);if(ele.loading_img){$(ele.loading_img).toggle(false);};}})(jQuery);
@@ -407,7 +400,7 @@ wn.request.call({args:args,success:opts.callback,error:opts.error,btn:opts.btn,f
* lib/js/core.js
*/
if(!console){var console={log:function(txt){}}}
-$(document).ready(function(){wn.versions.check();wn.provide('wn.app');$.extend(wn.app,new wn.Application());});
+window._version_number="d58703b2c2e2a5dd1294cd924eb13c57161cf583571b48248ed44bbc";$(document).ready(function(){wn.assets.check();wn.provide('wn.app');$.extend(wn.app,new wn.Application());});
/*
* lib/js/legacy/globals.js
@@ -492,7 +485,7 @@ return val;},full_str:function(){var d=new Date();return d.getFullYear()+'-'+(d.
else if(user_fmt=='dd/mm/yyyy'){var d=d.split('/');return d[2]+'-'+d[1]+'-'+d[0];}
else if(user_fmt=='yyyy-mm-dd'){return d;}
else if(user_fmt=='mm/dd/yyyy'){var d=d.split('/');return d[2]+'-'+d[0]+'-'+d[1];}
-else if(user_fmt=='mm-dd-yyyy'){var d=d.split('-');return d[2]+'-'+d[0]+'-'+d[1];}},global_date_format:function(d){if(d.substr)d=this.str_to_obj(d);return nth(d.getDate())+' '+month_list_full[d.getMonth()]+' '+d.getFullYear();},get_today:function(){var today=new Date();var m=(today.getMonth()+1)+'';if(m.length==1)m='0'+m;var d=today.getDate()+'';if(d.length==1)d='0'+d;return today.getFullYear()+'-'+m+'-'+d;},get_cur_time:function(){var d=new Date();var hh=d.getHours()+''
+else if(user_fmt=='mm-dd-yyyy'){var d=d.split('-');return d[2]+'-'+d[0]+'-'+d[1];}},user_to_obj:function(d){return dateutil.str_to_obj(dateutil.user_to_str(d));},global_date_format:function(d){if(d.substr)d=this.str_to_obj(d);return nth(d.getDate())+' '+month_list_full[d.getMonth()]+' '+d.getFullYear();},get_today:function(){var today=new Date();var m=(today.getMonth()+1)+'';if(m.length==1)m='0'+m;var d=today.getDate()+'';if(d.length==1)d='0'+d;return today.getFullYear()+'-'+m+'-'+d;},get_cur_time:function(){var d=new Date();var hh=d.getHours()+''
var mm=cint(d.getMinutes()/5)*5+''
return(hh.length==1?'0'+hh:hh)+':'+(mm.length==1?'0'+mm:mm);}}
wn.datetime.only_date=function(val){if(val==null||val=='')return null;if(val.search(':')!=-1){var tmp=val.split(' ');var d=tmp[0].split('-');}else{var d=val.split('-');}
@@ -854,10 +847,10 @@ wn.ui.AppFrame=Class.extend({init:function(parent,title){this.buttons={};this.$w
\
×\