From 6c8504877b4c156100b67b6ecdc9a35671b116fc Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 10 Sep 2012 12:23:06 +0530 Subject: [PATCH 1/2] Fixes in item wise purchase details report --- .../itemwise_purchase_details/itemwise_purchase_details.js | 4 ++-- public/js/all-app.js | 2 +- public/js/report-legacy.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.js b/erpnext/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.js index 603f915e605..139d69e1974 100644 --- a/erpnext/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.js +++ b/erpnext/buying/search_criteria/itemwise_purchase_details/itemwise_purchase_details.js @@ -15,7 +15,7 @@ // along with this program. If not, see . report.customize_filters = function() { - this.filter_fields_dict['Purchase Order'+FILTER_SEP +'From PO Date'].df['report_default'] = sys_defaults.year_start_date; - this.filter_fields_dict['Purchase Order'+FILTER_SEP +'To PO Date'].df['report_default'] = dateutil.obj_to_str(new Date()); + this.filter_fields_dict['Purchase Order'+FILTER_SEP +'From Purchase Order Date'].df['report_default'] = sys_defaults.year_start_date; + this.filter_fields_dict['Purchase Order'+FILTER_SEP +'To Purchase Order Date'].df['report_default'] = dateutil.obj_to_str(new Date()); } \ No newline at end of file diff --git a/public/js/all-app.js b/public/js/all-app.js index b5be8ac7059..5876391adbf 100644 --- a/public/js/all-app.js +++ b/public/js/all-app.js @@ -2124,7 +2124,7 @@ set_multiple=function(dt,dn,dict,table_field){var d=locals[dt][dn];for(var key i refresh_many=function(flist,dn,table_field){for(var i in flist){if(table_field)refresh_field(flist[i],dn,table_field);else refresh_field(flist[i]);}} set_field_tip=function(n,txt){var df=get_field(cur_frm.doctype,n,cur_frm.docname);if(df)df.description=txt;if(cur_frm&&cur_frm.fields_dict){if(cur_frm.fields_dict[n]) cur_frm.fields_dict[n].comment_area.innerHTML=replace_newlines(txt);else -errprint('[set_field_tip] Unable to set field tip: '+n);}} +console.log('[set_field_tip] Unable to set field tip: '+n);}} refresh_field=function(n,docname,table_field){if(typeof n==typeof[])refresh_many(n,docname,table_field);if(table_field){if(_f.frm_dialog&&_f.frm_dialog.display){if(_f.frm_dialog.cur_frm.fields_dict[n]&&_f.frm_dialog.cur_frm.fields_dict[n].refresh) _f.frm_dialog.cur_frm.fields_dict[n].refresh();}else{var g=_f.cur_grid_cell;if(g)var hc=g.grid.head_row.cells[g.cellIndex];if(g&&hc&&hc.fieldname==n&&g.row.docname==docname){hc.template.refresh();}else{cur_frm.fields_dict[table_field].grid.refresh_cell(docname,n);}}}else if(cur_frm&&cur_frm.fields_dict){if(cur_frm.fields_dict[n]&&cur_frm.fields_dict[n].refresh) cur_frm.fields_dict[n].refresh();}} diff --git a/public/js/report-legacy.js b/public/js/report-legacy.js index 30ca8488e0e..5a3b93fa3da 100644 --- a/public/js/report-legacy.js +++ b/public/js/report-legacy.js @@ -33,7 +33,7 @@ _r.ReportBuilder.prototype.select_column=function(dt,label,value){if(value==null _r.ReportBuilder.prototype.set_filter=function(dt,label,value){if(this.filter_fields_dict[dt+'\1'+label]) this.filter_fields_dict[dt+'\1'+label].set_input(value);} _r.ReportBuilder.prototype.load_criteria=function(criteria_name){this.clear_criteria();if(!this.sc_dict[criteria_name]){alert(criteria_name+' could not be loaded. Please Refresh and try again');} -this.sc=locals['Search Criteria'][this.sc_dict[criteria_name]];var report=this;if(this.sc&&this.sc.report_script)eval(this.sc.report_script);this.large_report=0;if(report.customize_filters){try{report.customize_filters(this);}catch(err){errprint('Error in "customize_filters":\n'+err);}} +this.sc=locals['Search Criteria'][this.sc_dict[criteria_name]];var report=this;if(this.sc&&this.sc.report_script)eval(this.sc.report_script);this.large_report=0;if(report.customize_filters){try{report.customize_filters(this);}catch(err){console.log('Error in "customize_filters":\n'+err);}} this.report_filters.refresh();this.column_picker.clear();var cl=this.sc.columns?this.sc.columns.split(','):[];for(var c=0;c Date: Mon, 10 Sep 2012 14:13:01 +0530 Subject: [PATCH 2/2] check match conditions for companies list in chart of accounts/cost center --- .../page/accounts_browser/accounts_browser.js | 20 +++++++------------ .../page/accounts_browser/accounts_browser.py | 16 ++++++++++++++- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/erpnext/accounts/page/accounts_browser/accounts_browser.js b/erpnext/accounts/page/accounts_browser/accounts_browser.js index 4f35fd41568..c58f73c5642 100644 --- a/erpnext/accounts/page/accounts_browser/accounts_browser.js +++ b/erpnext/accounts/page/accounts_browser/accounts_browser.js @@ -22,7 +22,12 @@ pscript['onload_Accounts Browser'] = function(wrapper){ wrapper.appframe = new wn.ui.AppFrame($(wrapper).find('.appframe-area')); - wrapper.appframe.add_button('New Company', function() { newdoc('Company'); }, 'icon-plus'); + + if (wn.boot.profile.can_create.indexOf("Company") !== -1) { + wrapper.appframe.add_button('New Company', function() { newdoc('Company'); }, + 'icon-plus'); + } + wrapper.appframe.add_button('Refresh', function() { wrapper.$company_select.change(); }, 'icon-refresh'); @@ -35,17 +40,6 @@ pscript['onload_Accounts Browser'] = function(wrapper){ }) .appendTo(wrapper.appframe.$w.find('.appframe-toolbar')); - // default company - if(sys_defaults.company) { - $('