Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/accounts/doctype/journal_voucher/journal_voucher.py b/accounts/doctype/journal_voucher/journal_voucher.py
index 01b6880..8b22f22 100644
--- a/accounts/doctype/journal_voucher/journal_voucher.py
+++ b/accounts/doctype/journal_voucher/journal_voucher.py
@@ -54,9 +54,9 @@
r = []
if self.doc.cheque_no :
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 :
- msgprint("Please enter cheque date")
+ msgprint("Please enter Reference date")
raise Exception
for d in getlist(self.doclist, 'entries'):
diff --git a/patches/november_2012/communication_sender_and_recipient.py b/patches/november_2012/communication_sender_and_recipient.py
index c49bc9b..f8d7a95 100644
--- a/patches/november_2012/communication_sender_and_recipient.py
+++ b/patches/november_2012/communication_sender_and_recipient.py
@@ -1,7 +1,7 @@
import webnotes
def execute():
- webnotes.reload_doc("support", "doctype", "communication")
+ webnotes.reload_doc("core", "doctype", "communication")
webnotes.conn.sql("""update tabCommunication set sender=email_address
where ifnull(support_ticket,'') != ''""")
webnotes.conn.sql("""update tabCommunication set recipients=email_address where