From cd7a02c489c861aab40991b937e9bde27cfb30c4 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 4 Jan 2013 14:03:36 +0530 Subject: [PATCH] added workflow help, fixed button primary action in form and refactored permissions --- hr/doctype/expense_claim/expense_claim.py | 4 ---- hr/doctype/leave_application/leave_application.py | 6 +----- website/doctype/product_settings/product_settings.py | 6 +++++- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/hr/doctype/expense_claim/expense_claim.py b/hr/doctype/expense_claim/expense_claim.py index 3906550224..9e476e5595 100644 --- a/hr/doctype/expense_claim/expense_claim.py +++ b/hr/doctype/expense_claim/expense_claim.py @@ -32,10 +32,6 @@ class DocType: 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 ebefc0eb15..ad3f864150 100755 --- a/hr/doctype/leave_application/leave_application.py +++ b/hr/doctype/leave_application/leave_application.py @@ -32,10 +32,6 @@ class DocType: 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 @@ class DocType: 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 0137ff1610..4e72be6be3 100644 --- a/website/doctype/product_settings/product_settings.py +++ b/website/doctype/product_settings/product_settings.py @@ -10,4 +10,8 @@ class DocType: 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