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

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

Browse Source
This commit is contained in:
Nabin Hait 2014-01-20 10:57:12 +05:30
commit ee0c623760
5 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config.json
View File

@ -1,6 +1,6 @@
{ {
"app_name": "ERPNext", "app_name": "ERPNext",
"app_version": "3.6.2", "app_version": "3.6.3",
"base_template": "app/portal/templates/base.html", "base_template": "app/portal/templates/base.html",
"modules": { "modules": {
"Accounts": { "Accounts": {
@ -74,5 +74,5 @@
"type": "module" "type": "module"
} }
}, },
"requires_framework_version": "==3.7.2" "requires_framework_version": "==3.7.3"
} }

2
install_erpnext.py
View File

@ -20,7 +20,7 @@ requirements = [
"jinja2", "jinja2",
"markdown2", "markdown2",
"markupsafe", "markupsafe",
"mysql-python==1.2.4", "mysql-python",
"pygeoip", "pygeoip",
"python-dateutil", "python-dateutil",
"python-memcached", "python-memcached",

15
public/js/conf.js
View File

@ -24,16 +24,17 @@ $(document).bind('toolbar_setup', function() {
wn.provide('wn.ui.misc'); wn.provide('wn.ui.misc');
wn.ui.misc.about = function() { wn.ui.misc.about = function() {
if(!wn.ui.misc.about_dialog) { if(!wn.ui.misc.about_dialog) {
var d = new wn.ui.Dialog({title: wn._('About ERPNext')}) var d = new wn.ui.Dialog({title: wn._('About')})
$(d.body).html(repl("<div>\ $(d.body).html(repl("<div>\
<p>"+wn._("ERPNext is an open-source web based ERP made by Web Notes Technologies Pvt Ltd.\ <h2>ERPNext</h2> \
to provide an integrated tool to manage most processes in a small organization.\ <p><strong>v" + wn.boot.app_version + "</strong></p>\
For more information about Web Notes, or to buy hosting servies, go to ")+ <p>"+wn._("An open source ERP made for the web.</p>") +
"<a href='https://erpnext.com'>https://erpnext.com</a>.</p>\ "<p>"+wn._("To report an issue, go to ")+"<a href='https://github.com/webnotes/erpnext/issues'>GitHub Issues</a></p> \
<p>"+wn._("To report an issue, go to ")+"<a href='https://github.com/webnotes/erpnext/issues'>GitHub Issues</a></p>\ <p><a href='http://erpnext.org' target='_blank'>http://erpnext.org</a>.</p>\
<hr>\
<p><a href='http://www.gnu.org/copyleft/gpl.html'>License: GNU General Public License Version 3</a></p>\ <p><a href='http://www.gnu.org/copyleft/gpl.html'>License: GNU General Public License Version 3</a></p>\
<hr>\
<p>&copy; 2014 Web Notes Technologies Pvt. Ltd and contributers </p> \
</div>", wn.app)); </div>", wn.app));
wn.ui.misc.about_dialog = d; wn.ui.misc.about_dialog = d;

2
public/js/toolbar.js
View File

@ -21,6 +21,6 @@ erpnext.toolbar.setup = function() {
<i class="icon-fixed-width icon-comments"></i> '+wn._('Live Chat')+'</a></li>'); <i class="icon-fixed-width icon-comments"></i> '+wn._('Live Chat')+'</a></li>');
} }
$("#toolbar-tools").append('<li><a href="#latest-updates">\ $("#toolbar-tools").append('<li><a href="https://github.com/webnotes/erpnext/releases" target="_blank">\
<i class="icon-fixed-width icon-rss"></i> Latest Updates</li>'); <i class="icon-fixed-width icon-rss"></i> Latest Updates</li>');
} }

2
stock/report/item_prices/item_prices.py
View File

@ -15,7 +15,7 @@ def execute(filters=None):
bom_rate = get_item_bom_rate() bom_rate = get_item_bom_rate()
val_rate_map = get_valuation_rate() val_rate_map = get_valuation_rate()
precision = get_currency_precision or 2 precision = get_currency_precision() or 2
data = [] data = []
for item in sorted(item_map): for item in sorted(item_map):