Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/erpnext/home/page/my_company/my_company.js b/erpnext/home/page/my_company/my_company.js
index 6a90550..ccda765 100644
--- a/erpnext/home/page/my_company/my_company.js
+++ b/erpnext/home/page/my_company/my_company.js
@@ -638,17 +638,17 @@
this.input_wrapper = $a(this.wrapper, 'div', 'my-company-input-wrapper');
var tab = make_table(this.input_wrapper, 1, 2, '100%', ['64%','36%'], {padding: '3px'})
this.input = $a($td(tab,0,0), 'textarea');
- $(this.input).add_default_text( 'Send a message to ' + fullname);
// button
var div = $a(this.input_wrapper, 'div');
this.post = $btn(div, 'Post'.bold(), function() { me.post_message(); }, {margin:'0px 13px 0px 3px'})
- this.post.set_disabled();
+ this.post.disabled = true;
+
this.input.onkeyup = this.input.onchange = function() {
if(this.value) {
- me.post.set_enabled();
+ me.post.disabled = false;
} else {
- me.post.set_disabled();
+ me.post.disabled = true;
}
}
diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py
index e599e7b..73c3a1e 100644
--- a/erpnext/setup/doctype/email_digest/email_digest.py
+++ b/erpnext/setup/doctype/email_digest/email_digest.py
@@ -318,8 +318,8 @@
WHERE
docstatus < 2 AND
%(company_condition)s
- creation >= '%(start_date)s' AND
- creation <= '%(end_date)s'""" % args
+ DATE(creation) >= '%(start_date)s' AND
+ DATE(creation) <= '%(end_date)s'""" % args
return query