From b0cffac79df85d50b8c364d46d529caffa6f8b84 Mon Sep 17 00:00:00 2001 From: ankitjavalkarwork Date: Tue, 22 Jul 2014 15:02:59 +0530 Subject: [PATCH 1/3] Payment Reconciliation Feature/Tool - add in module list --- .../payment_reconciliation/payment_reconciliation.json | 8 ++++---- erpnext/config/accounts.py | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json index a83d45363e1..b9705a60314 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json @@ -31,7 +31,7 @@ "hidden": 1, "in_list_view": 1, "label": "Party Type", - "options": "\nCustomer\nSupplier", + "options": "Customer\nSupplier", "permlevel": 0, "read_only": 1, "reqd": 0 @@ -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 722bf77f837..f52cea9818c 100644 --- a/erpnext/config/accounts.py +++ b/erpnext/config/accounts.py @@ -51,11 +51,11 @@ def get_data(): "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", From b5ae643b6e941e300610fe30afbba0eee55d14e5 Mon Sep 17 00:00:00 2001 From: ankitjavalkarwork Date: Tue, 22 Jul 2014 15:26:04 +0530 Subject: [PATCH 2/3] Payment Reconciliation Feature/Tool - minor change --- .../doctype/payment_reconciliation/payment_reconciliation.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json index b9705a60314..8e675ef8b1c 100644 --- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json +++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.json @@ -31,7 +31,7 @@ "hidden": 1, "in_list_view": 1, "label": "Party Type", - "options": "Customer\nSupplier", + "options": "\nCustomer\nSupplier", "permlevel": 0, "read_only": 1, "reqd": 0 From 87633d6be64bd2c82116f0ee81166b893754b797 Mon Sep 17 00:00:00 2001 From: ankitjavalkarwork Date: Tue, 22 Jul 2014 18:14:30 +0530 Subject: [PATCH 3/3] Payment Reconciliation Feature/Tool - Patch --- erpnext/patches.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/erpnext/patches.txt b/erpnext/patches.txt index 1a903de743b..5ac1da151ab 100644 --- a/erpnext/patches.txt +++ b/erpnext/patches.txt @@ -68,4 +68,6 @@ erpnext.patches.v4_1.set_outgoing_email_footer 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