Merge branch 'develop' into subs
diff --git a/erpnext/config/selling.py b/erpnext/config/selling.py
index 63e7ad9..9209ca9 100644
--- a/erpnext/config/selling.py
+++ b/erpnext/config/selling.py
@@ -299,6 +299,12 @@
"name": "Customers Without Any Sales Transactions",
"doctype": "Customer"
},
+ {
+ "type": "report",
+ "is_query_report": True,
+ "name": "Sales Partners Commission",
+ "doctype": "Customer"
+ }
]
},
{
diff --git a/erpnext/hr/doctype/additional_salary/additional_salary.py b/erpnext/hr/doctype/additional_salary/additional_salary.py
index 9ca1260..043f0df 100644
--- a/erpnext/hr/doctype/additional_salary/additional_salary.py
+++ b/erpnext/hr/doctype/additional_salary/additional_salary.py
@@ -9,6 +9,12 @@
from frappe.utils import getdate, date_diff
class AdditionalSalary(Document):
+ def before_insert(self):
+ if frappe.db.exists("Additional Salary", {"employee": self.employee, "salary_component": self.salary_component,
+ "amount": self.amount, "payroll_date": self.payroll_date, "company": self.company}):
+
+ frappe.throw(_("Additional Salary Component Exists."))
+
def validate(self):
self.validate_dates()
if self.amount < 0: