Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

integrated workflow, disable Submit, Cancel if workflow is defined

Browse Source
This commit is contained in:
Rushabh Mehta 2012-12-28 16:07:55 +05:30
parent 5a3cbd8700
commit 4337802cdb
6 changed files with 49 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
home/page/latest_updates/latest_updates.js
View File

@ -1,4 +1,11 @@
erpnext.updates = [
["28th December 2012", [
"Workflow: Added System for Multi-level approval before Submission",
]],
["27th December 2012", [
"Website: Added auto-generated Contact Us and About Us Pages",
"Website: Added option to create slideshows and add them to Pages, Products and Product Groups",
]],
["25th December 2012", [
"Stock Balance Report: Inflow, outflow and balance of stock within a defined period",
"Stock Reports: Added Brand filter on some of the reports"

5
hr/doctype/expense_claim/expense_claim.py
View File

@ -32,6 +32,11 @@ class DocType:
def validate(self):
# if self.doc.exp_approver == self.doc.owner:
# webnotes.msgprint("""Self Approval is not allowed.""", raise_exception=1)
if self.doc.status not in ("Draft", "Approved", "Rejected"):
webnotes.msgprint("Status must be one of 'Draft', 'Approved' or 'Rejected'",
raise_exception=True)
self.validate_fiscal_year()
self.validate_exp_details()

9
hr/doctype/leave_application/leave_application.js
View File

@ -55,15 +55,14 @@ cur_frm.cscript.refresh = function(doc, dt, dn) {
} else {
if(doc.status=="Approved") {
cur_frm.set_intro("Leave application has been approved.");
if(cur_frm.doc.docstatus==0) {
cur_frm.set_intro("Please submit to update Leave Balance.");
}
} else if(doc.status=="Rejected") {
cur_frm.set_intro("Leave application has been rejected.");
}
}
}
if(doc.status=="Approved" && doc.docstatus==0) {
cur_frm.savesubmit()
}
}
}
cur_frm.cscript.employee = function (doc, dt, dn){

3
hr/doctype/leave_application/leave_application.py
View File

@ -33,6 +33,9 @@ class DocType:
def validate(self):
# if self.doc.leave_approver == self.doc.owner:
# webnotes.msgprint("""Self Approval is not allowed.""", raise_exception=1)
if self.doc.status not in ("Open", "Approved", "Rejected"):
webnotes.msgprint("Status must be one of 'Open', 'Approved' or 'Rejected'",
raise_exception=True)
self.validate_to_date()
self.validate_balance_leaves()

2
manufacturing/page/manufacturing_home/manufacturing_home.html
View File

@ -28,7 +28,7 @@
<div class="section-item">
<a class="section-link"
title = "BOM Replace Tool"
href="#!Form/BOM Replace Tool">BOM Replace Tool</a>
href="#Form/BOM Replace Tool">BOM Replace Tool</a>
</div>
</div>
</div>

54
setup/page/setup/setup.html
View File

@ -4,45 +4,49 @@
<div class="setup-column">
<h3>Company</h3>
<p>
<b><a href="#!List/Company">Companies</a></b><br>
<b><a href="#List/Company">Companies</a></b><br>
<span class="help">List of companies (not customers / suppliers)</span>
</p>
<p>
<b><a href="#!List/Fiscal Year">Fiscal Years</a></b><br>
<b><a href="#List/Fiscal Year">Fiscal Years</a></b><br>
<span class="help">Financial Years for books of accounts</span>
</p>
<p>
<b><a href="#!List/Currency">Currencies</a></b><br>
<b><a href="#List/Currency">Currencies</a></b><br>
<span class="help">Currency Master</span>
</p>
</div>
<div class="setup-column">
<h3>Users and Permissions</h3>
<p>
<b><a href="#!List/Profile">Users</a></b><br>
<b><a href="#List/Profile">Users</a></b><br>
<span class="help">Add/remove users, set roles, passwords etc</span>
</p>
<p>
<b><a href="#!Permission Engine">Permission Manager</a></b><br>
<b><a href="#Permission Engine">Permission Manager</a></b><br>
<span class="help">Set permissions on transactions / masters</span>
</p>
<p>
<b><a href="#!List/Authorization Rule">Amount based Authorization Rules</a></b><br>
<b><a href="#List/Workflow">Workflow Manager</a></b><br>
<span class="help">Set workflow rules.</span>
</p>
<p>
<b><a href="#List/Authorization Rule">Amount based Authorization Rules</a></b><br>
<span class="help">Restrict submission rights based on amount</span>
</p>
</div>
<div class="setup-column">
<h3>Data</h3>
<p>
<b><a href="#!data-import-tool">Data Import Tool</a></b><br>
<b><a href="#data-import-tool">Data Import Tool</a></b><br>
<span class="help">Import data from spreadsheet (csv) files</span>
</p>
<p>
<b><a href="#!Form/Global Defaults/Global Defaults">Global Defaults</a></b><br>
<b><a href="#Form/Global Defaults/Global Defaults">Global Defaults</a></b><br>
<span class="help">Set default values for entry</span>
</p>
<p>
<b><a href="#!Trash">Recycle Bin</a></b><br>
<b><a href="#Trash">Recycle Bin</a></b><br>
<span class="help">Un-trash items</span>
</p>
<p>
@ -53,75 +57,75 @@
<div class="setup-column">
<h3>Email and Notifications</h3>
<p>
<b><a href="#!Form/Email Settings/Email Settings">Email Settings</a></b><br>
<b><a href="#Form/Email Settings/Email Settings">Email Settings</a></b><br>
<span class="help">Out going mail server and support ticket mailbox</span>
</p>
<p>
<b><a href="#!Form/Notification Control/Notification Control">Auto Notifications</a></b><br>
<b><a href="#Form/Notification Control/Notification Control">Auto Notifications</a></b><br>
<span class="help">Automatic email sending to customers and suppliers</span>
</p>
<p>
<b><a href="#!List/Email Digest">Email Digests</a></b><br>
<b><a href="#List/Email Digest">Email Digests</a></b><br>
<span class="help">Daily, weekly, monthly email Digests</span>
</p>
<p>
<b><a href="#!Form/SMS Settings/SMS Settings">SMS Setup</a></b><br>
<b><a href="#Form/SMS Settings/SMS Settings">SMS Setup</a></b><br>
<span class="help">Setup outgoing SMS via your bulk SMS provider</span>
</p>
<p>
<b><a href="#!Form/SMS Center/SMS Center">Send Bulk SMS</a></b><br>
<b><a href="#Form/SMS Center/SMS Center">Send Bulk SMS</a></b><br>
<span class="help">Send bulk SMS to leads, customers, contacts</span>
</p>
</div>
<div class="setup-column">
<h3>Customize ERPNext</h3>
<p>
<b><a href="#!Form/Customize Form/Customize Form">Customize Forms</a></b><br>
<b><a href="#Form/Customize Form/Customize Form">Customize Forms</a></b><br>
<span class="help">Change entry properties (hide fields, make mandatory etc)</span>
</p>
<p>
<b><a href="#!List/Custom Field">Custom Fields</a></b><br>
<b><a href="#List/Custom Field">Custom Fields</a></b><br>
<span class="help">Add fields to forms</span>
</p>
<p>
<b><a href="#!List/Custom Script">Custom Scripts</a></b><br>
<b><a href="#List/Custom Script">Custom Scripts</a></b><br>
<span class="help">Add custom code to forms</span>
</p>
<p>
<b><a href="#!Form/Features Setup/Features Setup">Disable Features</a></b><br>
<b><a href="#Form/Features Setup/Features Setup">Disable Features</a></b><br>
<span class="help">Simplify entry forms by disabling features</span>
</p>
<p>
<b><a href="#!modules_setup">Modules Setup</a></b><br>
<b><a href="#modules_setup">Modules Setup</a></b><br>
<span class="help">Show, hide modules</span>
</p>
<p>
<b><a href="#!Form/Naming Series/Naming Series">Numbering Series</a></b><br>
<b><a href="#Form/Naming Series/Naming Series">Numbering Series</a></b><br>
<span class="help">Set multiple numbering series for transactions</span>
</p>
</div>
<div class="setup-column">
<h3>Branding and Printing</h3>
<p>
<b><a href="#!List/Letter Head">Letter Heads</a></b><br>
<b><a href="#List/Letter Head">Letter Heads</a></b><br>
<span class="help">Letter heads for print</span>
</p>
<p>
<b><a href="#!List/Print Format">Print Formats</a></b><br>
<b><a href="#List/Print Format">Print Formats</a></b><br>
<span class="help">HTML print formats for quotes, invoices etc</span>
</p>
<p>
<b><a href="#!List/Print Heading">Print Headings</a></b><br>
<b><a href="#List/Print Heading">Print Headings</a></b><br>
<span class="help">Add headers for standard print formats</span>
</p>
<!--
<p>
<b><a href="#!Form/Personalize/Personalize">Home Banner</a></b><br>
<b><a href="#Form/Personalize/Personalize">Home Banner</a></b><br>
<span class="help">Add a home page banner</span>
</p>
-->
<p>
<b><a href="#!Form/Style Settings/Style Settings">Style Settings</a></b><br>
<b><a href="#Form/Style Settings/Style Settings">Style Settings</a></b><br>
<span class="help">Change background fonts etc</span>
</p>
</div>