nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-08-27 22:05:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patch system changes, Inclusive Price feature and session cache clear on disabling user or on new login

Browse Source
This commit is contained in:
Anand Doshi
2012-01-02 16:25:05 +05:30
parent 1fad05aed8
commit d56d57d205
6 changed files with 248 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/setup/doctype/other_charges/other_charges.js
View File

@@ -36,7 +36,7 @@ cur_frm.pformat.other_charges= function(doc){
// add rows
if(cl.length){
for(var i=0;i<cl.length;i++){
if(fmt_money(convert_rate(cl[i].tax_amount))!=0)
if(fmt_money(convert_rate(cl[i].tax_amount))!=0 && !cl[i].included_in_print_rate)
out += make_row(cl[i].description,fmt_money(convert_rate(cl[i].tax_amount)),0);
}
}