diff --git a/patches/september_2013/p01_fix_buying_amount_gl_entries.py b/patches/september_2013/p01_fix_buying_amount_gl_entries.py
index 7379c30..7812a2a 100644
--- a/patches/september_2013/p01_fix_buying_amount_gl_entries.py
+++ b/patches/september_2013/p01_fix_buying_amount_gl_entries.py
@@ -21,10 +21,6 @@
 			recreate_gl_entries("Sales Invoice", si, "entries")
 	
 def recreate_gl_entries(doctype, name, parentfield):
-	# remove gl entries
-	webnotes.conn.sql("""delete from `tabGL Entry` where voucher_type=%s
-		and voucher_no=%s""", (doctype, name))
-	
 	# calculate buying amount and make gl entries
 	bean = webnotes.bean(doctype, name)
 	bean.run_method("set_buying_amount")
@@ -35,16 +31,20 @@
 			res = webnotes.conn.sql("""select expense_account, cost_center
 				from `tab%s` child where docstatus=1 and item_code=%s and
 					ifnull(expense_account, '')!='' and ifnull(cost_center, '')!='' and
-					(select company from `tab%s` parent where parent.name=child.parent)=%s
-					order by creation desc limit 1""" % (item.doctype, "%s", doctype, "%s"), 
-					(item.item_code, bean.doc.company))
+					(select company from `tabAccount` ac where ac.name=child.expense_account)=%s and
+					(select company from `tabCost Center` cc where cc.name=child.cost_center)=%s
+					order by creation desc limit 1""" % (item.doctype, "%s", "%s", "%s"), 
+					(item.item_code, bean.doc.company, bean.doc.company))
 			if res:
 				if not item.expense_account:
 					item.expense_account = res[0][0]
 				if not item.cost_center:
 					item.cost_center = res[0][1]
 			
-			webnotes.conn.set_value(item.doctype, item.name, "expense_account", item.expense_account)
-			webnotes.conn.set_value(item.doctype, item.name, "cost_center", item.cost_center)
-		
+				webnotes.conn.set_value(item.doctype, item.name, "expense_account", item.expense_account)
+				webnotes.conn.set_value(item.doctype, item.name, "cost_center", item.cost_center)
+	
+	# remove gl entries
+	webnotes.conn.sql("""delete from `tabGL Entry` where voucher_type=%s
+		and voucher_no=%s""", (doctype, name))
 	bean.run_method("make_gl_entries")
\ No newline at end of file