nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-20 21:49:18 +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-12-01 16:33:35 +05:30
parent 0d2fddbc06 14d968d099
commit 4bbaddd57d
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
accounts/doctype/journal_voucher/journal_voucher.js
View File

@@ -27,6 +27,7 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
cur_frm.cscript.refresh = function(doc) { cur_frm.cscript.refresh = function(doc) {
cur_frm.cscript.is_opening(doc) cur_frm.cscript.is_opening(doc)
erpnext.hide_naming_series(); erpnext.hide_naming_series();
cur_frm.cscript.voucher_type(doc);
} }
cur_frm.cscript.load_defaults = function(doc, cdt, cdn) { cur_frm.cscript.load_defaults = function(doc, cdt, cdn) {
@@ -211,6 +212,9 @@ cur_frm.cscript.view_ledger_entry = function(doc,cdt,cdn){
cur_frm.cscript.voucher_type = function(doc, cdt, cdn) { cur_frm.cscript.voucher_type = function(doc, cdt, cdn) {
if(doc.voucher_type == 'Bank Voucher' && cstr(doc.company)) { if(doc.voucher_type == 'Bank Voucher' && cstr(doc.company)) {
cur_frm.set_df_property("cheque_no", "reqd", true);
cur_frm.set_df_property("cheque_date", "reqd", true);
var children = getchildren('Journal Voucher Detail', doc.name, 'entries'); var children = getchildren('Journal Voucher Detail', doc.name, 'entries');
if(!children || children.length==0) { if(!children || children.length==0) {
$c('accounts.get_default_bank_account', {company: doc.company }, function(r, rt) { $c('accounts.get_default_bank_account', {company: doc.company }, function(r, rt) {
@@ -221,5 +225,8 @@ cur_frm.cscript.voucher_type = function(doc, cdt, cdn) {
} }
}); });
} }
} else {
cur_frm.set_df_property("cheque_no", "reqd", false);
cur_frm.set_df_property("cheque_date", "reqd", false);
} }
} }

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