From be7ce4744a0f1e75bc0cf1508b32676089e5b2db Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 8 Jun 2012 14:18:21 +0530 Subject: [PATCH 1/2] website color should be black --- README.md | 13 +++++++++++++ erpnext/startup/startup.css | 4 ---- public/css/all-app.css | 4 ---- public/css/all-web.css | 4 ---- update_erpnext.py | 23 ----------------------- 5 files changed, 13 insertions(+), 35 deletions(-) delete mode 100644 update_erpnext.py diff --git a/README.md b/README.md index 98514f3da7..a936e160e8 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,21 @@ ERPNext is built on [wnframework](https://github.com/webnotes/wnframework) (Vers ## Download and Install +First install all the pre-requisites, then + + $ git clone git://github.com/webnotes/erpnext.git + $ cd erpnext + $ python erpnext_install.py + [See installation notes](https://github.com/webnotes/erpnext/wiki/How-to-Install-ERPNext) +## Patch and update + +To patch and update from the latest git repository the erpnext folder and run. +You will have to set your origin in git remote + + $ lib/wnf.py --update origin master + ## Forums - [User / Functional](http://groups.google.com/group/erpnext-user-forum) diff --git a/erpnext/startup/startup.css b/erpnext/startup/startup.css index de76623bb2..4bc4982290 100644 --- a/erpnext/startup/startup.css +++ b/erpnext/startup/startup.css @@ -12,10 +12,6 @@ span, div, td, input, textarea, button, select { font-family: inherit; } -body { - color: #616161; -} - .small { font-size: 11.5px; } diff --git a/public/css/all-app.css b/public/css/all-app.css index 4f5d548503..5e3e068844 100644 --- a/public/css/all-app.css +++ b/public/css/all-app.css @@ -3844,10 +3844,6 @@ span, div, td, input, textarea, button, select { font-family: inherit; } -body { - color: #616161; -} - .small { font-size: 11.5px; } diff --git a/public/css/all-web.css b/public/css/all-web.css index 1848143695..bffceb9b29 100644 --- a/public/css/all-web.css +++ b/public/css/all-web.css @@ -2542,10 +2542,6 @@ span, div, td, input, textarea, button, select { font-family: inherit; } -body { - color: #616161; -} - .small { font-size: 11.5px; } diff --git a/update_erpnext.py b/update_erpnext.py deleted file mode 100644 index 341fafda12..0000000000 --- a/update_erpnext.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/python -import commands - -cmd_list = [ - 'lib/wnf.py --pull origin master', - 'lib/wnf.py -l', - 'lib/wnf.py --sync_all' -] -err = 0 -for cmd in cmd_list: - stat, op = commands.getstatusoutput(cmd) - if stat != 0: - print "something went wrong" - print "cannot proceed with update" - print "status: %s" % stat - print "output: %s" % op - err = 1 - break - -if not err: - print "update_erpnext.py --> run success." -else: - print "update_erpnext.py --> run failed." \ No newline at end of file From efd016d292da270b3ded250f2f2aa5b42470db6b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 8 Jun 2012 15:19:26 +0530 Subject: [PATCH 2/2] fixed forum link in README --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a936e160e8..bf42d2bc9a 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,10 @@ You will have to set your origin in git remote ## Forums -- [User / Functional](http://groups.google.com/group/erpnext-user-forum) -- [Technical](http://groups.google.com/group/wnframework) +Please join our forums for more questions: + +- [Developer Forum](http://groups.google.com/group/erpnext-developer-forum) +- [User Forum](http://groups.google.com/group/erpnext-user-forum) ## License