From 265f3edb8f6ba669c160c92bcfff2a780bc2918c Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@iwebnotes.com>
Date: Thu, 12 Jan 2012 14:56:26 +0530
Subject: [PATCH 1/2] On clicking Get Charges, also pull the field
 included_in_print_rate

---
 erpnext/selling/doctype/sales_common/sales_common.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/erpnext/selling/doctype/sales_common/sales_common.py b/erpnext/selling/doctype/sales_common/sales_common.py
index ea9ffe99be..47a348372e 100644
--- a/erpnext/selling/doctype/sales_common/sales_common.py
+++ b/erpnext/selling/doctype/sales_common/sales_common.py
@@ -175,7 +175,7 @@ class DocType(TransactionBase):
 			if default: add_cond = 'ifnull(t2.is_default,0) = 1'
 			else: add_cond = 't1.parent = "'+cstr(obj.doc.charge)+'"'
 			idx = 0
-			other_charge = sql("select t1.charge_type,t1.row_id,t1.description,t1.account_head,t1.rate,t1.tax_amount from `tabRV Tax Detail` t1, `tabOther Charges` t2 where t1.parent = t2.name and t2.company = '%s' and %s order by t1.idx" % (obj.doc.company, add_cond), as_dict = 1)
+			other_charge = sql("select t1.charge_type,t1.row_id,t1.description,t1.account_head,t1.rate,t1.tax_amount,t1.included_in_print_rate from `tabRV Tax Detail` t1, `tabOther Charges` t2 where t1.parent = t2.name and t2.company = '%s' and %s order by t1.idx" % (obj.doc.company, add_cond), as_dict = 1)
 			for other in other_charge:
 				d =	addchild(obj.doc, 'other_charges', 'RV Tax Detail', 1, obj.doclist)
 				d.charge_type = other['charge_type']
@@ -184,6 +184,7 @@ class DocType(TransactionBase):
 				d.account_head = other['account_head']
 				d.rate = flt(other['rate'])
 				d.tax_amount = flt(other['tax_amount'])
+				d.included_in_print_rate = cint(other['included_in_print_rate'])
 				d.idx = idx
 				idx += 1
 			

From 31e1b72d8c418a6be1375c8d6c2070c01e8565df Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@iwebnotes.com>
Date: Thu, 12 Jan 2012 15:13:16 +0530
Subject: [PATCH 2/2] Changed message to 'Loading...' after clear cache and
 refresh

---
 index.html  | 2 +-
 version.num | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 38dd883d11..741a983b44 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
 	<meta charset="utf-8">
 	<title>ERPNext</title>
 	<meta name="author" content="">
-	<script type="text/javascript">window._version_number="29"
+	<script type="text/javascript">window._version_number="30"
 
 wn={}
 wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}
diff --git a/version.num b/version.num
index d99e90eb96..8580e7b684 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-29
\ No newline at end of file
+30
\ No newline at end of file