diff --git a/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.js b/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.js index 7ab1e5705c0..0e8e298f4c7 100644 --- a/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.js +++ b/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.js @@ -38,6 +38,18 @@ erpnext.coa = { .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)); @@ -50,7 +62,7 @@ erpnext.coa = { .val(dateutil.obj_to_user(end_date)); erpnext.coa.refresh_btn = wrapper.appframe.add_button("Refresh", function() { - erpnext.coa.chart = new erpnext.ChartOfAccounts(); + erpnext.coa.chart.refresh(); }, "icon-refresh"); @@ -75,6 +87,9 @@ erpnext.coa = { 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; } }); @@ -88,20 +103,44 @@ erpnext.ChartOfAccounts = Class.extend({ }, load_slickgrid: function() { // load tree - wn.require('js/lib/jquery/jquery.ui.sortable'); 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.formatters.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; }'); + 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({ @@ -112,6 +151,9 @@ erpnext.ChartOfAccounts = Class.extend({ 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(); } }) @@ -144,9 +186,9 @@ erpnext.ChartOfAccounts = Class.extend({ } }); this.set_indent(data, parent_map); - this.data = data; + this.accounts = data; this.parent_map = parent_map; - this.data_by_name = data_by_name; + this.accounts_by_name = data_by_name; }, prepare_balances: function() { var gl = this.gl; @@ -157,15 +199,14 @@ erpnext.ChartOfAccounts = Class.extend({ this.set_fiscal_year(); if (!this.fiscal_year) return; - $.each(this.data, function(i, v) { + $.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) { - v[1] = me.data[v[1]].name; var posting_date = dateutil.str_to_obj(v[0]); - var account = me.data_by_name[v[1]]; + var account = me.accounts_by_name[v[1]]; me.update_balances(account, posting_date, v) }); @@ -200,11 +241,11 @@ erpnext.ChartOfAccounts = Class.extend({ update_groups: function() { // update groups var me= this; - $.each(this.data, function(i, account) { + $.each(this.accounts, function(i, account) { // update groups var parent = me.parent_map[account.name]; while(parent) { - parent_account = me.data_by_name[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; @@ -217,7 +258,7 @@ erpnext.ChartOfAccounts = Class.extend({ }, format_balances: function() { // format amount - $.each(this.data, function(i, v) { + $.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); @@ -259,38 +300,12 @@ erpnext.ChartOfAccounts = Class.extend({ d.indent = indent; }); }, - 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; - }, setup_dataview: function() { var me = this; // initialize the model this.dataView = new Slick.Data.DataView({ inlineFilters: true }); this.dataView.beginUpdate(); - this.dataView.setItems(this.data); + this.dataView.setItems(this.accounts); this.dataView.setFilter(this.dataview_filter); this.dataView.endUpdate(); }, @@ -298,7 +313,7 @@ erpnext.ChartOfAccounts = Class.extend({ if (item.parent) { var parent = item.parent; while (parent) { - if (erpnext.coa.chart.data_by_name[parent]._collapsed) { + if (erpnext.coa.chart.accounts_by_name[parent]._collapsed) { return false; } parent = erpnext.coa.chart.parent_map[parent]; @@ -337,7 +352,7 @@ erpnext.ChartOfAccounts = Class.extend({ }, account_formatter: function (row, cell, value, columnDef, dataContext) { value = value.replace(/&/g,"&").replace(//g,">"); - var data = erpnext.coa.chart.data; + var data = erpnext.coa.chart.accounts; var spacer = ""; var idx = erpnext.coa.chart.dataView.getIdxById(dataContext.id); diff --git a/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.py b/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.py index 99791638605..59cd460e710 100644 --- a/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.py +++ b/erpnext/accounts/page/chart_of_accounts/chart_of_accounts.py @@ -41,6 +41,7 @@ def get_companies(): 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 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/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 . + +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"] + } +} diff --git a/erpnext/startup/startup.py b/erpnext/startup/startup.py index 0ae31141fed..3d304927dae 100644 --- a/erpnext/startup/startup.py +++ b/erpnext/startup/startup.py @@ -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 . + import webnotes def get_unread_messages(): diff --git a/public/css/all-app.css b/public/css/all-app.css index ab3ad365825..adf8ad267b7 100644 --- a/public/css/all-app.css +++ b/public/css/all-app.css @@ -163,7 +163,7 @@ h6 { margin-top: 1px; } .btn-small { - padding: 5px 9px; + padding: 4px 9px; font-size: 11px; line-height: 16px; } diff --git a/public/css/all-web.css b/public/css/all-web.css index 971d32f6363..6a77fac6f94 100644 --- a/public/css/all-web.css +++ b/public/css/all-web.css @@ -163,7 +163,7 @@ h6 { margin-top: 1px; } .btn-small { - padding: 5px 9px; + padding: 4px 9px; font-size: 11px; line-height: 16px; } diff --git a/public/js/all-app.js b/public/js/all-app.js index f52272c8efb..49d299cde1b 100644 --- a/public/js/all-app.js +++ b/public/js/all-app.js @@ -176,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').html(label).attr('value',value).appendTo(this);} -return $(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=$('').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); @@ -400,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){}}} -window._version_number="031a31bad930de7f9e8157242afbcba4729d91ff9f957c0c897cafd6";$(document).ready(function(){wn.assets.check();wn.provide('wn.app');$.extend(wn.app,new wn.Application());}); +window._version_number="820949d75a1ddbb59843ce9171e6c532b5f5e6650784839c2a66d84a";$(document).ready(function(){wn.assets.check();wn.provide('wn.app');$.extend(wn.app,new wn.Application());}); /* * lib/js/legacy/globals.js @@ -850,7 +850,7 @@ wn.ui.AppFrame=Class.extend({init:function(parent,title){this.buttons={};this.$w 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='';} this.buttons[label]=$(repl('',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('
');this.toolbar=this.$w.find('.appframe-toolbar');},add_select:function(label,options){this.add_toolbar();return $("").datepicker({dateFormat:sys_defaults.date_format.replace("yyyy","yy"),changeYear:true,}).val(dateutil.str_to_user(date)||"").appendTo(this.add_label(label));},});wn.ui.make_app_page=function(opts){if(opts.single_column){$(opts.parent).html('
\ +this.$w.append('
');this.toolbar=this.$w.find('.appframe-toolbar');},add_label:function(label){return $(""+label+" ").appendTo(this.toolbar);},add_select:function(label,options){this.add_toolbar();return $("").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('
\
\
\
');}else{$(opts.parent).html('
\ @@ -1063,6 +1063,16 @@ me.list.run();});this.dialog.show();},add_column:function(c){var w=$('
\ ×\
').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=$("
").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(){$('
\ +

Loading Report...

\ +
\ +
').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"
"+fmt_money(value)+"
";}}) /* * lib/js/legacy/widgets/dialog.js */ diff --git a/public/js/all-web.js b/public/js/all-web.js index 2c0b0aeae09..eea537abb9e 100644 --- a/public/js/all-web.js +++ b/public/js/all-web.js @@ -63,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').html(label).attr('value',value).appendTo(this);} -return $(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=$('').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); @@ -287,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){}}} -window._version_number="031a31bad930de7f9e8157242afbcba4729d91ff9f957c0c897cafd6";$(document).ready(function(){wn.assets.check();wn.provide('wn.app');$.extend(wn.app,new wn.Application());}); +window._version_number="820949d75a1ddbb59843ce9171e6c532b5f5e6650784839c2a66d84a";$(document).ready(function(){wn.assets.check();wn.provide('wn.app');$.extend(wn.app,new wn.Application());}); /* * lib/js/legacy/globals.js @@ -509,7 +509,7 @@ wn.ui.AppFrame=Class.extend({init:function(parent,title){this.buttons={};this.$w 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='';} this.buttons[label]=$(repl('',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('
');this.toolbar=this.$w.find('.appframe-toolbar');},add_select:function(label,options){this.add_toolbar();return $("").datepicker({dateFormat:sys_defaults.date_format.replace("yyyy","yy"),changeYear:true,}).val(dateutil.str_to_user(date)||"").appendTo(this.add_label(label));},});wn.ui.make_app_page=function(opts){if(opts.single_column){$(opts.parent).html('
\ +this.$w.append('
');this.toolbar=this.$w.find('.appframe-toolbar');},add_label:function(label){return $(""+label+" ").appendTo(this.toolbar);},add_select:function(label,options){this.add_toolbar();return $("").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('
\
\
\
');}else{$(opts.parent).html('
\