Merge pull request #1970 from ankitjavalkarwork/payrec
Added Payment Reconciliation to list accounts.py
diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
index a83d453..8e675ef 100644
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json
@@ -129,7 +129,7 @@
],
"hide_toolbar": 1,
"issingle": 1,
- "modified": "2014-07-21 16:54:31.454679",
+ "modified": "2014-07-22 14:53:59.084438",
"modified_by": "Administrator",
"module": "Accounts",
"name": "Payment Reconciliation",
@@ -139,7 +139,7 @@
{
"cancel": 0,
"create": 1,
- "delete": 1,
+ "delete": 0,
"permlevel": 0,
"read": 1,
"role": "Accounts Manager",
@@ -149,7 +149,7 @@
{
"cancel": 0,
"create": 1,
- "delete": 1,
+ "delete": 0,
"permlevel": 0,
"read": 1,
"role": "Accounts User",
diff --git a/erpnext/config/accounts.py b/erpnext/config/accounts.py
index 722bf77..f52cea9 100644
--- a/erpnext/config/accounts.py
+++ b/erpnext/config/accounts.py
@@ -51,11 +51,11 @@
"name": "Bank Reconciliation",
"description": _("Update bank payment dates with journals.")
},
- # {
- # "type": "doctype",
- # "name": "Payment to Invoice Matching Tool",
- # "description": _("Match non-linked Invoices and Payments.")
- # },
+ {
+ "type": "doctype",
+ "name": "Payment Reconciliation",
+ "description": _("Match non-linked Invoices and Payments.")
+ },
{
"type": "doctype",
"name": "Period Closing Voucher",
diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 1a903de..5ac1da1 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -68,4 +68,6 @@
erpnext.patches.v4_1.fix_jv_remarks
erpnext.patches.v4_1.fix_sales_order_delivered_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'")
\ No newline at end of file
+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")
\ No newline at end of file