'+p(d)+"")}),a},w,x=function(a){a+="~0";var b=/^(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/gm;return e?a=a.replace(b,function(a,b,c){var d=b,e=c.search(/[*+-]/g)>-1?"ul":"ol";d=d.replace(/\n{2,}/g,"\n\n\n");var f=w(d);return f=f.replace(/\s+$/,""),f="<"+e+">"+f+"\n",f}):(b=/(\n\n|^\n?)(([ ]{0,3}([*+-]|\d+[.])[ \t]+)[^\r]+?(~0|\n{2,}(?=\S)(?![ \t]*(?:[*+-]|\d+[.])[ \t]+)))/g,a=a.replace(b,function(a,b,c,d){var e=b,f=c,g=d.search(/[*+-]/g)>-1?"ul":"ol",f=f.replace(/\n{2,}/g,"\n\n\n"),h=w(f);return h=e+"<"+g+">\n"+h+"\n",h})),a=a.replace(/~0/,""),a};w=function(a){return e++,a=a.replace(/\n{2,}$/,"\n"),a+="~0",a=a.replace(/(\n)?(^[ \t]*)([*+-]|\d+[.])[ \t]+([^\r]+?(\n{1,2}))(?=\n*(~0|\2([*+-]|\d+[.])[ \t]+))/gm,function(a,b,c,d,e){var f=e,g=b,h=c;return g||f.search(/\n{2,}/)>-1?f=o(L(f)):(f=x(L(f)),f=f.replace(/\n$/,""),f=p(f)),""+f+"\n"}),a=a.replace(/~0/g,""),e--,a};var y=function(a){return a+="~0",a=a.replace(/(?:\n\n|^)((?:(?:[ ]{4}|\t).*\n+)+)(\n*[ ]{0,3}[^ \t\n]|(?=~0))/g,function(a,b,c){var d=b,e=c;return d=C(L(d)),d=M(d),d=d.replace(/^\n+/g,""),d=d.replace(/\n+$/g,""),d=""+d+"\n
",A(d)+e}),a=a.replace(/~0/,""),a},z=function(a){return a+="~0",a=a.replace(/(?:^|\n)```(.*)\n([\s\S]*?)\n```/g,function(a,b,c){var d=b,e=c;return e=C(e),e=M(e),e=e.replace(/^\n+/g,""),e=e.replace(/\n+$/g,""),e=""+e+"\n
",A(e)}),a=a.replace(/~0/,""),a},A=function(a){return a=a.replace(/(^\n+|\n+$)/g,""),"\n\n~K"+(d.push(a)-1)+"K\n\n"},B=function(a){return a=a.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm,function(a,b,c,d,e){var f=d;return f=f.replace(/^([ \t]*)/g,""),f=f.replace(/[ \t]*$/g,""),f=C(f),b+""+f+""}),a},C=function(a){return a=a.replace(/&/g,"&"),a=a.replace(//g,">"),a=N(a,"*_{}[]\\",!1),a},D=function(a){return a=a.replace(/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g,"$2"),a=a.replace(/(\*|_)(?=\S)([^\r]*?\S)\1/g,"$2"),a},E=function(a){return a=a.replace(/((^[ \t]*>[ \t]?.+\n(.+\n)*\n*)+)/gm,function(a,b){var c=b;return c=c.replace(/^[ \t]*>[ \t]?/gm,"~0"),c=c.replace(/~0/g,""),c=c.replace(/^[ \t]+$/gm,""),c=o(c),c=c.replace(/(^|\n)/g,"$1 "),c=c.replace(/(\s*[^\r]+?<\/pre>)/gm,function(a,b){var c=b;return c=c.replace(/^ /mg,"~0"),c=c.replace(/~0/g,""),c}),A("\n"+c+"\n
")}),a},F=function(a){a=a.replace(/^\n+/g,""),a=a.replace(/\n+$/g,"");var b=a.split(/\n{2,}/g),c=[],e=b.length;for(var f=0;f=0?c.push(g):g.search(/\S/)>=0&&(g=p(g),g=g.replace(/^([ \t]*)/g,""),g+="
",c.push(g))}e=c.length;for(var f=0;f=0){var h=d[RegExp.$1];h=h.replace(/\$/g,"$$$$"),c[f]=c[f].replace(/~K\d+K/,h)}return c.join("\n\n")},G=function(a){return a=a.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g,"&"),a=a.replace(/<(?![a-z\/?\$!])/gi,"<"),a},H=function(a){return a=a.replace(/\\(\\)/g,O),a=a.replace(/\\([`*_{}\[\]()>#+-.!])/g,O),a},I=function(a){return a=a.replace(/<((https?|ftp|dict):[^'">\s]+)>/gi,'$1'),a=a.replace(/<(?:mailto:)?([-.\w]+\@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>/gi,function(a,b){return J(K(b))}),a},J=function(a){var b=[function(a){return"&#"+a.charCodeAt(0)+";"},function(a){return"&#x"+a.charCodeAt(0).toString(16)+";"},function(a){return a}];return a="mailto:"+a,a=a.replace(/./g,function(a){if(a=="@")a=b[Math.floor(Math.random()*2)](a);else if(a!=":"){var c=Math.random();a=c>.9?b[2](a):c>.45?b[1](a):b[0](a)}return a}),a=''+a+"",a=a.replace(/">.+:/g,'">'),a},K=function(a){return a=a.replace(/~E(\d+)E/g,function(a,b){var c=parseInt(b);return String.fromCharCode(c)}),a},L=function(a){return a=a.replace(/^(\t|[ ]{1,4})/gm,"~0"),a=a.replace(/~0/g,""),a},M=function(a){return a=a.replace(/\t(?=\t)/g," "),a=a.replace(/\t/g,"~A~B"),a=a.replace(/~B(.+?)~A/g,function(a,b,c){var d=b,e=4-d.length%4;for(var f=0;f
').insertAfter(module_top); + $('
').css({"margin-top": "0px"}) + .insertAfter(module_top); } else { var list_group = $('
\- \
diff --git a/public/js/wn/views/query_report.js b/public/js/wn/views/query_report.js
index 318dd356d5..e1664969fb 100644
--- a/public/js/wn/views/query_report.js
+++ b/public/js/wn/views/query_report.js
@@ -227,15 +227,17 @@ wn.views.QueryReport = Class.extend({
},
make_data: function(result, columns) {
var me = this;
- this.data = $.map(result, function(row, row_idx) {
+ this.data = [];
+ for(var row_idx=0, l=result.length; row_idx < l; row_idx++) {
+ var row = result[row_idx];
var newrow = {};
- for(var i=1, j=me.columns.length; i
- #login_wrapper {
- width: 330px;
- margin: 70px auto;
- }
-
- #login_wrapper,
- #login_wrapper h3 {
- color: #333;
- }
-
- #login_wrapper a {
- color: #0088cc;
- }
-
- .layout-wrapper {
- background-color: #fff;
- padding: 10px;
- box-shadow: 1px 1px 3px 3px #ccc;
- font-size: 12px;
- min-height: 100px;
- border-radius: 5px;
- }
-
- #login_wrapper h3 {
- text-align: center;
- }
-
- .login-banner {
- margin-bottom: 20px;
- }
-
- .login-box td {
- padding: 8px;
- }
- .login-box td input {
- margin-bottom: 0px;
- }
- .login-footer {
- text-align: center;
- padding: 15px;
- }
-
\ No newline at end of file
diff --git a/templates/js/login.js b/templates/js/login.js
index 7f50c83540..155f8225fd 100644
--- a/templates/js/login.js
+++ b/templates/js/login.js
@@ -6,12 +6,9 @@ $(document).ready(function(wrapper) {
$('#login_btn').click(login.do_login);
- $('#password').keypress(function(ev){
- if(ev.which==13 && $('#password').val()) {
- $('form').submit(function() {
- login.do_login();
- return false;
- });
+ $('#pass').keypress(function(ev){
+ if(ev.which==13 && $('#pass').val()) {
+ $("#login_btn").click();
}
});
$(document).trigger('login_rendered');
@@ -41,7 +38,7 @@ login.do_login = function(){
} else {
args.cmd = "login"
args.usr = ($("#login_id").val() || "").trim();
- args.pwd = $("#password").val();
+ args.pwd = $("#pass").val();
if(!args.usr || !args.pwd) {
login.set_message("Both login and password required.");
@@ -85,7 +82,7 @@ login.show_login = function() {
$("#password-row").toggle(true);
$("#full-name-row, #login_message").toggle(false);
$("#login_btn").html("Login").removeClass("btn-success");
- $("#switch-view").html('Forgot Password?');
if(!disable_signup) {
diff --git a/templates/pages/login.html b/templates/pages/login.html
index 70762dcec4..26c44f7275 100644
--- a/templates/pages/login.html
+++ b/templates/pages/login.html
@@ -4,58 +4,56 @@
- {% include "lib/templates/css/login.css" %}
+
{% endblock %}
{% set title="Login" %}
{% block body %}
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
-
- Home |
- ERPNext
© {{ copyright }}
- {% endif %}
+
+
+ Home | ERPNext
© {{ copyright }}
+ {% endif %}
+
+
{% endblock %}
\ No newline at end of file
diff --git a/webnotes/__init__.py b/webnotes/__init__.py
index 3c6113b2a5..93bdf11a7b 100644
--- a/webnotes/__init__.py
+++ b/webnotes/__init__.py
@@ -479,6 +479,7 @@ def get_config():
def update_config(path):
with open(path, "r") as configfile:
this_config = json.loads(configfile.read())
+ _config.app_name = this_config.get("app_name")
_config.modules.update(this_config["modules"])
_config.web.pages.update(this_config["web"]["pages"])
_config.web.generators.update(this_config["web"]["generators"])
diff --git a/webnotes/auth.py b/webnotes/auth.py
index 76db23d55f..3521ef6b06 100644
--- a/webnotes/auth.py
+++ b/webnotes/auth.py
@@ -156,10 +156,12 @@ class LoginManager:
from startup import event_handlers
if hasattr(event_handlers, method):
getattr(event_handlers, method)(self)
- return
except ImportError, e:
pass
+ cp = webnotes.bean("Control Panel", "Control Panel")
+ cp.run_method(method)
+
def validate_ip_address(self):
"""check if IP Address is valid"""
ip_list = webnotes.conn.get_value('Profile', self.user, 'restrict_ip', ignore=True)
diff --git a/webnotes/db.py b/webnotes/db.py
index 7af2839490..6ae170aa1a 100644
--- a/webnotes/db.py
+++ b/webnotes/db.py
@@ -19,7 +19,8 @@ class Database:
def __init__(self, host=None, user=None, password=None, ac_name=None, use_default = 0):
self.host = host or 'localhost'
self.user = user or conf.db_name
-
+ self.in_transaction = False
+
if ac_name:
self.user = self.get_db_login(ac_name) or conf.db_name
@@ -430,14 +431,18 @@ class Database:
return webnotes.defaults.get_defaults(parent)
def begin(self):
- return # not required
+ if not self.in_transaction:
+ self.sql("start transaction")
+ self.in_transaction = True
def commit(self):
self.sql("commit")
+ self.in_transaction = False
def rollback(self):
self.sql("ROLLBACK")
self.transaction_writes = 0
+ self.in_transaction = False
def field_exists(self, dt, fn):
return self.sql("select name from tabDocField where fieldname=%s and parent=%s", (dt, fn))
diff --git a/webnotes/install_lib/install.py b/webnotes/install_lib/install.py
index 012b906395..2a35874345 100755
--- a/webnotes/install_lib/install.py
+++ b/webnotes/install_lib/install.py
@@ -31,7 +31,7 @@ class Installer:
def import_from_db(self, target, source_path='', password = 'admin', verbose=0):
"""
a very simplified version, just for the time being..will eventually be deprecated once the framework stabilizes.
- """
+ """
# delete user (if exists)
self.dbman.delete_user(target)
@@ -73,6 +73,7 @@ class Installer:
# update admin password
self.create_auth_table()
self.update_admin_password(password)
+
return target
def install_app(self):
diff --git a/webnotes/model/code.py b/webnotes/model/code.py
index c5d5638961..e1b9d4e1c3 100644
--- a/webnotes/model/code.py
+++ b/webnotes/model/code.py
@@ -83,9 +83,10 @@ def get_server_obj(doc, doclist = [], basedoctype = ''):
# custom?
custom_script = get_custom_server_script(doc.doctype)
+
if custom_script:
global custom_class
-
+
exec custom_class + custom_script.replace('\t',' ') in locals()
return CustomDocType(doc, doclist)
diff --git a/webnotes/utils/__init__.py b/webnotes/utils/__init__.py
index a6d8bd78ae..1ac874a7d5 100644
--- a/webnotes/utils/__init__.py
+++ b/webnotes/utils/__init__.py
@@ -8,6 +8,7 @@ import webnotes
user_time_zone = None
user_format = None
+current_date = None
no_value_fields = ['Section Break', 'Column Break', 'HTML', 'Table', 'FlexTable',
'Button', 'Image', 'Graph']
@@ -193,7 +194,10 @@ def convert_utc_to_user_timezone(utc_timestamp):
def now():
"""return current datetime as yyyy-mm-dd hh:mm:ss"""
- return now_datetime().strftime('%Y-%m-%d %H:%M:%S')
+ if current_date:
+ return getdate(current_date).strftime("%Y-%m-%d") + " " + now_datetime().strftime('%H:%M:%S')
+ else:
+ return now_datetime().strftime('%Y-%m-%d %H:%M:%S')
def nowdate():
"""return current date as yyyy-mm-dd"""
diff --git a/webnotes/utils/scheduler.py b/webnotes/utils/scheduler.py
index 7fe88ef2d7..f5db923717 100644
--- a/webnotes/utils/scheduler.py
+++ b/webnotes/utils/scheduler.py
@@ -4,7 +4,7 @@
from __future__ import unicode_literals
"""
Scheduler will call the following events from the module
-`startup.schedule_handler`
+`startup.schedule_handler` and Control Panel (for server scripts)
execute_always
execute_daily
@@ -74,6 +74,12 @@ def trigger(method):
except Exception:
return log(method)
+
+ try:
+ cp = webnotes.bean("Control Panel", "Control Panel")
+ cp.run_method(method)
+ except Exception:
+ return log(method)
def log(method):
"""log error in patch_log"""
diff --git a/wnf.py b/wnf.py
index b7bb645bcc..4f29493067 100755
--- a/wnf.py
+++ b/wnf.py
@@ -398,12 +398,12 @@ def run():
inst.import_from_db(options.install_fresh, verbose = 1)
elif options.make_demo:
- import utilities.make_demo
- utilities.make_demo.make()
+ import utilities.demo.make_demo
+ utilities.demo.make_demo.make()
elif options.make_demo_fresh:
- import utilities.make_demo
- utilities.make_demo.make(True)
+ import utilities.demo.make_demo
+ utilities.demo.make_demo.make(True)
elif options.diff_ref_file is not None:
import webnotes.modules.diff
Login
- -- - +
Login
+- {% if copyright %} -
+ {% if copyright %} +