Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/hr/doctype/expense_claim/expense_claim.py b/hr/doctype/expense_claim/expense_claim.py
index 3906550..9e476e5 100644
--- a/hr/doctype/expense_claim/expense_claim.py
+++ b/hr/doctype/expense_claim/expense_claim.py
@@ -32,10 +32,6 @@
def validate(self):
# if self.doc.exp_approver == self.doc.owner:
# webnotes.msgprint("""Self Approval is not allowed.""", raise_exception=1)
-
- import utilities
- utilities.validate_status(self.doc.approval_status, ["Draft", "Approved", "Rejected"])
-
self.validate_fiscal_year()
self.validate_exp_details()
diff --git a/hr/doctype/leave_application/leave_application.py b/hr/doctype/leave_application/leave_application.py
index ebefc0e..ad3f864 100755
--- a/hr/doctype/leave_application/leave_application.py
+++ b/hr/doctype/leave_application/leave_application.py
@@ -32,10 +32,6 @@
def validate(self):
# if self.doc.leave_approver == self.doc.owner:
- # webnotes.msgprint("""Self Approval is not allowed.""", raise_exception=1)
- import utilities
- utilities.validate_status(self.doc.status, ["Open", "Approved", "Rejected"])
-
self.validate_to_date()
self.validate_balance_leaves()
self.validate_leave_overlap()
@@ -43,7 +39,7 @@
def on_submit(self):
if self.doc.status != "Approved":
- webnotes.msgprint("""Only Approved Leave Applications can be Submitted.""",
+ webnotes.msgprint("""Only Leave Applications with status 'Approved' can be Submitted.""",
raise_exception=True)
def get_holidays(self):
diff --git a/website/doctype/product_settings/product_settings.py b/website/doctype/product_settings/product_settings.py
index 0137ff1..4e72be6 100644
--- a/website/doctype/product_settings/product_settings.py
+++ b/website/doctype/product_settings/product_settings.py
@@ -10,4 +10,8 @@
def on_update(self):
"""clear web cache"""
from website.utils import clear_cache
- clear_cache()
\ No newline at end of file
+ clear_cache()
+
+ if self.doc.default_product_category:
+ webnotes.model_wrapper("Item Group",
+ self.doc.default_product_category).save()
\ No newline at end of file