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

Merge pull request #1970 from ankitjavalkarwork/payrec

Browse Source 
Added Payment Reconciliation to list accounts.py
This commit is contained in:
Nabin Hait 2014-07-22 18:24:58 +05:30
commit 9df4196597
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,7 +129,7 @@
], ],
"hide_toolbar": 1, "hide_toolbar": 1,
"issingle": 1, "issingle": 1,
"modified": "2014-07-21 16:54:31.454679", "modified": "2014-07-22 14:53:59.084438",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Payment Reconciliation", "name": "Payment Reconciliation",
@ -139,7 +139,7 @@
{ {
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 0,
"permlevel": 0, "permlevel": 0,
"read": 1, "read": 1,
"role": "Accounts Manager", "role": "Accounts Manager",
@ -149,7 +149,7 @@
{ {
"cancel": 0, "cancel": 0,
"create": 1, "create": 1,
"delete": 1, "delete": 0,
"permlevel": 0, "permlevel": 0,
"read": 1, "read": 1,
"role": "Accounts User", "role": "Accounts User",

10
erpnext/config/accounts.py
View File

@ -51,11 +51,11 @@ def get_data():
"name": "Bank Reconciliation", "name": "Bank Reconciliation",
"description": _("Update bank payment dates with journals.") "description": _("Update bank payment dates with journals.")
}, },
# { {
# "type": "doctype", "type": "doctype",
# "name": "Payment to Invoice Matching Tool", "name": "Payment Reconciliation",
# "description": _("Match non-linked Invoices and Payments.") "description": _("Match non-linked Invoices and Payments.")
# }, },
{ {
"type": "doctype", "type": "doctype",
"name": "Period Closing Voucher", "name": "Period Closing Voucher",

4
erpnext/patches.txt
View File

@ -68,4 +68,6 @@ erpnext.patches.v4_1.set_outgoing_email_footer
erpnext.patches.v4_1.fix_jv_remarks erpnext.patches.v4_1.fix_jv_remarks
erpnext.patches.v4_1.fix_sales_order_delivered_status erpnext.patches.v4_1.fix_sales_order_delivered_status
erpnext.patches.v4_1.fix_delivery_and_billing_status erpnext.patches.v4_1.fix_delivery_and_billing_status
execute:frappe.db.sql("update `tabAccount` set root_type='Liability' where root_type='Income' and report_type='Balance Sheet'") execute:frappe.db.sql("update `tabAccount` set root_type='Liability' where root_type='Income' and report_type='Balance Sheet'")
execute:frappe.delete_doc("DocType", "Payment to Invoice Matching Tool")
execute:frappe.delete_doc("DocType", "Payment to Invoice Matching Tool Detail")