From 0e57b971ad2c9d3bb7f828ef5ca9fd1ffc1c7c27 Mon Sep 17 00:00:00 2001 From: ankitjavalkarwork Date: Fri, 11 Jul 2014 16:08:55 +0530 Subject: [PATCH] Add Payment Reconciliation Feature/Tool - minor changes --- .../payment_reconciliation.js | 17 ++++++++++++----- .../payment_reconciliation.py | 6 +++++- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js index f0706db896..b40691d053 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js @@ -7,19 +7,26 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext onload: function() { var me = this - this.frm.set_query ("party_account", function() { + this.frm.set_query ('party_account', function() { return{ filters:[ - ["Account", "company", "=", me.frm.doc.company], - ["Account", "group_or_ledger", "=", "Ledger"], - ["Account", "master_type", "in", ["Customer", "Supplier"]] + ['Account', 'company', '=', me.frm.doc.company], + ['Account', 'group_or_ledger', '=', 'Ledger'], + ['Account', 'master_type', 'in', ['Customer', 'Supplier']] ] }; }); + }, + + get_unreconciled_entries: function() { + return this.frm.call({ + doc: me.frm.doc, + method: 'get_unreconciled_entries' + }); } }); $.extend(cur_frm.cscript, new erpnext.accounts.PaymentReconciliationController({frm: cur_frm})); -cur_frm.add_fetch("party_account", "master_type", "party_type") \ No newline at end of file +cur_frm.add_fetch('party_account', 'master_type', 'party_type') \ No newline at end of file diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py index 8fb331714b..2eb188b0a9 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.py @@ -11,4 +11,8 @@ from frappe import msgprint, _ from frappe.model.document import Document class PaymentReconciliation(Document): - pass \ No newline at end of file + def get_unreconciled_entries(self): + self.set('payment_reconciliation_payment', []) + jve = self.get_jv_entries() + self.create_payment_reconciliation_payment(jve) +