Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
commit
9d3f8b9f59
0
erpnext/accounts/page/chart_of_accounts/__init__.py
Normal file
0
erpnext/accounts/page/chart_of_accounts/__init__.py
Normal file
@ -0,0 +1,21 @@
|
||||
.cell-title {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.cell-effort-driven {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.toggle {
|
||||
height: 9px;
|
||||
width: 9px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.toggle.expand {
|
||||
background: url(images/expand.gif) no-repeat center center;
|
||||
}
|
||||
|
||||
.toggle.collapse {
|
||||
background: url(images/collapse.gif) no-repeat center center;
|
||||
}
|
369
erpnext/accounts/page/chart_of_accounts/chart_of_accounts.js
Normal file
369
erpnext/accounts/page/chart_of_accounts/chart_of_accounts.js
Normal file
@ -0,0 +1,369 @@
|
||||
// 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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
/* todo
|
||||
- load / display chart of accounts
|
||||
- settings for company, start date, end data
|
||||
- load balances
|
||||
- open ledger on link
|
||||
*/
|
||||
|
||||
wn.pages['chart-of-accounts'].onload = function(wrapper) {
|
||||
wn.ui.make_app_page({
|
||||
parent: wrapper,
|
||||
title: 'Chart of Accounts',
|
||||
single_column: true
|
||||
});
|
||||
|
||||
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.fiscal_year_select = wrapper.appframe
|
||||
.add_select("Fiscal Year", ["Loading..."]).css("width", "100px")
|
||||
.change(function() {
|
||||
var selected_year = $(this).val();
|
||||
var fiscal_year = $.map(erpnext.coa.fiscal_years, function(v) {
|
||||
return v[0] === selected_year ? v : null;
|
||||
});
|
||||
erpnext.coa.opening_date.val(dateutil.str_to_user(fiscal_year[1]));
|
||||
erpnext.coa.closing_date.val(dateutil.str_to_user(fiscal_year[2]));
|
||||
erpnext.coa.refresh_btn.click();
|
||||
})
|
||||
|
||||
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.refresh();
|
||||
}, "icon-refresh");
|
||||
|
||||
|
||||
|
||||
erpnext.coa.waiting = $('<div class="well" style="width: 63%; margin: 30px auto;">\
|
||||
<p style="text-align: center;">Building Trial Balance Report. \
|
||||
Please wait for a few moments</p>\
|
||||
<div class="progress progress-striped active">\
|
||||
<div class="bar" style="width: 100%"></div></div>')
|
||||
.appendTo($(wrapper).find('.layout-main'));
|
||||
|
||||
$('<div id="chart-of-accounts" style="height: 500px; border: 1px solid #aaa;">\
|
||||
</div>').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,"<").replace(/>/g,">");
|
||||
var data = erpnext.coa.chart.accounts;
|
||||
var spacer = "<span style='display:inline-block;height:1px;width:" +
|
||||
(15 * dataContext["indent"]) + "px'></span>";
|
||||
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 + " <span class='toggle expand'></span> " + value;
|
||||
} else {
|
||||
return spacer + " <span class='toggle collapse'></span> " + value;
|
||||
}
|
||||
} else {
|
||||
return spacer + " <span class='toggle'></span> " + value;
|
||||
}
|
||||
}
|
||||
});
|
49
erpnext/accounts/page/chart_of_accounts/chart_of_accounts.py
Normal file
49
erpnext/accounts/page/chart_of_accounts/chart_of_accounts.py
Normal file
@ -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
|
@ -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'
|
||||
}
|
||||
]
|
0
erpnext/accounts/page/general_ledger/__init__.py
Normal file
0
erpnext/accounts/page/general_ledger/__init__.py
Normal file
65
erpnext/accounts/page/general_ledger/general_ledger.js
Normal file
65
erpnext/accounts/page/general_ledger/general_ledger.js
Normal file
@ -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;
|
||||
},
|
||||
});
|
||||
|
||||
}
|
||||
|
10
erpnext/accounts/page/general_ledger/general_ledger.py
Normal file
10
erpnext/accounts/page/general_ledger/general_ledger.py
Normal file
@ -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, ))
|
28
erpnext/accounts/page/general_ledger/general_ledger.txt
Normal file
28
erpnext/accounts/page/general_ledger/general_ledger.txt
Normal file
@ -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'
|
||||
}
|
||||
]
|
@ -1,4 +0,0 @@
|
||||
def execute():
|
||||
import webnotes
|
||||
from webnotes.modules import reload_doc
|
||||
reload_doc('stock', 'Report', 'Stock Ledger')
|
@ -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',
|
||||
},
|
||||
]
|
||||
|
@ -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")
|
37
erpnext/startup/report_data_map.py
Normal file
37
erpnext/startup/report_data_map.py
Normal file
@ -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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
data_map = {
|
||||
"Account": {
|
||||
"columns": ["name", "parent_account", "lft", "rgt", "debit_or_credit", "is_pl_account",
|
||||
"company"],
|
||||
"order_by": "lft"
|
||||
},
|
||||
"GL Entry": {
|
||||
"columns": ["account", "posting_date", "cost_center", "debit", "credit", "is_opening",
|
||||
"company"],
|
||||
"conditions": ["ifnull(is_cancelled, 'No')='No'"],
|
||||
"order_by": "posting_date"
|
||||
},
|
||||
"Company": {
|
||||
"columns": ["name"],
|
||||
"conditions": ["docstatus < 2"]
|
||||
},
|
||||
"Fiscal Year": {
|
||||
"columns": ["name", "year_start_date",
|
||||
"adddate(year_start_date, interval 1 year) as year_end_date"]
|
||||
}
|
||||
}
|
@ -1,4 +1,19 @@
|
||||
from __future__ import unicode_literals
|
||||
# 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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
import webnotes
|
||||
|
||||
def get_unread_messages():
|
||||
|
@ -1,26 +0,0 @@
|
||||
# Report, Stock Ledger
|
||||
[
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-09-06 18:47:05',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-09-06 18:48:22',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
|
||||
# These values are common for all Report
|
||||
{
|
||||
'doctype': 'Report',
|
||||
'json': u'{"filters":[["Stock Ledger Entry","is_cancelled","=","No"]],"columns":[["item_code","Stock Ledger Entry"],["warehouse","Stock Ledger Entry"],["posting_date","Stock Ledger Entry"],["posting_time","Stock Ledger Entry"],["actual_qty","Stock Ledger Entry"],["bin_aqat","Stock Ledger Entry"],["voucher_type","Stock Ledger Entry"],["voucher_no","Stock Ledger Entry"]],"sort_by":"Stock Ledger Entry.posting_date","sort_order":"desc","sort_by_next":"Stock Ledger Entry.posting_time","sort_order_next":"desc"}',
|
||||
'name': '__common__',
|
||||
'ref_doctype': u'Stock Ledger Entry'
|
||||
},
|
||||
|
||||
# Report, Stock Ledger
|
||||
{
|
||||
'doctype': 'Report',
|
||||
'name': u'Stock Ledger'
|
||||
}
|
||||
]
|
@ -3,9 +3,9 @@
|
||||
|
||||
# These values are common in all dictionaries
|
||||
{
|
||||
'creation': '2012-04-16 11:42:44',
|
||||
'creation': '2012-09-13 15:18:44',
|
||||
'docstatus': 0,
|
||||
'modified': '2012-04-16 16:00:35',
|
||||
'modified': '2012-09-13 15:38:45',
|
||||
'modified_by': u'Administrator',
|
||||
'owner': u'Administrator'
|
||||
},
|
||||
@ -23,8 +23,8 @@
|
||||
'module': u'Stock',
|
||||
'name': '__common__',
|
||||
'page_len': 50,
|
||||
'sort_by': u'`tabStock Ledger Entry`.`item_code`',
|
||||
'sort_order': u'DESC',
|
||||
'sort_by': u'`tabStock Ledger Entry`.`posting_date`, `tabStock Ledger Entry`.`posting_time`, `tabStock Ledger Entry`.`name`',
|
||||
'sort_order': u'ASC',
|
||||
'standard': u'Yes'
|
||||
},
|
||||
|
||||
|
@ -163,7 +163,7 @@ h6 {
|
||||
margin-top: 1px;
|
||||
}
|
||||
.btn-small {
|
||||
padding: 5px 9px;
|
||||
padding: 4px 9px;
|
||||
font-size: 11px;
|
||||
line-height: 16px;
|
||||
}
|
||||
@ -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
|
||||
*/
|
||||
|
@ -163,7 +163,7 @@ h6 {
|
||||
margin-top: 1px;
|
||||
}
|
||||
.btn-small {
|
||||
padding: 5px 9px;
|
||||
padding: 4px 9px;
|
||||
font-size: 11px;
|
||||
line-height: 16px;
|
||||
}
|
||||
|
BIN
public/images/collapse.gif
Normal file
BIN
public/images/collapse.gif
Normal file
Binary file not shown.
After Width: | Height: | Size: 846 B |
BIN
public/images/expand.gif
Normal file
BIN
public/images/expand.gif
Normal file
Binary file not shown.
After Width: | Height: | Size: 851 B |
@ -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<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}
|
||||
parent=parent[n];}}
|
||||
wn.provide('wn.settings');wn.provide('wn.ui');
|
||||
/*
|
||||
* lib/js/wn/versions.js
|
||||
*/
|
||||
wn.versions={check:function(){if(window.localStorage){var localversion=localStorage._version_number;localStorage.clear();}}}
|
||||
/*
|
||||
* lib/js/wn/assets.js
|
||||
*/
|
||||
wn.assets={executed_:{},exists:function(src){if('localStorage'in window&&localStorage.getItem(src))
|
||||
return true},add:function(src,txt){if('localStorage'in window){localStorage.setItem(src,txt);}},get:function(src){return localStorage.getItem(src);},extn:function(src){if(src.indexOf('?')!=-1){src=src.split('?').slice(-1)[0];}
|
||||
return src.split('.').slice(-1)[0];},load:function(src){var t=src;$.ajax({url:t,data:{q:Math.floor(Math.random()*1000)},dataType:'text',success:function(txt){wn.assets.add(src,txt);},async:false})},execute:function(src){if(!wn.assets.exists(src)){wn.assets.load(src);}
|
||||
var type=wn.assets.extn(src);if(wn.assets.handler[type]){wn.assets.handler[type](wn.assets.get(src),src);wn.assets.executed_[src]=1;}},handler:{js:function(txt,src){wn.dom.eval(txt);},css:function(txt,src){wn.dom.set_style(txt);},cgi:function(txt,src){wn.dom.eval(txt)}}}
|
||||
/*
|
||||
* lib/js/wn/require.js
|
||||
*/
|
||||
wn.require=function(items){if(typeof items==="string"){items=[items];}
|
||||
var l=items.length;for(var i=0;i<l;i++){var src=items[i];wn.assets.execute(src);}}
|
||||
wn.assets={executed_:{},check:function(){if(window._version_number!=localStorage.getItem("_version_number")){localStorage.clear();localStorage.setItem("_version_number",window._version_number)}},exists:function(src){if('localStorage'in window&&localStorage.getItem(src))
|
||||
return true},add:function(src,txt){if('localStorage'in window){localStorage.setItem(src,txt);}},get:function(src){return localStorage.getItem(src);},extn:function(src){if(src.indexOf('?')!=-1){src=src.split('?').slice(-1)[0];}
|
||||
return src.split('.').slice(-1)[0];},load:function(src){var t=src;$.ajax({url:t,data:{q:Math.floor(Math.random()*1000)},dataType:'text',success:function(txt){wn.assets.add(src,txt);},async:false})},execute:function(src){if(!wn.assets.exists(src)){wn.assets.load(src);}
|
||||
var type=wn.assets.extn(src);if(wn.assets.handler[type]){wn.assets.handler[type](wn.assets.get(src),src);wn.assets.executed_[src]=1;}},handler:{js:function(txt,src){wn.dom.eval(txt);},css:function(txt,src){wn.dom.set_style(txt);}}}
|
||||
/*
|
||||
* lib/js/wn/dom.js
|
||||
*/
|
||||
@ -183,7 +176,7 @@ return cookies[c];}
|
||||
wn.dom.set_box_shadow=function(ele,spread){$(ele).css('-moz-box-shadow','0px 0px '+spread+'px rgba(0,0,0,0.3);')
|
||||
$(ele).css('-webkit-box-shadow','0px 0px '+spread+'px rgba(0,0,0,0.3);')
|
||||
$(ele).css('-box-shadow','0px 0px '+spread+'px rgba(0,0,0,0.3);')};(function($){$.fn.add_options=function(options_list){for(var i=0;i<options_list.length;i++){var v=options_list[i];value=v.value||v;label=v.label||v;$('<option>').html(label).attr('value',value).appendTo(this);}
|
||||
$(this).val(options_list[0].value||options_list[0]);}
|
||||
this.selectedIndex=0;return $(this);}
|
||||
$.fn.set_working=function(){var ele=this.get(0);$(ele).attr('disabled','disabled');if(ele.loading_img){$(ele.loading_img).toggle(true);}else{ele.loading_img=$('<img src="images/lib/ui/button-load.gif" \
|
||||
style="margin-left: 4px; margin-bottom: -2px; display: inline;" />').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
|
||||
<span class="appframe-title"></span>\
|
||||
<span class="close">×</span>\
|
||||
</div>').appendTo(this.$w);this.$w.find('.close').click(function(){window.history.back();})
|
||||
if(title)this.title(title);},title:function(txt){this.$titlebar.find('.appframe-title').html(txt);},add_button:function(label,click,icon){if(!this.$w.find('.appframe-toolbar').length)
|
||||
this.$w.append('<div class="appframe-toolbar"></div>');args={label:label,icon:''};if(icon){args.icon='<i class="'+icon+'"></i>';}
|
||||
if(title)this.title(title);},title:function(txt){this.$titlebar.find('.appframe-title').html(txt);},add_button:function(label,click,icon){this.add_toolbar();args={label:label,icon:''};if(icon){args.icon='<i class="'+icon+'"></i>';}
|
||||
this.buttons[label]=$(repl('<button class="btn btn-small">\
|
||||
%(icon)s %(label)s</button>',args)).click(click).appendTo(this.$w.find('.appframe-toolbar'));return this.buttons[label];},clear_buttons:function(){this.$w.find('.appframe-toolbar').empty();}});wn.ui.make_app_page=function(opts){if(opts.single_column){$(opts.parent).html('<div class="layout-wrapper layout-wrapper-appframe">\
|
||||
%(icon)s %(label)s</button>',args)).click(click).appendTo(this.toolbar);return this.buttons[label];},clear_buttons:function(){this.toolbar&&this.toolbar.empty();},add_toolbar:function(){if(!this.toolbar)
|
||||
this.$w.append('<div class="appframe-toolbar"></div>');this.toolbar=this.$w.find('.appframe-toolbar');},add_label:function(label){return $("<span style='margin: 2px 4px;'>"+label+" </span>").appendTo(this.toolbar);},add_select:function(label,options){this.add_toolbar();return $("<select style='width: 160px; margin: 2px 4px;'>").add_options(options).appendTo(this.toolbar);},add_date:function(label,date){this.add_toolbar();return $("<input style='width: 80px; margin: 2px 4px;'>").datepicker({dateFormat:sys_defaults.date_format.replace("yyyy","yy"),changeYear:true,}).val(dateutil.str_to_user(date)||"").appendTo(this.toolbar);},});wn.ui.make_app_page=function(opts){if(opts.single_column){$(opts.parent).html('<div class="layout-wrapper layout-wrapper-appframe">\
|
||||
<div class="layout-appframe"></div>\
|
||||
<div class="layout-main"></div>\
|
||||
</div>');}else{$(opts.parent).html('<div class="layout-wrapper layout-wrapper-background">\
|
||||
@ -1070,6 +1063,16 @@ me.list.run();});this.dialog.show();},add_column:function(c){var w=$('<div style
|
||||
margin-bottom: 10px; border-radius: 3px; cursor: move;">\
|
||||
<a class="close" style="margin-top: 5px;">×</a>\
|
||||
</div>').appendTo($(this.dialog.body).find('.column-list'));var fieldselect=new wn.ui.FieldSelect(w,this.doctype);fieldselect.$select.css('width','90%').val((c[1]||this.doctype)+"."+c[0]);w.find('.close').click(function(){$(this).parent().remove();});}});
|
||||
/*
|
||||
* lib/js/wn/views/grid_report.js
|
||||
*/
|
||||
wn.provide("wn.report_dump");$.extend(wn.report_dump,{data:{},with_data:function(doctypes,callback){var missing=[];$.each(doctypes,function(i,v){if(!wn.report_dump.data[v])missing.push(v);})
|
||||
if(missing.length){wn.call({method:"webnotes.widgets.report_dump.get_data",args:{doctypes:missing},callback:function(r){$.each(r.message,function(doctype,doctype_data){var data=[];$.each(doctype_data.data,function(i,d){var row={};$.each(doctype_data.columns,function(idx,col){row[col]=d[idx];});row.id=doctype+"-"+i;data.push(row);});wn.report_dump.data[doctype]=data;});callback();}})}else{callback();}}});wn.provide("wn.views");wn.views.GridReport=Class.extend({init:function(opts){this.filter_inputs={};$.extend(this,opts);this.wrapper=$("<div style='height: 500px; border: 1px solid #aaa;'>").appendTo(this.parent);this.id=wn.dom.set_unique_id(this.wrapper.get(0));if(this.filters){this.make_filters();}
|
||||
this.make_waiting();this.import_slickgrid();var me=this;this.get_data();wn.cur_grid_report=this;},get_data:function(){var me=this;wn.report_dump.with_data(this.doctypes,function(){$.each(me.filter_inputs,function(i,v){var opts=v.get(0).opts;if(opts.fieldtype=="Select"&&inList(me.doctypes,opts.options)){$(v).add_options($.map(wn.report_dump.data[opts.options],function(d){return d.name;}));}});me.setup();me.refresh();});},make_waiting:function(){$('<div class="well" style="width: 63%; margin: 30px auto;">\
|
||||
<p style="text-align: center;">Loading Report...</p>\
|
||||
<div class="progress progress-striped active">\
|
||||
<div class="bar" style="width: 100%"></div></div>').appendTo(this.wrapper);},load_filters:function(callback){callback();},make_filters:function(){var me=this;$.each(this.filters,function(i,v){v.fieldname=v.fieldname||v.label.replace(/ /g,'_').toLowerCase();var input=null;if(v.fieldtype=='Select'){input=me.appframe.add_select(v.label,["Select "+v.options]);}else if(v.fieldtype=='Button'){input=me.appframe.add_button(v.label);}else if(v.fieldtype=='Date'){input=me.appframe.add_date(v.label);}else if(v.fieldtype=='Label'){input=me.appframe.add_label(v.label);}
|
||||
input&&(input.get(0).opts=v);me.filter_inputs[v.fieldname]=input;});},import_slickgrid:function(){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_data();this.render();},render:function(){this.grid=new Slick.Grid("#"+this.id,this.dataView,this.columns,this.options);this.dataView.onRowsChanged.subscribe(function(e,args){grid.invalidateRows(args.rows);grid.render();});this.dataView.onRowCountChanged.subscribe(function(e,args){grid.updateRowCount();grid.render();});},prepare_data_view:function(items){this.dataView=new Slick.Data.DataView({inlineFilters:true});this.dataView.beginUpdate();this.dataView.setItems(items);this.dataView.setFilter(this.dataview_filter);this.dataView.endUpdate();},options:{editable:false,enableColumnReorder:false},dataview_filter:function(item){return true;},date_formatter:function(row,cell,value,columnDef,dataContext){return dateutil.str_to_user(value);},currency_formatter:function(row,cell,value,columnDef,dataContext){return"<div style='text-align: right;'>"+fmt_money(value)+"</div>";}})
|
||||
/*
|
||||
* lib/js/legacy/widgets/dialog.js
|
||||
*/
|
||||
|
@ -21,22 +21,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<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}
|
||||
parent=parent[n];}}
|
||||
wn.provide('wn.settings');wn.provide('wn.ui');
|
||||
/*
|
||||
* lib/js/wn/versions.js
|
||||
*/
|
||||
wn.versions={check:function(){if(window.localStorage){var localversion=localStorage._version_number;localStorage.clear();}}}
|
||||
/*
|
||||
* lib/js/wn/assets.js
|
||||
*/
|
||||
wn.assets={executed_:{},exists:function(src){if('localStorage'in window&&localStorage.getItem(src))
|
||||
return true},add:function(src,txt){if('localStorage'in window){localStorage.setItem(src,txt);}},get:function(src){return localStorage.getItem(src);},extn:function(src){if(src.indexOf('?')!=-1){src=src.split('?').slice(-1)[0];}
|
||||
return src.split('.').slice(-1)[0];},load:function(src){var t=src;$.ajax({url:t,data:{q:Math.floor(Math.random()*1000)},dataType:'text',success:function(txt){wn.assets.add(src,txt);},async:false})},execute:function(src){if(!wn.assets.exists(src)){wn.assets.load(src);}
|
||||
var type=wn.assets.extn(src);if(wn.assets.handler[type]){wn.assets.handler[type](wn.assets.get(src),src);wn.assets.executed_[src]=1;}},handler:{js:function(txt,src){wn.dom.eval(txt);},css:function(txt,src){wn.dom.set_style(txt);},cgi:function(txt,src){wn.dom.eval(txt)}}}
|
||||
/*
|
||||
* lib/js/wn/require.js
|
||||
*/
|
||||
wn.require=function(items){if(typeof items==="string"){items=[items];}
|
||||
var l=items.length;for(var i=0;i<l;i++){var src=items[i];wn.assets.execute(src);}}
|
||||
wn.assets={executed_:{},check:function(){if(window._version_number!=localStorage.getItem("_version_number")){localStorage.clear();localStorage.setItem("_version_number",window._version_number)}},exists:function(src){if('localStorage'in window&&localStorage.getItem(src))
|
||||
return true},add:function(src,txt){if('localStorage'in window){localStorage.setItem(src,txt);}},get:function(src){return localStorage.getItem(src);},extn:function(src){if(src.indexOf('?')!=-1){src=src.split('?').slice(-1)[0];}
|
||||
return src.split('.').slice(-1)[0];},load:function(src){var t=src;$.ajax({url:t,data:{q:Math.floor(Math.random()*1000)},dataType:'text',success:function(txt){wn.assets.add(src,txt);},async:false})},execute:function(src){if(!wn.assets.exists(src)){wn.assets.load(src);}
|
||||
var type=wn.assets.extn(src);if(wn.assets.handler[type]){wn.assets.handler[type](wn.assets.get(src),src);wn.assets.executed_[src]=1;}},handler:{js:function(txt,src){wn.dom.eval(txt);},css:function(txt,src){wn.dom.set_style(txt);}}}
|
||||
/*
|
||||
* lib/js/wn/dom.js
|
||||
*/
|
||||
@ -70,7 +63,7 @@ return cookies[c];}
|
||||
wn.dom.set_box_shadow=function(ele,spread){$(ele).css('-moz-box-shadow','0px 0px '+spread+'px rgba(0,0,0,0.3);')
|
||||
$(ele).css('-webkit-box-shadow','0px 0px '+spread+'px rgba(0,0,0,0.3);')
|
||||
$(ele).css('-box-shadow','0px 0px '+spread+'px rgba(0,0,0,0.3);')};(function($){$.fn.add_options=function(options_list){for(var i=0;i<options_list.length;i++){var v=options_list[i];value=v.value||v;label=v.label||v;$('<option>').html(label).attr('value',value).appendTo(this);}
|
||||
$(this).val(options_list[0].value||options_list[0]);}
|
||||
this.selectedIndex=0;return $(this);}
|
||||
$.fn.set_working=function(){var ele=this.get(0);$(ele).attr('disabled','disabled');if(ele.loading_img){$(ele.loading_img).toggle(true);}else{ele.loading_img=$('<img src="images/lib/ui/button-load.gif" \
|
||||
style="margin-left: 4px; margin-bottom: -2px; display: inline;" />').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);
|
||||
@ -294,7 +287,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
|
||||
@ -379,7 +372,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('-');}
|
||||
@ -513,10 +506,10 @@ wn.ui.AppFrame=Class.extend({init:function(parent,title){this.buttons={};this.$w
|
||||
<span class="appframe-title"></span>\
|
||||
<span class="close">×</span>\
|
||||
</div>').appendTo(this.$w);this.$w.find('.close').click(function(){window.history.back();})
|
||||
if(title)this.title(title);},title:function(txt){this.$titlebar.find('.appframe-title').html(txt);},add_button:function(label,click,icon){if(!this.$w.find('.appframe-toolbar').length)
|
||||
this.$w.append('<div class="appframe-toolbar"></div>');args={label:label,icon:''};if(icon){args.icon='<i class="'+icon+'"></i>';}
|
||||
if(title)this.title(title);},title:function(txt){this.$titlebar.find('.appframe-title').html(txt);},add_button:function(label,click,icon){this.add_toolbar();args={label:label,icon:''};if(icon){args.icon='<i class="'+icon+'"></i>';}
|
||||
this.buttons[label]=$(repl('<button class="btn btn-small">\
|
||||
%(icon)s %(label)s</button>',args)).click(click).appendTo(this.$w.find('.appframe-toolbar'));return this.buttons[label];},clear_buttons:function(){this.$w.find('.appframe-toolbar').empty();}});wn.ui.make_app_page=function(opts){if(opts.single_column){$(opts.parent).html('<div class="layout-wrapper layout-wrapper-appframe">\
|
||||
%(icon)s %(label)s</button>',args)).click(click).appendTo(this.toolbar);return this.buttons[label];},clear_buttons:function(){this.toolbar&&this.toolbar.empty();},add_toolbar:function(){if(!this.toolbar)
|
||||
this.$w.append('<div class="appframe-toolbar"></div>');this.toolbar=this.$w.find('.appframe-toolbar');},add_label:function(label){return $("<span style='margin: 2px 4px;'>"+label+" </span>").appendTo(this.toolbar);},add_select:function(label,options){this.add_toolbar();return $("<select style='width: 160px; margin: 2px 4px;'>").add_options(options).appendTo(this.toolbar);},add_date:function(label,date){this.add_toolbar();return $("<input style='width: 80px; margin: 2px 4px;'>").datepicker({dateFormat:sys_defaults.date_format.replace("yyyy","yy"),changeYear:true,}).val(dateutil.str_to_user(date)||"").appendTo(this.toolbar);},});wn.ui.make_app_page=function(opts){if(opts.single_column){$(opts.parent).html('<div class="layout-wrapper layout-wrapper-appframe">\
|
||||
<div class="layout-appframe"></div>\
|
||||
<div class="layout-main"></div>\
|
||||
</div>');}else{$(opts.parent).html('<div class="layout-wrapper layout-wrapper-background">\
|
||||
|
@ -171,10 +171,10 @@ _r.DataTable.prototype.set_asc=function(icon){this.sort_icon.src='images/lib/ico
|
||||
_r.DataTable.prototype.set_sort_option_disabled=function(label,disabled){var s=this.sort_sel;if(disabled){for(var i=0;i<s.options.length;i++){if(s.options[i]&&s.options[i].text==label){this.disabled_options[label]=s.options[i];s.remove(i);}}}else{if(this.disabled_options[label]){try{s.add(this.disabled_options[label],s.options[s.options.length-1]);}catch(e){try{s.add(this.disabled_options[label],s.options.length-1);}catch(e){}}
|
||||
this.disabled_options[label]=null;}}}
|
||||
_r.DataTable.prototype.add_sort_option=function(label,val){var s=this.sort_sel;s.options[s.options.length]=new Option(label,val,false,s.options.length==0?true:false);}
|
||||
_r.DataTable.prototype.update_query=function(no_limit){if((_r.rb_con.cur_rb&&_r.rb_con.cur_rb.get_query)||(this.search_criteria&&this.search_criteria.custom_query)){}else{if(!sel_val(this.sort_sel)){this.sort_sel.selectedIndex=0;}
|
||||
_r.DataTable.prototype.update_query=function(no_limit){if((_r.rb_con.cur_rb&&_r.rb_con.cur_rb.get_query)||(this.search_criteria&&this.search_criteria.custom_query)){}else{var me=this;var sort_by=null,sort_order="";if(sel_val(this.sort_sel)){sort_by=sel_val(this.sort_sel);sort_order=this.sort_order;}else if(_r.rb_con.cur_rb.sc.sort_by){sort_by=(_r.rb_con.cur_rb.sc.sort_by||"").split(",");sort_by=$.map(sort_by,function(v){return v.trim()+" "+(me.sort_order||"");}).join(", ");sort_order="";}else{this.sort_sel.selectedIndex=0;sort_by=sel_val(this.sort_sel);sort_order=this.sort_order;}
|
||||
this.query+=NEWLINE
|
||||
+' ORDER BY '+sel_val(this.sort_sel)
|
||||
+' '+this.sort_order;}
|
||||
+' ORDER BY '+sort_by
|
||||
+' '+sort_order;}
|
||||
if(no_limit||this.no_limit){if(this.show_query)alert(this.query);return;}
|
||||
this.query+=' LIMIT '+(this.start_rec-1)+','+this.page_len;if(this.show_query)
|
||||
alert(this.query);}
|
||||
|
Loading…
x
Reference in New Issue
Block a user