Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/build.json b/build.json
index 635e73d..1aa3b20 100644
--- a/build.json
+++ b/build.json
@@ -81,7 +81,6 @@
"lib/js/core.min.js:concat",
"lib/js/legacy/globals.js",
"lib/js/legacy/utils/datatype.js",
- "lib/js/legacy/utils/browser_detect.js",
"lib/js/legacy/utils/datetime.js",
"lib/js/legacy/utils/dom.js",
"lib/js/legacy/utils/handler.js",
@@ -125,7 +124,6 @@
"lib/js/core.min.js:concat",
"lib/js/legacy/globals.js",
"lib/js/legacy/utils/datatype.js",
- "lib/js/legacy/utils/browser_detect.js",
"lib/js/legacy/utils/datetime.js",
"lib/js/legacy/utils/dom.js",
"lib/js/legacy/utils/handler.js",
diff --git a/css/all-app.css b/css/all-app.css
index f3a07ec..2ac3c75 100644
--- a/css/all-app.css
+++ b/css/all-app.css
@@ -2766,6 +2766,7 @@
}
body {
+ background: url(../erpnext/images/stripedbg.png) repeat;
}
.erpnext-footer {
diff --git a/css/all-web.css b/css/all-web.css
index 967c32b..9b4ef72 100644
--- a/css/all-web.css
+++ b/css/all-web.css
@@ -1574,6 +1574,7 @@
}
body {
+ background: url(../erpnext/images/stripedbg.png) repeat;
}
.erpnext-footer {
diff --git a/erpnext/setup/doctype/item_group/item_group.py b/erpnext/setup/doctype/item_group/item_group.py
index a3ed364..b43523d 100644
--- a/erpnext/setup/doctype/item_group/item_group.py
+++ b/erpnext/setup/doctype/item_group/item_group.py
@@ -8,11 +8,11 @@
#
# 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
+# 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/>.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Please edit this list and import only required elements
import webnotes
@@ -34,33 +34,33 @@
class DocType:
- def __init__(self,d,dl):
- self.doc, self.doclist = d,dl
- self.nsm_parent_field = 'parent_item_group';
+ def __init__(self,d,dl):
+ self.doc, self.doclist = d,dl
+ self.nsm_parent_field = 'parent_item_group';
- # update Node Set Model
- def update_nsm_model(self):
- import webnotes
- import webnotes.utils.nestedset
- webnotes.utils.nestedset.update_nsm(self)
+ # update Node Set Model
+ def update_nsm_model(self):
+ import webnotes
+ import webnotes.utils.nestedset
+ webnotes.utils.nestedset.update_nsm(self)
- # ON UPDATE
- #--------------------------------------
- def on_update(self):
- # update nsm
- self.update_nsm_model()
+ # ON UPDATE
+ #--------------------------------------
+ def on_update(self):
+ # update nsm
+ self.update_nsm_model()
- def validate(self):
- if self.doc.lft and self.doc.rgt:
- res = sql("select name from `tabItem Group` where is_group = 'Yes' and docstatus!= 2 and (rgt > %s or lft < %s) and name ='%s' and name !='%s'"%(self.doc.rgt,self.doc.lft,self.doc.parent_item_group,self.doc.item_group_name))
- if not res:
- msgprint("Please enter proper parent item group.")
- raise Exception
-
- r = sql("select name from `tabItem Group` where name = '%s' and docstatus = 2"%(self.doc.item_group_name))
- if r:
- msgprint("'%s' record is trashed. To untrash please go to Setup & click on Trash."%(self.doc.item_group_name))
- raise Exception
+ def validate(self):
+ if self.doc.lft and self.doc.rgt:
+ res = sql("select name from `tabItem Group` where is_group = 'Yes' and docstatus!= 2 and (rgt > %s or lft < %s) and name ='%s' and name !='%s'"%(self.doc.rgt,self.doc.lft,self.doc.parent_item_group,self.doc.item_group_name))
+ if not res:
+ msgprint("Please enter proper parent item group.")
+ raise Exception
+
+ r = sql("select name from `tabItem Group` where name = '%s' and docstatus = 2"%(self.doc.item_group_name))
+ if r:
+ msgprint("'%s' record is trashed. To untrash please go to Setup & click on Trash."%(self.doc.item_group_name))
+ raise Exception
def on_trash(self):
ig = sql("select name from `tabItem` where ifnull(item_group, '') = %s", self.doc.name)
diff --git a/erpnext/startup/startup.css b/erpnext/startup/startup.css
index 1ce0264..64d6dea 100644
--- a/erpnext/startup/startup.css
+++ b/erpnext/startup/startup.css
@@ -13,6 +13,7 @@
}
body {
+ background: url(../erpnext/images/stripedbg.png) repeat;
}
.erpnext-footer {
diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js
index 6448574..ecd4a4d 100644
--- a/erpnext/startup/startup.js
+++ b/erpnext/startup/startup.js
@@ -46,6 +46,10 @@
erpnext.startup.start = function() {
$('#startup_div').html('Starting up...').toggle(true);
+ if(!erpnext.check_browser_support())
+ return;
+
+
erpnext.startup.set_globals();
if(wn.boot.custom_css) {
@@ -86,6 +90,29 @@
$('#startup_div').toggle(false);
}
+erpnext.check_browser_support = function() {
+ var is_supported = function() {
+ if($.browser.mozilla && flt($.browser.version)<4) return false;
+ if($.browser.msie && flt($.browser.version)<9) return false;
+ if($.browser.webkit && flt($.browser.version)<534) return false;
+ return true;
+ }
+ var s = is_supported();
+ if(!s) {
+ $('body').html('<div style="width: 900px; margin: 20px auto; padding: 20px;\
+ background-color: #fff; border: 2px solid #aaa; font-family: Arial">\
+ <h3>Unsupported Browser</h3> \
+ <p><i>ERPNext requires a modern web browser to function correctly</i></p> \
+ <p>Supported browsers are: \
+ <ul><li><a href="http://mozilla.com/firefox">Mozilla Firfox 4+</a>, \
+ <li><a href="http://google.com/chrome">Google Chorme 14+</a>, \
+ <li><a href="http://apple.com/safari">Apple Safari 5+</a>, \
+ <li><a href="http://ie.microsoft.com">Microsoft Internet Explorer 9+</a>, \
+ <li><a href="http://www.opera.com/">Opera</a></p></ul>')
+ }
+ return s;
+}
+
// chart of accounts
// ====================================================================
show_chart_browser = function(nm, chart_type){
diff --git a/images/stripedbg.png b/images/stripedbg.png
new file mode 100755
index 0000000..64ece57
--- /dev/null
+++ b/images/stripedbg.png
Binary files differ
diff --git a/js/all-app.js b/js/all-app.js
index 24bd724..bcdcbfd 100644
--- a/js/all-app.js
+++ b/js/all-app.js
Binary files differ
diff --git a/js/all-web.js b/js/all-web.js
index 08e84bf..9e07a03 100644
--- a/js/all-web.js
+++ b/js/all-web.js
@@ -239,14 +239,6 @@
return bestguess+comma+' '+in_words(remainder);}else{return bestguess;}}
function roundNumber(num,dec){var result=Math.round(num*Math.pow(10,dec))/Math.pow(10,dec);return result;}
/*
- * lib/js/legacy/utils/browser_detect.js
- */
-var appVer=navigator.appVersion.toLowerCase();var is_minor=parseFloat(appVer);var is_major=parseInt(is_minor);var iePos=appVer.indexOf('msie');if(iePos!=-1){is_minor=parseFloat(appVer.substring(iePos+5,appVer.indexOf(';',iePos)))
-is_major=parseInt(is_minor);}
-var isIE=(iePos!=-1);var isIE6=(isIE&&is_major<=6);var isIE7=(isIE&&is_major>=7);if(/Firefox[\/\s](\d+\.\d+)/.test(navigator.userAgent)){var isFF=1;var ffversion=new Number(RegExp.$1)
-if(ffversion>=3)var isFF3=1;else if(ffversion>=2)var isFF2=1;else if(ffversion>=1)var isFF1=1;}
-var isSafari=navigator.userAgent.indexOf('Safari')!=-1?1:0;var isChrome=navigator.userAgent.indexOf('Chrome')!=-1?1:0;
-/*
* lib/js/legacy/utils/datetime.js
*/
function same_day(d1,d2){if(d1.getFullYear()==d2.getFullYear()&&d1.getMonth()==d2.getMonth()&&d1.getDate()==d2.getDate())return true;else return false;}
@@ -390,7 +382,7 @@
var outUrl="index.cgi";var NULL_CHAR='^\5*';function checkResponse(r,on_timeout,no_spinner,freeze_msg){try{if(r.readyState==4&&r.status==200)return true;else return false;}catch(e){msgprint("error:Request timed out, try again");if(on_timeout)
on_timeout();hide_loading();if(freeze_msg)
unfreeze();return false;}}
-var pending_req=0;function newHttpReq(){if(!isIE)
+var pending_req=0;function newHttpReq(){if(!$.browser.msie)
var r=new XMLHttpRequest();else if(window.ActiveXObject)
var r=new ActiveXObject("Microsoft.XMLHTTP");return r;}
function $c(command,args,fn,on_timeout,no_spinner,freeze_msg,btn){var req=newHttpReq();ret_fn=function(){if(checkResponse(req,on_timeout,no_spinner,freeze_msg)){if(btn)$(btn).done_working();if(!no_spinner)
@@ -835,7 +827,7 @@
/*
* lib/js/legacy/webpage/freeze_page.js
*/
-var fcount=0;var frozen=0;var dialog_message;var dialog_back;function freeze(msg,do_freeze){if(!dialog_back){dialog_back=$a($i('body_div'),'div','dialog_back');if(isIE)dialog_back.style['filter']='alpha(opacity=60)';}
+var fcount=0;var frozen=0;var dialog_message;var dialog_back;function freeze(msg,do_freeze){if(!dialog_back){dialog_back=$a($i('body_div'),'div','dialog_back');$(dialog_back).css('opacity',0.6);}
$ds(dialog_back);fcount++;frozen=1;}
function unfreeze(){if(dialog_message)
$dh(dialog_message);if(!fcount)return;fcount--;if(!fcount){$dh(dialog_back);frozen=0;}}
@@ -1080,12 +1072,25 @@
var current_module;var is_system_manager=0;wn.provide('erpnext.startup');erpnext.modules={'Selling':'selling-home','Accounts':'accounts-home','Stock':'stock-home','Buying':'buying-home','Support':'support-home','Projects':'projects-home','Production':'production-home','Website':'website-home','HR':'hr-home','Setup':'Setup','Activity':'activity','To Do':'todo','Calendar':'calendar','Messages':'messages','Knowledge Base':'questions','Dashboard':'dashboard'}
erpnext.startup.set_globals=function(){pscript.is_erpnext_saas=cint(wn.control_panel.sync_with_gateway)
if(inList(user_roles,'System Manager'))is_system_manager=1;}
-erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
+erpnext.startup.start=function(){$('#startup_div').html('Starting up...').toggle(true);if(!erpnext.check_browser_support())
+return;erpnext.startup.set_globals();if(wn.boot.custom_css){set_style(wn.boot.custom_css);}
if(wn.boot.user_background){erpnext.set_user_background(wn.boot.user_background);}
if(user=='Guest'){if(wn.boot.website_settings.title_prefix){wn.title_prefix=wn.boot.website_settings.title_prefix;}}else{wn.boot.profile.allow_modules=wn.boot.profile.allow_modules.concat(['To Do','Knowledge Base','Calendar','Activity','Messages'])
erpnext.toolbar.setup();erpnext.startup.set_periodic_updates();$('footer').html('<div class="web-footer erpnext-footer">\
<a href="#!attributions">ERPNext | Attributions and License</a></div>');if(in_list(user_roles,'System Manager')&&(wn.boot.setup_complete=='No')){wn.require("erpnext/startup/js/complete_setup.js");erpnext.complete_setup();}}
$('#startup_div').toggle(false);}
+erpnext.check_browser_support=function(){var is_supported=function(){if($.browser.mozilla&&flt($.browser.version)<4)return false;if($.browser.msie&&flt($.browser.version)<9)return false;if($.browser.webkit&&flt($.browser.version)<534)return false;return true;}
+var s=is_supported();if(!s){$('body').html('<div style="width: 900px; margin: 20px auto; padding: 20px;\
+ background-color: #fff; border: 2px solid #aaa; font-family: Arial">\
+ <h3>Unsupported Browser</h3> \
+ <p><i>ERPNext requires a modern web browser to function correctly</i></p> \
+ <p>Supported browsers are: \
+ <ul><li><a href="http://mozilla.com/firefox">Mozilla Firfox 4+</a>, \
+ <li><a href="http://google.com/chrome">Google Chorme 14+</a>, \
+ <li><a href="http://apple.com/safari">Apple Safari 5+</a>, \
+ <li><a href="http://ie.microsoft.com">Microsoft Internet Explorer 9+</a>, \
+ <li><a href="http://www.opera.com/">Opera</a></p></ul>')}
+return s;}
show_chart_browser=function(nm,chart_type){var call_back=function(){if(nm=='Sales Browser'){var sb_obj=new SalesBrowser();sb_obj.set_val(chart_type);}
else if(nm=='Accounts Browser')
pscript.make_chart(chart_type);}
diff --git a/version.num b/version.num
index e791c50..25c4e52 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-787
+796
\ No newline at end of file
