fix: Missing commits from hotfix branch (#17997)
* fix: merge conflict
* fix: restored missing set_gst_state_and_state_number function
* fix: style linting as per codacy
* fix: Fixes related to customer/lead merging
* fix: merge conflict
* fix: Fixes related to customer/lead merging
* fix: Assign isue/opportunity to user
* fix: Assign isue/opportunity to user
* fix: Replaced Invoice type by GST Category
* fix: merge conflict
* fix: merge conflict
* fix: test cases
* fix: test cases
diff --git a/erpnext/config/accounting.py b/erpnext/config/accounting.py
index 9a9ee7e..ce1384a 100644
--- a/erpnext/config/accounting.py
+++ b/erpnext/config/accounting.py
@@ -167,7 +167,7 @@
"type": "doctype",
"name": "Opening Invoice Creation Tool",
"description": _("Create Opening Sales and Purchase Invoices")
- },
+ }
]
},
{
@@ -182,7 +182,7 @@
"type": "doctype",
"name": "Journal Entry",
"description": _("Accounting journal entries.")
- },
+ }
]
},
{
@@ -247,6 +247,12 @@
"name": "Bank",
},
{
+ "type": "page",
+ "label": _("Reconcile payments and bank transactions"),
+ "name": "bank-reconciliation",
+ "description": _("Link bank transactions with payments.")
+ },
+ {
"type": "doctype",
"label": _("Bank Account"),
"name": "Bank Account",