From 58574acfbcf7ccd02d0328ecc3f38044718da35a Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Wed, 11 Jan 2012 13:39:06 +0530 Subject: [PATCH] Fix: Bug in Actual Tax Rate due to inclusive rate --- erpnext/selling/doctype/sales_common/sales_common.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/selling/doctype/sales_common/sales_common.js b/erpnext/selling/doctype/sales_common/sales_common.js index 57f449f3a62..bd7ca202a1b 100644 --- a/erpnext/selling/doctype/sales_common/sales_common.js +++ b/erpnext/selling/doctype/sales_common/sales_common.js @@ -563,7 +563,7 @@ cur_frm.cscript['Calculate Charges'] = function(doc, cdt, cdn) { if(!cl[i].row_id){ alert("Please Enter Row on which amount needs to be calculated for row : "+cl[i].idx); validated = false; - } else if(cl[cl[i].row_id-1].charge_type=='Actual') { + } else if(cl[i].included_in_print_rate && cl[cl[i].row_id-1].charge_type=='Actual') { msgprint("Row of type 'Actual' cannot be depended on for type '" + cl[i].charge_type + "'\ when using tax inclusive prices.
\ This will lead to incorrect values.

\