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",
diff --git a/erpnext/config/integrations.py b/erpnext/config/integrations.py
index 01e077f..52c9ab8 100644
--- a/erpnext/config/integrations.py
+++ b/erpnext/config/integrations.py
@@ -35,6 +35,11 @@
"type": "doctype",
"name": "Amazon MWS Settings",
"description": _("Connect Amazon with ERPNext"),
+ },
+ {
+ "type": "doctype",
+ "name": "Plaid Settings",
+ "description": _("Connect your bank accounts to ERPNext"),
}
]
}
diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py
index b31eb02..f18aadb 100644
--- a/erpnext/config/selling.py
+++ b/erpnext/config/selling.py
@@ -309,10 +309,33 @@
"is_query_report": True,
"name": "Sales Partners Commission",
"doctype": "Customer"
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Sales Partners Commission",
+ "doctype": "Customer"
}
]
},
{
+ "label": _("SMS"),
+ "icon": "fa fa-wrench",
+ "items": [
+ {
+ "type": "doctype",
+ "name": "SMS Center",
+ "description":_("Send mass SMS to your contacts"),
+ },
+ {
+ "type": "doctype",
+ "name": "SMS Log",
+ "description":_("Logs for maintaining sms delivery status"),
+ },
+
+ ]
+ },
+ {
"label": _("Help"),
"items": [
{