Merge remote-tracking branch 'frappe/master' into develop
Conflicts: erpnext/patches.txt
This commit is contained in:
commit
e63da9813c
@ -70,7 +70,7 @@ class PaymentReconciliation(Document):
|
||||
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,
|
||||
|
Loading…
x
Reference in New Issue
Block a user