| commit | e63da9813cea5776a4d4a57620b87af431f3b20b | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@erpnext.com> | Thu Sep 24 14:34:50 2015 +0530 |
| committer | Anand Doshi <anand@erpnext.com> | Thu Sep 24 14:34:50 2015 +0530 |
| tree | 1f82729bed7c3b91478f7cc1fe1fc52c4af7ac2e | |
| parent | c020e42d20ed4e9ee1e7c01d726d589c59e47562 [diff] | |
| parent | 5b649521d19c4aa5e4d50b4897632eb26e69af8c [diff] |
Merge remote-tracking branch 'frappe/master' into develop Conflicts: erpnext/patches.txt
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py index ff0d15b..bfdb041 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
@@ -70,7 +70,7 @@ 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,