Merge remote-tracking branch 'frappe/master' into develop

Conflicts: erpnext/patches.txt
gmarke · Sep 24, 2015 · e63da98 · e63da98
2 parents c020e42 + 5b64952
commit e63da98
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -70,7 +70,7 @@ def get_invoice_entries(self):
 		non_reconciled_invoices = []
 		dr_or_cr = "debit" if self.party_type == "Customer" else "credit"
 		cond = self.check_condition(dr_or_cr)
-
+		
 		invoice_list = frappe.db.sql("""
 			select
 				voucher_no, voucher_type, posting_date,