nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-06-05 13:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait
2012-01-03 11:10:25 +05:30
parent db126e80b8 1e4b8be8dc
commit 616548f95c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
erpnext/home/page/my_company/my_company.js
View File

@@ -638,17 +638,17 @@ MemberConversation = function(parent, uid, fullname) {
this.input_wrapper = $a(this.wrapper, 'div', 'my-company-input-wrapper'); 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'}) var tab = make_table(this.input_wrapper, 1, 2, '100%', ['64%','36%'], {padding: '3px'})
this.input = $a($td(tab,0,0), 'textarea'); this.input = $a($td(tab,0,0), 'textarea');
$(this.input).add_default_text( 'Send a message to ' + fullname);
// button // button
var div = $a(this.input_wrapper, 'div'); var div = $a(this.input_wrapper, 'div');
this.post = $btn(div, 'Post'.bold(), function() { me.post_message(); }, {margin:'0px 13px 0px 3px'}) 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() { this.input.onkeyup = this.input.onchange = function() {
if(this.value) { if(this.value) {
me.post.set_enabled(); me.post.disabled = false;
} else { } else {
me.post.set_disabled(); me.post.disabled = true;
} }
} }

4
erpnext/setup/doctype/email_digest/email_digest.py
View File

@@ -318,8 +318,8 @@ class DocType:
WHERE WHERE
docstatus < 2 AND docstatus < 2 AND
%(company_condition)s %(company_condition)s
creation >= '%(start_date)s' AND DATE(creation) >= '%(start_date)s' AND
creation <= '%(end_date)s'""" % args DATE(creation) <= '%(end_date)s'""" % args
return query return query