From 810041cbe33733f4f286aa962d73e82981378f02 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 15 Jun 2015 10:20:04 +0530 Subject: [PATCH 1/2] [fix] Fixed error due to performance upgrade cleanup --- .../accounts/report/accounts_receivable/accounts_receivable.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py index bdfdf0ede3..19703be8eb 100644 --- a/erpnext/accounts/report/accounts_receivable/accounts_receivable.py +++ b/erpnext/accounts/report/accounts_receivable/accounts_receivable.py @@ -171,7 +171,7 @@ class ReceivablePayableReport(object): def get_gl_entries(self, party_type): if not hasattr(self, "gl_entries"): conditions, values = self.prepare_conditions(party_type) - self.gl_entries = frappe.db.sql("""select posting_date, account, party_type, party, debit, credit, + self.gl_entries = frappe.db.sql("""select name, posting_date, account, party_type, party, debit, credit, voucher_type, voucher_no, against_voucher_type, against_voucher from `tabGL Entry` where docstatus < 2 and party_type=%s {0} order by posting_date, party""" .format(conditions), values, as_dict=True) From 65922d307900f58adca867681ae79bab35089a32 Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 15 Jun 2015 10:23:53 +0530 Subject: [PATCH 2/2] [fix] supplier invoice date can not be after posting date --- erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py index 2516ded589..8820c87b40 100644 --- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py +++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.py @@ -3,7 +3,7 @@ from __future__ import unicode_literals import frappe -from frappe.utils import cint, formatdate, flt +from frappe.utils import cint, formatdate, flt, getdate from frappe import msgprint, _, throw from erpnext.setup.utils import get_company_currency import frappe.defaults @@ -389,7 +389,7 @@ class PurchaseInvoice(BuyingController): def validate_supplier_invoice(self): if self.bill_date: - if self.bill_date > self.posting_date: + if getdate(self.bill_date) > getdate(self.posting_date): frappe.throw("Supplier Invoice Date cannot be greater than Posting Date") if self.bill_no: if cint(frappe.db.get_single_value("Accounts Settings", "check_supplier_invoice_uniqueness")):