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

post_render in pv and AP report error solved

Browse Source
This commit is contained in:
Nabin Hait 2011-09-09 17:55:25 +05:30
parent 2c6db0f13b
commit 40693e3190
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
accounts/doctype/payable_voucher/payable_voucher.js
View File

@ -20,12 +20,15 @@ cur_frm.cscript.onload = function(doc,dt,dn) {
}
if(doc.__islocal){
if(doc.supplier) {cur_frm.cscript.supplier(doc,dt,dn)}
hide_field(['supplier_address','contact_person','supplier_name','address_display','contact_display','contact_mobile','contact_email']);
hide_field(['supplier_address', 'contact_person', 'supplier_name', 'address_display', 'contact_display', 'contact_mobile', 'contact_email']);
}
}
if(doc.supplier) unhide_field(['supplier_address','contact_person','supplier_name','address_display','contact_display','contact_mobile','contact_email']);
//Onload post render
//------------------------
cur_frm.cscript.onload_post_render = function(doc, dt, dn) {
if(doc.__islocal && doc.supplier) cur_frm.cscript.supplier(doc,dt,dn);
}
// Refresh

6
accounts/search_criteria/accounts_payable/accounts_payable.py
View File

@ -90,9 +90,13 @@ for r in res:
# supplier type
r.append(supp_type_dict.get(r[col_idx['Account']], ''))
if r[col_idx['Voucher Type']] == 'Payable Voucher':
r += pv_dict.get(r[col_idx['Voucher No']], ['', '', ''])
else:
r += ['', '', '']
# if entry against Payable Voucher
if r[col_idx['Against Voucher']] and r[col_idx['Voucher Type']] == 'Payable Voucher':
r += pv_dict.get(r[col_idx['Voucher No']], ['', '', ''])
cond = " and ifnull(against_voucher, '') = '%s'" % r[col_idx['Against Voucher']]
# if entry against JV & and not adjusted within period