commit 10a48ea5e9ec3a46d876b3c4b0ab03717a1044a8
author Nabin Hait <nabinhait@gmail.com> Mon Oct 03 14:05:10 2016 +0530
committer GitHub <noreply@github.com> Mon Oct 03 14:05:10 2016 +0530
tree 463e4ed8f678626d64f8a6aa1b7844eb78dae332
parent 0b7b109c0be74520305d741354ea08b376a157f9
parent b1391ca635b3800447dab3c171775cb68ad58748

Merge pull request #6527 from rohitwaghchaure/budget_issue

[Fix] company key error during cancellation of stock entry

erpnext/accounts/general_ledger.py

diff --git a/erpnext/accounts/general_ledger.py b/erpnext/accounts/general_ledger.py
index 4af197e..392902c 100644
--- a/erpnext/accounts/general_ledger.py
+++ b/erpnext/accounts/general_ledger.py
@@ -168,8 +168,8 @@
 
 	if not gl_entries:
 		gl_entries = frappe.db.sql("""
-			select account, posting_date, party_type, party, cost_center, fiscal_year,
-			voucher_type, voucher_no, against_voucher_type, against_voucher, cost_center
+			select account, posting_date, party_type, party, cost_center, fiscal_year,voucher_type,
+			voucher_no, against_voucher_type, against_voucher, cost_center, company
 			from `tabGL Entry`
 			where voucher_type=%s and voucher_no=%s""", (voucher_type, voucher_no), as_dict=True)