fix: conflicts
diff --git a/erpnext/config/crm.py b/erpnext/config/crm.py
index cf10219..09c2a65 100644
--- a/erpnext/config/crm.py
+++ b/erpnext/config/crm.py
@@ -117,6 +117,13 @@
"name": "Lead Owner Efficiency",
"doctype": "Lead",
"dependencies": ["Lead"]
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Territory-wise Sales",
+ "doctype": "Opportunity",
+ "dependencies": ["Opportunity"]
}
]
},
diff --git a/erpnext/config/desktop.py b/erpnext/config/desktop.py
index 95f6f7c..ce7c245 100644
--- a/erpnext/config/desktop.py
+++ b/erpnext/config/desktop.py
@@ -81,6 +81,15 @@
"description": "Sales pipeline, leads, opportunities and customers."
},
{
+ "module_name": "Loan Management",
+ "category": "Modules",
+ "label": _("Loan Management"),
+ "color": "#EF4DB6",
+ "icon": "octicon octicon-repo",
+ "type": "module",
+ "description": "Loan Management for Customer and Employees"
+ },
+ {
"module_name": "Support",
"category": "Modules",
"label": _("Support"),
diff --git a/erpnext/config/hr.py b/erpnext/config/hr.py
index 4e5e903..7b3b466 100644
--- a/erpnext/config/hr.py
+++ b/erpnext/config/hr.py
@@ -291,6 +291,10 @@
},
{
"type": "doctype",
+ "name": "Appointment Letter",
+ },
+ {
+ "type": "doctype",
"name": "Staffing Plan",
},
]
diff --git a/erpnext/config/loan_management.py b/erpnext/config/loan_management.py
new file mode 100644
index 0000000..a84f13a
--- /dev/null
+++ b/erpnext/config/loan_management.py
@@ -0,0 +1,107 @@
+from __future__ import unicode_literals
+from frappe import _
+import frappe
+
+
+def get_data():
+ return [
+ {
+ "label": _("Loan"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Loan Type",
+ "description": _("Loan Type for interest and penalty rates"),
+ },
+ {
+ "type": "doctype",
+ "name": "Loan Application",
+ "description": _("Loan Applications from customers and employees."),
+ },
+ {
+ "type": "doctype",
+ "name": "Loan",
+ "description": _("Loans provided to customers and employees."),
+ },
+
+ ]
+ },
+ {
+ "label": _("Loan Security"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Loan Security Type",
+ },
+ {
+ "type": "doctype",
+ "name": "Loan Security Price",
+ },
+ {
+ "type": "doctype",
+ "name": "Loan Security",
+ },
+ {
+ "type": "doctype",
+ "name": "Loan Security Pledge",
+ },
+ {
+ "type": "doctype",
+ "name": "Loan Security Unpledge",
+ },
+ {
+ "type": "doctype",
+ "name": "Loan Security Shortfall",
+ },
+ ]
+ },
+ {
+ "label": _("Disbursement and Repayment"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Loan Disbursement",
+ },
+ {
+ "type": "doctype",
+ "name": "Loan Repayment",
+ },
+ {
+ "type": "doctype",
+ "name": "Loan Interest Accrual"
+ }
+ ]
+ },
+ {
+ "label": _("Loan Processes"),
+ "items": [
+ {
+ "type": "doctype",
+ "name": "Process Loan Security Shortfall",
+ },
+ {
+ "type": "doctype",
+ "name": "Process Loan Interest Accrual",
+ }
+ ]
+ },
+ {
+ "label": _("Reports"),
+ "items": [
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Loan Repayment and Closure",
+ "route": "#query-report/Loan Repayment and Closure",
+ "doctype": "Loan Repayment",
+ },
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Loan Security Status",
+ "route": "#query-report/Loan Security Status",
+ "doctype": "Loan Security Pledge",
+ }
+ ]
+ }
+ ]
\ No newline at end of file