Add Payment Reconciliation Feature/Tool - JS changes1
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
index c2ba1e6..14520c2 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
@@ -16,8 +16,13 @@
]
};
});
+
+ var help_content = ['<i class="icon-hand-right"></i> Note:',
+ '<ul>If you are unable to match the exact amount, then amend your Journal Voucher and split rows such that your amounts match the invoice you are trying to reconcile. </ul>'].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 ce0d731..40b5706 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 fba5f4e..4e4ee1a 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
@@ -31,6 +31,12 @@
"read_only": 1
},
{
+ "fieldname": "col_break1",
+ "fieldtype": "Column Break",
+ "label": "Column Break",
+ "permlevel": 0
+ },
+ {
"fieldname": "amount",
"fieldtype": "Currency",
"in_list_view": 1,
@@ -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 e136881..3094a17 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 @@
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 e939b02..3dd36fc 100644
--- a/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
+++ b/erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
@@ -31,6 +31,29 @@
"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",
"fieldtype": "Select",
@@ -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 9082ef9..21e19bd 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 @@
from frappe.model.document import Document
class PaymentReconciliationPayment(Document):
- pass
\ No newline at end of file
+ pass