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

Add Payment Reconciliation Feature/Tool - JS changes1

Browse Source
This commit is contained in:
ankitjavalkarwork 2014-07-18 15:42:45 +05:30
parent 84fd33ea7a
commit 5283e5a7d8
6 changed files with 59 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
View File

@ -16,8 +16,13 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext
]
};
});
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({

11
erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
View File

@ -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",

8
erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.json
View File

@ -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",

4
erpnext/accounts/doctype/payment_reconciliation_invoice/payment_reconciliation_invoice.py
View File

@ -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
pass

50
erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.json
View File

@ -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",

4
erpnext/accounts/doctype/payment_reconciliation_payment/payment_reconciliation_payment.py
View File

@ -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
pass