From 5283e5a7d8adfc9829f91336e5e329ace5b98e5d Mon Sep 17 00:00:00 2001 From: ankitjavalkarwork Date: Fri, 18 Jul 2014 15:42:45 +0530 Subject: [PATCH] Add Payment Reconciliation Feature/Tool - JS changes1 --- .../payment_reconciliation.js | 5 ++ .../payment_reconciliation.json | 11 +++- .../payment_reconciliation_invoice.json | 8 ++- .../payment_reconciliation_invoice.py | 4 +- .../payment_reconciliation_payment.json | 50 +++++++++++++------ .../payment_reconciliation_payment.py | 4 +- 6 files changed, 59 insertions(+), 23 deletions(-) diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js index c2ba1e62b3..14520c2a05 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js @@ -16,8 +16,13 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext ] }; }); + + var help_content = [' Note:', + ''].join("\n"); + this.frm.set_value("reconcile_help", help_content); }, + get_unreconciled_entries: function() { var me = this; return this.frm.call({ diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json index ce0d731786..40b5706260 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json @@ -108,7 +108,7 @@ { "fieldname": "sec_break2", "fieldtype": "Section Break", - "label": "Invoice/JV Details", + "label": "Invoice/Journal Voucher Details", "permlevel": 0 }, { @@ -118,11 +118,18 @@ "options": "Payment Reconciliation Invoice", "permlevel": 0, "read_only": 1 + }, + { + "fieldname": "reconcile_help", + "fieldtype": "Small Text", + "label": "", + "permlevel": 0, + "read_only": 1 } ], "hide_toolbar": 1, "issingle": 1, - "modified": "2014-07-17 19:07:34.385854", + "modified": "2014-07-18 15:53:20.638456", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Reconciliation", diff --git a/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json b/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json index fba5f4e422..4e4ee1ae95 100644 --- a/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json +++ b/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json @@ -30,6 +30,12 @@ "permlevel": 0, "read_only": 1 }, + { + "fieldname": "col_break1", + "fieldtype": "Column Break", + "label": "Column Break", + "permlevel": 0 + }, { "fieldname": "amount", "fieldtype": "Currency", @@ -48,7 +54,7 @@ } ], "istable": 1, - "modified": "2014-07-17 15:52:28.820965", + "modified": "2014-07-18 12:20:51.269974", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Reconciliation Invoice", diff --git a/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.py b/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.py index e136881514..3094a173f0 100644 --- a/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.py +++ b/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.py @@ -1,4 +1,4 @@ -# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and contributors # For license information, please see license.txt from __future__ import unicode_literals @@ -6,4 +6,4 @@ import frappe from frappe.model.document import Document class PaymentReconciliationInvoice(Document): - pass \ No newline at end of file + pass diff --git a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json index e939b02e1e..3dd36fc465 100644 --- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json +++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json @@ -30,6 +30,29 @@ "permlevel": 0, "read_only": 1 }, + { + "fieldname": "is_advance", + "fieldtype": "Data", + "hidden": 1, + "label": "Is Advance", + "permlevel": 0, + "read_only": 1 + }, + { + "fieldname": "voucher_detail_number", + "fieldtype": "Data", + "hidden": 1, + "in_list_view": 0, + "label": "Voucher Detail Number", + "permlevel": 0, + "read_only": 1 + }, + { + "fieldname": "col_break1", + "fieldtype": "Column Break", + "label": "Column Break", + "permlevel": 0 + }, { "default": "Sales Invoice", "fieldname": "invoice_type", @@ -51,21 +74,10 @@ "reqd": 1 }, { - "fieldname": "is_advance", - "fieldtype": "Data", - "hidden": 1, - "label": "Is Advance", - "permlevel": 0, - "read_only": 1 - }, - { - "fieldname": "voucher_detail_number", - "fieldtype": "Data", - "hidden": 1, - "in_list_view": 0, - "label": "Voucher Detail Number", - "permlevel": 0, - "read_only": 1 + "fieldname": "sec_break1", + "fieldtype": "Section Break", + "label": "", + "permlevel": 0 }, { "fieldname": "remark", @@ -74,10 +86,16 @@ "label": "Remark", "permlevel": 0, "read_only": 1 + }, + { + "fieldname": "col_break2", + "fieldtype": "Column Break", + "label": "Column Break", + "permlevel": 0 } ], "istable": 1, - "modified": "2014-07-17 18:32:25.230146", + "modified": "2014-07-18 15:53:15.589501", "modified_by": "Administrator", "module": "Accounts", "name": "Payment Reconciliation Payment", diff --git a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py index 9082ef9bcf..21e19bdd71 100644 --- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py +++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py @@ -1,4 +1,4 @@ -# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors +# Copyright (c) 2013, Web Notes Technologies Pvt. Ltd. and Contributors and contributors # For license information, please see license.txt from __future__ import unicode_literals @@ -6,4 +6,4 @@ import frappe from frappe.model.document import Document class PaymentReconciliationPayment(Document): - pass \ No newline at end of file + pass