From 385380125b5d00e8c52d7c25c1966f38b74e3f7c Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 18 Apr 2012 16:04:02 +0530 Subject: [PATCH] fixes in customize form, naming series form loading --- .../cash_flow_statement/cash_flow_statement.txt | 6 +++--- erpnext/setup/doctype/naming_series/naming_series.js | 2 +- erpnext/support/doctype/support_ticket/__init__.py | 2 +- js/all-app.js | 3 +-- js/all-web.js | 3 +-- 5 files changed, 7 insertions(+), 9 deletions(-) diff --git a/erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.txt b/erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.txt index 1d33298b03..a9e748e098 100644 --- a/erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.txt +++ b/erpnext/accounts/search_criteria/cash_flow_statement/cash_flow_statement.txt @@ -3,9 +3,9 @@ # These values are common in all dictionaries { - 'creation': '2012-04-03 12:49:50', + 'creation': '2012-04-11 17:36:48', 'docstatus': 0, - 'modified': '2012-04-03 12:49:50', + 'modified': '2012-04-18 12:17:52', 'modified_by': u'Administrator', 'owner': u'Administrator' }, @@ -14,7 +14,7 @@ { 'columns': u'Account\x01ID', 'criteria_name': u'Cash Flow Statement', - 'dis_filters': u'fiscal_year\ntransaction_date', + 'dis_filters': u'fiscal_year', 'doc_type': u'Account', 'doctype': 'Search Criteria', 'filters': u"{'Account\x01Group or Ledger':'Ledger','Account\x01Is PL Account':'','Account\x01Is Active':'','Account\x01Account Type':'','Account\x01Company':'','Account\x01Fiscal Year':'','Account\x01Show Group Balance':'','Account\x01Level':'2'}", diff --git a/erpnext/setup/doctype/naming_series/naming_series.js b/erpnext/setup/doctype/naming_series/naming_series.js index 799adb7421..c7897e44f5 100644 --- a/erpnext/setup/doctype/naming_series/naming_series.js +++ b/erpnext/setup/doctype/naming_series/naming_series.js @@ -27,7 +27,7 @@ cur_frm.cscript.onload = function(doc, cdt, cdn){ cur_frm.cscript.refresh = function(doc, cdt, cdn) { // hide buttons - $(cur_frm.frm_head.page_head.toolbar_area).toggle(false); + $('.appframe-toolbar').toggle(false); } cur_frm.cscript.select_doc_for_series = function(doc, cdt, cdn) { diff --git a/erpnext/support/doctype/support_ticket/__init__.py b/erpnext/support/doctype/support_ticket/__init__.py index 9843213221..d74580854e 100644 --- a/erpnext/support/doctype/support_ticket/__init__.py +++ b/erpnext/support/doctype/support_ticket/__init__.py @@ -96,7 +96,7 @@ class SupportMailbox(POP3Mailbox): d.raised_by = mail.mail['From'] d.content_type = content_type d.status = 'Open' - d.naming_series = (opts and opts.split("\n")[0]) or 'SUP' + d.naming_series = opts and opts.split("\n")[0] or 'SUP' try: d.save(1) except: diff --git a/js/all-app.js b/js/all-app.js index 962d2147c7..511c961ca8 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -450,8 +450,7 @@ wn.container.change_to('Form - '+dt);wn.views.formview[dt].frm.refresh(dn);});}) * lib/js/wn/views/reportview.js */ wn.views.reportview={show:function(dt,rep_name){wn.require('lib/js/legacy/report.compressed.js');dt=get_label_doctype(dt);if(!_r.rb_con){_r.rb_con=new _r.ReportContainer();} -_r.rb_con.set_dt(dt,function(rb){if(rep_name){var t=rb.current_loaded;rb.load_criteria(rep_name);if((rb.dt)&&(!rb.dt.has_data()||rb.current_loaded!=t)) -rb.dt.run();} +_r.rb_con.set_dt(dt,function(rb){if(rep_name){var t=rb.current_loaded;rb.load_criteria(rep_name);if((rb.dt)&&(!rb.dt.has_data()||rb.current_loaded!=t)){rb.dt.run();}} if(!rb.forbidden){wn.container.change_to('Report Builder');}});}} /* * lib/js/wn/request.js diff --git a/js/all-web.js b/js/all-web.js index 27a673af5f..745a97157e 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -337,8 +337,7 @@ wn.container.change_to('Form - '+dt);wn.views.formview[dt].frm.refresh(dn);});}) * lib/js/wn/views/reportview.js */ wn.views.reportview={show:function(dt,rep_name){wn.require('lib/js/legacy/report.compressed.js');dt=get_label_doctype(dt);if(!_r.rb_con){_r.rb_con=new _r.ReportContainer();} -_r.rb_con.set_dt(dt,function(rb){if(rep_name){var t=rb.current_loaded;rb.load_criteria(rep_name);if((rb.dt)&&(!rb.dt.has_data()||rb.current_loaded!=t)) -rb.dt.run();} +_r.rb_con.set_dt(dt,function(rb){if(rep_name){var t=rb.current_loaded;rb.load_criteria(rep_name);if((rb.dt)&&(!rb.dt.has_data()||rb.current_loaded!=t)){rb.dt.run();}} if(!rb.forbidden){wn.container.change_to('Report Builder');}});}} /* * lib/js/wn/request.js