Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/home/page/attributions/attributions.css b/home/page/attributions/attributions.css
index e69de29..68ec516 100644
--- a/home/page/attributions/attributions.css
+++ b/home/page/attributions/attributions.css
@@ -0,0 +1,6 @@
+.layout-attributions table {
+ width: 70%;
+}
+.layout-attributions td:first-child {
+ width: 30%;
+}
\ No newline at end of file
diff --git a/home/page/attributions/attributions.html b/home/page/attributions/attributions.html
index ab879b7..37ee25b 100644
--- a/home/page/attributions/attributions.html
+++ b/home/page/attributions/attributions.html
@@ -1,83 +1,99 @@
-<div class="layout-wrapper">
- <a class="close" onclick="window.history.back();">×</a>
- <h1>Attributions</h1>
+<div class="layout-wrapper layout-wrapper-appframe layout-attributions">
+ <div class="layout-appframe"></div>
+ <div class="layout-main">
+ <h3>ERPNext is made using these Awesome Open Source Projects <i class="icon-heart" style="color: red"></i></h3>
<hr>
- <p><b>Source Code:</b> <a href="https://github.com/webnotes/erpnext">
- https://github.com/webnotes/erpnext</a></p>
- <p><b>Website:</b> <a href="https://erpnext.com">
- https://erpnext.com</a></p>
+ <table class="table table-bordered table-striped">
+ <tbody>
+ <tr>
+ <td><a href="https://github.com/webnotes/wnframework">wnframework</a></td>
+ <td>The full stack Python + Javascript web application framework on which ERPNext is built.</td>
+ </tr>
+ <tr>
+ <td><a href="https://github.com/webnotes/erpnext">ERPNext</a></td>
+ <td>Web based, Open Source ERP.</td>
+ </tr>
+ <tr>
+ <td><a href="http://en.wikipedia.org/wiki/Linux">Linux Operating System</a></td>
+ <td>The operating system that brought a revolution in Open Source software.</td>
+ </tr>
+ <tr>
+ <td><a href="http://www.mysql.com/">MySQL Database</a></td>
+ <td>The world's most popular Open Source Database.</td>
+ </tr>
+ <tr>
+ <td><a href="http://httpd.apache.org">Apache HTTPD web server</a></td>
+ <td>The Number One HTTP Server On The Internet.</td>
+ </tr>
+ <tr>
+ <td><a href="http://python.org/">Python Programming Language</a></td>
+ <td>The "batteries included" language that lets you write elegant code, quickly.<br><br>Python Libraries:
+ <ul>
+ <li>MySQLdb
+ <li>pytz
+ <li>jinja2
+ <li>markdown2
+ <li>dateutil
+ <li>termcolor
+ <li>python-memcached
+ </ul>
+ </td>
+ </tr>
+ <tr>
+ <td><a href="http://git-scm.com/">Git - Source Code Management</a></td>
+ <td>Git is a free and open source distributed version control system designed to handle everything from small to very large projects with speed and efficiency.<br><br>
+ Kindly hosted on the web by <a href="https://github.com">GitHub</a>: The service that makes it easier for individuals and teams to write better code, faster. </td>
+ </tr>
+ <tr>
+ <td><a href="http://jquery.com/">JQuery Javascript Libary</a></td>
+ <td>The write less, do more Javascript Library.</td>
+ </tr>
+ <tr>
+ <td><a href="http://jqueryui.com/">JQuery UI - User Interface Library</a></td>
+ <td>A curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library.</td>
+ </tr>
+ <tr>
+ <td><a href="http://twitter.github.com/bootstrap/index.html">Bootstrap CSS Framework</a></td>
+ <td>Sleek, intuitive, and powerful front-end framework for faster and easier web development.</td>
+ </tr>
+ <tr>
+ <td><a href="http://fortawesome.github.com/Font-Awesome/">Font Awesome - Icons</a></td>
+ <td>The iconic font designed for use with Twitter Bootstrap.</td>
+ </tr>
+ <tr>
+ <td><a href="http://www.tinymce.com/">TinyMCE Rich Text Editor</a></td>
+ <td>TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under LGPL by Moxiecode Systems AB.</td>
+ </tr>
+ <tr>
+ <td><a href="https://github.com/mleibman/SlickGrid">SlickGrid</a></td>
+ <td>A lightning fast JavaScript grid/spreadsheet.</td>
+ </tr>
+ <tr>
+ <td><a href="http://www.flotcharts.org/">Flot Charting Library</a></td>
+ <td>Attractive JavaScript plotting for jQuery.</td>
+ </tr>
+ <tr>
+ <td><a href="http://ace.ajax.org/">Ace Code Editor</a></td>
+ <td>High Performance Code Editor for the web.</td>
+ </tr>
+ <tr>
+ <td><a href="http://taitems.github.com/jQuery.Gantt/">JQuery.Gantt - Gantt Charts</a></td>
+ <td>Draw Gantt charts with the famous jQuery ease of development.</td>
+ </tr>
+ <tr>
+ <td><a href="http://jscolor.com/">JSColor - Color Picker</a></td>
+ <td>HTML/Javascript Color Picker.</td>
+ </tr>
+ <tr>
+ <td><a href="https://github.com/dcneiner/Downloadify">Downloadify - Flash Download Widget</a></td>
+ <td>A tiny javascript + Flash library that enables the creation and download of text files without server interaction.</td>
+ </tr>
+ </tbody>
+ </table>
+
<hr>
- <p class="help">ERPNext is an Open Source project and is possible because of the work of
- thousands of software developers, companies and designers who have contributed their
- work to the community. We have tried to list as many projects as possible that are
- used by ERPNext, but this list may not be exhaustive.</p>
-
-
- <h4>Server</h4>
- <ul>
- <li>Linux (GNU)</li>
- <li>Apache HTTPD server (web server)</li>
- <li>MySQL (database, Percona build)</li>
- <li>Git (source code control via Github)</li>
- </ul>
-
- <h4>Programming Languages & Libraries</h4>
- <ul>
- <li><a href="http://python.org">Python</a></li>
- <ul>
- <li>Python-MySQL</li>
- <li>pytz (timezones)</li>
- <li>jinja2 (templating)</li>
- <li>markdown2 (markdown parser)</li>
- <li>jsmin (javascript minifier)</li>
- </ul>
- <li>Javascript</li>
- <ul>
- <li>JQuery</li>
- <li>JQuery UI (datepicker, sortable)</li>
- <li>TinyMCE - text editor</li>
- <li>Twitter Bootstrap</li>
- <li>Ace - code editor</li>
- <li>Slick Grid - report grid</li>
- <li>jQPlot - graphs</li>
- <li><a href="http://taitems.github.com/jQuery.Gantt/" target="_blank">
- JQuery.Gantt</a> - Gantt Chart</li>
- <li>JSON2 - JSON builder, parser</li>
- <li>JSColor - color picker</li>
- <li><a href="https://github.com/dcneiner/Downloadify" target="_blank">
- Downloadify</a> - Export CSV files from the browser</li>
- <li><a href="https://github.com/harvesthq/chosen" target="_blank">
- Chosen</a> - a searchable select dropdown</li>
- </ul>
- </ul>
-
- <h4>CSS Frameworks</h4>
- <ul>
- <li>Twitter Bootstrap</li>
- </ul>
-
- <h4>Icons</h4>
- <ul>
- <li>The Noun Project</li>
- <li>Font Awesome: http://fortawesome.github.com/Font-Awesome</li>
- </ul>
-
- <h4>Web Frameworks</h4>
- <ul>
- <li>wnframework</li>
- </ul>
-
- <h4>Web Browsers</h4>
- <ul>
- <li>Mozilla Firefox</li>
- <ul>
- <li>Firebug (debugger)</li>
- </ul>
- <li>Apple Safari</li>
- <li>Google Chorme</li>
- </ul>
- <hr>
- <h2>ERPNext License</h2>
+ <h3>ERPNext License: GNU/General Public License</h3>
+ <div class="well">
<p><b>ERPNext - Open Source, web based ERP</b></p>
<p>Copyright © 2008 onwards, Web Notes Technologies Pvt Ltd, India</p>
@@ -92,6 +108,9 @@
GNU General Public License for more details.</p>
<p>For complete license see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a></p>
+ </div>
+ <p class="alert">Note: A link to this page must be easily accessible and all other ERPNext branding must remain as it is.</p>
<hr>
<p>For more information please write to us at support@erpnext.com</p>
+ </div>
</div>
\ No newline at end of file
diff --git a/home/page/attributions/attributions.js b/home/page/attributions/attributions.js
index fc56784..29eb72f 100644
--- a/home/page/attributions/attributions.js
+++ b/home/page/attributions/attributions.js
@@ -1 +1,4 @@
-wn.pages['attributions'].onload = function(wrapper) { }
\ No newline at end of file
+wn.pages['attributions'].onload = function(wrapper) {
+ wrapper.appframe = new wn.ui.AppFrame($(wrapper).find(".layout-appframe"),
+ "Attributions");
+}
\ No newline at end of file
diff --git a/home/page/latest_updates/latest_updates.js b/home/page/latest_updates/latest_updates.js
index 47d08c7..539d64d 100644
--- a/home/page/latest_updates/latest_updates.js
+++ b/home/page/latest_updates/latest_updates.js
@@ -1,7 +1,7 @@
erpnext.updates = [
["21st December 2012", [
"Manufacturing: For Material Transfer against Production Order, \
- fetch quantity pending to be transferred for each item."
+ fetch quantity pending to be transferred for each item.",
"Desktop: New Icons and now sortable by dragging."
]],
["20th December 2012", [
diff --git a/projects/doctype/task/task.py b/projects/doctype/task/task.py
index c390806..83f8995 100644
--- a/projects/doctype/task/task.py
+++ b/projects/doctype/task/task.py
@@ -24,8 +24,6 @@
sql = webnotes.conn.sql
-
-
class DocType:
def __init__(self,doc,doclist=[]):
self.doc = doc
@@ -37,7 +35,6 @@
ret = {'customer': cust and cust[0][0] or '', 'customer_name': cust and cust[0][1] or ''}
return ret
- # TODO: Remove these? as the field customer doesn't exists
def get_customer_details(self):
cust = sql("select customer_name from `tabCustomer` where name=%s", self.doc.customer)
if cust:
diff --git a/projects/doctype/task/task.txt b/projects/doctype/task/task.txt
index a7ada4b..f47d2eb 100644
--- a/projects/doctype/task/task.txt
+++ b/projects/doctype/task/task.txt
@@ -2,27 +2,18 @@
{
"owner": "Administrator",
"docstatus": 0,
- "creation": "2012-09-18 11:05:48",
+ "creation": "2012-10-29 14:30:00",
"modified_by": "Administrator",
- "modified": "2012-10-29 14:24:55"
+ "modified": "2012-12-24 10:46:06"
},
{
- "section_style": "Tray",
- "allow_attach": 1,
- "tag_fields": "status",
- "module": "Projects",
- "server_code_error": " ",
- "allow_trash": 1,
- "doctype": "DocType",
- "document_type": "Master",
- "subject": "%(subject)s",
"autoname": "TASK.#####",
- "name": "__common__",
- "colour": "White:FFF",
- "_last_update": "1324880734",
- "show_in_menu": 0,
+ "allow_attach": 1,
+ "doctype": "DocType",
+ "module": "Projects",
"max_attachments": 5,
- "version": 1
+ "document_type": "Master",
+ "name": "__common__"
},
{
"name": "__common__",
@@ -74,13 +65,13 @@
"reqd": 0
},
{
- "search_index": 1,
+ "oldfieldtype": "Date",
"doctype": "DocField",
"label": "Expected End Date",
"oldfieldname": "exp_end_date",
"fieldname": "exp_end_date",
"fieldtype": "Date",
- "oldfieldtype": "Date",
+ "search_index": 1,
"reqd": 0,
"in_filter": 1
},
@@ -93,11 +84,9 @@
},
{
"oldfieldtype": "Link",
- "colour": "White:FFF",
"doctype": "DocField",
"label": "Project",
"oldfieldname": "project",
- "trigger": "Client",
"fieldname": "project",
"fieldtype": "Link",
"options": "Project"
@@ -105,23 +94,21 @@
{
"no_copy": 1,
"oldfieldtype": "Select",
- "colour": "White:FFF",
"doctype": "DocField",
"label": "Status",
"oldfieldname": "status",
- "trigger": "Client",
"fieldname": "status",
"fieldtype": "Select",
"options": "Open\nWorking\nPending Review\nClosed\nCancelled"
},
{
- "search_index": 1,
+ "oldfieldtype": "Select",
"doctype": "DocField",
"label": "Priority",
"oldfieldname": "priority",
"fieldname": "priority",
"fieldtype": "Select",
- "oldfieldtype": "Select",
+ "search_index": 1,
"reqd": 0,
"options": "Low\nMedium\nHigh\nUrgent",
"in_filter": 1
@@ -217,13 +204,12 @@
},
{
"doctype": "DocField",
+ "label": "More Details",
"fieldname": "more_details",
- "fieldtype": "Section Break",
- "label": "More Details"
+ "fieldtype": "Section Break"
},
{
"oldfieldtype": "Date",
- "colour": "White:FFF",
"doctype": "DocField",
"label": "Review Date",
"oldfieldname": "review_date",
@@ -234,7 +220,6 @@
},
{
"oldfieldtype": "Date",
- "colour": "White:FFF",
"doctype": "DocField",
"label": "Closing Date",
"oldfieldname": "closing_date",
@@ -260,7 +245,7 @@
"permlevel": 0
},
{
- "permlevel": 1,
- "doctype": "DocPerm"
+ "doctype": "DocPerm",
+ "permlevel": 1
}
]
\ No newline at end of file
diff --git a/website/css/website.css b/website/css/website.css
index 86f0414..112d29c 100644
--- a/website/css/website.css
+++ b/website/css/website.css
@@ -6,7 +6,9 @@
padding: 0px;
min-height: 400px;
margin: 40px auto;
- box-shadow: 1px 1px 3px 3px #ccc;
+ box-shadow: 1px 1px 3px 3px #bbb;
+ border-radius: 5px;
+ overflow: hidden;
}
.navbar-inner {
@@ -23,6 +25,7 @@
box-shadow: none;
-webkit-box-shadow: none;
-moz-box-shadow: none;
+ border-radius: 0px 0px 5px 5px;
}
.layout-main {
diff --git a/website/templates/css/login.css b/website/templates/css/login.css
index 3d64009..710f889 100644
--- a/website/templates/css/login.css
+++ b/website/templates/css/login.css
@@ -10,6 +10,7 @@
box-shadow: 1px 1px 3px 3px #ccc;
font-size: 12px;
min-height: 100px;
+ border-radius: 5px;
}
#login_wrapper h3 {
diff --git a/website/utils.py b/website/utils.py
index 079ad21..bac87ff 100644
--- a/website/utils.py
+++ b/website/utils.py
@@ -210,7 +210,7 @@
from `tabWebsite Product Category` t1, `tabItem Group` t2
where t1.item_group = t2.name
and ifnull(t2.show_in_website,0)=1 order by t1.idx""", as_dict=1)
- products_item = filter(lambda d: d.url.split(".")[0]=="products", top_items)[0]
+ products_item = filter(lambda d: d.url and d.url.split(".")[0]=="products", top_items)[0]
products_item.child_items = products
return {