Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	erpnext/patches.txt
This commit is contained in:
Anand Doshi 2015-09-24 14:34:50 +05:30
commit e63da9813c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py
View File

@ -70,7 +70,7 @@ class PaymentReconciliation(Document):
non_reconciled_invoices = [] non_reconciled_invoices = []
dr_or_cr = "debit" if self.party_type == "Customer" else "credit" dr_or_cr = "debit" if self.party_type == "Customer" else "credit"
cond = self.check_condition(dr_or_cr) cond = self.check_condition(dr_or_cr)
invoice_list = frappe.db.sql(""" invoice_list = frappe.db.sql("""
select select
voucher_no, voucher_type, posting_date, voucher_no, voucher_type, posting_date,