Merge branch 'shf_rename' of github.com:webnotes/erpnext into shf_rename
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 1d33298..a9e748e 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 799adb7..c7897e44 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.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 9843213..d745808 100644
--- a/erpnext/support/doctype/support_ticket/__init__.py
+++ b/erpnext/support/doctype/support_ticket/__init__.py
@@ -96,7 +96,7 @@
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 8be8069..b68a485 100644
--- a/js/all-app.js
+++ b/js/all-app.js
@@ -454,8 +454,7 @@
* 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 db20e57..8a1be4a 100644
--- a/js/all-web.js
+++ b/js/all-web.js
@@ -341,8 +341,7 @@
* 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