Merge branch 'master' of github.com:webnotes/erpnext
This commit is contained in:
commit
4bbaddd57d
@ -27,6 +27,7 @@ cur_frm.cscript.onload = function(doc, cdt, cdn) {
|
||||
cur_frm.cscript.refresh = function(doc) {
|
||||
cur_frm.cscript.is_opening(doc)
|
||||
erpnext.hide_naming_series();
|
||||
cur_frm.cscript.voucher_type(doc);
|
||||
}
|
||||
|
||||
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) {
|
||||
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');
|
||||
if(!children || children.length==0) {
|
||||
$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);
|
||||
}
|
||||
}
|
||||
|
@ -54,9 +54,9 @@ class DocType:
|
||||
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'):
|
||||
|
@ -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
|
||||
|
Loading…
x
Reference in New Issue
Block a user