Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Rushabh Mehta 2012-12-01 08:42:07 +01:00
commit 7c27667f95
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accounts/doctype/journal_voucher/journal_voucher.py
View File

@ -54,9 +54,9 @@ class DocType:
r = [] r = []
if self.doc.cheque_no : if self.doc.cheque_no :
if self.doc.cheque_date: if self.doc.cheque_date:
r.append('Via cheque #%s dated %s' % (self.doc.cheque_no, formatdate(self.doc.cheque_date))) r.append('Via Reference #%s dated %s' % (self.doc.cheque_no, formatdate(self.doc.cheque_date)))
else : else :
msgprint("Please enter cheque date") msgprint("Please enter Reference date")
raise Exception raise Exception
for d in getlist(self.doclist, 'entries'): for d in getlist(self.doclist, 'entries'):

2
patches/november_2012/communication_sender_and_recipient.py
View File

@ -1,7 +1,7 @@
import webnotes import webnotes
def execute(): def execute():
webnotes.reload_doc("support", "doctype", "communication") webnotes.reload_doc("core", "doctype", "communication")
webnotes.conn.sql("""update tabCommunication set sender=email_address webnotes.conn.sql("""update tabCommunication set sender=email_address
where ifnull(support_ticket,'') != ''""") where ifnull(support_ticket,'') != ''""")
webnotes.conn.sql("""update tabCommunication set recipients=email_address where webnotes.conn.sql("""update tabCommunication set recipients=email_address where