From 34b9f5b1e0a5e10179946d27cb0abf1dfc9ba090 Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 30 Dec 2011 16:02:03 +0530 Subject: [PATCH 1/2] Fix new transaction entries issue --- erpnext/setup/doctype/email_digest/email_digest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/setup/doctype/email_digest/email_digest.py b/erpnext/setup/doctype/email_digest/email_digest.py index e599e7b058..73c3a1ee7a 100644 --- a/erpnext/setup/doctype/email_digest/email_digest.py +++ b/erpnext/setup/doctype/email_digest/email_digest.py @@ -318,8 +318,8 @@ class DocType: 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 From 1fad05aed8c21287f9d3c64a90a4ffafad912bec Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Mon, 2 Jan 2012 16:00:15 +0530 Subject: [PATCH 2/2] Bug Fix: Posting comments to other users now working --- erpnext/home/page/my_company/my_company.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/erpnext/home/page/my_company/my_company.js b/erpnext/home/page/my_company/my_company.js index 6a905501eb..ccda765460 100644 --- a/erpnext/home/page/my_company/my_company.js +++ b/erpnext/home/page/my_company/my_company.js @@ -638,17 +638,17 @@ MemberConversation = function(parent, uid, fullname) { 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; } }