Merge branch 'edge' of github.com:webnotes/erpnext into edge

Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-01-02 14:02:36 +05:30
12 changed files with 45 additions and 955 deletions

View File

@@ -23,9 +23,13 @@
<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-manager">Permission Manager</a></b><br>
<span class="help">Set permissions on transactions / masters</span>
</p>
<p>
<b><a href="#user-properties">User Properties</a></b><br>
<span class="help">Set default values for users (also used for permissions).</span>
</p>
<p>
<b><a href="#List/Workflow">Workflow Manager</a></b><br>
<span class="help">Set workflow rules.</span>
@@ -114,12 +118,6 @@
<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>
<span class="help">Add a home page banner</span>
</p>
-->
<p>
<b><a href="#Form/Style Settings/Style Settings">Style Settings</a></b><br>
<span class="help">Change background fonts etc</span>